From 48a3cbce919b337caaa6d345ef49760349ac1469 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 23 Jan 2015 09:40:37 +0000 Subject: [PATCH] using recommended lowercase protocol "mailto:" in CalDAV:calendar-user-address-set --- phpgwapi/inc/class.groupdav.inc.php | 2 +- phpgwapi/inc/class.groupdav_principals.inc.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpgwapi/inc/class.groupdav.inc.php b/phpgwapi/inc/class.groupdav.inc.php index c47d9e75a4..2c21441f8b 100644 --- a/phpgwapi/inc/class.groupdav.inc.php +++ b/phpgwapi/inc/class.groupdav.inc.php @@ -603,7 +603,7 @@ class groupdav extends HTTP_WebDAV_Server { $principalType = 'users'; $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'].'/'); diff --git a/phpgwapi/inc/class.groupdav_principals.inc.php b/phpgwapi/inc/class.groupdav_principals.inc.php index a526472f74..bba59b16c9 100644 --- a/phpgwapi/inc/class.groupdav_principals.inc.php +++ b/phpgwapi/inc/class.groupdav_principals.inc.php @@ -939,7 +939,7 @@ class groupdav_principals extends groupdav_handler '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/'))), '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(false).'/principals/users/'.$account['account_lid'].'/'), 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']), array('calendar', 'resources'), $account['account_id']), // add proxy-rights 'alternate-URI-set' => array( - HTTP_WebDAV_Server::mkprop('href','MAILTO:'.$account['account_email'])), + HTTP_WebDAV_Server::mkprop('href','mailto:'.$account['account_email'])), // CardDAV 'addressbook-home-set' => HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'addressbook-home-set',$addressbooks), 'principal-address' => HTTP_WebDAV_Server::mkprop(groupdav::CARDDAV,'principal-address',