Merge branch 'edge' of git@github.com:ktgit/knowledgetree into edge

Mark Holtzhausen
2 parents 013ceb18 ae75ba39
Showing 47 changed files with 1452 additions and 2675 deletions
bin/system_info.php
setup/migrate/ini.php
setup/migrate/migrateUtil.php
setup/migrate/migrater.php
setup/migrate/path.php
setup/migrate/session.php
setup/migrate/steps/migrateComplete.php
setup/migrate/steps/migrateDatabase.php
setup/migrate/steps/migrateInstallation.php
setup/migrate/templates/database.tpl
setup/migrate/templates/installation.tpl
setup/migrate/templates/installation_confirm.tpl
setup/upgrade.php
setup/upgrade/index.php
setup/upgrade/step.php
setup/upgrade/steps/upgradeBackup.php
setup/upgrade/steps/upgradeComplete.php
setup/upgrade/steps/upgradeDatabase.php
setup/upgrade/steps/upgradeInstallation.php
setup/upgrade/steps/upgradeRestore.php
+<?php
+
+/**
+ *
+ * $Id:
+ *
+ * KnowledgeTree Community Edition
+ * Document Management Made Simple
+ * Copyright (C) 2008, 2009 KnowledgeTree Inc.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License version 3 as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
+ * California 94120-7775, or email info@knowledgetree.com.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the
+ * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+ * must display the words "Powered by KnowledgeTree" and retain the original
+ * copyright notice.
+ * Contributor( s): ______________________________________
+ */
+
+/*
+* Script to collect system information as part of a call home mechanism, no identifying information is stored.
+*
+* The following data is collected:
+* Unique installation information: installation GUID, number of users in repository, number of documents in repository,
+* operating system (platform, platform version, flavor if Linux), version and edition.
+*/
+chdir(realpath(dirname(__FILE__)));
+require_once('../config/dmsDefaults.php');
+
+global $default;
+$default->log->debug('System information collection script starting...');
+
+// Get installation guid
+function getGuid()
+{
+    $guid = KTUtil::getSystemIdentifier();
+
+    if(PEAR::isError($guid)){
+        $guid = '';
+    }
+    return $guid;
+}
+
+// Get the number of users in the repository
+function getUserCnt()
+{
+    $query = 'select count(*) as cnt, disabled from users where id > 0 group by disabled;';
+    $result = DBUtil::getResultArray($query);
+
+    if(empty($result) || PEAR::isError($result)){
+        return '';
+    }
+    $users = '';
+
+    foreach ($result as $row){
+        $str = '';
+        switch($row['disabled']){
+            case 0: $str = 'Enabled'; break;
+            case 1: $str = 'Disabled'; break;
+            case 2: $str = 'Deleted'; break;
+        }
+
+        $str .= ': '.$row['cnt'];
+
+        $users .= (!empty($users)) ? '; ' : '';
+        $users .= $str;
+    }
+    return $users;
+}
+
+// Get the number of documents in the repository
+function getDocCnt()
+{
+    $query = 'select count(*) as cnt, s.name from documents d, status_lookup s WHERE s.id = d.status_id group by d.status_id;';
+    $result2 = DBUtil::getResultArray($query);
+
+    if(empty($result2) || PEAR::isError($result2)){
+        return '';
+    }
+    $docs = '';
+
+    foreach ($result2 as $row){
+        $docs .= (!empty($docs)) ? '; ' : '';
+        $docs .= $row['name'].': '.$row['cnt'];
+    }
+    return $docs;
+}
+
+// Get the version of KT
+function getKTVersion()
+{
+    $version = KTUtil::getSystemSetting('knowledgeTreeVersion');
+    if(empty($version) || PEAR::isError($version)){
+        $version = file_get_contents(KT_DIR . 'docs/VERSION.txt');
+    }
+    // remove newline that is in the version file
+    $version = str_replace("\n", '', $version);
+    return $version;
+}
+
+// Get the edition of KT
+function getKTEdition()
+{
+    $edition = 'Community';
+    if (KTPluginUtil::pluginIsActive('ktdms.wintools')) {
+        $path = KTPluginUtil::getPluginPath('ktdms.wintools');
+        require_once($path .  'baobabkeyutil.inc.php');
+        $edition = BaobabKeyUtil::getName();
+
+        // Remove the brackets around the name
+        $edition = substr($edition, 1);
+        $edition = substr($edition, 0, strlen($edition)-1);
+    }
+    return $edition;
+}
+
+
+// Get OS info - platform, version, linux flavour
+function getOSInfo()
+{
+    $server = php_uname();
+
+    if(strpos($server, 'Darwin') !== false){
+        $os = 'Mac OS X';
+    }else if(strpos($server, 'Win') !== false){
+        $os = 'Windows';
+    }else {
+        $os = 'Linux';
+    }
+
+    return $os;
+}
+
+function sendForm($data)
+{
+    $url = 'http://ktnetwork.knowledgetree.com/call_home.php';
+    //$url = 'http://10.33.20.250/knowledgetree/call_home.php';
+    $data = http_build_query($data);
+
+	$ch = curl_init($url);
+	curl_setopt($ch,CURLOPT_SSL_VERIFYPEER, false);
+	curl_setopt($ch,CURLOPT_SSL_VERIFYHOST, false);
+	curl_setopt($ch, CURLOPT_POST, true);
+	curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+	curl_exec($ch);
+	curl_close($ch);
+}
+
+$post_str = getGuid() .'|'. getUserCnt() .'|'. getDocCnt() .'|'. getKTVersion() .'|'. getKTEdition() .'|'. getOSInfo();
+$data['system_info'] = $post_str;
+
+sendForm($data);
+
+$default->log->debug('System information collection script finishing.');
+exit(0);
+?>
-<?php
-/**
- * $Id:$
- *
- * KnowledgeTree Community Edition
- * Document Management Made Simple
- * Copyright (C) 2008, 2009 KnowledgeTree Inc.
- * Portions copyright The Jam Warehouse Software (Pty) Limited
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License version 3 as published by the
- * Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
- * California 94120-7775, or email info@knowledgetree.com.
- *
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU General Public License version 3.
- *
- * In accordance with Section 7(b) of the GNU General Public License version 3,
- * these Appropriate Legal Notices must retain the display of the "Powered by
- * KnowledgeTree" logo and retain the original copyright notice. If the display of the
- * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
- * must display the words "Powered by KnowledgeTree" and retain the original
- * copyright notice.
- * Contributor( s): ______________________________________
- *
- */
-
-class Ini {
-
-    private $cleanArray = array();
-    private $iniFile = '';
-    private $lineNum = 0;
-    private $exists = '';
-
-    function Ini($iniFile = '../../config.ini') {
-       $this->iniFile = $iniFile;
-       $this->backupIni($iniFile);
-       $this->read($iniFile);
-    }
-
-    /**
-     * Create a backup with the date as an extension in the same location as the original config.ini
-     *
-     * @param string $iniFile
-     * @return boolean
-     */
-    function backupIni($iniFile)
-    {
-    	$content = file_get_contents($iniFile);
-    	if ($content === false)
-    	{
-    		return false;
-    	}
-    	$date = date('YmdHis');
-
-    	$backupFile = $iniFile . '.' .$date;
-        if (is_writeable($backupFile)) {
-    	    file_put_contents($backupFile, $content);
-        }
-    }
-
-    function read($iniFile) {
-
-        $iniArray = file($iniFile);
-        $section = '';
-        foreach($iniArray as $iniLine) {
-            $this->lineNum++;
-            $iniLine = trim($iniLine);
-            $firstChar = substr($iniLine, 0, 1);
-            if($firstChar == ';') {
-                if($section == ''){
-                    $this->cleanArray['_comment_'.$this->lineNum]=$iniLine;
-                }else {
-                    $this->cleanArray[$section]['_comment_'.$this->lineNum]=$iniLine;
-                }
-                continue;
-            }
-            if($iniLine == '') {
-                if($section == ''){
-                    $this->cleanArray['_blankline_'.$this->lineNum]='';
-                }else {
-                    $this->cleanArray[$section]['_blankline_'.$this->lineNum]='';
-                }
-                continue;
-            }
-
-            if ($firstChar == '[' && substr($iniLine, -1, 1) == ']') {
-                $section = substr($iniLine, 1, -1);
-                $this->sections[] = $section;
-            } else {
-                $equalsPos = strpos($iniLine, '=');
-                if ($equalsPos > 0 && $equalsPos != sizeof($iniLine)) {
-                    $key = trim(substr($iniLine, 0, $equalsPos));
-                    $value = trim(substr($iniLine, $equalsPos+1));
-                    if (substr($value, 1, 1) == '"' && substr( $value, -1, 1) == '"') {
-                        $value = substr($value, 1, -1);
-                    }
-                    $this->cleanArray[$section][$key] = stripcslashes($value);
-                } else {
-                    $this->cleanArray[$section][trim($iniLine)]='';
-                }
-            }
-        }
-        return $this->cleanArray;
-    }
-
-    function write($iniFile = "") {
-
-        if(empty($iniFile)) {
-            $iniFile = $this->iniFile;
-        }
-        if (!is_writeable($iniFile)) {
-            return;
-        }
-
-        $fileHandle = fopen($iniFile, 'wb');
-        foreach ($this->cleanArray as $section => $items) {
-            if (substr($section, 0, strlen('_blankline_')) === '_blankline_' ) {
-                fwrite ($fileHandle, "\r\n");
-                continue;
-            }
-            if (substr($section, 0, strlen('_comment_')) === '_comment_' ) {
-                fwrite ($fileHandle, "$items\r\n");
-                continue;
-            }
-            fwrite ($fileHandle, "[".$section."]\r\n");
-            foreach ($items as $key => $value) {
-                if (substr($key, 0, strlen('_blankline_')) === '_blankline_' ) {
-                    fwrite ($fileHandle, "\r\n");
-                    continue;
-                }
-                if (substr($key, 0, strlen('_comment_')) === '_comment_' ) {
-                    fwrite ($fileHandle, "$value\r\n");
-                    continue;
-                }
-
-                $value = addcslashes($value,'');
-                //fwrite ($fileHandle, $key.' = "'.$value."\"\r\n");
-                fwrite ($fileHandle, $key.' = '.$value."\r\n");
-            }
-        }
-        fclose($fileHandle);
-    }
-
-    function itemExists($checkSection, $checkItem) {
-
-        $this->exists = '';
-        foreach($this->cleanArray as $section => $items) {
-            if($section == $checkSection) {
-                $this->exists = 'section';
-                foreach ($items as $key => $value) {
-                    if($key == $checkItem) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    function addItem($addSection, $addItem, $value, $itemComment = '', $sectionComment = '') {
-
-        if($this->itemExists($addSection, $addItem)) {
-            $this->delItem($addSection, $addItem);
-        }
-
-        if($this->exists != 'section') {
-            $this->cleanArray['_blankline_'.$this->lineNum++]='';
-            if(!empty($sectionComment)) $this->cleanArray['_comment_'.$this->lineNum++] = '; '.$sectionComment;
-        }
-        if(!empty($itemComment)) {
-            $this->cleanArray[$addSection]['_comment_'.$this->lineNum++] = '; '.$itemComment;
-        }
-        $this->cleanArray[$addSection][$addItem] = stripcslashes($value);
-        return true;
-    }
-
-    function updateItem($addSection, $addItem, $value) {
-
-        $this->cleanArray[$addSection][$addItem] = stripcslashes($value);
-        return true;
-    }
-
-    function delItem($delSection, $delItem) {
-
-        if(!$this->itemExists($delSection, $delItem)) return false;
-
-        unset($this->cleanArray[$delSection][$delItem]);
-        return true;
-    }
-
-    function delSection($delSection) {
-
-        unset($this->cleanArray[$delSection]);
-        return true;
-    }
-    
-    // Return file line by line
-    public function getFileByLine() {
-        $data = $this->read($this->iniFile);
-        return $data[''];
-    }
-    
-    public function getSection($section) {
-    	if (isset($this->cleanArray[$section])) {
-    		return $this->cleanArray[$section];
-    	}
-    	
-    	return false;
-    }
-}
-?>
@@ -142,6 +142,11 @@ class MigrateUtil {
     	return new $serviceName();
     }
  
+    public function loadInstallIni($path) {
+    	require_once("../wizard/ini.php");
+    	return new Ini($path);
+    }
+    
     public function redirect($url, $exit = true, $rfc2616 = false)
     {
 		return $this->bootstrap->redirect($url, $exit = true, $rfc2616 = false);
@@ -510,6 +510,9 @@ class Migrater {
     	} elseif (isset($_POST['BInstall'])) {
     		$this->migraterAction = 'binstall';
     		$this->response = 'binstall';
+//    	} elseif (isset($_POST['Backup'])) {
+//    		$this->migraterAction = 'backup';
+//    		$this->response = 'backup';
     	} else {
     		$this->response = '';
     		$this->migraterAction = '';
@@ -545,8 +548,8 @@ class Migrater {
                 }
             	break;
             case 'previous':
-                $this->_backward(); // Load previous page
-            	break;
+				$this->_backward(); // Load previous page
+				break;
             case 'install':
                 $iutil = new MigrateUtil();
                 $iutil->redirect('../wizard/index.php?step_name=installtype');
@@ -555,6 +558,11 @@ class Migrater {
                 $iutil = new MigrateUtil();
                 $iutil->redirect('../wizard/index.php?step_name=dependencies');
             	break;
+//            case 'backup':
+//                $iutil = new MigrateUtil();
+//                $iutil->redirect('../upgrade/index.php?step_name=backup');
+//                $iutil->redirect("..".DS."upgrade".DS."index.php?step_name=backup");
+//            	break;
             default:
             	// TODO : handle silent
             	$this->_landing();
-<?php
-/**
-* Migrater Paths.
-*
-* KnowledgeTree Community Edition
-* Document Management Made Simple
-* Copyright (C) 2008,2009 KnowledgeTree Inc.
-* Portions copyright The Jam Warehouse Software (Pty) Limited
-*
-* This program is free software; you can redistribute it and/or modify it under
-* the terms of the GNU General Public License version 3 as published by the
-* Free Software Foundation.
-*
-* This program is distributed in the hope that it will be useful, but WITHOUT
-* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-* details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
-* California 94120-7775, or email info@knowledgetree.com.
-*
-* The interactive user interfaces in modified source and object code versions
-* of this program must display Appropriate Legal Notices, as required under
-* Section 5 of the GNU General Public License version 3.
-*
-* In accordance with Section 7(b) of the GNU General Public License version 3,
-* these Appropriate Legal Notices must retain the display of the "Powered by
-* KnowledgeTree" logo and retain the original copyright notice. If the display of the
-* logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
-* must display the words "Powered by KnowledgeTree" and retain the original
-* copyright notice.
-*
-* @copyright 2008-2009, KnowledgeTree Inc.
-* @license GNU General Public License version 3
-* @author KnowledgeTree Team
-* @package Migrater
-* @version Version 0.1
-*/
-	// Define installer environment
-	define('DEBUG', 0);
-	define('AJAX', 0);
-	// Define migrater environment
-	if (substr(php_uname(), 0, 7) == "Windows"){
-    	define('WINDOWS_OS', true);
-    	define('UNIX_OS', false);
-    	define('OS', 'windows');
-	} else {
-    	define('WINDOWS_OS', false);
-    	define('UNIX_OS', true);
-    	define('OS', 'unix');
-	}
-	if(WINDOWS_OS) {
-		define('DS', '\\');
-	} else {
-		define('DS', '/');
-	}
-	// Define environment root
-	$wizard = realpath(dirname(__FILE__));
-	$xdir = explode(DS, $wizard);
-	array_pop($xdir);
-	array_pop($xdir);
-	$sys = '';
-	foreach ($xdir as $k=>$v) {
-		$sys .= $v.DS;
-	}
-	// Define paths to wizard
-    define('MIGRATE_DIR', $wizard.DS);
-    define('WIZARD_LIB', MIGRATE_DIR."lib".DS);
-    define('SERVICE_LIB', WIZARD_LIB."services".DS);
-    define('SQL_DIR', MIGRATE_DIR."sql".DS);
-    define('SQL_UPGRADE_DIR', SQL_DIR."upgrades".DS);
-    define('CONF_DIR', MIGRATE_DIR."config".DS);
-    define('RES_DIR', MIGRATE_DIR."resources".DS);
-    define('STEP_DIR', MIGRATE_DIR."steps".DS);
-    define('TEMP_DIR', MIGRATE_DIR."templates".DS);
-    define('SHELL_DIR', MIGRATE_DIR."shells".DS);
-    define('OUTPUT_DIR', MIGRATE_DIR."output".DS);
-    // Define paths to system webroot
-	define('SYSTEM_DIR', $sys);
-	define('SYS_VAR_DIR', SYSTEM_DIR."var".DS);
-    define('SYS_BIN_DIR', SYSTEM_DIR."bin".DS);
-    define('SYS_LOG_DIR', SYS_VAR_DIR."log".DS);
-    define('SYS_OUT_DIR', SYS_VAR_DIR);
-    define('VAR_BIN_DIR', SYS_VAR_DIR."bin".DS);
-    // Define paths to system
-    array_pop($xdir);
-	$asys = '';
-	foreach ($xdir as $k=>$v) {
-		$asys .= $v.DS;
-	}
-    define('SYSTEM_ROOT', $asys);
-    // Migrate Type
-    preg_match('/Zend/', $sys, $matches); // TODO: Dirty
-    if($matches) {
-		$sysdir = explode(DS, $sys);
-		array_pop($sysdir);
-		array_pop($sysdir);
-		array_pop($sysdir);
-		array_pop($sysdir);
-		$zendsys = '';
-		foreach ($sysdir as $k=>$v) {
-			$zendsys .= $v.DS;
-		}
-    	define('INSTALL_TYPE', 'Zend');
-    	define('PHP_DIR', $zendsys."ZendServer".DS."bin".DS);
-    } else {
-    	$modules = get_loaded_extensions();
-    	// TODO: Dirty
-    	if(in_array('Zend Download Server', $modules) || in_array('Zend Monitor', $modules) || in_array('Zend Utils', $modules) || in_array('Zend Page Cache', $modules)) {
-    		define('INSTALL_TYPE', 'Zend');
-    		define('PHP_DIR', '');
-    	} else {
-    		define('INSTALL_TYPE', '');
-    		define('PHP_DIR', '');
-    	}
-    }
-    // Other
-    date_default_timezone_set('Africa/Johannesburg');
-    if(WINDOWS_OS) { // Mysql bin [Windows]
-	    $serverPaths = explode(';',$_SERVER['PATH']);
-	    foreach ($serverPaths as $apath) {
-	    	preg_match('/mysql/i', $apath, $matches);
-	    	if($matches) {
-	    		define('MYSQL_BIN', $apath.DS);
-	    		break;
-	    	}
-	    }
-    } else {
-    	define('MYSQL_BIN', ''); // Assume its linux and can be executed from command line
-    }
-    
-?>
@@ -175,7 +175,7 @@ class Session
 	* @access public
 	* @return void
 	*/
-	public function destroy() {
+	public function destroyMigrate() {
 		$this->startSession();
 		unset($_SESSION[$this->salt]);
 		session_destroy();
@@ -82,8 +82,9 @@ class migrateComplete extends Step {
     }
  
     private function checkSqlDump() {
-    	$tmpFolder = "/tmp/knowledgtree";
-    	$sqlFile = $tmpFolder."dms.sql";
+    	$database = $this->getDataFromSession("database"); // Get installation directory
+    	// TODO
+    	$sqlFile = $_SESSION['migrate']['database']['dumpLocation'];
 		if(file_exists($sqlFile)) {
 			$this->temp_variables['sql']['class'] = "tick";
 			$this->temp_variables['sql']['name'] = "dms.sql";
@@ -52,14 +52,13 @@ class migrateDatabase extends Step
     public $_dbhandler = null;
  
 	/**
-	* Reference to Database object
+	* Reference to Utility object
 	*
 	* @author KnowledgeTree Team
 	* @access public
 	* @var object
 	*/	
-    public $_util = null;
-    
+    public $util = null;
  
 	/**
 	* List of errors encountered
@@ -95,7 +94,7 @@ class migrateDatabase extends Step
 	* @access public
 	* @var array
 	*/
-    protected $silent = true;
+    protected $silent = false;
  
 	/**
 	* List of errors used in template
@@ -105,7 +104,7 @@ class migrateDatabase extends Step
 	* @var array
 	*/
     public $templateErrors = array('dmspassword', 'dmsuserpassword', 'con', 'dname', 'dtype', 'duname', 'dpassword');
-    
+    private $sqlDumpFile = '';
 	/**
 	* Constructs database object
 	*
@@ -137,6 +136,7 @@ class migrateDatabase extends Step
     	}
 		if($this->next()) {
 			if($this->exportDatabase()) {
+				$this->storeSilent();
 				return 'next';
 			}
 		} else if($this->previous()) {
@@ -147,26 +147,78 @@ class migrateDatabase extends Step
     }
  
     public function exportDatabase() {
-    	if(WINDOWS_OS) {
-    		$tmpFolder = "../";
-    	} else {
-    		$tmpFolder = "/tmp/knowledgtree";
+    	if($this->doTest()) {
+	    	$installation = $this->getDataFromSession("installation"); // Get installation directory
+	    	$dbSettings = $installation['dbSettings'];
+	    	$location = $installation['location'];
+			$uname = $this->temp_variables['duname'];
+			$pwrd = $this->temp_variables['dpassword'];
+			$tmpFolder = $this->resolveTempDir();
+	    	if(WINDOWS_OS) {
+//	    		$tmpFolder = "tmp/";
+	    		$exe = "\"$location\mysql\bin\mysqldump.exe\""; // Location of dump
+	    	} else {
+//	    		$tmpFolder = "/tmp/";
+	    		$exe = "'$location/mysql/bin/mysqldump'"; // Location of dump
+	    	}
+			$sqlFile = $tmpFolder."/dms_migrate.sql";
+			$dbAdminUser = $dbSettings['dbAdminUser'];
+			$dbAdminPass = $dbSettings['dbAdminPass'];
+			$dbName = $dbSettings['dbName'];
+			$cmd = "$exe -u{$dbAdminUser} -p{$dbAdminPass} $dbName > ".$sqlFile;
+//			echo $cmd;
+//			die;
+			$response = $this->util->pexec($cmd);
+			if(file_exists($sqlFile)) {
+				$fileContents = file_get_contents($sqlFile);
+				if(!empty($fileContents)) {
+					$this->sqlDumpFile = realpath($sqlFile); // Store location of dump
+					return true;
+				}
+			}
     	}
-    	@mkdir($tmpFolder);
+    	
+		return false;
+    }
+    
+    // TODO
+function resolveTempDir()
+{
+
+    if (!WINDOWS_OS)
+    {
+        $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;
+}
+
+    public function doTest() {
+    	return true;
     	$installation = $this->getDataFromSession("installation"); // Get installation directory
     	$dbSettings = $installation['dbSettings'];
+    	$location = $installation['location'];
 		$uname = $this->temp_variables['duname'];
 		$pwrd = $this->temp_variables['dpassword'];
-		$sqlFile = $tmpFolder."dms.sql";
-		$dbName = $dbSettings['dbName'];
-		$cmd = "mysqldump -u{$uname} -p{$pwrd} {$dbName} > ".$sqlFile;
-		echo $cmd;
-		$response = $this->util->pexec($cmd);
-		if(file_exists($sqlFile)) {
-			return true;
-		} else {
-			return false;
-		}
+		//dmsadmin	//clean1 // 3316 // TODO
+		$dbhandler = $this->util->loadInstallDBUtil();
+		$dbhandler->load("localhost:3316",$uname, $pwrd, "dms");
+    	if (!$dbhandler->getDatabaseLink()) {
+        	$this->error['con'] = "Could not connect to the database, please check username and password";
+        	return false;
+    	}
+    	
+    	return true;
     }
  
 	/**
@@ -180,6 +232,7 @@ class migrateDatabase extends Step
    private function setDetails() {
         $this->temp_variables['duname'] = $this->getPostSafe('duname');
         $this->temp_variables['dpassword'] = $this->getPostSafe('dpassword');
+        $this->temp_variables['dumpLocation'] = $this->getPostSafe('dumpLocation');
         // create lock file to indicate migration mode
         $this->createMigrateFile();
     }
@@ -245,5 +298,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
@@ -78,15 +78,37 @@ class migrateInstallation extends step
 	*/
     protected $silent = false;
  
+	/**
+	* Reference to Utility object
+	*
+	* @author KnowledgeTree Team
+	* @access public
+	* @var object
+	*/	
+    public $util = null;
+    
 	private $location = '';
 	private $dbSettings = array();
 	private $ktSettings = array();
 	private $urlPaths = array();
 	private $knownWindowsLocations = array("C:\Program Files\ktdms"=>"C:\Program Files\ktdms\knowledgeTree\config\config-path","C:\Program Files x86\ktdms"=>"C:\Program Files x86\ktdms\knowledgeTree\config\config-path","C:\ktdms"=>"C:\ktdms\knowledgeTree\config\config-path");
 	private $knownUnixLocations = array("/opt/ktdms","/var/www/ktdms");
-	
+
+	/**
+	* Installation Settings
+	*
+	* @author KnowledgeTree Team
+	* @access public
+	* @var object
+	*/	
+    private $settings = array();
+    private $supportedVersion = '3.6.1';
+    private $foundVersion = 'Unknown';
+    private $versionError = false;
+    
     function __construct() {
         $this->temp_variables = array("step_name"=>"installation", "silent"=>$this->silent);
+        $this->util = new MigrateUtil();
     }
  
     public function doStep() {
@@ -120,7 +142,7 @@ class migrateInstallation extends step
     				$this->location = $loc;
     		}
     	} else {
-    		foreach ($this->knownUnixLocations as $loc) {
+    		foreach ($this->knownUnixLocations as $loc=>$configPath) {
     			if(file_exists($configPath))
     				$this->location = $loc;
     		}
@@ -128,6 +150,44 @@ class migrateInstallation extends step
     }
  
     public function doRun() {
+		if(!$this->readConfig()) {
+			$this->storeSilent();
+			return false;
+		} else {
+			if($this->readVersion()) {
+				$this->checkVersion();
+			}
+			$this->storeSilent();
+			return true;
+		}
+		
+    }
+    
+    
+    
+    
+    public function checkVersion() {
+		if($this->foundVersion <= $this->supportedVersion) {
+			$this->versionError = true;
+			$this->error[] = "KT installation needs to be 3.6.1 or higher";
+		} else {
+			return true;
+		}
+    }
+    
+    public function readVersion() {
+    	$verFile = $this->location."/knowledgeTree/docs/VERSION.txt";
+    	if(file_exists($verFile)) {
+			$this->foundVersion = file_get_contents($verFile);
+			return true;
+    	} else {
+			$this->error[] = "KT installation version not found";
+    	}
+
+		return false;    	
+    }
+    
+    public function readConfig() {
 		$ktInstallPath = isset($_POST['location']) ? $_POST['location']: '';
 		if($ktInstallPath != '') {
 			$this->location = $ktInstallPath;
@@ -136,7 +196,7 @@ class migrateInstallation extends step
 				if(file_exists($configPath)) {
 					$configFilePath = file_get_contents($configPath);
 					if(file_exists($configFilePath)) { // For 3.7 and after
-						$this->readConfig($configFilePath);
+						$this->loadConfig($configFilePath);
 						$this->storeSilent();
  
 						return true;
@@ -144,7 +204,7 @@ class migrateInstallation extends step
 						$configFilePath = $ktInstallPath.DS."knowledgeTree".DS.$configFilePath; // For older than 3.6.2
 						$configFilePath = trim($configFilePath);
 						if(file_exists($configFilePath)) {
-							$this->readConfig($configFilePath);
+							$this->loadConfig($configFilePath);
 							$this->storeSilent();
  
 							return true;
@@ -158,19 +218,18 @@ class migrateInstallation extends step
 				$this->error[] = "KT installation not found";
 			}
 		}
-		$this->storeSilent();
  
 		return false;
     }
  
-    private function readConfig($path) {
-    	$ini = new Ini($path);
+    private function loadConfig($path) {
+    	$ini = $this->util->loadInstallIni($path);//new Ini($path);
     	$dbSettings = $ini->getSection('db');
     	$this->dbSettings = array('dbHost'=> $dbSettings['dbHost'],
     								'dbName'=> $dbSettings['dbName'],
     								'dbUser'=> $dbSettings['dbUser'],
     								'dbPass'=> $dbSettings['dbPass'],
-    								'dbPort'=> $dbSettings['dbPort'],
+    								'dbPort'=> $dbSettings['dbPort'] == 'default' ? "3306":"",
     								'dbAdminUser'=> $dbSettings['dbAdminUser'],
     								'dbAdminPass'=> $dbSettings['dbAdminPass'],
     	);
@@ -197,7 +256,9 @@ class migrateInstallation extends step
     private function setDetails() {
     	$inst = $this->getDataFromSession("installation");
     	if ($inst) {
-    		$this->location = $inst['location'];
+    		if(file_exists($this->location)) {
+    			$this->location = $inst['location'];
+    		}
     	}
     }
  
@@ -210,9 +271,11 @@ class migrateInstallation extends step
     }
  
     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
@@ -2,31 +2,40 @@
 	<p class="title">Migrate Database</p>
 	<div id="database" class="step1" style="display:block;">
 		<div class="description">
-		This step configures the connection to the database server and migrates the database. The details for an administrative <br/>
-		user on the database server are required in order to be able to configure and migrate the database.
+		This step configures the connection to the database server and migrates the database. 
+<!--		The details for an administrative <br/>-->
+<!--		user on the database server are required in order to be able to configure and migrate the database.-->
 		</div>
 		<div id="step_content_database" class="step">
+		<br/><br/>
+		<span class="error">!!NB!! You are advised to backup your database before proceeding. !!NB!!</span>
+<!--		<span class="error"> <?php if($errors['con']) { echo $errors['con']."<br/><br/>"; } ?> </span>
+		
+		
+		<p class="empty_space">
+			Database Details
+		</p>
 			<table class="dbconf">
 			<?php
-				$input_size = '35';
-				$align = 'left';
+//				$input_size = '35';
+//				$align = 'left';
 			?>
-		<!--	TODO: Different Databases-->
 				    <tr>
 				        <td><label for='duname'>Enter Database Administrative username: </label></td>
-				        <td><input type='text' value="<?php echo $duname?>" id='duname' name='duname' size='<?php echo $input_size; ?>' style="float:left"/></td>
-				        <td id="error" class="error"><?php if($errors['duname']) echo $errors['duname']; ?></td>
+				        <td><input type='text' value="<?php //echo $duname?>" id='duname' name='duname' size='<?php //echo $input_size; ?>' style="float:left"/></td>
+				        <td id="error" class="error"><?php //if($errors['duname']) echo $errors['duname']; ?></td>
 				    </tr>
 				    <tr>
 				        <td><label for='dpassword'>Enter the password for the Administrator: </label></td>
-				        <td><input type='password' value="<?php echo $dpassword?>" id='dpassword' name='dpassword' size='<?php echo $input_size; ?>' style="float:left"/></td>
-				        <td id="error" class="error"><?php if($errors['dpassword']) echo $errors['dpassword']; ?></td>
+				        <td><input type='password' value="<?php //echo $dpassword?>" id='dpassword' name='dpassword' size='<?php //echo $input_size; ?>' style="float:left"/></td>
+				        <td id="error" class="error"><?php //if($errors['dpassword']) echo $errors['dpassword']; ?></td>
 				    </tr>
 			</table>
-		</div>
+		</div>-->
 	</div>
-    <input type="button" name="Previous" value="previous" class="button_previous"/>
-	<input type="submit" name="Next" value="next" class="button_next"/>
+	<input type="submit" name="Previous" value="Previous" class="button_previous"/>
+	<input type="submit" name="Next" value="Next" class="button_next"/>
+<!--	<input type="submit" name="Backup" value="Backup" class="button_next"/>-->
 </form>
 <script type="text/javascript">
 	$("#duname").focus();
@@ -25,13 +25,11 @@
 		    	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://wiki.knowledgetree.com/Web_Based_Migrater#Current_Installation" target="_blank">Click here for help on overcoming installation detection issues</a>
 	<?php } ?>
 	<div id="step_content" class="step">
-		<br/>
-		<br/>
 		<p class="empty_space">
 			Please verify the location of your current installation.
 		</p>
  
-		<input id="location" name="location" type="text" style="width:430px; float:left" value="<?php echo $location; ?>">
+		<input id="location" name="location" type="text" style="width:430px; float:left" value="<?php if($location) echo $location; ?>">
 		<br/><br/>
 		<?php
 		if($errors) {
@@ -26,11 +26,26 @@
 	<?php } ?>
 	<!--Content-->
 	<div id="step_content" class="step">
-		<br/>
-		<br/>
 		<p class="empty_space">
 			Please verify your current installation settings.
 		</p>
+		<h3>Installation Settings</h3>
+		<table class="conf_paths">
+			<tr>
+			<?php
+				if($versionError) {
+					$w = '26%';
+					$x = '10%';
+				} else {
+					$w = '22%';
+					$x = '50%';
+				}
+			?>
+				<td width="<?php echo $w; ?>">KnowledgeTree Version: </td>
+				<td width="<?php echo $x; ?>"><?php echo $foundVersion; ?></td>
+				<?php if($versionError) { ?> <td class="error" width="50%"> KnowledgeTree installation needs to be 3.6.1 or higher </td> <?php } ?>
+			</tr>
+		</table>
  
 		<h3>Database Settings</h3>
 		<table class="conf_paths">
@@ -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
 <?php
 /**
-* Upgrader Index.
+* Database Upgrader Index.
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 <?php
 /**
-* Step .
+* Step Controller.
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
@@ -119,10 +119,10 @@ class Step
     {
         // if not authenticated, return to step 1
         if (!isset($_SESSION['setup_user'])) {
-            header('index.php?step=welcome');
+            header('Location: index.php?step=welcome');
             exit;
         }
-            
+
         return '';
     }
  
@@ -254,38 +254,31 @@ class Step
  
         return false;
     }
-
-	/**
-	* Checks if Confirm button has been clicked
-	*
-	* @author KnowledgeTree Team
-	* @param none
-	* @access public
-	* @return boolean
-	*/
+    
+    /**
+    * Checks if Upgrade button has been clicked
+    *
+    * @author KnowledgeTree Team
+    * @param none
+    * @access public
+    * @return boolean
+    */
     function upgrade() {
-        if(isset($_POST['Upgrade'])) {
-            return true;
-        }
-
-        return false;
+        return isset($_POST['Upgrade']);
     }
-
-	/**
-	* Checks if Confirm button has been clicked
-	*
-	* @author KnowledgeTree Team
-	* @param none
-	* @access public
-	* @return boolean
-	*/
-    function installer() {
-        if(isset($_POST['Install'])) {
-            return true;
-        }
-
-        return false;
+    
+    /**
+    * Checks if Upgrade button has been clicked
+    *
+    * @author KnowledgeTree Team
+    * @param none
+    * @access public
+    * @return boolean
+    */
+    function restore() {
+        return isset($_POST['Restore']);
     }
+
 	/**
 	* Checks if we are currently in this class step
 	*
 <?php
 /**
-* Complete Step Controller. 
+* Backup Step Controller. 
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
@@ -52,12 +52,9 @@ class upgradeBackup extends Step {
 	* @var object
 	*/	
     private $_dbhandler = null;
-
-    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"=>"backup", "silent"=>$this->silent);
@@ -65,7 +62,7 @@ class upgradeBackup extends Step {
     	$this->util = new UpgradeUtil();
     }
  
-    function doStep() {
+    public function doStep() {
         parent::doStep();
         if(!$this->inStep("backup")) {
             $this->doRun();
@@ -75,16 +72,50 @@ class upgradeBackup extends Step {
             if ($this->doRun()) {
                 return 'next';
             }
-        } else if($this->previous()) {
+        }
+        else if ($this->confirm()) {
+            if ($this->doRun('confirm')) {
+                return 'confirm';
+            }
+        }
+        else if ($this->backupNow()) {
+            if ($this->doRun('backupNow')) {
+                return 'next';
+            }
+            else {
+                return 'error';
+            }
+        }
+        else if($this->previous()) {
             return 'previous';
         }
+        else if ($this->upgrade()) {
+            header('Location: index.php?step_name=database');
+            exit;
+        }
  
         $this->doRun();
         return 'landing';
     }
  
-    function doRun() {
-        $this->backupConfirm();
+    private function backupNow()
+    {
+        return isset($_POST['BackupNow']);
+    }
+    
+    private function doRun($action = null) {
+        $this->temp_variables['action'] = $action;
+        
+        if (is_null($action) || ($action == 'confirm')) {
+            $this->temp_variables['title'] = 'Confirm Backup';
+            $this->backupConfirm();
+        }
+        else {
+            $this->temp_variables['title'] = 'Backup Created';
+            $this->backup();
+            // TODO error checking (done in backupDone at the moment)
+            $this->backupDone();
+        }
         $this->storeSilent();// Set silent mode variables
  
         return true;
@@ -98,273 +129,146 @@ class upgradeBackup extends Step {
     }
  
     private function backup() {
-        check_state(1);
-        set_state(2);
-        title('Backup In Progress');
-        $targetfile=$_SESSION['backupFile'];
-        $stmt=create_backup_stmt($targetfile);
-        $dir=$stmt['dir'];
-    
-    
-    
+        $targetfile = $_SESSION['backupFile'];
+        $stmt = $this->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=$this->resolveTempDir();
+            $dir = $this->util->resolveTempDir();
             $_SESSION['backupFile'] =   $stmt['target'];
  
-                if (OS_UNIX)
-                {
-                    chmod($stmt['target'],0600);
-                }
+            if (OS_UNIX) {
+                chmod($stmt['target'],0600);
+            }
  
-            if (is_file($stmt['target']) && filesize($stmt['target']) > 0)
-            {
+            if (is_file($stmt['target']) && filesize($stmt['target']) > 0) {
                 $_SESSION['backupStatus'] = true;
-    
             }
-            else
-            {
+            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
         }
-    
-    
-    
     }
  
     private function backupDone() {
-        check_state(2);
-        set_state(3);
-        title('Backup Status');
         $status = $_SESSION['backupStatus'];
-        $filename=$_SESSION['backupFile'];
+        $filename = $_SESSION['backupFile'];
+        
+        $this->temp_variables['backupStatus'] = $status;
  
         if ($status)
         {
-            $stmt=create_restore_stmt($filename);
-    ?>
-            The backup file <nobr><i>"<?php echo $filename;?>"</i></nobr> has been created.
+            $stmt = $this->util->create_restore_stmt($filename);
+            $this->temp_variables['display'] = 'The backup file <nobr><i>"' . $filename . '"</i></nobr> has been created.
             <P> It appears as though the <font color=green>backup has been successful</font>.
-            <P>
-            <?php
+            <P>';
                 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:
                     <P>
                     <table bgcolor="lightgrey">
                     <tr>
                         <td>
-                            <nobr>cd <?php echo $stmt['dir'];?></nobr>
-                            <br/>
-            <?php
+                            <nobr>cd ' . $stmt['dir'] . '</nobr>
+                            <br/>';
                 }
                 else
                 {
-            ?>
-                The mysql backup utility could not be found automatically. Please edit the config.ini and update the backup/mysql Directory entry.
+                    $this->temp_variables['display'] .= '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
+                        <td>';
                 }
-            ?>
-                            <nobr><?php echo $stmt['display'];?></nobr>
-                    </table>
-    
-    <?php
+            $this->temp_variables['display'] .= '<nobr>' . $stmt['display'] . '</nobr>
+                    </table>';
         }
         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
-    
+            $this->temp_variables['display'] .= '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>' . $_SESSION['backupOutput'] . '</table>';
         }
-    ?>
-    <br/>
+    }
+
+    private function create_backup_stmt($targetfile=null)
+    {
+        $oKTConfig =& KTConfig::getSingleton();
  
-    &nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="back" onclick="javascript:do_start('welcome')">
-    <?php
-        if ($status)
+        $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=$this->util->resolveMysqlDir();
+    
+        $info['dir']=$dir;
+    
+        $prefix='';
+        if (OS_UNIX)
         {
-            ?>
-    &nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="next" onclick="javascript:do_start('UpgradeConfirm')">
+            $prefix .= "./";
+        }
  
-    <?php
+        if (@stat($dbSocket) !== false)
+        {
+            $mechanism="--socket=\"$dbSocket\"";
         }
-}
-
-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=$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
@@ -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
 <?php
 /**
-* Database Step Controller. 
+* Upgrade Step Controller. 
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
@@ -40,9 +40,9 @@
 * @version Version 0.1
 */
  
-// include defaults
 require '../../config/dmsDefaults.php';
 require_once KT_LIB_DIR . '/config/config.inc.php';
+require_once KT_LIB_DIR . '/plugins/pluginutil.inc.php';
 include KT_LIB_DIR . '/upgrades/upgrade.inc.php';
  
 class upgradeDatabase extends Step 
@@ -66,105 +66,6 @@ class upgradeDatabase extends Step
     public $_util = null;
  
 	/**
-	* Database type
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var array
-	*/	
-    private $dtype = '';
-    
-	/**
-	* Database types
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var array
-	*/	
-    private $dtypes = array();
-    
-	/**
-	* Database host
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var string
-	*/
-    private $dhost = '';
-    
-	/**
-	* Database port
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var string
-	*/
-    private $dport = '';
-    
-	/**
-	* Database name
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var string
-	*/
-    private $dname = '';
-    
-	/**
-	* Database root username
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var string
-	*/
-    private $duname = '';
-    
-	/**
-	* Database root password
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var string
-	*/
-    private $dpassword = '';
-    
-	/**
-	* Database dms username
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var string
-	*/
-    private $dmsname = '';
-    
-	/**
-	* Database dms password
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var string
-	*/
-    private $dmspassword = '';
-
-	/**
-	* Default dms user username
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var boolean
-	*/
-    private $dmsusername = '';
-    
-	/**
-	* Default dms user password
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var boolean
-	*/
-	private $dmsuserpassword = '';
-	
-	/**
 	* Location of database binaries.
 	*
 	* @author KnowledgeTree Team
@@ -180,25 +81,7 @@ class upgradeDatabase extends Step
 	* @access private
 	* @var string
 	*/
-    private $dbbinary = ''; // TODO:multiple databases
-    
-	/**
-	* Database table prefix
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var string
-	*/
-    private $tprefix = '';
-    
-	/**
-	* Flag to drop database
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var boolean
-	*/
-    private $ddrop = false;
+    private $dbBinary = ''; // TODO:multiple databases
  
 	/**
 	* List of errors encountered
@@ -227,26 +110,11 @@ class upgradeDatabase extends Step
 	*/
     public $storeInSession = true;
  
-	/**
-	* Flag if step needs to be upgraded
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @var array
-	*/
-    protected $runUpgrade = true;
-    
-	/**
-	* Flag if step needs to run silently
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @var array
-	*/
-    protected $silent = true;
+    protected $silent = false;
+    protected $temp_variables = array();
  
 	/**
-	* Constructs database object
+	* Constructs database upgrade object
 	*
 	* @author KnowledgeTree Team
 	* @access public
@@ -271,30 +139,22 @@ class upgradeDatabase extends Step
     public function doStep() {
         parent::doStep();
     	$this->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("<tr bgcolor='$color'><td>%s</td><td>%s</td><td>%s</td></tr>\n",
             htmlspecialchars($upgrade->getDescriptor()),
             htmlspecialchars($upgrade->getDescription()),
-            $upgrade->isAlreadyApplied() ? "Yes" : "No"
+                $upgrade->isAlreadyApplied() ? "Yes" : "No"
             );
         }
         $ret .= '</table>';
@@ -380,42 +233,6 @@ class upgradeDatabase extends Step
     }
  
 	/**
-	* Store options
-	*
-	* @author KnowledgeTree Team
-	* @params object SimpleXmlObject
-	* @access private
-	* @return void
-	*/
-   private function setDetails() {
-        // create lock file to indicate Upgrade mode
-        $this->createUpgradeFile();
-    }
-    
-    /**
-     * Creates miUpgradeock file so that system knows it is supposed to run an upgrade installation
-     * 
-     * @author KnowledgeTree Team
-     * @access private
-     * @return void
-     */
-    private function createUpgradeFile() {
-        @touch($this->wizardLocation . DIRECTORY_SEPARATOR . "upgrade.lock");
-    }
-    
-	/**
-	* Safer way to return post data
-	*
-	* @author KnowledgeTree Team
-	* @params SimpleXmlObject $simplexml
-	* @access public
-	* @return void
-	*/
-    public function getPostSafe($key) {
-    	return isset($_POST[$key]) ? $_POST[$key] : "";
-    }
-    
-	/**
 	* Stores varibles used by template
 	*
 	* @author KnowledgeTree Team
@@ -465,100 +282,161 @@ class upgradeDatabase extends Step
                                     'dbAdminUser'=> $dbSettings['dbAdminUser'],
                                     'dbAdminPass'=> $dbSettings['dbAdminPass'],
         );
-//        $ktSettings = $ini->getSection('KnowledgeTree');
-//        $froot = $ktSettings['fileSystemRoot'];
-//        if ($froot == 'default') {
-//            $froot = $this->location;
-//        }
-//        $this->ktSettings = array('fileSystemRoot'=> $froot,
-//        );
-//        $urlPaths = $ini->getSection('urls');
-//        $this->urlPaths = array(array('name'=> 'Var Directory', 'path'=> $froot.DS.'var'),
-//                                    array('name'=> 'Log Directory', 'path'=> $froot.DS.'log'),
-//                                    array('name'=> 'Document Root', 'path'=> $froot.DS.'Documents'),
-//                                    array('name'=> 'UI Directory', 'path'=> $froot.DS.'presentation'.DS.'lookAndFeel'.DS.'knowledgeTree'),
-//                                    array('name'=> 'Temporary Directory', 'path'=> $froot.DS.'tmp'),
-//                                    array('name'=> 'Cache Directory', 'path'=> $froot.DS.'cache'),
-//        );
-//        $this->temp_variables['urlPaths'] = $this->urlPaths;
-//        $this->temp_variables['ktSettings'] = $this->ktSettings;
         $this->temp_variables['dbSettings'] = $this->dbSettings;
     }
  
-    function upgradeConfirm()
+    private function upgradeConfirm()
     {
-        if (!isset($_SESSION['backupStatus']) || $_SESSION['backupStatus'] === false)
-        {
+        if (!isset($_SESSION['backupStatus']) || $_SESSION['backupStatus'] === false) {
             $this->temp_variables['backupStatus'] = false;
         }
+        else {
+            $this->temp_variables['backupStatus'] = true;
+        }
     }
  
-
-function upgrade()
-{
-    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))
+    private function upgradeDatabase()
     {
-?>
-<font color="red">Pre-Upgrade actions failed.</font><br/>
-<?php
-    }
-    else
-    {
-?>
-<p>
-<font color="green">Pre-Upgrade actions succeeded.</font><br/>
-<?php
+        global $default;
+        
+        $this->temp_variables['detail'] = '<p>The table below describes the upgrades that have occurred to
+            upgrade your KnowledgeTree installation to <strong>' . $default->systemVersion . '</strong>';
+      
+        $pre_res = $this->performPreUpgradeActions();
+        if (PEAR::isError($pre_res)) {
+            $this->temp_variables['preUpgrade'] = '<font color="red">Pre-Upgrade actions failed.</font>';
+        }
+        else {
+            $this->temp_variables['preUpgrade'] = '<font color="green">Pre-Upgrade actions succeeded.</font>';
+    
+        }
+        
+        $res = $this->performAllUpgrades();
+        if (PEAR::isError($res) || PEAR::isError($pres)) {
+            // TODO instantiate error details hideable section
+            $this->temp_variables['upgradeStatus'] = '<font color="red">Database upgrade failed</font>
+                                                      <br/><br/>
+                                                      Please restore from your backup and ensure that the database does not contain 
+                                                      any unsupported modifications and try the upgrade process again.
+                                                      <br/><br/>
+                                                      If the problem persists, contact KnowledgeTree Support.';
+        }
+        else {
+            $this->temp_variables['upgradeStatus'] = '<font color="green">Upgrade succeeded.</font>';
+        }
+    
+        $post_pres = $this->performPostUpgradeActions();
+        if (PEAR::isError($post_res)) {
+            $this->temp_variables['postUpgrade'] = '<font color="red">Post-Upgrade actions failed.</font>';
+        }
+        else {
+            $this->temp_variables['postUpgrade'] = '<font color="green">Post-Upgrade actions succeeded.</font>';
+        }
     }
-?>
-<p>
-  <?php
-    $res = performAllUpgrades();
-    if (PEAR::isError($res) || PEAR::isError($pres))
-    {
-?>
-<font color="red">Upgrade failed.</font>
-<?php
+
+    private 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;
+    
     }
-    else
-    {
-?>
-<p>
-<font color="green">Upgrade succeeded.</font>
-<?php
+    
+    private 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;
+    
     }
-?>
-<p>
-  <?php
-    $post_pres = performPostUpgradeActions();
-    if (PEAR::isError($post_res))
-    {
-?>
-<font color="red">Post-Upgrade actions failed.</font><br/><br/>
-<?php
+
+    private function performAllUpgrades () {
+        global $default;
+        
+        $row = 1;
+        
+        $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);
+        
+        $this->temp_variables['upgradeTable'] = '';
+    
+        foreach ($upgrades as $upgrade) {
+            if (($row % 2) == 1) {
+                $class = "odd";
+            } else {
+                $class = "even";
+            }
+            $this->temp_variables['upgradeTable'] .= sprintf('<div class="row %s"><div class="foo">%s</div>' . "\n", $class, 
+                                                             htmlspecialchars($upgrade->getDescription()));
+            ++$row;
+            $res = $upgrade->performUpgrade();
+            $this->temp_variables['upgradeTable'] .= sprintf('<div class="bar">%s</div>', $this->showResult($res));
+            $this->temp_variables['upgradeTable'] .= '<br style="clear: both">' . "\n";
+            $this->temp_variables['upgradeTable'] .= "</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;
     }
-    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
+    
+    private 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;
     }
-?>
-
-&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
-}
  
 }
 ?>
 \ No newline at end of file
 <?php
 /**
-* Upgrade Step Controller. 
+* Notification Controller. 
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
@@ -50,15 +50,24 @@ class UpgradeInstallation extends step
 	* @var array
 	*/
     protected $silent = false;
+    protected $temp_variables = array();
  
-    function __construct() {
-        $this->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';
 <?php
 /**
-* Complete Step Controller. 
+* Restore Step Controller. 
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
@@ -53,10 +53,8 @@ class upgradeRestore extends Step {
 	*/	
     private $_dbhandler = null;
  
-    private $privileges_check = 'tick';
-    private $database_check = 'tick';
-    protected $silent = true;
-    
+    protected $silent = false;
+    protected $temp_variables = array();    
     protected $util = null;
  
     public function __construct() {
@@ -65,8 +63,10 @@ class upgradeRestore extends Step {
     	$this->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.
-<?php
-        print "\n";
-
-
-        $curdir=getcwd();
-        chdir($dir);
-
-
-        $ok=true;
-        $stmts=explode("\n",$stmt['cmd']);
-        foreach($stmts as $stmt)
+        $this->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;
-
-
-?>
-            <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 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 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 = $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\"<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 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 <nobr><i>"' . $filename . '"</i></nobr> has been completed.
+            <P>
+            It appears as though the <font color=green>restore has been successful</font>.
+            <P>';
+            
+            $this->temp_variables['title'] = 'Restore Complete'; 
+            $this->temp_variables['restoreSuccessful'] = true;
+        }
+        else
+        {
+            $this->temp_variables['display'] = '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>' . $_SESSION['restoreOutput'] . '
+            </table>';
+            $this->temp_variables['title'] = 'Restore Failed';
+            $this->temp_variables['restoreSuccessful'] = false;
         }
     }
-
-    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))
-    {
-            mkdir($dir);
-    }
-    return $dir;
-}
-
-
-function restoreSelect()
-{
-//    title('Select Backup to Restore');
-
-    $dir = $this->resolveTempDir();
-
-    $files = array();
-    if ($dh = opendir($dir))
+    
+    private function restoreSelect()
     {
-        while (($file = readdir($dh)) !== false)
+        $this->temp_variables['availableBackups'] = false;
+        $dir = $this->util->resolveTempDir();
+    
+        $files = array();
+        if ($dh = opendir($dir))
         {
-            if (!preg_match('/kt-backup.+\.sql/',$file))
+            while (($file = readdir($dh)) !== false)
             {
-                continue;
+                if (!preg_match('/kt-backup.+\.sql/',$file)) {
+                    continue;
+                }
+                $files[] = $file;
             }
-            $files[] = $file;
+            closedir($dh);
+        }
+        
+        $this->temp_variables['title'] = 'Select Backup to Restore';
+        $this->temp_variables['dir'] = $dir;
+        if (count($files) != 0) {
+            $this->temp_variables['availableBackups'] = true;
+            $this->temp_variables['files'] = $files;
         }
-        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>
-        <form action="index.php?step_name=restore" method="post">
-
-    <table border=1 cellpadding=1 cellspacing=1>
-            <tr bgcolor="darkgrey">
-            <td>Filename
-            <td>File Size
-            <td>Action
-<?php
-    $i=0;
-    foreach($files as $file)
+    
+    private function restoreSelected()
     {
-        $color=((($i++)%2)==0)?'white':'lightgrey';
-?>
-        <tr bgcolor="<?php echo $color;?>">
-            <td><?php echo $file;?>
-            <td><?php echo filesize($dir . '/'.$file);?>
-            <td><input type="submit" name="RestoreSelect" value="restore">
-<?php
-    }
-?>
-    </table>
-    <input type="hidden" name="file" value="<?php echo $file; ?>" />
-    </form>
- <?php
+        $file=$_REQUEST['file'];
+    
+        $dir = $this->util->resolveTempDir();
+        $_SESSION['backupFile'] = $dir . '/' . $file;
     }
-   ?>
-
-   <p>
-&nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="back" onclick="javascript:do_start('welcome')">
-   <?php
-
-}
-
-function restoreSelected()
-{
-    $file=$_REQUEST['file'];
-
-    $dir = $this->resolveTempDir();
-    $_SESSION['backupFile'] = $dir . '/' . $file;
-?>
-<?php
-
-}
-
-function restoreConfirm()
-{
-    if (!isset($_SESSION['backupFile']) || !is_file($_SESSION['backupFile']) || filesize($_SESSION['backupFile']) == 0)
+    
+    private function restoreConfirm()
     {
-        $this->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
@@ -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;
         }
  
 <form action="index.php?step_name=backup" method="post">
-	<p class="title">Confirm Backup</p>
+	<p class="title"><?php echo $title; ?></p>
  
 	<?php
 	if($errors || $warnings){
@@ -12,20 +12,22 @@
 	<br/><br/>
 	<div>
     <?php
-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>
-<p>
-<table bgcolor="lightgrey">
-<tr>
-<td>
-<nobr>cd "<?php echo $dir; ?>"</nobr>
-<br/>
-</p><?php
+    if ($dir != '') {
+        if (!$backupStatus) {
+            ?>
+                    Are you sure you want to perform the backup?
+            
+            <p>
+            Your mysql installation has been resolved. Manually, you would do the following:
+                </p>
+            <p>
+            <table bgcolor="lightgrey">
+            <tr>
+            <td>
+            <nobr>cd "<?php echo $dir; ?>"</nobr>
+            <br/>
+            </p><?php
+        }
     }
     else
     {
@@ -42,17 +44,23 @@ You can continue to do the backup manually using the following process:
 ?><nobr><?php echo $display; ?></nobr>
 </table>
 <P>
-	<?php if($silent) { ?>
-		</div>
-	<?php } ?>
 	</div>
-        <?php
+	</div>
+    <?php
 if ($dir != '')
 {
-?><input type="submit" name="Next" value="Next" class="button_next"><?php
+    if (($action == '') || ($action == 'confirm')) {
+        ?><input type="submit" name="BackupNow" value="Next" class="button_next"><?php
+    }
+    else if ($backupStatus) {
+        ?><input type="submit" name="Next" value="Restore" class="button_next">
+        <input type="submit" name="Upgrade" value="Upgrade" class="button_next"><?php
+    }
+    else {
+        ?><input type="submit" name="Next" value="Next" class="button_next"><?php
+    }
 }
  
     ?>
     <input type="submit" name="Previous" value="Back" class="button_previous">
-	</div>
 </form>
 \ No newline at end of file
+<?php global $default; ?>
 <form>
-	<p class="title">Upgrade Completed</p>
+	<p class="title">Database Upgrade Completed</p>
  
-	<p class="description">This allows you to check that your KnowledgeTree configuration is set
-	up correctly.  You can run this at any time after configuration to check
-	that things are still set up correctly.</p>
-	
-	<?php
-	if($errors || $warnings){
-	    echo '<div>'
-	       . '<a href="http://wiki.knowledgetree.com/Web_Based_Upgrader#Post_Upgrade" target="_blank">'
-	       . 'Click Here for help on overcoming post Upgrade issues</a></div><br/>';
-	}
-	?>
 	<div id="step_content_complete" class="step">
 <!--	Services	-->
 	<br/><br/>
 	<div>
-	    <h3><?php echo "<span class='{$services_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Services</h3>
-	<?php if($silent) { ?>
-		<div id="option2" class="onclick" onclick="javascript:{w.toggleClass('services_check', 'option2');}">Show Details</div>
-		<div class="services_check" style="display:none">
-	<?php } ?>
-	    <table style="width:755px;">
-	        <tr>
-	        	<td style="width:15px;"> <?php echo "<span class='{$LuceneStatus}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?> </td>
-	        	<td style="width:640px;"> Lucene Service <?php if ($LuceneStatus != 'tick') { ?> Could not be stopped <?php } else { ?> Stopped <?php } ?></td>
-	        	<?php if ($LuceneStatus != 'tick') { ?>
-	        		<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
-	        	<?php } ?>
-	        </tr> 
-	        <tr>
-	        	<td> <?php echo "<span class='{$SchedulerStatus}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?> </td>
-	        	<td> Scheduler Service <?php if ($LuceneStatus != 'tick') { ?> Could not be stopped <?php } else { ?> Stopped <?php } ?></td>
-	        	<?php if ($SchedulerStatus != 'tick') { ?>
-	        		<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
-	        	<?php } ?>
-	        </tr>
-	        <tr>
-	        	<td> <?php echo "<span class='{$OpenOfficeStatus}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?> </td>
-	        	<td> OpenOffice Service <?php if ($OpenOfficeStatus != 'tick') { ?> Could not be stopped <?php } else { ?> Stopped <?php } ?></td>
-	        	<?php if ($OpenOfficeStatus != 'tick') { ?>
-	        		<td><a href="javascript:this.location.reload();" class="refresh">Refresh</a></td>
-	        	<?php } ?>
-	        </tr>
-	    </table>
-	<?php if($silent) { ?>
-		</div>
-	<?php } ?>
+	    Your database has been upgraded to <?php echo $default->systemVersion; ?>
 	</div>
 	</div>
-    <a href="../wizard" class="buttons back" style="width:100px;">Goto Installer</a>
+    <a href="../../" class="buttons back" style="width:100px;">Goto Login</a>
 </form>
 \ No newline at end of file
@@ -6,29 +6,47 @@
 		</div>
 		<div id="step_content_database" class="step">
             <br/><br/>
-            <?php if ($action == 'preview') { ?>
+            <?php if (empty($action) || ($action == 'preview')) { ?>
 			<p>The table below describes the upgrades that need to occur to
             upgrade your KnowledgeTree installation to <strong><?php echo $systemVersion;?></strong>.
             Click on the button below the table to perform the upgrades.</p>
             <?php echo $upgradeTable; ?>
             <?php }
-            else if ($action == 'runUpgrade') { ?>
-            <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>
+            else if ($action == 'confirm') {
+                if (!$backupStatus) { ?>
+                    <p>We are about to start the upgrade process.<P>
+                <?php }
+                else { ?>
+                <br/>
+                <font color="Red">Please ensure that you have made a backup before continuing with the upgrade process.</font>
+                <p>
+                <?php } ?>
+            <?php }
+            else if ($action == 'runUpgrade') {
+                echo $preUpgrade;
+                echo '<br/><br/>';
+                echo $upgradeTable;
+                echo '<br/><br/>';
+                echo $postUpgrade;
+                echo '<br/><br/>';
+                echo $upgradeStatus;
+                echo '<br/><br/>';
+            }
+            ?>
 		</div>
 	</div>
-    <?php if ($action == 'preview') { ?>
+    <?php if (empty($action) || ($action == 'preview')) { ?>
     <input type="submit" name="Previous" value="previous" class="button_previous"/>
+    <input type="submit" name="ConfirmUpgrade" value="next" class="button_next"/>
+    <?php }
+    else if ($action == 'confirm') { ?>
+    <input type="submit" name="Cancel" value="cancel" class="button_previous"/>
     <input type="submit" name="RunUpgrade" value="next" class="button_next"/>
     <?php }
     else if ($action == 'runUpgrade') { ?>
-    <input type="submit" name="Cancel" value="cancel" class="button_previous"/>
-    <input type="submit" name="Confirm" value="next" class="button_next"/>
+    <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>
+    <input type="submit" name="Next" value="next" class="button_next"/>
     <?php } ?>
 </form>
 \ No newline at end of file
@@ -2,7 +2,6 @@
 	<p class="title">Current Installation</p>
 	<div id="step_content" class="step">
 		<p class="empty_space">
-        <?php // set_state(1); ?>
         <p class="empty_space"> If you have just updated
         your KnowledgeTree code base, you will need to complete the upgrade process in order to ensure your system is fully operational with the new version.
         <p class="empty_space">
@@ -19,7 +18,4 @@
     <input type="submit" name="Upgrade" value="Upgrade" class="button_next"/>
     <input type="submit" name="Restore" value="Restore Database" class="button_next"/>
     <input type="submit" name="Next" value="Backup Now" class="button_next"/>
-</form>
-<script type="text/javascript">
-	$("#location").focus();
-</script>
 \ No newline at end of file
+</form>
 \ No newline at end of file
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+	<head>
+		<title>KnowledgeTree Upgrade Wizard</title>
+		<script type="text/javascript" src="resources/jquery.js"></script>
+		<script type="text/javascript" src="resources/wizard.js" ></script>
+		<link rel="stylesheet" type="text/css" href="resources/wizard.css" />
+		
+	</head>
+
+	<body onload="">
+		<div id="outer-wrapper">
+		    <div id="header">
+		    <div id="logo"><img src="resources/graphics/dame/upgrader-header_logo.png"/></div>
+		    <div id="install_details">
+				<span style="font-size:120%;"> 3.7 </span>
+				<span style="font-size:80%;">Commercial Edition</span>
+				</div>
+		    </div>
+		    <div id="wrapper">
+		        <div id="container">
+		            <div id="sidebar">
+                        <?php echo $left; ?>
+                    </div>
+		            <div id="content">
+		            	<div id="content_container">
+		            	    <p class="title"><?php echo $title; ?></p>
+		                	<form action="index.php?step_name=welcome" method="post">
+		                		<div id="step_content" class="step">
+									<?php if(isset($error)) { 
+											echo "<span class='error'>".$error."</span>";
+											?>
+											<?php
+										}
+									?>
+									<?php 
+										if(isset($errors)) {
+											if($errors){
+											    echo '<div class="error">';
+											    foreach ($errors as $msg){
+											        echo $msg . "<br />";
+											        ?>
+											        	<a href="javascript:this.location.reload();" class="refresh">Refresh</a>
+											        <?php
+											    }
+											    echo '</div>';
+											}
+										}
+									?>
+                                    <br/><br/>
+                                    <?php echo $content; ?>
+								</div>
+							</form>
+		                </div>
+		            </div>
+		        </div>
+		        <div class="clearing">&nbsp;</div>
+		    </div>
+			
+		    <div id="footer">
+
+		    	<img width="105" height="23" align="right" src="resources/graphics/dame/powered-by-kt.png" style="padding: 5px;"/>
+		    </div>
+		</div>
+	</body>
+</html>
+<script>
+	var w = new wizard();
+</script>
 \ No newline at end of file
 <form action="index.php?step_name=restore" method="post">
-    <p class="title">Confirm Restore</p>
+    <p class="title"><?php echo $title; ?></p>
  
     <?php
     if($errors || $warnings){
@@ -12,30 +12,65 @@
     <br/><br/>
     <div>
     <?php
-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
-    {
+    if (!$restore) {
+        if (!$availableBackups) {
+            ?>There don't seem to be any backups to restore from the <i>"<?php echo $dir;?>"</i> directory.<?php
+        }
+        else if (!$selected) {
+        ?>
+        <P>
+        Select a backup to restore from the list below:
+        <P>
+            <form action="index.php?step_name=restore" method="post">
+    
+        <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';
     ?>
-     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
-    }
+            <tr bgcolor="<?php echo $color;?>">
+                <td><?php echo $file;?>
+                <td><?php echo filesize($dir . '/'.$file);?>
+                <td><input type="submit" name="RestoreSelect" value="restore">
+    <?php
+        }
+    ?>
+        </table>
+        <input type="hidden" name="file" value="<?php echo $file; ?>" />
+        </form>
+        <?php
+        }
+    else 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
+        }
+    } // end not doing a restore, just preliminary steps
 ?>
 <nobr><?php echo $display;?></nobr>
 </td>
@@ -46,7 +81,7 @@ You can continue to do the restore manually using the following command(s):
         </div>
     <?php } ?>
             <?php
-if ($dir != '')
+if (($dir != '') && ($selected))
 {
 ?>
 Press <i>Next</i> to attempt the command(s) above.
@@ -56,9 +91,12 @@ Press &lt;i&gt;Next&lt;/i&gt; to attempt the command(s) above.
 }
     ?>
     </div>
-
-
+    </div>
     <input type="submit" name="Previous" value="Back" class="button_previous">
+    <?php if (($dir != '') && ($selected)) { ?>
+    <input type="submit" name="RunRestore" value="Next" class="button_next">
+    <?php }
+    else { ?>
     <input type="submit" name="Next" value="Next" class="button_next">
-    </div>
+    <?php } ?>
 </form>
 \ No newline at end of file
@@ -39,6 +39,9 @@
 * @package Upgrader
 * @version Version 0.1
 */
+
+require '../../config/dmsDefaults.php';
+
 class UpgradeUtil {	
 	/**
 	* Constructs upgradeation object
@@ -79,6 +82,31 @@ class UpgradeUtil {
         ob_end_clean();
         echo $contents;
 	}
+    
+    /**
+     * Function to send output to the browser prior to normal dynamic loading of a template after code execution
+     * 
+     * @param string $template The name of the template to use
+     * @param array $output [optional] Optional array containing output text to be inserted into the template
+     * @return 
+     */
+    public function flushOutput($template, $output = null) {
+        if (is_array($output)) {
+            foreach ($output as $key => $value) {
+                $template_vars[$key] = $value;
+            }
+        }
+        $file = "templates/" . $template;
+        if (!file_exists($file)) {
+            return false;
+        }
+        extract($template_vars); // Extract the vars to local namespace
+        ob_start();
+        include($file);
+        $contents = ob_get_contents();
+        ob_end_clean();
+        echo $contents;
+    }
  
 	/**
 	* Check if system needs to be upgraded
@@ -637,6 +665,107 @@ class UpgradeUtil {
         }
         return join(" ", $aSafeArgs);
     }
+    
+    public 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 = $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\"<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;
+    }
+    
+    public 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 '';
+    }
+    
+    public 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;
+    }
  
 }
 ?>
 \ No newline at end of file
@@ -186,6 +186,9 @@ class UpgradeWizard {
 	* @return mixed
  	*/
 	public function systemChecks() {
+	    // for now we don't write to any of these locations
+        return true;
+        
 		$res = $this->iutil->checkStructurePermissions();
 		if($res === true) return $res;
 		switch ($res) {
@@ -17,7 +17,7 @@
         <step name="Service Dependency" order="3" mode="silent">services</step>
         <step name="Database Configuration" order="1">database</step>
         <step name="Registration">registration</step>
-        <step name="Install" mode="silent">install</step>
+        <step name="Install" order="4" mode="silent">install</step>
         <step name="Complete">complete</step>
     </steps>
  </install>
 \ No newline at end of file
@@ -14,8 +14,8 @@
     <dhost>localhost</dhost>
     <dport>3306</dport>
     <dname>dms</dname>
-    <duname>root</duname>
-    <dmsadminuser>dmsadminuser</dmsadminuser>
+    <duname>dms</duname>
+    <dmsadminuser>dmsadmin</dmsadminuser>
     <dmsaupass>js9281djw</dmsaupass>
     <dmsuser>dmsuser</dmsuser>
     <dmsupass>djw9281js</dmsupass>
@@ -146,8 +146,8 @@ class dbUtil {
     * @return object The result of the query.
     */
     public function query($query) {
-    	$this->useDb();
-      $result = mysql_query($query, $this->dbconnection);
+		$this->useDb();
+      	$result = mysql_query($query, $this->dbconnection);
 		if($result) {
 			return $result;
 		} else {
@@ -165,13 +165,12 @@ class dbUtil {
     */
     public function execute($query) {
     	$this->useDb();
-      $result = @mysql_query($query, $this->dbconnection);
-		if($result) {
-			return true;
-		} else {
+      	$result = @mysql_query($query, $this->dbconnection);
+		if(!$result) {
 			$this->error[] = @mysql_error($this->dbconnection);
-			return false;
 		}
+		
+		return $result;
     }
  
 	/** 
@@ -200,10 +199,7 @@ class dbUtil {
 	      if ($result == NULL || @mysql_num_rows($result) < 1)
 	        return NULL;
 	      else {
-	      	$row = @mysql_fetch_assoc($result);
-   			while ($row) {
-   				$r[] = $row;
-   			}
+	      	while(($r[] = mysql_fetch_assoc($result)) || array_pop($r)); 
    			return $r;
 	      }
     }
@@ -206,9 +206,18 @@ class Ini {
         return true;
     }
  
+    // Return file line by line
     public function getFileByLine() {
         $data = $this->read($this->iniFile);
         return $data[''];
     }
+    
+    public function getSection($section) {
+    	if (isset($this->cleanArray[$section])) {
+    		return $this->cleanArray[$section];
+    	}
+    	
+    	return false;
+    }
 }
 -?>
+?>
 \ No newline at end of file
@@ -39,8 +39,8 @@
 * @package Installer
 * @version Version 0.1
 */
-class InstallUtil {	
-	
+class InstallUtil {
+
 	private $salt = 'installers';
 	/**
 	* Constructs installation object
@@ -50,7 +50,7 @@ class InstallUtil {
  	*/
 	public function __construct() {
 	}
-	
+
 	/**
 	* Check if system needs to be installed
 	*
@@ -64,7 +64,7 @@ class InstallUtil {
  
 			return true;
 		}
-		
+
 		return false;
 	}
  
@@ -100,13 +100,13 @@ class InstallUtil {
  
     /**
      * Redirect
-     * 
+     *
      * This function redirects the client. This is done by issuing
      * a "Location" header and exiting if wanted.  If you set $rfc2616 to true
      * HTTP will output a hypertext note with the location of the redirect.
-     * 
-     * @static 
-     * @access  public 
+     *
+     * @static
+     * @access  public
      *                  have already been sent.
      * @param   string  $url URL where the redirect should go to.
      * @param   bool    $exit Whether to exit immediately after redirection.
@@ -119,10 +119,10 @@ class InstallUtil {
         if (headers_sent()) {
             return false;
         }
-        
+
         $url = $this->absoluteURI($url);
         header('Location: '. $url);
-        
+
         if (    $rfc2616 && isset($_SERVER['REQUEST_METHOD']) &&
                 $_SERVER['REQUEST_METHOD'] != 'HEAD') {
             printf('Redirecting to: <a href="%s">%s</a>.', $url, $url);
@@ -135,21 +135,21 @@ class InstallUtil {
  
    /**
      * Absolute URI
-     * 
+     *
      * This function returns the absolute URI for the partial URL passed.
      * The current scheme (HTTP/HTTPS), host server, port, current script
      * location are used if necessary to resolve any relative URLs.
-     * 
+     *
      * Offsets potentially created by PATH_INFO are taken care of to resolve
      * relative URLs to the current script.
-     * 
-     * You can choose a new protocol while resolving the URI.  This is 
-     * particularly useful when redirecting a web browser using relative URIs 
+     *
+     * You can choose a new protocol while resolving the URI.  This is
+     * particularly useful when redirecting a web browser using relative URIs
      * and to switch from HTTP to HTTPS, or vice-versa, at the same time.
-     * 
-     * @author  Philippe Jausions <Philippe.Jausions@11abacus.com> 
-     * @static 
-     * @access  public 
+     *
+     * @author  Philippe Jausions <Philippe.Jausions@11abacus.com>
+     * @static
+     * @access  public
      * @param   string  $url Absolute or relative URI the redirect should go to.
      * @param   string  $protocol Protocol to use when redirecting URIs.
      * @param   integer $port A new port number.
@@ -159,7 +159,7 @@ class InstallUtil {
     {
         // filter CR/LF
         $url = str_replace(array("\r", "\n"), ' ', $url);
-        
+
         // Mess around with already absolute URIs
         if (preg_match('!^([a-z0-9]+)://!i', $url)) {
             if (empty($protocol) && empty($port)) {
@@ -169,12 +169,12 @@ class InstallUtil {
                 $url = $protocol .':'. end($array = explode(':', $url, 2));
             }
             if (!empty($port)) {
-                $url = preg_replace('!^(([a-z0-9]+)://[^/:]+)(:[\d]+)?!i', 
+                $url = preg_replace('!^(([a-z0-9]+)://[^/:]+)(:[\d]+)?!i',
                     '\1:'. $port, $url);
             }
             return $url;
         }
-            
+
         $host = 'localhost';
         if (!empty($_SERVER['HTTP_HOST'])) {
             list($host) = explode(':', $_SERVER['HTTP_HOST']);
@@ -192,7 +192,7 @@ class InstallUtil {
                 $port = isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : 80;
             }
         }
-        
+
         if ($protocol == 'http' && $port == 80) {
             unset($port);
         }
@@ -201,31 +201,31 @@ class InstallUtil {
         }
  
         $server = $protocol .'://'. $host . (isset($port) ? ':'. $port : '');
-        
+
         if (!strlen($url)) {
-            $url = isset($_SERVER['REQUEST_URI']) ? 
+            $url = isset($_SERVER['REQUEST_URI']) ?
                 $_SERVER['REQUEST_URI'] : $_SERVER['PHP_SELF'];
         }
-        
+
         if ($url{0} == '/') {
             return $server . $url;
         }
-        
+
         // Check for PATH_INFO
-        if (isset($_SERVER['PATH_INFO']) && strlen($_SERVER['PATH_INFO']) && 
+        if (isset($_SERVER['PATH_INFO']) && strlen($_SERVER['PATH_INFO']) &&
                 $_SERVER['PHP_SELF'] != $_SERVER['PATH_INFO']) {
             $path = dirname(substr($_SERVER['PHP_SELF'], 0, -strlen($_SERVER['PATH_INFO'])));
         } else {
             $path = dirname($_SERVER['PHP_SELF']);
         }
-        
+
         if (substr($path = strtr($path, '\\', '/'), -1) != '/') {
             $path .= '/';
         }
-        
+
         return $server . $path . $url;
     }
-    
+
     /**
      * Check whether a given directory / file path exists and is writable
      *
@@ -244,7 +244,7 @@ class InstallUtil {
         }
  
     }
-    
+
     /**
      * Check whether a given directory / file path exists and is writable
      *
@@ -258,7 +258,7 @@ class InstallUtil {
     {
     	if(!$file)
         	$exist = 'Directory doesn\'t exist';
-        else 
+        else
         	$exist = 'File doesn\'t exist';
         $write = 'Directory not writable';
         $ret = array('class' => 'cross');
@@ -280,12 +280,12 @@ class InstallUtil {
                 $ret['msg'] = $exist;
                 return $ret;
             }
-            mkdir($dir, '0755');
+            mkdir($dir, 0755);
         }
  
         if(is_writable($dir)){
             $ret['class'] = 'tick';
-            
+
             return $ret;
         }
  
@@ -293,7 +293,7 @@ class InstallUtil {
         $ret['msg'] = $write;
         return $ret;
     }
-    
+
 	 /**
      * Change permissions on a directory helper
      *
@@ -305,7 +305,7 @@ class InstallUtil {
     public function canChangePermissions($folderPath) {
 		return $this->_chmodRecursive($folderPath, 0755);
     }
-    
+
 	/**
      * Change permissions on a directory (recursive)
      *
@@ -344,7 +344,7 @@ class InstallUtil {
 			return true;
 		}
 	}
-	
+
    /**
      * Check if a file can be written to a folder
      *
@@ -358,11 +358,11 @@ class InstallUtil {
     	if($fr = fwrite($fh, 'test') === false) {
     		return false;
     	}
-    	
+
     	fclose($fh);
     	return true;
     }
-    
+
     /**
      * Attempt using the php-java bridge
      *
@@ -379,7 +379,7 @@ class InstallUtil {
 		}
 		return true;
     }
-	
+
     /**
 	* Check if Zend Bridge is enabled
 	*
@@ -390,12 +390,12 @@ class InstallUtil {
 	*/
     public function zendBridge() {
 		$mods = get_loaded_extensions();
-		if(in_array('Zend Java Bridge', $mods)) 
+		if(in_array('Zend Java Bridge', $mods))
 			return true;
-		else 
+		else
 			return false;
     }
-    
+
     /**
      * Attempt java detection
      *
@@ -412,7 +412,7 @@ class InstallUtil {
  
     	return 'java';
     }
-    
+
     /**
      * Attempt java detection
      *
@@ -429,7 +429,7 @@ class InstallUtil {
  
     	return 'java';
     }
-    
+
     /**
      * Attempt java detection
      *
@@ -451,7 +451,7 @@ class InstallUtil {
 			}
 		}
     }
-    
+
     /**
 	* Check if user entered location of JRE
 	*
@@ -471,7 +471,7 @@ class InstallUtil {
     		return false;
     	}
     }
-    
+
     /**
 	* Check if user entered location of PHP
 	*
@@ -491,7 +491,7 @@ class InstallUtil {
     		return false;
     	}
     }
-    
+
     public function openOfficeSpecified() {
     	if(isset($_POST['soffice'])) {
     		if($_POST['soffice'] != '') {
@@ -503,7 +503,7 @@ class InstallUtil {
     		return false;
     	}
     }
-    
+
 	/**
 	* Get session data from post
 	*
@@ -516,10 +516,10 @@ class InstallUtil {
     	if(empty($_SESSION[$this->salt][$class])) {
     		return false;
     	}
-    	
+
     	return $_SESSION[$this->salt][$class];
     }
-    
+
     /**
 	* Determine the location of JAVA_HOME
 	*
@@ -539,7 +539,7 @@ class InstallUtil {
  
     	return $response;
     }
-    
+
     /**
 	* Determine the location of PHP
 	*
@@ -562,10 +562,10 @@ class InstallUtil {
 		if(file_exists(PHP_DIR."php")) {
 			return PHP_DIR."php";
 		}
-		
+
 		return 'php';
     }
-    
+
     function getPhpHelper($cmd) {
     	$response = $this->pexec($cmd);
 		if(is_array($response['out'])) {
@@ -579,10 +579,10 @@ class InstallUtil {
 				}
 			}
 		}
-		
-		return '';    	
+
+		return '';
     }
-    
+
     function getOpenOffice() {
     	$cmd = "whereis soffice";
 		$res = $this->getOpenOfficeHelper($cmd);
@@ -594,10 +594,10 @@ class InstallUtil {
 		if($res != '') {
 			return $res;
 		}
-		
+
 		return 'soffice';
     }
-    
+
     function getOpenOfficeHelper($cmd) {
 		$response = $this->pexec($cmd);
 		if(is_array($response['out'])) {
@@ -611,11 +611,11 @@ class InstallUtil {
 				}
 			}
 		}
-		
+
 		return '';
     }
-    
-    
+
+
    /**
      * Portably execute a command on any of the supported platforms.
      *
@@ -656,9 +656,9 @@ class InstallUtil {
  
     	return $aRet;
     }
-    
+
 	/**
-	* 
+	*
 	*
 	* @author KnowledgeTree Team
 	* @access public
@@ -681,9 +681,9 @@ class InstallUtil {
         }
         return $mDefault;
     }
-    
+
 	/**
-	* 
+	*
 	*
 	* @author KnowledgeTree Team
 	* @access public
@@ -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
@@ -296,8 +296,8 @@ class configuration extends Step
      */
     public function registerDBConfig($server, $dbconf) { // Adjust server variables
         $server['dbName'] = array('where'=>'file', 'name'=>ucwords($dbconf['dname']), 'section'=>'db', 'value'=>$dbconf['dname'], 'setting'=>'dbName');
-        $server['dbUser'] = array('where'=>'file', 'name'=>ucwords($dbconf['duname']), 'section'=>'db', 'value'=>$dbconf['duname'], 'setting'=>'dbUser');
-        $server['dbPass'] = array('where'=>'file', 'name'=>ucwords($dbconf['dpassword']), 'section'=>'db', 'value'=>$dbconf['dpassword'], 'setting'=>'dbPass');
+        $server['dbUser'] = array('where'=>'file', 'name'=>ucwords($dbconf['dmsname']), 'section'=>'db', 'value'=>$dbconf['dmsname'], 'setting'=>'dbUser');
+        $server['dbPass'] = array('where'=>'file', 'name'=>ucwords($dbconf['dmspassword']), 'section'=>'db', 'value'=>$dbconf['dmspassword'], 'setting'=>'dbPass');
         $server['dbPort'] = array('where'=>'file', 'name'=>ucwords($dbconf['dport']), 'section'=>'db', 'value'=>$dbconf['dport'], 'setting'=>'dbPort');
         $server['dbAdminUser'] = array('where'=>'file', 'name'=>ucwords($dbconf['dmsname']), 'section'=>'db', 'value'=>$dbconf['dmsname'], 'setting'=>'dbAdminUser');
         $server['dbAdminPass'] = array('where'=>'file', 'name'=>ucwords($dbconf['dmspassword']), 'section'=>'db', 'value'=>$dbconf['dmspassword'], 'setting'=>'dbAdminPass');
@@ -636,6 +636,10 @@ class database extends Step
  
         }
  
+		if(!$this->importExportedDB()) {
+			$this->error['con'] = "Could not Import ";
+		}
+		
         return true;
     }
  
@@ -755,7 +759,7 @@ class database extends Step
     	} else {
 			$user1 = "GRANT SELECT, INSERT, UPDATE, DELETE ON {$this->dname}.* TO {$this->dmsusername}@{$this->dhost} IDENTIFIED BY \"{$this->dmsuserpassword}\";";
 			$user2 = "GRANT ALL PRIVILEGES ON {$this->dname}.* TO {$this->dmsname}@{$this->dhost} IDENTIFIED BY \"{$this->dmspassword}\";";
-			if ($this->_dbhandler->execute($user1) && $this->_dbhandler->execute($user2)) {
+			if ($this->_dbhandler->query($user1) && $this->_dbhandler->query($user2)) {
             	return true;
         	} else {
         		$this->error['con'] = "Could not create users for database: {$this->dname}";
@@ -784,7 +788,7 @@ class database extends Step
 			while (!feof($handle)) {
     			$query.= fgets($handle, 4096);
     				if (substr(rtrim($query), -1) == ';') {
-     					$this->_dbhandler->execute($query);
+     					$this->_dbhandler->query($query);
      					$query = '';
     				}
 			}
@@ -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
 	*
 <?php
 /**
-* Install Step Controller. 
+* Install Step Controller.
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
@@ -40,9 +40,27 @@
 * @version Version 0.1
 */
  
-class install extends step 
+class install extends step
 {
  
+	/**
+	* Flag to store class information in session
+	*
+	* @author KnowledgeTree Team
+	* @access public
+	* @var array
+	*/
+    protected $storeInSession = true;
+
+	/**
+	* Flag if step needs to be installed
+	*
+	* @author KnowledgeTree Team
+	* @access public
+	* @var array
+	*/
+    protected $runInstall = true;
+
     function __construct() {
         $this->temp_variables = array("step_name"=>"install");
     }
@@ -52,12 +70,14 @@ class install extends step
     		return 'landing';
     	}
         if($this->install()) {
+            $this->doRun();
             return 'install';
         } else if($this->previous()) {
             return 'previous';
         }
  
-        return 'landing'; 
+        $this->doRun();
+        return 'landing';
     }
  
     public function getStepVars()
@@ -68,5 +88,41 @@ class install extends step
     public function getErrors() {
         return $this->error;
     }
+
+    public function doRun()
+    {
+        if(isset($_POST['Install'])) {
+            if(isset($_POST['call_home'])){
+                $value = $_POST['call_home'];
+            }else{
+                $value = 'disable';
+            }
+            $this->temp_variables['call_home'] = $value;
+
+            // Force a set session
+            // TODO: fix this to correctly set the session
+            $_SESSION['installers'] ['install']['call_home'] = $value;
+        }
+    }
+
+    public function installStep()
+    {
+        $conf = $this->getDataFromSession("install");
+        // retrieve database information from session
+        // initialise the db connection
+        $this->_dbhandler = new dbUtil();
+        $dbconf = $this->getDataFromSession("database");
+        $this->_dbhandler->load($dbconf['dhost'], $dbconf['duname'], $dbconf['dpassword'], $dbconf['dname']);
+
+        $complete = 1;
+        if($conf['call_home'] == 'enable'){
+            $complete = 0;
+        }
+        $query = "UPDATE scheduler_tasks SET is_complete = {$complete} WHERE task = 'Call Home'";
+        $this->_dbhandler->query($query);
+
+        // close the database connection
+        $this->_dbhandler->close();
+    }
 }
 ?>
 \ No newline at end of file
@@ -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') {
         	?>
@@ -5,9 +5,14 @@
 		<br/>
 		<br/>
 		<p class="empty_space">
-			The wizard will now complete the installation and run a final check on the system. 
+			The wizard will now complete the installation and run a final check on the system.
+		</p>
+		<div class="demo"><?php echo $html->image('kt_browse.png'); ?></div>
+		<br/>
+		<br/>
+		<p>
+            <input type='checkbox' name='call_home' value='enable' checked /> Enable the monitoring system
 		</p>
-		<div class="demo"><?php echo $html->image('dame/kt_browse.png'); ?></div>
 	</div>
 	<input type="submit" name="Previous" value="Previous" class="button_previous"/>
 	<input type="submit" name="Install" value="Install" class="button_next"/>
@@ -1376,7 +1376,8 @@ INSERT INTO `scheduler_tasks` VALUES
 (8,'Disk Usage and Folder Utilisation Statistics','plugins/housekeeper/bin/UpdateStats.php','',0,'5mins','2007-10-01 00:00:00',NULL,0,'enabled'),
 (9,'Refresh Index Statistics','search2/bin/cronIndexStats.php','',0,'1min','2007-10-01',NULL,0,'enabled'),
 (10,'Refresh Resource Dependancies','search2/bin/cronResources.php','',0,'1min','2007-10-01',NULL,0,'enabled'),
-(11,'Bulk Download Queue','bin/ajaxtasks/downloadTask.php','',0,'1min','2007-10-01',NULL,0,'system');
+(11,'Bulk Download Queue','bin/ajaxtasks/downloadTask.php','',0,'1min','2007-10-01',NULL,0,'system'),
+(12,'Call Home','bin/system_info.php','',0,'daily','2009-10-01',NULL,0,'system');
  
 /*!40000 ALTER TABLE `scheduler_tasks` ENABLE KEYS */;
 UNLOCK TABLES;
@@ -1767,7 +1768,9 @@ INSERT INTO `upgrades` VALUES
 (225,'upgrade*3.6.3*99*upgrade3.6.3','Upgrade from version 3.6.2 to 3.6.3','2009-06-01 00:00:00',1,'upgrade*3.6.3*99*upgrade3.6.3'),
 (226,'sql*3.7.0*0*3.7.0/plugins_admin.sql','Database upgrade to version 3.7.0: Plugins admin','2009-09-01 00:00:00',1,'upgrade*3.7.0*99*upgrade3.7.0'),
 (227,'sql*3.7.0*0*3.7.0/config_settings.sql','Database upgrade to version 3.7.0: Config settings','2009-09-01 00:00:00',1,'upgrade*3.7.0*99*upgrade3.7.0'),
-(228,'upgrade*3.7.0*99*upgrade3.7.0','Upgrade from version 3.6.3 to 3.7.0','2009-09-01 00:00:00',1,'upgrade*3.7.0*99*upgrade3.7.0');
+(228,'sql*3.7.0*0*3.7.0/plugin_helper.sql','Database upgrade to version 3.7.0: Plugin helper','2009-09-01 00:00:00',1,'upgrade*3.7.0*99*upgrade3.7.0'),
+(229,'sql*3.7.0*0*3.7.0/call_home_task.sql','Database upgrade to version 3.7.0: Call home task','2009-09-01 00:00:00',1,'upgrade*3.7.0*99*upgrade3.7.0'),
+(230,'upgrade*3.7.0*99*upgrade3.7.0','Upgrade from version 3.6.3 to 3.7.0','2009-09-01 00:00:00',1,'upgrade*3.7.0*99*upgrade3.7.0');
 /*!40000 ALTER TABLE `upgrades` ENABLE KEYS */;
 UNLOCK TABLES;
  
+INSERT INTO `scheduler_tasks` (task, script_url, frequency, run_time, status)
+VALUES ('Call Home','bin/system_info.php','daily','2009-10-01','system');
 \ No newline at end of file
@@ -22,16 +22,14 @@ i18n[&#39;Upload succeeded&#39;] = &#39;{i18n}Upload succeeded{/i18n}&#39;;
  
 i18n['Document type changed'] = '{i18n}Document type changed{/i18n}';
  
-i18n['Upload failed'] = '{i18n}Upload failed{/i18n}';
-
-i18n['Your document has not been saved.'] = '{i18n}Your document has not been saved.{/i18n}';
-
-i18n['A newer version of this document is available. Would you like to open it instead?'] = '{i18n}A newer version of this document is available. Would you like to open it instead?{/i18n}';
-
 i18n['Upload'] = '{i18n}Upload{/i18n}';
  
 i18n['Upload cancelled'] = '{i18n}Upload cancelled{/i18n}';
  
+i18n['Upload failed'] = '{i18n}Upload failed{/i18n}';
+
+i18n['Your document has not been saved.'] = '{i18n}Your document has not been saved.{/i18n}';
+
 i18n['Your document has been saved.'] = '{i18n}Your document has been saved.{/i18n}';
  
 i18n['Download failed'] = '{i18n}Download failed{/i18n}';
@@ -62,13 +60,13 @@ i18n[&#39;Document checked in.&#39;] = &#39;{i18n}Document checked in.{/i18n}&#39;;
  
 i18n['Document checked out.'] = '{i18n}Document checked out.{/i18n}';
  
-i18n['Cancel edit failed'] = '{i18n}Cancel edit failed{/i18n}';
+i18n['Cancel checkout failed'] = '{i18n}Cancel checkout failed{/i18n}';
  
-i18n['The edit has not been cancelled.'] = '{i18n}The edit has not been cancelled.{/i18n}';
+i18n['The check-out has not been cancelled.'] = '{i18n}The check-out has not been cancelled.{/i18n}';
  
-i18n['Cancel edit succeeded'] = '{i18n}Cancel edit succeeded{/i18n}';
+i18n['Cancel checkout succeeded'] = '{i18n}Cancel checkout succeeded{/i18n}';
  
-i18n['The edit has been cancelled.'] = '{i18n}The edit has been cancelled.{/i18n}';
+i18n['The check-out has been cancelled.'] = '{i18n}The check-out has been cancelled.{/i18n}';
  
 i18n['Properties could not be saved.'] = '{i18n}Properties could not be saved.{/i18n}';
  
@@ -172,16 +170,6 @@ i18n[&#39;Login&#39;] = &#39;{i18n}Login{/i18n}&#39;;
  
 i18n['Document already open'] = '{i18n}Document already open{/i18n}';
  
-i18n['Unable to delete folder'] = '{i18n}Unable to delete folder{/i18n}';
-
-i18n['Delete Folder'] = '{i18n}Delete Folder{/i18n}';
-
-i18n['This will delete this folder.<br/>Are you sure you want to continue?'] = '{i18n}This will delete this folder.<br/>Are you sure you want to continue?{/i18n}';
-
-i18n['Unable to Delete Folder'] = '{i18n}Unable to Delete Folder{/i18n}';
-
-i18n['This folder contains other documents/folders<br/>and may not be deleted.'] = '{i18n}This folder contains other documents/folders<br/>and may not be deleted.{/i18n}';
-
 i18n['Introduction'] = '{i18n}Introduction{/i18n}';
  
 i18n['The requested action has not been implemented'] = '{i18n}The requested action has not been implemented{/i18n}';
@@ -204,16 +192,6 @@ i18n[&#39;Save&#39;] = &#39;{i18n}Save{/i18n}&#39;;
  
 i18n['Adds your open Office document to KnowledgeTree. You must have \'write\' permissions on the folder.'] = '{i18n}Adds your open Office document to KnowledgeTree. You must have \'write\' permissions on the folder.{/i18n}';
  
-i18n['Add Folder'] = '{i18n}Add Folder{/i18n}';
-
-i18n['Provides an interface to create a new folder under the current folder. You must have \'add\' permissions on the folder.'] = '{i18n}Provides an interface to create a new folder under the current folder. You must have \'add\' permissions on the folder.{/i18n}';
-
-i18n['Rename Folder'] = '{i18n}Rename Folder{/i18n}';
-
-i18n['Provides an interface to rename the current folder. You must have \'rename\' permissions on the folder.'] = '{i18n}Provides an interface to rename the current folder. You must have \'rename\' permissions on the folder.{/i18n}';
-
-i18n['Provides an interface to delete the current folder. You must have \'delete\' permissions on the folder.'] = '{i18n}Provides an interface to delete the current folder. You must have \'delete\' permissions on the folder.{/i18n}';
-
 i18n['New folder'] = '{i18n}New folder{/i18n}';
  
 i18n['Saves active document to a new folder. You must have \'write\' permissions on the folder.'] = '{i18n}Saves active document to a new folder. You must have \'write\' permissions on the folder.{/i18n}';
@@ -316,8 +294,6 @@ i18n[&#39;Please complete all required fields.&#39;] = &#39;{i18n}Please complete all requir
  
 i18n['Editing'] = '{i18n}Editing{/i18n}';
  
-i18n['File Type'] = '{i18n}File Type{/i18n}';
-
 i18n['Type'] = '{i18n}Type{/i18n}';
  
 i18n['Some fields are required'] = '{i18n}Some fields are required{/i18n}';
@@ -364,6 +340,6 @@ i18n[&#39;You do not have the required permissions to view the root folder. Please c
  
 i18n['Search for documents'] = '{i18n}Search for documents{/i18n}';
  
-// Total Language Strings: 153
+// Total Language Strings: 141
  
-// Unique Strings: 153
 \ No newline at end of file
+// Unique Strings: 141
 \ No newline at end of file