Peter M. Groen / knowledgetree

Commit db53ccb898ec5ff83836217ca8b26450d0529ebd

Authored by Jarrett Jordaan
1 parent a68e959d

Updated Services Templates 

Committed by: Jarrett Jordaan

Reviewed by: Paul Barrett
Inline Side-by-side
Showing 3 changed files with 6 additions and 3 deletions
setup/wizard/lib/services/windowsLucene.php
  View file @db53ccb
... ... @@ -429,7 +429,6 @@ class windowsLucene extends windowsService {
429 429 $luceneExe = $this->getLuceneExe();
430 430 $luceneSource = $this->getLuceneSource();
431 431 $luceneDir = $this->getluceneDir();
432   -// $javaJVM = $this->getJavaJVM();
433 432 if($luceneExe && $luceneSource && $luceneDir) {
434 433 $cmd = "\"{$luceneExe}\""." -install \"".$this->getName()."\" \"".$this->getJavaJVM(). "\" -Djava.class.path=\"".$luceneSource."\"". " -start ".$this->getLuceneServer(). " -out \"".$this->getLuceneOut()."\" -err \"".$this->getLuceneError()."\" -current \"".$luceneDir."\" -auto";
435 434 if(DEBUG) {
... ...
setup/wizard/lib/services/windowsOpenOffice.php
  View file @db53ccb
... ... @@ -201,7 +201,6 @@ class windowsOpenOffice extends windowsService {
201 201 public function install() {
202 202 $status = $this->status();
203 203 if($status == '') {
204   - //$binary = $this->util->openOfficeSpecified();
205 204 $binary = $this->getBin();
206 205 if($binary != '') {
207 206 $cmd = "\"{$this->winservice}\" install $this->name "."-displayname {$this->name} -start auto \"".$binary."\" -headless -invisible -nofirststartwizard -\"accept=socket,host={$this->host},port={$this->port};urp;\"";;
... ...
setup/wizard/templates/services.tpl
  View file @db53ccb
... ... @@ -10,6 +10,7 @@
10 10 The wizard will review your system to determine whether you can run KnowledgeTree background services. <br/>Once the scan is completed, you&rsquo;ll see whether your system has met the requirements or whether there are areas you need to address.
11 11 </p>
12 12 <!--Continue Message-->
  13 +<?php if($validation) { ?>
13 14 <?php
14 15 if(!$errors && !$warnings) {
15 16 ?>
... ... @@ -33,10 +34,10 @@
33 34 }?>
34 35 <?php
35 36 if($errors || $warnings) {
36   -// var_dump($errors);
37 37 ?>
38 38 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://wiki.knowledgetree.com/Web_Based_Installer#Service_Dependencies" target="_blank">Click here for help on overcoming service issues</a>
39 39 <?php } ?>
  40 +<?php } ?>
40 41 <!--Content-->
41 42 <div id="step_content_configuration" class="step">
42 43 <?php if(!$alreadyInstalled) { ?>
... ... @@ -170,6 +171,7 @@
170 171 All services are already installed.
171 172 <!-- </p>-->
172 173 <?php } ?>
  174 + <?php if($validation) { ?>
173 175 <h3><?php echo "<span class='{$serviceCheck}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>"; ?>Services Check</h3>
174 176 <?php if($silent) { ?>
175 177 <?php if($serviceCheck != 'tick') {
... ... @@ -216,6 +218,9 @@
216 218 <?php if($silent) { ?>
217 219 </div>
218 220 <?php } ?>
  221 + <?php } else { ?>
  222 + Services have to be manually started after the installation has been run. <a href="http://wiki.knowledgetree.com/KnowledgeTree_Setup_Wizard_Troubleshoot#Services" target="_blank">Click here for help on starting services</a>
  223 + <?php } ?>
219 224 </div>
220 225 <input type="submit" name="Previous" value="Previous" class="button_previous"/>
221 226 <input type="submit" name="Next" value="Next" class="button_next"/>
... ...