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

Commit 1ac7d09a authored by Nextgen-Networks's avatar Nextgen-Networks
Browse files

Merge branch '1.12.1-nc14beta' of... 

Merge branch '1.12.1-nc14beta' of https://github.com/nextgen-networks/rainloop-nextcloud into 1.12.1-nc14beta
parents 74cb3a2c 88130912

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/lib/RainLoopHelper.php

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