From 1267d2ed60c6914c59a69c0d7ef65ef90b8a5d74 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 26 May 2011 18:30:54 +0000 Subject: [PATCH] reverted accidential commited calendar_ui (re-added old ical import) --- calendar/inc/class.calendar_ui.inc.php | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php index d2b4f95ded..a3afa5b2f7 100644 --- a/calendar/inc/class.calendar_ui.inc.php +++ b/calendar/inc/class.calendar_ui.inc.php @@ -773,16 +773,10 @@ function load_cal(url,id) { 'link' => False ); } - $file[] = array( - 'text' => lang('Import').': '.html::a_href(lang('iCal'),'calendar.calendar_uiforms.import'). - ' & '.html::a_href(lang('CSV'),'/calendar/csv_import.php'), - 'no_lang' => True, - 'link' => False, - ); // Merge print - if ($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir']) - { + if ($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir']) + { $options = ''; $documents = calendar_merge::get_documents($GLOBALS['egw_info']['user']['preferences']['calendar']['document_dir']); @@ -790,7 +784,7 @@ function load_cal(url,id) { $spreadsheets = importexport_admin_prefs_sidebox_hooks::get_spreadsheet_list('calendar'); foreach($spreadsheets as $file_info) { - if($key = array_search($file_info['name'], $documents)) + if($key = array_search($file_info['name'], $documents)) { unset($documents[$key]); } @@ -863,7 +857,7 @@ function load_cal(url,id) { if(!$timespan) { $timespan = array(array( - 'start' => is_array($this->first) ? $this->bo->date2ts($this->first) : $this->first, + 'start' => is_array($this->first) ? $this->bo->date2ts($this->first) : $this->first, 'end' => is_array($this->last) ? $this->bo->date2ts($this->last) : $this->last )); }