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

Megan Watson
2 parents 320167ce 6ac190cc
Showing 26 changed files with 781 additions and 1174 deletions
setup/migrate/ini.php
setup/migrate/migrateUtil.php
setup/migrate/migrater.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/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
setup/upgrade/steps/upgradeWelcome.php
setup/upgrade/templates/backup.tpl
setup/upgrade/templates/installation.tpl
setup/upgrade/templates/restore.tpl
-<?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();
@@ -82,8 +82,12 @@ class migrateComplete extends Step {
     }
  
     private function checkSqlDump() {
-    	$tmpFolder = "/tmp/knowledgtree";
-    	$sqlFile = $tmpFolder."dms.sql";
+    	$database = $this->getDataFromSession("database"); // Get installation directory
+    	// TODO
+    	$sqlFile = $_SESSION['database']['dumpLocation'];
+//    	$tmpFolder = $database['dumpLocation'];
+//    	$sqlFile = $tmpFolder."dms.sql";
+    	//echo $sqlFile;
 		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['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"=>"/opt/ktdms/knowledgeTree/config/config-path","/var/www/ktdms"=>"/var/www/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() {
@@ -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">
 <?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();
@@ -92,17 +89,21 @@ class upgradeBackup extends Step {
         else if($this->previous()) {
             return 'previous';
         }
+        else if ($this->upgrade()) {
+            header('Location: index.php?step_name=database');
+            exit;
+        }
  
         $this->doRun();
         return 'landing';
     }
  
-    function backupNow()
+    private function backupNow()
     {
         return isset($_POST['BackupNow']);
     }
  
-    function doRun($action = null) {
+    private function doRun($action = null) {
         $this->temp_variables['action'] = $action;
  
         if (is_null($action) || ($action == 'confirm')) {
@@ -127,29 +128,7 @@ class upgradeBackup extends Step {
     private function storeSilent() {
     }
  
-    /*
-    // these belong in a shared lib
-    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;
-    }
-}
-*/
-    
     private function backup() {
-//        $this->check_state(1);
-//        $this->set_state(2);
         $targetfile = $_SESSION['backupFile'];
         $stmt = $this->create_backup_stmt($targetfile);
         $dir = $stmt['dir'];
@@ -163,7 +142,7 @@ function check_state($value, $state=&#39;Home&#39;)
             $read = fread($handle, 10240);
             pclose($handle);
             $_SESSION['backupOutput']=$read;
-            $dir = $this->resolveTempDir();
+            $dir = $this->util->resolveTempDir();
             $_SESSION['backupFile'] =   $stmt['target'];
  
             if (OS_UNIX) {
@@ -177,21 +156,9 @@ function check_state($value, $state=&#39;Home&#39;)
                 $_SESSION['backupStatus'] = false;
             }
         }
-        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() {
-//        $this->check_state(2);
-//        $this->set_state(3);
-//        title('Backup Status');
         $status = $_SESSION['backupStatus'];
         $filename = $_SESSION['backupFile'];
  
@@ -200,7 +167,7 @@ function check_state($value, $state=&#39;Home&#39;)
         if ($status)
         {
             $stmt = $this->util->create_restore_stmt($filename);
-            $this->temp_variables['display'] = 'The backup file <nobr><i>"<?php echo $filename;?>"</i></nobr> has been created.
+            $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>';
                 if ($stmt['dir'] != '')
@@ -230,136 +197,78 @@ function check_state($value, $state=&#39;Home&#39;)
         else
         {
             $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>';
+            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>';
         }
-}
-
-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)
+    private function create_backup_stmt($targetfile=null)
     {
-        if (is_file($dir . '/' . $mysqlname))
+        $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->util->resolveMysqlDir();
+    
+        $info['dir']=$dir;
+    
+        $prefix='';
+        if (OS_UNIX)
         {
-            return $dir;
+            $prefix .= "./";
         }
+    
+        if (@stat($dbSocket) !== false)
+        {
+            $mechanism="--socket=\"$dbSocket\"";
+        }
+        else
+        {
+            $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)) {
-            mkdir($dir);
+    private 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'];
     }
-    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
@@ -44,20 +44,20 @@ require &#39;../../config/dmsDefaults.php&#39;;
  
 class upgradeComplete extends Step {
  
-    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);
     }
  
-    function doStep() {
+    public function doStep() {
         $this->doRun();
     	return 'landing';
     }
  
-    function doRun() {
+    private function doRun() {
         $this->storeSilent();// Set silent mode variables
     }
  
 <?php
 /**
-* Database Step Controller. 
+* Upgrade Step Controller. 
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
@@ -40,7 +40,6 @@
 * @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';
@@ -67,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
@@ -181,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
@@ -228,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
@@ -272,12 +139,12 @@ 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->inStep("database")) {
+    	    $this->doRun();
+    		return 'landing';
+    	}
 		if($this->next()) {
+		    $this->doRun('preview');
 			return 'next';
 		} else if($this->previous()) {
 			return 'previous';
@@ -297,15 +164,15 @@ class upgradeDatabase extends Step
         return 'landing';
     }
  
-    function confirmUpgrade() {
+    private function confirmUpgrade() {
         return isset($_POST['ConfirmUpgrade']);
     }
  
-    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,8 +194,7 @@ class upgradeDatabase extends Step
         }
         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;
             }
         }
@@ -336,7 +202,7 @@ class upgradeDatabase extends Step
         return true;
     }
  
-    public function generateUpgradeTable() {
+    private function generateUpgradeTable() {
         global $default;
  
         $this->temp_variables['systemVersion'] = $default->systemVersion;
@@ -359,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>';
@@ -367,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
@@ -455,7 +285,7 @@ class upgradeDatabase extends Step
         $this->temp_variables['dbSettings'] = $this->dbSettings;
     }
  
-    function upgradeConfirm()
+    private function upgradeConfirm()
     {
         if (!isset($_SESSION['backupStatus']) || $_SESSION['backupStatus'] === false) {
             $this->temp_variables['backupStatus'] = false;
@@ -465,158 +295,148 @@ class upgradeDatabase extends Step
         }
     }
  
-
-function upgrade()
-{
-    global $default;
+    private function upgradeDatabase()
+    {
+        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>';
  
-    $this->temp_variables['detail'] = '<p>The table below describes the upgrades that have occurred to
-        upgrade your KnowledgeTree installation to <strong>' . $default->systemVersion . '</strong>';
-?>
-    <p>
-
-<?php
-  
-    $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><!--: 
+                                                      click here for error details-->
+                                                      <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>';
+        }
     }
-            ?>
-    <br/>
  
-<p>
-  <?php
-?>
-<p>
-<?php
-    $res = $this->performAllUpgrades();
-    if (PEAR::isError($res) || PEAR::isError($pres)) {
-        $this->temp_variables['upgradeStatus'] = '<font color="red">Upgrade failed.</font>';
-    }
-    else {
-        $this->temp_variables['upgradeStatus'] = '<font color="green">Upgrade succeeded.</font>';
-    }
-?>
-<p>
-    
-<p>
-  <?php
-    $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>';
+    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;
+    
     }
-}
-
-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);
+    
+    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;
+    
     }
  
-    return true;
-
-}
-
-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);
+    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;
  
-    $this->temp_variables['upgradeTable'] = '';
-
-    foreach ($upgrades as $upgrade) {
-        if (($GLOBALS['row'] % 2) == 1) {
-            $class = "odd";
-        } else {
-            $class = "even";
+        $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;
+            }
         }
-        $this->temp_variables['upgradeTable'] .= sprintf('<div class="row %s"><div class="foo">%s</div>' . "\n", $class, htmlspecialchars($upgrade->getDescription()));
-        $GLOBALS['row']++;
-        ob_flush();
-        flush();
-        $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";
-        ob_flush();
-        flush();
-        $this->temp_variables['upgradeTable'] .= "</div>\n";
+    
+        return $res;
+    }
+    
+    private function showResult($res) {
         if (PEAR::isError($res)) {
-            if (!is_a($res, 'Upgrade_Already_Applied')) {
-                break;
-            } else {
-                $res = true;
+            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 === false) {
-            $res = PEAR::raiseError("Upgrade returned false");
-            break;
+        if ($res === true) {
+            return '<span style="color: green">Success</span>';
         }
-    }
-
-    return $res;
-}
-
-function showResult($res) {
-    if (PEAR::isError($res)) {
-        if (is_a($res, 'Upgrade_Already_Applied')) {
-            return '<span style="color: orange">Already applied</span>';
+        if ($res === false) {
+            return '<span style="color: red">Failure</span>';
         }
-        return sprintf('<span style="color: red">%s</span>', htmlspecialchars($res->toString()));
+        return $res;
     }
-    if ($res === true) {
-        return '<span style="color: green">Success</span>';
-    }
-    if ($res === false) {
-        return '<span style="color: red">Failure</span>';
-    }
-    return $res;
-}
  
 }
 ?>
 \ No newline at end of file
 <?php
 /**
-* Upgrade Step Controller. 
+* Notification Controller. 
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
@@ -50,12 +50,13 @@ class UpgradeInstallation extends step
 	* @var array
 	*/
     protected $silent = false;
+    protected $temp_variables = array();
  
-    function __construct() {
+    public function __construct() {
         $this->temp_variables = array("step_name"=>"installation");
     }
  
-    function doStep() {
+    public function doStep() {
         parent::doStep();
         if($this->next()) {
             return 'next';
@@ -72,13 +73,5 @@ class UpgradeInstallation extends step
         return 'landing';
     }
  
-    function backup() {
-        return isset($_POST['Backup']);
-    }
-     
-    function restore() {
-        return isset($_POST['Restore']);
-    }
-    
 }
 ?>
 \ No newline at end of file
 <?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,24 +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() {
-        $this->temp_variables['selected'] = false;
-        if ($this->select()) {
-            $this->restoreSelected();
-            $this->temp_variables['selected'] = true;
+    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']);
     } 
  
@@ -105,183 +121,126 @@ class upgradeRestore extends Step {
      */
     private function storeSilent() {
     }
- /*   
-    // these belong in a shared lib
-    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 restore()
-{
-//    check_state(1);
-//    set_state(5);
-//    title('Restore In Progress');
-    $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'))
+    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;
-
-    }
-    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
+            // should be some sort of error checking, really
+            $this->restoreDone();
+        }
     }
  
-}
-
-
-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
+    private function restoreDone()
     {
-?>
-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
-
+        $status = $_SESSION['restoreStatus'];
+        $filename = $_SESSION['backupFile'];
+    
+        if ($status)
+        {
+            $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;
+        }
     }
-?>
-
-<br/>
-
-&nbsp;&nbsp; &nbsp; &nbsp;  <input type=button value="back" onclick="javascript:do_start('welcome')">
-
-<?php
-
-}
-
-function restoreSelect()
-{
-    $this->temp_variables['availableBackups'] = false;
-//    title('Select Backup to Restore');
-    $dir = $this->util->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)) {
-                continue;
+            while (($file = readdir($dh)) !== false)
+            {
+                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);
     }
  
-    $this->temp_variables['dir'] = $dir;
-    if (count($files) != 0) {
-        $this->temp_variables['availableBackups'] = true;
-        $this->temp_variables['files'] = $files;
+    private function restoreSelected()
+    {
+        $file=$_REQUEST['file'];
+    
+        $dir = $this->util->resolveTempDir();
+        $_SESSION['backupFile'] = $dir . '/' . $file;
     }
-}
-
-function restoreSelected()
-{
-    $file=$_REQUEST['file'];
-
-    $dir = $this->util->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();
-        return;
+        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->util->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;
         }
  
@@ -44,18 +44,17 @@ 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 != '')
 {
     if (($action == '') || ($action == 'confirm')) {
         ?><input type="submit" name="BackupNow" value="Next" class="button_next"><?php
     }
     else if ($backupStatus) {
-        ?><input type="submit" name="Next" value="Next" class="button_next"><?php
+        ?><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
@@ -64,5 +63,4 @@ if ($dir != &#39;&#39;)
  
     ?>
     <input type="submit" name="Previous" value="Back" class="button_previous">
-	</div>
 </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">
 <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,63 +12,65 @@
     <br/><br/>
     <div>
     <?php
-    if (!$availableBackups) {
-        ?>There don't seem to be any backups to restore from the <i>"<?php echo $dir;?>"</i> directory.<?php
-    }
-    else if (!$selected) {
+    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';
+    ?>
+            <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>
-    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';
-?>
-        <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>
+    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 ($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
-    }
+        }
+        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>
@@ -89,11 +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">
     <?php } ?>
-    </div>
 </form>
 \ No newline at end of file
@@ -666,115 +666,106 @@ class UpgradeUtil {
         return join(" ", $aSafeArgs);
     }
  
-    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
+    public function create_restore_stmt($targetfile)
     {
-        $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');
+        $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;
     }
-
-    foreach($dirs as $dir)
+    
+    public function resolveMysqlDir()
     {
-        if (is_file($dir . '/' . $mysqlname))
+        // possibly detect existing installations:
+    
+        if (OS_UNIX) {
+            $dirs = array('/opt/mysql/bin','/usr/local/mysql/bin');
+            $mysqlname ='mysql';
+        }
+        else
         {
-            return $dir;
+            $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 '';
     }
-
-    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))
+    
+    public function resolveTempDir()
     {
-            mkdir($dir);
+        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;
     }
-    return $dir;
-}
  
 }
 ?>
 \ 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
@@ -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');
@@ -755,7 +755,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 +784,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 = '';
     				}
 			}