From 8262dc54e70e8f929fbb684c9e9e6e6c238abffd Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Wed, 24 Apr 2013 13:05:37 +0000
Subject: [PATCH] use cache invalidation on inital read before edit too; add
 missing translation

---
 admin/inc/class.uiaccounts.inc.php | 10 ++++++----
 admin/lang/egw_de.lang             |  1 +
 admin/lang/egw_en.lang             |  1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/admin/inc/class.uiaccounts.inc.php b/admin/inc/class.uiaccounts.inc.php
index 75059b22dc..3f93463fde 100755
--- a/admin/inc/class.uiaccounts.inc.php
+++ b/admin/inc/class.uiaccounts.inc.php
@@ -1371,9 +1371,11 @@
 			{
 				if($_account_id)
 				{
-					$account =& CreateObject('phpgwapi.accounts',(int)$_account_id,'u');
-					$userData = $account->read_repository();
-					$userGroups = $account->membership($_account_id);
+					// invalidate account, before reading it, to cope with changes to DB or LDAP outside EGw
+					accounts::cache_invalidate((int)$_account_id);
+					$userData = $GLOBALS['egw']->accounts->read((int)$_account_id,'u');
+
+					$userGroups = $GLOBALS['egw']->accounts->membership($_account_id);
 					$acl =& CreateObject('phpgwapi.acl',$_account_id);
 					$acl->read_repository();
 					$userData['anonymous'] = $acl->check('anonymous',1,'phpgwapi');
@@ -1394,7 +1396,7 @@
 					$userData['changepassword'] = (bool)$GLOBALS['egw_info']['server']['change_pwd_every_x_days'];
 					$userData['mustchangepassword'] = false;
 				}
-				$allGroups = $account->get_list('groups');
+				$allGroups = $GLOBALS['egw']->accounts->get_list('groups');
 			}
 			$page_params['menuaction'] = 'admin.uiaccounts.'.($_account_id?'edit':'add').'_user';
 			if($_account_id)
diff --git a/admin/lang/egw_de.lang b/admin/lang/egw_de.lang
index 73bafef7d7..1af56321ca 100644
--- a/admin/lang/egw_de.lang
+++ b/admin/lang/egw_de.lang
@@ -638,6 +638,7 @@ wrong account type: %1 is no %2 !!!	admin	de	Falscher Konten Typ: %1 ist kein(e)
 wrong admin-account or -password !!!	admin	de	Falscher Admin-Account oder Passwort !!!
 xml-rpc	admin	de	XML-RPC
 yes, but no scayt	admin	de	Ja, aber keine automatische Rechtschreibüberprüfung
+yes, use browser based spell checking engine	admin	de	Ja, benutze nur die im Browser eingebaute Rechtschreibhilfe
 yes, use webspellchecker	admin	de	Ja, benutze nur den WebSpellChecker (online)
 you can only change the hash, if you set a random password or currently use plaintext passwords!	admin	de	Sie können die Passwort-Verschlüsselung nur ändern, wenn sie ein zufälliges Passwort setzen oder bisher Passworte im Klartext gespeichert haben!
 you have entered an invalid expiration date	admin	de	Sie haben ein ungültiges Ablaufdatum angegeben
diff --git a/admin/lang/egw_en.lang b/admin/lang/egw_en.lang
index 986eadffe5..f5b2c888d7 100644
--- a/admin/lang/egw_en.lang
+++ b/admin/lang/egw_en.lang
@@ -639,6 +639,7 @@ wrong account type: %1 is no %2 !!!	admin	en	Wrong account type: %1 is NO %2 !
 wrong admin-account or -password !!!	admin	en	Wrong admin account or password!
 xml-rpc	admin	en	XML-RPC
 yes, but no scayt	admin	en	Yes, but no Spell Check As You Type (online)
+yes, use browser based spell checking engine	admin	en	Yes, use browser based spell checking engine
 yes, use webspellchecker	admin	en	Yes, use online WebSpellChecker
 you can only change the hash, if you set a random password or currently use plaintext passwords!	admin	en	You can change the hash only, if you set a random password or currently use plaintext passwords!
 you have entered an invalid expiration date	admin	en	You have entered an invalid expiration date!