holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reverted accidential commited calendar_ui (re-added old ical import)

Browse Source
This commit is contained in:
Ralf Becker 2011-05-26 18:30:54 +00:00
parent 547ec37257
commit 1267d2ed60
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
calendar/inc/class.calendar_ui.inc.php
View File

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