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

Jarrett Jordaan
2 parents 6e778ae3 00b5ac53
Showing 5 changed files with 21 additions and 24 deletions
plugins/thumbnails/sql/upgradeto0.sql
plugins/thumbnails/thumbnails.php
setup/wizard/steps/database.php
sql/mysql/install/data.sql
sql/mysql/upgrade/3.7.0/config_settings.sql
-INSERT INTO `config_settings` (group_name, display_name, description, item, value, default_value, type, options, can_edit)
-VALUES ('externalBinary', 'convert', 'The path to the ImageMagick "convert" binary', 'convertPath', 'default', 'convert', 'string', NULL, 1);
 \ No newline at end of file
@@ -154,8 +154,14 @@ class thumbnailGenerator extends BaseProcessor
     	    $pdfDir = $default->pdfDirectory;
             $pdfFile = $pdfDir .DIRECTORY_SEPARATOR. $this->document->iId.'.pdf';
 	    }
-
+		
+		$pdfFile = str_replace('/', '\\', $pdfFile);
+		
         $thumbnaildir = $default->internalVarDirectory.DIRECTORY_SEPARATOR.'thumbnails';
+		if (!KTUtil::isAbsolutePath($thumbnaildir)) {
+            $thumbnaildir = KT_DIR . $thumbnaildir;
+        }
+        $thumbnaildir = str_replace('/', '\\', $thumbnaildir);
         $thumbnailfile = $thumbnaildir.DIRECTORY_SEPARATOR.$this->document->iId.'.jpg';
         //if thumbail dir does not exist, generate one and add an index file to block access
@@ -179,6 +185,7 @@ class thumbnailGenerator extends BaseProcessor
        // if (extension_loaded('imagick')) {
             $pathConvert = (!empty($default->convertPath)) ? $default->convertPath : 'convert';
             // windows path may contain spaces
+
             if (WINDOWS_OS) {
 				$cmd = "\"{$pathConvert}\" -size 200x200 \"{$pdfFile}[0]\" -resize 200x200 \"$thumbnailfile\"";
             }
