diff --git a/dmsctl.bat b/dmsctl.bat index 8159e73..01b49fa 100644 --- a/dmsctl.bat +++ b/dmsctl.bat @@ -6,6 +6,7 @@ rem KnowledgeTree Control Script rem ============= SET ENVIRONMENT VARIABLES ============== set INSTALL_PATH=%CD% cd .. +cd .. set ZEND_PATH=%CD% cd %INSTALL_PATH% set JAVA_BIN=%ZEND_PATH%\jre\bin\java.exe @@ -82,4 +83,4 @@ echo The Scheduler automatic service was successfully installed IF EXIST "%INSTALL_PATH%\var\bin\luceneinstall.bat" call "%INSTALL_PATH%\var\bin\luceneinstall.bat" goto end -:end \ No newline at end of file +:end diff --git a/setup/wizard/installUtil.php b/setup/wizard/installUtil.php index 3f8a399..590fdcf 100644 --- a/setup/wizard/installUtil.php +++ b/setup/wizard/installUtil.php @@ -47,7 +47,7 @@ class InstallUtil { private $salt = 'installers'; public $dbUtilities = null; public $iniUtilities = null; - + /** * Constructs installation object * @@ -83,9 +83,9 @@ class InstallUtil { include($file); $contents = ob_get_contents(); ob_end_clean(); - echo $contents; + echo $contents; } - + return false; } @@ -460,7 +460,7 @@ class InstallUtil { return preg_replace('/java:/', '', $r); } } - + return ''; } @@ -530,10 +530,10 @@ class InstallUtil { return true; } } - + return false; } - + /** * Check if system needs to be migrated * @@ -548,10 +548,10 @@ class InstallUtil { return true; } } - + return false; } - + /** * Check if system needs to be migrated * @@ -566,10 +566,10 @@ class InstallUtil { return true; } } - + return false; } - + /** * Check if system needs to be migrated * @@ -584,10 +584,10 @@ class InstallUtil { return true; } } - + return false; } - + /** * Get session data from package * @@ -600,10 +600,10 @@ class InstallUtil { if(empty($_SESSION[$package][$class])) { return false; } - + return $_SESSION[$package][$class]; } - + /** * Get session data from post * @@ -688,7 +688,7 @@ class InstallUtil { /** * Deletes migration lock file if a clean install is chosen * This is in case someone changes their mind after choosing upgrade/migrate and clicks back up to this step - * + * * @author KnowledgeTree Team * @access public * @return void @@ -710,10 +710,10 @@ class InstallUtil { return true; return false; } - + /** * Determine type of installation - * + * * @author KnowledgeTree Team * @access public * @return string @@ -732,10 +732,10 @@ class InstallUtil { } } } - + /** * Determine if zend php exists - * + * * @author KnowledgeTree Team * @access public * @return string @@ -746,6 +746,7 @@ class InstallUtil { $sysdir = explode(DS, SYSTEM_DIR); array_pop($sysdir); array_pop($sysdir); + array_pop($sysdir); $zendsys = ''; foreach ($sysdir as $v) { $zendsys .= $v.DS; @@ -757,13 +758,13 @@ class InstallUtil { return DS."usr".DS."local".DS."zend".DS."bin".DS; } } - + return false; } - + /** * Determine if mysql exists - * + * * @author KnowledgeTree Team * @access public * @return string @@ -780,14 +781,14 @@ class InstallUtil { } } } - + return "mysql"; // Assume its linux and can be executed from command line } public function sqlInstallDir() { return SYSTEM_DIR."sql".DS."mysql".DS."install".DS; } - + public function getFileByLine($file) { $fileLines = array(); $file_handle = fopen($file, "rb"); @@ -799,7 +800,7 @@ class InstallUtil { fclose($file_handle); return $fileLines; } - + /** * Portably execute a command on any of the supported platforms. *