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

Megan Watson
2 parents c302b7c9 0f21f249
Showing 41 changed files with 238 additions and 152 deletions
plugins/ktcore/document/edit.php
plugins/multiselect/templates/ktcore/search2/adv_query_builder.smarty
setup/migrate/migrateUtil.php
setup/migrate/templates/complete.tpl
setup/migrate/templates/database.tpl
setup/migrate/templates/installation.tpl
setup/migrate/templates/installation_confirm.tpl
setup/migrate/templates/services.tpl
setup/wizard/installUtil.php
setup/wizard/installWizard.php
setup/wizard/installer.php
setup/wizard/lib/services/unixLucene.php
setup/wizard/lib/services/unixOpenOffice.php
setup/wizard/lib/services/unixScheduler.php
setup/wizard/lib/services/windowsLucene.php
setup/wizard/lib/services/windowsOpenOffice.php
setup/wizard/lib/services/windowsScheduler.php
setup/wizard/lib/validation/openofficeValidation.php
setup/wizard/resources/css/wizard.css
setup/wizard/resources/js/wizard.js
@@ -216,6 +216,31 @@ class KTDocumentEditAction extends KTDocumentAction {
             $values = (array) KTUtil::arrayGet($data, 'fieldset_' . $oFieldset->getId());
             foreach ($fields as $oField) {
                 $val = KTUtil::arrayGet($values, 'metadata_' . $oField->getId());
+                
+                // for html fields we want to do some stripping :)
+                if ($oField->getIsHTML())
+                {
+                    // NOTE this works great...once the text is saved a first time
+                    //      but the first time the <script> tags come through encoded, so decode first
+                    // HOWEVER html_entity_decode decodes too much (e.g. &nbsp; - which causes a DB error for some reason)!  use this instead
+                    // NOTE I considered a preg_replace_callback but str_replace is probably more efficient in this case as we only have 
+                    //      two symbols to replace
+                    $val = str_replace('&lt;', '<', $val);
+                    $val = str_replace('&gt;', '>', $val);
+                    //$val = preg_replace_callback('/&lt;([^&]*)&gt;/', create_function('$matches', 'return "<" . $matches[1] . ">";'), $val);
+                    // in case of script which does not yet contain <!-- //--> around the actual code (i.e. first submission again)
+                    // these will not be correctly removed by strip_tags
+                    $val = preg_replace('/<script[^>]*>([^<]*)<\/script>/', '', $val);
+                    // remove any attempts to call an onclick/onmouseover/onwhatever call
+                    $val = preg_replace_callback('/on[^= ]*=[^; \/>]*;?"? *\/? *(>?)/', 
+                                                 create_function('$matches', 'if (isset($matches[1])) return $matches[1]; else return null;'), 
+                                                 $val);
+                    // now strip remaining tags including script tags with code surrounded by <!-- //-->, 
+					// which would not be stripped by the previous regex
+                    $val = strip_tags($val, '<p><a><b><strong><ol><ul><li><p><br><i><em><u><span>');
+                    // remove empty <p> tags?
+                    $val = preg_replace('/<p><\/p>\r?\n?/', '', $val);
+                }
                 if($oField->getDataType() == "LARGE TEXT" && !is_null($oField->getMaxLength()))
                 {
@@ -429,6 +429,7 @@ function createText(groupid, fid, type)
 			html += "<option value=\"is not\">{/literal}{i18n}is not{/i18n}{literal}";
 			break;
 		case 'STRING':
+        case 'LARGE TEXT':
 			html += "<option value=\"is\">{/literal}{i18n}is{/i18n}{literal}";
 			html += "<option value=\"is not\">{/literal}{i18n}is not{/i18n}{literal}";
 			html += "<option value=\"contains\">{/literal}{i18n}contains{/i18n}{literal}";
@@ -496,7 +497,7 @@ function addFieldTypeSelection(groupid, fid, type, options)
 			}
 			// want to fall through
 		case 'FULLTEXT':
-            
+        case 'LARGE TEXT':
 		case 'STRINGMATCH':
 			html = createText(groupid, fid, type);
 			break;
@@ -157,15 +157,6 @@ class MigrateUtil {
 		return $this->bootstrap->absoluteURI($url = null, $protocol = null, $port = null);
     }
-   /**
-     * Portably execute a command on any of the supported platforms.
-     *
-	 * @author KnowledgeTree Team
-     * @access public
-     * @param string $aCmd
-     * @param array $aOptions
-     * @return array
-     */
     public function pexec($aCmd, $aOptions = null) {
 		return $this->bootstrap->pexec($aCmd, $aOptions = null);
     }
@@ -67,5 +67,6 @@
 		?>
 		</table>
 	</div>
-    <input class="button_next" type="submit" value="Back To Installer" name="BInstall"/>
-</form>
 \ No newline at end of file
+    <input class="button_next" type="submit" value="Continue Installion" name="BInstall"/>
+</form>
+<?php if (AJAX) { echo $html->js('form.js'); } ?>
 \ No newline at end of file
@@ -18,4 +18,5 @@
 </form>
 <script type="text/javascript">
 	$("#duname").focus();
-</script>
 \ No newline at end of file
+</script>
+<?php if (AJAX) { echo $html->js('form.js'); } ?>
 \ No newline at end of file
@@ -46,4 +46,5 @@
 </form>
 <script type="text/javascript">
 	$("#location").focus();
-</script>
 \ No newline at end of file
+</script>
+<?php if (AJAX) { echo $html->js('form.js'); } ?>
 \ No newline at end of file
@@ -71,4 +71,4 @@
     <input type="submit" name="Edit" value="Back"  class="button_previous"/>
     <input type="submit" name="Confirm" value="Confirm" class="button_next"/>
 </form>
-<?php if (AJAX) { ?> <script type="text/javascript" src="resources/form.js"></script> <?php } ?>
 \ No newline at end of file
+<?php if (AJAX) { echo $html->js('form.js'); } ?>
 \ No newline at end of file
@@ -79,4 +79,5 @@
 	</div>
     <input type="submit" name="Previous" value="Back" class="button_previous"/>
     <input type="submit" name="Next" value="Next" class="button_next"/>
-</form>
 \ No newline at end of file
+</form>
+<?php if (AJAX) { echo $html->js('form.js'); } ?>
 \ No newline at end of file
@@ -66,21 +66,6 @@ class InstallUtil {
 		return false;
 	}
-	/**
-	* Check if system needs to be migrated
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @param none
-	* @return boolean
- 	*/
-	public function isMigration() {
- 		if (isset($_POST['Migrate'])) {
-			return true;
-    	}
-    	return false;
-	}
-	
 	public function error($error) {
 		$template_vars['error'] = $error;
 		$file = "templates/error.tpl";
@@ -518,6 +503,42 @@ class InstallUtil {
     }
 	/**
+	* Check if system needs to be migrated
+	*
+	* @author KnowledgeTree Team
+	* @access public
+	* @param none
+	* @return boolean
+ 	*/
+	public function migrationSpecified() {
+    	if(isset($_POST['installtype'])) {
+        	if($_POST['installtype'] == "Upgrade Installation") {
+            	return true;
+        	}
+    	}
+    	
+        return false;
+	}
+	
+	/**
+	* Check if system needs to be migrated
+	*
+	* @author KnowledgeTree Team
+	* @access public
+	* @param none
+	* @return boolean
+ 	*/
+	public function upgradeSpecified() {
+    	if(isset($_POST['installtype'])) {
+        	if($_POST['installtype'] == "Upgrade Only") {
+            	return true;
+        	}
+    	}
+    	
+        return false;
+	}
+	
+	/**
 	* Get session data from package
 	*
 	* @author KnowledgeTree Team
@@ -644,7 +665,30 @@ class InstallUtil {
 		return '';
     }
+    /**
+     * Deletes migration lock file if a clean install is chosen
+     * This is in case someone changes their mind after choosing upgrade/migrate and clicks back up to this step
+     * 
+     * @author KnowledgeTree Team
+     * @access private
+     * @return void
+     */
+    function deleteMigrateFile() {
+    	if(file_exists("migrate.lock"))
+    		@unlink("migrate.lock");
+    }
+    /**
+     * Check if we are migrating an existing installation
+     *
+     * @return unknown
+     */
+    function isMigration() {
+    	if(file_exists("migrate.lock"))
+    		return true;
+    	return false;
+    }
+    
    /**
      * Portably execute a command on any of the supported platforms.
      *
@@ -116,18 +116,6 @@ class InstallWizard {
 	}
 	/**
-	* Check if system has to be migrated
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @param none
-	* @return boolean
- 	*/
-	private function isMigration() {
-		return $this->util->isMigration();
-	}
-	
-	/**
 	* Display the wizard
 	*
 	* @author KnowledgeTree Team
@@ -295,8 +283,10 @@ class InstallWizard {
 			$this->createInstallFile();
 		}
 		if(!$this->isSystemInstalled()) { // Check if the systems not installed
-			if($this->isMigration()) { // Check if the migrator needs to be accessed
+			if($this->util->migrationSpecified()) { // Check if the migrator needs to be accessed
 				$this->util->redirect('../migrate');
+			} elseif ($this->util->upgradeSpecified()) {
+				$this->util->redirect('../upgrade');
 			}
 			$response = $this->systemChecks();
 			if($response === true) {
@@ -414,8 +414,6 @@ class Installer {
 	*/
     private function _completeInstall() {
     	@touch("install.lock");
-    	if(file_exists("migrate.lock"))
-    		@unlink("migrate.lock");
     }
 	/**
@@ -59,7 +59,7 @@ class unixLucene extends unixService {
 	* @param string
 	* @return void
  	*/
-	public function load() {
+	public function load($options = null) {
 		$this->setLuceneSource("ktlucene.jar");
 		$this->setLuceneDir(SYSTEM_DIR."bin".DS."luceneserver".DS);
 		$this->setIndexerDir(SYSTEM_DIR."search2".DS."indexing".DS."bin".DS);
@@ -63,7 +63,7 @@ class unixOpenOffice extends unixService {
 	* @param string
 	* @return void
  	*/
-	public function load() {
+	public function load($options = null) {
 		$this->setPort("8100");
 		$this->setHost("localhost");
 		$this->soffice = $this->util->getOpenOffice();
@@ -57,7 +57,7 @@ class unixScheduler extends unixService {
 	* @param string
 	* @return void
  	*/
-	public function load() {
+	public function load($options = null) {
 		$this->setPhpCli();
 		$this->scheduler = 'scheduler';
 		$this->setSchedulerSource('schedulerTask.sh');
@@ -140,7 +140,7 @@ class windowsLucene extends windowsService {
 	* @param string
 	* @return void
  	*/
-	public function load() {
+	public function load($options = null) {
 		$this->setJavaBin();
 		$this->setLuceneDIR(SYSTEM_DIR."bin".DS."luceneserver");
 		$this->setLuceneExe("KTLuceneService.exe");
@@ -140,8 +140,10 @@ class windowsOpenOffice extends windowsService {
 	* @param string
 	* @return void
  	*/
-	public function load() {
-        // hack for testing
+	public function load($options = null) {
+    	if(isset($options['binary'])) {
+    		$this->setBin($options['binary']);
+    	}
 		$this->setPort("8100");
 		$this->setHost("127.0.0.1");
 		$this->setLog("openoffice.log");
@@ -173,7 +175,7 @@ class windowsOpenOffice extends windowsService {
 	}
 	private function setBin($bin) {
-		$this->bin = "\"".$bin."\"";
+		$this->bin = $bin;
 	}
 	public function getBin() {
@@ -198,15 +200,18 @@ class windowsOpenOffice extends windowsService {
     public function install() {
     	$status = $this->status();
     	if($status == '') {
-    		$services = $this->util->getDataFromSession('services');
-    		$this->setBin($services['openOfficeExe']);
-            $cmd = "\"{$this->winservice}\" install $this->name "."-displayname {$this->name} -start auto {$this->getBin()} -headless -invisible -accept=socket,host={$this->host},port={$this->port};urp;";;
-        	if(DEBUG) {
-        		echo "Command : $cmd<br/>";
-        		return ;
-        	}
-            $response = $this->util->pexec($cmd);
-            return $response;
+    		//$binary = $this->util->openOfficeSpecified();
+    		$binary = $this->getBin();
+    		if($binary != '') {
+            	$cmd = "\"{$this->winservice}\" install $this->name "."-displayname {$this->name} -start auto \"".$binary."\" -headless -invisible -accept=socket,host={$this->host},port={$this->port};urp;";;
+	        	if(DEBUG) {
+	        		echo "Command : $cmd<br/>";
+	        		return ;
+	        	}
+	            $response = $this->util->pexec($cmd);
+	            return $response;
+    		}
+    		return $status;
     	}
         else {
     		return $status;
@@ -85,7 +85,7 @@ class windowsScheduler extends windowsService {
 	* @param string
 	* @return void
  	*/
-	function load() {
+	function load($options = null) {
 		$this->setSchedulerDIR($this->varDir."bin");
 		$this->setSchedulerScriptPath("taskrunner.bat");
 		$this->setSchedulerSource("schedulerService.php");
@@ -63,8 +63,7 @@ class openofficeValidation extends serviceValidation {
 	*/
     private $unixLocations = array("/usr/local/bin", "/usr/bin");
-    
-    public function preset() {
+    public function preset($options = null) {
     	$this->specifyOpenOffice();
     }
@@ -91,15 +90,15 @@ class openofficeValidation extends serviceValidation {
     public function binaryChecks() {
     	if($this->util->openOfficeSpecified()) {
     		$this->soffice = $this->util->openOfficeSpecified();
-			if(file_exists($this->soffice)) 
-				return true;
+			if(file_exists($this->soffice))
+				return $this->soffice;
 			else 
 				return false;
     	} else {
     		$auto = $this->detectOpenOffice();
     		if($auto) {
     			$this->soffice = $auto;
-    			return true;
+    			return $this->soffice;
     		}
     		return false;
     	}
@@ -102,13 +102,13 @@ select {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
 	overflow: auto;
-	height: 400px;
+	min-height: 400px;
 }
 #step_content_dependencies {
 	border: 1px solid rgb(207, 207, 207);
 	padding: 5px;
-	min-height:265px;
+	min-height:285px;
 }
 #step_content_configuration {
@@ -323,6 +323,12 @@ select {
 	margin-top:10px;
 }
+.button_radio_next {
+	float:none;
+	margin-left:0px;
+	margin-top:0px;
+}
+
 .buttons a {
     background: #DDDDDD;
     border: solid 1px #888;
@@ -533,4 +539,10 @@ td.dir_description {
 	position:relative;
 	height:0px;
 	width:0px;
+}
+
+#install_options {
+	position:relative;
+	padding-left: 400px;
+	padding-top: 10px;
 }
 \ No newline at end of file
@@ -218,17 +218,11 @@ wizard.prototype.sendRegistration = function ()  {
 }
 wizard.prototype.clearSessions = function ()  {
-	<?php 
-		echo 'All Clear';
-    	$_SESSION['installers'] = null;
-    	$_SESSION['migrate'] = null;
-    	$_SESSION['upgrade'] = null;
-	?>
 //	var address = 'session.php?action=destroyAll';
 //	$.ajax({
 //		url: address,
 //		dataType: "html",
 //		type: "POST",
 //		cache: false,
-//	});	
+//	});
 }
 \ No newline at end of file
@@ -295,10 +295,12 @@ class Step
 	* @return boolean
 	*/
     function migrate() {
-        if(isset($_POST['Migrate'])) {
-            return true;
-        }
-
+    	if(isset($_POST['installtype'])) {
+        	if($_POST['installtype'] == "Upgrade Installation") {
+            	return true;
+        	}
+    	}
+    	
         return false;
     }
@@ -52,6 +52,7 @@ class complete extends Step {
     private $paths_check = 'tick';
     private $privileges_check = 'tick';
     private $database_check = 'tick';
+    private $migrate_check = false;
     protected $silent = true;
     function doStep() {
@@ -61,14 +62,11 @@ class complete extends Step {
     }
     function doRun() {
-        // check filesystem (including location of document directory and logging)
-        $this->checkFileSystem();
-        // check database
-        $this->checkDb();
-        // check services
-        $this->checkServices();
+        $this->checkFileSystem(); // check filesystem (including location of document directory and logging)
+        $this->checkDb(); // check database
+        $this->checkServices(); // check services
+        $this->checkInstallType();// Set silent mode variables
         $this->storeSilent();// Set silent mode variables
-        
     }
     private function checkFileSystem()
@@ -219,6 +217,14 @@ class complete extends Step {
 		return true;
     }
+    function checkInstallType() {
+    	if ($this->util->isMigration()) {
+    		$this->migrate_check = true;
+    	} else {
+    		$this->migrate_check = false;
+    	}
+    }
+    
     /**
      * Set all silent mode varibles
      *
@@ -228,11 +234,7 @@ class complete extends Step {
     	$this->temp_variables['paths_check'] = $this->paths_check;
     	$this->temp_variables['privileges_check'] = $this->privileges_check;
     	$this->temp_variables['database_check'] = $this->database_check;
-    	if (file_exists('migrate.lock')) {
-    		$this->temp_variables['migrate_check'] = true;
-    	} else {
-    		$this->temp_variables['migrate_check'] = false;
-    	}
+    	$this->temp_variables['migrate_check'] = $this->migrate_check;
     }
 }
 ?>
 \ No newline at end of file
@@ -310,7 +310,7 @@ class configuration extends Step
         $server = $conf['server'];
         $paths = $conf['paths'];
         // TODO
-        if (file_exists('migrate.lock')) { // Check if its an upgrade
+        if ($this->util->isMigration()) { // Check if its an upgrade
         	$this->readInstallation();
         } else {
         	$this->readConfigPath(); // initialise writing to config.ini
@@ -448,14 +448,14 @@ class configuration extends Step
     private function getPathInfo($fileSystemRoot)
     {
         if(isset($this->temp_variables['paths'])) {
-        	if (file_exists('migrate.lock')) { // Check if its an upgrade
+        	if ($this->util->isMigration()) { // Check if its an upgrade
         		$this->readInstallation(); // Read values from config.ini of other installation
         		$dirs = $this->getFromConfigPath(); // Store contents
         	} else {
         		$dirs = $this->temp_variables['paths']; // Pull from temp
         	}
         } else {
-        	if (file_exists('migrate.lock')) { // Check if its an upgrade
+        	if ($this->util->isMigration()) { // Check if its an upgrade
         		$this->readInstallation(); // Read values from config.ini of other installation
         	} else {
         		$this->readConfigPath(); // Read contents of config-path file
@@ -557,8 +557,8 @@ class database extends Step
 	*/
     private function mysql() {
         $con = $this->connectMysql();
-        // check for migrate.lock file which indicates this is a migration and not a clean install
-        if (file_exists('migrate.lock')) {
+        // check for migrate lock file which indicates this is a migration and not a clean install
+        if ($this->util->isMigration()) {
             if(!$this->migrateDB($con)) {
                 $this->error['con'] = "Could not Create Database: ";
                 return false;
@@ -48,10 +48,11 @@ class installType extends step
     	if(!$this->inStep("installtype")) {
     		return 'landing';
     	}
+    	
         if($this->migrate()) {
             return 'migrate';
         } if($this->next()) {
-            $this->deleteMigrateFile();
+            $this->util->deleteMigrateFile();
             return 'next';
         } else if($this->previous()) {
             return 'previous';
@@ -68,17 +69,5 @@ class installType extends step
     public function getErrors() {
         return $this->error;
     }
-    
-    /**
-     * Deletes migration lock file if a clean install is chosen
-     * This is in case someone changes their mind after choosing upgrade/migrate and clicks back up to this step
-     * 
-     * @author KnowledgeTree Team
-     * @access private
-     * @return void
-     */
-    private function deleteMigrateFile() {
-        @unlink("migrate.lock");
-    }
 }
 ?>
 \ No newline at end of file
@@ -216,10 +216,10 @@ class services extends Step
 	    		$class = strtolower($service)."Validation";
 				$this->$class->preset(); // Sets defaults
 				if(!$this->$class->installed) {
-					if(!WINDOWS_OS) { $this->$class->getBinary(); } // Get binary, if it exists
+					if(!WINDOWS_OS) { $binary = $this->$class->getBinary(); } // Get binary, if it exists
 					$passed = $this->$class->binaryChecks(); // Run Binary Pre Checks
 	    			if ($passed) { // Install Service
-	    				$this->installService($service);
+	    				$this->installService($service, $passed);
 	    			}
 				} else {
 					$this->$class->installed();
@@ -323,10 +323,10 @@ class services extends Step
 	* @access private
 	* @return boolean
 	*/
-    private function installService($serviceName) {
+    private function installService($serviceName, $binary) {
 		$className = OS.$serviceName;
 		$service = new $className();
-		$status = $this->serviceHelper($service);
+		$status = $this->serviceHelper($service, $binary);
 		if (!$status) {
 			$this->serviceCheck = 'cross_orange';
 		}
@@ -340,8 +340,8 @@ class services extends Step
 	* @access private
 	* @return string
 	*/
-	private function serviceHelper($service) {
-		$service->load(); // Load Defaults
+	private function serviceHelper($service, $binary) {
+		$service->load(array('binary'=>$binary)); // Load Defaults
 		$response = $service->install(); // Install service
 		$statusCheck = OS."ServiceInstalled";
 		return $this->$statusCheck($service);
@@ -446,7 +446,7 @@ class services extends Step
 	* @return mixed
 	*/
 	public function installStep() {
-		if (!file_exists('migrate.lock')) { // Check if it is a migration
+		if (!$this->util->isMigration()) { // Check if it is a migration
 			foreach ($this->getServices() as $serviceName) {
 				$className = OS.$serviceName;
 				$service = new $className();
@@ -12,7 +12,7 @@
 	       . 'Click Here for help on overcoming post install issues</a></div><br/>';
 	}
 	?>
-	<div id="step_content_complete" class="step">
+	<div id="step_content_<?php echo $step_name; ?>" class="step">
 	<!--	Paths and Permissions	-->
 		<div>
 		    <h3><?php echo "<span class='{$paths_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Paths and Permissions</h3>
@@ -65,6 +65,7 @@
 		</div>
 	<!--	Services	-->
 		<br/><br/>
+<?php if(!$migrate_check) { ?>
 		<div>
 		    <h3><?php echo "<span class='{$services_check}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Services</h3>
 		<?php if($silent) { ?>
@@ -116,11 +117,13 @@
 			</div>
 		<?php } ?>
 		</div>
+		<?php } ?>
 	</div>
+	
 	<?php if($migrate_check) { ?>
-		<a href="../../login.php" class="buttons back upgrade" style="width:80px;" onclick="javascript:{w.clearSessions();}">Goto Login</a>
+		<a href="../../control.php" class="buttons back upgrade" style="width:80px;" onclick="javascript:{w.clearSessions();}">Goto Login</a>
     <?php } else { ?>
-    <a href="../../login.php" class="buttons back upgrade" style="width:80px;" onclick="javascript:{w.clearSessions();}">Goto Login</a>
+    	<a href="../../control.php" class="buttons back upgrade" style="width:80px;" onclick="javascript:{w.clearSessions();}">Goto Login</a>
     <?php } ?>
     <?php
         if (INSTALL_TYPE == 'Zend') {
-<form id="dependencies_configuration_services" action="index.php?step_name=configuration" method="post">
+<form id="dependencies_configuration_services" action="index.php?step_name=<?php echo $step_name; ?>" method="post">
 	<p class="title">Checking System Configuration</p>
 	<p class="description">
@@ -32,7 +32,7 @@
 		    	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://wiki.knowledgetree.com/Web_Based_Installer#System_Configuration" target="_blank">Click here for help on overcoming configuration issues</a>
 	<?php } ?>
 	<!--Content-->
-	<div id="step_content_configuration" class="step">
+	<div id="step_content_<?php echo $step_name; ?>" class="step">
 	<h3>Server Settings</h3>
 	<p class="description">
-<form id="dependencies_configuration_services" action="index.php?step_name=configuration" method="post">
+<form id="dependencies_configuration_services" action="index.php?step_name=<?php echo $step_name; ?>" method="post">
 	<p class="title">System Configuration</p>
 <!--Continue Message-->
 	<?php
@@ -26,7 +26,7 @@
 		    	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://wiki.knowledgetree.com/Web_Based_Installer#System_Configuration" target="_blank">Click here for help on overcoming configuration issues</a>
 	<?php } ?>
 <!--Content-->
-	<div id="step_content_configuration" class="step">
+	<div id="step_content_<?php echo $step_name; ?>" class="step">
 		<h3>Server Settings</h3>
 		<table>
 		    <tr>
@@ -15,7 +15,7 @@
 	This step configures the connection to the database server and installs the database. The details for an administrative <br/>
 	user on the database server are required in order to be able to configure and install the installation database.
 	</div>
-	<div id="step_content_database" class="step">
+	<div id="step_content_<?php echo $step_name; ?>" class="step">
 	<table class="dbconf">
 	<?php
@@ -4,7 +4,7 @@
 	<div class="description">
 	Please confirm whether KnowledgeTree has correctly determined your database settings before proceeding. Print this page for future use. <a href="javascript:window.print()">Click to Print This Page</a>
 	</div>
-	<div id="step_content_database_confirm" class="step">
+	<div id="step_content_<?php echo $step_name; ?>_confirm" class="step">
 		<h3><b>Database Settings</b></h3>
 		<table class="dbconf">
 		<?php
-<form id="license_dependencies_configuration" action="index.php?step_name=dependencies" method="post">
+<form id="license_dependencies_configuration" action="index.php?step_name=<?php echo $step_name; ?>" method="post">
 	<p class="title">Checking PHP Dependencies</p>
 	<p class="description">
 	The wizard will review your system to determine whether you have the right PHP components in place to run KnowledgeTree. <br/>
@@ -29,7 +29,7 @@
 		    	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://wiki.knowledgetree.com/Web_Based_Installer#PHP_Dependencies" target="_blank" class="description_click">Click here for help on overcoming dependency issues</span></a>
 	<?php } ?>
 <!--Content-->
-	<div id="step_content_dependencies" class="step">
+	<div id="step_content_<?php echo $step_name; ?>" class="step">
 		<h3><?php echo "<span class='{$php}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>PHP Version Check</h3>
 		<?php if($silent) { ?>
 			<?php if($versionSection) {
-<form id="registration_install_complete" action="index.php?step_name=install" method="post">
+<form id="registration_install_complete" action="index.php?step_name=<?php echo $step_name; ?>" method="post">
 	<p class="title">Finalizing System Installation</p>
-	<div id="step_content" class="step">
+	<div id="step_content_<?php echo $step_name; ?>" class="step">
 		<br/>
 		<br/>
 		<p class="empty_space">
-<form id="registration_install_complete" action="index.php?step_name=installtype" method="post">
+<form id="registration_install_complete" action="index.php?step_name=<?php echo $step_name; ?>" method="post">
 	<p class="title">Installation Type</p>
 	<div id="step_content" class="step">
 		<br/>
-		<br/>
-		<p class="empty_space">
-			The wizard will require you choose between an upgrade of an existing sytem or a clean install. 
-		</p>
-		<div class="demo"><?php echo $html->image('kt_browse.png'); ?></div>
+		The wizard will require you choose an installation type.
+		<br/><br/>
+		<table>
+			<tr>
+				<td> <input type="radio" name="installtype" value="Clean Install" checked id="clean" /> </td>
+				<td> <label for="clean"><b>Clean Install</b> - New Installation of KnowledgeTree</label> </td>
+			</tr>
+			<tr>
+				<td> <input type="radio" name="installtype" value="Upgrade Installation" id="migrate" /> </td>
+				<td> <label for="migrate"><b>Upgrade Installation</b> - Upgrade an existing Installation of KnowledgeTree</label> </td>
+			</tr>
+			<tr>
+				<td> <input type="radio" name="installtype" value="Upgrade Only" id="upgrade" /> </td>
+				<td> <label for="upgrade"><b>Source Only Upgrade</b> - Manually Update Source and Upgrade Database only</label> </td>
+			</tr>
+		</table>
 	</div>
 	<input type="submit" name="Previous" value="Previous" class="button_previous"/>
-	<input type="submit" name="Next" value="Clean Install" class="button_next"/>
-	<input type="submit" name="Migrate" value="Upgrade Install" class="button_next"/>
+	<input type="submit" name="Next" value="Next" class="button_next" />
 </form>
+<script type="text/javascript">
+	function clear() {
+		
+	}
+</script>
 <?php if (AJAX) { echo $html->js('form.js'); } ?>
 \ No newline at end of file
@@ -20,7 +20,7 @@
 	and services. Please see our <a href="http://www.knowledgetree.com/about/legal" target="_blank">Privacy and Data Retention policies</a> for more information.
 	</p>
 	<br/>
-	<div id="step_content_registration" class="step">
+	<div id="step_content_<?php echo $step_name; ?>" class="step">
 		<span class="error" id="reg_error"></span>
 		<?php if(WINDOWS_OS) $input_width = 40; else { $input_width = 32; } ?>
 		<table>
 <form id="database_registration_install" action="index.php?step_name=install" method="post">
 	<p class="title">Thank you for registering</p>
-	<div id="step_content_registration_confirm" class="step">
+	<div id="step_content_<?php echo $step_name; ?>_confirm" class="step">
 		<br/>
 		<br/>
 		<p class="empty_space">
 <?php if (AJAX) { ?>
-	<form id="configuration_services_database" action="index.php?step_name=services" method="post" id="services">
+	<form id="configuration_services_database" action="index.php?step_name=<?php echo $step_name; ?>" method="post" id="services">
 <?php } else { ?>
-	<form action="index.php?step_name=services" method="post" id="services">
+	<form action="index.php?step_name=<?php echo $step_name; ?>" method="post" id="_<?php echo $step_name; ?>">
 <?php } ?>
 	<p class="title">Checking Service Dependencies</p>
-<form id="welcome_license" action="index.php?step_name=welcome" method="post">
+<form id="welcome_license" action="index.php?step_name=<?php echo $step_name; ?>" method="post">
 	<p class="title">Welcome to KnowledgeTree</p>
 	<div id="step_content" class="step">
 		<br/>
@@ -8,8 +8,17 @@
       {foreach item=aFieldPair from=$fieldset_values name=fields}
     <tr class="{cycle values=even,odd} {if $smarty.foreach.fields.first}first{/if}">
         <th>{$aFieldPair.field->getName()}</th>
-        <td>{if ($aFieldPair.value !== null)}{$aFieldPair.value|sanitize}
-            {else}<span class="descriptiveText">{i18n}no value{/i18n}</span>{/if}</td>
+        <td>
+        {if ($aFieldPair.value !== null)}
+			{if ($aFieldPair.field->getIsHTML())}
+				{$aFieldPair.value}
+			{else}
+				{$aFieldPair.value|sanitize}
+			{/if}
+        {else}
+			<span class="descriptiveText">{i18n}no value{/i18n}</span>
+		{/if}
+        </td>
     </tr>
       {/foreach}
     </table>
 <!--------------------------------------
 	---- Changes for Custom Fields -----
-	-------------------------------------->
+	------------------------------------
+    Bold, italics, underline, hyperlink and colour.
+Lists, ordered and unordered (<ul>, <ol>, <li>).
+Paragraph and break tags.
+    -->
 {if $options.field->getIsHTML()}
 {literal}
 <script type="text/javascript" src="/thirdpartyjs/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
@@ -15,10 +19,8 @@ theme : &quot;advanced&quot;,
 plugins : "safari,spellchecker,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,imagemanager,filemanager", 
 // Theme options 
-theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,fontselect,fontsizeselect", 
-theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor", 
-theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen", 
-theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,spellchecker,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,blockquote,pagebreak,|,insertfile,insertimage", 
+theme_advanced_buttons1 : "bold,italic,underline,|,forecolor,backcolor,|,bullist,numlist,|,link,unlink,anchor,|,pagebreak,|,insertdate,inserttime,preview,help", 
+theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,undo,redo,|,cleanup,removeformat,print,fullscreen,spellchecker", 
 theme_advanced_toolbar_location : "top", 
 theme_advanced_toolbar_align : "left", 
 theme_advanced_statusbar_location : "bottom", 
@@ -382,6 +382,7 @@ function createText(groupid, fid, type)
 			html += "<option value=\"is not\">{/literal}{i18n}is not{/i18n}{literal}";
 			break;
 		case 'STRING':
+        case 'LARGE TEXT':
 			html += "<option value=\"is\">{/literal}{i18n}is{/i18n}{literal}";
 			html += "<option value=\"is not\">{/literal}{i18n}is not{/i18n}{literal}";
 			html += "<option value=\"contains\">{/literal}{i18n}contains{/i18n}{literal}";
@@ -449,7 +450,7 @@ function addFieldTypeSelection(groupid, fid, type, options)
 			}
 			// want to fall through
 		case 'FULLTEXT':
-
+        case 'LARGE TEXT':
 		case 'STRINGMATCH':
 			html = createText(groupid, fid, type);
 			break;