Use SystemConfig internally

diff --git a/lib/base.php b/lib/base.php
index aee1698e222233989e36facb8fbe2c489bad86f1..c0db0454f6adc9f3745cfc355c1dc66ba595b917 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -115,7 +115,7 @@ class OC {
        /**
         * @var \OC\Config
         */
-       public static $config = null;
+       private static $config = null;
 
        /**
         * @throws \RuntimeException when the 3rdparty directory is missing or
@@ -157,7 +157,7 @@ class OC {
 
 
                if (OC::$CLI) {
-                       OC::$WEBROOT = \OC::$config->getValue('overwritewebroot', '');
+                       OC::$WEBROOT = self::$config->getValue('overwritewebroot', '');
                } else {
                        if (substr($scriptName, 0 - strlen(OC::$SUBURI)) === OC::$SUBURI) {
                                OC::$WEBROOT = substr($scriptName, 0, 0 - strlen(OC::$SUBURI));
@@ -170,7 +170,7 @@ class OC {
                                // This most likely means that we are calling from CLI.
                                // However some cron jobs still need to generate
                                // a web URL, so we use overwritewebroot as a fallback.
-                               OC::$WEBROOT = \OC::$config->getValue('overwritewebroot', '');
+                               OC::$WEBROOT = self::$config->getValue('overwritewebroot', '');
                        }
 
                        // Resolve /owncloud to /owncloud/ to ensure to always have a trailing
@@ -183,8 +183,8 @@ class OC {
                }
 
                // search the 3rdparty folder
-               OC::$THIRDPARTYROOT = \OC::$config->getValue('3rdpartyroot', null);
-               OC::$THIRDPARTYWEBROOT = \OC::$config->getValue('3rdpartyurl', null);
+               OC::$THIRDPARTYROOT = self::$config->getValue('3rdpartyroot', null);
+               OC::$THIRDPARTYWEBROOT = self::$config->getValue('3rdpartyurl', null);
 
                if (empty(OC::$THIRDPARTYROOT) && empty(OC::$THIRDPARTYWEBROOT)) {
                        if (file_exists(OC::$SERVERROOT . '/3rdparty')) {
@@ -202,7 +202,7 @@ class OC {
                }
 
                // search the apps folder
-               $config_paths = \OC::$config->getValue('apps_paths', array());
+               $config_paths = self::$config->getValue('apps_paths', array());
                if (!empty($config_paths)) {
                        foreach ($config_paths as $paths) {
                                if (isset($paths['url']) && isset($paths['path'])) {

diff --git a/lib/private/app.php b/lib/private/app.php
index b0d2273a0cd898fad487d246945ca29c742882a3..ff711e82424042c9f8b73d9f89add3d04889fe3a 100644 (file)
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -96,7 +96,7 @@ class OC_App {
         * if $types is set, only apps of those types will be loaded
         */
        public static function loadApps($types = null) {
-               if (\OC::$config->getValue('maintenance', false)) {
+               if (\OC::$server->getSystemConfig()->getValue('maintenance', false)) {
                        return false;
                }
                // Load the enabled apps here
@@ -239,7 +239,7 @@ class OC_App {
         * @return string[]
         */
        public static function getEnabledApps($forceRefresh = false, $all = false) {
-               if (!\OC::$config->getValue('installed', false)) {
+               if (!\OC::$server->getSystemConfig()->getValue('installed', false)) {
                        return array();
                }
                // in incognito mode or when logged out, $user will be false,
@@ -374,7 +374,7 @@ class OC_App {
                $settings = array();
                // by default, settings only contain the help menu
                if (OC_Util::getEditionString() === '' &&
-                       \OC::$config->getValue('knowledgebaseenabled', true) == true
+                       \OC::$server->getSystemConfig()->getValue('knowledgebaseenabled', true) == true
                ) {
                        $settings = array(
                                array(
@@ -455,7 +455,7 @@ class OC_App {
         * @return string|false
         */
        public static function getInstallPath() {
-               if (\OC::$config->getValue('appstoreenabled', true) == false) {
+               if (\OC::$server->getSystemConfig()->getValue('appstoreenabled', true) == false) {
                        return false;
                }
 

diff --git a/lib/private/helper.php b/lib/private/helper.php
index 707f6cdccad5e8791d8cdcc5f740f726fb748e0b..3a5326d218e192996e6c444092038dcf3ef0165a 100644 (file)
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -746,7 +746,7 @@ class OC_Helper {
         */
        public static function getStorageInfo($path, $rootInfo = null) {
                // return storage info without adding mount points
-               $includeExtStorage = \OC::$config->getValue('quota_include_external_storage', false);
+               $includeExtStorage = \OC::$server->getSystemConfig()->getValue('quota_include_external_storage', false);
 
                if (!$rootInfo) {
                        $rootInfo = \OC\Files\Filesystem::getFileInfo($path, false);

diff --git a/lib/private/user.php b/lib/private/user.php
index 4e395a3f7a36d2f880d55542a1ba59ea39ba9b5b..cfa60d675feff231ab438feb37c3a93804ce4096 100644 (file)
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -130,7 +130,7 @@ class OC_User {
         */
        public static function setupBackends() {
                OC_App::loadApps(array('prelogin'));
-               $backends = \OC::$config->getValue('user_backends', array());
+               $backends = \OC::$server->getSystemConfig()->getValue('user_backends', array());
                foreach ($backends as $i => $config) {
                        $class = $config['class'];
                        $arguments = $config['arguments'];
@@ -498,7 +498,7 @@ class OC_User {
                if ($user) {
                        return $user->getHome();
                } else {
-                       return \OC::$config->getValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $uid;
+                       return \OC::$server->getSystemConfig()->getValue('datadirectory', OC::$SERVERROOT . '/data') . '/' . $uid;
                }
        }
 

diff --git a/lib/private/util.php b/lib/private/util.php
index 193a446d60a4abce210f9e9c41940d841d1d4547..84842285bbafd61d756aa25a701f4eafbcad4433 100644 (file)
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -72,7 +72,7 @@ class OC_Util {
 
        private static function initLocalStorageRootFS() {
                // mount local file backend as root
-               $configDataDirectory = \OC::$config->getValue("datadirectory", OC::$SERVERROOT . "/data");
+               $configDataDirectory = \OC::$server->getSystemConfig()->getValue("datadirectory", OC::$SERVERROOT . "/data");
                //first set up the local "root" storage
                \OC\Files\Filesystem::initMountManager();
                if (!self::$rootMounted) {
@@ -184,7 +184,7 @@ class OC_Util {
                OC_Hook::emit('OC_Filesystem', 'preSetup', array('user' => $user));
 
                //check if we are using an object storage
-               $objectStore = \OC::$config->getValue('objectstore');
+               $objectStore = \OC::$server->getSystemConfig()->getValue('objectstore', null);
                if (isset($objectStore)) {
                        self::initObjectStoreRootFS($objectStore);
                } else {
@@ -848,7 +848,7 @@ class OC_Util {
        public static function checkDatabaseVersion() {
                $l = \OC::$server->getL10N('lib');
                $errors = array();
-               $dbType = \OC::$config->getValue('dbtype', 'sqlite');
+               $dbType = \OC::$server->getSystemConfig()->getValue('dbtype', 'sqlite');
                if ($dbType === 'pgsql') {
                        // check PostgreSQL version
                        try {
@@ -1108,11 +1108,11 @@ class OC_Util {
         * @return string
         */
        public static function getInstanceId() {
-               $id = \OC::$config->getValue('instanceid', null);
+               $id = \OC::$server->getSystemConfig()->getValue('instanceid', null);
                if (is_null($id)) {
                        // We need to guarantee at least one letter in instanceid so it can be used as the session_name
                        $id = 'oc' . \OC::$server->getSecureRandom()->getLowStrengthGenerator()->generate(10, \OCP\Security\ISecureRandom::CHAR_LOWER.\OCP\Security\ISecureRandom::CHAR_DIGITS);
-                       \OC::$config->setValue('instanceid', $id);
+                       \OC::$server->getSystemConfig()->setValue('instanceid', $id);
                }
                return $id;
        }
@@ -1364,7 +1364,7 @@ class OC_Util {
         * @return string the theme
         */
        public static function getTheme() {
-               $theme = \OC::$config->getValue("theme", '');
+               $theme = \OC::$server->getSystemConfig()->getValue("theme", '');
 
                if ($theme === '') {
                        if (is_dir(OC::$SERVERROOT . '/themes/default')) {