[Fusionforge-commits] FusionForge branch 6.0 updated. v6.0.3-59-gdf25d5d

Roland Mas lolando at libremir.placard.fr.eu.org
Wed Jan 6 15:11:49 CET 2016


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, 6.0 has been updated
       via  df25d5d8d0641c378eace91ba156fcf96c826c2b (commit)
      from  ee4d67136ab936c6f2632d2e505bd86175d918bb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=df25d5d8d0641c378eace91ba156fcf96c826c2b

commit df25d5d8d0641c378eace91ba156fcf96c826c2b
Author: Roland Mas <lolando at debian.org>
Date:   Wed Jan 6 15:06:35 2016 +0100

    Better error message when user status is not active

diff --git a/src/plugins/authldap/www/post-login.php b/src/plugins/authldap/www/post-login.php
index 0732bb8..73dfa3a 100644
--- a/src/plugins/authldap/www/post-login.php
+++ b/src/plugins/authldap/www/post-login.php
@@ -92,8 +92,10 @@ if ($login) {
 		} else {
 			$warning_msg = _('Missing Password Or User Name');
 		}
-	} else {
-		$warning_msg = _('LDAP server unreachable');
+	} elseif ($u != NULL && $u->getStatus != 'A') {
+            $warning_msg = _('User is inactive');
+    } else {
+            $warning_msg = _('LDAP server unreachable');
 	}
 }
 

-----------------------------------------------------------------------

Summary of changes:
 src/plugins/authldap/www/post-login.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list