Code cleanup.

Committed by: Jarrett Jordaan Reviewed by: Megan Watson

Code cleanup.
Committed by: Jarrett Jordaan Reviewed by: Megan Watson
Jarrett Jordaan
1 parent 182ef4ad
Showing 13 changed files with 60 additions and 83 deletions
setup/migrate/steps/migrateComplete.php
setup/migrate/steps/migrateDatabase.php
setup/migrate/steps/migrateServices.php
setup/migrate/templates/database.tpl
setup/migrate/templates/wizard.tpl
setup/upgrade/steps/upgradeComplete.php
setup/upgrade/templates/complete.tpl
setup/upgrade/templates/wizard.tpl
setup/wizard/resources/css/wizard.css
setup/wizard/steps/complete.php
setup/wizard/steps/database.php
setup/wizard/steps/services.php
setup/wizard/templates/wizard.tpl
@@ -164,7 +164,6 @@ class migrateComplete extends Step {
 			if($state == "STARTED" || $state == "RUNNING")
 				$running = true;
     	} else {
-    		//TODO : Read fomr my.cnf file
     		$mysqlPid = "/var/run/mysqld/mysqld.sock";
     		if(file_exists($mysqlPid))
     			$running = true;
@@ -155,31 +155,20 @@ class migrateDatabase extends Step
 				unlink($sqlFile);
 			}
 		}
-		$noFile = true;
 		// Handle failed dump
 		if(WINDOWS_OS) {
 			// Could be permissions, check error code.
-			if(!$noFile) {
-				$sqlFile = "C:\\kt-backup-$date.sql"; // Use tmp instead due to permissions
-			}
+			$sqlFile = "C:\\kt-backup-$date.sql"; // Use tmp instead due to permissions
 		} else {
-			if(!$noFile) {
-				$sqlFile = "/tmp/kt-backup-$date.sql"; // Use tmp instead due to permissions
-			}
+			$sqlFile = "/tmp/kt-backup-$date.sql"; // Use tmp instead due to permissions
 		}
 		$cmd = $exe.' -u"'.$dbAdminUser.'" -p"'.$dbAdminPass.'" --port="'.$port.'" '.$dbName.' > '.$sqlFile;
-		if($noFile) {
-			$this->error[]['error'] = "The KnowledgeTree Setup Wizard was unable to connect to your KnowledgeTree 3.6.1 database.";
-			$this->error[]['msg'] = "Ensure that your KnowledgeTree Mysql service is running.";
-			$this->error[]['cmd'] = "Click <b>Next</b> after resolving the above errors.";
-			$this->temp_variables['manual_export'] = "";
-		} else {
-	    	$this->error[]['error'] = "Could not export database:";
-	    	$this->error[]['msg'] = "Execute the following command in a $termOrBash.";
-	    	$this->error[]['cmd'] = $cmd;
-	    	$this->temp_variables['manual_export'] = $sqlFile;
-		}
-
+		$this->error[]['error'] = "The KnowledgeTree Setup Wizard was unable to connect to your KnowledgeTree 3.6.1 database.";
+		$this->error[]['msg'] = "Ensure that your KnowledgeTree Mysql service is running.";
+		$this->error[]['cmd'] = "Click <b>Next</b> after resolving the above errors.";
+		$this->temp_variables['dumpLocation'] = $sqlFile;
+		$this->temp_variables['manual_export'] = $sqlFile;
+		$this->error[]['manual'] = $cmd;
 		return false;
     }
@@ -274,7 +263,7 @@ class migrateDatabase extends Step
         return $this->error;
     }
