extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-22 22:08:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

invalidate account, before reading it, to code with changed to DB or LDAP outside EGw

Browse Source
This commit is contained in:
Ralf Becker 2013-04-23 13:47:20 +00:00
parent a211ea665d
commit 5c71e6916e
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/inc/class.admin_cmd_edit_group.inc.php
View File

@ -5,7 +5,7 @@
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de> * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @package admin * @package admin
* @copyright (c) 2007 by Ralf Becker <RalfBecker-AT-outdoor-training.de> * @copyright (c) 2007-13 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$ * @version $Id$
*/ */
@ -83,6 +83,8 @@ class admin_cmd_edit_group extends admin_cmd
if ($this->account) if ($this->account)
{ {
// invalidate account, before reading it, to code with changed to DB or LDAP outside EGw
accounts::cache_invalidate($data['account_id']);
if (!($old = admin_cmd::$accounts->read($data['account_id']))) if (!($old = admin_cmd::$accounts->read($data['account_id'])))
{ {
throw new egw_exception_wrong_userinput(lang("Unknown account: %1 !!!",$this->account),15); throw new egw_exception_wrong_userinput(lang("Unknown account: %1 !!!",$this->account),15);

4
admin/inc/class.admin_cmd_edit_user.inc.php
View File

@ -5,7 +5,7 @@
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de> * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @package admin * @package admin
* @copyright (c) 2007-10 by Ralf Becker <RalfBecker-AT-outdoor-training.de> * @copyright (c) 2007-13 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$ * @version $Id$
*/ */
@ -123,6 +123,8 @@ class admin_cmd_edit_user extends admin_cmd_change_pw
if ($this->account) if ($this->account)
{ {
// invalidate account, before reading it, to code with changed to DB or LDAP outside EGw
accounts::cache_invalidate($data['account_id']);
if (!($old = admin_cmd::$accounts->read($data['account_id']))) if (!($old = admin_cmd::$accounts->read($data['account_id'])))
{ {
throw new egw_exception_wrong_userinput(lang("Unknown account: %1 !!!",$this->account),15); throw new egw_exception_wrong_userinput(lang("Unknown account: %1 !!!",$this->account),15);

14
admin/inc/class.uiaccounts.inc.php
View File

@ -994,8 +994,9 @@
$t->parse('password_fields','form_logininfo',True); $t->parse('password_fields','form_logininfo',True);
$account =& CreateObject('phpgwapi.accounts',(int)$_GET['account_id'],'u'); // invalidate account, before reading it, to code with changed to DB or LDAP outside EGw
$userData = $account->read_repository(); accounts::cache_invalidate((int)$_GET['account_id']);
$userData = $GLOBALS['egw']->accounts->read((int)$_GET['account_id'],'u');
$var['account_lid'] = $userData['account_lid']; $var['account_lid'] = $userData['account_lid'];
$var['account_firstname'] = $userData['firstname']; $var['account_firstname'] = $userData['firstname'];
@ -1053,7 +1054,7 @@
} }
// Find out which groups they are members of // Find out which groups they are members of
$usergroups = $account->membership((int)$_GET['account_id']); $usergroups = $GLOBALS['egw']->accounts->membership((int)$_GET['account_id']);
if(!@is_array($usergroups)) if(!@is_array($usergroups))
{ {
$var['groups_select'] = lang('None'); $var['groups_select'] = lang('None');
@ -1174,8 +1175,10 @@
$p->set_file(Array('edit' => 'group_form.tpl')); $p->set_file(Array('edit' => 'group_form.tpl'));
$p->set_block('edit','select'); $p->set_block('edit','select');
$p->set_block('edit','popwin'); $p->set_block('edit','popwin');
//fix from Maanus 280105
$accounts =& CreateObject('phpgwapi.accounts',$group_info['account_id'],'g'); // invalidate account, before reading it, to code with changed to DB or LDAP outside EGw
accounts::cache_invalidate((int)$_GET['account_id']);
$group_repository = $GLOBALS['egw']->accounts->read((int)$_GET['account_id'],'u');
$p->set_var('accounts',$GLOBALS['egw']->uiaccountsel->selection('account_user[]','admin_uiaccounts_user',$group_info['account_user'],'accounts',min(3+count($group_info['account_user']),10),false,'style="width: 300px;"')); $p->set_var('accounts',$GLOBALS['egw']->uiaccountsel->selection('account_user[]','admin_uiaccounts_user',$group_info['account_user'],'accounts',min(3+count($group_info['account_user']),10),false,'style="width: 300px;"'));
@ -1190,7 +1193,6 @@
); );
$p->set_var($var); $p->set_var($var);
$group_repository = $accounts->read_repository();
if (!$group_repository['file_space']) if (!$group_repository['file_space'])
{ {
$group_repository['file_space'] = $GLOBALS['egw_info']['server']['vfs_default_account_size_number'] . "-" . $GLOBALS['egw_info']['server']['vfs_default_account_size_type']; $group_repository['file_space'] = $GLOBALS['egw_info']['server']['vfs_default_account_size_number'] . "-" . $GLOBALS['egw_info']['server']['vfs_default_account_size_type'];