Peter M. Groen / knowledgetree

Commit 890b3b793bcb3c9e24d6f484fdc2e9dd59a430f0

Authored by Jarrett Jordaan
1 parent e0c010c3

KTS-4480: Autoload Paths Fixed 

Committed by: Jarrett Jordaan

Reviewed by: Megan Watson
Inline Side-by-side
Showing 3 changed files with 4 additions and 2 deletions
setup/wizard/steps/complete.php
  View file @890b3b7
@@ -96,6 +96,7 @@ class complete extends Step { @@ -96,6 +96,7 @@ class complete extends Step {
96 foreach ($paths as $path) 96 foreach ($paths as $path)
97 { 97 {
98 $output = ''; 98 $output = '';
  99 + $path['path'] = $class = strtolower(substr($path['path'],0,1)).substr($path['path'],1); // Damn you windows
99 $result = $this->util->checkPermission($path['path']); 100 $result = $this->util->checkPermission($path['path']);
100 $output = sprintf($pathhtml, $result['class'], $path['path'], 101 $output = sprintf($pathhtml, $result['class'], $path['path'],
101 (($result['class'] == 'tick') ? 'class="green"' : 'class="error"' ), 102 (($result['class'] == 'tick') ? 'class="green"' : 'class="error"' ),
setup/wizard/steps/configuration.php
  View file @890b3b7
@@ -450,7 +450,7 @@ class configuration extends Step @@ -450,7 +450,7 @@ class configuration extends Step
450 } 450 }
451 $dirs = $this->getFromConfigPath(); // Store contents 451 $dirs = $this->getFromConfigPath(); // Store contents
452 } 452 }
453 - $varDirectory = $fileSystemRoot . DS . 'var'; 453 +
454 foreach ($dirs as $key => $dir){ 454 foreach ($dirs as $key => $dir){
455 $path = (isset($_POST[$dir['setting']])) ? $_POST[$dir['setting']] : $dir['path']; 455 $path = (isset($_POST[$dir['setting']])) ? $_POST[$dir['setting']] : $dir['path'];
456 456
@@ -460,6 +460,7 @@ class configuration extends Step @@ -460,6 +460,7 @@ class configuration extends Step
460 if(WINDOWS_OS) 460 if(WINDOWS_OS)
461 $path = preg_replace('/\//', '\\',$path); 461 $path = preg_replace('/\//', '\\',$path);
462 $dirs[$key]['path'] = $path; 462 $dirs[$key]['path'] = $path;
  463 + $path = $class = strtolower(substr($path,0,1)).substr($path,1); // Damn you windows
463 if(isset($dir['file'])) 464 if(isset($dir['file']))
464 $class = $this->util->checkPermission($path, $dir['create'], true); 465 $class = $this->util->checkPermission($path, $dir['create'], true);
465 else 466 else
setup/wizard/steps/services.php
  View file @890b3b7
@@ -219,7 +219,7 @@ class services extends Step @@ -219,7 +219,7 @@ class services extends Step
219 $srv = new $className(); 219 $srv = new $className();
220 $srv->load(); 220 $srv->load();
221 $status = $this->serviceInstalled($srv); 221 $status = $this->serviceInstalled($srv);
222 - if($status != 'STARTED') { 222 + if($status != 'STARTED' || $status != 'STOPPED') {
223 if(!WINDOWS_OS) { $binary = $this->$class->getBinary(); } // Get binary, if it exists 223 if(!WINDOWS_OS) { $binary = $this->$class->getBinary(); } // Get binary, if it exists
224 $passed = $this->$class->binaryChecks(); // Run Binary Pre Checks 224 $passed = $this->$class->binaryChecks(); // Run Binary Pre Checks
225 if ($passed) { // Install Service 225 if ($passed) { // Install Service