Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0616d8b7 authored by Nextgen-Networks's avatar Nextgen-Networks
Browse files

OCP\Config is deprecated/removed 

Replaced OCP\Config:: with \OC::$server->getConfig()->

Thanks Tab Fitts for the hint!
parent cc9ec668

rainloop/admin.php

+1 −1
Original line number Diff line number Diff line
@@ -14,5 +14,5 @@ OCP\Util::addScript('rainloop', 'admin'); 


$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();

rainloop/app.php

+4 −4
Original line number Diff line number Diff line
@@ -29,15 +29,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));

rainloop/appinfo/app.php

+1 −1
Original line number Diff line number Diff line
@@ -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');

rainloop/personal.php

+3 −3
Original line number Diff line number Diff line
@@ -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) ? '' : '******');