From 796183d40d6ac9dfe488c57d8b127720a61d310a Mon Sep 17 00:00:00 2001 From: Javyer Date: Fri, 3 Apr 2020 00:34:03 +0200 Subject: [PATCH] Comply with Owncloud 10.3.2 --- build/owncloud/rainloop-app/admin.php | 4 +++- build/owncloud/rainloop-app/ajax/admin.php | 4 ++-- build/owncloud/rainloop-app/ajax/personal.php | 6 +++--- build/owncloud/rainloop-app/app.php | 8 ++++---- build/owncloud/rainloop-app/appinfo/app.php | 2 +- build/owncloud/rainloop-app/appinfo/info.xml | 2 +- build/owncloud/rainloop-app/lib/RainLoopHelper.php | 8 ++++---- build/owncloud/rainloop-app/personal.php | 6 +++--- 8 files changed, 21 insertions(+), 19 deletions(-) diff --git a/build/owncloud/rainloop-app/admin.php b/build/owncloud/rainloop-app/admin.php index 492e848cf..e57c6297f 100644 --- a/build/owncloud/rainloop-app/admin.php +++ b/build/owncloud/rainloop-app/admin.php @@ -12,7 +12,9 @@ OCP\User::checkAdminUser(); OCP\Util::addScript('rainloop', 'admin'); +include_once OC_App::getAppPath('rainloop').'/lib/RainLoopHelper.php'; + $oTemplate = new OCP\Template('rainloop', 'admin-local'); $oTemplate->assign('rainloop-admin-panel-link', OC_RainLoop_Helper::getAppUrl().'?admin'); -$oTemplate->assign('rainloop-autologin', OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false)); +$oTemplate->assign('rainloop-autologin', \OC::$server->getConfig()->getAppValue('rainloop', 'rainloop-autologin', false)); return $oTemplate->fetchPage(); diff --git a/build/owncloud/rainloop-app/ajax/admin.php b/build/owncloud/rainloop-app/ajax/admin.php index a8343c23f..2c277ad0d 100644 --- a/build/owncloud/rainloop-app/ajax/admin.php +++ b/build/owncloud/rainloop-app/ajax/admin.php @@ -18,10 +18,10 @@ $bAutologin = false; if (isset($_POST['appname']) && 'rainloop' === $_POST['appname']) { - OCP\Config::setAppValue('rainloop', 'rainloop-autologin', isset($_POST['rainloop-autologin']) ? + \OC::$server->getConfig()->setAppValue('rainloop', 'rainloop-autologin', isset($_POST['rainloop-autologin']) ? '1' === $_POST['rainloop-autologin'] : false); - $bAutologin = OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false); + $bAutologin = \OC::$server->getConfig()->getAppValue('rainloop', 'rainloop-autologin', false); } else { diff --git a/build/owncloud/rainloop-app/ajax/personal.php b/build/owncloud/rainloop-app/ajax/personal.php index 02252b750..11f6fbe75 100644 --- a/build/owncloud/rainloop-app/ajax/personal.php +++ b/build/owncloud/rainloop-app/ajax/personal.php @@ -21,18 +21,18 @@ if (isset($_POST['appname'], $_POST['rainloop-password'], $_POST['rainloop-email $sPostEmail = $_POST['rainloop-email']; - OCP\Config::setUserValue($sUser, 'rainloop', 'rainloop-email', $sPostEmail); + \OC::$server->getConfig()->setUserValue($sUser, 'rainloop', 'rainloop-email', $sPostEmail); $sPass = $_POST['rainloop-password']; if ('******' !== $sPass && '' !== $sPass) { include_once OC_App::getAppPath('rainloop').'/lib/RainLoopHelper.php'; - OCP\Config::setUserValue($sUser, 'rainloop', 'rainloop-password', + \OC::$server->getConfig()->setUserValue($sUser, 'rainloop', 'rainloop-password', OC_RainLoop_Helper::encodePassword($sPass, md5($sPostEmail))); } - $sEmail = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-email', ''); + $sEmail = \OC::$server->getConfig()->getUserValue($sUser, 'rainloop', 'rainloop-email', ''); } else { diff --git a/build/owncloud/rainloop-app/app.php b/build/owncloud/rainloop-app/app.php index 94569d475..2699b4017 100644 --- a/build/owncloud/rainloop-app/app.php +++ b/build/owncloud/rainloop-app/app.php @@ -15,15 +15,15 @@ if (@file_exists(__DIR__.'/app/index.php')) $sUser = OCP\User::getUser(); - if (OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false)) + if (\OC::$server->getConfig()->getAppValue('rainloop', 'rainloop-autologin', false)) { $sEmail = $sUser; - $sEncodedPassword = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-autologin-password', ''); + $sEncodedPassword = \OC::$server->getConfig()->getUserValue($sUser, 'rainloop', 'rainloop-autologin-password', ''); } else { - $sEmail = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-email', ''); - $sEncodedPassword = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-password', ''); + $sEmail = \OC::$server->getConfig()->getUserValue($sUser, 'rainloop', 'rainloop-email', ''); + $sEncodedPassword = \OC::$server->getConfig()->getUserValue($sUser, 'rainloop', 'rainloop-password', ''); } $sDecodedPassword = OC_RainLoop_Helper::decodePassword($sEncodedPassword, md5($sEmail)); diff --git a/build/owncloud/rainloop-app/appinfo/app.php b/build/owncloud/rainloop-app/appinfo/app.php index 3f3b87d76..254d10992 100644 --- a/build/owncloud/rainloop-app/appinfo/app.php +++ b/build/owncloud/rainloop-app/appinfo/app.php @@ -13,7 +13,7 @@ OC::$CLASSPATH['OC_RainLoop_Helper'] = OC_App::getAppPath('rainloop') . '/lib/Ra OCP\App::registerAdmin('rainloop', 'admin'); OCP\App::registerPersonal('rainloop', 'personal'); -if (OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false)) +if (\OC::$server->getConfig()->getAppValue('rainloop', 'rainloop-autologin', false)) { OCP\Util::connectHook('OC_User', 'post_login', 'OC_RainLoop_Helper', 'login'); OCP\Util::connectHook('OC_User', 'post_setPassword', 'OC_RainLoop_Helper', 'changePassword'); diff --git a/build/owncloud/rainloop-app/appinfo/info.xml b/build/owncloud/rainloop-app/appinfo/info.xml index a71679ce7..e28b0b589 100644 --- a/build/owncloud/rainloop-app/appinfo/info.xml +++ b/build/owncloud/rainloop-app/appinfo/info.xml @@ -11,7 +11,7 @@ 165254 - + tools diff --git a/build/owncloud/rainloop-app/lib/RainLoopHelper.php b/build/owncloud/rainloop-app/lib/RainLoopHelper.php index e38f260fa..7bfedad8b 100644 --- a/build/owncloud/rainloop-app/lib/RainLoopHelper.php +++ b/build/owncloud/rainloop-app/lib/RainLoopHelper.php @@ -191,7 +191,7 @@ class OC_RainLoop_Helper $sEmail = $sUser; $sPassword = $aParams['password']; - return OCP\Config::setUserValue($sUser, 'rainloop', 'rainloop-autologin-password', + return \OC::$server->getConfig()->setUserValue($sUser, 'rainloop', 'rainloop-autologin-password', self::encodePassword($sPassword, md5($sEmail))); } @@ -200,7 +200,7 @@ class OC_RainLoop_Helper public static function logout() { - OCP\Config::setUserValue( + \OC::$server->getConfig()->setUserValue( OCP\User::getUser(), 'rainloop', 'rainloop-autologin-password', ''); $sApiPath = __DIR__.'/../app/index.php'; @@ -231,10 +231,10 @@ class OC_RainLoop_Helper OCP\Util::writeLog('rainloop', 'rainloop|login: Setting new RainLoop password for '.$sEmail, OCP\Util::DEBUG); - OCP\Config::setUserValue($sUser, 'rainloop', 'rainloop-autologin-password', + \OC::$server->getConfig()->setUserValue($sUser, 'rainloop', 'rainloop-autologin-password', self::encodePassword($sPassword, md5($sEmail))); - OCP\Config::setUserValue($sUser, 'rainloop', 'rainloop-password', + \OC::$server->getConfig()->setUserValue($sUser, 'rainloop', 'rainloop-password', self::encodePassword($sPassword, md5($sEmail))); return true; diff --git a/build/owncloud/rainloop-app/personal.php b/build/owncloud/rainloop-app/personal.php index 449505116..cc920772c 100644 --- a/build/owncloud/rainloop-app/personal.php +++ b/build/owncloud/rainloop-app/personal.php @@ -13,7 +13,7 @@ OCP\App::checkAppEnabled('rainloop'); OCP\Util::addScript('rainloop', 'personal'); -if (OCP\Config::getAppValue('rainloop', 'rainloop-autologin', false)) +if (\OC::$server->getConfig()->getAppValue('rainloop', 'rainloop-autologin', false)) { $oTemplate = new OCP\Template('rainloop', 'empty'); } @@ -23,8 +23,8 @@ else $oTemplate = new OCP\Template('rainloop', 'personal'); - $sEmail = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-email', ''); - $sPass = OCP\Config::getUserValue($sUser, 'rainloop', 'rainloop-password', ''); + $sEmail = \OC::$server->getConfig()->getUserValue($sUser, 'rainloop', 'rainloop-email', ''); + $sPass = \OC::$server->getConfig()->getUserValue($sUser, 'rainloop', 'rainloop-password', ''); $oTemplate->assign('rainloop-email', $sEmail); $oTemplate->assign('rainloop-password', 0 === strlen($sPass) && 0 === strlen($sEmail) ? '' : '******');