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

Paul Barrett
2 parents 7d6b4102 6d2d3d5c
Showing 19 changed files with 88 additions and 91 deletions
setup/migrate/steps/migrateComplete.php
setup/migrate/steps/migrateDatabase.php
setup/migrate/steps/migrateInstallation.php
setup/migrate/steps/migrateServices.php
setup/migrate/templates/complete.tpl
setup/migrate/templates/services.tpl
setup/migrate/templates/wizard.tpl
setup/upgrade/templates/complete.tpl
setup/upgrade/templates/database.tpl
setup/upgrade/templates/loading.tpl
setup/upgrade/templates/wizard.tpl
setup/wizard/lib/services/windowsLucene.php
setup/wizard/lib/services/windowsOpenOffice.php
setup/wizard/lib/services/windowsScheduler.php
setup/wizard/resources/css/wizard.css
setup/wizard/steps/database.php
setup/wizard/templates/complete.tpl
setup/wizard/templates/database.tpl
setup/wizard/templates/wizard.tpl
@@ -169,6 +169,9 @@ class migrateComplete extends Step {
     		$mysqlPid = "/var/run/mysqld/mysqld.sock";
     		if(file_exists($mysqlPid))
     			$running = true;
+    		$mysqlPid = "/var/run/mysqld/mysqld.pid";
+    		if(file_exists($mysqlPid))
+    			$running = true;
     	}
     	if($running) {
     		$this->temp_variables['zmysql']['class'] = "tick";
@@ -152,6 +152,8 @@ class migrateDatabase extends Step
 			if(!empty($fileContents)) {
 				$this->sqlDumpFile = realpath($sqlFile); // Store location of dump
 				return true;
+			} else {
+				unlink($sqlFile);
 			}
 		}
 		$noFile = true;
