From 4b3c6d636eaec27c8ff68e17949665cb521479e7 Mon Sep 17 00:00:00 2001
From: Julien HEYMAN <julien.heyman@atosorigin.com>
Date: Fri, 5 Jun 2009 14:36:12 +0000
Subject: [PATCH] Active unix account when we reactive an account

---
 gforge/www/admin/useredit.php | 8 ++++++--
 gforge/www/admin/userlist.php | 6 +++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/gforge/www/admin/useredit.php b/gforge/www/admin/useredit.php
index 3e129e2211..ba0afd2363 100644
--- a/gforge/www/admin/useredit.php
+++ b/gforge/www/admin/useredit.php
@@ -71,8 +71,12 @@ if (getStringFromRequest('delete_user') != '' && getStringFromRequest('confirm_d
 	if ($u->getUnixStatus() != 'N') {
 		$u->setUnixStatus($status);
 	} else {
-		// make sure that user doesn't have LDAP entry
-		$u->setUnixStatus('N');
+		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()) {
diff --git a/gforge/www/admin/userlist.php b/gforge/www/admin/userlist.php
index c5336c9bdf..1bccd05dc1 100644
--- a/gforge/www/admin/userlist.php
+++ b/gforge/www/admin/userlist.php
@@ -48,7 +48,11 @@ function performAction($newStatus, $statusString, $user_id) {
 	} else {
 		if(!$u->setStatus($newStatus)) {
 			exit_error('Error',$u->getErrorMessage());
-		}	
+		}
+		if(!$u->setUnixStatus($newStatus)) {
+			exit_error('Error',$u->getErrorMessage());
+		}
+
 	}
 	echo "<h2>" .sprintf(_('User updated to %1$s status'), $statusString)."</h2>";
 }
-- 
2.30.2