Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/pierre-alain-b/rainloop-nextcloud.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Bieder <jordan.bieder@geduld.fr>2020-02-03 14:02:41 +0300
committerJordan Bieder <jordan.bieder@geduld.fr>2020-02-03 14:02:41 +0300
commit86d87c8ac9ac3a21ce574b46ae4739c369b11dfc (patch)
treebb064f1d7cbd032748d93f6cf40d6ce6c0d956cd
parent72d765a0af4c02883ea59021b36d9a48a9a8e026 (diff)
In any option selected, check if the user provides individual setting to log in.
If so, then use those.
-rwxr-xr-xrainloop/app.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/rainloop/app.php b/rainloop/app.php
index 4ab70ee..1f8bd2b 100755
--- a/rainloop/app.php
+++ b/rainloop/app.php
@@ -50,9 +50,10 @@ if (@file_exists(__DIR__.'/app/index.php'))
$sPasswordSalt = $sUser;
$sEncodedPassword = \OC::$server->getConfig()->getUserValue($sUser, 'rainloop', 'rainloop-autologin-password', '');
}
- else
+ $sIndividualEmail = \OC::$server->getConfig()->getUserValue($sUser, 'rainloop', 'rainloop-email', '');
+ if (!empty($sIndividualEmail))
{
- $sEmail = \OC::$server->getConfig()->getUserValue($sUser, 'rainloop', 'rainloop-email', '');
+ $sEmail = $sIndividualEmail;
$sPasswordSalt = $sEmail;
$sEncodedPassword = \OC::$server->getConfig()->getUserValue($sUser, 'rainloop', 'rainloop-password', '');
}