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

Paul Barrett
2 parents 9ba18b37 713eeb8b
Showing 16 changed files with 101 additions and 117 deletions
setup/migrate/migrateWizard.php
setup/migrate/migrater.php
setup/migrate/steps/migrateDatabase.php
setup/migrate/steps/migrateServices.php
setup/migrate/templates/installation.tpl
setup/migrate/templates/services.tpl
setup/upgrade/steps/upgradeDatabase.php
setup/upgrade/steps/upgradeWelcome.php
setup/upgrade/templates/complete.tpl
setup/upgrade/upgradeWizard.php
setup/upgrade/upgrader.php
setup/wizard/installUtil.php
setup/wizard/installWizard.php
setup/wizard/path.php
setup/wizard/steps/database.php
setup/wizard/templates/complete.tpl
@@ -177,7 +177,7 @@ class MigrateWizard {
 	* @return void
  	*/
 	private function createMigrateFile() {
-		@touch("migrate");
+		touch("migrate");
 	}
 	/**
@@ -189,7 +189,7 @@ class MigrateWizard {
 	* @return void
  	*/
 	private function removeMigrateFile() {
-		@unlink("migrate");
+		unlink("migrate");
 	}
 	/**
@@ -413,7 +413,7 @@ class Migrater {
 	* @return void
 	*/
     private function _completeMigrate() {
-    	@touch("migrate");
+    	touch("migrate");
     }
 	/**
@@ -117,6 +117,7 @@ class migrateDatabase extends Step
     			}
     		}
     	}
+    	$noFile = false;
     	$installation = $this->getDataFromSession("installation"); // Get installation directory
     	$manual = false; // If file was exported manually
     	$dbSettings = $installation['dbSettings'];
@@ -125,7 +126,7 @@ class migrateDatabase extends Step
 		$tmpFolder = $this->resolveTempDir();
     	if(WINDOWS_OS) {
     		$termOrBash = "command prompt window";
-    		$exe = "$location".DS."mysql".DS."bin".DS."mysqldump.exe".DS;
+    		$exe = "\"$location".DS."mysql".DS."bin".DS."mysqldump.exe\"";
     	} else {
     		$termOrBash = "terminal window";
     		$exe = "\"$location".DS."mysql".DS."bin".DS."mysqldump\""; // Location of dump
@@ -153,23 +154,20 @@ class migrateDatabase extends Step
 				return true;
 			}
 		}
+		$noFile = true;
 		// Handle failed dump
 		if(WINDOWS_OS) {
 			// Could be permissions, check error code.
-			if($response['ret'] == 2) {
-
-			} else {
+			if(!$noFile) {
 				$sqlFile = "C:\\kt-backup-$date.sql"; // Use tmp instead due to permissions
 			}
 		} else {
-			if($response['ret'] == 2) {
-
-			} else {
+			if(!$noFile) {
 				$sqlFile = "/tmp/kt-backup-$date.sql"; // Use tmp instead due to permissions
 			}
 		}
 		$cmd = $exe.' -u"'.$dbAdminUser.'" -p"'.$dbAdminPass.'" --port="'.$port.'" '.$dbName.' > '.$sqlFile;
-		if($response['ret'] == 2) {
+		if($noFile) {
 			$this->error[]['error'] = "Could not connect to the KnowledgeTree Database";
 			$this->error[]['msg'] = "Make sure all KnowledgeTree Services are running.";
 			$this->error[]['cmd'] = "<p class=\"description\">Click <b>Next</b> after resolving the above errors.</p>";
@@ -207,6 +205,7 @@ class migrateDatabase extends Step
 	* @return void
 	*/
 	private function setDetails() {
+		$this->createMigrateFile(); // create lock file to indicate migration mode
     	$database = $this->getDataFromSession("database");
     	if(isset($database['dumpLocation'])) {
     		if(!empty($database['dumpLocation'])) {
@@ -219,7 +218,7 @@ class migrateDatabase extends Step
         $this->temp_variables['duname'] = $this->getPostSafe('duname');
         $this->temp_variables['dpassword'] = $this->getPostSafe('dpassword');
         $this->temp_variables['dumpLocation'] = $this->getPostSafe('dumpLocation');
-        $this->createMigrateFile(); // create lock file to indicate migration mode
+
         return true;
     }
@@ -231,7 +230,7 @@ class migrateDatabase extends Step
      * @return void
      */
     private function createMigrateFile() {
-        @touch(SYSTEM_DIR.'var'.DS.'bin'.DS."migrate.lock");
+        touch(SYSTEM_DIR.'var'.DS.'bin'.DS."migrate.lock");
     }
 	/**
@@ -272,7 +272,9 @@ class migrateServices extends Step
     		$this->temp_variables['services'][$serv->getName()]['class'] = $state;
     		$this->temp_variables['services'][$serv->getName()]['name'] = $serv->getName();
     	}
-    	$this->checkMysql();
+    	if(!$this->checkMysql()) {
+    		return false;
+    	}
     	if ($this->serviceCheck != 'tick') {
     		return false;
     	}
@@ -292,10 +294,12 @@ class migrateServices extends Step
     		$this->temp_variables['services']['KTMysql']['name'] = "KTMysql";
     		$this->temp_variables['services']['KTMysql']['msg'] = "Service Running";
     		$this->error[] = "Service : KTMysql running.<br/>";
+    		return false;
     	} else {
     		$this->temp_variables['services']['KTMysql']['class'] = "tick";
     		$this->temp_variables['services']['KTMysql']['name'] = "KTMysql";
     		$this->temp_variables['services']['KTMysql']['msg'] = "Service has been uninstalled";
+    		return true;
     	}
     }
@@ -33,7 +33,7 @@
 		</p>
 		<p class="empty_space">
 			<small>
-				Make sure that the services are running for that installation.
+				Make sure that the KnowledgeTree services are running.
 			</small>
 		</p>
 		<br/>
@@ -74,8 +74,10 @@
 		}
 		?>
 		</table>
-		<br/>
-		<p class=\"description\">Click <b>Next</b> after deactivating the above services.</p>
+		<?php if ($serviceCheck != 'tick') { ?>
+			<br/>
+			<p class=\"description\">Click <b>Next</b> if deactivating the above services.</p>
+		<?php } ?>
 		<?php if($silent) { ?>
 			</div>
 		<?php } ?>
@@ -268,7 +268,7 @@ class upgradeDatabase extends Step
         // It should idealy work the same as the upgrades.
         // Lock the scheduler
         $lockFile = $this->cachePath . DIRECTORY_SEPARATOR . 'scheduler.lock';
-        @touch($lockFile);
+        touch($lockFile);
         return true;
     }
@@ -287,7 +287,7 @@ class upgradeDatabase extends Step
             // things up a bit
             exec("del /q /s " . escapeshellarg($sPath));
         }
-        $hPath = @opendir($sPath);
+        $hPath = opendir($sPath);
         while (($sFilename = readdir($hPath)) !== false) {
             if (in_array($sFilename, array('.', '..'))) {
                 continue;
@@ -297,11 +297,11 @@ class upgradeDatabase extends Step
                 $this->deleteDirectory($sFullFilename);
                 continue;
             }
-            @chmod($sFullFilename, 0666);
-            @unlink($sFullFilename);
+            chmod($sFullFilename, 0666);
+            unlink($sFullFilename);
         }
         closedir($hPath);
-        @rmdir($sPath);
+        rmdir($sPath);
     }
     private function performPostUpgradeActions() {
@@ -320,7 +320,7 @@ class upgradeDatabase extends Step
         // Unlock the scheduler
         $lockFile = $this->cachePath . DIRECTORY_SEPARATOR . 'scheduler.lock';
         if(file_exists($lockFile)){
-            @unlink($lockFile);
+            unlink($lockFile);
         }
         return true;
@@ -92,19 +92,12 @@ class upgradeWelcome extends step {
     	$dconf = $this->getDataFromPackage('installers', 'database'); // Use info from install
     	if($dconf) { // From Install
 	    	$this->util->dbUtilities->load($dconf['dhost'], $dconf['dport'], $dconf['duname'], $dconf['dpassword'], $dconf['dname']);
-    	} elseif($upgradeOnly) {
-    		require_once("../wizard/steps/configuration.php"); // configuration to read the ini path
-    		$wizConfigHandler = new configuration();
-    		$configPath = $wizConfigHandler->readConfigPathIni();
-			$this->util->iniUtilities->load($configPath);
-			$dconf = $this->util->iniUtilities->getSection('db');
-    		$this->util->dbUtilities->load($dconf['dbHost'],$dconf['dbPort'], $dconf['dbUser'], $dconf['dbPass'], $dconf['dbName']);
 			$sQuery = "SELECT count(*) AS match_count FROM users WHERE username = '$username' AND password = '".md5($password)."'";
 			$res = $this->util->dbUtilities->query($sQuery);
 			$ass = $this->util->dbUtilities->fetchAssoc($res);
 			if($ass[0]['match_count'] == 1)
 				return true;
-    	} else { // Upgrade
+    	} elseif($upgradeOnly) {
     		require_once("../wizard/steps/configuration.php"); // configuration to read the ini path
     		$wizConfigHandler = new configuration();
     		$configPath = $wizConfigHandler->readConfigPathIni();
@@ -116,6 +109,20 @@ class upgradeWelcome extends step {
 			$ass = $this->util->dbUtilities->fetchAssoc($res);
 			if($ass[0]['match_count'] == 1)
 				return true;
+    	} else { // Upgrade
+    		require_once("../wizard/steps/configuration.php"); // configuration to read the ini path
+    		$wizConfigHandler = new configuration();
+    		$configPath = $wizConfigHandler->readConfigPathIni();
+    		if($configPath) {
+				$this->util->iniUtilities->load($configPath);
+				$dconf = $this->util->iniUtilities->getSection('db');
+	    		$this->util->dbUtilities->load($dconf['dbHost'],$dconf['dbPort'], $dconf['dbUser'], $dconf['dbPass'], $dconf['dbName']);
+				$sQuery = "SELECT count(*) AS match_count FROM users WHERE username = '$username' AND password = '".md5($password)."'";
+				$res = $this->util->dbUtilities->query($sQuery);
+				$ass = $this->util->dbUtilities->fetchAssoc($res);
+				if($ass[0]['match_count'] == 1)
+					return true;
+    		}
     	}
         $this->error[] = 'Could Not Authenticate User';
         return false;
@@ -10,57 +10,28 @@
 	</div>
 <br/><br/>
 	<?php if($migrateCheck) { ?>
-		<div>
-		    <h3><?php echo "<span class='{$servicesCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Services</h3>
-		<?php if($silent) { ?>
-			<div id="option2" class="onclick notop" onclick="javascript:{w.toggleClass('services_check', 'option2');}">Show Details</div>
-			<div class="services_check" style="display:none">
-		<?php } ?>
-		    <table style="width:755px;">
-		        <tr>
-		        	<td style="width:15px;"> <?php echo "<span class='{$LuceneStatus}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?> </td>
-		        	<td style="width:640px;"> Lucene Service <?php if ($LuceneStatus != 'tick') { ?> Could not be started <?php } else { ?> Started <?php } ?></td>
-		        	<?php if ($LuceneStatus != 'tick') { ?>
-		        		<td>
-						<?php if (AJAX) { ?>
-<!--							<a href="#" class="refresh" onclick="w.refresh('complete')">Refresh</a>-->
-						<?php } else { ?>
-<!--							<a href="javascript:this.location.reload();" class="refresh">Refresh</a>-->
-						<?php } ?>
-		        		</td>
-		        	<?php } ?>
-		        </tr> 
-		        <tr>
-		        	<td> <?php echo "<span class='{$SchedulerStatus}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?> </td>
-		        	<td> Scheduler Service <?php if ($SchedulerStatus != 'tick') { ?> Could not be started <?php } else { ?> Started <?php } ?></td>
-		        	<?php if ($SchedulerStatus != 'tick') { ?>
-		        		<td>
-						<?php if (AJAX) { ?>
-<!--							<a href="#" class="refresh" onclick="w.refresh('complete')">Refresh</a>-->
-						<?php } else { ?>
-<!--							<a href="javascript:this.location.reload();" class="refresh">Refresh</a>-->
-						<?php } ?>
-		        		</td>
-		        	<?php } ?>
-		        </tr>
-		        <tr>
-		        	<td> <?php echo "<span class='{$OpenOfficeStatus}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?> </td>
-		        	<td> OpenOffice Service <?php if ($OpenOfficeStatus != 'tick') { ?> Could not be started <?php } else { ?> Started <?php } ?></td>
-		        	<?php if ($OpenOfficeStatus != 'tick') { ?>
-		        		<td>
-						<?php if (AJAX) { ?>
-<!--							<a href="#" class="refresh" onclick="w.refresh('complete')">Refresh</a>-->
-						<?php } else { ?>
-<!--							<a href="javascript:this.location.reload();" class="refresh">Refresh</a>-->
-						<?php } ?>
-		        		</td>
-		        	<?php } ?>
-		        </tr>
-		    </table>
-		<?php if($silent) { ?>
-			</div>
-		<?php } ?>
-		</div>
+			<h3>Services</h3>
+			The KnowledgeTree services need to be started to allow for optimal functioning of the search, indexing and pdf generation.
+			<?php if(!WINDOWS_OS) { ?>
+			To start the services, execute the dmsctl.sh shell script in the KnowledgeTree directory from a terminal.
+			<br/>
+			<br/>
+			<?php } else { ?>
+			To start the services, execute the dmsctl.bat batch file in the KnowledgeTree directory from a command prompt, run as administrator.
+			<br/>
+			<br/>
+			<?php } ?>
+			<p class="disclaimer">
+			<?php if(WINDOWS_OS) { ?>
+				cd <?php echo "\"".SYSTEM_ROOT."\""; ?> <br/>
+				dmsctl.bat install<br/>
+				dmsctl.bat start
+			<?php } else { ?>
+				cd /usr/share/knowledgetree-ce<br/>
+				sudo ./dmsctl.sh start
+			<?php } ?>
+			</p>
+			<br/>
 		<?php } ?>
 	</div>
 	<a href="../../login.php" class="back button_next" style="width:50px;" onclick="javascript:{w.clearSessions();}">Finish</a>
@@ -52,7 +52,6 @@ function __autoload($class) { // Attempt and autoload classes
 	if ($class == "template") { // Load existing templating classes
 		require_once(WIZARD_DIR."../wizard/template.php");
 		require_once(WIZARD_DIR."../wizard/lib/helpers/htmlHelper.php");
-		return ;
 	}
 	if(file_exists(WIZARD_DIR."$class.php")) {
 		require_once(WIZARD_DIR."$class.php");
@@ -155,7 +154,7 @@ class UpgradeWizard {
 	* @return void
  	*/
 	private function createUpgradeFile() {
-		@touch(SYSTEM_DIR.'var'.DS.'bin'.DS."upgrade.lock");
+		touch(SYSTEM_DIR.'var'.DS.'bin'.DS."upgrade.lock");
 	}
 	/**
@@ -167,7 +166,7 @@ class UpgradeWizard {
 	* @return void
  	*/
 	private function removeUpgradeFile() {
-		@unlink(SYSTEM_DIR.'var'.DS.'bin'.DS."upgrade.lock");
+		unlink(SYSTEM_DIR.'var'.DS.'bin'.DS."upgrade.lock");
 	}
 	/**
@@ -413,7 +413,7 @@ class Upgrader {
 	* @return void
 	*/
     private function _completeUpgrade() {
-    	@touch("upgrade");
+    	touch("upgrade");
     }
 	/**
@@ -712,7 +712,7 @@ class InstallUtil {
      */
     function deleteMigrateFile() {
     	if(file_exists(SYSTEM_DIR.'var'.DS.'bin'.DS."migrate.lock"))
-    		@unlink(SYSTEM_DIR.'var'.DS.'bin'.DS."migrate.lock");
+    		unlink(SYSTEM_DIR.'var'.DS.'bin'.DS."migrate.lock");
     }
     /**
@@ -203,7 +203,7 @@ class InstallWizard {
 	* @return void
  	*/
 	private function createInstallFile() {
-		@touch(SYSTEM_DIR.'var'.DS.'bin'.DS."install.lock");
+		touch(SYSTEM_DIR.'var'.DS.'bin'.DS."install.lock");
 	}
 	/**
@@ -216,7 +216,7 @@ class InstallWizard {
  	*/
 	private function removeInstallFile() {
 		if(file_exists(SYSTEM_DIR.'var'.DS.'bin'.DS."install.lock"))
-			@unlink(SYSTEM_DIR.'var'.DS.'bin'.DS."install.lock");
+			unlink(SYSTEM_DIR.'var'.DS.'bin'.DS."install.lock");
 	}
 	/**
@@ -126,7 +126,7 @@
 		$type = file_get_contents($verType);
     }
     if($type) {
-		define('INSTALL_TYPE', $type);
+		define('INSTALL_TYPE', trim($type));
     } else {
 		define('INSTALL_TYPE', 'community');
 	}
@@ -768,13 +768,14 @@ class database extends Step
         $dbMigrate = $this->util->getDataFromPackage('migrate', 'database');
         $sqlFile = $dbMigrate['dumpLocation'];
     	$this->parse_mysql_dump($sqlFile);
-    	$dropPluginHelper = "TRUNCATE plugin_helper;";
+    	$dropPluginHelper = "TRUNCATE plugin_helper;"; // Remove plugin helper table
     	$this->util->dbUtilities->query($dropPluginHelper);
-    	$updateUrls = 'UPDATE config_settings c SET c.value = "default" where c.group_name = "urls";';
+    	$updateUrls = 'UPDATE config_settings c SET c.value = "default" where c.group_name = "urls";'; // Remove references to old paths
     	$this->util->dbUtilities->query($updateUrls);
-		$this->writeBinaries();
-		// ensure a guid was generated and is stored
-		$this->util->getSystemIdentifier();
+    	$updateExternalBinaries = 'UPDATE config_settings c SET c.value = "default" where c.group_name = "externalBinary";'; // Remove references to old paths
+    	$this->util->dbUtilities->query($updateExternalBinaries);
+		$this->writeBinaries(); // Rebuild some of the binaries
+		$this->util->getSystemIdentifier(); // ensure a guid was generated and is stored
     	return true;
     }
@@ -793,7 +794,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($bin[1])) continue;
-    	        
         		$updateBin = 'UPDATE config_settings c SET c.value = "'. str_replace('\\', '\\\\', $bin[1]) . '" '
         		           . 'where c.group_name = "' . $bin[0] . '" and c.display_name = "'.$displayName.'";';
                 $this->util->dbUtilities->query($updateBin);
@@ -16,28 +16,30 @@
 	<br/>
 	<div id="step_content_<?php echo $step_name; ?>" class="step">
 	<?php if(!$servicesValidation) { ?>
-		<h3>Services</h3>
-		The KnowledgeTree services need to be started to allow for optimal functioning of the search, indexing and pdf generation.
-		<?php if(!WINDOWS_OS) { ?>
-		To start the services, execute the dmsctl.sh shell script in the KnowledgeTree directory from a terminal.
-		<br/>
-		<br/>
-		<?php } else { ?>
-		To start the services, execute the dmsctl.bat batch file in the KnowledgeTree directory from a command prompt, run as administrator.
-		<br/>
-		<br/>
-		<?php } ?>
-		<p class="disclaimer">
-		<?php if(WINDOWS_OS) { ?>
-			cd <?php echo "\"".SYSTEM_ROOT."\""; ?> <br/>
-			dmsctl.bat install<br/>
-			dmsctl.bat start
-		<?php } else { ?>
-			cd /usr/share/knowledgetree-ce<br/>
-			sudo ./dmsctl.sh start
+		<?php if(!$migrate_check) { ?>
+			<h3>Services</h3>
+			The KnowledgeTree services need to be started to allow for optimal functioning of the search, indexing and pdf generation.
+			<?php if(!WINDOWS_OS) { ?>
+			To start the services, execute the dmsctl.sh shell script in the KnowledgeTree directory from a terminal.
+			<br/>
+			<br/>
+			<?php } else { ?>
+			To start the services, execute the dmsctl.bat batch file in the KnowledgeTree directory from a command prompt, run as administrator.
+			<br/>
+			<br/>
+			<?php } ?>
+			<p class="disclaimer">
+			<?php if(WINDOWS_OS) { ?>
+				cd <?php echo "\"".SYSTEM_ROOT."\""; ?> <br/>
+				dmsctl.bat install<br/>
+				dmsctl.bat start
+			<?php } else { ?>
+				cd /usr/share/knowledgetree-ce<br/>
+				sudo ./dmsctl.sh start
+			<?php } ?>
+			</p>
+			<br/>
 		<?php } ?>
-		</p>
-		<br/>
 	<?php } ?>
 	<!--	Paths and Permissions	-->
 	<?php