From 890b3b793bcb3c9e24d6f484fdc2e9dd59a430f0 Mon Sep 17 00:00:00 2001
From: Jarrett Jordaan <jarrett@knowledgetree.com>
Date: Fri, 30 Oct 2009 12:11:07 +0200
Subject: [PATCH] KTS-4480: Autoload Paths Fixed

---
 setup/wizard/steps/complete.php      | 1 +
 setup/wizard/steps/configuration.php | 3 ++-
 setup/wizard/steps/services.php      | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/setup/wizard/steps/complete.php b/setup/wizard/steps/complete.php
index 8df2aae..d32a648 100644
--- a/setup/wizard/steps/complete.php
+++ b/setup/wizard/steps/complete.php
@@ -96,6 +96,7 @@ class complete extends Step {
 	        foreach ($paths as $path)
 	        {
 	            $output = '';
+	            $path['path'] = $class = strtolower(substr($path['path'],0,1)).substr($path['path'],1); // Damn you windows
 	            $result = $this->util->checkPermission($path['path']);
             	$output = sprintf($pathhtml, $result['class'], $path['path'], 
                                      (($result['class'] == 'tick') ? 'class="green"' : 'class="error"' ), 
diff --git a/setup/wizard/steps/configuration.php b/setup/wizard/steps/configuration.php
index 7024af7..bdfca7d 100644
--- a/setup/wizard/steps/configuration.php
+++ b/setup/wizard/steps/configuration.php
@@ -450,7 +450,7 @@ class configuration extends Step
         	}
 			$dirs = $this->getFromConfigPath(); // Store contents
         }
-        $varDirectory = $fileSystemRoot . DS . 'var';
+        
         foreach ($dirs as $key => $dir){
             $path = (isset($_POST[$dir['setting']])) ? $_POST[$dir['setting']] : $dir['path'];
 
@@ -460,6 +460,7 @@ class configuration extends Step
 			if(WINDOWS_OS)
             	$path = preg_replace('/\//', '\\',$path);
             	$dirs[$key]['path'] = $path;
+            	$path = $class = strtolower(substr($path,0,1)).substr($path,1); // Damn you windows
             	if(isset($dir['file']))
             		$class = $this->util->checkPermission($path, $dir['create'], true);
             	else 
diff --git a/setup/wizard/steps/services.php b/setup/wizard/steps/services.php
index 6f5d309..153796d 100644
--- a/setup/wizard/steps/services.php
+++ b/setup/wizard/steps/services.php
@@ -219,7 +219,7 @@ class services extends Step
 				$srv = new $className();
 				$srv->load();
 				$status = $this->serviceInstalled($srv);
-				if($status != 'STARTED') {
+				if($status != 'STARTED' || $status != 'STOPPED') {
 					if(!WINDOWS_OS) { $binary = $this->$class->getBinary(); } // Get binary, if it exists
 					$passed = $this->$class->binaryChecks(); // Run Binary Pre Checks
 	    			if ($passed) { // Install Service
--
libgit2 0.21.4