@@ -128,7 +128,7 @@ class migrateInstallation extends step
     public function detectInstallation() {
     	if(WINDOWS_OS) {
-    		$knownWindowsLocations = array("C:\Program Files\ktdms"=>"C:\Program Files\ktdms\knowledgeTree\config\config-path","C:\Program Files x86\ktdms"=>"C:\Program Files x86\ktdms\knowledgeTree\config\config-path","C:\ktdms"=>"C:\ktdms\knowledgeTree\config\config-path");
+    		$knownWindowsLocations = array("C:\Program Files\ktdms"=>"C:\Program Files\ktdms\knowledgeTree\config\config-path","C:\Program Files (x86)\ktdms"=>"C:\Program Files (x86)\ktdms\knowledgeTree\config\config-path","C:\ktdms"=>"C:\ktdms\knowledgeTree\config\config-path");
     		foreach ($knownWindowsLocations as $loc=>$configPath) {
     			if(file_exists($configPath))
     				$this->location = $loc;
@@ -244,14 +244,8 @@ class migrateInstallation extends step
 		$this->ktSettings = array('fileSystemRoot'=> $froot);
     	$varDir = $froot.DS.'var';
 		$this->urlPaths = array(
-//									array('name'=> 'Var Directory', 'path'=> $varDir),
-//									array('name'=> 'Log Directory', 'path'=> $varDir.DS.'log'),
 									array('name'=> 'Document Root', 'path'=> $froot.DS.'Documents'),
-//									array('name'=> 'Temporary Directory', 'path'=> $varDir.DS.'tmp'),
-//									array('name'=> 'Cache Directory', 'path'=> $varDir.DS.'cache'),
-//									array('name'=> 'Upload Directory', 'path'=> $varDir.DS.'uploads'),
     	);
-//		$this->urlPaths = array();
     	$this->dbSettings['dbPort'] = $this->util->getPort($this->location); // Add Port
     	$this->temp_variables['urlPaths'] = $this->urlPaths;
     	$this->temp_variables['ktSettings'] = $this->ktSettings;
@@ -285,11 +285,16 @@ class migrateServices extends Step
     		$serv = $this->util->loadInstallService($className);
     		$serv->load();
     		$sStatus = $serv->status();
-    		if($sStatus == 'STARTED' || $sStatus == 'RUNNING' || $sStatus == 'STOPPED') {
+    		if($sStatus == 'STARTED' || $sStatus == 'RUNNING') {
     			$state = 'cross';
     			$this->error[] = "Service : {$serv->getName()} could not be uninstalled.<br/>";
     			$this->serviceCheck = 'cross';
     			$this->temp_variables['services'][$serv->getName()]['msg'] = "Service Running";
+    		} elseif ($sStatus == 'STOPPED') { 
+    			$state = 'cross';
+    			$this->error[] = "Service : {$serv->getName()} could not be uninstalled.<br/>";
+    			$this->serviceCheck = 'cross';
+    			$this->temp_variables['services'][$serv->getName()]['msg'] = "Service Stopped, please uninstall service";
     		} else {
     			$state = 'tick';
     			$this->temp_variables['services'][$serv->getName()]['msg'] = "Service has been uninstalled";
@@ -2,13 +2,6 @@
 	<p class="title">Migration Completed</p>
 	<p class="description">Your database migration was successfully completed. Please check the section below for details of the migration and final instructions</p>
-	<?php
-	if($errors || $warnings){
-	    echo '<div>'
-	       . '<a href="http://wiki.knowledgetree.com/Web_Based_Migrater#Complete" target="_blank">'
-	       . 'Click Here for help on overcoming post migrate issues</a></div><br/>';
-	}
-	?>
 	<div id="step_content_<?php echo $step_name; ?>" class="step">
 <!--	SQL	-->
@@ -75,7 +75,7 @@
 		</table>
 		<?php if ($serviceCheck != 'tick') { ?>
 			<br/>
-			<p class=\"description\">Click <b>Next</b> if deactivating the above services.</p>
+			<p class=\"description\">Click <b>Next</b> if the above services are deactivated .</p>
 		<?php } ?>
 		<?php if($silent) { ?>
 			</div>
@@ -13,6 +13,7 @@
 		<?php if(AGENT == "IE6") echo $html->css('ie6.css'); ?>
         <?php if(AGENT == "IE7") echo $html->css('ie7.css'); ?>
         <?php if(AGENT == "IE8") echo $html->css('ie8.css'); ?>
+        <?php if(INSTALL_TYPE == "community") echo $html->css('community.css'); ?>
         <meta http-equiv=Content-Type content="text/html; charset=utf-8">
 	</head>
 	<body onload="">
@@ -5,6 +5,12 @@
 	<div>
 	    Your database has been upgraded to <?php echo $sysVersion; ?>
 	</div>
+	<br/>
+	<div>
+		<a href="http://wiki.knowledgetree.com/Web_Based_Installer#Post_Install" target="_blank">
+			Click Here for help on overcoming post install issues
+		</a>
+	</div>
 	<?php if($migrateCheck) { ?>
 		<br/>
 		<h3>Services</h3>
@@ -20,17 +26,22 @@
 		<?php } ?>
 		<p class="disclaimer">
 		<?php if(WINDOWS_OS) { ?>
-			[START MENU] => [Programs] => [KnowledgeTree] => [Services]
+			<b>Using shortcuts:</b>
+			<br/>
+			[START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [services]
+			<br/>
+			Click [Install Services]
 			<br/>
-			Click [Install Services] 
+			[START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [services]
 			<br/>
-			Click [Start Services] 
+			Click [Start Services]
 			<br/>
 			<br/>
-			Alternatively:
+			<b>Alternatively:</b>
 			<br/>
 			Open a command prompt and enter the following:
 			<br/>
+			<br/>
 			cd <?php echo "\"".SYSTEM_DIR."\""; ?> <br/>
 			dmsctl.bat install<br/>
 			dmsctl.bat start
@@ -47,11 +58,6 @@
 	<?php } else { ?>
 	<br>
 	<?php } ?>
-	<div>
-		<a href="http://wiki.knowledgetree.com/Web_Based_Installer#Post_Install" target="_blank">
-			Click Here for help on overcoming post install issues
-		</a>
-	</div>
 	</div>
 <!--	<a href="../../login.php" class="back button_next" style="width:50px;" onclick="javascript:{w.clearSessions();}">Finish</a>-->
 		<input type="submit" name="Next" value="Finish" class="button_next"/>
@@ -21,7 +21,7 @@
             <?php }
             else if ($action == 'confirm') {
                 if ($backupStatus) { ?>
-                    <p>We are about to start the upgrade process.<P>
+                    <p>We are about to start the upgrade process. Are you sure you want to proceed with the upgrade process?<P>
                 <?php }
                 else { ?>
                     <p><font color="Red">Please ensure that you have made a backup before continuing with the upgrade process.</font><p>
 <div id="loadingBar" style="display:none; text-align: center; padding: 4px;">
-	<img src="/setup/wizard/resources/graphics/loading.gif">
+		<img src="../wizard/resources/graphics/loading.gif">
 	<br/>
 	<?php echo $loadingText; ?>
 </div>
@@ -13,6 +13,7 @@
 		<?php if(AGENT == "IE6") echo $html->css('ie6.css'); ?>
         <?php if(AGENT == "IE7") echo $html->css('ie7.css'); ?>
         <?php if(AGENT == "IE8") echo $html->css('ie8.css'); ?>
+        <?php if(INSTALL_TYPE == "community") echo $html->css('community.css'); ?>
         <meta http-equiv=Content-Type content="text/html; charset=utf-8">
 	</head>
 	<body onload="">
@@ -133,6 +133,8 @@ class windowsLucene extends windowsService {
 	public $name = "KTLucene";
 	public $hrname = "KnowledgeTree Indexer Service. (KTLucene)";
+
+	public $description = "KnowledgeTree Indexer Service.";
 	/**
 	* Load defaults needed by service
@@ -419,23 +421,15 @@ class windowsLucene extends windowsService {
  	*/
 	public function install() {
 		$state = $this->status();
-//		if($state == '') {
 			$luceneExe = $this->getLuceneExe();
 			$luceneSource = $this->getLuceneSource();
 			$luceneDir = $this->getluceneDir();
-//			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) {
-            		echo "$cmd<br/>";
-            		return false;
-            	}
-            	$this->writeLuceneInstall($cmd);
-				//$response = $this->util->pexec($cmd);
-//				return $response;
-//			}
-			return $state;
-//		}
-
+			$cmd = "\"{$luceneExe}\""." -install \"".$this->getName()."\" -description "."\"".$this->description."\""." \"".$this->getJavaJVM(). "\" -Djava.class.path=\"".$luceneSource."\"". " -start ".$this->getLuceneServer(). " -out \"".$this->getLuceneOut()."\" -err \"".$this->getLuceneError()."\" -current \"".$luceneDir."\" -auto";
+        	if(DEBUG) {
+        		echo "$cmd<br/>";
+        		return false;
+        	}
+        	$this->writeLuceneInstall($cmd);
 		return $state;
 	}
@@ -134,6 +134,8 @@ class windowsOpenOffice extends windowsService {
     public $hrname = "KnowledgeTree OpenOffice.org Service. (KTOpenOffice)";
+    public $description = "KnowledgeTree OpenOffice.org Service.";
+    
 	/**
 	* Load defaults needed by service
 	*
@@ -212,7 +214,7 @@ class windowsOpenOffice extends windowsService {
     	if($status == '') {
     		$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;\"";;
+            	$cmd = "\"{$this->winservice}\" install \"{$this->name}\" -description \"{$this->description}\" -displayname \"{$this->name}\" -start auto \"".$binary."\" -headless -invisible -nofirststartwizard -\"accept=socket,host={$this->host},port={$this->port};urp;\"";;
 	        	if(DEBUG) {
 	        		echo "$cmd<br/>";
 	        		return false;
@@ -79,6 +79,8 @@ class windowsScheduler extends windowsService {
 	public $hrname = "KnowledgeTree Scheduler Service. (KTScheduler)";
+	public $description = "KnowledgeTree Scheduler Service.";
+	
 	/**
 	* Load defaults needed by service
 	*
@@ -180,7 +182,7 @@ class windowsScheduler extends windowsService {
 	}
 	private function setOptions() {
-		$this->options = "-displayname {$this->name} -start auto -binary \"{$this->getSchedulerScriptPath()}\" -headless -invisible ";
+		$this->options = "-displayname \"{$this->name}\" -description \"{$this->description}\" -start auto -binary \"{$this->getSchedulerScriptPath()}\" -headless -invisible ";
 	}
 	private function writeTaskRunner() {
@@ -233,36 +235,9 @@ class windowsScheduler extends windowsService {
 		$state = $this->status();
 		if($state == '') {
 			$this->writeTaskRunner();
-            //if (function_exists('win32_create_service')) { // TODO what if it does not exist? check how the dmsctl.bat does this
-//            	if(DEBUG) {
-//            		echo '<pre>';
-//            		print_r(array('service' => $this->name, 'display' => $this->name, 'path' => $this->getSchedulerScriptPath()));
-//    	            echo '</pre>';
-//    	            echo '<pre>';
-//    	            print_r(file_get_contents($this->getSchedulerScriptPath()));
-//    	            echo '</pre>';
-//            		return ;
-//            	}
-            	/*
-    			$response = win32_create_service(array(
-    	            'service' => $this->name,
-    	            'display' => $this->name,
-    	            'path' => $this->getSchedulerScriptPath()
-    	            ));
-    			return $response;
-    			*/
-            //} else { // Attempt to use the winserv
-            	// TODO: Add service using winserv
-            	$this->setWinservice();
-            	$this->setOptions();
-            	$cmd = "\"{$this->winservice}\" install $this->name $this->options";
-            	if(DEBUG) {
-            		echo "$cmd<br/>";
-            		return false;
-            	}
-            	//$response = $this->util->pexec($cmd);
-            	//return $response;
-            //}
+        	$this->setWinservice();
+        	$this->setOptions();
+        	$cmd = "\"{$this->winservice}\" install $this->name $this->options";
             $this->writeSchedulerInstall($cmd);
 		}
 		return $state;
@@ -285,7 +260,7 @@ class windowsScheduler extends windowsService {
 	}
 	public function getStopMsg($installDir) {
-		return "";//"Execute from command prompt : $installDir/dmsctl.bat stop";
+		return "";
 	}
 }
 ?>
 \ No newline at end of file
@@ -609,4 +609,13 @@ td.dir_description {
 .facebook {
+}
+
+.connect {
+	float:none;
+	padding-bottom:0;
+	padding-left:560px;
+	padding-right:10px;
+	padding-top:10px;
+	position:static;
 }
 \ No newline at end of file
@@ -638,6 +638,9 @@ class database extends Step
 			$this->error['con'] = "Could not populate schema ";
 		}
 		$this->writeBinaries();
+    	$port = $conf['server']['port'];
+		$iserverPorts = 'UPDATE config_settings SET value = "'.$port.'" where group_name = "server" and item IN("internal_server_port", "server_port");'; // Update internal server port
+    	$this->util->dbUtilities->query($iserverPorts);
 		// ensure a guid was generated and is stored
 		$this->util->getSystemIdentifier();
 		$this->reBuildPaths();
@@ -767,10 +770,13 @@ class database extends Step
     	$this->parse_mysql_dump($sqlFile);
     	$dropPluginHelper = "TRUNCATE plugin_helper;"; // Remove plugin helper table
     	$this->util->dbUtilities->query($dropPluginHelper);
-    	$this->reBuildPaths();
-
+    	$conf = $this->util->getDataFromSession('configuration');
+    	$port = $conf['server']['port'];
+		$iserverPorts = 'UPDATE config_settings SET value = "'.$port.'" where group_name = "server" and item IN("internal_server_port", "server_port");'; // Update internal server port
+    	$this->util->dbUtilities->query($iserverPorts);
     	$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->reBuildPaths();
 		$this->writeBinaries(); // Rebuild some of the binaries
 		$this->util->getSystemIdentifier(); // ensure a guid was generated and is stored
@@ -13,16 +13,7 @@
 	</div>
 	<br/>
 	<div id="step_content_<?php echo $step_name; ?>" class="step">
-	<div style="padding: 0pt 0pt 40px 15px; float: right;">
-	<a class="twitter" href="http://www.twitter.com/knowledgetreesw" style="color:#FFFFFF;" target="_blank">
-		<?php echo $html->image('twitterbutton.png'); ?>
-	</a>
-	<br/>
-	<br/>
-	<a class="facebook" href="http://www.facebook.com/pages/KnowledgeTree-Document-Management-Made-Simple/59248880725" style="color:#FFFFFF;" target="_blank">
-		<?php echo $html->image('facebookbutton.png'); ?>
-	</a>
-	</div>
+
 	<?php if(!$servicesValidation) { ?>
 		<?php if(!$migrate_check) { ?>
 			<h3>Services</h3>
@@ -38,14 +29,18 @@
 			<?php } ?>
 			<p class="disclaimer">
 				<?php if(WINDOWS_OS) { ?>
-					[START MENU] => [Programs] => [KnowledgeTree] => [Services]
+					<b>Using shortcuts:</b>
+					<br/>
+					[START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [services]
+					<br/>
+					Click [Install Services]
 					<br/>
-					Click [Install Services] 
+					[START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [services]
 					<br/>
-					Click [Start Services] 
+					Click [Start Services]
 					<br/>
 					<br/>
-					Alternatively:
+					<b>Alternatively:</b>
 					<br/>
 					Open a command prompt and enter the following:
 					<br/>
@@ -187,6 +182,16 @@
 		</div>
 		<?php } ?>
 		<?php } ?>
+	<div class="connect">
+		<a class="twitter" href="http://www.twitter.com/knowledgetreesw" style="color:#FFFFFF;" target="_blank">
+			<?php echo $html->image('twitterbutton.png'); ?>
+		</a>
+		<br/>
+		<br/>
+		<a class="facebook" href="http://www.facebook.com/pages/KnowledgeTree-Document-Management-Made-Simple/59248880725" style="color:#FFFFFF;" target="_blank">
+			<?php echo $html->image('facebookbutton.png'); ?>
+		</a>
+	</div>
 	</div>
 	<?php
         $script = $_SERVER['SCRIPT_NAME'];
@@ -63,7 +63,7 @@
 	    <table>
 	    	<tr>
 	    		<td width="10px"> <label for='dhost'>Host: </label> </td>
-	    		<td width="205px"> <div id="tooltips" title="The address of the server where the database is located, if different to the current server">&nbsp;</div> </td>
+	    		<td width="10px"> <div id="tooltips" title="The address of the server where the database is located, if different to the current server">&nbsp;</div> </td>
 	    		<td width="10px"> <input type="text" value="<?php echo $dhost?>" id="dhost" name="dhost" size='<?php echo $input_size; ?>' class="textinput"/> </td>
 	    	</tr>
 	    	<tr>
@@ -12,6 +12,7 @@
 		<?php if(AGENT == "IE6") echo $html->css('ie6.css'); ?>
         <?php if(AGENT == "IE7") echo $html->css('ie7.css'); ?>
         <?php if(AGENT == "IE8") echo $html->css('ie8.css'); ?>
+        <?php if(INSTALL_TYPE == "community") echo $html->css('community.css'); ?>
         <meta http-equiv=Content-Type content="text/html; charset=utf-8">
 	</head>
 	<body onload="">