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

Unverified Commit b0d41191 authored by Pierre-Alain Bandinelli's avatar Pierre-Alain Bandinelli Committed by GitHub
Browse files

Merge pull request #136 from piti-diablotin/master 

Automatically fall back to user defined credentials
parents 72d765a0 9ae35349

rainloop/app.php

+3 −2
Original line number Diff line number Diff line
@@ -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', '');

		}

rainloop/templates/admin-local.php

+3 −3
Original line number Diff line number Diff line
@@ -18,19 +18,19 @@ 
				<div style="display: flex;">

					<input type="radio" id="rainloop-noautologin" name="rainloop-autologin" value="0" <?php if (!$_['rainloop-autologin']&&!$_['rainloop-autologin-with-email']): ?>checked="checked"<?php endif; ?> />

					<label style="margin: auto 5px;" for="rainloop-noautologin">

						<?php p($l->t('Do not automatically login')); ?>

						<?php p($l->t('Let the user define its own email/password credentials only')); ?>

					</label>

				</div>

				<div style="display: flex;">

					<input type="radio" id="rainloop-autologin" name="rainloop-autologin" value="1" <?php if ($_['rainloop-autologin']): ?>checked="checked"<?php endif; ?> />

					<label style="margin: auto 5px;" for="rainloop-autologin">

						<?php p($l->t('Automatically login with Nextcloud user credentials')); ?>

						<?php p($l->t('Automatically login with Nextcloud user credentials or user defined credentials')); ?>

					</label>

				</div>

				<div style="display: flex;">

					<input type="radio" id="rainloop-autologin-with-email" name="rainloop-autologin" value="2" <?php if ($_['rainloop-autologin-with-email']): ?>checked="checked"<?php endif; ?> />

					<label style="margin: auto 5px;" for="rainloop-autologin-with-email">

						<?php p($l->t('Automatically login with Nextcloud user email credentials')); ?>

						<?php p($l->t('Automatically login with Nextcloud user email credentials or user defined credentials')); ?>

					</label>

				</div>

				<br />