Move StatusNet addon dependencies in own library subfolder

[friendica-addons.git] / dav / common / calendar.fnk.php

diff --git a/dav/common/calendar.fnk.php b/dav/common/calendar.fnk.php
index 13d2cdbb8790bda33a200af2b557df3ed5f27117..11f31f7de4e7f3792dec1def9348e12678a89319 100644 (file)
--- a/dav/common/calendar.fnk.php
+++ b/dav/common/calendar.fnk.php
@@ -7,7 +7,9 @@ define("DAV_DISPLAYNAME", "{DAV:}displayname");
 define("DAV_CALENDARCOLOR", "{http://apple.com/ns/ical/}calendar-color");
 
 
-class DAVVersionMismatchException extends Exception {}
+class DAVVersionMismatchException extends Exception
+{
+}
 
 
 class vcard_source_data_email
@@ -99,16 +101,13 @@ class vcard_source_data
        public $photo;
 }
 
-;
-
-
 /**
  * @param vcard_source_data $vcardsource
  * @return string
  */
 function vcard_source_compile($vcardsource)
 {
-       $str = "BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//" . DAV_APPNAME . "//DAV-Plugin//EN\r\n";
+       $str = "BEGIN:VCARD\r\nVERSION:3.0\r\nPRODID:-//Friendica//DAV-Plugin//EN\r\n";
        $str .= "N:" . str_replace(";", ",", $vcardsource->name_last) . ";" . str_replace(";", ",", $vcardsource->name_first) . ";" . str_replace(";", ",", $vcardsource->name_middle) . ";;\r\n";
        $str .= "FN:" . str_replace(";", ",", $vcardsource->name_first) . " " . str_replace(";", ",", $vcardsource->name_middle) . " " . str_replace(";", ",", $vcardsource->name_last) . "\r\n";
        $str .= "REV:" . str_replace(" ", "T", $vcardsource->last_update) . "Z\r\n";
@@ -237,7 +236,7 @@ function dav_create_server($force_authentication = false, $needs_caldav = true,
 
        if (CALDAV_URL_PREFIX != "") $server->setBaseUri(CALDAV_URL_PREFIX);
 
-       $authPlugin = new Sabre_DAV_Auth_Plugin(Sabre_DAV_Auth_Backend_Std::getInstance(), 'SabreDAV');
+       $authPlugin = new Sabre_DAV_Auth_Plugin(Sabre_DAV_Auth_Backend_Std::getInstance(), DAV_APPNAME);
        $server->addPlugin($authPlugin);
 
        if ($needs_caldav) {
@@ -253,6 +252,10 @@ function dav_create_server($force_authentication = false, $needs_caldav = true,
                $aclPlugin                      = new $GLOBALS["CALDAV_ACL_PLUGIN_CLASS"]();
                $aclPlugin->defaultUsernamePath = "principals/users";
                $server->addPlugin($aclPlugin);
+       } else {
+               $aclPlugin                      = new Sabre_DAVACL_Plugin();
+               $aclPlugin->defaultUsernamePath = "principals/users";
+               $server->addPlugin($aclPlugin);
        }
 
        if ($force_authentication) $server->broadcastEvent('beforeMethod', array("GET", "/")); // Make it authenticate
@@ -346,7 +349,6 @@ function dav_get_current_user_calendar_by_id(&$server, $id, $with_privilege = ""
  */
 function dav_create_empty_vevent($uid = "")
 {
-       $a = get_app();
        if ($uid == "") $uid = uniqid();
        return Sabre\VObject\Reader::read("BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:-//" . DAV_APPNAME . "//DAV-Plugin//EN\r\nBEGIN:VEVENT\r\nUID:" . $uid . "@" . dav_compat_get_hostname() .
                "\r\nDTSTAMP:" . date("Ymd") . "T" . date("His") . "Z\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");