extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 00:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed problem in import reported by Lutz: global var and reference problem

Browse Source
This commit is contained in:
Ralf Becker 2006-03-17 21:09:40 +00:00
parent c1b44bf441
commit 9b89e909af
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/csv_import.php
View File

@ -37,7 +37,7 @@
$GLOBALS['egw']->redirect_link('/admin/index.php'); $GLOBALS['egw']->redirect_link('/admin/index.php');
} }
$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps']['calendar']['title'].' - '.lang('Import CSV-File'); $GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps']['calendar']['title'].' - '.lang('Import CSV-File');
$uical =& CreateObject('calendar.uical',true); $cal =& CreateObject('calendar.uical',true);
$GLOBALS['egw']->common->egw_header(); $GLOBALS['egw']->common->egw_header();
$GLOBALS['egw']->template->set_file(array('import_t' => 'csv_import.tpl')); $GLOBALS['egw']->template->set_file(array('import_t' => 'csv_import.tpl'));
@ -472,7 +472,7 @@
{ {
$values['uid'] = 'cal-csv-import-'.$values['uid'].'-'.$GLOBALS['egw_info']['server']['install_id']; $values['uid'] = 'cal-csv-import-'.$values['uid'].'-'.$GLOBALS['egw_info']['server']['install_id'];
} }
if (($event = $uical->bo->read($values['uid'],null,$is_admin))) // no ACL check for admins if (($event = $cal->bo->read($values['uid'],null,$is_admin))) // no ACL check for admins
{ {
//echo "updating existing event"; _debug_array($event); //echo "updating existing event"; _debug_array($event);
$values['id'] = $event['id']; $values['id'] = $event['id'];
@ -480,7 +480,7 @@
} }
$action = $values['id'] ? 'updating' : 'adding'; $action = $values['id'] ? 'updating' : 'adding';
//echo $action.'<pre>'.print_r($values,True)."</pre>\n"; //echo $action.'<pre>'.print_r($values,True)."</pre>\n";
$cal_id = $uical->bo->update($values,true,!$values['modified'],$is_admin); // ignoring conflicts and ACL (for admins) on import $cal_id = $cal->bo->update($values,true,!$values['modified'],$is_admin); // ignoring conflicts and ACL (for admins) on import
$log .= "\t\t".'<td align="center">'.($cal_id ? $action." cal_id=$cal_id" : 'Error '.$action)."</td>\n\t</tr>\n"; $log .= "\t\t".'<td align="center">'.($cal_id ? $action." cal_id=$cal_id" : 'Error '.$action)."</td>\n\t</tr>\n";
} }