From fc001bbfe0d1498b69228e76ffd67cc53d92df08 Mon Sep 17 00:00:00 2001 From: Jarrett Jordaan Date: Tue, 15 Dec 2009 13:58:34 +0200 Subject: [PATCH] Code cleanup. --- setup/migrate/steps/migrateComplete.php | 1 - setup/migrate/steps/migrateDatabase.php | 29 +++++++++-------------------- setup/migrate/steps/migrateServices.php | 2 +- setup/migrate/templates/database.tpl | 10 ++++++++++ setup/migrate/templates/wizard.tpl | 2 +- setup/upgrade/steps/upgradeComplete.php | 2 +- setup/upgrade/templates/complete.tpl | 8 ++++++-- setup/upgrade/templates/wizard.tpl | 2 +- setup/wizard/resources/css/wizard.css | 76 +++++++++++++++++++++++++++------------------------------------------------- setup/wizard/steps/complete.php | 3 +-- setup/wizard/steps/database.php | 2 +- setup/wizard/steps/services.php | 3 +-- setup/wizard/templates/wizard.tpl | 3 +-- 13 files changed, 60 insertions(+), 83 deletions(-) diff --git a/setup/migrate/steps/migrateComplete.php b/setup/migrate/steps/migrateComplete.php index cf99ec9..a3eaf6b 100644 --- a/setup/migrate/steps/migrateComplete.php +++ b/setup/migrate/steps/migrateComplete.php @@ -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; diff --git a/setup/migrate/steps/migrateDatabase.php b/setup/migrate/steps/migrateDatabase.php index b4a6bc0..419e195 100644 --- a/setup/migrate/steps/migrateDatabase.php +++ b/setup/migrate/steps/migrateDatabase.php @@ -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 Next 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 Next 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; diff --git a/setup/migrate/steps/migrateServices.php b/setup/migrate/steps/migrateServices.php index 9b3b507..852993f 100644 --- a/setup/migrate/steps/migrateServices.php +++ b/setup/migrate/steps/migrateServices.php @@ -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."; diff --git a/setup/migrate/templates/database.tpl b/setup/migrate/templates/database.tpl index cafd054..e24044d 100644 --- a/setup/migrate/templates/database.tpl +++ b/setup/migrate/templates/database.tpl @@ -118,6 +118,16 @@


+

+ Manually perform a KnowledgeTree 3.6.1 database export +

+

+ +

diff --git a/setup/migrate/templates/wizard.tpl b/setup/migrate/templates/wizard.tpl index a82660a..4133c7d 100644 --- a/setup/migrate/templates/wizard.tpl +++ b/setup/migrate/templates/wizard.tpl @@ -21,7 +21,7 @@