From 24fe2bb81ee6e954ce846d8e82d17420343f2ecd Mon Sep 17 00:00:00 2001
From: Matt Pass <matt@mattpass.com>
Date: Thu, 30 Aug 2012 07:58:07 +0100
Subject: [PATCH] serverType defined in settings and in a beter way

Instead of detecting a : in the path, now detect by server software name
This is now being done in settings file so it can be used elsewhere too
---
 files.php        | 1 -
 lib/settings.php | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/files.php b/files.php
index f03c4e5..1a69697 100644
--- a/files.php
+++ b/files.php
@@ -14,7 +14,6 @@
 <?php
 $ICEcoder["restrictedFiles"] = $_SESSION['restrictedFiles'];
 $ICEcoder["bannedFiles"] = $_SESSION['bannedFiles'];
-$serverType = strrpos($docRoot,":") ? "Windows" : "Linux";
 
 // Function to sort given values alphabetically
 function alphasort($a, $b) {
diff --git a/lib/settings.php b/lib/settings.php
index 3017929..3aa39a7 100644
--- a/lib/settings.php
+++ b/lib/settings.php
@@ -89,6 +89,7 @@ if (isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10) {
 // Define the docRoot & iceRoot
 $docRoot = rtrim(str_replace("\\","/",$_SERVER['DOCUMENT_ROOT']));
 $iceRoot = rtrim(str_replace("\\","/",$ICEcoder["root"]));
+$serverType = stristr($_SERVER[SERVER_SOFTWARE], "win") ? "Windows" : "Linux";
 
 // Establish our user level
 if (!isset($_SESSION['userLevel'])) {$_SESSION['userLevel'] = 0;};