From 540df3317362269e0feb75e077b107e71ed79f62 Mon Sep 17 00:00:00 2001 From: Andreas Boehler Date: Sat, 10 Sep 2016 10:32:08 +0200 Subject: [PATCH] Fix a few deprecated calls --- user_sql.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/user_sql.php b/user_sql.php index 4252c79..9283c66 100644 --- a/user_sql.php +++ b/user_sql.php @@ -37,6 +37,7 @@ class OC_USER_SQL extends \OC_User_Backend implements \OCP\IUserBackend, \OCP\Us protected $settings; protected $helper; protected $session_cache_name; + protected $ocConfig; /** * The default constructor. It loads the settings for the given domain @@ -52,6 +53,7 @@ class OC_USER_SQL extends \OC_User_Backend implements \OCP\IUserBackend, \OCP\Us $this -> helper = new \OCA\user_sql\lib\Helper(); $domain = \OC::$server->getRequest()->getServerHost(); $this -> settings = $this -> helper -> loadSettingsForDomain($domain); + $this -> ocConfig = \OC::$server->getConfig(); $this -> helper -> connectToDb($this -> settings); $this -> session_cache_name = 'USER_SQL_CACHE'; return false; @@ -86,17 +88,17 @@ class OC_USER_SQL extends \OC_User_Backend implements \OCP\IUserBackend, \OCP\Us return false; } $newMail = $row[$this -> settings['col_email']]; - $currMail = \OCP\Config::getUserValue($ocUid, 'settings', 'email', ''); + $currMail = $this->ocConfig->getUserValue($ocUid, 'settings', 'email', ''); switch($this -> settings['set_mail_sync_mode']) { case 'initial': if($currMail === '') - \OCP\Config::setUserValue($ocUid, 'settings', 'email', $newMail); + $this->ocConfig->setUserValue($ocUid, 'settings', 'email', $newMail); break; case 'forcesql': if($currMail !== $newMail) - \OCP\Config::setUserValue($ocUid, 'settings', 'email', $newMail); + $this->ocConfig->setUserValue($ocUid, 'settings', 'email', $newMail); break; case 'forceoc': if(($currMail !== '') && ($currMail !== $newMail))