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

* ImportExport: switch notifications off by default on import

Browse Source
This commit is contained in:
Ralf Becker 2015-11-13 15:50:32 +00:00
parent ae72f4d481
commit 5f919ced72
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
calendar/inc/class.calendar_import_ical.inc.php
View File

@ -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');

5
importexport/inc/class.importexport_import_ui.inc.php
View File

@ -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);