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

Fix handling of recurrence and time zone

Browse Source
This commit is contained in:
Nathan Gray 2012-10-12 17:11:29 +00:00
parent dccb36e16a
commit 02e72dc15c
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
calendar/inc/class.calendar_import_csv.inc.php
View File

@ -47,7 +47,7 @@ class calendar_import_csv implements importexport_iface_import_plugin {
/** /**
* actions wich could be done to data entries * actions wich could be done to data entries
*/ */
protected static $actions = array( 'none', 'update', 'insert' ); protected static $actions = array( 'none', 'insert' );
/** /**
* conditions for actions * conditions for actions
@ -143,8 +143,8 @@ class calendar_import_csv implements importexport_iface_import_plugin {
} }
// set eventOwner // set eventOwner
$_definition->plugin_options['owner'] = isset( $_definition->plugin_options['owner'] ) ? $options =& $_definition->plugin_options;
$_definition->plugin_options['owner'] : $this->user; $options['owner'] = $options['owner'] ? $options['owner'] : $this->user;
// Start counting successes // Start counting successes
$count = 0; $count = 0;
@ -163,7 +163,8 @@ class calendar_import_csv implements importexport_iface_import_plugin {
1 => lang('Low'), 1 => lang('Low'),
2 => lang('Normal'), 2 => lang('Normal'),
3 => lang('High') 3 => lang('High')
), ),
'recurrence' => $this->bo->recur_types
); );
while ( $record = $import_csv->get_record() ) { while ( $record = $import_csv->get_record() ) {
@ -183,12 +184,12 @@ class calendar_import_csv implements importexport_iface_import_plugin {
$this->errors[$import_csv->get_current_position()] = lang( $this->errors[$import_csv->get_current_position()] = lang(
'Invalid owner ID: %1. Might be a bad field translation. Used %2 instead.', 'Invalid owner ID: %1. Might be a bad field translation. Used %2 instead.',
$record['owner'], $record['owner'],
$_definition->plugin_options['owner'] $options['owner']
); );
$record['owner'] = $_definition->plugin_options['owner']; $record['owner'] = $options['owner'];
} }
} else { } else {
$record['owner'] = $_definition->plugin_options['owner']; $record['owner'] = $options['owner'];
} }
if ($record['participants'] && !is_array($record['participants'])) { if ($record['participants'] && !is_array($record['participants'])) {
@ -212,6 +213,15 @@ class calendar_import_csv implements importexport_iface_import_plugin {
} }
} }
if($record['recurrence'])
{
list($record['recur_type'], $record['recur_interval']) = explode('/',$record['recurrence'],2);
$record['recur_interval'] = trim($record['recur_interval']);
$record['recur_type'] = array_search(strtolower(trim($record['recur_type'])), array_map('strtolower',$lookups['recurrence']));
unset($record['recurrence']);
}
$record['tzid'] = calendar_timezones::id2tz($record['tz_id']);
// Calendar doesn't actually support conditional importing // Calendar doesn't actually support conditional importing
if ( $_definition->plugin_options['conditions'] ) { if ( $_definition->plugin_options['conditions'] ) {
foreach ( $_definition->plugin_options['conditions'] as $condition ) { foreach ( $_definition->plugin_options['conditions'] as $condition ) {