Fix missing coma.

Beautification for tabs alignment Fix autologin with autologin with email which did not work ...
pierre-alain-b · Oct 24, 2019 · 6c7931e · 6c7931e
1 parent f78e95d
commit 6c7931e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/rainloop/app.php b/rainloop/app.php
@@ -1,4 +1,4 @@
-<?php
+appinfo/app.php<?php
 
 /**
  * Nextcloud - RainLoop mail plugin
@@ -36,24 +36,24 @@
 		$sEncodedPassword = '';
 
 		$sUser = OCP\User::getUser();
-    $sPasswordSalt = '';
+		$sPasswordSalt = '';
 
 		if (\OC::$server->getConfig()->getAppValue('rainloop', 'rainloop-autologin', false))
 		{
 			$sEmail = $sUser;
-      $sPasswordSalt = $sUser;
+			$sPasswordSalt = $sUser;
 			$sEncodedPassword = \OC::$server->getConfig()->getUserValue($sUser, 'rainloop', 'rainloop-autologin-password', '');
 		}
 		else if (\OC::$server->getConfig()->getAppValue('rainloop', 'rainloop-autologin-with-email', false))
 		{
 			$sEmail = \OC::$server->getConfig()->getUserValue($sUser, 'settings', 'email','');
-      $sPasswordSalt = $sUser;
+			$sPasswordSalt = $sUser;
 			$sEncodedPassword = \OC::$server->getConfig()->getUserValue($sUser, 'rainloop', 'rainloop-autologin-password', '');
 		}
 		else
 		{
 			$sEmail = \OC::$server->getConfig()->getUserValue($sUser, 'rainloop', 'rainloop-email', '');
-      $sPasswordSalt = $sEmail
+			$sPasswordSalt = $sEmail;
 			$sEncodedPassword = \OC::$server->getConfig()->getUserValue($sUser, 'rainloop', 'rainloop-password', '');
 		}
 

diff --git a/rainloop/appinfo/app.php b/rainloop/appinfo/app.php
@@ -13,7 +13,7 @@
 OCP\App::registerAdmin('rainloop', 'admin');
 OCP\App::registerPersonal('rainloop', 'personal');
 
-if (\OC::$server->getConfig()->getAppValue('rainloop', 'rainloop-autologin', false))
+if (\OC::$server->getConfig()->getAppValue('rainloop', 'rainloop-autologin', false) || \OC::$server->getConfig()->getAppValue('rainloop', 'rainloop-autologin-with-email', false))
 {
 	OCP\Util::connectHook('OC_User', 'post_login', 'OC_RainLoop_Helper', 'login');
 	OCP\Util::connectHook('OC_User', 'post_setPassword', 'OC_RainLoop_Helper', 'changePassword');