Story ID: 778902 Services Updated

Committed by: Jarrett Jordaan Reviewed by: Megan Watson

Story ID: 778902 Services Updated
Committed by: Jarrett Jordaan Reviewed by: Megan Watson
Jarrett Jordaan
1 parent 9dcabe27
Showing 73 changed files with 300 additions and 132 deletions
setup/wizard/batches/lucene_install.bat
setup/wizard/batches/lucene_start.bat
setup/wizard/batches/lucene_uninstall.bat
setup/wizard/batches/scheduler_install.bat
setup/wizard/batches/scheduler_start.bat
setup/wizard/batches/scheduler_uninstall.bat
setup/wizard/config/config.xml
setup/wizard/config/databases.xml
setup/wizard/dbUtil.php
setup/wizard/index.php
setup/wizard/ini.php
setup/wizard/installUtil.php
setup/wizard/installWizard.php
setup/wizard/installer.php
setup/wizard/lib/services/service.php
setup/wizard/lib/services/unixAgent.php
setup/wizard/lib/services/unixLucene.php
setup/wizard/lib/services/unixScheduler.php
setup/wizard/lib/services/unixService.php
setup/wizard/lib/services/windowsAgent.php
@@ -12,9 +12,10 @@
         <step name="Welcome">welcome</step>
         <step name="License Agreement">license</step>
         <step name="PHP Dependencies" mode="silent">dependencies</step>
-        <step name="System Configuration" order="1">configuration</step>
+        <step name="System Configuration" order="2">configuration</step>
         <step name="Service Dependencies" order="3" mode="silent">services</step>
-        <step name="Database Configuration" order="2">database</step>
+        <step name="Database Configuration" order="1">database</step>
+        <step name="Registration">registration</step>
         <step name="Install" mode="silent">install</step>
         <step name="Complete">complete</step>
     </steps>
