From ae51ae95bc5f34af2fb11c5a086e8eda122b78ad Mon Sep 17 00:00:00 2001
From: Vinciane <vinciane.bizet@maarch.org>
Date: Mon, 21 Jan 2019 17:30:10 +0100
Subject: [PATCH] rollback change password before activate user
---
apps/maarch_entreprise/index.php | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/apps/maarch_entreprise/index.php b/apps/maarch_entreprise/index.php
index 587e1c01185..84751d7cd57 100755
--- a/apps/maarch_entreprise/index.php
+++ b/apps/maarch_entreprise/index.php
@@ -339,6 +339,9 @@ if (!empty($_REQUEST['page']) && empty($_REQUEST['triggerAngular'])) {
//HTML CONTENT OF ANGULAR
echo \SrcCore\models\CoreConfigModel::initAngularStructure();
+ if ($user['status'] == 'ABS') {
+ $_REQUEST['triggerAngular'] = 'activateUser';
+ }
$loggingMethod = \SrcCore\models\CoreConfigModel::getLoggingMethod();
if (!in_array($loggingMethod['id'], ['sso', 'cas', 'ldap', 'ozwillo', 'shibboleth'])) {
@@ -355,11 +358,7 @@ if (!empty($_REQUEST['page']) && empty($_REQUEST['triggerAngular'])) {
}
}
}
- if ($user['status'] == 'ABS') {
- $_REQUEST['triggerAngular'] = 'activateUser';
- }
-
-
+
if (isset($_SESSION['HTTP_REFERER'])) {
$url = $_SESSION['HTTP_REFERER'];
unset($_SESSION['HTTP_REFERER']);
--
GitLab