friendica/friendica-addons
1
0
Fork 0
mirror of https://git.friendi.ca/friendica/friendica-addons.git synced 2025-07-11 10:58:48 +00:00
Code Issues Releases Wiki Activity

More refactoring, mainly of the addressbook/VCARD-part

Browse source
This commit is contained in:
Tobias Hößl 2012-08-02 20:26:52 +00:00
parent a9924ea443
commit f039582421
12 changed files with 531 additions and 321 deletions
Download patch file Download diff file Expand all files Collapse all files

7
dav/common/calendar.fnk.php
View file

@ -249,6 +249,11 @@ function dav_create_server($force_authentication = false, $needs_caldav = true,
$server->addPlugin($carddavPlugin);
}
$aclPlugin = new $GLOBALS["CALDAV_ACL_PLUGIN_CLASS"]();
$aclPlugin->defaultUsernamePath = "principals/users";
$server->addPlugin($aclPlugin);
if ($force_authentication) $server->broadcastEvent('beforeMethod', array("GET", "/")); // Make it authenticate
return $server;
@ -275,7 +280,7 @@ function dav_get_current_user_calendars(&$server, $with_privilege = "")
$calendars = array();
/** @var Sabre_DAVACL_Plugin $aclplugin */
$aclplugin = $server->getPlugin("acl");
foreach ($children as $child) if (is_a($child, "Sabre_CalDAV_Calendar")) {
foreach ($children as $child) if (is_a($child, "Sabre_CalDAV_Calendar") || is_subclass_of($child, "Sabre_CalDAV_Calendar")) {
if ($with_privilege != "") {
$caluri = $calendar_path . $child->getName();
if ($aclplugin->checkPrivileges($caluri, $with_privilege, Sabre_DAVACL_Plugin::R_PARENT, false)) $calendars[] = $child;