More cleanups of OC_Config usage

diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php
index f05a4afad2c713c9a1e169f1e10bf459ac49753b..c189e753853908e545d4d55d3831a8e6476aa45e 100644 (file)
--- a/apps/user_ldap/lib/helper.php
+++ b/apps/user_ldap/lib/helper.php
@@ -62,7 +62,7 @@ class Helper {
                ';
 
                if($activeConfigurations) {
-                       if (\OC_Config::getValue( 'dbtype', 'sqlite' ) === 'oci') {
+                       if (\OC::$server->getConfig()->getSystemValue( 'dbtype', 'sqlite' ) === 'oci') {
                                //FIXME oracle hack: need to explicitly cast CLOB to CHAR for comparison
                                $sql .= ' AND to_char(`configvalue`)=\'1\'';
                        } else {

diff --git a/lib/private/db/connection.php b/lib/private/db/connection.php
index 85b1b7cd5ea07e7d95b691ed6a3f21b243f8a02b..d32d1c5fa464f39d2421f47255f0b2cf35e5b4ed 100644 (file)
--- a/lib/private/db/connection.php
+++ b/lib/private/db/connection.php
@@ -154,7 +154,7 @@ class Connection extends \Doctrine\DBAL\Connection implements IDBConnection {
                $statement = $this->replaceTablePrefix($statement);
                $statement = $this->adapter->fixupStatement($statement);
 
-               if(\OC_Config::getValue( 'log_query', false)) {
+               if(\OC::$server->getSystemConfig()->getValue( 'log_query', false)) {
                        \OCP\Util::writeLog('core', 'DB prepare : '.$statement, \OCP\Util::DEBUG);
                }
                return parent::prepare($statement);

diff --git a/lib/private/db/statementwrapper.php b/lib/private/db/statementwrapper.php
index 4bdaf01f071b9c8f3b28b9da7ceac3299af82686..c888fab07740f1d20f1135ed4da4049a9578dee7 100644 (file)
--- a/lib/private/db/statementwrapper.php
+++ b/lib/private/db/statementwrapper.php
@@ -64,7 +64,7 @@ class OC_DB_StatementWrapper {
         * @return \OC_DB_StatementWrapper|int
         */
        public function execute($input=array()) {
-               if(OC_Config::getValue( "log_query", false)) {
+               if(\OC::$server->getSystemConfig()->getValue( "log_query", false)) {
                        $params_str = str_replace("\n", " ", var_export($input, true));
                        \OCP\Util::writeLog('core', 'DB execute with arguments : '.$params_str, \OCP\Util::DEBUG);
                }

diff --git a/lib/private/log/owncloud.php b/lib/private/log/owncloud.php
index 721bc6002fa512798a318c063ddf832f13507686..f8a5f7534c5d6c134125148b1d71a3c33b26a6e2 100644 (file)
--- a/lib/private/log/owncloud.php
+++ b/lib/private/log/owncloud.php
@@ -38,8 +38,9 @@ class OC_Log_Owncloud {
         * Init class data
         */
        public static function init() {
-               $defaultLogFile = OC_Config::getValue("datadirectory", OC::$SERVERROOT.'/data').'/owncloud.log';
-               self::$logFile = OC_Config::getValue("logfile", $defaultLogFile);
+               $systemConfig = \OC::$server->getSystemConfig();
+               $defaultLogFile = $systemConfig->getValue("datadirectory", OC::$SERVERROOT.'/data').'/owncloud.log';
+               self::$logFile = $systemConfig->getValue("logfile", $defaultLogFile);
 
                /*
                * Fall back to default log file if specified logfile does not exist
@@ -110,7 +111,7 @@ class OC_Log_Owncloud {
         */
        public static function getEntries($limit=50, $offset=0) {
                self::init();
-               $minLevel=OC_Config::getValue( "loglevel", \OCP\Util::WARN );
+               $minLevel = \OC::$server->getSystemConfig()->getValue("loglevel", \OCP\Util::WARN);
                $entries = array();
                $handle = @fopen(self::$logFile, 'rb');
                if ($handle) {

diff --git a/lib/private/log/rotate.php b/lib/private/log/rotate.php
index 27731c07db297b397eb715b0977338ce8348784a..98ebef25988667500e70a99b250b4e7c477bac0e 100644 (file)
--- a/lib/private/log/rotate.php
+++ b/lib/private/log/rotate.php
@@ -32,7 +32,7 @@ namespace OC\Log;
 class Rotate extends \OC\BackgroundJob\Job {
        private $max_log_size;
        public function run($logFile) {
-               $this->max_log_size = \OC_Config::getValue('log_rotate_size', false);
+               $this->max_log_size = \OC::$server->getConfig()->getSystemValue('log_rotate_size', false);
                if ($this->max_log_size) {
                        $filesize = @filesize($logFile);
                        if ($filesize >= $this->max_log_size) {

diff --git a/lib/private/log/syslog.php b/lib/private/log/syslog.php
index cc4c5a29c395fd79ea5e7f234ee18e279404ca15..7a638c36a77a3dbd6e9581b7008638f9002ee0b7 100644 (file)
--- a/lib/private/log/syslog.php
+++ b/lib/private/log/syslog.php
@@ -35,7 +35,7 @@ class OC_Log_Syslog {
         * Init class data
         */
        public static function init() {
-               openlog(OC_Config::getValue("syslog_tag", "ownCloud"), LOG_PID | LOG_CONS, LOG_USER);
+               openlog(\OC::$server->getSystemConfig()->getValue("syslog_tag", "ownCloud"), LOG_PID | LOG_CONS, LOG_USER);
                // Close at shutdown
                register_shutdown_function('closelog');
        }

diff --git a/lib/private/route/router.php b/lib/private/route/router.php
index 25860ee46bf7bc9d7344b414c095e1e799c55987..4ca5e16ddf2405a0451b30313be9ade682e58d93 100644 (file)
--- a/lib/private/route/router.php
+++ b/lib/private/route/router.php
@@ -260,7 +260,7 @@ class Router implements IRouter {
                        $this->loadRoutes($app);
                } else if (substr($url, 0, 6) === '/core/' or substr($url, 0, 10) === '/settings/') {
                        \OC::$REQUESTEDAPP = $url;
-                       if (!\OC_Config::getValue('maintenance', false) && !\OCP\Util::needUpgrade()) {
+                       if (!\OC::$server->getConfig()->getSystemValue('maintenance', false) && !\OCP\Util::needUpgrade()) {
                                \OC_App::loadApps();
                        }
                        $this->loadRoutes('core');

diff --git a/lib/private/user/database.php b/lib/private/user/database.php
index 3969b446071be3d805829e09e4d314425b0580d4..98850771212d75ba470fdbf420b0d1e770e32c3d 100644 (file)
--- a/lib/private/user/database.php
+++ b/lib/private/user/database.php
@@ -266,7 +266,7 @@ class OC_User_Database extends OC_User_Backend implements \OCP\IUserBackend {
         */
        public function getHome($uid) {
                if ($this->userExists($uid)) {
-                       return OC_Config::getValue("datadirectory", OC::$SERVERROOT . "/data") . '/' . $uid;
+                       return \OC::$server->getConfig()->getSystemValue("datadirectory", OC::$SERVERROOT . "/data") . '/' . $uid;
                }
 
                return false;

diff --git a/lib/private/user/session.php b/lib/private/user/session.php
index baceeb43956f0ffa6d6d0b3c67738bea32d936c4..ba702c9f365b70d6b45ed86edd716aab5ddb9583 100644 (file)
--- a/lib/private/user/session.php
+++ b/lib/private/user/session.php
@@ -287,7 +287,7 @@ class Session implements IUserSession, Emitter {
         */
        public function setMagicInCookie($username, $token) {
                $secureCookie = \OC::$server->getRequest()->getServerProtocol() === 'https';
-               $expires = time() + \OC_Config::getValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15);
+               $expires = time() + \OC::$server->getConfig()->getSystemValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15);
                setcookie("oc_username", $username, $expires, \OC::$WEBROOT, '', $secureCookie, true);
                setcookie("oc_token", $token, $expires, \OC::$WEBROOT, '', $secureCookie, true);
                setcookie("oc_remember_login", "1", $expires, \OC::$WEBROOT, '', $secureCookie, true);