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

Unverified Commit 17a2feb7 authored by Tab Fitts's avatar Tab Fitts
Browse files

Replace deprecated OCP\Config class. 

https://github.com/nextcloud/server/pull/7840
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/ajax/admin.php

+2 −2
Original line number Diff line number Diff line
@@ -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

{

rainloop/ajax/personal.php

+3 −3
Original line number Diff line number Diff line
@@ -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

{

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');