extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-24 20:01:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

missing calendar part from r52268

Browse Source
This commit is contained in:
Ralf Becker 2015-03-25 18:35:31 +00:00
parent 8727804b9a
commit dd5ce3e58d
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
calendar/inc/class.calendar_hooks.inc.php
View File

@ -45,6 +45,7 @@ class calendar_hooks
'mime' => array( 'mime' => array(
'text/calendar' => array( 'text/calendar' => array(
'menuaction' => 'calendar.calendar_uiforms.edit', 'menuaction' => 'calendar.calendar_uiforms.edit',
'mime_data' => 'ical_data',
'mime_url' => 'ical_url', 'mime_url' => 'ical_url',
'mime_popup' => '750x400', 'mime_popup' => '750x400',
), ),

36
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -1213,36 +1213,30 @@ class calendar_uiforms extends calendar_ui
unset($event['participants']); unset($event['participants']);
return $this->process_edit($event); return $this->process_edit($event);
} }
// vfs path passed in --> url // vfs url
if (!empty($_GET['ical_vfs']) && egw_vfs::file_exists($_GET['ical_vfs'])) if (!empty($_GET['ical_url']) && parse_url($_GET['ical_url'], PHP_URL_SCHEME) == 'vfs')
{ {
$_GET['ical_url'] = egw_vfs::PREFIX.$_GET['ical_vfs']; $_GET['ical_vfs'] = parse_url($_GET['ical_url'], PHP_URL_PATH);
} }
// url passed in --> read it making sure to prepend own host if it starts with a / // vfs path
if (!empty($_GET['ical_url'])) if (!empty($_GET['ical_vfs']) &&
(!egw_vfs::file_exists($_GET['ical_vfs']) || !($_GET['ical'] = file_get_contents(egw_vfs::PREFIX.$_GET['ical_vfs']))))
{ {
$schema = (string)parse_url($_GET['ical_url'], PHP_URL_SCHEME); //error_log(__METHOD__."() Error: importing the iCal: vfs file not found '$_GET[ical_vfs]'!");
switch($schema) $msg = lang('Error: importing the iCal').': '.lang('VFS file not found').': '.$_GET['ical_vfs'];
{
case '': // own url with webserver_url is a path
$_GET['ical_url'] = ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$_GET['ical_url'];
// fall through
case 'vfs':
case 'http':
case 'https':
$_GET['ical'] = file_get_contents($_GET['ical_url']);
break;
default:
error_log(__METHOD__."() Error: importing the iCal: unsupported schema '$schema'");
$msg = lang('Error: importing the iCal').': '.lang('unsupported schema').' '.$schema;
$event =& $this->default_add_event(); $event =& $this->default_add_event();
break;
} }
if (!empty($_GET['ical_data']) &&
!($_GET['ical'] = egw_link::get_data($_GET['ical_data'])))
{
//error_log(__METHOD__."() Error: importing the iCal: data not found '$_GET[ical_data]'!");
$msg = lang('Error: importing the iCal').': '.lang('Data not found').': '.$_GET['ical_data'];
$event =& $this->default_add_event();
} }
if (!empty($_GET['ical'])) if (!empty($_GET['ical']))
{ {
$ical = new calendar_ical(); $ical = new calendar_ical();
if (!($events = $ical->icaltoegw($_GET['ical_url'], '', 'utf-8')) || count($events) != 1) if (!($events = $ical->icaltoegw($_GET['ical'], '', 'utf-8')) || count($events) != 1)
{ {
error_log(__METHOD__."('$_GET[ical]') error parsing iCal!"); error_log(__METHOD__."('$_GET[ical]') error parsing iCal!");
$msg = lang('Error: importing the iCal'); $msg = lang('Error: importing the iCal');