@@ -330,7 +330,7 @@ class InstallUtil {
     	if(WINDOWS_OS) {
     	    $sCmd = 'call '.$sCmd;
     	}
-    	echo $sCmd."<br/>";
+
     	exec($sCmd, $aOutput, $iRet);
     	$aRet['ret'] = $iRet;
     	$aRet['out'] = $aOutput;
@@ -267,7 +267,6 @@ class Installer {
 	* @return string
 	*/
     private function _runStepAction($stepName) {
-    	//echo $stepName."==";
         $this->stepAction = new stepAction($stepName);
         $this->stepAction->setSteps($this->getSteps());
         $this->stepAction->setStepNames($this->getStepNames());
@@ -403,8 +402,6 @@ class Installer {
     private function _resetSessions() {
     	if($this->session) {
 	    	if($this->_firstStepPeriod()) {
-	    		$this->session->destroy();
-/*	    		
 	    		foreach ($this->getSteps() as $class) {
 	    			$this->session->un_setClass($class);
 	    		}
@@ -414,7 +411,6 @@ class Installer {
 	    		foreach ($this->_getInstallOrders() as $class) {
 	    			$this->session->un_setClass($class);
 	    		}
-*/
 	    	}
     	}
     }
@@ -434,7 +430,17 @@ class Installer {
     	if(!$this->installOrders) {
     		$this->_xmlStepsOrders();
     	}
+    	if(isset($_POST['Next'])) {
+    		$this->response = 'next';
+    	} elseif (isset($_POST['Previous'])) {
+    		$this->response = 'previous';
+   	  	} elseif (isset($_POST['Confirm'])) {
+    		$this->response = 'next';
+    	} elseif (isset($_POST['Install'])) {
+    		$this->response = 'next';
+    	}
     }
+    
 	/**
 	* Main control to handle the flow of install
 	*
@@ -445,39 +451,29 @@ class Installer {
 	*/
     public function step() {
 		$this->loadNeeded();
-        $response = $this->_landing();
-        switch($response) {
+        switch($this->response) {
             case 'next':
-                $this->_proceed(); // Load next window
+        		$step_name = $this->_getStepName();
+        		$res = $this->_runStepAction($step_name);
+				if($res == 'next')
+                	$this->_proceed(); // Load next window
+                elseif ($res == 'install') {
+                	$this->_runStepsInstallers(); // Load landing
+                	$this->_proceed(); // Load next window
+                } elseif ($res == 'confirm') {
+                	$this->stepConfirmation = true;
+                	$this->_landing();
+                } else {
+//                	die("Unmet parameters");
+                }
             	break;
-
             case 'previous':
-                $this->_backward(); // Load previous window
-            	break;
-            	
-            case 'confirm':
-                $this->stepConfirmation = true;
-                $this->_landing();
-            	break;
-            	
-            case 'error':
-                $this->_landing(); // Load landing with errors
-            	break;
-            	
-            case 'landing':
-                $this->_landing(); // Load landing
-            	break;
-            	
-            case 'install':
-                $this->_runStepsInstallers(); // Load landing
-                $this->_proceed(); // Load next window
-            	break;
-            	
+                $this->_backward(); // Load previous page
+            	break;           	
             default:
-                die("Response $response: That was unexpected"); // No class response
+            	$this->_landing();
             	break;
         }
-
         $this->stepAction->paintAction(); // Display step
     }
  
@@ -99,8 +99,6 @@ class unixLucene extends Service {
 					}
 				}
 			}
-//			echo $this->phpDir;
-//			die;
 			return ;
 		} else {
 			$this->phpDir = $phpdir;
@@ -165,13 +163,8 @@ class unixLucene extends Service {
  
   	public function stop() {
   		// TODO: Breaks things
-		if($this->getPhpDir() != "") {
-//    		$cmd = $this->getPhpDir()." ".$this->getIndexerDir().$this->getShutdownScript()." positive &> ".SYS_LOG_DIR."dmsctl.log";
-		} else {
-    		$cmd = "pkill -f ".$this->getLuceneSource();
-		}
 		$state = $this->status();
-		if($state == 'STARTED') {
+		if($state != 'STOPPED') {
 			$cmd = "pkill -f ".$this->getLuceneSource();
     		$response = $this->util->pexec($cmd);
 			return $response;
@@ -181,27 +174,34 @@ class unixLucene extends Service {
  
     public function install() {
     	$state = $this->status();
-//    	die;
     	if($state != 'STARTED') {
 	    	$cmd = "cd ".$this->getLuceneDir()."; ";
 	    	$cmd .= "nohup java -jar ".$this->getLuceneSource()." &> ".SYS_LOG_DIR."lucene.log &";
 	    	$response = $this->util->pexec($cmd);
+	    	
 	    	return $response;
     	} elseif ($state == 'STOPPED') {
-    		// start her up
-    		
+    		// Start Service
+    		return true;
+    	} else {
+    		// Service Running Already
+    		return true;
     	}
+    	
+    	return false;
     }
  
     public function status() {
-    	$cmd = "ps ax | grep ".$this->getLuceneSource()." | awk {'print $1'}";
-//    	echo $cmd;
+    	$cmd = "ps ax | grep ".$this->getLuceneSource();
     	$response = $this->util->pexec($cmd);
-//    	var_dump($response);
     	if(is_array($response['out'])) {
     		if(count($response['out']) > 1) {
-//    			var_dump($response['out']);
-    			return 'STARTED';
+    			foreach ($response['out'] as $r) {
+    				preg_match('/grep/', $r, $matches); // Ignore grep
+    				if(!$matches) {
+    					return 'STARTED';
+    				}
+    			}
     		} else {
     			return 'STOPPED';
     		}
@@ -47,6 +47,7 @@ class unixScheduler extends Service {
 	protected $schedulerDir;
 	protected $schedulerSource;
 	protected $schedulerSourceLoc;
+	protected $systemDir;
 	private $util = null;
  
 	public function __construct() {
@@ -55,6 +56,7 @@ class unixScheduler extends Service {
 	function load() {
 		$this->name = "KTSchedulerTest";
 		$this->util = new InstallUtil();
+		$this->setSystemDir(SYSTEM_ROOT."bin".DS);
 		$this->setSchedulerDir(SYSTEM_DIR."bin".DS);
 		$this->setSchedulerSource('schedulerTask.sh');
 		$this->setSchedulerSourceLoc('schedulerTask.sh');
@@ -69,6 +71,16 @@ class unixScheduler extends Service {
 		return $this->schedulerPidFile;
 	}
  
+	function setSystemDir($systemDir) {
+		$this->systemDir = $systemDir;
+	}
+	
+	function getSystemDir() {
+		if(file_exists($this->systemDir))
+			return $this->systemDir;
+		return false;
+	}
+	
 	function setSchedulerDir($schedulerDir) {
 		$this->schedulerDir = $schedulerDir;
 	}
@@ -90,21 +102,25 @@ class unixScheduler extends Service {
 	}
  
 	function getSchedulerSourceLoc() {
-		if(file_exists($this->schedulerSourceLoc)) {
+		if(file_exists($this->schedulerSourceLoc))
 			return $this->schedulerSourceLoc;
-		}
-//		die('File Expected Error');
 		return false;
 	}
  
 	function install() {
-		$source = $this->getSchedulerSourceLoc();
-		if($source) {
-			$cmd = "nohup ".$source." &> ".SYS_LOG_DIR."dmsctl.log";
-	    	$response = $this->util->pexec($cmd);
-    		return $response;
-		}
-		
+//		$source = $this->getSchedulerSourceLoc();
+//		if($source) {
+//			$cmd = "nohup ".$source." &> ".SYS_LOG_DIR."dmsctl.log";
+//	    	$response = $this->util->pexec($cmd);
+//    		return $response;
+//		} else {
+//			$source = $this->getSystemDir().$this->schedulerSource;
+//			if(file_exists($source)) {
+//				$cmd = "nohup ".$source." &> ".SYS_LOG_DIR."dmsctl.log";
+//		    	$response = $this->util->pexec($cmd);
+//	    		return $response;
+//			}
+//		}
 		return false;
 	}
  
@@ -113,17 +129,22 @@ class unixScheduler extends Service {
 	}
  
 	function stop() {
-    	$cmd = "pkill -f ".$this->name;
+    	$cmd = "pkill -f ".$this->schedulerSource;
     	$response = $this->util->pexec($cmd);
 		return $response;
 	}
  
 	function status() {
-    	$cmd = "ps ax | grep ".$this->getSchedulerSource()." | awk {'print $1'}";
+    	$cmd = "ps ax | grep ".$this->getSchedulerSource();
     	$response = $this->util->pexec($cmd);
-    	if(is_array($response['out'])) {
+      	if(is_array($response['out'])) {
     		if(count($response['out']) > 1) {
-    			return 'STARTED';
+    			foreach ($response['out'] as $r) {
+    				preg_match('/grep/', $r, $matches); // Ignore grep
+    				if(!$matches) {
+    					return 'STARTED';
+    				}
+    			}
     		} else {
     			return 'STOPPED';
     		}
@@ -131,5 +152,17 @@ class unixScheduler extends Service {
  
     	return 'STOPPED';
 	}
+	
+	function writeSchedulerTask() {
+		$fp = fopen($this->getSchedulerDir().$this->getSchedulerSource(), "w+");
+		$content = "#!/bin/sh\n";
+		$content .= "cd ".$this->getSchedulerDir()."\n";
+		$content .= "while true; do\n";
+		$content .= "php "."\"{$this->getSchedulerDir()}{$this->getSchedulerSource()}\"";
+		$content .= "sleep 30\n";
+		$content .= "done";
+		fwrite($fp, $content);
+		fclose($fp);
+	}
 }
 ?>
 \ No newline at end of file
@@ -73,10 +73,17 @@
     define('RES_DIR', WIZARD_DIR."resources".DS);
     define('STEP_DIR', WIZARD_DIR."steps".DS);
     define('TEMP_DIR', WIZARD_DIR."templates".DS);
-    // Define paths to system
+    // Define paths to system webroot
 	define('SYSTEM_DIR', $sys);
     define('SYS_BIN_DIR', SYSTEM_DIR."bin".DS);
     define('SYS_LOG_DIR', SYSTEM_DIR."var".DS."log".DS);
+    // Define paths to system
+    array_pop($xdir);
+	$asys = '';
+	foreach ($xdir as $k=>$v) {
+		$asys .= $v.DS;
+	}
+    define('SYSTEM_ROOT', $asys);
     // Install Type
     preg_match('/Zend/', $sys, $matches);
     if($matches) {
@@ -96,13 +103,16 @@
     }
     // Other
     date_default_timezone_set('Africa/Johannesburg');
-    // Mysql bin
-    $serverPaths = explode(';',$_SERVER['PATH']);
-    foreach ($serverPaths as $apath) {
-    	preg_match('/mysql/i', $apath, $matches);
-    	if($matches) {
-    		define('MYSQL_BIN', $apath.DS);
-    		break;
-    	}
+    // Mysql bin [Windows]
+    if(WINDOWS_OS) {
+	    $serverPaths = explode(';',$_SERVER['PATH']);
+	    foreach ($serverPaths as $apath) {
+	    	preg_match('/mysql/i', $apath, $matches);
+	    	if($matches) {
+	    		define('MYSQL_BIN', $apath.DS);
+	    		break;
+	    	}
+	    }
     }
+    
 ?>
@@ -47,13 +47,11 @@ wizard.prototype.toggleElement = function(el) {
  
 // Handle steps within database page
  wizard.prototype.showStep = function(p, d) {
-	// Don't check if previous is clicked
-	if(d != 'p') {
-    	// Check for errors
+	if(d != 'p') { // Don't check if previous is clicked
     	var ueq = 0;
-    	if(p == 2) {
+    	if(p == 2) { // Check User 1
     		ueq = w.validateUsers('dmsname', 'dmspassword', 'dmspassword2');
-    	} else if(p == 3) {
+    	} else if(p == 3) { // Check User 1
     		ueq = w.validateUsers('dmsusername', 'dmsuserpassword', 'dmsuserpassword2');
     	}
     	if(ueq != 0) {
@@ -136,8 +134,20 @@ wizard.prototype.focusElement = function(el) {
 wizard.prototype.onSubmitValidate = function() {
 	var response = w.showStep(3, 'n');
 	if(response == true) {
+		alert(response);
 		document.getElementById('sendAll').name = 'Next'; // Force the next step
 		document.getElementById('sendAll').value = 'next';
 		document.getElementById('dbsettings').submit();
+	} else {
+		alert('asd');
+		return false;
+		/*
+		document.getElementById('sendAll').name = 'Previous'; // Force the previous step
+		document.getElementById('sendAll').value = 'previous';
+		document.getElementById('dbsettings').submit();
+		*/
 	}
+	
+
+
 }
 \ No newline at end of file
@@ -322,6 +322,7 @@ class stepAction {
         $step_tpl = new Template($template);
         $step_tpl->set("errors", $step_errors); // Set template errors
         $step_vars = $this->action->getStepVars(); // Get template variables
+        $step_tpl->set("step_vars", $step_vars); // Set template errors
         foreach ($step_vars as $key => $value) { // Set template variables
             $step_tpl->set($key, $value); // Load values to session
             if($this->action->storeInSession()) { // Check if class values need to be stored in session
@@ -117,8 +117,12 @@ class configuration extends Step
 	 * @return string The position in the step
 	 */
     public function doStep() {
+    	if(!$this->inStep("configuration")) {
+    		$this->doRun();
+    		return 'landing';
+    	}
         if($this->next()) {
-            if($this->doRun()){
+            if($this->doRun()) {
                 return 'confirm';
             }
             return 'error';
@@ -241,8 +241,8 @@ class database extends Step
     public function __construct() {
     	$this->_dbhandler = new dbUtil();
     	$this->_util = new InstallUtil();
-		$this->mysqlDir = MYSQL_BIN;
-		echo $this->mysqlDir;
+    	if(WINDOWS_OS)
+			$this->mysqlDir = MYSQL_BIN;
     }
  
 	/**
@@ -323,7 +323,7 @@ class database extends Step
     	else 
     		$con = $this->_dbhandler->load($this->dhost.":".$this->dport, $this->duname, $this->dpassword, $this->dname);
         if (!$con) {
-            $this->error[] = "Could not connect: " . $this->_dbhandler->getErrors();
+            $this->error[] = "Could not connect";
             return false;
         } else {
         	$this->error = array(); // Reset usage errors
@@ -541,7 +541,7 @@ class database extends Step
         $con = $this->connectMysql();
         if($con) {
             if(!$this->createDB($con)) {
-            	$this->error[] = "Could not Create Database: " . $this->_dbhandler->getErrors();
+            	$this->error[] = "Could not Create Database: ";
             	return false;
             }
             $this->closeMysql($con);
@@ -559,7 +559,7 @@ class database extends Step
     private function connectMysql() {
 		$con = $this->_dbhandler->load($this->dhost, $this->duname, $this->dpassword, $this->dname);
         if (!$con) {
-            $this->error[] = "Could not connect: " . $this->_dbhandler->getErrors();
+            $this->error[] = "Could not connect: ";
  
             return false;
         }
@@ -579,16 +579,16 @@ class database extends Step
 		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[] = "Could create database: " . $this->_dbhandler->getErrors();
+					$this->error[] = "Could create database: ";
 					return false;// cannot overwrite database
 		        }
 		    } else {
-		    	$this->error[] = "Could not drop database: " . $this->_dbhandler->getErrors();
+		    	$this->error[] = "Could not drop database: ";
 		    	return false;// cannot overwrite database
 		    }
 		} else {
 		    if(!$this->create($con)) { // attempt to create the db
-				$this->error[] = "Could not create database: " . $this->_dbhandler->getErrors();
+				$this->error[] = "Could not create database: ";
 				return false;// cannot overwrite database
 		    }
 		}
@@ -638,7 +638,7 @@ class database extends Step
 		if($this->_dbhandler->useBD($this->dname)) {
             return true;
         } else {
-            $this->error[] = "Error using database: ".$this->_dbhandler->getErrors();
+            $this->error[] = "Error using database: ";
             return false;
         }
     }
@@ -655,11 +655,11 @@ class database extends Step
         if($this->ddrop) {
             $sql = "DROP DATABASE {$this->dname};";
 			if(!$this->_dbhandler->query($sql)) {
-                $this->error[] = "Cannot drop database: ".$this->_dbhandler->getErrors();
+                $this->error[] = "Cannot drop database: ";
                 return false;
             }
         } else {
-            $this->error[] = "Cannot drop database: ".$this->_dbhandler->getErrors();
+            $this->error[] = "Cannot drop database: ";
             return false;
         }
         return true;
@@ -688,7 +688,7 @@ class database extends Step
 			if ($this->_dbhandler->execute($user1) && $this->_dbhandler->execute($user2)) {
             	return true;
         	} else {
-        		$this->error[] = "Could not create users in database: ".$this->_dbhandler->getErrors();
+        		$this->error[] = "Could not create users in database: ";
         		return false;
         	}
 		}
@@ -785,30 +785,4 @@ class database extends Step
  
     }
 }
-
-/*$db = new database();
-$db->doProcess();
-$dhost = 'localhost';
-$dbbinary = "C:\Program Files\Zend\MySQL51\bin\mysql.exe";
-$dbbinary = "mysql";
-$dbbinary = MYSQL_BIN."mysql.exe";
-$duname = "root";
-$dpassword = "root";
-$dname = "dms_install";
-$sql1 = "DROP DATABASE {$dname}";
-$sql2 = "CREATE DATABASE {$dname}";
-$con = $db->_dbhandler->load($dhost, $duname, $dpassword, $dname);
-$db->_dbhandler->query($sql1, $con);
-$db->_dbhandler->query($sql2, $con);
-//die;
-$command = "\"$dbbinary\" -u{$duname} -p{$dpassword} {$dname} < \"".SQL_DIR."structure.sql\"";
-//echo $command."<br>";
-$db->_util->pexec($command);
-$command = "\"$dbbinary\" -u{$duname} -p{$dpassword} {$dname} < \"".SQL_DIR."data.sql\"";
-$db->_util->pexec($command);
-echo $command."<br>";
-$db->setName("dms".rand());
-$db->installStep();
-var_dump($db);
-die;*/
 ?>
 \ No newline at end of file
@@ -71,7 +71,7 @@ class dependencies extends Step
      * @access public
      */
     public function __construct() {
-        $this->temp_variables = array("step_name"=>"dependencyCheck");
+        $this->temp_variables = array("step_name"=>"dependencies");
         $this->error = array();
         $this->done = true;
     }
@@ -85,6 +85,10 @@ class dependencies extends Step
 	 */
     public function doStep()
     {
+    	if(!$this->inStep("dependencies")) {
+    		$this->doRun();
+    		return 'landing';
+    	}
         // Check dependencies
         $passed = $this->doRun();
         if($this->next()) {
@@ -48,11 +48,12 @@ class install extends step
     }
  
     public function doStep() {
+    	if(!$this->inStep("install")) {
+    		return 'landing';
+    	}
         if($this->install()) {
-
             return 'install';
         } else if($this->previous()) {
-
             return 'previous';
         }
  
@@ -40,21 +40,31 @@
 * @version Version 0.1
 */
  
-class license extends step {
  
+class license extends step {
+	/**
+	* List of errors encountered by step
+	*
+	* @author KnowledgeTree Team
+	* @access protected
+	* @var array
+	*/
+    protected $error = array();
+    
     function __construct() {
         $this->temp_variables = array("step_name"=>"license");
     }
  
     public function doStep() {
+    	if(!$this->inStep("license")) {
+    		return 'landing';
+    	}
         if($this->next()) {
             if($this->doRun())
-            	
                 return 'next';
             else
                 return 'error';
         } else if($this->previous()) {
-
             return 'previous';
         }
  
@@ -65,14 +75,14 @@ class license extends step {
         if(isset($_POST['license'])) {
             // check if agree
             if($_POST['license']) {
-
                 return true;
             } else {
                 $this->error[] = "Please accept the license agreement";
-
                 return false;
             }
         }
+        $this->error[] = "Please accept the license agreement";
+        return false;
     }
  
     public function getStepVars()
+<?php
+/**
+* Complete Step Controller. 
+*
+* KnowledgeTree Community Edition
+* Document Management Made Simple
+* Copyright(C) 2008,2009 KnowledgeTree Inc.
+* Portions copyright The Jam Warehouse Software(Pty) Limited
+*
+* This program is free software; you can redistribute it and/or modify it under
+* the terms of the GNU General Public License version 3 as published by the
+* Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful, but WITHOUT
+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+* FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+* details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*
+* You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
+* California 94120-7775, or email info@knowledgetree.com.
+*
+* The interactive user interfaces in modified source and object code versions
+* of this program must display Appropriate Legal Notices, as required under
+* Section 5 of the GNU General Public License version 3.
+*
+* In accordance with Section 7(b) of the GNU General Public License version 3,
+* these Appropriate Legal Notices must retain the display of the "Powered by
+* KnowledgeTree" logo and retain the original copyright notice. If the display of the
+* logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+* must display the words "Powered by KnowledgeTree" and retain the original
+* copyright notice.
+*
+* @copyright 2008-2009, KnowledgeTree Inc.
+* @license GNU General Public License version 3
+* @author KnowledgeTree Team
+* @package Installer
+* @version Version 0.1
+*/
+
+class registration extends Step 
+{
+
+    function configure() {
+        $this->temp_variables = array("step_name"=>"registration");
+    }
+
+    function doStep() {
+		if(!$this->inStep("registration")) {
+			
+			return 'landing';
+		}
+		if($this->next()) {
+		    if($this->doRun())
+		        return 'next';
+		    else
+		        return 'error';
+		} else if($this->previous()) {
+		    return 'previous';
+		}
+		
+		return 'landing';
+    }
+    
+	public function doRun() {
+		return true; // TODO: Bypass for now
+        if(isset($_POST['email'])) {
+            if($_POST['email']) { // check email is valid
+                return true;
+            } else {
+                $this->error[] = "Please accept the license agreement";
+                return false;
+            }
+        }
+    }
+}
+?>
 \ No newline at end of file
@@ -65,14 +65,18 @@ class services extends Step
     protected $java;
  
     protected $util;
+    
+    public $temp_variables;
+    
 	/**
-	* Constructs database object
+	* Constructs services object
 	*
 	* @author KnowledgeTree Team
 	* @access public
 	* @param none
  	*/
     public function __construct() {
+    	$this->temp_variables = array("step_name"=>"services");
     	$this->util = new InstallUtil();
     	$this->setJava();
     }
@@ -130,18 +134,21 @@ class services extends Step
 	*/
     public function doStep()
     {
+    	if(!$this->inStep("services")) {
+    		$this->doRun();
+    		return 'landing';
+    	}
         // Check dependencies
         $passed = $this->doRun();
+//        die;
         if($this->next()) {
             if($passed)
                 return 'next';
             else
                 return 'error';
         } else if($this->previous()) {
-
             return 'previous';
         }
-
         return 'landing';
     }
  
@@ -160,6 +167,8 @@ class services extends Step
     	}
  
 		$this->installService();
+//		if(count($this->getErrors() > 0))
+//			return false;
 		return true;
     }
  
@@ -177,6 +186,9 @@ class services extends Step
 			$className = OS.$serviceName;
 			$service = new $className();
 			$status = $this->serviceHelper($service);
+			if ($status) {
+				$this->temp_variables['services'][] = $service->getName()." has been added as a Service";
+			}
 		}
  
 		return true;
@@ -192,11 +204,9 @@ class services extends Step
 	*/
 	private function serviceHelper($service) {
 		$service->load(); // Load Defaults
-		$response = $service->uninstall(); // Uninstall service if it exists
 		$response = $service->install(); // Install service
 		$statusCheck = OS."ServiceInstalled";
 		return $this->$statusCheck($service);
-		
 	}
  
    	/**
@@ -279,5 +289,17 @@ class services extends Step
     public function getErrors() {
         return $this->error;
     }
+    
+    /**
+     * Get the variables to be passed to the template
+     *
+	 * @author KnowledgeTree Team
+     * @access public
+     * @return array
+     */
+    public function getStepVars()
+    {
+        return $this->temp_variables;
+    }
 }
 ?>
 \ No newline at end of file
+<h1>Registration</h1>
+
+<div class="errors">
+    <?php if(isset($errors)) {
+        foreach($errors as $k=>$e) {
+                echo $e;
+        }
+    }?>
+</div>
+
+<form action="index.php?step_name=registration" method="post">
+
+<div class="buttons">
+    <input type="submit" name="Previous" value="Previous"/>
+    <input type="submit" name="Next" value="Next"/>
+</div>
+</form>
 \ No newline at end of file
@@ -13,7 +13,13 @@ if($errors){
     echo '</div>';
 }
 ?>
-
+<?php
+if($step_vars){
+    foreach ($step_vars['services'] as $msg){
+        echo $msg . "<br />\n";
+    }
+}
+?>
  
 <form action="index.php?step_name=services" method="post">
  
@@ -2,8 +2,8 @@
 <html>
 	<head>
 		<title>KnowledgeTree Installer</title>
+		<script type="text/javascript" src="resources/wizard.js" ></script>
 		<link rel="stylesheet" type="text/css" href="resources/wizard.css" />
-		<script type="text/javascript" src="resources/wizard.js"></script>
 	</head>
 	<body onload="w.doFormCheck();">
 		<div id="outer-wrapper">