extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-13 16:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

make sure, we use the info_id on conditional actions

Browse Source
This commit is contained in:
Klaus Leithoff 2011-09-29 13:01:32 +00:00
parent 79e51d3cb8
commit 65d63c3fb5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
infolog/inc/class.infolog_import_infologs_csv.inc.php
View File

@ -180,7 +180,7 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin {
} else { } else {
$record['info_owner'] = $_definition->plugin_options['record_owner']; $record['info_owner'] = $_definition->plugin_options['record_owner'];
} }
if (!isset($record['info_owner'])) $record['info_owner'] = $GLOBALS['egw_info']['user']['account_id'];
// Special values // Special values
if ($record['addressbook'] && !is_numeric($record['addressbook'])) if ($record['addressbook'] && !is_numeric($record['addressbook']))
{ {
@ -207,7 +207,8 @@ class infolog_import_infologs_csv implements importexport_iface_import_plugin {
// apply action to all records matching this exists condition // apply action to all records matching this exists condition
$action = $condition['true']; $action = $condition['true'];
foreach ( (array)$results as $contact ) { foreach ( (array)$results as $contact ) {
$record['id'] = $contact['id']; $record['info_id'] = $contact['info_id'];
$record['info_owner'] = $contact['info_owner'];
if ( $_definition->plugin_options['update_cats'] == 'add' ) { if ( $_definition->plugin_options['update_cats'] == 'add' ) {
if ( !is_array( $contact['cat_id'] ) ) $contact['cat_id'] = explode( ',', $contact['cat_id'] ); if ( !is_array( $contact['cat_id'] ) ) $contact['cat_id'] = explode( ',', $contact['cat_id'] );
if ( !is_array( $record['cat_id'] ) ) $record['cat_id'] = explode( ',', $record['cat_id'] ); if ( !is_array( $record['cat_id'] ) ) $record['cat_id'] = explode( ',', $record['cat_id'] );