diff options
| author | Steven <wwjd2@web.de> | 2012-02-13 17:15:31 +0100 |
|---|---|---|
| committer | Steven <wwjd2@web.de> | 2012-02-13 23:48:22 +0100 |
| commit | 4cc3a3096a5ad28a070db12424db586c40457243 (patch) | |
| tree | 76b6008cf6fe3b8ce999cfba394774788479ccfe | |
| parent | c9db88aa3bbea2e65976b50b584f10b792a5d550 (diff) | |
| download | nextcloud-server-4cc3a3096a5ad28a070db12424db586c40457243.tar.gz nextcloud-server-4cc3a3096a5ad28a070db12424db586c40457243.zip | |
Server verhindert beim OSX Client einen Delete
| -rw-r--r-- | 3rdparty/Sabre/DAV/Server.php | 2 | ||||
| -rw-r--r-- | apps/calendar/lib/connector_sabre.php | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/3rdparty/Sabre/DAV/Server.php b/3rdparty/Sabre/DAV/Server.php index 3d76d4f1918..28c69188a32 100644 --- a/3rdparty/Sabre/DAV/Server.php +++ b/3rdparty/Sabre/DAV/Server.php @@ -648,7 +648,7 @@ class Sabre_DAV_Server { * @return void */ protected function httpDelete($uri) { - + if (!$this->broadcastEvent('beforeUnbind',array($uri))) return; $this->tree->delete($uri); diff --git a/apps/calendar/lib/connector_sabre.php b/apps/calendar/lib/connector_sabre.php index 263fb7ffde5..47bf4f202e9 100644 --- a/apps/calendar/lib/connector_sabre.php +++ b/apps/calendar/lib/connector_sabre.php @@ -206,6 +206,10 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract { * @return void */ public function deleteCalendar($calendarId) { + if(preg_match( '=iCal/[1-4]?.*Mac OS X/10.[1-6](.[0-9])?=', $_SERVER['HTTP_USER_AGENT'] )){ + throw new Sabre_DAV_Exception_Forbidden("Action is not possible with OSX 10.6.x", 403); + } + OC_Calendar_Calendar::deleteCalendar($calendarId); } |