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

Megan Watson
2 parents a44e8280 085f1ee3
Showing 5 changed files with 21 additions and 5 deletions
plugins/thumbnails/thumbnails.php
setup/wizard/lib/services/windowsLucene.php
setup/wizard/lib/services/windowsOpenOffice.php
setup/wizard/steps/database.php
setup/wizard/templates/services.tpl
@@ -170,6 +170,11 @@ class thumbnailGenerator extends BaseProcessor
             $default->log->debug('Thumbnail Generator Plugin: PDF file does not exist, cannot generate a thumbnail');
             return false;
         }
+        
+        if (WINDOWS_OS) {
+            $thumbnailfile = KT_DIR . $thumbnailfile;
+        }
+        
 		// if a previous version of the thumbnail exists - delete it
 		if (file_exists($thumbnailfile)) {
 			@unlink($thumbnailfile);
@@ -177,7 +182,10 @@ class thumbnailGenerator extends BaseProcessor
         // do generation
        // if (extension_loaded('imagick')) {
             $pathConvert = (!empty($default->convertPath)) ? $default->convertPath : 'convert';
-        	$result = shell_exec("{$pathConvert} -size 200x200 {$pdfFile}[0] -resize 200x200 $thumbnailfile");
+            if (WINDOWS_OS) {
+                $pathConvert = '"' . $pathConvert . '"';
+            }
+        	$result = KTUtil::pexec("{$pathConvert} -size 200x200 {$pdfFile}[0] -resize 200x200 $thumbnailfile");
         	return true;
         //}else{
         	//$default->log->debug('Thumbnail Generator Plugin: Imagemagick not installed, cannot generate a thumbnail');
@@ -212,6 +220,10 @@ class ThumbnailViewlet extends KTDocumentViewlet {
         global $default;
 		$varDir = $default->internalVarDirectory;
 		$thumbnailfile = $varDir . '/thumbnails/'.$documentId.'.jpg';
+		
+		if (WINDOWS_OS) {
+            $thumbnailfile = KT_DIR . $thumbnailfile;
+        }
 		// if the thumbnail doesn't exist try to create it
 		if (!file_exists($thumbnailfile)){
@@ -429,7 +429,6 @@ class windowsLucene extends windowsService {
 			$luceneExe = $this->getLuceneExe();
 			$luceneSource = $this->getLuceneSource();
 			$luceneDir = $this->getluceneDir();
-//			$javaJVM = $this->getJavaJVM();
 			if($luceneExe && $luceneSource && $luceneDir) {
 				$cmd = "\"{$luceneExe}\""." -install \"".$this->getName()."\" \"".$this->getJavaJVM(). "\" -Djava.class.path=\"".$luceneSource."\"". " -start ".$this->getLuceneServer(). " -out \"".$this->getLuceneOut()."\" -err \"".$this->getLuceneError()."\" -current \"".$luceneDir."\" -auto";
             	if(DEBUG) {
@@ -201,7 +201,6 @@ class windowsOpenOffice extends windowsService {
     public function install() {
     	$status = $this->status();
     	if($status == '') {
-    		//$binary = $this->util->openOfficeSpecified();
     		$binary = $this->getBin();
     		if($binary != '') {
             	$cmd = "\"{$this->winservice}\" install $this->name "."-displayname {$this->name} -start auto \"".$binary."\" -headless -invisible -nofirststartwizard -\"accept=socket,host={$this->host},port={$this->port};urp;\"";;
@@ -781,7 +781,7 @@ class database extends Step
     	if($binaries) {
 	    	foreach ($binaries as $k=>$bin) {
 	    		if($k != 1) {
-	    			$updateBin = 'UPDATE config_settings c SET c.value = "'.$bin.'" where c.group_name = "externalBinary" and c.display_name = "'.$k.'";';
+	    			$updateBin = 'UPDATE config_settings c SET c.value = "'.str_replace('\\', '\\\\', $bin).'" where c.group_name = "externalBinary" and c.display_name = "'.$k.'";';
 					$this->util->dbUtilities->query($updateBin);
 	    		}
 	    	}
@@ -790,6 +790,7 @@ class database extends Step
     	// if Windows, hard code (relative to SYSTEM_ROOT) where we expect the Zend MSI installer to have placed them
     	if (WINDOWS_OS) {
     	    $winBinaries = array('php' => 'ZendServer\bin\php.exe', 'python' => 'openoffice\program\python.exe', 
+    	                      'java' => 'jre\bin\java.exe', 
     	                      // since we don't know where convert is yet, let's just assume somewhere for now (manually test)
     	                      'convert' => 'imagick\convert.exe', 
     	                      'zip' => 'bin\zip\zip.exe', 'unzip' => 'bin\unzip\unzip.exe');
@@ -10,6 +10,7 @@
 	The wizard will review your system to determine whether you can run KnowledgeTree background services. <br/>Once the scan is completed, you&rsquo;ll see whether your system has met the requirements or whether there are areas you need to address. 
 	</p>
 <!--Continue Message-->
+<?php if($validation) { ?>
 	<?php
 		if(!$errors && !$warnings) {
 			?>
@@ -33,10 +34,10 @@
 	}?>
 	<?php
 		if($errors || $warnings) {
-//			var_dump($errors);
 			?>
 		    	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://wiki.knowledgetree.com/Web_Based_Installer#Service_Dependencies" target="_blank">Click here for help on overcoming service issues</a>
 	<?php } ?>
+<?php } ?>
 <!--Content-->
 	<div id="step_content_configuration" class="step">
 		<?php if(!$alreadyInstalled) { ?>
@@ -170,6 +171,7 @@
 			All services are already installed.
 <!--			</p>-->
 		<?php } ?>
+		<?php if($validation) { ?>
 		<h3><?php echo "<span class='{$serviceCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Services Check</h3>
 		<?php if($silent) { ?>
 			<?php if($serviceCheck != 'tick') {
@@ -216,6 +218,9 @@
 		<?php if($silent) { ?>
 			</div>
 		<?php } ?>
+		<?php } else { ?>
+			Services have to be manually started after the installation has been run. <a href="http://wiki.knowledgetree.com/KnowledgeTree_Setup_Wizard_Troubleshoot#Services" target="_blank">Click here for help on starting services</a>
+		<?php } ?>
 	</div>
     <input type="submit" name="Previous" value="Previous" class="button_previous"/>
     <input type="submit" name="Next" value="Next" class="button_next"/>