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

Paul Barrett
2 parents f208a446 61ade212
Showing 25 changed files with 249 additions and 158 deletions
bin/schedulerTask.sh
ktapi/ktapi.inc.php
setup/wizard/lib/helpers/phpinfo.php
setup/wizard/lib/services/unixScheduler.php
setup/wizard/path.php
setup/wizard/resources/wizard.css
setup/wizard/resources/wizard.js
setup/wizard/steps/complete.php
setup/wizard/steps/database.php
setup/wizard/steps/dependencies.php
setup/wizard/steps/registration.php
setup/wizard/steps/services.php
setup/wizard/templates/complete.tpl
setup/wizard/templates/configuration.tpl
setup/wizard/templates/database.tpl
setup/wizard/templates/database_confirm.tpl
setup/wizard/templates/dependencies.tpl
setup/wizard/templates/error.tpl
setup/wizard/templates/errors.tpl
setup/wizard/templates/license.tpl
-#!/bin/sh
-cd /var/www/installers/knowledgetree/bin/
-while true; do
-php -Cq scheduler.php
-sleep 30
-done
 \ No newline at end of file
@@ -3280,7 +3280,7 @@ class KTAPI
     	$url = $download_manager->allow_download($document);
     	$response['status_code'] = 0;
-		$response['results'] = $url;
+		$response['results'] = urlencode($url);
     	return $response;
     }
+<?php echo phpinfo(); ?>
 \ No newline at end of file
