StoryId 778896: Installer Framework updates

Committed by: Jarrett Jordaan Reviewed by: Megan Watson

StoryId 778896: Installer Framework updates
Committed by: Jarrett Jordaan Reviewed by: Megan Watson
jarrett
1 parent 66a351b6
Showing 24 changed files with 383 additions and 490 deletions
setup/wizard/config/config.xml
setup/wizard/config/databases.xml
setup/wizard/config/mysql.xml
setup/wizard/config/oracle.xml
setup/wizard/config/postgres.xml
setup/wizard/resources/wizard.css
setup/wizard/session.php
setup/wizard/step.php
setup/wizard/steps/complete.php
setup/wizard/steps/configuration.php
setup/wizard/steps/database.php
setup/wizard/steps/dependency_check.php
setup/wizard/steps/install.php
setup/wizard/steps/license.php
setup/wizard/steps/welcome.php
setup/wizard/templates/configuration.tpl
setup/wizard/templates/configuration_confirm.tpl
setup/wizard/templates/database.tpl
setup/wizard/templates/database_confirm.tpl
setup/wizard/templates/dependency_check.tpl
@@ -3,9 +3,8 @@
 <!--
     Document   : config.xml
     Created on : 01 July 2009, 9:57 AM
-    Author     : jarrett
-    Description:
-        Purpose of the document follows.
+    Author     : KnowledgeTree Team
+    Description: Installer steps
 -->
 <install version="3.3">
@@ -18,4 +17,4 @@
         <step name="Install">install</step>
         <step name="Complete">complete</step>
     </steps>
 - </install>
+ </install>
 \ No newline at end of file
@@ -3,9 +3,8 @@
 <!--
     Document   : database.xml
     Created on : 01 July 2009, 1:13 PM
-    Author     : jarrett
-    Description:
-        Purpose of the document follows.
+    Author     : KnowledgeTree Team
+    Description: Installer Default MySql Database Configuration
 -->
 <database>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Document   : mysql.xml
-    Created on : 01 July 2009, 1:56 PM
-    Author     : jarrett
-    Description:
-        Purpose of the document follows.
--->
-
-<mysql version="3.6">
-    <host>localhost</host>
-    <name>dms</name>
-    <username>root</username>
-    <password></password>
-    <port>3306</port>
-    <adminu>dmsadmin</adminu>
-    <adminp></adminp>
-</mysql>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Document   : oracle.xml
-    Created on : 01 July 2009, 1:57 PM
-    Author     : jarrett
-    Description:
-        Purpose of the document follows.
--->
-
-<oracle>
-    <host></host>
-    <name></name>
-    <username></username>
-    <password></password>
-    <port></port>
-    <adminu></adminu>
-    <adminp></adminp>
-</oracle>
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Document   : postgres.xml
-    Created on : 01 July 2009, 1:57 PM
-    Author     : jarrett
-    Description:
-        Purpose of the document follows.
--->
-
-<postgres>
-    <host></host>
-    <name></name>
-    <username></username>
-    <password></password>
-    <port></port>
-    <adminu></adminu>
-    <adminp></adminp>
-</postgres>
@@ -10,38 +10,33 @@ body {
 }
 h1 {
-    font-size: 2em;
+    font-size: 3em;
     font-weight: normal;
     padding: 10px 0;
-    color: #444;
+    color: #555;
 }
 h2 {
-    font-size: 1.5em;
+    font-size: 2em;
     font-weight: normal;
     padding: 10px 0;
     color: #555;
 }
 h3 {
-    font-size: 1.2em;
+    font-size: 1.5em;
     font-weight: normal;
     padding: 10px 0;
     color: #555;
 }
-p {
-    padding-bottom: 10px;
-    word-wrap: break-word;
-}
-
 a {
     color: #EC7725;
 }
 th {
     font-weight: bold;
-    text-align: left;
+    font-size: 1.1em;
     padding: 5px 5px;
 }
