diff --git a/setup/wizard/installUtil.php b/setup/wizard/installUtil.php
index 8dcb4ce..635817b 100644
--- a/setup/wizard/installUtil.php
+++ b/setup/wizard/installUtil.php
@@ -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;
}
diff --git a/setup/wizard/lib/services/windowsLucene.php b/setup/wizard/lib/services/windowsLucene.php
index ff7a231..3df9023 100644
--- a/setup/wizard/lib/services/windowsLucene.php
+++ b/setup/wizard/lib/services/windowsLucene.php
@@ -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
*
diff --git a/setup/wizard/lib/services/windowsOpenOffice.php b/setup/wizard/lib/services/windowsOpenOffice.php
index 4722c65..48df139 100644
--- a/setup/wizard/lib/services/windowsOpenOffice.php
+++ b/setup/wizard/lib/services/windowsOpenOffice.php
@@ -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
";
return ;
diff --git a/setup/wizard/lib/services/windowsScheduler.php b/setup/wizard/lib/services/windowsScheduler.php
index e6d8a95..bc76f32 100644
--- a/setup/wizard/lib/services/windowsScheduler.php
+++ b/setup/wizard/lib/services/windowsScheduler.php
@@ -209,6 +209,9 @@ class windowsScheduler extends windowsService {
echo '
';
print_r(array('service' => $this->name, 'display' => $this->name, 'path' => $this->getSchedulerScriptPath()));
echo '';
+ echo ''; + print_r(file_get_contents($this->getSchedulerScriptPath())); + echo ''; return ; } $response = win32_create_service(array( diff --git a/setup/wizard/lib/validation/luceneValidation.php b/setup/wizard/lib/validation/luceneValidation.php index 83d47e8..2bf3205 100644 --- a/setup/wizard/lib/validation/luceneValidation.php +++ b/setup/wizard/lib/validation/luceneValidation.php @@ -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(); diff --git a/setup/wizard/lib/validation/openofficeValidation.php b/setup/wizard/lib/validation/openofficeValidation.php index f2d1b2b..3f69fbb 100644 --- a/setup/wizard/lib/validation/openofficeValidation.php +++ b/setup/wizard/lib/validation/openofficeValidation.php @@ -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 *