@@ -95,7 +95,7 @@ class unixScheduler extends unixService {
 	}
 	function writeSchedulerTask() {
-		$fp = fopen($this->getSchedulerDir().$this->getSchedulerSource(), "w+");
+		$fp = @fopen($this->getSchedulerDir().$this->getSchedulerSource(), "w+");
 		$content = "#!/bin/sh\n";
 		$content .= "cd ".$this->getSchedulerDir()."\n";
 		$content .= "while true; do\n";
@@ -103,8 +103,9 @@ class unixScheduler extends unixService {
 		$content .= "php -Cq scheduler.php\n";
 		$content .= "sleep 30\n";
 		$content .= "done";
-		fwrite($fp, $content);
-		fclose($fp);
+		@fwrite($fp, $content);
+		@fclose($fp);
+		@chmod($this->getSchedulerDir().$this->getSchedulerSource(), '644');
 	}
 	function install() {
@@ -146,6 +147,8 @@ class unixScheduler extends unixService {
 	}
 	function start() {
+		// TODO : Write sh on the fly? Not sure the reasoning here
+		$this->writeSchedulerTask();
 		$source = $this->getSchedulerSourceLoc();
 		if($source) { // Source
 			$cmd = "nohup ".$source." > ".SYS_LOG_DIR."scheduler.log 2>&1 & echo $!";
@@ -102,7 +102,8 @@
     	define('PHP_DIR', $zendsys."ZendServer".DS."bin".DS);
     } else {
     	$modules = get_loaded_extensions();
-    	if(in_array('Zend Monitor', $modules)) { // TODO: Dirty
+    	// TODO: Dirty
+    	if(in_array('Zend Download Server', $modules) || in_array('Zend Monitor', $modules) || in_array('Zend Utils', $modules) || in_array('Zend Page Cache', $modules)) {
     		define('INSTALL_TYPE', 'Zend');
     		define('PHP_DIR', '');
     	} else {
@@ -176,7 +176,7 @@ select {
 .error {
 	font-weight: bold;
-    color: #9F0000;
+    color: red;
 }
 .errors {
@@ -264,4 +264,8 @@ input#dname {
 #section {
 	/*border:1px solid;*/
+}
+
+sup {
+	font-size: 11px;
 }
 \ No newline at end of file
@@ -7,27 +7,6 @@ wizard.prototype.doFormCheck = function() {
 	w.addReadOnly();
 }
-// Disable DnD on element
-// Element has to have a readOnly status set to readonly
-wizard.prototype.disableDnd = function(el_id) {
-//    el = document.getElementById(el_id);
-//    el.removeAttribute('readOnly');
-}
-
-// Add readOnly access on all inputs of a form
-wizard.prototype.addReadOnly = function() {
-	inputs = document.getElementsByTagName('input');
-	for(i=0;i<inputs.length;i++) {
-		var input_id = inputs[i].id;
-		if(input_id != '') {
-//    		inputs[i].setAttribute('readOnly', 'readonly');
-//    		inputs[i].setAttribute('onfocus', "javascript:{w.disableDnd('"+ input_id +"')}");
-//    		inputs[i].focus();
-//    		w.focusElement(inputs[i]);
-		}
-	}
-}
-
 // Toggle Advance Database options
 wizard.prototype.toggleClass = function(el) {
 	var el = document.getElementsByClassName(el); //adv_options|php_details|php_ext_details|php_con_details
@@ -150,4 +129,83 @@ wizard.prototype.onSubmitValidate = function(silent) {
 		}
 	}
 	return true;
+}
+
+// Validate Registration Page
+wizard.prototype.validateRegistration = function() {
+	var first = document.getElementById('first');
+	var last = document.getElementById('last');
+	var email = document.getElementById('email');
+	if(first.value < 2) {
+		
+		return false;
+	}
+	if(last.value < 2) {
+		
+		
+	}
+	if(w.emailCheck(email.value)) {
+		
+	}
+	
+	return false;
+}
+
+// Validate Registration Page Courtesy of SmartWebby.com (http://www.smartwebby.com/dhtml/)
+wizard.prototype.emailCheck = function() { 
+	var at="@";
+	var dot=".";
+	var lat=str.indexOf(at);
+	var lstr=str.length;
+	var ldot=str.indexOf(dot);
+	if (str.indexOf(at)==-1) {
+	//		   alert("Invalid E-mail ID")
+		return false;
+	}
+	if (str.indexOf(at)==-1 || str.indexOf(at)==0 || str.indexOf(at)==lstr) {
+	//		   alert("Invalid E-mail ID")
+		return false;
+	}
+	if (str.indexOf(dot)==-1 || str.indexOf(dot)==0 || str.indexOf(dot)==lstr) {
+	//		    alert("Invalid E-mail ID")
+		return false;
+	}
+	if (str.indexOf(at,(lat+1))!=-1) {
+	//		    alert("Invalid E-mail ID")
+		return false;
+	}
+	if (str.substring(lat-1,lat)==dot || str.substring(lat+1,lat+2)==dot){
+	//		    alert("Invalid E-mail ID")
+		return false;
+	}
+	if (str.indexOf(dot,(lat+2))==-1){
+	//		    alert("Invalid E-mail ID")
+		return false;
+	}
+	if (str.indexOf(" ")!=-1){
+	//		    alert("Invalid E-mail ID")
+		return false;
+	}
+	return true;
+}
+
+// Disable DnD on element
+// Element has to have a readOnly status set to readonly
+wizard.prototype.disableDnd = function(el_id) {
+//    el = document.getElementById(el_id);
+//    el.removeAttribute('readOnly');
+}
+
+// Add readOnly access on all inputs of a form
+wizard.prototype.addReadOnly = function() {
+	inputs = document.getElementsByTagName('input');
+	for(i=0;i<inputs.length;i++) {
+		var input_id = inputs[i].id;
+		if(input_id != '') {
+//    		inputs[i].setAttribute('readOnly', 'readonly');
+//    		inputs[i].setAttribute('onfocus', "javascript:{w.disableDnd('"+ input_id +"')}");
+//    		inputs[i].focus();
+//    		w.focusElement(inputs[i]);
+		}
+	}
 }
 \ No newline at end of file
@@ -143,8 +143,9 @@ class complete extends Step {
             $this->temp_variables['docLocation'] = '<td><div class="cross_orange"></div></td>'
                                                  . '<td class="warning" colspan="2">Your document directory is set to the default, which is inside the web root. '
                                                  . 'This may present a security problem if your documents can be accessed from the web, '
-                                                 . 'working around the permission system in KnowledgeTree.</td>';
+                                                 . 'working around the permission system in KnowledgeTree<sup>&#174;</sup>.</td>';
                                                  $this->paths_check = 'cross_orange';
+                                                 $this->warnings[] = 'Move var directory';
         }
         else {
             $this->temp_variables['docLocation'] = sprintf($html, 'tick', '', 'Your document directory is outside the web root.');
@@ -202,7 +202,7 @@ class database extends Step
 	* @access public
 	* @var array
 	*/
-    public $temp_variables = array("step_name"=>"database");
+    public $temp_variables = array();
 	/**
 	* List of errors encountered
@@ -259,7 +259,7 @@ class dependencies extends Step
         if($phpversion6 != 1){
             $this->done = false;
-            $check['version'] = "KnowledgeTree is not supported on PHP 6.0 and higher. You are running version <b>{$phpversion}</b>.";
+            $check['version'] = "KnowledgeTree<sup>&#174;</sup> is not supported on PHP 6.0 and higher. You are running version <b>{$phpversion}</b>.";
             return $check;
         }
         $check['class'] = 'tick';
@@ -42,13 +42,16 @@
 class registration extends Step
 {
+	
+	public $temp_variables = array("step_name"=>"registration");
+	
     /**
      * Initialise the registration step
      *
      * @author KnowledgeTree Team
      * @access public
      */
-    public function configure()
+    public function __construct()
     {
         $this->temp_variables = array("step_name"=>"registration");
     }
@@ -430,7 +433,8 @@ class registration extends Step
             'RO' => 'ROMANIA',
             'RU' => 'RUSSIAN FEDERATION',
             'RW' => 'RWANDA',
-            'BL' => 'SAINT BARTH�LEMY',
+//            TODO: Special Character for the e
+            'BL' => 'SAINT BARTHELEMY',
             'SH' => 'SAINT HELENA',
             'KN' => 'SAINT KITTS AND NEVIS',
             'LC' => 'SAINT LUCIA',
@@ -89,6 +89,24 @@ class services extends Step
     private $alreadyInstalled = false;
 	/**
+	* Flag if services are already Installed
+	*
+	* @author KnowledgeTree Team
+	* @access private
+	* @var mixed
+	*/
+    private $luceneInstalled = false;
+    
+	/**
+	* Flag if services are already Installed
+	*
+	* @author KnowledgeTree Team
+	* @access private
+	* @var mixed
+	*/
+    private $schedulerInstalled = false;
+    
+	/**
 	* PHP Installed 
 	*
 	* @author KnowledgeTree Team
@@ -302,6 +320,7 @@ class services extends Step
 		return true;
     }
+    
     /**
 	* Do some basic checks to help the user overcome java problems
 	*
@@ -759,9 +778,12 @@ class services extends Step
     */
     private function storeSilent() {
     	$this->temp_variables['alreadyInstalled'] = $this->alreadyInstalled;
+    	$this->temp_variables['luceneInstalled'] = $this->luceneInstalled;
+    	$this->temp_variables['schedulerInstalled'] = $this->schedulerInstalled;
 		$this->temp_variables['javaExeError'] = $this->javaExeError;
 		$this->temp_variables['javaCheck'] = $this->javaCheck;
 		$this->temp_variables['javaExtCheck'] = $this->javaExtCheck;
+		// TODO : PHP detection
 		$this->temp_variables['phpCheck'] = 'tick';//$this->phpCheck;
 		$this->temp_variables['phpExeError'] = '';//$this->phpExeError;
 		$this->temp_variables['serviceCheck'] = $this->serviceCheck;
 <h1>Installation Completed</h1>
-<h2>KnowledgeTree post-configuration checkup</h2>
+<h2>KnowledgeTree<sup>&#174;</sup> post-configuration checkup</h2>
-<p>This allows you to check that your KnowledgeTree configuration is set
+<p>This allows you to check that your KnowledgeTree<sup>&#174;</sup> configuration is set
 up correctly.  You can run this at any time after configuration to check
 that things are still set up correctly.</p>
 <?php
 if($errors || $warnings){
     echo '<div>'
-       . '<a href="http://wiki.knowledgetree.com/Web_Based_Installer#PHP_Dependencies" target="_blank">'
-       . 'Click Here for help on overcoming dependency issues</a></div><br/>';
+       . '<a href="http://wiki.knowledgetree.com/Web_Based_Installer#Post_Install" target="_blank">'
+       . 'Click Here for help on overcoming post install issues</a></div><br/>';
 }
 ?>
@@ -80,7 +80,7 @@ if($errors || $warnings){
 <form>
 	<div class="buttons">
 <!--	    <a href="index.php?step_name=complete&step=previous" class="previous">Previous</a>-->
-<!--	    <a href="">Refresh</a>-->
+	    <a href="">Refresh</a>
 	    <a href="../../">Goto Login</a>
 	    <?php
 	        if (INSTALL_TYPE == 'Zend') {
 <h1>System Configuration</h1>
 <p class="description">
-This check ensures that KnowledgeTree is correctly configured to run.
+This check ensures that KnowledgeTree<sup>&#174;</sup> is correctly configured to run.
 </p>
 <form action="index.php?step_name=configuration" method="post">
@@ -9,7 +9,7 @@ This check ensures that KnowledgeTree is correctly configured to run.
 <h3>Server Settings</h3>
 <p class="description">
-The settings below have been drawn from the system information. The host and port should reflect the host and port that will be used to access KnowledgeTree. The Root Url is only needed if your installation is in a directory off the main web server root.
+The settings below have been drawn from the system information. The host and port should reflect the host and port that will be used to access KnowledgeTree<sup>&#174;</sup>. The Root Url is only needed if your installation is in a directory off the main web server root.
 </p>
 <div class="error">
@@ -55,7 +55,7 @@ The settings below have been drawn from the system information. The host and por
 	<div class="paths_perms" style="display:none">
 <?php } ?>
 <p class="description">
-The following folders must be writable for KnowledgeTree to be able to run. The permissions on the configuration file may be reset to read-only once the installation has completed.
+The following folders must be writable for KnowledgeTree<sup>&#174;</sup> to be able to run. The permissions on the configuration file may be reset to read-only once the installation has completed.
 </p>
 <table>
 <?php
@@ -12,10 +12,14 @@
 	user on the database server are required in order to be able to configure and install the installation database.
 	</div>
 	<table class="dbconf">
+<!--	TODO: Different Databases-->
 	    <tr><td>Your current database type is: </td>
 		<?php if($dtypes) {
 		        foreach($dtypes as $k=>$v) {
-		    ?><td><input type="hidden" name="dtype" value="<?php echo $v; ?>" <?php if(!$k)echo 'checked="checked"'; ?>/>&nbsp;&nbsp;<?php echo ucwords($v); ?></td>
+		    ?><td>
+		    	<?php echo ucwords($v);?>
+<!--		    	<input type="hidden" name="dtype" value="<?php //echo $v; ?>" <?php //if(!$k)echo 'checked="checked"'; ?>/>&nbsp;&nbsp;<?php //echo ucwords($v); ?>-->
+		    	</td>
 		<?php }
 		}
 		?>
@@ -3,11 +3,10 @@
 <div class="description">
 Please confirm that your database settings have been entered correctly before proceeding with the installation.
 </div>
-<div id="section">
-<h3>Database Settings</h3>
+<!--<div id="section">-->
 <form action="index.php?step_name=<?php echo $step_name; ?>" method="post">
-
+<h3><b>Database Settings</b></h3>
 <table width="20%" class="dbconf">
 <?php
 if($dtypes) {
@@ -17,24 +16,24 @@ if($dtypes) {
         }
         ?>
     <tr>
-        <td><b>Database type: </b></td>
+        <td>Database type: </td>
         <td><?php echo $type; ?></td>
     </tr>
 <?php } ?>
     <tr>
-        <td><b>Name: </b></td>
+        <td>Name: </td>
         <td><?php echo $dname; ?></td>
     </tr>
     <tr>
-        <td><b>Root Username: </b></td>
+        <td>Root Username: </td>
         <td><?php echo $duname; ?></td>
     </tr>
     <tr>
-        <td><b>Root Username: </b></td>
+        <td>Root Username: </td>
         <td><?php echo $duname; ?></td>
     </tr>
     <tr>
-        <td><b>Root Password: </b></td>
+        <td>Root Password: </td>
         <td><?php echo $dpassword; ?></td>
     </tr>
     <?php if($ddrop) { ?>
@@ -43,51 +42,51 @@ if($dtypes) {
     </tr>
     <?php } ?>
 </table>
-</div>
-<h3>Advanced Settings</h3>
+<!--</div>-->
+<h3><b>Advanced Settings</b></h3>
-<table width="46%" class="dbconf">
+<table width="23%" class="dbconf">
     <tr>
-        <td><b>Host: </b></td>
+        <td>Host: </td>
         <td><?php echo $dhost; ?></td>
     </tr>
     <tr>
-        <td><b>Port: </b></td>
+        <td>Port: </td>
         <td><?php echo $dport; ?></td>
     </tr>
     <tr>
-        <td><b>Mysql Binary: </b></td>
+        <td>Mysql Binary: </td>
         <td><?php echo $dbbinary; ?></td>
     </tr>
     <?php if (!$silent) { ?>
     <tr>
-        <td><b>Table Prefix: </b></td>
+        <td><b>Table Prefix: </td>
         <td><?php echo $tprefix; ?></td>
     </tr>
 <?php } ?>
 </table>
-<h3>Database Users</h3>
+<h3><b>Database Users</b></h3>
-<table width="46%" class="dbconf">
+<table width="23%" class="dbconf">
     <?php //if (!$silent) { ?>
     <tr>
-        <td><b>DMS Admin Username: </b></td>
+        <td>DMS Admin Username: </td>
         <td><?php echo $dmsname; ?></td>
     </tr>
     <?php //} ?>
     <tr>
-        <td><b>DMS Admin Password: </b></td>
+        <td>DMS Admin Password: </td>
         <td><?php echo $dmspassword; ?></td>
     </tr>
     <?php //if (!$silent) { ?>
     <tr>
-        <td><b>DMS User Username: </b></td>
+        <td>DMS User Username: </td>
         <td><?php echo $dmsusername; ?></td>
     </tr>
     <?php //} ?>
     <tr>
-        <td><b>DMS User Password: </b></td>
+        <td>DMS User Password: </td>
         <td><?php echo $dmsuserpassword; ?></td>
     </tr>
 </table>
 <h1>PHP Dependencies Check</h1>
 <p class="description">
-This checkup ensures that your environment is ready to support a KnowledgeTree installation. <br/>
+This checkup ensures that your environment is ready to support a KnowledgeTree<sup>&#174;</sup> installation. <br/>
 Settings marked in green are available, settings marked in orange are optional and settings marked in red are required.
 </p>
@@ -32,7 +32,7 @@ if($silent) { ?&gt;
 	<div class="php_ext_details" style="display:none">
 <?php } ?>
 <p class="description">
-The following determines your PHP installation environment. The extensions are required for KnowledgeTree to perform at an optimal level.
+The following determines your PHP installation environment. The extensions are required for KnowledgeTree<sup>&#174;</sup> to perform at an optimal level.
 </p>
 <table>
 <?php
@@ -69,7 +69,7 @@ if($silent) { ?&gt;
 	<div class="php_con_details" style="display:none">
 <?php } ?>
 <p class="description">
-The following is the recommended PHP configuration for KnowledgeTree to perform at an optimal level.
+The following is the recommended PHP configuration for KnowledgeTree<sup>&#174;</sup> to perform at an optimal level.
 </p>
 <table>
 <tr>
@@ -88,6 +88,8 @@ The following is the recommended PHP configuration for KnowledgeTree to perform 
     }
 ?>
 </table>
+<br/>
+B = Bytes, K = Kilobytes, M = Megabytes, G = Gigabytes
 <?php if($silent) { ?>
 	</div>
 <?php } ?>
 <head>
-		<title>KnowledgeTree Installer</title>
+		<title>KnowledgeTree&#174; Installer</title>
 		<script type="text/javascript" src="resources/wizard.js"></script>
 		<link rel="stylesheet" type="text/css" href="resources/wizard.css">
 	</head><body onload="w.doFormCheck();">
@@ -11,7 +11,7 @@
 		    <div id="wrapper">
 		        <div id="container">
 		            <div id="content">
-		                <h1>Welcome to the KnowledgeTree Setup Wizard</h1>
+		                <h1>Welcome to the KnowledgeTree<sup>&#174;</sup> Setup Wizard</h1>
 <div style="width: 800px;">
 <?php if(isset($error)) echo '';echo "<div class='error'>".$error."</div>"; ?>
-<h1>Welcome to the KnowledgeTree Setup Wizard</h1>
+<h1>Welcome to the KnowledgeTree<sup>&#174;</sup> Setup Wizard</h1>
 <div style="width: 800px;">
 <?php if(isset($error)) echo $error; ?>
 <h1>License Agreement</h1>
-<div class="errors">
+<div class="error">
     <?php if(isset($errors)) {
         foreach($errors as $k=>$e) {
                 echo $e;
@@ -14,7 +14,7 @@ Please read and accept the license agreement below before continuing with the se
 <form action="index.php?step_name=license" method="POST">
 <div style="overflow: scroll; height: 500px; width:800px; overflow-x:hidden;">
-<h2>KnowledgeTree On-premise Commercial End-User</h2>
+<h2>KnowledgeTree<sup>&#174;</sup> On-premise Commercial End-User</h2>
 <p>
 License Agreement Version 2.3
 </p>
@@ -25,9 +25,9 @@ THIS AGREEMENT AND THAT YOU HAVE THE NECESSARY AUTHORITY TO BIND THE COMPANY TO 
 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
+This is an agreement entered into by and between you (the "Company") and KnowledgeTree<sup>&#174;</sup> 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
+license the KnowledgeTree<sup>&#174;</sup> 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>
@@ -134,9 +134,9 @@ User accounts cannot be shared or used by more than one individual End User but 
 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
+License fee: The Company shall pay to KT an amount specified on the KnowledgeTree<sup>&#174;</sup> 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-
+forth in the terms and conditions on the KnowledgeTree<sup>&#174;</sup> website. All fees paid to KT are non-
 refundable. The Company will also pay all applicable taxes, including sales, use, personal property,
 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
@@ -309,7 +309,7 @@ defined in FAR 52.227-14, Rights in Data - General, including Alternate III (Jun
 <p>
 <h3>CONTRACTOR/MANUFACTURER</h3>
 The Contractor/Manufacturer for the Software is:
-KnowledgeTree Inc.
+KnowledgeTree<sup>&#174;</sup>
 c/o DLA Piper US LLP
 2000 University Avenue
 East Palo Alto, CA 94303
-<h1>Register your KnowledgeTree Installation</h1>
+<h1>Register your KnowledgeTree<sup>&#174;</sup> Installation</h1>
-<div class="errors">
+<div class="error">
     <?php if(isset($errors)) {
         foreach($errors as $k=>$e) {
                 echo $e;
@@ -9,23 +9,23 @@
 </div>
 <p>
-Register your KnowledgeTree Installation and receive the KnowledgeTree Drop Box for Windows software, a drag and drop tool that makes
-placing documents into KnowledgeTree even easier.
+Register your KnowledgeTree<sup>&#174;</sup> Installation and receive the KnowledgeTree<sup>&#174;</sup> Drop Box for Windows software, a drag and drop tool that makes
+placing documents into KnowledgeTree<sup>&#174;</sup> even easier.
 </p>
 <p class='disclaimer'>
-We will not share your information with 3rd-parties, nor will we send you information not directly related to KnowledgeTree Inc.'s products
-and services. Please see our <a href="http://www.knowledgetree.com/about/legal">Privacy and Data Retention policies</a> for more information.
+We will not share your information with 3rd-parties, nor will we send you information not directly related to KnowledgeTree<sup>&#174;</sup>'s products
+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>
-
-<form action="index.php?step_name=registration" method="post">
+<!--<form action="index.php?step_name=registration" method="post">-->
+<form id="registration" action="index.php?step_name=<?php echo $step_name; ?>" method="post" onsubmit="w.validateRegistration();return false;">
 <p>
 <table>
     <tr>
         <td><label for='first'>First Name</label></td>
         <td rowspan='6' width='5%'>&nbsp;</td>
-        <td><input name='submitted[first_name]' id='first' size='44' /></td>
+        <td><input name='submitted[first_name]' id='first' size='37' /></td>
         <td rowspan='6' width='5%'>&nbsp;</td>
         <td rowspan='6'>
             <img src='resources/graphics/dropbox.png' />
@@ -33,11 +33,11 @@ and services. Please see our &lt;a href=&quot;http://www.knowledgetree.com/about/legal&quot;&gt;
     </tr>
     <tr>
         <td><label for='last'>Last Name</label></td>
-        <td><input name='submitted[last_name]' id='last' size='44' /></td>
+        <td><input name='submitted[last_name]' id='last' size='37' /></td>
     </tr>
     <tr>
         <td><label for='email'>Email Address</label></td>
-        <td><input name='submitted[email_address]' id='email' size='44' /></td>
+        <td><input name='submitted[email_address]' id='email' size='37' /></td>
     </tr>
     <tr>
         <td><label for='country'>Country</label></td>
 <h1>Thank you for registering</h1>
-<div class="errors">
+<div class="error">
     <?php if(isset($errors)) {
         foreach($errors as $k=>$e) {
                 echo $e;
@@ -9,7 +9,7 @@
 </div>
 <p>
-Thank you for signing up. You'll receive an email from us shortly with download instructions for the KnowledgeTree Drop Box software.
+Thank you for signing up. You'll receive an email from us shortly with download instructions for the KnowledgeTree<sup>&#174;</sup> Drop Box software.
 </p>
 <form action="index.php?step_name=registration" method="post">
@@ -2,72 +2,71 @@
 <h1>Services Dependencies Check</h1>
 <p class="description">
-This checkup ensures that your environment is ready to support KnowledgeTree's background services. 
+This checkup ensures that your environment is ready to support KnowledgeTree<sup>&#174;</sup>'s background services. 
 </p>
 <?php
 if($errors || $warnings){
     echo '<div>'
        . '<a href="http://wiki.knowledgetree.com/Web_Based_Installer#Service_Dependencies" target="_blank">'
-       . 'Click Here for help on overcoming service issues</a></div><br/>';
+       . 'Click Here for help on overcoming services issues</a></div><br/>';
 }
 ?>
 <?php if(!$alreadyInstalled) { ?>
-<?php if($javaExeError != '') { ?>
-Specify the location of your Java executable
-<br />
-<input name='java' id='port' size='25' value='<?php echo $java['location']; ?>'/>
-&nbsp;&nbsp;&nbsp;
-<?php if($javaExeError != true) { ?><span class="error"><?php echo $javaExeError; ?></span><?php } ?>
-<?php } ?>
-<?php if($phpExeError != '') { ?>
-<br />
-Specify the location of your PHP executable
-<br />
-<?php if($php['location'] == '') { ?>
-	<input name='php' id='port' size='25' value='<?php echo $php['location']; ?>'/>
-<?php } else {?>
-	<input type="hidden" name='php' id='port' size='25' value='<?php echo $php['location']; ?>'/>
-<?php } ?>
-&nbsp;&nbsp;&nbsp;
-<?php if($phpExeError != true) { ?><span class="error"><?php echo $phpExeError; ?></span><?php } ?>
-<?php } ?>
-<?php if($javaExeError != '' || $phpExeError != '') { ?>
-<br />
-<input type="submit" name="Refresh" value="Submit"/>
-<?php } ?>
-<h3><?php echo "<span class='{$javaCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Java Check</h3>
-<?php if($silent) { ?>
-	<div id="options" class="onclick" onclick="javascript:{w.toggleClass('java_details');}">Show Details</div>
-	<div class="java_details" style="display:none">
-<?php } ?>
-<p class="description">
-The Java version must be higher than 1.5.
-</p>
-<?php echo "<span class='{$step_vars['java']['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$step_vars['java']['found']}"; ?>
-<br/>
-<?php echo "<span class='{$step_vars['version']['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$step_vars['version']['found']}"; ?>
-<?php if($silent) { ?>
-	</div>
-<?php } ?>
-<?php if (!$disableExtension) {?>
-<h3><?php echo "<span class='{$javaExtCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Java Extensions</h3>
-<?php if($silent) { ?>
-	<div id="options" class="onclick" onclick="javascript:{w.toggleClass('java_ext_details');}">Show Details</div>
-	<div class="java_ext_details" style="display:none">
-<?php } ?>
-<p class="description">
-A PHP Java Bridge is required for KnowledgeTree to perform at an optimal level.
-</p>
-<?php echo "<span class='{$step_vars['extensions']['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$step_vars['extensions']['found']}"; ?>
-<br />
-<?php if($silent) { ?>
-	</div>
-<?php } ?>
-<?php } ?>
+	<?php if($javaExeError != '') { ?>
+		Specify the location of your Java executable
+		&nbsp;&nbsp;&nbsp;
+		<input name='java' id='port' size='25' value='<?php echo $java['location']; ?>'/>
+		&nbsp;&nbsp;&nbsp;
+		<?php if($javaExeError != true) { ?><span class="error"><?php echo $javaExeError; ?></span><?php } ?>
+	<?php } ?>
+	<?php if($phpExeError != '') { ?>
+		<br />
+		Specify the location of your PHP executable
+		<br />
+		<?php if($php['location'] == '') { ?>
+			<input name='php' id='port' size='25' value='<?php echo $php['location']; ?>'/>
+		<?php } else { ?>
+			<input type="hidden" name='php' id='port' size='25' value='<?php echo $php['location']; ?>'/>
+		<?php } ?>
+		&nbsp;&nbsp;&nbsp;
+		<?php if($phpExeError != true) { ?><span class="error"><?php echo $phpExeError; ?></span><?php } ?>
+	<?php } ?>
+	<?php if($javaExeError != '' || $phpExeError != '') { ?>
+		<input type="submit" name="Refresh" value="Submit"/>
+	<?php } ?>
+	<h3><?php echo "<span class='{$javaCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Java Check</h3>
+	<?php if($silent) { ?>
+		<div id="options" class="onclick" onclick="javascript:{w.toggleClass('java_details');}">Show Details</div>
+		<div class="java_details" style="display:none">
+	<?php } ?>
+	<p class="description">
+	The Java version must be higher than 1.5.
+	</p>
+	<?php echo "<span class='{$step_vars['java']['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$step_vars['java']['found']}"; ?>
+	<br/>
+	<?php echo "<span class='{$step_vars['version']['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$step_vars['version']['found']}"; ?>
+	<?php if($silent) { ?>
+		</div>
+	<?php } ?>
+	<?php if (!$disableExtension) { ?>
+		<h3><?php echo "<span class='{$javaExtCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Java Extensions</h3>
+		<?php if($silent) { ?>
+			<div id="options" class="onclick" onclick="javascript:{w.toggleClass('java_ext_details');}">Show Details</div>
+			<div class="java_ext_details" style="display:none">
+		<?php } ?>
+		<p class="description">
+		A PHP Java Bridge is required for KnowledgeTree<sup>&#174;</sup> to perform at an optimal level.
+		</p>
+		<?php echo "<span class='{$step_vars['extensions']['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$step_vars['extensions']['found']}"; ?>
+		<br />
+		<?php if($silent) { ?>
+			</div>
+		<?php } ?>
+	<?php } ?>
 <?php } else { ?>
-<p class="description">
-All services are already installed.
-</p>
+	<p class="description">
+	All services are already installed.
+	</p>
 <?php } ?>
 <h3><?php echo "<span class='{$serviceCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Services Check</h3>
 <?php if($silent) { ?>
@@ -89,10 +88,9 @@ if($step_vars){
 <?php if($silent) { ?>
 	</div>
 <?php } ?>
-
 <div class="buttons">
     <input type="submit" name="Previous" value="Previous"/>
-    <input type="submit" name="Refresh" value="Refresh"/>
     <input type="submit" name="Next" value="Next"/>
+    <input type="submit" name="Refresh" value="Refresh"/>
 </div>
 </form>
 \ No newline at end of file
-<h1>Welcome to the KnowledgeTree Setup Wizard</h1>
+<h1>Welcome to the KnowledgeTree<sup>&#174;</sup> Setup Wizard</h1>
 <div style='width:800px;'>
 <p>
-KnowledgeTree<sup>TM</sup> is document management made simple - easily share, track, secure, and manage the documents and records your organization depends on.
+KnowledgeTree<sup>&#174;</sup> is document management made simple - easily share, track, secure, and manage the documents and records your organization depends on.
 </p>
 <p>
-KnowledgeTree provides an easy-to-use, production-ready, enterprise document management solution for use by corporations, government institutions, medium
-to small businesses, and many other types of organizations. KnowledgeTree's open source architecture allows organizations to easily customize and
+KnowledgeTree<sup>&#174;</sup> provides an easy-to-use, production-ready, enterprise document management solution for use by corporations, government institutions, medium
+to small businesses, and many other types of organizations. KnowledgeTree<sup>&#174;</sup>'s open source architecture allows organizations to easily customize and
 integrate the document management system with their existing infrastructure, providing a more flexible, cost-effective alternative to proprietary
 applications.
 </p>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html>
 	<head>
-		<title>KnowledgeTree Installer</title>
+		<title>KnowledgeTree&#174; Installer</title>
 		<script type="text/javascript" src="resources/wizard.js" ></script>
 		<link rel="stylesheet" type="text/css" href="resources/wizard.css" />
 	</head>