-    private function storeSilent() {
+    public function storeSilent() {
     	// TODO
     	$_SESSION['migrate']['database']['dumpLocation'] = $this->sqlDumpFile;
     	$this->temp_variables['dumpLocation'] = $this->sqlDumpFile;
@@ -398,7 +398,7 @@ class migrateServices extends Step
 	* @access private
 	* @return void
     */
-    private function storeSilent() {
+    public function storeSilent() {
     	$this->temp_variables['alreadyUninstalled'] = $this->alreadyUninstalled;
     	$this->temp_variables['serviceCheck'] = $this->serviceCheck;
     	$this->temp_variables['msg'] = "Turn off KnowledgeTree Mysql Instance.";
@@ -118,6 +118,16 @@
 	<?php } ?>
 </p>
 <br/>
+<p class="description">
+	Manually perform a KnowledgeTree 3.6.1 database export
+</p>
+<p class="disclaimer">
+<?php
+if(isset($error['manual'])) {
+					echo $error['manual'];
+				}
+?>
+</p>
 <?php
 	}
 	?>
@@ -21,7 +21,7 @@
 		<div id="outer-wrapper" align="left">
 		    <div id="header">
 			    <div id="logo"><?php echo $html->image('dame/installer-header_logo.png'); ?> </div>
-			    <div id="install_details">
+			    <div id="version_details">
 					<span style="font-size:120%;"> <?php if (isset($vars['migrate_version'])) echo $vars['migrate_version']; ?> </span>
 					<span style="font-size:120%;"> <?php if (isset($vars['migrate_version'])) echo $vars['migrate_type']; ?></span>
 				</div>
@@ -88,7 +88,7 @@ class upgradeComplete extends Step {
      * Set all silent mode varibles
      *
      */
-    protected function storeSilent() {
+    public function storeSilent() {
     	$v = $this->getDataFromSession('upgradeProperties');
     	$this->temp_variables['sysVersion'] = $this->util->readVersion();
     	$this->temp_variables['migrateCheck'] = $this->migrateCheck;
@@ -31,11 +31,15 @@
 			<br/>
 			[START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [services]
 			<br/>
-			Right-Click and run [Install Services] as administrator
+			Right-Click and run [Install Services] as administrator, if applicable, or
+			<br/>
+			Click [Install Services]
 			<br/>
 			[START MENU] => [Programs] => [KnowledgeTree 3.7.x] => [services]
 			<br/>
-			Right-Click and run [Start Services] as administrator
+			Right-Click and run [Start Services] as administrator, if applicable, or
+			<br/>
+			Click [Start Services]
 			<br/>
 			<br/>
 			<b>Alternatively:</b>
@@ -21,7 +21,7 @@
 		<div id="outer-wrapper" align="left">
 		    <div id="header">
 		    <div id="logo"><?php echo $html->image('dame/installer-header_logo.png'); ?></div>
-		    <div id="upgrade_details">
+		    <div id="version_details">
 				<span style="font-size:120%;"> <?php echo $vars['upgrade_version']; ?> </span>
 				<span style="font-size:120%;"> <?php echo $vars['upgrade_type']; ?> </span>
 				</div>
 * { margin: 0; padding: 0; }
-
 body {
 	background-attachment:scroll;
 	background-color:transparent;
@@ -70,7 +69,7 @@ select {
 #outer-wrapper {
 	border:1px solid #B7B7B7;
 	margin-top:20px;
-	/*width:1024px;*/width:964px;
+	width:964px;
 }
 #header {
@@ -87,12 +86,12 @@ select {
 #container {
 	background: white url("../graphics/left.png") repeat-y left;
 	overflow:auto;
-	/*min-height:630px;height:410px;*/min-height:500px;
+	min-height:500px;
 }
 #content {
     margin-left: 220px;
-    /*height:515px;*/height:500px;
+    height:500px;
 }
 #content_container {
@@ -105,19 +104,19 @@ select {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
 	overflow: auto;
-	/*min-height: 400px;*/min-height: 300px;
+	min-height: 300px;
 }
 #step_content_dependencies {
 	border: 1px solid rgb(207, 207, 207);
-	/*padding: 5px;*/padding: 12px;
-	/*min-height:270px;*/min-height:170px;
+	padding: 12px;
+	/min-height:170px;
 }
 #step_content_configuration {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
-	/*min-height:320px;*//*height:330px*/min-height:130px;
+	min-height:130px;
 }
 #step_content_services {
@@ -129,25 +128,25 @@ select {
 #step_content_registration {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
-	/*min-height:320px;*/min-height:100px;
+	min-height:100px;
 }
 #step_content_registration_confirm {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
-	/*min-height:400px;*/min-height:300px;
+	min-height:300px;
 }
 #step_content_install {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
-	/*min-height:400px;*/min-height:150px;
+	min-height:150px;
 }
 #step_content_database {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
-	/*min-height:365px;*/min-height:240px;
+	min-height:240px;
 }
 #step_content_database_confirm {
@@ -164,7 +163,7 @@ select {
 .license_agreement {
 	overflow: scroll;
-	/*height:370px;*/height:270px;
+	height:270px;
 	overflow-x:hidden;
 	border:1px solid #CFCFCF;
 }
@@ -204,11 +203,11 @@ select {
 #logo {
 	position:relative;
-	/*right:760px;*/right:75%;
-	/*top:20px;*/top:25%;
+	right:75%;
+	top:25%;
 }
-#install_details {
+#version_details {
 	bottom:20px;
 	position:relative;
 	right:10px;
@@ -282,7 +281,7 @@ select {
 }
 .conf_paths {
-	/*width:755px;*/width:100%;
+	width:100%;
 }
 .errors {
@@ -320,7 +319,6 @@ select {
 	font-size:13px;
 	font-weight:bold;
 	margin-left:5px;
-	/*margin-top:10px;*/
 }
 .step .radio {
@@ -368,7 +366,9 @@ select {
 .onclick {
      cursor: pointer;
      color: #EC7725;
-     /*width: 150px;*//*width:350px;top:12px;position:relative;*/width:350px;padding-top:12px;position:static;
+     width:350px;
+     padding-top:12px;
+     position:static;
 }
 .description {
@@ -415,18 +415,10 @@ table#dbconf tr td input{
 	padding: 5px 8px;
 }
-/*#section {
-
-}*/
-
 .php_ext_details table {
-	width:745px;
+	width:645px;
 }
-/*.php_ext_details table tr {
-
-}*/
-
 td.ext_indicator {
 	width:10px;
 }
@@ -456,7 +448,7 @@ td.dir_description {
 }
 .php_con_details table {
-	/*width:745px;*/width:675px;
+	width:675px;
 }
 .error_message {
@@ -515,12 +507,6 @@ td.dir_description {
 	font-size:12pt;
 }
-.demo {
-	/*left:75px;
-	position:relative;
-	width:600px*/
-}
-
 .text_message {
 }
@@ -540,7 +526,7 @@ td.dir_description {
 #loading {
 	bottom:250px;
-	/*left:500px;*/left:400px;
+	left:400px;
 	position:relative;
 	height:0px;
 	width:0px;
@@ -563,15 +549,15 @@ td.dir_description {
 }
 .dependency_details {
-	/*top:12px;*/padding-top:12px;
-	/*position:relative;*/position:static;
+	padding-top:12px;
+	position:static;
 	width:650px;
 }
 .dependencies {
-	/*position:relative;*/position:static;
+	position:static;
 	right:30%;
-	/*width:880px;*/width:650px;
+	width:650px;
 }
 .registration_template {
@@ -583,7 +569,7 @@ td.dir_description {
 }
 .description_complete {
-	/*position:relative;*/position:static;
+	position:static;
 	right:35%;
 	width:100%;
 }
@@ -603,14 +589,6 @@ td.dir_description {
 	font-family:sans-serif;
 }
-.twitter {
-
-}
-
-.facebook {
-
-}
-
 .connect {
 	float:none;
 	padding-bottom:0;
@@ -169,7 +169,6 @@ class complete extends Step {
         $this->util->dbUtilities->load($dbconf['dhost'], $dbconf['dport'], $dbconf['dmsusername'], $dbconf['dmsuserpassword'], $dbconf['dname']);
         $loaded = $this->util->dbUtilities->getDatabaseLink();
         // if we can log in to the database, check access
-        // TODO check write access?
         if ($loaded)
         {
             $this->temp_variables['dbConnectUser'] .= sprintf($html, 'tick', '', 'Database connectivity successful (user: ' . $dbconf['dmsusername'] . ')');
@@ -257,7 +256,7 @@ class complete extends Step {
      * Set all silent mode varibles
      *
      */
-    private function storeSilent() {
+    public function storeSilent() {
     	$this->temp_variables['services_check'] = $this->services_check;
     	$this->temp_variables['paths_check'] = $this->paths_check;
     	$this->temp_variables['privileges_check'] = $this->privileges_check;
@@ -886,7 +886,7 @@ class database extends Step
     private function closeMysql() {
         try {
             $this->util->dbUtilities->close();
-        } catch (Exeption $e) {
+        } catch (Exception $e) {
             $this->error['con'] = "Could not close: " . $e;
         }
     }
@@ -245,8 +245,7 @@ class services extends Step
 			$this->serviceCheck = 'tick';
 		}
 		$this->storeSilent(); // Store info needed for silent mode
-		if(!empty($errors))
-			return false;
+		
 		return true;
     }
@@ -20,7 +20,7 @@
 		<div id="outer-wrapper" align="left">
 		    <div id="header">
 			    <div id="logo"><?php echo $html->image('dame/installer-header_logo.png'); ?> </div>
-			    <div id="install_details">
+			    <div id="version_details">
 					<span style="font-size:120%;"> <?php echo $vars['install_version']; ?> </span>
 					<span style="font-size:120%;"><?php echo $vars['install_type']; ?></span>
 				</div>
@@ -45,7 +45,6 @@
 		        </div>
 		        <div class="clearing">&nbsp;</div>
 		    </div>
-
 		    <div id="footer">
 		    	<?php echo $html->image('dame/powered-by-kt.png', array("height"=>"23px", "width"=>"105px", "style"=>"padding: 5px;")); ?>
 		    </div>