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

Megan Watson
2 parents b6cd6507 c7b70a08
Showing 19 changed files with 379 additions and 49 deletions
.gitignore
setup/upgrade/config/databases.xml
setup/upgrade/session.php
setup/upgrade/steps/upgradeBackup.php
setup/upgrade/steps/upgradeComplete.php
setup/upgrade/steps/upgradeDatabase.php
setup/upgrade/steps/upgradeRestore.php
setup/upgrade/steps/upgradeWelcome.php
setup/upgrade/templates/welcome.tpl
setup/upgrade/upgradeUtil.php
setup/upgrade/upgradeWizard.php
setup/wizard/installUtil.php
setup/wizard/lib/services/windowsLucene.php
setup/wizard/lib/services/windowsOpenOffice.php
setup/wizard/lib/services/windowsScheduler.php
setup/wizard/lib/validation/luceneValidation.php
setup/wizard/lib/validation/openofficeValidation.php
setup/wizard/steps/configuration.php
setup/wizard/steps/database.php
@@ -14,3 +14,4 @@ clienttools/Office
 *.out
 baobab/
 ktoffice*/
+setup/wizard/install.lock
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    Document   : database.xml
+    Created on : 01 July 2009, 1:13 PM
+    Author     : KnowledgeTree Team
+    Description: Installer Default MySql Database Configuration
+-->
+
+<database>
+    <dtypes>
+        <dtype>mysql</dtype>
+    </dtypes>
+    <dhost>localhost</dhost>
+    <dport>3306</dport>
+    <dname>dms</dname>
+    <duname>root</duname>
+    <dmsadminuser>dmsadmin</dmsadminuser>
+    <dmsaupass>js9281djw</dmsaupass>
+    <dmsuser>dms</dmsuser>
+    <dmsupass>djw9281js</dmsupass>
+</database>
+<?php
+/**
+* Session 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 Upgrader
+* @version Version 0.1
+*/
+class session
+{
+	private $salt = 'upgrade';
+	/**
+	* Constructs session object
+	*
+	* @author KnowledgeTree Team
+	* @access public
+	* @param none
+ 	*/
+	public function __construct() {
+		$this->startSession();
+	}
+	
+	/**
+	* Starts a session if one does not exist
+	*
+	* @author KnowledgeTree Team
+	* @param none
+	* @access public
+	* @return void
+	*/
+	public function startSession() {
+		if(!isset($_SESSION[$this->salt]['ready'])) {
+//			session_start();
+			$_SESSION[$this->salt] ['ready'] = TRUE;
+		}
+	}
+
+	/**
+	* Sets a value key pair in session
+	*
+	* @author KnowledgeTree Team
+	* @param string $fld
+	* @param string $val
+	* @access public
+	* @return void
+	*/
+	public function set($fld, $val) {
+		$this->startSession();
+		$_SESSION[$this->salt] [$fld] = $val;
+	}
+	
+	/**
+	* Sets a value key pair in a class in session
+	*
+	* @author KnowledgeTree Team
+	* @param string $class
+	* @param string $fld
+	* @param string $val
+	* @access public
+	* @return void
+	*/
+	public function setClass($class , $k, $v) {
+		$this->startSession();
+		$classArray = $this->get($class);
+		if(isset($classArray[$k])) {
+			$classArray[$k] = $v;
+		} else {
+			$classArray[$k] = $v;
+		}
+		$_SESSION[$this->salt] [ $class] = $classArray;
+	}
+	
+	/**
+	* Sets a error value key pair in a class in session
+	*
+	* @author KnowledgeTree Team
+	* @param string $class
+	* @param string $fld
+	* @param string $val
+	* @access public
+	* @return void
+	*/
+	public function setClassError($class, $k, $v) {
+		$this->startSession();
+		$classArray = $this->get($class);
+		if(isset($classArray[$k])) {
+			$classArray[$k] = $v;
+		} else {
+			$classArray[$k] = $v;
+		}
+		$_SESSION[$this->salt] [ $class] = $classArray;
+	}
+	
+	/**
+	* Clear error values in a class session
+	*
+	* @author KnowledgeTree Team
+	* @param string $class
+	* @param string $fld
+	* @param string $val
+	* @access public
+	* @return void
+	*/
+	public function clearErrors($class) {
+		$classArray = $this->get($class);
+		unset($classArray['errors']);
+		$_SESSION[$this->salt] [ $class] = $classArray;
+	}
+	
+	/**
+	* Unset a value in session
+	*
+	* @author KnowledgeTree Team
+	* @param string $fld
+	* @access public
+	* @return void
+	*/
+	public function un_set($fld) {
+		$this->startSession();
+		unset($_SESSION[$this->salt] [$fld]);
+	}
+	
+	/**
+	* Unset a class value in session
+	*
+	* @author KnowledgeTree Team
+	* @param string $class
+	* @access public
+	* @return void
+	*/
+	public function un_setClass($class) {
+		$this->startSession();
+		if(isset($_SESSION[$this->salt] [$class]))
+			unset($_SESSION[$this->salt] [$class]);
+	}
+	
+	/**
+	* Destroy the session
+	*
+	* @author KnowledgeTree Team
+	* @param none
+	* @access public
+	* @return void
+	*/
+	public function destroy() {
+		$this->startSession();
+		unset($_SESSION[$this->salt]);
+		session_destroy();
+	}
+	
+	/**
+	* Get a session value
+	*
+	* @author KnowledgeTree Team
+	* @param string $fld
+	* @access public
+	* @return string
+	*/
+	public function get($fld) {
+		$this->startSession();
+		if(isset($_SESSION[$this->salt] [$fld]))
+			return $_SESSION[$this->salt] [$fld];
+		return false;
+	}
+	
+	/**
+	* Check if a field exists in session
+	*
+	* @author KnowledgeTree Team
+	* @param string $fld
+	* @access public
+	* @return string
+	*/
+	public function is_set($fld) {
+		$this->startSession();
+		return isset($_SESSION[$this->salt] [$fld]);
+	}
+	
+	/**
+	* Return a class from session
+	*
+	* @author KnowledgeTree Team
+	* @param string $fld
+	* @access public
+	* @return string
+	*/
+	public function getClass($class) {
+		return $_SESSION[$this->salt][$class];
+	}
+}
+?>
 \ No newline at end of file
