[Fusionforge-commits] FusionForge branch Branch_5_3 updated. c7c0d12f0f72458ce960297bf4812d3c9b8d5294

Franck Villaume nerville at fusionforge.org
Thu May 15 16:01:18 CEST 2014


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, Branch_5_3 has been updated
       via  c7c0d12f0f72458ce960297bf4812d3c9b8d5294 (commit)
      from  e6d8521ae6720230398247b7468b19f2b0219e15 (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 -----------------------------------------------------------------
commit c7c0d12f0f72458ce960297bf4812d3c9b8d5294
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu May 15 15:59:45 2014 +0200

    fix [#666]: wrong update for unix_status in the useredit.php page.

diff --git a/src/www/admin/useredit.php b/src/www/admin/useredit.php
index cc15b2b..11dad12 100644
--- a/src/www/admin/useredit.php
+++ b/src/www/admin/useredit.php
@@ -69,17 +69,6 @@ if (getStringFromRequest('delete_user') != '') {
 		exit_error( _('Could Not Complete Operation: ').$u->getErrorMessage(),'admin');
 	}
 
-	if ($u->getUnixStatus() != 'N') {
-		$u->setUnixStatus($status);
-	} else {
-		if (count($u->getGroups())>0 && $u->isActive()) {
-			$u->setUnixStatus('A');
-		}else{
-			// make sure that user doesn't have LDAP entry
-			$u->setUnixStatus('N');
-		}
-	}
-
 	if (is_array($addToProjectArray)) {
 		foreach($addToProjectArray as $project_id_to_add) {
 			$feedbackMembership = '';
@@ -101,6 +90,17 @@ if (getStringFromRequest('delete_user') != '') {
 		}
 	}
 
+	if ($u->getUnixStatus() == 'A') {
+		$u->setUnixStatus($status);
+	} else {
+		if (count($u->getGroups())>0 && $u->isActive()) {
+			$u->setUnixStatus('A');
+		}else{
+			// make sure that user doesn't have LDAP entry
+			$u->setUnixStatus('N');
+		}
+	}
+
 	if ($u->isError()) {
 		$error_msg = $u->getErrorMessage();
 		if (isset($error_msgMembership) && sizeof($error_msgMembership))

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

Summary of changes:
 src/www/admin/useredit.php |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list