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

Megan Watson
2 parents 2fd5f2e4 f406cb27
Showing 2 changed files with 30 additions and 11 deletions
plugins/thumbnails/templates/thumbnail_viewlet.smarty
plugins/thumbnails/thumbnails.php
@@ -13,14 +13,16 @@
         	<div id="thumb_{/literal}{$documentId}{literal}" class="thumb">
             <a href='{$url}' rel="lightbox" title="{$title}">
             <img id="img{$documentId}" src="{$thumbnail}" {if $height}height="{$height}"{/if} class="lightbox_window"/>
+            </a>
             </div>
 		{else}
-			<a href='{$url}' target='_blank'>
-			<img src="{$thumbnail}" {if $height}height="{$height}"{/if}/>
-        {/if}
-        
-        {if $url}
-            </a>
+			{if $url}
+				<a href='{$url}' target='_blank'>
+				<img src="{$thumbnail}" {if $height}height="{$height}"{/if}/>
+				</a>
+			{else}
+				<img src="{$thumbnail}" {if $height}height="{$height}"{/if}/>
+			{/if}
         {/if}
     </div>
 </div>
 \ No newline at end of file
@@ -194,9 +194,12 @@ class thumbnailGenerator extends BaseProcessor
         $thumbnailfile = $thumbnaildir.DIRECTORY_SEPARATOR.$this->document->iId.'.jpg';
         //if thumbail dir does not exist, generate one and add an index file to block access
         if (!file_exists($thumbnaildir)) {
-        	 mkdir($thumbnaildir, 0755);
-        	 touch($thumbnaildir.DIRECTORY_SEPARATOR.'index.html');
-        	 file_put_contents($thumbnaildir.DIRECTORY_SEPARATOR.'index.html', 'You do not have permission to access this directory.');
+        	mkdir($thumbnaildir, 0755);
+        }
+        
+        if (!file_exists($thumbnaildir.DIRECTORY_SEPARATOR.'index.html')) {
+        	touch($thumbnaildir.DIRECTORY_SEPARATOR.'index.html');
+        	file_put_contents($thumbnaildir.DIRECTORY_SEPARATOR.'index.html', 'You do not have permission to access this directory.');
         }
  
         // if there is no pdf that exists - hop out
@@ -219,8 +222,22 @@ class thumbnailGenerator extends BaseProcessor
 		else {
 			$cmd = "{$pathConvert} {$srcFile}" . $pageNumber . " -resize 200x200 $thumbnailfile";
 		}
-
-		$result = KTUtil::pexec($cmd);
+		
+		$default->log->debug($cmd);
+
+		$output = KTUtil::pexec($cmd);
+		
+		// Log the output
+		if(isset($output['out'])){
+			$out = $output['out'];
+			if(is_array($out)){
+				$out = array_pop($out);
+			}
+			if(strpos($out, 'ERROR') === 0){
+			    $default->log->error('InstaView Plugin: error in creation of document thumbnail '.$this->document->iId.': '. $out);
+			}
+		}
+		
         return true;
     }
 }