From 6c7931e234c8bf5f2e77c0921c6e3f99889185c2 Mon Sep 17 00:00:00 2001
From: Jordan Bieder <jordan.bieder@uliege.be>
Date: Thu, 24 Oct 2019 20:03:59 +0200
Subject: [PATCH] Fix missing coma. Beautification for tabs alignment Fix
 autologin with autologin with email which did not work ...

---
 rainloop/app.php         | 10 +++++-----
 rainloop/appinfo/app.php |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 rainloop/appinfo/app.php

diff --git a/rainloop/app.php b/rainloop/app.php
index a66074ce..7fe66c75 100755
--- 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
old mode 100755
new mode 100644
index cd21ed0d..496c3a68
--- 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');