summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <morris.jobke@gmail.com>2014-03-21 15:06:11 +0100
committerMorris Jobke <morris.jobke@gmail.com>2014-03-21 15:06:11 +0100
commit43313d120dfd943e823f2f4ff12b6f5893284743 (patch)
tree0addbcc54beb27ef12eb6042f34881834f8603cf /lib
parent37af74efb3e3511b2d6eacef67dc90f22a685bd3 (diff)
parent6de9033d8655f172320fd092916b51b56b0f8080 (diff)
downloadnextcloud-server-43313d120dfd943e823f2f4ff12b6f5893284743.tar.gz
nextcloud-server-43313d120dfd943e823f2f4ff12b6f5893284743.zip
Merge pull request #7820 from owncloud/core-macwarning
Added warning for Mac OS on setup page
Diffstat (limited to 'lib')
-rwxr-xr-xlib/private/util.php11
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/private/util.php b/lib/private/util.php
index 70dadb1befd..f72276418ba 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -1085,13 +1085,22 @@ class OC_Util {
}
/**
- * @return bool - well are we running on windows or not
+ * Checks whether the server is running on Windows
+ * @return bool true if running on Windows, false otherwise
*/
public static function runningOnWindows() {
return (substr(PHP_OS, 0, 3) === "WIN");
}
/**
+ * Checks whether the server is running on Mac OS X
+ * @return bool true if running on Mac OS X, false otherwise
+ */
+ public static function runningOnMac() {
+ return (strtoupper(substr(PHP_OS, 0, 6)) === 'DARWIN');
+ }
+
+ /**
* Handles the case that there may not be a theme, then check if a "default"
* theme exists and take that one
* @return string the theme