@@ -40,7 +40,7 @@
 * @version Version 0.1
 */
-require_once('../../config/dmsDefaults.php');
+//require_once('../../config/dmsDefaults.php');
 class upgradeBackup extends Step {
     protected $silent = false;
@@ -40,7 +40,7 @@
 * @version Version 0.1
 */
-require_once('../../config/dmsDefaults.php');
+//require_once('../../config/dmsDefaults.php');
 class upgradeComplete extends Step {
@@ -40,10 +40,10 @@
 * @version Version 0.1
 */
-require_once('../../config/dmsDefaults.php');
-require_once(KT_LIB_DIR . '/config/config.inc.php');
-require_once(KT_LIB_DIR . '/plugins/pluginutil.inc.php');
-require_once(KT_LIB_DIR . '/upgrades/upgrade.inc.php');
+//require_once('../../config/dmsDefaults.php');
+//require_once(KT_LIB_DIR . '/config/config.inc.php');
+//require_once(KT_LIB_DIR . '/plugins/pluginutil.inc.php');
+//require_once(KT_LIB_DIR . '/upgrades/upgrade.inc.php');
 class upgradeDatabase extends Step 
 {
@@ -40,7 +40,7 @@
 * @version Version 0.1
 */
-require_once('../../config/dmsDefaults.php');
+//require_once('../../config/dmsDefaults.php');
 class upgradeRestore extends Step {
@@ -40,14 +40,12 @@
 * @version Version 0.1
 */
-require_once('../../config/dmsDefaults.php');
-require_once KT_LIB_DIR . '/authentication/authenticationutil.inc.php';
-
 class upgradeWelcome extends step {
     protected $silent = false;
     protected $temp_variables = array();
-
+	protected $error = array() ;
+    
     public function doStep() {
     	$this->temp_variables = array("step_name"=>"welcome");
         if($this->next()) {
@@ -81,9 +79,18 @@ class upgradeWelcome extends step {
     }
     private function checkPassword($username, $password) {
-/*
-    	$dconf = $this->getDataFromPackage('installers', 'database');
-    	$this->dbhandler->load($dconf['dhost'], $dconf['duname'], $dconf['dpassword'], $dconf['dname']);
+    	$dconf = $this->getDataFromPackage('installers', 'database'); // Use info from install
+    	if($dconf) {
+	    	$this->dbhandler->load($dconf['dhost'], $dconf['duname'], $dconf['dpassword'], $dconf['dname']);
+    	} else {
+    		require_once("../wizard/iniUtilities.php"); // ini to read the ini content
+    		require_once("../wizard/steps/configuration.php"); // configuration to read the ini path
+    		$wizConfigHandler = new configuration();
+    		$configPath = $wizConfigHandler->readConfigPathIni();
+			$ini = new iniUtilities($configPath);
+			$dconf = $ini->getSection('db');
+    		$this->dbhandler->load($dconf['dbHost'], $dconf['dbUser'], $dconf['dbPass'], $dconf['dbName']);
+    	}
         $sQuery = "SELECT count(*) AS match_count FROM users WHERE username = '$username' AND password = '".md5($password)."'";
         $res = $this->dbhandler->query($sQuery);
         $ass = $this->dbhandler->fetchAssoc($res);
@@ -91,28 +98,15 @@ class upgradeWelcome extends step {
         	if($ass[0]['match_count'])
         		return true;
         }
+        $this->error[] = 'Could Not Authenticate User';
         return false;
-        */
-    	
-        global $default;
-    
-        $sTable = KTUtil::getTableName('users');
-        $sQuery = "SELECT count(*) AS match_count FROM $sTable WHERE username = ? AND password = ?";
-        $aParams = array($username, md5($password));
-        $res = DBUtil::getOneResultKey(array($sQuery, $aParams), 'match_count');
-        if (PEAR::isError($res)) { return false; }
-        else {
-            $sTable = KTUtil::getTableName('users_groups_link');
-            $sQuery = "SELECT count(*) AS match_count FROM $sTable WHERE user_id = ? AND group_id = 1";
-            $aParams = array($res);
-            $res = DBUtil::getOneResultKey(array($sQuery, $aParams), 'match_count');
-            if (PEAR::isError($res)) { return false; }
-            else {
-                return ($res == 1);
-            }
-        }
     }
+    public function getErrors() {
+    	return $this->error;
+    }
+    
+    
 }
 ?>
 \ No newline at end of file
@@ -9,9 +9,14 @@
         <p class="empty_space"> Only administrator users may access the upgrade wizard. </p>
 		<div class="demo">
             <table>
-                <tr><td>Username<td><input name=username>
-                <tr><td>Password<td><input name=password type="password">
+                <tr><td>Username</td><td><input name=username></td></tr>
+                <tr><td>Password</td><td><input name=password type="password"></td></tr>
+                <?php if (!empty($errors)) { ?><tr><td></td><td><span class="error">Could Not Authenticate User</span></td></tr> <?php } ?>
+                <?php
+//                	print_r($errors);
+                ?>
             </table>
+            
         </div>
 	</div>
 	<?php
@@ -40,7 +40,7 @@
 * @version Version 0.1
 */
-require_once('../../config/dmsDefaults.php');
+//require_once('../../config/dmsDefaults.php');
 require_once("../wizard/installUtil.php");
 class UpgradeUtil extends InstallUtil {	
@@ -117,7 +117,7 @@ class UpgradeWizard {
 			$ins = new Upgrader(); // Instantiate the upgrader
 			$ins->resolveErrors($response); // Run step
 		} else {
-			$ins = new Upgrader(new UpgradeSession()); // Instantiate the upgrader and pass the session class
+			$ins = new Upgrader(new session()); // Instantiate the upgrader and pass the session class
 			$ins->step(); // Run step
 		}
 	}
@@ -748,17 +748,17 @@ class InstallUtil {
      */
     public function useZendPhp() {
 	    if($this->installEnvironment() == 'Zend') {
-	    	if(WINDOWS_OS) {
+	    	if(WINDOWS_OS) { // For Zend Installation only
 				$sysdir = explode(DS, SYSTEM_DIR);
 				array_pop($sysdir);
 				array_pop($sysdir);
-				array_pop($sysdir);
-				array_pop($sysdir);
 				$zendsys = '';
 				foreach ($sysdir as $k=>$v) {
 					$zendsys .= $v.DS;
 				}
-				return $zendsys."ZendServer".DS."bin".DS;
+				$bin = $zendsys."ZendServer".DS."bin".DS;
+				if(file_exists($bin))
+					return $bin;
 	    	} else {
 	    		return DS."usr".DS."local".DS."zend".DS."bin".DS;
 	    	}
@@ -377,10 +377,32 @@ class windowsLucene extends windowsService {
 		} elseif (file_exists($this->getJavaBin().DS."bin".DS."server".DS."jvm.dll")) {
 			$this->javaJVM = $this->getJavaBin().DS."bin".DS."server".DS."jvm.dll";
 		} else {
-			return false;
+			$javaJVM = $this->useZendJVM();
+			if(file_exists($javaJVM)) {
+				$this->javaJVM = $javaJVM;
+			}
 		}
 	}
+    public function useZendJVM() {
+	    if($this->util->installEnvironment() == 'Zend') {
+	    	if(WINDOWS_OS) { // For Zend Installation only
+				$sysdir = explode(DS, SYSTEM_DIR);
+				array_pop($sysdir);
+				array_pop($sysdir);
+				$zendsys = '';
+				foreach ($sysdir as $k=>$v) {
+					$zendsys .= $v.DS;
+				}
+				$jvm = $zendsys."jre".DS."bin".DS."client".DS."jvm.dll";
+				if(file_exists($jvm))
+					return $jvm;
+	    	}
+	    }
+	    
+	    return false;
+    }
+	
 	/**
 	* Get Java JVM path
 	*
@@ -203,7 +203,7 @@ class windowsOpenOffice extends windowsService {
     		//$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;\"";;
+            	$cmd = "\"{$this->winservice}\" install $this->name "."-displayname {$this->name} -start auto \"".$binary."\" -headless -invisible -nofirststartwizard -\"accept=socket,host={$this->host},port={$this->port};urp;\"";;
 	        	if(DEBUG) {
 	        		echo "Command : $cmd<br/>";
 	        		return ;
@@ -209,6 +209,9 @@ class windowsScheduler extends windowsService {
             		echo '<pre>';
             		print_r(array('service' => $this->name, 'display' => $this->name, 'path' => $this->getSchedulerScriptPath()));
     	            echo '</pre>';
+    	            echo '<pre>';
+    	            print_r(file_get_contents($this->getSchedulerScriptPath()));
+    	            echo '</pre>';
             		return ;
             	}
     			$response = win32_create_service(array(
@@ -355,6 +355,25 @@ class luceneValidation extends serviceValidation {
     	}    	
     }
+    public function useZendJava() {
+	    if($this->util->installEnvironment() == 'Zend') {
+	    	if(WINDOWS_OS) { // For Zend Installation only
+				$sysdir = explode(DS, SYSTEM_DIR);
+				array_pop($sysdir);
+				array_pop($sysdir);
+				$zendsys = '';
+				foreach ($sysdir as $k=>$v) {
+					$zendsys .= $v.DS;
+				}
+				$java = $zendsys."jre".DS."bin".DS."java.exe";
+				if(file_exists($java))
+					return $java;
+	    	}
+	    }
+	    
+	    return false;
+    }
+    
    	/**
 	* Attempts to use user input and configure java settings
 	*
@@ -374,11 +393,24 @@ class luceneValidation extends serviceValidation {
     	if(WINDOWS_OS) { 
     		$cmd = "\"$javaExecutable\" -cp \"".SYS_DIR.";\" javaVersion \"".$this->outputDir."outJV\""." \"".$this->outputDir."outJVHome\"";
     		$func = OS."ReadJVFromFile";
-    		if($this->$func($cmd)) return true;
+    		if($this->$func($cmd)) {
+    			return true;
+    		} else {
+    			$this->java = $this->useZendJava(); // Java not installed
+    			$javaExecutable = $this->java;
+    			$cmd = "\"$javaExecutable\" -cp \"".SYS_DIR.";\" javaVersion \"".$this->outputDir."outJV\""." \"".$this->outputDir."outJVHome\"";
+    			if($this->$func($cmd)) {
+    				return true;
+    			}
+    		}
     	} else {
     		$cmd = "\"$javaExecutable\" -version > ".$this->outputDir."outJV 2>&1 echo $!";
     		$func = OS."ReadJVFromFile";
-    		if($this->$func($cmd)) return true;
+    		if($this->$func($cmd)) {
+    			return true; 
+    		} else {
+				// TODO: Not sure
+    		}
     	}
 		$this->javaVersionInCorrect();
@@ -159,9 +159,33 @@ class openofficeValidation extends serviceValidation {
 				return $pathToBinary;
 			}
 		}
-		
+		$pathToBinary = $this->useZendOffice(); // Check for openoffice in zend
+		if(file_exists($pathToBinary)) {
+			return $pathToBinary;
+		}
+			
 		return false;
 	}
+	
+	public function useZendOffice() {
+	    if($this->util->installEnvironment() == 'Zend') {
+	    	if(WINDOWS_OS) { // For Zend Installation only
+				$sysdir = explode(DS, SYSTEM_DIR);
+				array_pop($sysdir);
+				array_pop($sysdir);
+				$zendsys = '';
+				foreach ($sysdir as $k=>$v) {
+					$zendsys .= $v.DS;
+				}
+				$soffice = $zendsys."openoffice".DS."program".DS."soffice.exe";
+				if(file_exists($soffice))
+					return $soffice;
+	    	}
+	    }
+	    
+	    return false;
+	}
+	
    	/**
     * Set all silent mode varibles
     *
@@ -576,7 +576,7 @@ class configuration extends Step
 		return true;
     }
-    private function readConfigPathIni() {
+    public function readConfigPathIni() {
     	if(isset($this->temp_variables['paths']['configFile']['path'])) {
     		return $this->temp_variables['paths']['configFile']['path'];
     	}
@@ -441,6 +441,8 @@ class database extends Step
             $this->temp_variables['tprefix'] = '';
             $this->temp_variables['ddrop'] = false;
         }
+        
+        return $this->temp_variables;
     }
 	/**
@@ -493,11 +495,12 @@ class database extends Step
 	* Read xml config file
 	*
 	* @author KnowledgeTree Team
-	* @access private
+	* @access public
 	* @params none
 	* @return object SimpleXmlObject
 	*/
-    private function readXml() {
+    public function readXml() {
+//    	echo CONF_DIR."databases.xml";
         $simplexml = simplexml_load_file(CONF_DIR."databases.xml");
         return $simplexml;