From d8f0c274f12d19476c9665fe73962536d38d1bc0 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Tue, 2 Aug 2011 13:03:37 +0000 Subject: [PATCH] * CalDAV: user agent detection of OS X 10.7 Lion iCal app (CoreDav instead of DavKit) --- phpgwapi/inc/class.groupdav.inc.php | 1 + phpgwapi/inc/class.groupdav_handler.inc.php | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/phpgwapi/inc/class.groupdav.inc.php b/phpgwapi/inc/class.groupdav.inc.php index e0405b4400..531a9786e5 100644 --- a/phpgwapi/inc/class.groupdav.inc.php +++ b/phpgwapi/inc/class.groupdav.inc.php @@ -142,6 +142,7 @@ class groupdav extends HTTP_WebDAV_Server $this->cnrnd = true; break; case 'davkit': // iCal app in OS X 10.6 created wrong request, if full url given + case 'coredav': // iCal app in OS X 10.7 $this->client_require_href_as_url = false; $this->cnrnd = true; break; diff --git a/phpgwapi/inc/class.groupdav_handler.inc.php b/phpgwapi/inc/class.groupdav_handler.inc.php index ccaaeb2ab7..18cdb50b04 100644 --- a/phpgwapi/inc/class.groupdav_handler.inc.php +++ b/phpgwapi/inc/class.groupdav_handler.inc.php @@ -336,9 +336,10 @@ abstract class groupdav_handler $user_agent = strtolower($_SERVER['HTTP_USER_AGENT']); foreach(array( 'iphone' => 'iphone', // Apple iPhone iCal - 'davkit' => 'davkit', // Apple iCal + 'davkit' => 'davkit', // Apple iCal 10.6 + 'coredav' => 'coredav', // Apple iCal 10.7 'dataaccess' => 'dataaccess', // Apple addressbook iPhone - 'cfnetwork' => 'cfnetwork', // Apple Addressbook + 'cfnetwork' => 'cfnetwork', // Apple Addressbook 10.6/7 'bionicmessage.net' => 'funambol', // funambol GroupDAV connector from bionicmessage.net 'zideone' => 'zideone', // zideone outlook plugin 'lightning' => 'lightning', // Lighting (SOGo connector for addressbook)