- -The mysql backup utility could not be found automatically. Either do a manual backup, or edit the config.ini and update the backup/mysql Directory entry. -
-You can continue to do the backup manually using the following process: -
-
|
-
- |
- - - - - - - - - - There don't seem to be any backups to restore from the "" directory. - -
- Select a backup to restore from the list below: -
- -
| Filename - | File Size - | Action - - |
| - | - | - - |
- - - - -
-
-Manually, you would do the following to restore the backup: -
-
|
- - -The mysql backup utility could not be found automatically. Either do a manual restore, or edit the config.ini and update the backup/mysql Directory entry. - -You can continue to do the restore manually using the following command(s): - -
- -Press continue to restore to attempt the command(s) above. - -
-
-
-
-
-
-
-
-
-
-
-
- The backup file It appears as though the backup has been successful. - - - Manually, you would do the following to restore the backup: - -
- The mysqldump utility was not found in the subdirectory.
-
-
- temp_variables['backupStatus'] = $status;
if ($status)
{
- $stmt=create_restore_stmt($filename);
- ?>
- The backup file It appears as though the backup has been successful. - - '; if ($stmt['dir'] != '') { - ?> - Manually, you would do the following to restore the backup: + $this->temp_variables['dir'] = $stmt['dir']; + $this->temp_variables['display'] .= 'Manually, you would do the following to restore the backup:
- We appologise for the inconvenience. - -
+ We appologise for the inconvenience. + +
+ } + + private function create_backup_stmt($targetfile=null) + { + $oKTConfig =& KTConfig::getSingleton(); - - get('db/dbAdminUser'); + $adminPwd = $oKTConfig->get('db/dbAdminPass'); + $dbHost = $oKTConfig->get('db/dbHost'); + $dbName = $oKTConfig->get('db/dbName'); + + $dbPort = trim($oKTConfig->get('db/dbPort')); + if (empty($dbPort) || $dbPort=='default') $dbPort = get_cfg_var('mysql.default_port'); + if (empty($dbPort)) $dbPort='3306'; + $dbSocket = trim($oKTConfig->get('db/dbSocket')); + if (empty($dbSocket) || $dbSocket=='default') $dbSocket = get_cfg_var('mysql.default_socket'); + if (empty($dbSocket)) $dbSocket='../tmp/mysql.sock'; + + $date=date('Y-m-d-H-i-s'); + + $dir=$this->util->resolveMysqlDir(); + + $info['dir']=$dir; + + $prefix=''; + if (OS_UNIX) { - ?> - + $prefix .= "./"; + } - get('db/dbAdminUser'); - $adminPwd = $oKTConfig->get('db/dbAdminPass'); - $dbHost = $oKTConfig->get('db/dbHost'); - $dbName = $oKTConfig->get('db/dbName'); - - $dbPort = trim($oKTConfig->get('db/dbPort')); - if (empty($dbPort) || $dbPort=='default') $dbPort = get_cfg_var('mysql.default_port'); - if (empty($dbPort)) $dbPort='3306'; - $dbSocket = trim($oKTConfig->get('db/dbSocket')); - if (empty($dbSocket) || $dbSocket=='default') $dbSocket = get_cfg_var('mysql.default_socket'); - if (empty($dbSocket)) $dbSocket='../tmp/mysql.sock'; - - $date=date('Y-m-d-H-i-s'); - - $dir=$this->resolveMysqlDir(); - - $info['dir']=$dir; - - $prefix=''; - if (OS_UNIX) - { - $prefix .= "./"; - } - - if (@stat($dbSocket) !== false) - { - $mechanism="--socket=\"$dbSocket\""; - } - else - { - $mechanism="--port=\"$dbPort\""; - } - - $tmpdir=$this->resolveTempDir(); - - if (is_null($targetfile)) - { - $targetfile="$tmpdir/kt-backup-$date.sql"; - } - - $stmt = $prefix . "mysqldump --user=\"$adminUser\" -p $mechanism \"$dbName\" > \"$targetfile\""; - $info['display']=$stmt; - $info['target']=$targetfile; - - - $stmt = $prefix. "mysqldump --user=\"$adminUser\" --password=\"$adminPwd\" $mechanism \"$dbName\" > \"$targetfile\""; - $info['cmd']=$stmt; - return $info; -} - -function resolveMysqlDir() -{ - // possibly detect existing installations: - - if (OS_UNIX) - { - $dirs = array('/opt/mysql/bin','/usr/local/mysql/bin'); - $mysqlname ='mysql'; - } - else - { - $dirs = explode(';', $_SERVER['PATH']); - $dirs[] ='c:/Program Files/MySQL/MySQL Server 5.0/bin'; - $dirs[] = 'c:/program files/ktdms/mysql/bin'; - $mysqlname ='mysql.exe'; - } - - $oKTConfig =& KTConfig::getSingleton(); - $mysqldir = $oKTConfig->get('backup/mysqlDirectory',$mysqldir); - $dirs[] = $mysqldir; - - if (strpos(__FILE__,'knowledgeTree') !== false && strpos(__FILE__,'ktdms') != false) - { - $dirs [] = realpath(dirname($FILE) . '/../../mysql/bin'); - } - - foreach($dirs as $dir) - { - if (is_file($dir . '/' . $mysqlname)) + else { - return $dir; + $mechanism="--port=\"$dbPort\""; } + + $tmpdir=$this->util->resolveTempDir(); + + if (is_null($targetfile)) + { + $targetfile="$tmpdir/kt-backup-$date.sql"; + } + + $stmt = $prefix . "mysqldump --user=\"$adminUser\" -p $mechanism \"$dbName\" > \"$targetfile\""; + $info['display']=$stmt; + $info['target']=$targetfile; + + + $stmt = $prefix. "mysqldump --user=\"$adminUser\" --password=\"$adminPwd\" $mechanism \"$dbName\" > \"$targetfile\""; + $info['cmd']=$stmt; + return $info; } - return ''; -} - -function resolveTempDir() -{ - - if (OS_UNIX) - { - $dir='/tmp/kt-db-backup'; - } - else - { - $dir='c:/kt-db-backup'; - } - $oKTConfig =& KTConfig::getSingleton(); - $dir = $oKTConfig->get('backup/backupDirectory',$dir); - - if (!is_dir($dir)) + private function backupConfirm() { - mkdir($dir); + $stmt = $this->create_backup_stmt(); + $_SESSION['backupFile'] = $stmt['target']; + + $dir = $stmt['dir']; + $this->temp_variables['dir'] = $dir; + $this->temp_variables['display'] = $stmt['display']; } - return $dir; -} - - -function backupConfirm() -{ - $stmt = $this->create_backup_stmt(); - $_SESSION['backupFile'] = $stmt['target']; - - $dir = $stmt['dir']; - $this->temp_variables['dir'] = $dir; - $this->temp_variables['display'] = $stmt['display']; -} - - - } ?> \ No newline at end of file diff --git a/setup/upgrade/steps/upgradeComplete.php b/setup/upgrade/steps/upgradeComplete.php index edba512..0896c1a 100644 --- a/setup/upgrade/steps/upgradeComplete.php +++ b/setup/upgrade/steps/upgradeComplete.php @@ -40,35 +40,24 @@ * @version Version 0.1 */ -class upgradeComplete extends Step { +require '../../config/dmsDefaults.php'; - /** - * Reference to Database object - * - * @author KnowledgeTree Team - * @access private - * @var object - */ - private $_dbhandler = null; +class upgradeComplete extends Step { - private $privileges_check = 'tick'; - private $database_check = 'tick'; - protected $silent = true; - protected $util = null; + protected $silent = false; + protected $temp_variables = array(); public function __construct() { $this->temp_variables = array("step_name"=>"complete", "silent"=>$this->silent); - $this->_dbhandler = new dbUtil(); - $this->util = new UpgradeUtil(); } - function doStep() { + public function doStep() { $this->doRun(); return 'landing'; } - function doRun() { + private function doRun() { $this->storeSilent();// Set silent mode variables } @@ -78,5 +67,6 @@ class upgradeComplete extends Step { */ private function storeSilent() { } + } ?> \ No newline at end of file diff --git a/setup/upgrade/steps/upgradeDatabase.php b/setup/upgrade/steps/upgradeDatabase.php index 2898ebb..2152471 100644 --- a/setup/upgrade/steps/upgradeDatabase.php +++ b/setup/upgrade/steps/upgradeDatabase.php @@ -1,6 +1,6 @@ initErrors(); - $this->setDetails(); // Set any posted variables if(!$this->inStep("database")) { $this->doRun(); return 'landing'; } if($this->next()) { - if ($this->doRun()) { - return 'next'; - } + $this->doRun('preview'); + return 'next'; } else if($this->previous()) { return 'previous'; } - else if ($this->backup()) { - return 'backup'; - } - else if ($this->restore()) { - return 'restore'; - } - else if ($this->upgrading()) { - $this->doRun('runUpgrade'); + else if ($this->confirmUpgrade()) { + $this->doRun('confirm'); return 'next'; } - else if ($this->confirm()) { - if ($this->doRun('confirm')) { + else if ($this->upgrading()) { + if ($this->doRun('runUpgrade')) { return 'next'; } return 'error'; @@ -304,19 +164,15 @@ class upgradeDatabase extends Step return 'landing'; } - function backup() { - return isset($_POST['Backup']); + private function confirmUpgrade() { + return isset($_POST['ConfirmUpgrade']); } - - function restore() { - return isset($_POST['Restore']); - } - - function upgrading() { + + private function upgrading() { return isset($_POST['RunUpgrade']); } - function doRun($action = null) { + private function doRun($action = null) { $this->readConfig(KTConfig::getConfigFilename()); if($this->dbSettings['dbPort'] == '') { @@ -327,21 +183,18 @@ class upgradeDatabase extends Step $this->dbSettings['dbPass'], $this->dbSettings['dbName']); } + $this->temp_variables['action'] = $action; if (is_null($action) || ($action == 'preview')) { - $this->temp_variables['action'] = 'preview'; $this->temp_variables['title'] = 'Preview Upgrade'; $this->temp_variables['upgradeTable'] = $this->generateUpgradeTable(); } - else if ($action == 'runUpgrade') { - $this->temp_variables['action'] = 'runUpgrade'; + else if ($action == 'confirm') { $this->temp_variables['title'] = 'Confirm Upgrade'; $this->temp_variables['upgradeTable'] = $this->upgradeConfirm(); } - else if ($action == 'confirm') { - $this->temp_variables['action'] = 'confirm'; + else if ($action == 'runUpgrade') { $this->temp_variables['title'] = 'Upgrade In Progress'; - if (!$this->upgrade()) { - $this->temp_variables['upgradeTable'] = $this->upgradeErrors(); + if (!$this->upgradeDatabase()) { return false; } } @@ -349,7 +202,7 @@ class upgradeDatabase extends Step return true; } - public function generateUpgradeTable() { + private function generateUpgradeTable() { global $default; $this->temp_variables['systemVersion'] = $default->systemVersion; @@ -372,7 +225,7 @@ class upgradeDatabase extends Step $ret .= sprintf(" | ||||||||||
| %s | %s | %s |
The table below describes the upgrades that have occurred to
- upgrade your installation to systemVersion;?>.
-
-
-Pre-Upgrade actions failed.
-
-
-Pre-Upgrade actions succeeded.
-temp_variables['detail'] = '
The table below describes the upgrades that have occurred to
+ upgrade your KnowledgeTree installation to ' . $default->systemVersion . '';
+
+ $pre_res = $this->performPreUpgradeActions();
+ if (PEAR::isError($pre_res)) {
+ $this->temp_variables['preUpgrade'] = 'Pre-Upgrade actions failed.';
+ }
+ else {
+ $this->temp_variables['preUpgrade'] = 'Pre-Upgrade actions succeeded.';
+
+ }
+
+ $res = $this->performAllUpgrades();
+ if (PEAR::isError($res) || PEAR::isError($pres)) {
+ // TODO instantiate error details hideable section
+ $this->temp_variables['upgradeStatus'] = 'Database upgrade failed
+
+ Please restore from your backup and ensure that the database does not contain
+ any unsupported modifications and try the upgrade process again.
+
+ If the problem persists, contact KnowledgeTree Support.';
+ }
+ else {
+ $this->temp_variables['upgradeStatus'] = 'Upgrade succeeded.';
+ }
+
+ $post_pres = $this->performPostUpgradeActions();
+ if (PEAR::isError($post_res)) {
+ $this->temp_variables['postUpgrade'] = 'Post-Upgrade actions failed.';
+ }
+ else {
+ $this->temp_variables['postUpgrade'] = 'Post-Upgrade actions succeeded.';
+ }
}
-?>
-
- -Upgrade failed. -cacheDirectory . DIRECTORY_SEPARATOR . 'scheduler.lock'; + touch($lockFile); + return true; + } - else - { -?> -
-Upgrade succeeded. -proxyCacheDirectory; + KTUtil::deleteDirectory($proxyDir); + + $oKTCache = new KTCache(); + $oKTCache->deleteAllCaches(); + + // Clear the configuration cache, it'll regenerate on next load + $oKTConfig = new KTConfig(); + $oKTConfig->clearCache(); + + // Unlock the scheduler + $lockFile = $default->cacheDirectory . DIRECTORY_SEPARATOR . 'scheduler.lock'; + if(file_exists($lockFile)){ + @unlink($lockFile); + } + + return true; + } -?> -
-
-Post-Upgrade actions failed.
-system_settings_table);
+ $lastVersion = DBUtil::getOneResultKey($query, 'value');
+ $currentVersion = $default->systemVersion;
+
+ $upgrades = describeUpgrade($lastVersion, $currentVersion);
+
+ $this->temp_variables['upgradeTable'] = '';
+
+ foreach ($upgrades as $upgrade) {
+ if (($row % 2) == 1) {
+ $class = "odd";
+ } else {
+ $class = "even";
+ }
+ $this->temp_variables['upgradeTable'] .= sprintf('
' . "\n"; + $this->temp_variables['upgradeTable'] .= "
-Post-Upgrade actions succeeded.
-
-Already applied';
+ }
+ return sprintf('%s', htmlspecialchars($res->toString()));
+ }
+ if ($res === true) {
+ return 'Success';
+ }
+ if ($res === false) {
+ return 'Failure';
+ }
+ return $res;
}
-?>
-
-
-
-
\ No newline at end of file
diff --git a/setup/upgrade/steps/upgradeInstallation.php b/setup/upgrade/steps/upgradeInstallation.php
index ce09f88..2354f5a 100644
--- a/setup/upgrade/steps/upgradeInstallation.php
+++ b/setup/upgrade/steps/upgradeInstallation.php
@@ -1,6 +1,6 @@
temp_variables = array("step_name"=>"welcome");
+ public function __construct() {
+ $this->temp_variables = array("step_name"=>"installation");
}
- function doStep() {
+ public function doStep() {
parent::doStep();
if($this->next()) {
- return 'next'; // Just a welcome, so return "next" action
+ return 'next';
+ }
+ else if ($this->restore()) {
+ header('Location: index.php?step_name=restore');
+ exit;
+ }
+ else if ($this->upgrade()) {
+ header('Location: index.php?step_name=database');
+ exit;
}
return 'landing';
diff --git a/setup/upgrade/steps/upgradeRestore.php b/setup/upgrade/steps/upgradeRestore.php
index 06c1f8a..5b26336 100644
--- a/setup/upgrade/steps/upgradeRestore.php
+++ b/setup/upgrade/steps/upgradeRestore.php
@@ -1,6 +1,6 @@
util = new UpgradeUtil();
}
- function doStep() {
+ public function doStep() {
parent::doStep();
+ $this->temp_variables['restore'] = false;
+
if(!$this->inStep("restore")) {
$this->doRun();
return 'landing';
@@ -78,22 +78,40 @@ class upgradeRestore extends Step {
} else if($this->previous()) {
return 'previous';
}
+ else if ($this->restoreNow()) {
+ $this->temp_variables['restoreSuccessful'] = false;
+ $this->doRun(true);
+ return 'next';
+ }
$this->doRun();
return 'landing';
}
- function doRun() {
- if ($this->select()) {
- $this->restoreSelected();
+ private function restoreNow() {
+ return isset($_POST['RunRestore']);
+ }
+
+ private function doRun($restore = false) {
+ if (!$restore) {
+ $this->temp_variables['selected'] = false;
+ if ($this->select()) {
+ $this->restoreSelected();
+ $this->temp_variables['selected'] = true;
+ $this->temp_variables['availableBackups'] = true;
+ }
+ $this->restoreConfirm();
+ } // end not running a restore, just setting up
+ else {
+ $this->restoreDatabase();
}
- $this->restoreConfirm();
+
$this->storeSilent();// Set silent mode variables
return true;
}
- function select() {
+ private function select() {
return isset($_POST['RestoreSelect']);
}
@@ -103,332 +121,126 @@ class upgradeRestore extends Step {
*/
private function storeSilent() {
}
-
- function restore()
-{
- check_state(1);
- set_state(5);
-// title('Restore In Progress');
- $status = $_SESSION['backupStatus'];
- $filename=$_SESSION['backupFile'];
- $stmt=create_restore_stmt($filename);
- $dir=$stmt['dir'];
-
-
-
- if (is_file($dir . '/mysql') || is_file($dir . '/mysql.exe'))
+ private function restoreDatabase()
{
-
-?>
- The restore is now underway. Please wait till it completes.
-temp_variables['restore'] = true;
+ $status = $_SESSION['backupStatus'];
+ $filename = $_SESSION['backupFile'];
+ $stmt = $this->util->create_restore_stmt($filename);
+ $dir = $stmt['dir'];
+
+ if (is_file($dir . '/mysql') || is_file($dir . '/mysql.exe'))
{
-
- $handle = popen($stmt, 'r');
- if ($handle=='false')
+ $curdir=getcwd();
+ chdir($dir);
+
+ $ok=true;
+ $stmts=explode("\n",$stmt['cmd']);
+ foreach($stmts as $stmt)
{
- $ok=false;
- break;
+
+ $handle = popen($stmt, 'r');
+ if ($handle=='false')
+ {
+ $ok=false;
+ break;
+ }
+ $read = fread($handle, 10240);
+ pclose($handle);
+ $_SESSION['restoreOutput']=$read;
}
- $read = fread($handle, 10240);
- pclose($handle);
- $_SESSION['restoreOutput']=$read;
- }
-
-
-
-
-
+
$_SESSION['restoreStatus'] = $ok;
-
-
-?>
-
-
-
- The mysql utility was not found in the subdirectory.
-
-
-
- The restore of
- It appears as though the restore has been successful. -
- - - - -It appears as though the restore process has failed.
-Unfortunately, it is difficult to diagnose these problems automatically -and would recommend that you try to do the backup process manually. -
-We appologise for the inconvenience. -
-
| - - |
- - - -get('db/dbAdminUser'); - $adminPwd = $oKTConfig->get('db/dbAdminPass'); - $dbHost = $oKTConfig->get('db/dbHost'); - $dbName = $oKTConfig->get('db/dbName'); - $dbPort = trim($oKTConfig->get('db/dbPort')); - if ($dbPort=='' || $dbPort=='default')$dbPort = get_cfg_var('mysql.default_port'); - if (empty($dbPort)) $dbPort='3306'; - $dbSocket = trim($oKTConfig->get('db/dbSocket')); - if (empty($dbSocket) || $dbSocket=='default') $dbSocket = get_cfg_var('mysql.default_socket'); - if (empty($dbSocket)) $dbSocket='../tmp/mysql.sock'; - - $dir = $this->resolveMysqlDir(); - - $info['dir']=$dir; - - $prefix=''; - if (OS_UNIX) - { - $prefix .= "./"; - } - - if (@stat($dbSocket) !== false) - { - $mechanism="--socket=\"$dbSocket\""; - } - else - { - $mechanism="--port=\"$dbPort\""; - } - - $tmpdir = $this->resolveTempDir(); - - $stmt = $prefix ."mysqladmin --user=\"$adminUser\" -p $mechanism drop \"$dbName\"
"; - $stmt .= $prefix ."mysqladmin --user=\"$adminUser\" -p $mechanism create \"$dbName\"
"; - - - $stmt .= $prefix ."mysql --user=\"$adminUser\" -p $mechanism \"$dbName\" < \"$targetfile\"\n"; - $info['display']=$stmt; - - - $stmt = $prefix ."mysqladmin --user=\"$adminUser\" --force --password=\"$adminPwd\" $mechanism drop \"$dbName\"\n"; - $stmt .= $prefix ."mysqladmin --user=\"$adminUser\" --password=\"$adminPwd\" $mechanism create \"$dbName\"\n"; - - $stmt .= $prefix ."mysql --user=\"$adminUser\" --password=\"$adminPwd\" $mechanism \"$dbName\" < \"$targetfile\""; - $info['cmd']=$stmt; - return $info; -} - -function resolveMysqlDir() -{ - // possibly detect existing installations: - - if (OS_UNIX) - { - $dirs = array('/opt/mysql/bin','/usr/local/mysql/bin'); - $mysqlname ='mysql'; - } - else - { - $dirs = explode(';', $_SERVER['PATH']); - $dirs[] ='c:/Program Files/MySQL/MySQL Server 5.0/bin'; - $dirs[] = 'c:/program files/ktdms/mysql/bin'; - $mysqlname ='mysql.exe'; - } - - $oKTConfig =& KTConfig::getSingleton(); - $mysqldir = $oKTConfig->get('backup/mysqlDirectory',$mysqldir); - $dirs[] = $mysqldir; - - if (strpos(__FILE__,'knowledgeTree') !== false && strpos(__FILE__,'ktdms') != false) - { - $dirs [] = realpath(dirname($FILE) . '/../../mysql/bin'); + // should be some sort of error checking, really + $this->restoreDone(); + } } - foreach($dirs as $dir) + private function restoreDone() { - if (is_file($dir . '/' . $mysqlname)) + $status = $_SESSION['restoreStatus']; + $filename = $_SESSION['backupFile']; + + if ($status) { - return $dir; + $this->temp_variables['display'] = 'The restore of
+ It appears as though the restore has been successful. +
'; + + $this->temp_variables['title'] = 'Restore Complete'; + $this->temp_variables['restoreSuccessful'] = true; + } + else + { + $this->temp_variables['display'] = 'It appears as though the restore process has failed.
+ Unfortunately, it is difficult to diagnose these problems automatically + and would recommend that you try to do the backup process manually. +
+ We appologise for the inconvenience. +
+
| ' . $_SESSION['restoreOutput'] . ' + |
- Select a backup to restore from the list below: -
-
- util->resolveTempDir(); + $_SESSION['backupFile'] = $dir . '/' . $file; } - ?> - -- - resolveTempDir(); - $_SESSION['backupFile'] = $dir . '/' . $file; -?> -restoreSelect(); - exit; + if (!isset($_SESSION['backupFile']) || !is_file($_SESSION['backupFile']) || filesize($_SESSION['backupFile']) == 0) + { + $this->restoreSelect(); + return; + } + + $status = $_SESSION['backupStatus']; + $filename = $_SESSION['backupFile']; + $stmt = $this->util->create_restore_stmt($filename); + + $this->temp_variables['title'] = 'Confirm Restore'; + $this->temp_variables['dir'] = $stmt['dir']; + $this->temp_variables['display'] = $stmt['display']; + $this->temp_variables['availableBackups'] = true; + $this->temp_variables['selected'] = true; } - $status = $_SESSION['backupStatus']; - $filename=$_SESSION['backupFile']; - $stmt = $this->create_restore_stmt($filename); - - $this->temp_variables['dir'] = $stmt['dir']; - $this->temp_variables['display'] = $stmt['display']; -} - - - - } ?> \ No newline at end of file diff --git a/setup/upgrade/steps/upgradeWelcome.php b/setup/upgrade/steps/upgradeWelcome.php index b311bcd..2450584 100644 --- a/setup/upgrade/steps/upgradeWelcome.php +++ b/setup/upgrade/steps/upgradeWelcome.php @@ -40,14 +40,13 @@ * @version Version 0.1 */ -global $default; -// include defaults include '../../config/dmsDefaults.php'; require_once KT_LIB_DIR . '/authentication/authenticationutil.inc.php'; class upgradeWelcome extends step { - protected $silent = true; + protected $silent = false; + protected $temp_variables = array(); public function __construct() { $this->temp_variables = array("step_name"=>"welcome"); @@ -76,7 +75,6 @@ class upgradeWelcome extends step { if (!$authenticated) { session_unset(); -// loginFailed(_kt('Could not authenticate administrative user')); return false; } diff --git a/setup/upgrade/templates/backup.tpl b/setup/upgrade/templates/backup.tpl index 8ade6b5..28bc28e 100644 --- a/setup/upgrade/templates/backup.tpl +++ b/setup/upgrade/templates/backup.tpl @@ -1,5 +1,5 @@