diff --git a/bin/win32/schedulerService.php b/bin/win32/schedulerService.php index 67e4a61..15669f8 100644 --- a/bin/win32/schedulerService.php +++ b/bin/win32/schedulerService.php @@ -54,14 +54,13 @@ global $default; $config = KTConfig::getSingleton(); $schedulerInterval = $config->get('KnowledgeTree/schedulerInterval',30); // interval in seconds -//$phpPath = $config->get('externalBinary/php','php'); // TODO - fix me // Change to knowledgeTree/bin folder $dir = realpath(dirname(__FILE__) . '/..'); chdir($dir); // Setup php binary path -$phpPath = realpath('../../php/php.exe'); +$phpPath = $config->get('externalBinary/php','php'); if (!is_file($phpPath)) { $default->log->error("Scheduler: php not found: $phpPath"); diff --git a/setup/wizard/installUtil.php b/setup/wizard/installUtil.php index ec0865a..5e041b2 100644 --- a/setup/wizard/installUtil.php +++ b/setup/wizard/installUtil.php @@ -764,12 +764,16 @@ class InstallUtil { if($this->installEnvironment() == 'Zend') { if(WINDOWS_OS) { // For Zend Installation only $sysdir = explode(DS, SYSTEM_DIR); - array_pop($sysdir); - array_pop($sysdir); + // pop until we find Zend, this should be our Zend root :) + $current = array_pop($sysdir); + while ($current != 'Zend') { + $current = array_pop($sysdir); + } $zendsys = ''; foreach ($sysdir as $v) { $zendsys .= $v.DS; } + $zendsys .= 'Zend'.DS; $bin = $zendsys."ZendServer".DS."bin".DS; if(file_exists($bin)) return $bin;