Story Id:1166869 Daily Commit

Committed by: Jarrett Jordaan Reviewed by: Paul Barrett

Story Id:1166869 Daily Commit
Committed by: Jarrett Jordaan Reviewed by: Paul Barrett
Jarrett Jordaan
1 parent 3f416054
Showing 12 changed files with 93 additions and 1148 deletions
setup/migrate/session.php
setup/migrate/steps/migrateComplete.php
setup/migrate/steps/migrateDatabase.php
setup/upgrade.php
setup/wizard/lib/services/unixOpenOffice.php
setup/wizard/lib/system/openOffice.class
setup/wizard/lib/system/openOffice.java
setup/wizard/resources/js/wizard.js
setup/wizard/steps/complete.php
setup/wizard/steps/database.php
setup/wizard/steps/install.php
setup/wizard/templates/complete.tpl
@@ -175,7 +175,7 @@ class Session
 	* @access public
 	* @return void
 	*/
-	public function destroy() {
+	public function destroyMigrate() {
 		$this->startSession();
 		unset($_SESSION[$this->salt]);
 		session_destroy();
@@ -84,10 +84,7 @@ class migrateComplete extends Step {
     private function checkSqlDump() {
     	$database = $this->getDataFromSession("database"); // Get installation directory
     	// TODO
-    	$sqlFile = $_SESSION['database']['dumpLocation'];
-//    	$tmpFolder = $database['dumpLocation'];
-//    	$sqlFile = $tmpFolder."dms.sql";
-    	//echo $sqlFile;
+    	$sqlFile = $_SESSION['migrate']['database']['dumpLocation'];
 		if(file_exists($sqlFile)) {
 			$this->temp_variables['sql']['class'] = "tick";
 			$this->temp_variables['sql']['name'] = "dms.sql";
@@ -301,7 +301,7 @@ function resolveTempDir()
     private function storeSilent() {
     	// TODO
-    	$_SESSION['database']['dumpLocation'] = $this->sqlDumpFile;
+    	$_SESSION['migrate']['database']['dumpLocation'] = $this->sqlDumpFile;
     	$this->temp_variables['dumpLocation'] = $this->sqlDumpFile;
     }
@@ -35,1125 +35,5 @@
  * Contributor( s): ______________________________________
  *
  */
-
-$GLOBALS["checkup"] = true;
-session_start();
-require_once('../config/dmsDefaults.php');
-require_once(KT_LIB_DIR . '/authentication/authenticationutil.inc.php');
-require_once(KT_LIB_DIR . '/upgrades/upgrade.inc.php');
-require_once(KT_LIB_DIR . '/plugins/pluginutil.inc.php');
-
-function generateUpgradeTable () {
-	global $default;
-	$query = sprintf('SELECT value FROM %s WHERE name = "databaseVersion"', $default->system_settings_table);
-	$lastVersion = DBUtil::getOneResultKey($query, 'value');
-	$currentVersion = $default->systemVersion;
-
-	$upgrades = describeUpgrade($lastVersion, $currentVersion);
-
-	$ret = "<table border=1 cellpadding=1 cellspacing=1 width='100%'>\n";
-	$ret .= "<tr bgcolor='darkgrey'><th width='10'>Code</th><th width='100%'>Description</th><th width='30'>Applied</th></tr>\n";
-	$i=0;
-	foreach ($upgrades as $upgrade) {
-		$color=((($i++)%2)==0)?'white':'lightgrey';
-		$ret .= sprintf("<tr bgcolor='$color'><td>%s</td><td>%s</td><td>%s</td></tr>\n",
-		htmlspecialchars($upgrade->getDescriptor()),
-		htmlspecialchars($upgrade->getDescription()),
-		$upgrade->isAlreadyApplied() ? "Yes" : "No"
-		);
-	}
-	$ret .= '</table>';
-	return $ret;
-}
-
-function showResult($res) {
-	if (PEAR::isError($res)) {
-		if (is_a($res, 'Upgrade_Already_Applied')) {
-			return '<span style="color: orange">Already applied</span>';
-		}
-		return sprintf('<span style="color: red">%s</span>', htmlspecialchars($res->toString()));
-	}
-	if ($res === true) {
-		return '<span style="color: green">Success</span>';
-	}
-	if ($res === false) {
-		return '<span style="color: red">Failure</span>';
-	}
-	return $res;
-}
-
-$GLOBALS['row'] = 1;
-
-function performAllUpgrades () {
-	global $default;
-	$query = sprintf('SELECT value FROM %s WHERE name = "databaseVersion"', $default->system_settings_table);
-	$lastVersion = DBUtil::getOneResultKey($query, 'value');
-	$currentVersion = $default->systemVersion;
-
-	$upgrades = describeUpgrade($lastVersion, $currentVersion);
-
-	foreach ($upgrades as $upgrade) {
-		if (($GLOBALS['row'] % 2) == 1) {
-			$class = "odd";
-		} else {
-			$class = "even";
-		}
-		printf('<div class="row %s"><div class="foo">%s</div>' . "\n", $class, htmlspecialchars($upgrade->getDescription()));
-		$GLOBALS['row']++;
-		ob_flush();
-		flush();
-		$res = $upgrade->performUpgrade();
-		printf('<div class="bar">%s</div>', showResult($res));
-		print '<br style="clear: both">' . "\n";
-		ob_flush();
-		flush();
-		print "</div>\n";
-		if (PEAR::isError($res)) {
-			if (!is_a($res, 'Upgrade_Already_Applied')) {
-				break;
-			} else {
-				$res = true;
-			}
-		}
-		if ($res === false) {
-			$res = PEAR::raiseError("Upgrade returned false");
-			break;
-		}
-	}
-
-    return $res;
-}
-
-function performPreUpgradeActions() {
-
-    // This is just to test and needs to be updated to a more sane and error resistent architrcture if it works.
-    // It should idealy work the same as the upgrades.
-
-    global $default;
-
-    // Lock the scheduler
-    $lockFile = $default->cacheDirectory . DIRECTORY_SEPARATOR . 'scheduler.lock';
-    touch($lockFile);
-    return true;
-
-}
-
-function performPostUpgradeActions() {
-
-    // This is just to test and needs to be updated to a more sane and error resistent architrcture if it works.
-    // It should idealy work the same as the upgrades.
-
-    global $default;
-
-    // Ensure all plugins are re-registered.
-    $sql = "TRUNCATE plugin_helper";
-    $res = DBUtil::runQuery($sql);
-
-    // Clear out all caches and proxies - they need to be regenerated with the new code
-    $proxyDir = $default->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;
-
-}
-
-if (PEAR::isError($loggingSupport)) {
-	print '<p><font color="red">Logging support is not currently working.  Check post-installation checkup.</font></p>';
-	exit(1);
-}
-
-if (PEAR::isError($dbSupport)) {
-	print '<p><font color="red">Database support is not currently working.  Check post-installation checkup or refresh this page (F5) to try again.</font></p>';
-	exit(1);
-}
-
-
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN">
-<html>
-  <head>
-    <title><?php echo APP_NAME;?> Upgrade</title>
-    <style type="text/css">
-th { text-align: left; }
-td { vertical-align: top; }
-.foo { float: left; }
-.bar { padding-left: 2em; float: right; }
-.odd { background-color: #eeeeee; }
-.even { background-color: #dddddd; }
-.row { padding: 0.5em 1em; }
-    </style>
-  </head>
-
-  <body>
-  <img src="<?php
-  	if($oKTConfig->get('ui/mainLogo')){
-  		echo $oKTConfig->get('ui/mainLogo');
-  	}else{
-	  	echo '../resources/graphics/ktlogo-topbar_base.png';
-	}?>"/>
-  <p>
-  <img src="upgrade-title.jpg"/>
-  <table style="width:800; height:500">
-<tr><td>
-<P>
-   <script type="text/javascript">
-function do_start(action)
-{
-	document.location='?go=' + action;
-}
-</script>
-<?php
-
-$action = trim($_REQUEST["go"]);
-switch ($action)
-{
-	case 'UpgradeConfirm':
-	case 'UpgradePreview':
-		UpgradePreview();
-		break;
-	case 'Upgrade':
-		Upgrade();
-		break;
-	case 'BackupConfirm':
-		backupConfirm();
-		break;
-	case 'Backup':
-		backup();
-		break;
-	case 'BackupDone':
-		backupDone();
-		break;
-	case 'RestoreConfirm':
-		restoreConfirm();
-		break;
-	case 'RestoreSelect':
-		restoreSelect();
-		break;
-	case 'RestoreSelected':
-		restoreSelected();
-		break;
-	case 'Restore':
-		restore();
-		break;
-	case 'RestoreDone':
-		restoreDone();
-		break;
-	case 'Login':
-		login();
-		break;
-	case 'LoginProcess':
-		loginProcess();
-		break;
-	default:
-		if (!isset($_SESSION['setup_user']))
-			login();
-		else
-			welcome();
-		break;
-}
-
-function login()
-{
-?>
-<P>
-The database upgrade wizard completes the upgrade process on an existing <?php echo APP_NAME;?> installation. It applies
-any upgrades to the database that may be required.
-<P>
-Only administrator users may access the upgrade wizard.
-<P>
-
-<form method=post action="?go=LoginProcess">
-<table>
-<tr><td>Username<td><input name=username>
-<tr><td>Password<td><input name=password type="password">
-<tr><td colspan=2 align=center><input type=submit value="login">
-</table>
-</form>
-<?php
-}
-
-function loginProcess()
-{
-	$username=$_REQUEST['username'];
-	$password=$_REQUEST['password'];
-
-	$authenticated = checkPassword($username, $password);
-
-	if (!$authenticated)
-	{
-		session_unset();
-		loginFailed(_kt('Could not authenticate administrative user'));
-		return;
-	}
-
-	$_SESSION['setup_user'] = $username;
-
-	welcome();
-}
-
-function checkPassword($username, $password) {
-	global $default;
-
-	$sTable = KTUtil::getTableName('users');
-	$sQuery = "SELECT count(*) AS match_count FROM $sTable WHERE username = ? AND password = ?";
-	$aParams = array($username, md5($password));
-	$res = DBUtil::getOneResultKey(array($sQuery, $aParams), 'match_count');
-	if (PEAR::isError($res)) { return false; }
-	else {
-		$sTable = KTUtil::getTableName('users_groups_link');
-		$sQuery = "SELECT count(*) AS match_count FROM $sTable WHERE user_id = ? AND group_id = 1";
-		$aParams = array($res);
-		$res = DBUtil::getOneResultKey(array($sQuery, $aParams), 'match_count');
-		if (PEAR::isError($res)) { return false; }
-		else {
-			return ($res == 1);
-		}
-	}
-}
-
-function loginFailed($message)
-{
-	print "<font color=red>$message</font>";
-	login();
-}
-
-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))
-		{
-			return $dir;
-		}
-	}
-
-	return '';
-}
-
-
-function create_backup_stmt($targetfile=null)
-{
-	$oKTConfig =& KTConfig::getSingleton();
-
-	$adminUser = $oKTConfig->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=resolveMysqlDir();
-
-	$info['dir']=$dir;
-
-	$prefix='';
-	if (OS_UNIX)
-	{
-		$prefix .= "./";
-	}
-
-	if (@stat($dbSocket) !== false)
-	{
-		$mechanism="--socket=\"$dbSocket\"";
-	}
-	else
-	{
-		$mechanism="--port=\"$dbPort\"";
-	}
-
-	$tmpdir=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 create_restore_stmt($targetfile)
-{
-	$oKTConfig =& KTConfig::getSingleton();
-
-	$adminUser = $oKTConfig->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=resolveMysqlDir();
-
-	$info['dir']=$dir;
-
-	$prefix='';
-	if (OS_UNIX)
-	{
-		$prefix .= "./";
-	}
-
-	if (@stat($dbSocket) !== false)
-	{
-		$mechanism="--socket=\"$dbSocket\"";
-	}
-	else
-	{
-		$mechanism="--port=\"$dbPort\"";
-	}
-
-	$tmpdir=resolveTempDir();
-
-	$stmt = $prefix ."mysqladmin --user=\"$adminUser\" -p $mechanism drop  \"$dbName\"<br/>";
-	$stmt .= $prefix ."mysqladmin --user=\"$adminUser\" -p $mechanism create  \"$dbName\"<br/>";
-
-
-	$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 title($title)
-{
-	if (!isset($_SESSION['setup_user']))
-	{
-		print "<script type='text/javascript'>document.location='?go=Login'</script>";
-	}
-	print "<h1>$title</h1>";
-}
-
-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))
-	{
-			mkdir($dir);
-	}
-	return $dir;
-}
-
-
-function upgradeConfirm()
-{
-	title('Confirm Upgrade');
-	if (!isset($_SESSION['backupStatus']) || $_SESSION['backupStatus'] === false)
-	{
-?>
-<br/>
-<font color="Red">Please ensure that you have made a backup before continuing with the upgrade process.</font>
-<p>
-<br/>
-<?php
-	}
-?>
-<p>
-We are about to start the upgrade process.
-<P>
-
-&nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="back" onclick="javascript:do_start('welcome')">
-&nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="next" onclick="javascript:do_start('UpgradePreview')">
-
-<?php
-
-}
-
-
-function backupConfirm()
-{
-	title('Confirm Backup');
-	$stmt=create_backup_stmt();
-	$_SESSION['backupFile'] = $stmt['target'];
-
-	$dir=$stmt['dir'];
-	if ($dir != '')
-	{
-?>
-
-Are you sure you want to perform the backup?
-
-<P>
-Your mysql installation has been resolved. Manually, you would do the following:
-<P>
-<table bgcolor="lightgrey">
-<tr>
-<td>
-<nobr>cd "<?php echo $dir;?>"</nobr>
-<br/>
-<?php
-	}
-	else
-	{
-?>
-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.
-<P>
-You can continue to do the backup manually using the following process:
-<P>
-<table bgcolor="lightgrey">
-<tr>
-<td>
-<?php
-
-	}
-?>
-<nobr><?php echo $stmt['display'];?></nobr>
-</table>
-<P>
-
-&nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="back" onclick="javascript:do_start('home')"> &nbsp;&nbsp; &nbsp; &nbsp;
-
-<?php
-if ($dir != '')
-{
-?>
-
-<input type=button value="next" onclick="javascript:do_start('Backup')">
-
-
-<?php
-}
-}
-
-function restoreSelect()
-{
-	title('Select Backup to Restore');
-
-	$dir = resolveTempDir();
-
-	$files = array();
-	if ($dh = opendir($dir))
-	{
-        while (($file = readdir($dh)) !== false)
-        {
-			if (!preg_match('/kt-backup.+\.sql/',$file))
-			{
-				continue;
-			}
-        	$files[] = $file;
-        }
-        closedir($dh);
-    }
-
-    if (count($files) == 0)
-    {
- ?>
- 	There don't seem to be any backups to restore from the <i>"<?php echo $dir;?>"</i> directory.
- <?php
-    }
-    else
-    {
- ?>
- 	<P>
- 	Select a backup to restore from the list below:
- 	<P>
- 	<script type="text/javascript">
- 	function selectRestore(filename)
- 	{
- 		document.location='?go=RestoreSelected&file=' + filename;
- 	}
- 	</script>
- 	<table border=1 cellpadding=1 cellspacing=1>
- 			<tr bgcolor="darkgrey">
-			<td>Filename
-			<td>File Size
-			<td>Action
-<?php
-	$i=0;
-	foreach($files as $file)
-	{
-		$color=((($i++)%2)==0)?'white':'lightgrey';
-?>
-		<tr bgcolor="<?php echo $color;?>">
-			<td><?php echo $file;?>
-			<td><?php echo filesize($dir . '/'.$file);?>
-			<td><input type=button value="restore" onclick="javascript:selectRestore('<?php echo $file;?>')">
-<?php
-	}
-?>
- 	</table>
- <?php
-    }
-   ?>
-
-   <p>
-&nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="back" onclick="javascript:do_start('welcome')">
-   <?php
-
-}
-
-function restoreSelected()
-{
-	$file=$_REQUEST['file'];
-
-	$dir = resolveTempDir();
-	$_SESSION['backupFile'] = $dir . '/' . $file;
-?>
-<script type="text/javascript">
-document.location='?go=RestoreConfirm';
-</script>
-<?php
-
-}
-
-function restoreConfirm()
-{
-	if (!isset($_SESSION['backupFile']) || !is_file($_SESSION['backupFile']) || filesize($_SESSION['backupFile']) == 0)
-	{
-		restoreSelect();
-		exit;
-	}
-
-	title('Confirm Restore');
-	$status = $_SESSION['backupStatus'];
-	$filename=$_SESSION['backupFile'];
-	$stmt=create_restore_stmt($filename);
-
-	$dir=$stmt['dir'];
-	if ($dir != '')
-	{
-?>
-<P>
-<P>
-Manually, you would do the following to restore the backup:
-<P>
-<table bgcolor="lightgrey">
-<tr>
-<td>
-<nobr>cd "<?php echo $dir;?>"</nobr>
-<br/>
-<?php
-	}
-	else
-	{
-?>
-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.
-<P>
-You can continue to do the restore manually using the following command(s):
-<P>
-<table bgcolor="lightgrey">
-<tr>
-<td>
-<?php
-
-	}
-?>
-<nobr><?php echo $stmt['display'];?></nobr>
-</td>
-</tr>
-</table>
-<P>
-<?php
-if ($dir != '')
-{
-?>
-Press <i>continue to restore</i> to attempt the command(s) above.
-
-<P>
-<?php
-}
-?>
-
-&nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="back" onclick="javascript:do_start('home')">
-&nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="select another backup" onclick="javascript:do_start('RestoreSelect')">
-
-<?php
-if ($dir != '')
-{
-?>
-<script type="text/javascript">
-function restore()
-{
-	if (confirm('Are you sure you want to restore? This is your last chance if the current data has not been backed up.'))
-	{
-		do_start('Restore');
-	}
-}
-</script>
-&nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="next" onclick="javascript:restore()">
-
-
-<?php
-}
-}
-
-
-function backupDone()
-{
-	check_state(2);
-	set_state(3);
-	title('Backup Status');
-	$status = $_SESSION['backupStatus'];
-	$filename=$_SESSION['backupFile'];
-
-	if ($status)
-	{
-		$stmt=create_restore_stmt($filename);
-?>
-		The backup file <nobr><i>"<?php echo $filename;?>"</i></nobr> has been created.
-		<P> It appears as though the <font color=green>backup has been successful</font>.
-		<P>
-		<?php
-			if ($stmt['dir'] != '')
-			{
-		?>
-				Manually, you would do the following to restore the backup:
-				<P>
-				<table bgcolor="lightgrey">
-				<tr>
-					<td>
-						<nobr>cd <?php echo $stmt['dir'];?></nobr>
-						<br/>
-		<?php
-			}
-			else
-			{
-		?>
-			The mysql backup utility could not be found automatically. Please edit the config.ini and update the backup/mysql Directory entry.
-				<P>
-				If you need to restore from this backup, you should be able to use the following statements:
-				<P>
-				<table bgcolor="lightgrey">
-				<tr>
-					<td>
-		<?php
-			}
-		?>
-						<nobr><?php echo $stmt['display'];?></nobr>
-				</table>
-
-<?php
-	}
-	else
-	{
-?>
-It appears as though <font color=red>the backup process has failed</font>.<P></P> Unfortunately, it is difficult to diagnose these problems automatically
-and would recommend that you try to do the backup process manually.
-<P>
-We appologise for the inconvenience.
-<P>
-<table bgcolor="lightgrey">
-<tr>
-<td>
-<?php echo $_SESSION['backupOutput'];?>
-</table>
-<?php
-
-	}
-?>
-<br/>
-
-&nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="back" onclick="javascript:do_start('welcome')">
-<?php
-	if ($status)
-	{
-		?>
-&nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="next" onclick="javascript:do_start('UpgradeConfirm')">
-
-<?php
-	}
-}
-function restoreDone()
-{
-	check_state(5);
-	set_state(6);
-	title('Restore Status');
-	$status = $_SESSION['restoreStatus'];
-	 $filename=$_SESSION['backupFile'];
-
-	if ($status)
-	{
-
-?>
-		The restore of <nobr><i>"<?php echo $filename;?>"</i></nobr> has been completed.
-		<P>
-		It appears as though the <font color=green>restore has been successful</font>.
-		<P>
-
-
-
-<?php
-	}
-	else
-	{
-?>
-It appears as though <font color=red>the restore process has failed</font>. <P>
-Unfortunately, it is difficult to diagnose these problems automatically
-and would recommend that you try to do the backup process manually.
-<P>
-We appologise for the inconvenience.
-<P>
-<table bgcolor="lightgrey">
-<tr>
-<td>
-<?php echo $_SESSION['restoreOutput'];?>
-</table>
-<?php
-
-	}
-?>
-
-<br/>
-
-&nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="back" onclick="javascript:do_start('welcome')">
-
-<?php
-
-}
-
-function set_state($value)
-{
-	$_SESSION['state'] = $value;
-}
-function check_state($value, $state='Home')
-{
-	if ($_SESSION['state'] != $value)
-	{
-		?>
-			<script type="text/javascript">
-			document.location="?go=<?php echo $state;?>";
-			</script>
-			<?php
-			exit;
-	}
-}
-
-function backup()
-{
-	check_state(1);
-	set_state(2);
-	title('Backup In Progress');
-	$targetfile=$_SESSION['backupFile'];
-	$stmt=create_backup_stmt($targetfile);
-	$dir=$stmt['dir'];
-
-
-
-
-	if (is_file($dir . '/mysqladmin') || is_file($dir . '/mysqladmin.exe'))
-	{
-		ob_flush();
-		flush();
-?>
-		The backup is now underway. Please wait till it completes.
-<?php
-
-		ob_flush();
-		flush();
-		$curdir=getcwd();
-		chdir($dir);
-		ob_flush();
-		flush();
-
-		$handle = popen($stmt['cmd'], 'r');
-		$read = fread($handle, 10240);
-		pclose($handle);
-		$_SESSION['backupOutput']=$read;
-		$dir=resolveTempDir();
-		$_SESSION['backupFile'] =   $stmt['target'];
-
-			if (OS_UNIX)
-			{
-				chmod($stmt['target'],0600);
-			}
-
-		if (is_file($stmt['target']) && filesize($stmt['target']) > 0)
-		{
-			$_SESSION['backupStatus'] = true;
-
-		}
-		else
-		{
-			$_SESSION['backupStatus'] = false;
-		}
-?>
-			<script type="text/javascript">
-			document.location="?go=BackupDone";
-			</script>
-<?php
-
-
-	}
-	else
-	{
-?>
-<P>
-	The <i>mysqldump</i> utility was not found in the <?php echo $dir;?> subdirectory.
-
-&nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="back" onclick="javascript:do_start('welcome')">
-<?php
-	}
-
-
-
-}
-
-
-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'))
-	{
-
-?>
-		The restore is now underway. Please wait till it completes.
-<?php
-		print "\n";
-
-
-		$curdir=getcwd();
-		chdir($dir);
-
-
-		$ok=true;
-		$stmts=explode("\n",$stmt['cmd']);
-		foreach($stmts as $stmt)
-		{
-
-			$handle = popen($stmt, 'r');
-			if ($handle=='false')
-			{
-				$ok=false;
-				break;
-			}
-			$read = fread($handle, 10240);
-			pclose($handle);
-			$_SESSION['restoreOutput']=$read;
-		}
-
-
-
-
-
-			$_SESSION['restoreStatus'] = $ok;
-
-
-?>
-			<script type="text/javascript">
-			document.location="?go=RestoreDone";
-			</script>
-<?php
-
-
-	}
-	else
-	{
-?>
-<P>
-	The <i>mysql</i> utility was not found in the <?php echo $dir;?> subdirectory.
-
-&nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="back" onclick="javascript:do_start('welcome')">
-<?php
-	}
-
-
-
-}
-
-
-function welcome()
-{
-	set_state(1);
-?>
-<br/>
-Welcome to the <?php echo APP_NAME;?> Database Upgrade Wizard.<P> If you have just updated
-your <?php echo APP_NAME;?> code base, you will need to complete the upgrade process in order to ensure your system is fully operational with the new version.
-<P>
-You will not be able to log into <?php echo APP_NAME;?> until your the database upgrade process is completed.
-<P>
-<font color="#ffa500">!!NB!! You are advised to backup the database before attempting the upgrade. !!NB!!</font>
-<P>
-If you have already done this, you may skip this step can continue directly to the upgrade.
-<P>
-
-
-&nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="cancel" onclick="document.location='..';"/>
-&nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="backup now" onclick="javascript:do_start('BackupConfirm');"/>
-&nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="next" onclick="javascript:do_start('UpgradeConfirm');"/>
-&nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="restore database" onclick="javascript:do_start('RestoreConfirm');"/>
-
-
-<?php
-
-
-}
-
-
-function UpgradePreview()
-{
-	title('Preview Upgrade');
-	global $default;
-?>
-        <p>The table below describes the upgrades that need to occur to
-        upgrade your <?php echo APP_NAME;?> installation to <strong><?php echo $default->systemVersion;?></strong>.
-        Click on the button below the table to perform the upgrades.</p>
-  <?php
-        $upgradeTable = generateUpgradeTable();
-	print $upgradeTable;
-	?>
-	<br/>
-
-&nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="back" onclick="javascript:do_start('home')">
-&nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="next" onclick="javascript:do_start('Upgrade')">
-	<?php
-
-}
-
-
-function Upgrade()
-{
-	title('Upgrade In Progress');
-	global $default;
-?>
-        <p>The table below describes the upgrades that have occurred to
-        upgrade your <?php echo APP_NAME;?> installation to <strong><?php echo $default->systemVersion;?></strong>.
-
-  <?php
-    $pre_res = performPreUpgradeActions();
-	if (PEAR::isError($pre_res))
-	{
-?>
-<font color="red">Pre-Upgrade actions failed.</font><br/>
-<?php
-	}
-	else
-	{
-?>
-<p>
-<font color="green">Pre-Upgrade actions succeeded.</font><br/>
-<?php
-	}
-?>
-<p>
-  <?php
-	$res = performAllUpgrades();
-	if (PEAR::isError($res) || PEAR::isError($pres))
-	{
-?>
-<font color="red">Upgrade failed.</font>
-<?php
-	}
-	else
-	{
-?>
-<p>
-<font color="green">Upgrade succeeded.</font>
-<?php
-	}
-?>
-<p>
-  <?php
-    $post_pres = performPostUpgradeActions();
-	if (PEAR::isError($post_res))
-	{
-?>
-<font color="red">Post-Upgrade actions failed.</font><br/><br/>
-<?php
-	}
-	else
-	{
-?>
-<p>
-<font color="green">Post-Upgrade actions succeeded.</font><br/><br/>
-<script type="text/javascript">
-    alert("To complete the upgrade please do the following before continuing:\n\n1. Restart the services as appropriate for your environment.\n\n\nOn first run of your upgraded installaton please do the following:\n\n1. Hard refresh your bowser (CTRL-F5) on first view of the Dashboard.\n2. Enable the new plugins you wish to use.\n\n\nSelect 'next' at the bottom of this page to continue.")
-</script>
-<?php
-	}
-?>
-
-&nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="back" onclick="javascript:do_start('home')">
-&nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="next" onclick="javascript:document.location='..';">
-<?php
-}
-
-?>
-<tr>
-<td height=80 <?php
-  	if($oKTConfig->get('ui/poweredByDisabled') == '0'){
-  		?> align="right"><img src="<?php echo $oKTConfig->get('ui/powerLogo');?>"></td>
-  	<?php }else{ ?>
-	  	background="../resources/graphics/ktbg.png">&nbsp;</td>
-	<?php }?>
-</table>
+header("Location: upgrade/");
+exit();
 \ No newline at end of file
@@ -112,37 +112,68 @@ class unixOpenOffice extends unixService {
     public function status($updrade = false) {
     	sleep(1);
-    	if($updrade) {
-    		$cmd = "ps ax | grep soffice";
-    	} else {
-    		$cmd = "netstat -npa | grep ".$this->getPort();
-    	}
-    	$response = $this->util->pexec($cmd);
+		$cmd = "ps ax | grep soffice";
+		$response = $this->util->pexec($cmd);
     	if(is_array($response['out'])) {
-    		if(count($response['out']) > 0) {
-    			preg_match('/8100/', $response['out'][0], $matches); // Ignore grep
-				if($matches) {
-    				if($matches[0] == '8100') {
+    		if(count($response['out']) > 1) {
+    			foreach ($response['out'] as $r) {
+    				preg_match('/grep/', $r, $matches); // Ignore grep
+    				if(!$matches) {
     					return 'STARTED';
     				}
-				}
+    			}
     		} else {
     			return '';
     		}
     	}
-    	
+    	/*
+    	if($updrade) {
+    		$cmd = "ps ax | grep soffice";
+    		$response = $this->util->pexec($cmd);
+	    	if(is_array($response['out'])) {
+	    		if(count($response['out']) > 1) {
+	    			foreach ($response['out'] as $r) {
+	    				preg_match('/grep/', $r, $matches); // Ignore grep
+	    				if(!$matches) {
+	    					return 'STARTED';
+	    				}
+	    			}
+	    		} else {
+	    			return '';
+	    		}
+	    	}
+    	} else {
+    		$cmd = "netstat -npa | grep ".$this->getPort();
+	    	$response = $this->util->pexec($cmd);
+	    	if(is_array($response['out'])) {
+	    		if(count($response['out']) > 0) {
+	    			preg_match('/8100/', $response['out'][0], $matches); // Ignore grep
+					if($matches) {
+	    				if($matches[0] == '8100') {
+	    					return 'STARTED';
+	    				}
+					}
+	    		} else {
+	    			return '';
+	    		}
+	    	}
+    	}
+    	*/
     	return '';
     }
     public function start() {
     	$state = $this->status();
     	if($state != 'STARTED') {
-			$cmd = "nohup {$this->getBin()} ".$this->getOption()." > ".$this->outputDir."openoffice.log 2>&1 & echo $!";
+			//$cmd = "nohup {$this->getBin()} ".$this->getOption()." > ".$this->outputDir."openoffice.log 2>&1 & echo $!";
+//			$cmd = "{$this->getBin()} ".$this->getOption();
+//"/usr/bin/java" openOffice -cp "/var/www/installers/knowledgetree/setup/wizard/lib/system/;" /usr/bin/soffice
+//"/usr/bin/java" -cp "/var/www/installers/knowledgetree/setup/wizard/lib/system/;" openOffice /usr/bin/soffice
+	    	$cmd = "\"{$this->util->getJava()}\" -cp \"".SYS_DIR."\" openOffice ".$this->getBin();
 	    	if(DEBUG) {
 	    		echo "Command : $cmd<br/>";
 	    		return ;
 	    	}
-	    	$cmd .= "\"{$this->util->getJava()}\" -cp \"".SYS_DIR.";\" openOffice \"";
 	    	$response = $this->util->pexec($cmd);
 	    	return $response;
@@ -5,12 +5,13 @@ import java.util.Properties;
 public class openOffice {
 	public static void main(String args[]) throws Exception {
+		String openoffice = args[0];
 		try {
         	// Execute a command without arguments
-        	String command = "nohup /usr/bin/soffice -nofirststartwizard -nologo -headless -accept=\"socket,host=localhost,port=8100;urp;StarOffice.ServiceManager\" > /dev/null 2>&1 & echo $!";
+        	String command = "nohup "+openoffice+" -nofirststartwizard -nologo -headless -accept=\"socket,host=localhost,port=8100;urp;StarOffice.ServiceManager\"";
         	Process child = Runtime.getRuntime().exec(command);
     	} catch (IOException e) {
     		System.err.println("Error: " + e.getMessage());
     	}
 	}
-}
 \ No newline at end of file
+}
@@ -219,10 +219,16 @@ wizard.prototype.sendRegistration = function ()  {
 wizard.prototype.clearSessions = function ()  {
 	var address = 'session.php?action=destroyInstall';
+	w.clearASession(address);
+	var address = 'session.php?action=destroyMigrate';
+	w.clearASession(address);
+}
+
+wizard.prototype.clearASession = function (address)  {
 	$.ajax({
 		url: address,
 		dataType: "html",
 		type: "POST",
 		cache: false,
-	});
+	});	
 }
 \ No newline at end of file
@@ -84,6 +84,7 @@ class complete extends Step {
         // check services
         $this->checkServices();
         $this->storeSilent();// Set silent mode variables
+        
     }
     private function checkFileSystem()
@@ -172,7 +173,8 @@ class complete extends Step {
         }
         // make db connection - user
-        $loaded = $this->_dbhandler->load($dbconf['dhost'], $dbconf['dmsusername'], $dbconf['dmsuserpassword'], $dbconf['dname']);
+        $this->_dbhandler->load($dbconf['dhost'], $dbconf['dmsusername'], $dbconf['dmsuserpassword'], $dbconf['dname']);
+        $loaded = $this->_dbhandler->getDatabaseLink();
         // if we can log in to the database, check access
         // TODO check write access?
         if ($loaded)
@@ -242,6 +244,11 @@ class complete extends Step {
     	$this->temp_variables['paths_check'] = $this->paths_check;
     	$this->temp_variables['privileges_check'] = $this->privileges_check;
     	$this->temp_variables['database_check'] = $this->database_check;
+    	if (file_exists('migrate.lock')) {
+    		$this->temp_variables['migrate_check'] = true;
+    	} else {
+    		$this->temp_variables['migrate_check'] = false;
+    	}
     }
 }
 ?>
 \ No newline at end of file
@@ -636,6 +636,10 @@ class database extends Step
         }
+		if(!$this->importExportedDB()) {
+			$this->error['con'] = "Could not Import ";
+		}
+		
         return true;
     }
@@ -805,6 +809,20 @@ class database extends Step
     	return $this->parse_mysql_dump(SQL_INSTALL_DIR."data.sql");
     }
