Story Id:1166880 Server Testing Updates

Committed by: Jarrett Jordaan Reviewed by: Paul Barrett

Story Id:1166880 Server Testing Updates
Committed by: Jarrett Jordaan Reviewed by: Paul Barrett
Jarrett Jordaan
1 parent 762864d3
Showing 9 changed files with 19 additions and 1112 deletions
setup/migrate/migrateUtil.php
setup/migrate/steps/complete.php
setup/migrate/steps/database.php
setup/migrate/steps/errors.php
setup/migrate/steps/installation.php
setup/migrate/steps/migrateServices.php
setup/migrate/steps/services.php
setup/migrate/steps/welcome.php
setup/migrate/templates/services.tpl
@@ -98,7 +98,7 @@ class MigrateUtil {
     }
-    function getInstallerServices() {
+    function getInstallServices() {
     	require_once("../wizard/installUtil.php");
     	require_once("../wizard/steps/services.php");
-<?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 Migrater
-* @version Version 0.1
-*/
-
-class complete extends Step {
-
-    /**
-	* Reference to Database object
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var object
-	*/	
-    private $_dbhandler = null;
-
-    /**
-     * List of services to check
-     * 
-     * @access private
-     * @var array
-     */
-    private $services_check = 'tick';
-    private $paths_check = 'tick';
-    private $privileges_check = 'tick';
-    private $database_check = 'tick';
-    protected $silent = true;
-    
-    protected $util = null;
-    
-    public function __construct() {
-    	$this->temp_variables = array("step_name"=>"complete", "silent"=>$this->silent);
-        $this->_dbhandler = new dbUtil();
-    	$this->util = new MigrateUtil();
-    }
-
-    function doStep() {
-        $this->doRun();
-    	return 'landing';
-    }
-    
-    function doRun() {
-        $this->checkServices();
-        $this->storeSilent();// Set silent mode variables
-    }
-    
-    private function checkServices()
-    {
-        $services = new services();
-        foreach ($services->getServices() as $serviceName) {
-			$this->temp_variables[$serviceName."Status"] = 'tick';
-        }     
-		return true;
-    }
-    
-    /**
-     * Set all silent mode varibles
-     *
-     */
-    private function storeSilent() {
-    	$this->temp_variables['services_check'] = $this->services_check;
-    }
-}
-?>
 \ No newline at end of file
-<?php
-/**
-* Database 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 Migrater
-* @version Version 0.1
-*/
-
-class database extends Step 
-{
-	/**
-	* Reference to Database object
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @var object
-	*/	
-    public $_dbhandler = null;
-    	
-	/**
-	* Reference to Database object
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @var object
-	*/	
-    public $_util = null;
-    
-	/**
-	* Database type
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var array
-	*/	
-    private $dtype = '';
-    
-	/**
-	* Database types
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var array
-	*/	
-    private $dtypes = array();
-    
-	/**
-	* Database host
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var string
-	*/
-    private $dhost = '';
-    
-	/**
-	* Database port
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var string
-	*/
-    private $dport = '';
-    
-	/**
-	* Database name
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var string
-	*/
-    private $dname = '';
-    
-	/**
-	* Database root username
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var string
-	*/
-    private $duname = '';
-    
-	/**
-	* Database root password
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var string
-	*/
-    private $dpassword = '';
-    
-	/**
-	* Database dms username
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var string
-	*/
-    private $dmsname = '';
-    
-	/**
-	* Database dms password
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var string
-	*/
-    private $dmspassword = '';
-
-	/**
-	* Default dms user username
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var boolean
-	*/
-    private $dmsusername = '';
-    
-	/**
-	* Default dms user password
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var boolean
-	*/
-	private $dmsuserpassword = '';
-	
-	/**
-	* Location of database binaries.
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var string
-	*/
-    private $mysqlDir; // TODO:multiple databases
-    
-	/**
-	* Name of database binary.
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var string
-	*/
-    private $dbbinary = ''; // TODO:multiple databases
-    
-	/**
-	* Database table prefix
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var string
-	*/
-    private $tprefix = '';
-    
-	/**
-	* Flag to drop database
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var boolean
-	*/
-    private $ddrop = false;
-    
-	/**
-	* List of errors encountered
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @var array
-	*/
-    public $error = array();
-    
-	/**
-	* List of errors used in template
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @var array
-	*/
-    public $templateErrors = array('dmspassword', 'dmsuserpassword', 'con', 'dname', 'dtype', 'duname', 'dpassword');
-    
-	/**
-	* Flag to store class information in session
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @var array
-	*/
-    public $storeInSession = true;
-    
-	/**
-	* Flag if step needs to be migrated
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @var array
-	*/
-    protected $runMigrate = true;
-    
-	/**
-	* Flag if step needs to run silently
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @var array
-	*/
-    protected $silent = true;
-    
-	/**
-	* Constructs database object
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @param none
- 	*/
-    public function __construct() {
-    	$this->temp_variables = array("step_name"=>"database", "silent"=>$this->silent);
-    	$this->_dbhandler = new dbUtil();
-    	$this->_util = new MigrateUtil();
-    	if(WINDOWS_OS)
-			$this->mysqlDir = MYSQL_BIN;
-    }
-
-	/**
-	* Main control of database setup
-	*
-	* @author KnowledgeTree Team
-	* @param none
-	* @access public
-	* @return string
-	*/
-    public function doStep() {
-    	$this->initErrors();
-    	$this->setDetails(); // Set any posted variables
-    	if(!$this->inStep("database")) {
-    		return 'landing';
-    	}
-		if($this->next()) {
-			return 'next';
-		} else if($this->previous()) {
-			return 'previous';
-		}
-        
-        return 'landing';
-    }
-
-	/**
-	* Store options
-	*
-	* @author KnowledgeTree Team
-	* @params object SimpleXmlObject
-	* @access private
-	* @return void
-	*/
-   private function setDetails() {
-        $this->temp_variables['dhost'] = $this->getPostSafe('dhost');
-        $this->temp_variables['dport'] = $this->getPostSafe('dport');
-        $this->temp_variables['duname'] = $this->getPostSafe('duname');
-        $this->temp_variables['dpassword'] = $this->getPostSafe('dpassword');
-		$this->temp_variables['dbbinary'] = $this->getPostSafe('dbbinary');
-    }
-    
-	/**
-	* Safer way to return post data
-	*
-	* @author KnowledgeTree Team
-	* @params SimpleXmlObject $simplexml
-	* @access public
-	* @return void
-	*/
-    public function getPostSafe($key) {
-    	return isset($_POST[$key]) ? $_POST[$key] : "";
-    }
-    
-	/**
-	* Stores varibles used by template
-	*
-	* @author KnowledgeTree Team
-	* @params none
-	* @access public
-	* @return array
-	*/
-    public function getStepVars() {
-        return $this->temp_variables;
-    }
-
-	/**
-	* Returns database errors
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @params none
-	* @return array
-	*/
-    public function getErrors() {
-
-        return $this->error;
-    }
-
-	/**
-	* Initialize errors to false
-	*
-	* @author KnowledgeTree Team
-	* @param none
-	* @access private
-	* @return boolean
-	*/
-    private function initErrors() {
-    	foreach ($this->templateErrors as $e) {
-    		$this->error[$e] = false;
-    	}
-    }
-}
-?>
 \ No newline at end of file
-<?php
-/**
-* Error 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 Migrater
-* @version Version 0.1
-*/
-class Errors extends Step {
-	public $error = array();
-	
-    function doStep() {
-    	return 'landing';
-    }
-    
-    function getErrors() {
-    	return $this->error;
-    }
-	
-    function getName() {
-    	return 'error';
-    }
-}
-?>
 \ No newline at end of file
-<?php
-/**
-* Migrate 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 Migrater
-* @version Version 0.1
-*/
-
-class installation extends step 
-{
-	/**
-	* Flag to display confirmation page first
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @var array
-	*/
-	public $displayFirst = false;
-	
-	/**
-	* Flag to store class information in session
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @var array
-	*/
-    protected $storeInSession = true;
-
-	/**
-	* List of paths
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @var array
-	*/
-    protected $paths = array();
-
-	/**
-	* Flag if step needs to run silently
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @var array
-	*/
-    protected $silent = false;
-    
-	private $location = '';
-	private $dbSettings = array();
-	private $ktSettings = array();
-	private $urlPaths = array();
-	
-    function __construct() {
-        $this->temp_variables = array("step_name"=>"installation", "silent"=>$this->silent);
-    }
-
-    public function doStep() {
-    	$this->detectInstallation();
-    	if(!$this->inStep("installation")) {
-    		$this->setDetails();
-    		$this->doRun();
-    		return 'landing';
-    	}
-        if($this->next()) {
-        	if($this->doRun()) {
-        		$this->setDetails();
-            	return 'confirm';
-        	} else {
-            	return 'error';
-        	}
-        } else if($this->previous()) {
-            return 'previous';
-        } else if($this->confirm()) {
-            	return 'next';
-        }
-		$this->doRun();
-        
-        return 'landing'; 
-    }
-
-    public function detectInstallation() {
-    	if(WINDOWS_OS) {
-    		$path1 = "'C:\\Program Files\ktdms'";
-    		$path2 = "'C:\\Program Files x86\ktdms'";
-    		if(file_exists($path1))
-    			$this->location = "C:\\Program Files\ktdms";
-    		elseif (file_exists($path2))
-    			$this->location = "C:\\Program Files x86\ktdms";
-    	} else {
-    		$path1 = "/opt/ktdms";
-    		$path2 = "/var/www/ktdms";
-    		if(file_exists($path1))
-    			$this->location = $path1;
-			elseif(file_exists($path2))
-				$this->location = $path2;
-    	}
-    }
-    
-    public function doRun() {
-		$ktInstallPath = isset($_POST['location']) ? $_POST['location']: '';
-		if($ktInstallPath != '') {
-			$this->location = $ktInstallPath;
-			//echo $ktInstallPath;die;
-			if(file_exists($ktInstallPath)) {
-				$configPath = $ktInstallPath.DS."knowledgeTree".DS."config".DS."config-path";
-				if(file_exists($configPath)) {
-					$configFilePath = file_get_contents($configPath);
-					if(file_exists($configFilePath)) {
-						$this->readConfig($configFilePath);
-						$this->storeSilent();
-						
-						return true;
-					} else {
-						$this->error[] = "KT installation configuration file empty";
-					}
-				} else {
-					$this->error[] = "KT installation configuration file not found";
-				}
-			} else {
-				$this->error[] = "KT installation not found";
-			}
-		}
-		$this->storeSilent();
-		
-		return false;
-    }
-    
-    private function readConfig($path) {
-    	$ini = new Ini($path);
-    	$dbSettings = $ini->getSection('db');
-    	$this->dbSettings = array('dbHost'=> $dbSettings['dbHost'],
-    								'dbName'=> $dbSettings['dbName'],
-    								'dbUser'=> $dbSettings['dbUser'],
-    								'dbPass'=> $dbSettings['dbPass'],
-    								'dbPort'=> $dbSettings['dbPort'],
-    								'dbAdminUser'=> $dbSettings['dbAdminUser'],
-    								'dbAdminPass'=> $dbSettings['dbAdminPass'],
-    	);
-		$ktSettings = $ini->getSection('KnowledgeTree');
-		$froot = $ktSettings['fileSystemRoot'];
-		if ($froot == 'default') {
-			$froot = $this->location;
-		}
-		$this->ktSettings = array('fileSystemRoot'=> $froot,
-    	);
-    	$urlPaths = $ini->getSection('urls');
-		$this->urlPaths = array(array('name'=> 'Var Directory', 'path'=> $froot.DS.'var'),
-									array('name'=> 'Log Directory', 'path'=> $froot.DS.'log'),
-									array('name'=> 'Document Root', 'path'=> $froot.DS.'Documents'),
-									array('name'=> 'UI Directory', 'path'=> $froot.DS.'presentation'.DS.'lookAndFeel'.DS.'knowledgeTree'),
-									array('name'=> 'Temporary Directory', 'path'=> $froot.DS.'tmp'),
-									array('name'=> 'Cache Directory', 'path'=> $froot.DS.'cache'),
-    	);
-    	$this->temp_variables['urlPaths'] = $this->urlPaths;
-    	$this->temp_variables['ktSettings'] = $this->ktSettings;
-    	$this->temp_variables['dbSettings'] = $this->dbSettings;
-    }
-    
-    private function setDetails() {
-    	$inst = $this->getDataFromSession("installation");
-    	if ($inst) {
-    		$this->location = $inst['location'];
-    	}
-    }
-    
-    public function getStepVars() {
-        return $this->temp_variables;
-    }
-
-    public function getErrors() {
-        return $this->error;
-    }
-    
-    public function storeSilent() {
-    	$this->temp_variables['location'] = $this->location;
-    	
-    }
-    
-}
-?>
 \ No newline at end of file
@@ -134,6 +134,7 @@ class migrateServices extends Step
     public function __construct() {
     	$this->temp_variables = array("step_name"=>"migrateServices", "silent"=>$this->silent);
     	$this->util = new MigrateUtil();
+    	$this->installServices = $this->util->getInstallServices();
     }
 	/**
@@ -146,7 +147,6 @@ class migrateServices extends Step
 	*/
     public function doStep()
     {
-    	$this->installServices = $this->util->getInstallerServices();
     	$this->services = $this->installServices->migrateGetServices();
     	$this->doRun();
     	$this->storeSilent();
@@ -158,7 +158,6 @@ class migrateServices extends Step
         } else if($this->previous()) {
             return 'previous';
         }
-        
         return 'landing';
     }
@@ -201,16 +200,18 @@ class migrateServices extends Step
      *
      */
     private function stopServices() {
-    	// Try the dmsctl
-    	$cmd = "./dmsctl.sh stop";
-    	$this->util->pexec($cmd);
-    	// probably will not work.
-    	foreach ($this->services as $service) {
-    		$sStatus = $service->status();
-    		if($sStatus != '') {
-    			$res = $service->uninstall();
-    			print_r($res);
-    		}
+    	$conf = $this->getDataFromSession("installation"); // Get installation directory
+    	if($conf['location'] != '') {
+	    	$cmd = $conf['location']."/dmsctl.sh stop"; // Try the dmsctl
+	    	// echo $cmd;
+	    	$this->util->pexec($cmd);
+    	} else { // probably will not work, but worth a try.
+	    	foreach ($this->services as $service) {
+	    		$sStatus = $service->status();
+	    		if($sStatus != '') {
+	    			$res = $service->uninstall();
+	    		}
+	    	}
     	}
     }
@@ -219,6 +220,7 @@ class migrateServices extends Step
     		$sStatus = $service->status();
     		if($sStatus == 'STARTED') {
     			$state = 'cross';
+    			$this->error[] = "Service : {$service->getName()} could not be stopped.<br/>";
     		} else {
     			$state = 'tick';
     		}
-<?php
-/**
-* Services 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 Migrater
-* @version Version 0.1
-*/
-
-class services extends Step 
-{
-	/**
-	* List of errors encountered
-	*
-	* @author KnowledgeTree Team
-	* @access protected
-	* @var array
-	*/
-    protected $error = array();
-    
-	/**
-	* Flag if step needs to be migrated
-	*
-	* @author KnowledgeTree Team
-	* @access protected
-	* @var array
-	*/
-    protected $runMigrate = true;
-    
-	/**
-	* List of services to be migrated
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var array
-	*/
-    private $services = array('Lucene', 'Scheduler', 'OpenOffice');
-    
-	/**
-	* Reference to utility object
-	*
-	* @author KnowledgeTree Team
-	* @access protected
-	* @var string
-	*/
-    protected $util;
-
-    
-	/**
-	* Flag if services are already Stopped
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var mixed
-	*/
-    private $alreadyStopped = false;
-    
-	/**
-	* Flag if services are already Stopped
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var mixed
-	*/
-    private $luceneStopped = false;
-    
-	/**
-	* Flag if services are already Stopped
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var mixed
-	*/
-    private $schedulerStopped = false;
-    
-	/**
-	* Flag if services are already Stopped
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var mixed
-	*/
-    private $openOfficeStopped = false;
-	/**
-	* Service Migrateed 
-	*
-	* @author KnowledgeTree Team
-	* @access private
-	* @var array
-	*/
-    private $serviceCheck = 'tick';
-    
-	/**
-	* Flag to store class information in session
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @var boolean
-	*/
-    protected $storeInSession = true;
-    
-	/**
-	* List of variables to be loaded to template
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @var array
-	*/
-    protected $temp_variables;
-    
-	/**
-	* Flag if step needs to run silently
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @var array
-	*/
-    protected $silent = true;
-    
-	/**
-	* Constructs services object
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @param none
- 	*/
-    public function __construct() {
-    	$this->temp_variables = array("step_name"=>"services", "silent"=>$this->silent);
-    	$this->util = new MigrateUtil();
-    }
-    
-	/**
-	* Main control of services setup
-	*
-	* @author KnowledgeTree Team
-	* @param none
-	* @access public
-	* @return string
-	*/
-    public function doStep()
-    {
-    	$this->doRun();
-    	$this->storeSilent();
-    	if(!$this->inStep("services")) {
-    		return 'landing';
-    	}
-        if($this->next()) {
-			return 'next';
-        } else if($this->previous()) {
-            return 'previous';
-        }
-        
-        return 'landing';
-    }
-    
-	/**
-	* Get service names
-	*
-	* @author KnowledgeTree Team
-	* @param none
-	* @access public
-	* @return array
-	*/
-    public function getServices() {
-    	return $this->services;
-    }
-    
-    /**
-	* Run step
-	*
-	* @author KnowledgeTree Team
-	* @param none
-	* @access private
-	* @return boolean
-	*/
-    private function doRun() {
-    	$serverDetails = $this->getServices();
-		foreach ($serverDetails as $serviceName) {
-			
-		}
-		
-    	$this->checkServiceStatus();
-		return true;
-    }
-    
-	/**
-	* A final check to see if services are still running,
-	* incase they switched on and turned off.
-	* 
-	* @author KnowledgeTree Team
-	* @param none
-	* @access private
-	* @return void
-	*/
-    private function checkServiceStatus() {
-    	$serverDetails = $this->getServices();
-		foreach ($serverDetails as $serviceName) {
-			$className = OS.$serviceName;
-			$service = new $className();
-			$service->load();
-			$status = $this->serviceInstalled($service);
-			echo "$status<br/>";
-			$this->temp_variables['services'][] = array('class'=>'tick', 'msg'=>$serviceName." has been shut down");
-		}
-    }
-    
-	/**
-	* Checks if all services have been started already, 
-	* incase the user lands on service page multiple times
-	* 
-	* @author KnowledgeTree Team
-	* @param none
-	* @access public
-	* @return boolean
-	*/
-    public function alreadyStopped() {
-    	$migrated = true;
-    	$serverDetails = $this->getServices();
-		foreach ($serverDetails as $serviceName) {
-			$className = OS.$serviceName;
-			$service = new $className();
-			$status = $this->serviceStatus($service);
-			if(!$status) {
-				return false;
-			}
-		}
-		return true;
-    }
-	
-	/**
-	* Returns services errors
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @params none
-	* @return array
-	*/
-    public function getErrors() {
-        return $this->error;
-    }
-    
-	/**
-	* Returns services warnings
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @params none
-	* @return array
-	*/
-    public function getWarnings() {
-        return $this->warnings;
-    }
-    
-	/**
-	* Get the variables to be passed to the template
-	*
-	* @author KnowledgeTree Team
-	* @access public
-	* @return array
-	*/
-    public function getStepVars()
-    {
-        return $this->temp_variables;
-    }
-       
-   	/**
-    * Set all silent mode varibles
-    *
-	* @author KnowledgeTree Team
-	* @param none
-	* @access private
-	* @return void
-    */
-    private function storeSilent() {
-    	$this->temp_variables['alreadyStopped'] = $this->alreadyStopped;
-    	$this->temp_variables['luceneStopped'] = $this->luceneStopped;
-    	$this->temp_variables['schedulerStopped'] = $this->schedulerStopped;
-    	$this->temp_variables['openOfficeStopped'] = $this->openOfficeStopped;
-    	$this->temp_variables['serviceCheck'] = $this->serviceCheck;
-    }
-}
-?>
 \ No newline at end of file
-<?php
-/**
-* Welcome 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 Migrater
-* @version Version 0.1
-*/
-
-class welcome extends step {
-
-	protected $silent = true;
-	
-    function __construct() {
-        $this->temp_variables = array("step_name"=>"license");
-    }
-
-    function doStep() {
-        if($this->next()) {
-            return 'next'; // Just a welcome, so return "next" action
-        } elseif ($this->installer()) {
-        	return 'install'; // Just a welcome, so return "next" action
-        }
-		
-        return 'landing';
-    }
-
-}
-
-?>
 \ No newline at end of file
@@ -44,8 +44,10 @@
 			$details = 'Hide Details';
 			$display = 'block';
 		} else {
-			$details = 'Show Details';
-			$display = 'none';
+			$details = 'Hide Details';
+			$display = 'block';
+//			$details = 'Show Details';
+//			$display = 'none';
 		}
 		?>
 			<div id="option6" class="onclick" onclick="javascript:{w.toggleClass('service_details', 'option6');}"><?php echo $details; ?></div>