extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-25 15:29:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix Prefer header to use return=(minimal|representation) instead of older draft dash, enable add-member property, and add Location header to action=attachment-add

Browse Source
This commit is contained in:
Ralf Becker 2013-09-24 12:29:17 +00:00
parent 45326fa484
commit 0601d40bd3
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
phpgwapi/inc/class.groupdav.inc.php
View File

@ -835,11 +835,11 @@ class groupdav extends HTTP_WebDAV_Server
} }
// rfc 5995 (Use POST to add members to WebDAV collections): we use collection path with add-member query param // rfc 5995 (Use POST to add members to WebDAV collections): we use collection path with add-member query param
/* leaving it switched off, until further testing, because OS X iCal seem to ignore it and OS X Addressbook uses POST to full URL without ?add-member // leaving it switched off, until further testing, because OS X iCal seem to ignore it and OS X Addressbook uses POST to full URL without ?add-member
if ($app && !in_array($app,array('inbox','outbox','principals'))) // not on inbox, outbox or principals if ($app && !in_array($app,array('inbox','outbox','principals'))) // not on inbox, outbox or principals
{ {
$props['add-member'][] = self::mkprop('href',$this->base_uri.$path.'?add-member'); $props['add-member'][] = self::mkprop('href',$this->base_uri.$path.'?add-member');
}*/ }
// add props modifyable via proppatch from client, eg. calendar-color, see self::$proppatch_props // add props modifyable via proppatch from client, eg. calendar-color, see self::$proppatch_props
foreach((array)$GLOBALS['egw_info']['user']['preferences'][$app] as $name => $value) foreach((array)$GLOBALS['egw_info']['user']['preferences'][$app] as $name => $value)
@ -1268,6 +1268,7 @@ class groupdav extends HTTP_WebDAV_Server
error_log(__METHOD__."() content-type=$options[content_type], filename=$filename: $path created $copied bytes copied"); error_log(__METHOD__."() content-type=$options[content_type], filename=$filename: $path created $copied bytes copied");
$ret = '201 Created'; $ret = '201 Created';
header(self::MANAGED_ID_HEADER.': '.self::path2managed_id($path)); header(self::MANAGED_ID_HEADER.': '.self::path2managed_id($path));
header('Location: '.self::path2location($path));
break; break;
case 'attachment-remove': case 'attachment-remove':
@ -1422,14 +1423,12 @@ class groupdav extends HTTP_WebDAV_Server
} }
/** /**
* Add ATTACH attribute(s) for iCal * Get attachment location from path
* *
* @param string $app eg. 'calendar' * @param string $path
* @param int|string $id * @return string
* @param array &$attributes
* @param array &$parameters
*/ */
public static function add_attach($app, $id, array &$attributes, array &$parameters) protected static function path2location($path)
{ {
static $url_prefix; static $url_prefix;
if (!isset($url_prefix)) if (!isset($url_prefix))
@ -1440,12 +1439,25 @@ class groupdav extends HTTP_WebDAV_Server
$url_prefix = ($_SERVER['HTTPS'] ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST']; $url_prefix = ($_SERVER['HTTPS'] ? 'https' : 'http').'://'.$_SERVER['HTTP_HOST'];
} }
} }
return $url_prefix.egw::link(egw_vfs::download_url($path));
}
/**
* Add ATTACH attribute(s) for iCal
*
* @param string $app eg. 'calendar'
* @param int|string $id
* @param array &$attributes
* @param array &$parameters
*/
public static function add_attach($app, $id, array &$attributes, array &$parameters)
{
foreach(egw_vfs::find(egw_link::vfs_path($app, $id, '', true), array( foreach(egw_vfs::find(egw_link::vfs_path($app, $id, '', true), array(
'type' => 'F', 'type' => 'F',
'need_mime' => true, 'need_mime' => true,
), true) as $path => $stat) ), true) as $path => $stat)
{ {
$attributes['ATTACH'][] = $url_prefix.egw::link(egw_vfs::download_url($path)); $attributes['ATTACH'][] = self::path2location($path);
$parameters['ATTACH'][] = array( $parameters['ATTACH'][] = array(
'MANAGED-ID' => groupdav::path2managed_id($path), 'MANAGED-ID' => groupdav::path2managed_id($path),
'FMTTYP' => $stat['mime'], 'FMTTYP' => $stat['mime'],

2
phpgwapi/inc/class.groupdav_handler.inc.php
View File

@ -344,7 +344,7 @@ abstract class groupdav_handler
*/ */
public function check_return_representation($options, $id, $user=null) public function check_return_representation($options, $id, $user=null)
{ {
if (isset($_SERVER['HTTP_PREFER']) && in_array('return-representation', explode(',', $_SERVER['HTTP_PREFER']))) if (isset($_SERVER['HTTP_PREFER']) && in_array('return=representation', explode(',', $_SERVER['HTTP_PREFER'])))
{ {
if ($_SERVER['REQUEST_METHOD'] == 'POST') if ($_SERVER['REQUEST_METHOD'] == 'POST')
{ {