+    private function importExportedDB() {
+		if (!WINDOWS_OS) {
+            $dir='/tmp/kt-db-backup';
+        }
+        else {
+            $dir='c:/kt-db-backup';
+        }
+    	$sqlFile = $dir."/dms_migrate.sql";
+    	$this->parse_mysql_dump($sqlFile);
+    	$this->_dbhandler->load($this->dhost, $this->duname, $this->dpassword, $this->dname);
+//    	$this->_dbhandler->query("TRUNCATE plugins;");
+    	$this->_dbhandler->query("TRUNCATE plugin_helper;");
+    	return true;
+    }
 	/**
 	* Close connection if it exists
 	*
@@ -91,7 +91,7 @@ class install extends step
     public function doRun()
     {
-        if(isset($_POST['Install'])){
+        if(isset($_POST['Install'])) {
             if(isset($_POST['call_home'])){
                 $value = $_POST['call_home'];
             }else{
@@ -117,7 +117,12 @@
 		<?php } ?>
 		</div>
 	</div>
-    <a href="../../" class="buttons back" style="width:80px;" onclick="javascript:{w.clearSessions();}">Goto Login</a>
+	<?php if($migrate_check) { ?>
+<!--    <a href="../upgrade" class="buttons back" style="width:62px;" onclick="javascript:{w.clearSessions();}">Upgrade</a>-->
+		<a href="../../login.php" class="buttons back upgrade" style="width:80px;" onclick="javascript:{w.clearSessions();}">Goto Login</a>
+    <?php } else { ?>
+    <a href="../../login.php" class="buttons back upgrade" style="width:80px;" onclick="javascript:{w.clearSessions();}">Goto Login</a>
+    <?php } ?>
     <?php
         if (INSTALL_TYPE == 'Zend') {
         	?>