@@ -220,7 +227,7 @@ class ThumbnailViewlet extends KTDocumentViewlet {
         // Check for the thumbnail
         global $default;
 		$varDir = $default->internalVarDirectory;
-		$thumbnailfile = $varDir . DIRECTORY_SEPARATOR . 'thumbnails'. DIRECTORY_SEPARATOR .$documentId.'.jpg';
+		$thumbnailfile = $varDir . '/thumbnails/'.$documentId.'.jpg';
 		// if the thumbnail doesn't exist try to create it
 		if (!file_exists($thumbnailfile)){
@@ -228,8 +235,12 @@ class ThumbnailViewlet extends KTDocumentViewlet {
             $thumbnailer->setDocument($this->oDocument);
             $thumbnailer->processDocument();
+			$thumbcheck = $thumbnailfile;
             // if it still doesn't exist, return an empty string
-            if (!file_exists($thumbnailfile)) {
+			if (!KTUtil::isAbsolutePath($thumbcheck)) {
+				$thumbcheck = KT_DIR . $thumbcheck;
+			}
+            if (!file_exists($thumbcheck)) {
                 return '';
             }
 		}
@@ -255,7 +266,7 @@ class ThumbnailViewlet extends KTDocumentViewlet {
     public function get_width($documentId){
     	global $default;
     	$varDir = $default->internalVarDirectory;
-		$thumbnailfile = $varDir . DIRECTORY_SEPARATOR.'thumbnails'.DIRECTORY_SEPARATOR.$documentId.'.jpg';
+		$thumbnailfile = $varDir . '/thumbnails/'.$documentId.'.jpg';
 		$size = getimagesize($thumbnailfile);
 		return $size[0];
     }
@@ -790,22 +790,6 @@ class database extends Step
     	        // continue without attempting to set the path if we can't find the file in the specified location
     	        if (!file_exists(SYSTEM_ROOT . $bin[1])) continue;
-    	        // thumbnails is a special case, being a plugin which won't have an entry on a new installation
-    	        if ($displayName == 'convert') {
-    	            // check if there is an entry, if not, insert and continue to next loop, else continue to update statement
-    	            $query = 'SELECT id FROM config_settings WHERE display_name = "' . $displayName . '"';
-    	            $this->util->dbUtilities->query($query);
-    	            $result = $this->util->dbUtilities->fetchAssoc();
-    	            if (is_null($result)) {
-    	                $query = "INSERT INTO `config_settings` "
-    	                       . "(group_name, display_name, description, item, value, default_value, type, options, can_edit) "
-    	                       . "VALUES ('" . $bin[0] . "', 'convert', 'The path to the ImageMagick \"convert\" binary', 'convertPath', "
-    	                       . "'" . str_replace('\\', '\\\\', SYSTEM_ROOT . $bin[1]) . "', 'convert', 'string', NULL, 1);";
-    	                $this->util->dbUtilities->query($query);
-    	                continue;
-    	            }
-    	        }
-    	        
         		$updateBin = 'UPDATE config_settings c SET c.value = "'. str_replace('\\', '\\\\', SYSTEM_ROOT . $bin[1]) . '" '
         		           . 'where c.group_name = "' . $bin[0] . '" and c.display_name = "'.$displayName.'";';
                 $this->util->dbUtilities->query($updateBin);
@@ -290,7 +290,8 @@ INSERT INTO `config_settings` VALUES
 (115, 'ldapAuthentication', 'Allow Moving Users in LDAP/AD', 'Moving users around within the LDAP or Active Directory structure will cause failed logins for these users. When this setting is enabled, a failed login will trigger a search for the user using their sAMAccountName setting and update their authentication details.', 'enableLdapUpdate', 'default', 'false', 'boolean', NULL, 1),
 (116, 'export', 'Use External Zip Binary', 'Utilises the external zip binary for compressing archives. The default is to use the PEAR archive class.', 'useBinary', 'default', 'true', 'boolean', NULL, 0),
 (117, 'export', 'Use Bulk Download Queue', 'The bulk download can be large and can prevent normal browsing. The download queue performs the bulk downloads in the background.', 'useDownloadQueue', 'default', 'true', 'boolean', NULL, 1),
-(118, 'urls', 'Internal Var Directory', 'The path to the internal var directory that must sit within the web root', 'internalVarDirectory', 'default', '${fileSystemRoot}/var', 'string', NULL, 0);
+(118, 'urls', 'Internal Var Directory', 'The path to the internal var directory that must sit within the web root', 'internalVarDirectory', 'default', '${fileSystemRoot}/var', 'string', NULL, 0),
+(119, 'urls', 'PDF Directoy', 'The path for storing the generated PDF Documents', 'pdfDirectory', 'default', '${varDirectory}/Pdf', 'string', '', 1);
 /*!40000 ALTER TABLE `config_settings` ENABLE KEYS */;
 UNLOCK TABLES;
 INSERT INTO `config_settings` (group_name, display_name, description, item, value, default_value, type, options, can_edit)
-VALUES ('urls', 'Internal Var Directory', 'The path to the internal var directory that must sit within the web root', 'internalVarDirectory', 'default', '${fileSystemRoot}/var', 'string', NULL, 0);
 \ No newline at end of file
+VALUES ('urls', 'Internal Var Directory', 'The path to the internal var directory that must sit within the web root', 'internalVarDirectory', 'default', '${fileSystemRoot}/var', 'string', NULL, 0);
+
+INSERT INTO `config_settings` (group_name, display_name, description, item, value, default_value, type, options, can_edit)
+VALUES ('urls', 'PDF Directoy', 'The path for storing the generated PDF Documents', 'pdfDirectory', 'default', '${varDirectory}/Pdf', 'string', '', 1);
 \ No newline at end of file