holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Admin - Record old values for change history when import updates an existing account

Browse Source
This commit is contained in:
nathangray 2019-06-17 16:30:07 -06:00
parent 6d54365f4f
commit 759fcbca51
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
admin/inc/class.admin_import_users_csv.inc.php
View File

@ -201,11 +201,20 @@ class admin_import_users_csv implements importexport_iface_import_plugin {
case 'disable': case 'disable':
case 'enable': case 'enable':
$_data['account_expires'] = $_action == 'disable' ? 'already' : ''; $_data['account_expires'] = $_action == 'disable' ? 'already' : '';
case 'create' :
case 'update' : case 'update' :
$old = $GLOBALS['egw']->accounts->read($_data['account_id']);
if($old)
{
$old['account_passwd'] = $old['account_pwd']; unset($old['account_pwd']);
$old['account_groups'] = implode(',',$GLOBALS['egw']->accounts->memberships($_data['account_id'], true));
// Limit history to what actually changed
$old = array_intersect_key($old, $_data);
}
case 'create' :
$command = new admin_cmd_edit_user(array( $command = new admin_cmd_edit_user(array(
'account' => $_action=='create'?null:(int)$_data['account_id'], 'account' => $_action=='create'?null:(int)$_data['account_id'],
'set' => $_data 'set' => $_data,
'old' => $_action=='create'?null:$old
)+(array)$admin_cmd); )+(array)$admin_cmd);