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

using recommended lowercase protocol "mailto:" in CalDAV:calendar-user-address-set

Browse Source
This commit is contained in:
Ralf Becker 2015-01-23 09:40:37 +00:00
parent 6a19d9fb78
commit 48a3cbce91
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -603,7 +603,7 @@ class groupdav extends HTTP_WebDAV_Server
{ {
$principalType = 'users'; $principalType = 'users';
$displayname = $account['account_fullname']; $displayname = $account['account_fullname'];
$calendar_user_address_set[] = self::mkprop('href','MAILTO:'.$account['account_email']); $calendar_user_address_set[] = self::mkprop('href','mailto:'.$account['account_email']);
} }
$calendar_user_address_set[] = self::mkprop('href',$this->base_uri.'/principals/'.$principalType.'/'.$account['account_lid'].'/'); $calendar_user_address_set[] = self::mkprop('href',$this->base_uri.'/principals/'.$principalType.'/'.$account['account_lid'].'/');

4
phpgwapi/inc/class.groupdav_principals.inc.php
View File

@ -939,7 +939,7 @@ class groupdav_principals extends groupdav_handler
'schedule-inbox-URL' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'schedule-inbox-URL',array( 'schedule-inbox-URL' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'schedule-inbox-URL',array(
HTTP_WebDAV_Server::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/inbox/'))), HTTP_WebDAV_Server::mkprop('href',$this->base_uri.'/'.$account['account_lid'].'/inbox/'))),
'calendar-user-address-set' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-user-address-set',array( 'calendar-user-address-set' => HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-user-address-set',array(
HTTP_WebDAV_Server::mkprop('href','MAILTO:'.$account['account_email']), HTTP_WebDAV_Server::mkprop('href','mailto:'.$account['account_email']),
HTTP_WebDAV_Server::mkprop('href',$this->base_uri(true).'/principals/users/'.$account['account_lid'].'/'), HTTP_WebDAV_Server::mkprop('href',$this->base_uri(true).'/principals/users/'.$account['account_lid'].'/'),
HTTP_WebDAV_Server::mkprop('href',$this->base_uri(false).'/principals/users/'.$account['account_lid'].'/'), HTTP_WebDAV_Server::mkprop('href',$this->base_uri(false).'/principals/users/'.$account['account_lid'].'/'),
HTTP_WebDAV_Server::mkprop('href','urn:uuid:'.common::generate_uid('accounts', $account['account_id'])), HTTP_WebDAV_Server::mkprop('href','urn:uuid:'.common::generate_uid('accounts', $account['account_id'])),
@ -955,7 +955,7 @@ class groupdav_principals extends groupdav_handler
'group-membership' => $this->principal_set('group-membership', $this->accounts->memberships($account['account_id']), 'group-membership' => $this->principal_set('group-membership', $this->accounts->memberships($account['account_id']),
array('calendar', 'resources'), $account['account_id']), // add proxy-rights array('calendar', 'resources'), $account['account_id']), // add proxy-rights
'alternate-URI-set' => array( 'alternate-URI-set' => array(
HTTP_WebDAV_Server::mkprop('href','MAILTO:'.$account['account_email'])), HTTP_WebDAV_Server::mkprop('href','mailto:'.$account['account_email'])),
// CardDAV // CardDAV
'addressbook-home-set' => HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'addressbook-home-set',$addressbooks), 'addressbook-home-set' => HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'addressbook-home-set',$addressbooks),
'principal-address' => HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'principal-address', 'principal-address' => HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'principal-address',