External Binary Settings updated after installation

Committed by: Jarrett Jordaan Reviewed by: Megan Watson

External Binary Settings updated after installation
Committed by: Jarrett Jordaan Reviewed by: Megan Watson
Jarrett Jordaan
1 parent 0b6dcbd8
Showing 5 changed files with 61 additions and 33 deletions
setup/wizard/lib/validation/luceneValidation.php
setup/wizard/lib/validation/schedulerValidation.php
setup/wizard/steps/database.php
setup/wizard/steps/services.php
setup/wizard/templates/install.tpl
@@ -262,28 +262,33 @@ class luceneValidation extends serviceValidation {
 	* @return boolean
 	*/
     public function binaryChecks() {
-    	if($this->util->javaSpecified()) {
-    		$this->disableExtension = true; // Disable the use of the php bridge extension
-    		if($this->detSettings(true)) { // AutoDetect java settings
-    			return true;
-    		} else {
-    			$this->specifyJava(); // Ask for settings
-    		}
-    	} else {
-    		$auto = $this->useBridge(); // Use Bridge to get java settings
-    		if($auto) {
+    	$java = $this->useZendJava();
+    	if(!$java) {
+	    	if($this->util->javaSpecified()) {
+	    		$this->disableExtension = true; // Disable the use of the php bridge extension
+	    		if($this->detSettings(true)) { // AutoDetect java settings
+	    			return true;
+	    		} else {
+	    			$this->specifyJava(); // Ask for settings
+	    		}
+	    	} else {
+	    		$auto = $this->useBridge(); // Use Bridge to get java settings
+	    		if($auto) {
+					return $auto;
+	    		} else {
+	    			$auto = $this->detSettings(); // Check if auto detected java works
+	    			if($auto) {
+	    				$this->disableExtension = true; // Disable the use of the php bridge extension
+	    				return $auto;
+	    			} else {
+						$this->specifyJava(); // Ask for settings
+	    			}
+	    		}
 				return $auto;
-    		} else {
-    			$auto = $this->detSettings(); // Check if auto detected java works
-    			if($auto) {
-    				$this->disableExtension = true; // Disable the use of the php bridge extension
-    				return $auto;
-    			} else {
-					$this->specifyJava(); // Ask for settings
-    			}
-    		}
-			return $auto;
+	    	}
     	}
+    	
+    	return $java;
     }
 	/**
@@ -368,6 +373,11 @@ class luceneValidation extends serviceValidation {
 				$java = $zendsys."jre".DS."bin".DS."java.exe";
 				if(file_exists($java))
 					return $java;
+	    	} else {
+	    		$java = "/usr/bin/java";
+	    		if(file_exists($java)) {
+	    			return $java;
+	    		}
 	    	}
 	    }
@@ -91,13 +91,14 @@ class schedulerValidation extends serviceValidation {
     public function binaryChecks() {
     	// TODO: Better detection
-    	return true;
-    	$this->setPhp();
-    	if($this->util->phpSpecified()) {
-			return $this->detPhpSettings();
+    	$phpDir = $this->util->useZendPhp();
+    	if(WINDOWS_OS) {
+    		$phpPath = "$phpDir"."php.exe";
     	} else {
-    		$this->specifyPhp();// Ask for settings
-			return false;
+    		$phpPath = "$phpDir"."php";
+    	}
+    	if(file_exists($phpPath)) {
+    		return $phpPath;
     	}
     }
@@ -141,9 +142,8 @@ class schedulerValidation extends serviceValidation {
 			$this->phpCheck = 'tick';
 		} elseif ($phpDir = $this->util->useZendPhp()) { // Use System Defined Settings
 			$this->php = $phpDir;
-		} else {
-
 		}
+		
 		$this->temp_variables['php']['location'] = $this->php;
     }
@@ -641,7 +641,8 @@ class database extends Step
 		if(!$this->populateSchema()) {
 			$this->error['con'] = "Could not populate schema ";
 		}
-
+		$this->writeBinaries();
+		
 		return true;
     }
@@ -769,8 +770,22 @@ class database extends Step
     	$this->util->dbUtilities->query($dropPluginHelper);
     	$updateUrls = 'UPDATE config_settings c SET c.value = "default" where c.group_name = "urls";';
     	$this->util->dbUtilities->query($updateUrls);
+		$this->writeBinaries();
+
     	return true;
     }
+    
+    private function writeBinaries() {
+    	$services = $this->util->getDataFromSession('services');
+    	$binaries = $services['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.'";';
+				$this->util->dbUtilities->query($updateBin);
+    		}
+    	}
+    }
+    
 	/**
 	* Close connection if it exists
 	*
@@ -67,7 +67,7 @@ class services extends Step
 	* @access private
 	* @var array
 	*/
-    private $services = array('Lucene', 'Scheduler', 'OpenOffice');
+    private $services = array('java'=>'Lucene', 'php'=>'Scheduler', 'soffice'=>'OpenOffice');
 	/**
 	* Flag if services are already Installed
@@ -144,6 +144,7 @@ class services extends Step
  	*/
 	public $schedulerValidation;
+	public $binaries = array();
 	/**
 	* Main control of services setup
 	*
@@ -202,7 +203,7 @@ class services extends Step
     		$this->alreadyInstalled = true;
     		$this->serviceCheck = 'tick';
     	} else {
-	    	foreach ($this->getServices() as $service) {
+	    	foreach ($this->getServices() as $bin=>$service) {
 	    		$class = strtolower($service)."Validation";
 				$this->$class->preset(); // Sets defaults
 				$className = OS.$service;
@@ -212,6 +213,7 @@ class services extends Step
 				if($status != 'STARTED' || $status != 'STOPPED') {
 					if(!WINDOWS_OS) { $binary = $this->$class->getBinary(); } // Get binary, if it exists
 					$passed = $this->$class->binaryChecks(); // Run Binary Pre Checks
+					$this->binaries[$bin] = $passed;
 	    			if ($passed) { // Install Service
 	    				$this->installService($service, $passed);
 	    			}
@@ -520,6 +522,7 @@ class services extends Step
     	}
     	$this->temp_variables['alreadyInstalled'] = $this->alreadyInstalled;
     	$this->temp_variables['serviceCheck'] = $this->serviceCheck;
+    	$this->temp_variables['binaries'] = $this->binaries;
     }
@@ -10,8 +10,8 @@
 		</p>
 		<div class="demo"><?php echo $html->image('greenit.jpg', array('style'=>'padding-left: 35px;')); ?></div>
 		<br/><br/><br/><br/>
-<p>		<input class="" type='checkbox' name='call_home' value='enable' checked style="float:left;"/>&nbsp;&nbsp;
-		Help to improve KnowledgeTree by providing anonymous usage statistics</p>
+<p>		<input type='checkbox' name='call_home' value='enable' checked style="float:left;"/>&nbsp;&nbsp;
+		<label for='call_home'>Help to improve KnowledgeTree by providing anonymous usage statistics</label></p>
 	</div>
 	<input type="submit" name="Previous" value="Previous" class="button_previous"/>
 	<input type="submit" name="Install" value="Install" class="button_next"/>