From 5f919ced72799c0ef8bc4835cf5a7da550f33842 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 13 Nov 2015 15:50:32 +0000 Subject: [PATCH] * ImportExport: switch notifications off by default on import --- calendar/inc/class.calendar_import_ical.inc.php | 5 +++++ importexport/inc/class.importexport_import_ui.inc.php | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/calendar/inc/class.calendar_import_ical.inc.php b/calendar/inc/class.calendar_import_ical.inc.php index ed9ee8924a..fa4da1c3f8 100644 --- a/calendar/inc/class.calendar_import_ical.inc.php +++ b/calendar/inc/class.calendar_import_ical.inc.php @@ -131,6 +131,11 @@ class calendar_import_ical implements importexport_iface_import_plugin { echo lang("No preview for iCal"); return; } + // switch off notifications by default + if (!isset($_definition->plugin_options['no_notification'])) + { + $_definition->plugin_options['no_notification'] = true; + } if (!$calendar_ical->importVCal($_stream, -1,null,false,0,'',null,null,null,$_definition->plugin_options['no_notification'])) { $this->errors[] = lang('Error: importing the iCal'); diff --git a/importexport/inc/class.importexport_import_ui.inc.php b/importexport/inc/class.importexport_import_ui.inc.php index 1b95daf174..61d70789dd 100644 --- a/importexport/inc/class.importexport_import_ui.inc.php +++ b/importexport/inc/class.importexport_import_ui.inc.php @@ -44,7 +44,7 @@ $definition = $_GET['definition'] ? $_GET['definition'] : $content['definition']; $template = new etemplate_new('importexport.import_dialog'); - + // Load application's translations if($appname) { @@ -204,6 +204,7 @@ $data['appname'] = $preserve['appname'] = $appname ? $appname : ($definition_obj ? $definition_obj->application : ''); $data['definition'] = $definition; $data['delimiter'] = $definition_obj->plugin_options['delimiter']; + $data['no_notifications'] = true; // switch notifications off by default $sel_options = self::get_select_options($data); @@ -418,7 +419,7 @@ continue; } //error_log("Raw[Defn: {$options['csv_fields'][$index]} File: $header] Lang[Defn: $lang_defn File: $lang_file] MSG_ID[Defn: $defn_message_id File: $file_message_id]"); - + // Problem $message[] = lang("Column mismatch: %1 should be %2, not %3", $index,$options['csv_fields'][$index], $header);