From d63ee993b30ff1e5780220c6f9fc133bf83f5652 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 16 Jul 2013 14:58:38 +0000
Subject: [PATCH] AD requires to activate account AFTER setting pw

---
 admin/inc/class.boaccounts.inc.php | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/admin/inc/class.boaccounts.inc.php b/admin/inc/class.boaccounts.inc.php
index ad1a9d369a..38bce508c6 100755
--- a/admin/inc/class.boaccounts.inc.php
+++ b/admin/inc/class.boaccounts.inc.php
@@ -381,16 +381,16 @@
 
 			// do NOT save password via accounts::save, as pw policy violation can happen and we cant/dont report that way
 			$passwd = $_userData['account_passwd'];
+			$new_account = !$_userData['account_id'];
 			unset($_userData['account_passwd']);
 			unset($_userData['account_passwd_2']);
-			if (!$GLOBALS['egw']->accounts->save($_userData))
+
+			if ($new_account && !$GLOBALS['egw']->accounts->save($_userData))
 			{
 				$errors[] = lang('Failed to save user!');
 				return $errors;
 			}
 
-			$GLOBALS['egw']->accounts->set_memberships($_userData['account_groups'],$_userData['account_id']);
-
 			if ($passwd)
 			{
 				try {
@@ -404,23 +404,32 @@
 						$GLOBALS['egw']->hooks->process($GLOBALS['hook_values']+array(
 							'location' => 'changepassword'
 						),False,True);	// called for every app now, not only enabled ones)
-						if ($_userData['account_lastpwd_change']==0)
+
+						if ($_userData['account_lastpwd_change']==0 ||	// AD requires to activate account AFTER setting pw
+							$new_account && $_userData['account_status'] == 'A' && $GLOBALS['egw']->accounts->require_password_for_enable())
 						{
 							// change password sets the shadow_timestamp/account_lastpwd_change timestamp
 							// so we need to reset that to 0 as Admin required the change of password upon next login
-							unset($_userData['account_passwd']);
-							$this->save_user($_userData);
+							$GLOBALS['egw']->accounts->save($_userData);
 						}
 					}
 					else
 					{
-						$errors[] = lang('Failed to change password.  Please contact your administrator.');
+						$errors[] = lang('Failed to change password.');
 					}
 				}
 				catch(Exception $e) {
 					$errors[] = $e->getMessage();
 				}
 			}
+			$GLOBALS['egw']->accounts->set_memberships($_userData['account_groups'],$_userData['account_id']);
+
+			if (!$new_account && !$GLOBALS['egw']->accounts->save($_userData))
+			{
+				$errors[] = lang('Failed to save user!');
+				return $errors;
+			}
+
 			if ($_userData['account_lastpwd_change']==0)
 			{
 				if (!isset($auth)) $auth =& CreateObject('phpgwapi.auth');