From: stronk7 <stronk7>
Date: Thu, 23 Mar 2006 17:54:33 +0000 (+0000)
Subject: Two new $CFG runtime variables created $CFG->ostype (WINDOWS, UNIX) and
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b8770bc0a599089bc611c2dbc8e0c80a8b32925e;p=moodle.git

Two new $CFG runtime variables created $CFG->ostype (WINDOWS, UNIX) and
$CFG->os (= PHP_OS) to handle it centrally. Also, although not critical,
it should be recommended to replace all the current uses of PHP_OS to the
new variables. See bug 4968.
(http://moodle.org/bugs/bug.php?op=show&bugid=4968)
---

diff --git a/lib/setup.php b/lib/setup.php
index 16860a354b..bfb55dcd30 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -446,6 +446,16 @@ global $HTTPSPAGEREQUIRED;
     }
 
 
+/// Calculate and set $CFG->ostype to be used everywhere. Possible values are:
+/// - WINDOWS: for any Windows flavour.
+/// - UNIX: for the rest
+/// Also, $CFG->os can continue being used if more specialization is required
+if (stristr(PHP_OS, 'win') && !stristr(PHP_OS, 'darwin')) {
+    $CFG->ostype = 'WINDOWS';
+} else {
+    $CFG->ostype = 'UNIX';
+}
+$CFG->os = PHP_OS;
 
 /// Set language/locale of printed times.  If user has chosen a language that
 /// that is different from the site language, then use the locale specified