@@ -54,7 +49,6 @@ td {
     margin: 50px;
     margin-top: 20px;
     text-align: left;
-    z-index: -1;
 }
 .header {
@@ -72,32 +66,22 @@ td {
 }
 .content {
-    background: #F1F1F1;
 }
 .left {
-    position: relative;
     float: left;
     width: 200px;
     text-align: center;
     /*background: url("graphics/left.png") repeat-y;*/
     background-position: top left;
-    background: #F1F1F1;
     height: inherit;
     padding-bottom: 20px;
     padding-top: 40px;
 }
 .right {
-    position: relative;
     float: left;
     padding: 20px;
-    background: white;
-}
-
-.onclick {
-    color: #EC7725;
-    cursor: pointer;
 }
 .menu {
@@ -130,7 +114,6 @@ td {
     height: 15px;
     width: 15px;
     padding-left: 20px;
-    color: #919191;
 }
 .tick {
@@ -155,10 +138,6 @@ td {
     align: center;
 }
-.error {
-    color: #9F0000;
-}
-
 .buttons {
     margin-top: 20px;
     position: relative;
@@ -187,7 +166,7 @@ td {
 }
 .adv_options {
-    display: none;
+
 }
 .description {
@@ -197,8 +176,13 @@ td {
 }
 .top {
-    font-size: 2em;
-    font-weight: normal;
-    padding: 10px 0;
-    color: #444;
+    color:#EC7725;
+}
+
+.right_top {
+    height:45px;
+}
+
+#database td {
+	width : 340px;
 }
 \ No newline at end of file
@@ -193,7 +193,9 @@ class Session
 	*/
 	public function get($fld) {
 		$this->startSession();
-		return $_SESSION [$fld];
+		if(isset($_SESSION [$fld]))
+			return $_SESSION [$fld];
+		return false;
 	}
 	/**
@@ -260,7 +260,7 @@ class Step
     }
 	/**
-	* Safer way to return post data helper
+	* Safer way to return post data
 	*
 	* @author KnowledgeTree Team
 	* @params SimpleXmlObject $simplexml
@@ -272,6 +272,18 @@ class Step
     }
 	/**
+	* Safer way to return post data
+	*
+	* @author KnowledgeTree Team
+	* @params SimpleXmlObject $simplexml
+	* @access public
+	* @return void
+	*/
+    public function getPostBoolean($key) {
+    	return isset($_POST[$key]) ? $_POST[$key] : false;
+    }
+    
+	/**
 	* Runs step install if required
 	*
 	* @author KnowledgeTree Team
 <?php
 /**
-* Complete Step Controller.
+* Complete Step Controller. 
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 <?php
 /**
-* Configuration Step Controller.
+* Configuration Step Controller. 
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
@@ -58,12 +58,12 @@ class configuration extends Step
 	* @var array
 	*/
     protected $storeInSession = true;
-
+    
     public function __construct()
     {
         $this->done = true;
     }
-
+    
 	private function setDetails() {
 		$conf = $this->getDataFromSession("configuration");
 		if($conf) {
@@ -71,7 +71,7 @@ class configuration extends Step
 			$this->temp_variables['paths'] = $conf['paths'];
 		}
 	}
-
+	
     public function doStep() {
         if($this->next()) {
             if($this->doRun()){
@@ -97,7 +97,7 @@ class configuration extends Step
         $this->doRun();
         return 'landing';
     }
-
+    
     public function doRun()
     {
         $server = $this->getServerInfo();
@@ -120,7 +120,7 @@ class configuration extends Step
         $port = $_SERVER['SERVER_PORT'];
         $ssl_enabled = isset($_SERVER['HTTPS']) ? (strtolower($_SERVER['HTTPS']) === 'on' ? 'yes' : 'no') : true;
-        $pos = strpos($script, '/setup/wizard/');
+        $pos = strpos($script, '/wizard/');
         $root_url = substr($script, 0, $pos);
         $server = array();
 <?php
 /**
-* Database Step Controller.
+* Database Step Controller. 
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
@@ -123,6 +123,33 @@ class database extends Step
 	* @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 binary.
+	*
+	* @author KnowledgeTree Team
+	* @access private
+	* @var string
+	*/
+    private $dbbinary = '';
 	/**
 	* Database table prefix
@@ -227,17 +254,17 @@ class database extends Step
         if($this->next()) {        	
             $this->setDBConfig(); // Set any posted variables
             $this->setDetails();
-            return 'confirm';
+            if($this->doTest()) { // Test
+				return 'confirm';
+            } else {
+                return 'error';
+            }
         } else if($this->previous()) {
             return 'previous';
         } else if($this->confirm()) {
             $this->setDataFromSession("database"); // Set Session Information
             $this->setDBConfig(); // Set any posted variables
-            if($this->doTest()) { // Test
-                return 'next';
-            } else {
-                return 'error';
-            }
+			return 'next';
         } else if($this->edit()) {
             $this->setDataFromSession("database"); // Set Session Information, since its an edit
             return 'landing';
@@ -253,6 +280,14 @@ class database extends Step
 	* @return boolean
 	*/
     public function doTest() {
+    	if($this->match($this->dmspassword, $this->getPassword1()) != 0) {
+    		$this->error = array("19"=>"Passwords do not match: " . $this->dmspassword." ". $this->getPassword1());
+    		return false;
+    	}
+    	if($this->match($this->dmsuserpassword, $this->getPassword2()) != 0) {
+    		$this->error = array("17"=>"Passwords do not match: " . $this->dmsuserpassword." ". $this->getPassword2());
+    		return false;
+    	}
         $con = @mysql_connect($this->dhost, $this->duname, $this->dpassword);
         if (!$con) {
             $this->error = array("1"=>"Could not connect: " . mysql_error());
@@ -262,6 +297,17 @@ class database extends Step
         }
     }
+    public function match($str1, $str2) {
+    	return strcmp($str1, $str2);
+    }
+    
+    public function getPassword1() {
+    	return $_POST['dmspassword2'];
+    }
+    
+    public function getPassword2() {
+    	return $_POST['dmsuserpassword2'];
+    }
 	/**
 	* Check if theres a database type
 	*
@@ -306,16 +352,19 @@ class database extends Step
 	*/
     public function setDBConfig() {
     	$this->dtype = $this->getPostSafe("dtype");
-    	$this->dtypes = array("0"=>"mysql");//$this->getPostSafe("dtypes");
+    	$this->dtypes = array("0"=>"mysql"); // TODO:multiple databases
         $this->dhost = $this->getPostSafe("dhost");
         $this->dport = $this->getPostSafe("dport");
         $this->dname = $this->getPostSafe("dname");
         $this->duname = $this->getPostSafe("duname");
         $this->dpassword = $this->getPostSafe("dpassword");
         $this->dmsname = $this->getPostSafe("dmsname");
+        $this->dmsusername = $this->getPostSafe("dmsusername");
         $this->dmspassword = $this->getPostSafe("dmspassword");
+        $this->dmsuserpassword = $this->getPostSafe("dmsuserpassword");
+        $this->dbbinary = $this->getPostSafe("dbbinary");
         $this->tprefix = $this->getPostSafe("tprefix");
-        $this->ddrop = $this->getPostSafe("ddrop");
+        $this->ddrop = $this->getPostBoolean("ddrop");
     }
 	/**
@@ -329,16 +378,19 @@ class database extends Step
     public function loadDefaults($simplexml) {
         if($simplexml) {
         	$this->temp_variables['dtype'] = "";
-            $this->temp_variables['dtypes'] = array("0"=>"mysql");//$this->getTypes($simplexml->dtypes);
+            $this->temp_variables['dtypes'] = array("0"=>"mysql"); // TODO:multiple databases
             $this->temp_variables['dname'] = (string) $simplexml->dname;
             $this->temp_variables['duname'] = (string) $simplexml->duname;
             $this->temp_variables['dhost'] = (string) $simplexml->dhost;
             $this->temp_variables['dport'] = (string) $simplexml->dport;
             $this->temp_variables['dpassword'] = '';
             $this->temp_variables['dmsname'] = '';
+            $this->temp_variables['dmsusername'] = '';
             $this->temp_variables['dmspassword'] = '';
+            $this->temp_variables['dmsuserpassword'] = '';
+            $this->temp_variables['dbbinary'] = '';
             $this->temp_variables['tprefix'] = '';
-            $this->temp_variables['ddrop'] = 0;
+            $this->temp_variables['ddrop'] = false;
         }
     }
@@ -352,16 +404,19 @@ class database extends Step
 	*/
    private function setDetails() {
    		$this->temp_variables['dtype'] = $this->getPostSafe('dtype');
-        $this->temp_variables['dtypes'] = array("0"=>"mysql");//$this->getPostSafe('dtypes');
+        $this->temp_variables['dtypes'] = array("0"=>"mysql"); // TODO:multiple databases;
         $this->temp_variables['dhost'] = $this->getPostSafe('dhost');
         $this->temp_variables['dport'] = $this->getPostSafe('dport');
         $this->temp_variables['dname'] = $this->getPostSafe('dname');
         $this->temp_variables['duname'] = $this->getPostSafe('duname');
         $this->temp_variables['dpassword'] = $this->getPostSafe('dpassword');
 		$this->temp_variables['dmsname'] = $this->getPostSafe('dmsname');
+		$this->temp_variables['dmsusername'] = $this->getPostSafe('dmsusername');
 		$this->temp_variables['dmspassword'] = $this->getPostSafe('dmspassword');
+		$this->temp_variables['dmsuserpassword'] = $this->getPostSafe('dmsuserpassword');;
+		$this->temp_variables['dbbinary'] = $this->getPostSafe('dbbinary');
         $this->temp_variables['tprefix'] = $this->getPostSafe('tprefix');
-        $this->temp_variables['ddrop'] = $this->getPostSafe('ddrop');
+        $this->temp_variables['ddrop'] = $this->getPostBoolean('ddrop');
     }
 	/**
@@ -474,23 +529,27 @@ class database extends Step
 	* @return object mysql connection
 	*/
     private function createDB($con) {
-       if($this->usedb($con)) { // attempt to use the db
-            if($this->dropdb($con)) { // attempt to drop the db
-                if($this->create($con)) { // attempt to create the db
-
-                }
-            }
-       } else {
-            if($this->create($con)) { // attempt to create the db
-
-            }
-       }
-       
+		if($this->usedb($con)) { // attempt to use the db
+		    if($this->dropdb($con)) { // attempt to drop the db
+		        if(!$this->create($con)) { // attempt to create the db
+					$this->error = array("15"=>"Could create database: " . mysql_error());
+					return false;// cannot overwrite database
+		        }
+		    } else {
+		    	$this->error = array("14"=>"Could not drop database: " . mysql_error());
+		    	return false;// cannot overwrite database
+		    }
+		} else {
+		    if(!$this->create($con)) { // attempt to create the db
+				$this->error = array("16"=>"Could create database: " . mysql_error());
+				return false;// cannot overwrite database
+		    }
+		}
 		$this->createDmsUser($con);
-        $this->createSchema($con);
-        $this->populateSchema($con);
-
-        return $con;
+		$this->createSchema($con);
+		$this->populateSchema($con);
+		
+		return true;
     }
 	/**
@@ -550,24 +609,8 @@ class database extends Step
             return false;
         }
-    }
-
-	/**
-	* Attempts to use a db
-	*
-	* @author KnowledgeTree Team
-	* @params mysql connection object $con
-	* @access private
-	* @return boolean
-	*/
-    private function usedb2($con) {
-        $sql = "USE {$this->dname};";
-        if (@mysql_query($sql, $con)) {
-            return $con;
-        } else {
-            $this->error = array("4"=>"Error using database: ".mysql_error()."");
-            return false;
-        }
+        
+        return true;
     }
 	/**
@@ -579,21 +622,20 @@ class database extends Step
 	* @return boolean
 	*/
     private function createDmsUser($con) {
-    	//TODO
-        $com = "mysql -u{$this->duname} -p{$this->dpassword} {$this->dname} < sql/user.sql";
-        exec($com, $output);
-//        $sql = @file_get_contents("sql/user.sql");
-//        if($sql) {
-//	        if (@mysql_query($sql, $con)) {
-//	            return true;
-//	        } else {
-//	            $this->error = array("7"=>"Error populating database : ".mysql_error()."");
-//	            return false;
-//	        }
-//        } else {
-//        	$this->error = array("8"=>"Error Reading sql File : ".mysql_error()."");
-//			return false;
-//        }
+    	if($this->dmsname == '' || $this->dmspassword == '') {
+        	$command = "{$this->dbbinary} -u{$this->duname} -p{$this->dpassword} {$this->dname} < sql/user.sql";
+        	
+        	return exec($command, $output);
+    	} else {
+			$sql = "GRANT SELECT, INSERT, UPDATE, DELETE ON {$this->dname}.* TO {$this->dmsusername}@{$this->dhost} IDENTIFIED BY '{$this->dmsuserpassword}';GRANT ALL PRIVILEGES ON {$this->dname}.* TO {$this->dmsname}@{$this->dhost} IDENTIFIED BY '{$this->dmspassword}';";
+		    if (@mysql_query($sql, $con)) {
+            	return true;
+        	} else {
+        		$this->error = array("18"=>"Could not create users in database: ".mysql_error()."");
+        		return false;
+        	}
+		}
+        
     }
 	/**
@@ -605,25 +647,8 @@ class database extends Step
 	* @return boolean
 	*/
     private function createSchema($con) {
-    	// TODO : 
-        $com = "mysql -u{$this->duname} -p{$this->dpassword} {$this->dname} < sql/structure.sql";
-        exec($com, $output);
-//		$sql = "USE {$this->dname};";
-//        $sql .= file_get_contents("sql/structure.sql");
-//        echo $sql;die;
-//        if($sql) {
-//	        if (mysql_query($sql, $con)) {
-//
-//	            return true;
-//	        } else {
-//
-//	            $this->error = array("9"=>"Error creating database schema : ".mysql_error()."");
-//	            return false;
-//	        }
-//        } else {
-//        	$this->error = array("10"=>"Error Reading sql File : ".mysql_error()."");
-//			return false;
-//        }
+        $command = "{$this->dbbinary} -u{$this->duname} -p{$this->dpassword} {$this->dname} < sql/structure.sql";
+        exec($command, $output);
     }
 	/**
@@ -635,21 +660,8 @@ class database extends Step
 	* @return boolean
 	*/
     private function populateSchema($con) {
-    	// TODO :
-        $com = "mysql -u{$this->duname} -p{$this->dpassword} {$this->dname} < sql/data.sql";
-        exec($com, $output);
-//        $sql = @file_get_contents("sql/data.sql");
-//		if($sql) {
-//	        if (@mysql_query($sql, $con)) {
-//	            return true;
-//	        } else {
-//	            $this->error = array("11"=>"Error populating database : ".mysql_error()."");
-//	            return false;
-//	        }
-//		} else {
-//        	$this->error = array("12"=>"Error Reading sql File : ".mysql_error()."");
-//			return false;
-//        }
+        $command = "{$this->dbbinary} -u{$this->duname} -p{$this->dpassword} {$this->dname} < sql/data.sql";
+        return exec($command, $output);
     }
 	/**
 <?php
 /**
-* Dependency Step Step Controller.
+* Dependency Step Step Controller. 
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
@@ -39,7 +39,6 @@
 * @package Installer
 * @version Version 0.1
 */
-
 require_once(WIZARD_DIR.'step.php');
 class dependencyCheck extends Step
@@ -47,7 +46,15 @@ class dependencyCheck extends Step
     private $maxPHPVersion = '6.0.0';
     private $minPHPVersion = '5.0.0';
     private $done;
-
+	/**
+	* Flag to store class information in session
+	*
+	* @author KnowledgeTree Team
+	* @access public
+	* @var array
+	*/
+    public $storeInSession = true;
+    
     /**
      * Constructor
      *
@@ -75,7 +82,7 @@ class dependencyCheck extends Step
         return 'landing';
     }
-
+    
     public function doRun()
     {
         $check = $this->checkPhpVersion();
 <?php
 /**
-* Install Step Controller.
+* Install Step Controller. 
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 <?php
 /**
-* License Step Controller.
+* License Step Controller. 
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
@@ -50,7 +50,7 @@ class license extends step {
     public function doStep() {
         if($this->next()) {
             if($this->doRun())
-
+            	
                 return 'next';
             else
                 return 'error';
@@ -59,7 +59,7 @@ class license extends step {
             return 'previous';
         }
-        return 'landing'; // Just a welcome, so return "next" action
+        return 'landing'; // Just a license, so return "next" action
     }
     public function doRun() {
 <?php
 /**
-* Welcome Step Controller.
+* Welcome Step Controller. 
 *
 * KnowledgeTree Community Edition
 * Document Management Made Simple
 <h1>System Configuration</h1>
-<form action="index.php?step_name=configuration" method="POST">
+<form action="index.php?step_name=configuration" method="post">
 <h3>Server Settings</h3>
@@ -44,7 +44,7 @@
 ?>
 </table>
-<form action="index.php?step_name=configuration" method="POST">
+<form action="index.php?step_name=configuration" method="post">
 <div class="buttons">
     <!--<input type="submit" onclick="history.back();" name="Back" value="Back"/>
 <h1>Database Configuration</h1>
-<form action="index.php?step_name=<?php echo $step_name; ?>" method='POST'>
+<form action="index.php?step_name=<?php echo $step_name; ?>" method="post">
+<div id="database" class="step1" style="display:block;">
+	Select your database type:
+	<div class="dtype">
+		<?php if($dtypes) {
+		        foreach($dtypes as $k=>$v) {
+		    ?>
+		        <input type="radio" name="dtype" value="<?php echo $v; ?>" <?php if(!$k)echo 'checked="checked"'; ?>/>&nbsp;&nbsp;<?php echo ucwords($v); ?>
+		        <br/>
+		<?php }
+		}
+		?>
+	</div>
-Select your database type:
-<div class='dtype'>
-<?php if($dtypes) {
-        foreach($dtypes as $k=>$v) {
-    ?>
-        <input type='radio' name='dtype' value="<?php echo $v; ?>" <?php echo (!$k) ? 'CHECKED' : ''; ?>"/>&nbsp;&nbsp;<?php echo ucwords($v); ?>
-<!--        <input type='hidden' name='dtypes' value='<?php echo $v; ?>'>-->
-        <br/>
-<?php }
-}
-?>
-<!--<input type='hidden' name='dtypes' value='postgres'>-->
-<!--<input type='hidden' name='dtypes' value='oracle'>-->
-<br />
+	<table>
+	    <tr>
+	        <td><label for='dname'>Enter a name for the database: </label></td>
+	        <td><input type='text' value="<?php echo $dname?>" id='dname' name='dname' size='40' /></td>
+	    </tr>
+	    <tr>
+	        <td><label for='duname'>Enter the username for the Root or Administrative User: </label></td>
+	        <td><input type='text' value="<?php echo $duname?>" id='duname' name='duname' size='40' /></td>
+	    </tr>
+	    <tr>
+	        <td><label for='dpassword'>Enter the password for the user: </label></td>
+	        <td><input type='text' value="<?php echo $dpassword?>" id='dpassword' name='dpassword' size='40' /></td>
+	    </tr>
+	    <tr>
+	        <td><label for='ddrop'>Drop database if it exists:  </label></td>
+	        <td><input type="checkbox" id='ddrop' name="ddrop" <?php echo ($ddrop) ? 'CHECKED' : ''; ?>/></td>
+	</table>
+	<div id="options" onclick="showAO();" style="cursor:pointer;">Advanced Options</div>
+	<div id="database" class="adv_options" style="display:none;">
+	    <div class="description">
+	        These options are only necessary for some sites. If you're not sure what you should enter here, leave the default settings or check with your hosting provider.
+	    </div>
+		<table>
+			<tr>
+				<td><label for='dname'>Host: </label></td>
+				<td><input type="text" value="<?php echo $dhost?>" id="dhost" name="dhost" size='40'/><br/></td>
+				
+			</tr>
+			<tr><td><div class="description">If your database is located on a different server, change this.</div></td></tr>
+			<tr>
+				<td><label for='dname'>Port: </label></td>
+				<td><input type="text" value="<?php echo $dport?>" id="dport" name="dport" size="40"/></td>
+				<tr><td><div class="description">If your database server is listening to a non-standard port, enter its number.</div></tr></td>
+			</tr>
+			<tr>
+				<td><label for='dname'>Binary: </label></td>
+				<td><input type="text" value="<?php echo $dbbinary?>" id="dbbinary" name="dbbinary" size="40"/></td>
+				<tr><td><div class="description">If your database binary is not in the system path, change this.</div></tr></td>
+			</tr>
+			<tr>
+				<td><label for='dname'>Table Prefix: </label></td>
+				<td><input type="text" value="<?php echo $tprefix?>" id="tprefix" name="tprefix" size="40"/></td>
+				<tr><td><div class="description">If more than one application will be sharing this database, enter a table prefix such as kt_ for your KnowledgeTree site here.</div></tr></td>
+			</tr>
+		</table>
+	</div>
+	<div class="buttons">
+	    <input type="submit" name="Previous" value="previous" />
+	    <input type="button" name="Next" value="next" onclick="showStep(1, 'n');"/>
+	</div>
 </div>
-
-<table>
-    <tr>
-        <td><label for='dname'>Enter a name for the database: </label></td>
-        <td><input type='text' value="<?php echo $dname?>" id='dname' name='dname' size='40' /></td>
-    </tr>
-    <tr>
-        <td><label for='duname'>Enter the username for the Root or Administrative User: </label></td>
-        <td><input type='text' value="<?php echo $duname?>" id='duname' name='duname' size='40' /></td>
-    </tr>
-    <tr>
-        <td><label for='dpassword'>Enter the password for the user: </label></td>
-        <td><input type='text' value="<?php echo $dpassword?>" id='dpassword' name='dpassword' size='40' /></td>
-    </tr>
-    <tr>
-        <td><label for='ddrop'>Drop database if it exists:  </label></td>
-        <td><input type="checkbox" id='ddrop' name="ddrop" <?php echo ($ddrop) ? 'CHECKED' : ''; ?>></td>
-</table>
-
-<br />
-
-<div id='options' onclick='showAO();' class='onclick'>Advanced Options</div>
-<div class='description'>
-        These options are only necessary for some sites. If you're not sure what you should enter here, leave the default settings.
-    </div>
-<div class='adv_options'>
-
-    <p>
-        <label for='dhost'>Host:</label><br />
-        <span class='description'>If your database is located on a different server, change this.</span><br />
-        <input type='text' value='<?php echo $dhost?>' name='dhost' id='dhost' size='40' />
-    </p>
-
-    <p>
-        <label for='dport'>Port:</label><br />
-        <span class='description'>If your database server is listening to a non-standard port, enter its number.</span><br />
-        <input type='text' value='<?php echo $dport?>' name='dport' id='dport' size='10' />
-    </p>
-
-    <p>
-        <label for='prefix'>Table Prefix: </label><br />
-        <span class='description'>If more than one application will be sharing this database, enter a table prefix such as kt_ for your KnowledgeTree site here.</span><br />
-        <input type='text' value='' name='prefix' id='prefix' size='40' />
-    </p>
-
+<div id="database" class="step2" style="display:none;">
+	<table>
+	    <tr>
+	        <td><label for='dmsname'>Enter a name for the DMS Admin User: </label></td>
+	        <td><input type='text' value="<?php echo $dmsname; ?>" id='dmsname' name='dmsname' size='40' /></td>
+		</tr>
+	    <tr>
+	        <td><label for='dmspassword'>Enter the password for the DMS Admin User: </label></td>
+	        <td><input type='text' value="<?php echo $dmspassword; ?>" id='dmspassword' name='dmspassword' size='40' /></td>
+		</tr>
+	    <tr>
+	        <td><label for='dmspassword2'>Re Enter the password for the DMS Admin User: </label></td>
+	        <td><input type='text' value="" id='dmspassword2' name='dmspassword2' size='40' /></td>
+		</tr>
+	</table>
+	
+	<div class="buttons">
+	    <input type="button" name="Previous" value="previous" onclick="showStep(2, 'p');"/>
+	    <input type="button" name="Next" value="next" onclick="showStep(2, 'n');"/>
+	</div>
 </div>
-<div class="buttons">
-    <input type="submit" name="Previous" value="previous"/>
-    <input type="submit" name="Next" value="next"/>
+
+<div id="database" class="step3" style="display:none;":>
+	<table>
+	    <tr>
+	        <td><label for='dmsusername'>Enter a name for the DMS Default User: </label></td>
+	        <td><input type='text' value="<?php echo $dmsusername; ?>" id='dmsusername' name='dmsusername' size='40' /></td>
+		</tr>
+	    <tr>
+	        <td><label for='dmsuserpassword'>Enter the password for the DMS Default User: </label></td>
+	        <td><input type='text' value="<?php echo $dmsuserpassword?>" id='dmsuserpassword' name='dmsuserpassword' size='40' /></td>
+		</tr>
+	    <tr>
+	        <td><label for='dmsuserpassword2'>Re Enter the password for the DMS Default User: </label></td>
+	        <td><input type='text' value="" id='dmsuserpassword2' name='dmsuserpassword2' size='40' /></td>
+		</tr>
+	</table>
+		<div class="buttons">
+	    <input type="button" name="Previous" value="previous" onclick="showStep(3, 'p');"/>
+	    <input type="submit" name="Next" value="next"/>
+	</div>
 </div>
+
 <div class="errors">
     <?php if(isset($errors)) {
         foreach($errors as $k=>$e) {
@@ -75,12 +116,25 @@ Select your database type:
     }?>
 </div>
 </form>
-<script>
+<script type="text/javascript">
+// Toggle Advance Database options
     function showAO() {
-        var v = document.getElementsByClassName("adv_options");
-        if(v[0].style.display == 'none')
-            v[0].style.display = 'block';
+        var el = document.getElementsByClassName("adv_options");
+        if(el[0].style.display == 'none')
+            el[0].style.display = 'block';
         else
-            v[0].style.display = 'none';
+            el[0].style.display = 'none';
+    }
+// Handle steps within database page
+    function showStep(p, d) {
+    	var el = document.getElementsByClassName("step"+p);
+    	el[0].style.display = 'none';
+    	if(d == "n") {
+    		var j = p+1;
+    	} else if(d == "p") {
+    		var j = p-1;
+    	}
+    	var el = document.getElementsByClassName("step"+j);
+    	el[0].style.display = 'block';
     }
 </script>
 \ No newline at end of file
-<h1>Database Configuration Confirmation</h1>
-
-<form action="index.php?step_name=<?php echo $step_name; ?>" method="POST">
-
+<form action="index.php?step_name=<?php echo $step_name; ?>" method="post">
+DB Configuration Confirmation:
 <div class="dtype">
 <?php if($dtypes) {
         foreach($dtypes as $k=>$v) {
-            if(!$k) $dtype = $v;
-        }
-    }
+    ?>
+        <input type="radio" name="dtype" value="<?php echo $v; ?>" <?php if(!$k)echo 'checked="checked"'; ?>/><?php echo $v; ?>
+        <br/>
+<?php }
+}
 ?>
-
 </div>
-
-<table>
-    <tr>
-        <td><b>Selected database type:</b></td>
-        <td>MySQL</td>
-    </tr>
-    <tr>
-        <td><b>Databse Name:</b></td>
-        <td><?php echo $dname; ?></td>
-    </tr>
-    <tr>
-        <td><b>Administrative / Root Username:</b></td>
-        <td><?php echo $duname; ?></td>
-    </tr>
-    <tr>
-        <td><b>Password:</b></td>
-        <td><?php echo $dpassword; ?></td>
-    </tr>
-    <tr>
-        <td><b>Database Server Host:</b></td>
-        <td><?php echo $dhost; ?></td>
-    </tr>
-    <tr>
-        <td><b>Port:</b></td>
-        <td><?php echo $dport; ?></td>
-    </tr>
-    <tr>
-        <td><b>Table Prefix:</b></td>
-        <td><?php echo $tprefix; ?></td>
-    </tr>
-    <tr>
-        <td colspan='2'>You have selected the option to drop the database if it already exists.</td>
-    </tr>
-</table>
-
-
+Name:<?php echo $dname; ?><br/>
+Root Username:<?php echo $duname; ?><br/>
+Root Password:<?php echo $dpassword; ?><br/>
+DMS Admin Username:<?php echo $dmsname; ?><br/>
+DMS Admin Password:<?php echo $dmspassword; ?><br/>
+DMS User Username:<?php echo $dmsusername; ?><br/>
+DMS User Password:<?php echo $dmsuserpassword; ?><br/>
+Host:<?php echo $dhost; ?><br/>
+Port:<?php echo $dport; ?><br/>
+Binary:<?php echo $dbbinary; ?><br/>
+Table Prefix:<?php echo $tprefix; ?><br/>
+<?php if($ddrop) { ?> You are about to drop the table if it exists <?php } ?>
 <div class="buttons">
     <input type="submit" name="Edit" value="Edit"/>
     <input type="submit" name="Confirm" value="Confirm"/>
 <h1>PHP Dependencies Check</h1>
-<?php
-if($errors){
-    echo '<div class="error">';
-    foreach ($errors as $msg){
-        echo $msg . "<br />\n";
-    }
-    echo '</div>';
-}
-?>
-
 <h3>PHP Version Check</h3>
 <?php echo "<span class='{$version['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$version['version']}"; ?>
@@ -70,7 +60,7 @@ if($errors){
 ?>
 </table>
-<form action="index.php?step_name=dependency_check" method="POST">
+<form action="index.php?step_name=dependency_check" method="post">
 <div class="buttons">
     <input type="submit" name="Previous" value="Previous"/>
 install
 <br/>
-<form action="index.php?step_name=install" method="POST">
+<form action="index.php?step_name=install" method="post">
     <div class="buttons">
         <input type="submit" name="Previous" value="Previous"/>
         <input type="submit" name="Install" value="Install"/>
-<h1>License Agreement</h1>
-
-<div class="error">
-    <?php if(isset($errors)) {
-        foreach($errors as $k=>$e) {
-                echo $e;
-        }
-    }?>
-</div>
-
-<form action="index.php?step_name=license" method="POST">
-<div style="overflow: scroll; height: 500px; width:800px;">
-<h2>KnowledgeTree On-premise Commercial End-User</h2>
-<p>
+<form action="index.php?step_name=license" method="post">
+<div>
+<textarea cols="100" rows="20">
+KnowledgeTree On-premise Commercial End-User
 License Agreement Version 2.3
-</p>
-<p>
-PLEASE READ THIS DOCUMENT CAREFULLY BEFORE INSTALLING THE SOFTWARE. BY INSTALLING AND USING THE SOFTWARE, YOU AGREE ON BEHALF
-OF THE ENTITY LICENSING THE SOFTWARE AND WHO IS BECOMING A PARTY TO THIS LICENSE AGREEMENT ("THE COMPANY") TO BE BOUND BY THE TERMS OF
-THIS AGREEMENT AND THAT YOU HAVE THE NECESSARY AUTHORITY TO BIND THE COMPANY TO THIS AGREEMENT. IF YOU DO NOT AGREE TO THE TERMS OF
+PLEASE READ THIS DOCUMENT CAREFULLY BEFORE INSTALLING THE
+SOFTWARE. BY INSTALLING AND USING THE SOFTWARE, YOU AGREE ON BEHALF
+OF THE ENTITY LICENSING THE SOFTWARE AND WHO IS BECOMING A PARTY TO
+THIS LICENSE AGREEMENT (â€œTHE COMPANYâ€?) TO BE BOUND BY THE TERMS OF
+THIS AGREEMENT AND THAT YOU HAVE THE NECESSARY AUTHORITY TO BIND
+THE COMPANY TO THIS AGREEMENT. IF YOU DO NOT AGREE TO THE TERMS OF
 THE AGREEMENT, DO NOT INSTALL OR USE THE SOFTWARE.
-</p>
-<p>
-This is an agreement entered into by and between you (the "Company") and KnowledgeTree Inc. and
-its subsidiaries ("KT"). This Agreement states the terms and conditions upon which KT offers to
+This is an agreement entered into by and between you (the â€œCompanyâ€?) and KnowledgeTree Inc. and
+its subsidiaries (â€œKTâ€?). This Agreement states the terms and conditions upon which KT offers to
 license the KnowledgeTree Commercial Editions software provided in this package together with all
 related documentation and accompanying items including, but not limited to, the executable programs,
-drivers, libraries and data files associated with such programs (collectively, the "Software").
-</p>
-
-<h3>DEFINITIONS</h3>
-<p>
+drivers, libraries and data files associated with such programs (collectively, the â€œSoftwareâ€?).
+DEFINITIONS
 Accessible Code means source code contained within the Software that is accessible under this
 Agreement.
-</p>
-<p>
 Affiliate means a company which is controlled, under common control or controlling the Company
 during the period of such control. For the purposes of this Agreement, "control" shall mean ownership,
 directly or indirectly, of more than 50% of the shares in the Company (or other voting securities) which
 vote for the election of the board of directors or other managing body of the Company.
-</p>
-<p>
 End User means an employee, contractor or agent of the Company and its Affiliates authorized by the
 Company to use the Software as per the terms of this Agreement.
-</p>
-<p>
 OEM Distribution means distribution of the Software as either a bundled add-on to, or embedded
 component of, another application with such application being made available to its users as, but not
 limited to, an on-premise application, a hosted application, a Software-as-a-Service offering or a
 subscription service for which the distributor of the application receives a license fee or any form of
 direct or indirect compensation.
-</p>
-<p>
 Protected Code means source code contained within the Software that is protected against access by
 KT and is not accessible under this Agreement.
-</p>
-<p>
 Distribution Archive means a software installer package or any other distribution medium commonly
 utilized to package and distribute software.
-</p>
-<p>
 Customer Service Systems means any online system provided by KT or its service providers to provide
 Company with product support, access to the Software, or user licenses, though not limited to these
 services.
-</p>
-<p>
 Unlimited Use License  means a grant of license under this agreement that is not limited to a set
 number of End Users, but is limited to one physical server device that the Software may be run on.
 Grant of Rights
-</p>
-<p>
 For the term of this Agreement and subject to the Company's payment of the license fees as defined
 below KT grants the Company a non-exclusive, non-transferable, non-sublicensable right to use and
 modify the Software only for the Company's own internal use and limited to the number of End Users
 for which the Company has paid the applicable license fee.
-</p>
-<h3>Company's responsibility for End Users</h3>
-<p>
+Companyâ€™s responsibility for End Users
 The Company shall be responsible for any act or omission of all End Users and for their compliance
 with all of the terms of this Agreement. Any action or breach by any of the Company's employees,
 contractors, agents or Affiliates shall be deemed an action or breach by the Company of this
@@ -84,25 +52,19 @@ breaches of this Agreement. The Company waives all of those defenses that the Co
 law or otherwise which may be raised to avoid liability should the Company not be liable for its
 employees, contractors', agents' or Affiliates' acts, omissions and non-compliance with the terms of this
 Agreement.
-</p>
-<h3>Delivery and acceptance of the Software</h3>
-<p>
+Delivery and acceptance of the Software
 The Software shall be deemed accepted once the Company has successfully downloaded and unpacked
 the Distribution Archive.
-</p>
-<h3>Restrictions</h3>
-<p>
+Restrictions
 The Company shall not, directly or indirectly: (i) remove or alter any copyright, trademark or
 proprietary notice in the Software; (ii) transfer, use or export the Software in violation of any laws or
 regulations of any government or governmental agency; (iii) reverse engineer, decompile or modify
 any protected code which forms part of the Software; (iv) distribute the Software via OEM Distribution
 without entering into a separate OEM Distribution Agreement with KT; (v) redistribute the Accessible
 or Protected Code; (vi) use and or modify the Software to develop a competitive product; and (vii)
-commit any act or omission the likely result of which is that KT's reputation will be brought into
+commit any act or omission the likely result of which is that KTâ€™s reputation will be brought into
 disrepute or which act or omission could reasonably be expected to have or does have a material and
-adverse effect on KT's interests.
-</p>
-<p>
+adverse effect on KTâ€™s interests.
 The Software includes license protection mechanisms that are designed to manage and protect the
 intellectual property rights of KT. The Company must not modify or alter those features to try to defeat
 the Software use rules that the license protection mechanisms are designed to enforce.
@@ -111,16 +73,12 @@ Company may continue to use the Software initially provided under this Agreement
 code and license key and use differing databases, web servers or operating systems than the database,
 web server or operating system initially selected by the Company on installation of the Software at no
 charge.
-</p>
-<h3>Proprietary Rights</h3>
-<p>
+Proprietary Rights
 KT and its licensors shall own all right, title, and interest to the Software, technology, information,
 code or software provided to Company, including all portions, copies or modifications thereof. Except
 as expressly provided herein, no licenses of any kind are granted hereunder, whether by implication,
 estoppel, or otherwise.
-</p>
-<h3>Fees and Payment</h3>
-<p>
+Fees and Payment
 End User Accounts: The Company shall designate an Administrator and notify KT of the identity and
 contact information for said Administrator. The Administrator may add End Users to the Company's
 subscription for the Software by placing an order with KT. The Company is responsible for all activity
@@ -129,8 +87,6 @@ unauthorized use of any password or account that provides Company access to the 
 Systems, or unauthorized copying or distribution of the Software or related proprietary material. End
 User accounts cannot be shared or used by more than one individual End User but may be reassigned to
 new End Users replacing former End Users.
-</p>
-<p>
 License fee: The Company shall pay to KT an amount specified on the KnowledgeTree website for the
 number of End Users that Company selects. Payment of the license fee shall be due and payable as set
 forth in the terms and conditions on the KnowledgeTree website. All fees paid to KT are non-
@@ -138,50 +94,37 @@ refundable. The Company will also pay all applicable taxes, including sales, use
 value-added, excise, customs fees, import duties, stamp duties and any other similar taxes and duties,
 including penalties and interest, imposed by any federal, state, provincial or other government entity on
 the transactions contemplated by this Agreement.
-</p>
-<p>
 Records Retention: Unless the company has purchased an Unlimited Use License, the Company shall
 maintain accurate records necessary to verify the number of End Users. Upon KT's written request, the
 Company shall provide KT with such records within ten (10) days. If the Company has more End
 Users than the Company has paid for, the Company shall immediately pay KT an additional license fee
 in addition to any costs incurred by KT associated with reviewing such records.
-</p>
-<h3>COPYRIGHT</h3>
-<p>
+COPYRIGHT
 KT reserves all rights not expressly granted to you in this EULA. The Software is protected by
 copyright and other intellectual property laws and treaties. KT and/or its licensors own the title,
 copyright, and other intellectual property rights in the Software. The Software is licensed, not sold. The
 Company may not remove the copyright notice from any copy of the Software or any copy of the
 written materials, if any, accompanying the Software.
-</p>
-<h3>MERGER OR INTEGRATION</h3>
-<p>
+MERGER OR INTEGRATION
 Should the Company merge any portion of the Software or accessible code into, or integrate any
 portion of the Software or accessible code with, any other program or code, any portion of the Software
 or accessible code merged into or integrated with another program, if any, will continue to be subject to
 the terms and conditions of this Agreement, and the Company must reproduce on the merged or
 integrated portion all copyright and other proprietary rights notices included in the originals of the
 Software or accessible code.
-</p>
-<h3>TRANSFER OF LICENSE</h3>
-<p>
+TRANSFER OF LICENSE
 The Company may not transfer its license in terms of this Agreement to any external third parties.
-</p>
-<h3>LIMITATIONS ON USING, COPYING, AND MODIFYING THE SOFTWARE</h3>
-<p>
+LIMITATIONS ON USING, COPYING, AND MODIFYING THE SOFTWARE
 Except to the extent expressly permitted by this Agreement or by the laws of the jurisdiction where the
 Company acquired the Software, it may not use, copy or modify the Software. Nor may the Company
 sub-license any of its rights under this Agreement.
-</p>
-<h3>DECOMPILING, DISASSEMBLING, OR REVERSE ENGINEERING</h3>
-<p>
+DECOMPILING, DISASSEMBLING, OR REVERSE ENGINEERING
 The Company acknowledges that the Software contains trade secrets and other proprietary information
 of KT and its licensors. Except to the extent expressly permitted by this Agreement or by the laws of
 the jurisdiction where the Company is located, it may not decompile, disassemble or otherwise reverse
 engineer the Software, or engage in any other activities to obtain underlying information that is not
 visible to the user in connection with the normal use of the Software.
-</p>
-<p>
+
 In particular, the Company agrees not for any purpose to transmit the Software or display the
 Software's object code on any computer screen or to make any hardcopy memory dumps of the
 Software's object code. If the Company believes that it requires information related to the
@@ -190,40 +133,29 @@ Software to obtain such information, and it agrees to request such information f
 listed below. Upon receiving such a request, KT shall determine whether the Company requires such
 information for a legitimate purpose and, if so, KT will provide such information to the Company
 within a reasonable time and on reasonable conditions.
-</p>
-<p>
+
 In any event, the Company will notify KT of any information derived from reverse engineering or such
 other activities, and the results thereof will constitute the confidential information of KT that may be
 used only in connection with the Software.
-</p>
-<h3>DURATION AND TERMINATION</h3>
-<p>
+DURATION AND TERMINATION
 The license granted to the Company is effective for 1 (ONE) year. The license will also terminate
 automatically without any notice from KT if the Company fails to comply with any term or condition
 of this Agreement. Upon termination, KT may also enforce any rights provided by law. The provisions
 of this Agreement that protect the proprietary rights of KT will continue in force after termination.
-</p>
-<h3>SOFTWARE MAINTENANCE</h3>
-<p>
-Software Maintenance includes KT's provisioning to the Company of updates and/or enhancements of
+SOFTWARE MAINTENANCE
+Software Maintenance includes KTâ€™s provisioning to the Company of updates and/or enhancements of
 the Software made generally available to customers from time to time, and online technical support
 (and where applicable, phone support) to one Company-designated technical contact for the sole
 purpose of addressing technical issues relating to the use of the Software (excluding any form of on-
 site visits by KT personnel or contractors).
-</p>
-<h3>DISCLAIMER OF ANY WARRANTY</h3>
-<p>
-KT does not warrant that the functions contained in the Software will meet the Company's
+DISCLAIMER OF ANY WARRANTY
+KT does not warrant that the functions contained in the Software will meet the Companyâ€™s
 requirements or that the operation of the Software will be correct, uninterrupted or error-free. KT
 provides evaluation copies of the Product so that customers can assess the Product.
-</p>
-<p>
 THE SOFTWARE IS PROVIDED AS-IS WITHOUT WARRANTY OF ANY KIND, EITHER
 EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED WARRANTIES
 OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, TITLE OR
 NONINFRINGEMENT.
-</p>
-<p>
 The Company assumes responsibility for the support and fault-finding of any modifications made to
 the Software, or merger and integration undertaken with or between any other program or code.
 The Company assumes full responsibility for the selection of the Software to achieve its intended
@@ -231,70 +163,52 @@ results, and for the installation, use and results obtained from the Software. T
 the entire risk as it applies to the quality and performance of the Software. Should the Software prove
 defective, the Company (and not KT, or its distributors or dealers) assumes the entire cost of any and
 all necessary servicing, repair or correction.
-</p>
-<p>
 Some countries/states do not allow the exclusion of implied warranties, so the above exclusion may not
 apply to the Company. KT disclaims all warranties of any kind if the Software was customized,
 repackaged or altered in any way by any third party other than KT.
-</p>
-<h3>INFRINGEMENT</h3>
-<p>
+INFRINGEMENT
 During any term of this Agreement, if any portion of the Software is held by a court of competent
 jurisdiction to infringe any third party intellectual property rights and the Company incurs a liability or
-expense as a result of such holding, then the Company's sole remedy shall be, and KT will, at its
+expense as a result of such holding, then the Companyâ€™s sole remedy shall be, and KT will, at its
 option: (i) obtain the right for the Company to continue to use the Software consistent with this
 Agreement; (ii) modify the Software so that it is non-infringing; or (iii) replace the infringing
 component with a non-infringing component, or (iv) refund all money paid in the then-current calendar
-quarter under this Agreement and all of the Company's rights and licenses under this Agreement shall
+quarter under this Agreement and all of the Companyâ€™s rights and licenses under this Agreement shall
 automatically terminate.
-</p>
-<h3>PUBLICITY RIGHTS</h3>
-<p>
-<ol>
-<li>a.	The Company grants KT the right to include the Company as a customer in promotional
-material for the Software or for KT.</li>
-<li>b.	The Company can deny KT this right by submitting a written request via e-mail to
+PUBLICITY RIGHTS
+a.	The Company grants KT the right to include the Company as a customer in promotional
+material for the Software or for KT.
+b.	The Company can deny KT this right by submitting a written request via e-mail to
 marketing@knowledgetree.com requesting to be excluded from such promotional material.
 Confirmation of such denial (via reply e-mail) must be received prior to purchasing for this to
-be effective.</li>
-<li>c.	Should the Company come to be or already be included in promotional material, as a result of
+be effective.
+c.	Should the Company come to be or already be included in promotional material, as a result of
 any prior purchases where the Company did not request exclusion from the promotional
 material, the Company can at any point, submit a written request via e-mail to
-marketing@knowledgetree.com to have KT remove the Company's name from the
+marketing@knowledgetree.com to have KT remove the Companyâ€™s name from the
 promotional material. Upon receipt of such request, KT will remove any reference to the
 Company from such promotional material within 30 days and make no further reference to the
-Company.</li>
-</ol>
-</p>
-<p>
+Company.
 During any term of this Agreement, the Company grants to KT a non-transferable, non-exclusive,
 license to reproduce and display its logos, trademarks, trade names and similar identifying material so
 that KT may refer to the Company as a user of the Software should KT so desire, such as on the KT
 website, in press releases and in other marketing materials.
-</p>
-<h3>INDEMNIFICATION</h3>
-<p>
+INDEMNIFICATION
 If the Company distributes the Software in violation of this Agreement, it hereby indemnifies, hold
 harmless and defends KT from and against any and all claims or lawsuits, including attorney's fees and
 costs that arise, result from or are connected with the use or distribution of the Software in violation of
 this Agreement.
-</p>
-<h3>LIMITATION OF REMEDIES AND DAMAGES</h3>
-<p>
+LIMITATION OF REMEDIES AND DAMAGES
 In no event will KT or its licensors be liable for any indirect, incidental, special or consequential
 damages, or for any personal injury or bodily injury (including death) to any persons caused by KT's
 negligence, or for any lost profits, lost savings, loss of use, lost revenues or lost data arising from or
 relating to the Software or this Agreement, even if KT or its licensors have been advised of the
-possibility of such damages. In no event will KT's liability or damages to the Company or any other
+possibility of such damages. In no event will KTâ€™s liability or damages to the Company or any other
 person ever exceed the amount paid by the Company to use the Software, regardless of the form of the
 claim.
-</p>
-<p>
 Some countries/states do not allow the limitation or exclusion of liability for incidental or
 consequential damages, so the above limitation or exclusion may not apply to the Company.
-</p>
-<h3>GOVERNMENT RESTRICTED RIGHTS</h3>
-<p>
+GOVERNMENT RESTRICTED RIGHTS
 Programs delivered to the U.S. Defense Dept. are delivered with Restricted Rights and the following
 applies: "Restricted Rights Legend: Use, duplication or disclosure by Government is subject to
 restrictions as currently set forth in subparagraph (c)(1)(ii) of DFARS 252-227-7013, Rights in
@@ -302,18 +216,14 @@ Technical Data and Computer Software (October 1988). Software manufacturer is Kn
 Inc., c/o DLA Piper US LLP, 2000 University Avenue, East Palo Alto, CA 94303. Programs delivered
 to a U.S. Government Agency not within the Defense, Dept. are delivered with "Restricted Rights" as
 defined in FAR 52.227-14, Rights in Data - General, including Alternate III (June 1987).
-</p>
-<h3>CONTRACTOR/MANUFACTURER</h3>
-<p>
-The Contractor/Manufacturer for the Software is:<br />
-KnowledgeTree Inc.<br />
-c/o DLA Piper US LLP<br />
-2000 University Avenue<br />
-East Palo Alto, CA 94303<br />
+CONTRACTOR/MANUFACTURER
+The Contractor/Manufacturer for the Software is:
+KnowledgeTree Inc.
+c/o DLA Piper US LLP
+2000 University Avenue
+East Palo Alto, CA 94303
 Phone: +1 415.200.0225
-</p>
-<h3>GENERAL</h3>
-<p>
+GENERAL
 This Agreement is binding on the Company as well as its employees, employers, contractors and
 agents, and on any successors and assignees. Neither the Software nor any information derived
 therefrom may be exported except in accordance with the laws of the State of Delaware or other
@@ -327,19 +237,24 @@ Software. If any provision of this Agreement is deemed invalid or unenforceable 
 government agency having jurisdiction, that particular provision will be deemed modified to the extent
 necessary to make the provision valid and enforceable, and the remaining provisions will remain in full
 force and effect. The original of this Agreement has been written in English, and that version will
-govern. Les parties aux prŽsentes confirment leur volontŽ que cette convention, de mme que tous les
-documents, y compris tout avis, qui s?y rattachent, soient rŽdigŽs en langue anglaise.
-</p>
-</div>
-
+govern. Les parties aux prÃ©sentes confirment leur volontÃ© que cette convention, de mÃªme que tous les
+documents, y compris tout avis, qui sâ€²y rattachent, soient rÃ©digÃ©s en langue anglaise.
+</textarea>
 <div class="agree">
-<br />
-    <input type="radio" name="license" value="1" checked="checked"/>&nbsp;&nbsp;I accept the agreement
+    <input type="radio" name="license" value="1" checked="checked"/>I accept the agreement
     <br/>
-    <input type="radio" name="license" value="0"/>&nbsp;&nbsp;I do not accept the agreement
+    <input type="radio" name="license" value="0"/>I do not accept the agreement
+</div>
+<div class="errors">
+    <?php if(isset($errors)) {
+        foreach($errors as $k=>$e) {
+                echo $e;
+        }
+    }?>
 </div>
 <div class="buttons">
     <input type="submit" name="Previous" value="Previous"/>
     <input type="submit" name="Next" value="Next"/>
 </div>
+</div>
 </form>
 \ No newline at end of file
@@ -12,7 +12,7 @@ applications.
 </p>
 </div>
-<form action="index.php?step_name=welcome" method="POST">
+<form action="index.php?step_name=welcome" method="post">
 <div class="buttons">
     <input type="submit" name="Next" value="Next"/>
 </div>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
 <head>
-<link rel="stylesheet" type="text/css" href="resources/wizard.css" />
+	<title>KnowledgeTree Installer</title>
+	<link rel="stylesheet" type="text/css" href="resources/wizard.css" />
 </head>
 <body>