Merge branch 'edge' of git@github.com:ktgit/knowledgetree into edge

Jarrett Jordaan
2 parents 5752e1b7 7fbb4d57
Showing 2 changed files with 18 additions and 23 deletions
plugins/thumbnails/thumbnails.php
setup/wizard/steps/database.php
@@ -147,10 +147,10 @@ class thumbnailGenerator extends BaseProcessor
         $mimeType = KTMime::getMimeTypeName($mimeTypeId);
 	    // Get the pdf source file - if the document is a pdf then use the document as the source
-	    if($mimeType == 'application/pdf'){
+	    if($mimeType == 'application/pdf') {
 	        $pdfDir = $default->documentRoot;
             $pdfFile = $pdfDir . DIRECTORY_SEPARATOR . $this->document->getStoragePath();
-	    }else{
+	    } else {
     	    $pdfDir = $default->pdfDirectory;
             $pdfFile = $pdfDir .DIRECTORY_SEPARATOR. $this->document->iId.'.pdf';
 	    }
@@ -175,28 +175,23 @@ class thumbnailGenerator extends BaseProcessor
             $default->log->debug('Thumbnail Generator Plugin: PDF file does not exist, cannot generate a thumbnail');
             return false;
         }
-		// if a previous version of the thumbnail exists - delete it
+
+        // if a previous version of the thumbnail exists - delete it
 		if (file_exists($thumbnailfile)) {
 			@unlink($thumbnailfile);
 		}
         // do generation
-       // if (extension_loaded('imagick')) {
-            $pathConvert = (!empty($default->convertPath)) ? $default->convertPath : 'convert';
-            // windows path may contain spaces
-
-            if (stristr(PHP_OS,'WIN')) {
-				$cmd = "\"{$pathConvert}\" -size 200x200 \"{$pdfFile}[0]\" -resize 200x200 \"$thumbnailfile\"";
-            }
-			else {
-				$cmd = "{$pathConvert} -size 200x200 {$pdfFile}[0] -resize 200x200 $thumbnailfile";
-			}
-        	$result = KTUtil::pexec($cmd);
-        	return true;
-        //}else{
-        	//$default->log->debug('Thumbnail Generator Plugin: Imagemagick not installed, cannot generate a thumbnail');
-           // return false;
-        //}
-
+        $pathConvert = (!empty($default->convertPath)) ? $default->convertPath : 'convert';
+        // windows path may contain spaces
+        if (stristr(PHP_OS,'WIN')) {
+			$cmd = "\"{$pathConvert}\" -size 200x200 \"{$pdfFile}[0]\" -resize 200x200 \"$thumbnailfile\"";
+        }
+		else {
+			$cmd = "{$pathConvert} -size 200x200 {$pdfFile}[0] -resize 200x200 $thumbnailfile";
+		}
+		
+		$result = KTUtil::pexec($cmd);
+        return true;
     }
 }
@@ -802,18 +802,18 @@ class database extends Step
     	                      	 'unzip' => array(0 => 'import', 1 => SYSTEM_ROOT . 'bin\unzip\unzip.exe'));
     	    if (INSTALL_TYPE == 'commercial' || true) {
-    	    	$winBinaries['pdf2swf'] = array(0 => 'externalBinary', 1 => SYSTEM_ROOT . 'bin\pdf2swf.exe');
+    	    	$winBinaries['pdf2swf'] = array(0 => 'externalBinary', 1 => SYSTEM_ROOT . 'bin\swftools\pdf2swf.exe');
     	    }
     	    foreach ($winBinaries as $displayName => $bin)
     	    {
     	        // continue without attempting to set the path if we can't find the file in the specified location
-    	        if (!file_exists($bin[1])) continue;
+//    	        if (!file_exists($bin[1])) continue;
     	        // instaView won't exist, must be inserted instead of updated
     	        if ($displayName == 'pdf2swf') {
     	            $updateBin = 'INSERT INTO `config_settings` (group_name, display_name, description, item, value, default_value, type, options, can_edit) '
-	    					   . 'VALUES ("' . $bin[0] . '", "pdf2swf", "The path to the SWFTools \"pdf2swf\" binary", "pdf2swfPath", '
+	    					   . 'VALUES ("' . $bin[0] . '", "' . $displayName . '", "The path to the SWFTools \"pdf2swf\" binary", "pdf2swfPath", '
 	    					   . '"' . str_replace('\\', '\\\\', $bin[1]) . '", "pdf2swf", "string", NULL, 1);';
     	        }
     	        else {