extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-21 10:27:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix some object/array errors

Browse Source
This commit is contained in:
ralf 2024-05-03 14:53:35 +02:00
parent 335b66612c
commit fc44e90b80
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,18 +69,18 @@ class admin_import_users_csv extends importexport_basic_import_csv
case 'exists' : case 'exists' :
$accounts = array(); $accounts = array();
// Skip the search if the field is empty // Skip the search if the field is empty
if($record[$condition['string']] !== '') if($record->$condition['string'] !== '')
{ {
$accounts = $GLOBALS['egw']->accounts->search(array( $accounts = $GLOBALS['egw']->accounts->search(array(
'type' => 'accounts', 'type' => 'accounts',
'query' => $record[$condition['string']], 'query' => $record->$condition['string'],
'query_type' => $condition['string'] 'query_type' => $condition['string']
)); ));
} }
// Search looks in the given field, but doesn't do an exact match // Search looks in the given field, but doesn't do an exact match
foreach((array)$accounts as $key => $account) foreach((array)$accounts as $key => $account)
{ {
if($account[$condition['string']] != $record[$condition['string']]) if($account[$condition['string']] != $record->$condition['string'])
{ {
unset($accounts[$key]); unset($accounts[$key]);
} }
@ -91,14 +91,14 @@ class admin_import_users_csv extends importexport_basic_import_csv
$action = $condition['true']; $action = $condition['true'];
foreach((array)$accounts as $account) foreach((array)$accounts as $account)
{ {
$record['account_id'] = $account['account_id']; $record->account_id = $account['account_id'];
$success = $this->admin_action($action['action'], $record, $import_csv->get_current_position(), $admin_cmd); $success = $this->admin_action($action['action'], $record->get_record_array(), $import_csv->get_current_position(), $admin_cmd);
} }
} }
else else
{ {
$action = $condition['false']; $action = $condition['false'];
$success = ($this->admin_action($action['action'], $record, $import_csv->get_current_position(), $admin_cmd)); $success = ($this->admin_action($action['action'], $record->get_record_array(), $import_csv->get_current_position(), $admin_cmd));
} }
break; break;
@ -115,7 +115,7 @@ class admin_import_users_csv extends importexport_basic_import_csv
else else
{ {
// unconditional insert // unconditional insert
$success = $this->admin_action('create', $record, $import_csv->get_current_position(), $admin_cmd); $success = $this->admin_action('create', $record->get_record_array(), $import_csv->get_current_position(), $admin_cmd);
} }
return $success; return $success;