Click Next after resolving the above errors.
"; + $this->temp_variables['manual_export'] = "a"; + } 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; + } + return false; } - + // TODO function resolveTempDir() { if (!WINDOWS_OS) { @@ -179,7 +195,7 @@ class migrateDatabase extends Step if (!is_dir($dir)) { mkdir($dir); } - + return $dir; } @@ -197,10 +213,10 @@ class migrateDatabase extends Step $this->temp_variables['dumpLocation'] = $this->getPostSafe('dumpLocation'); $this->createMigrateFile(); // create lock file to indicate migration mode } - + /** * Creates migration lock file so that system knows it is supposed to run an upgrade installation - * + * * @author KnowledgeTree Team * @access private * @return void @@ -208,7 +224,7 @@ class migrateDatabase extends Step private function createMigrateFile() { @touch(SYSTEM_DIR.'var'.DS.'bin'.DS."migrate.lock"); } - + /** * Safer way to return post data * @@ -220,7 +236,7 @@ class migrateDatabase extends Step public function getPostSafe($key) { return isset($_POST[$key]) ? $_POST[$key] : ""; } - + /** * Stores varibles used by template * @@ -244,7 +260,7 @@ class migrateDatabase extends Step public function getErrors() { return $this->error; } - + /** * Initialize errors to false * @@ -258,12 +274,12 @@ class migrateDatabase extends Step $this->error[$e] = false; } } - + private function storeSilent() { // TODO $_SESSION['migrate']['database']['dumpLocation'] = $this->sqlDumpFile; $this->temp_variables['dumpLocation'] = $this->sqlDumpFile; } - + } ?> \ No newline at end of file diff --git a/setup/migrate/steps/migrateInstallation.php b/setup/migrate/steps/migrateInstallation.php index 6c1e159..0718624 100644 --- a/setup/migrate/steps/migrateInstallation.php +++ b/setup/migrate/steps/migrateInstallation.php @@ -1,6 +1,6 @@ temp_variables = array("step_name"=>"installation", "silent"=>$this->silent); $this->detectInstallation(); @@ -122,8 +122,8 @@ class migrateInstallation extends step return 'next'; } $this->doRun(); - - return 'landing'; + + return 'landing'; } public function detectInstallation() { @@ -141,7 +141,7 @@ class migrateInstallation extends step } } } - + public function doRun() { if(!$this->readConfig()) { $this->storeSilent(); @@ -154,7 +154,7 @@ class migrateInstallation extends step $this->storeSilent(); return true; } - + } public function checkVersion() { @@ -163,10 +163,10 @@ class migrateInstallation extends step $this->error[] = "KT installation needs to be 3.6.1 or higher"; return false; } - + return true; } - + public function readVersion() { $verFile = $this->location."/knowledgeTree/docs/VERSION.txt"; if(file_exists($verFile)) { @@ -176,25 +176,25 @@ class migrateInstallation extends step $this->error[] = "KT installation version not found"; } - return false; + return false; } - + public function readConfig() { if(isset($_POST['location'])) { $ktInstallPath = $_POST['location']; if($ktInstallPath != '' || strlen($ktInstallPath) == 0) { $this->location = $ktInstallPath; - + return $this->configExists($ktInstallPath); - } + } } else { - + return false; } return false; } - + private function configExists($ktInstallPath) { if(file_exists($ktInstallPath)) { $configPath = $ktInstallPath.DS."knowledgeTree".DS."config".DS."config-path"; @@ -203,7 +203,7 @@ class migrateInstallation extends step if(file_exists($configFilePath)) { // For 3.7 and after $this->loadConfig($configFilePath); $this->storeSilent(); - + return true; } else { $configFilePath = $ktInstallPath.DS."knowledgeTree".DS.$configFilePath; // For older than 3.6.2 @@ -211,7 +211,7 @@ class migrateInstallation extends step if(file_exists($configFilePath)) { $this->loadConfig($configFilePath); $this->storeSilent(); - + return true; } $this->error[] = "KT installation configuration file empty"; @@ -222,10 +222,10 @@ class migrateInstallation extends step } else { $this->error[] = "Please Enter a Location"; } - + return false; } - + private function loadConfig($path) { $this->util->iniUtilities->load($path); $dbSettings = $this->util->iniUtilities->getSection('db'); @@ -233,7 +233,6 @@ class migrateInstallation extends step 'dbName'=> $dbSettings['dbName'], 'dbUser'=> $dbSettings['dbUser'], 'dbPass'=> $dbSettings['dbPass'], - 'dbPort'=> $this->util->getPort($this->location), 'dbAdminUser'=> $dbSettings['dbAdminUser'], 'dbAdminPass'=> $dbSettings['dbAdminPass'], ); @@ -253,11 +252,12 @@ class migrateInstallation extends step array('name'=> 'Cache Directory', 'path'=> $varDir.DS.'cache'), array('name'=> 'Upload Directory', 'path'=> $varDir.DS.'uploads'), ); + $this->dbSettings['dbPort'] = $this->util->getPort($this->location); // Add Port $this->temp_variables['urlPaths'] = $this->urlPaths; $this->temp_variables['ktSettings'] = $this->ktSettings; $this->temp_variables['dbSettings'] = $this->dbSettings; } - + private function setDetails() { $inst = $this->getDataFromSession("installation"); if ($inst) { @@ -266,7 +266,7 @@ class migrateInstallation extends step } } } - + public function getStepVars() { return $this->temp_variables; } @@ -274,13 +274,13 @@ class migrateInstallation extends step public function getErrors() { return $this->error; } - + public function storeSilent() { if($this->location==1) { $this->location = '';} $this->temp_variables['location'] = $this->location; $this->temp_variables['foundVersion'] = $this->foundVersion; $this->temp_variables['versionError'] = $this->versionError; $this->temp_variables['settings'] = $this->settings; - } + } } ?> \ No newline at end of file diff --git a/setup/migrate/templates/database.tpl b/setup/migrate/templates/database.tpl index 3723bd4..ef06289 100644 --- a/setup/migrate/templates/database.tpl +++ b/setup/migrate/templates/database.tpl @@ -2,17 +2,20 @@Migrate Database
The Setup Wizard will now migrate your existing database to the new Zend Server stack. This process may take several minutes to complete.
Click Next to continue.
+ + - + " method="post" id="">Deactivate Services
- +All KnowledgeTree services need to be deactivated before the migration takes place.
@@ -34,7 +34,7 @@