Fix problems when friendica is installed in a subpath; small CSS-Fixes

[friendica-addons.git] / dav / main.php

diff --git a/dav/main.php b/dav/main.php
index bc5aeab022bee752ad56870a597faa20a337a687..b71ef61965512f4b00a9c611df035ae8a3b6bf10 100644 (file)
--- a/dav/main.php
+++ b/dav/main.php
@@ -29,9 +29,6 @@ function dav_module()
 function dav_init(&$a)
 {
 
-       error_reporting(E_ALL);
-       ini_set("display_errors", 1);
-
        /*
         * Recommended settings:
         * ALTER TABLE `photo` ADD INDEX ( `contact-id` )
@@ -91,7 +88,7 @@ function dav_init(&$a)
        if ($a->argc >= 2 && $a->argv[1] == "wdcal") {
 
                if ($a->argc >= 3 && $a->argv[2] == "feed") {
-                       wdcal_print_feed();
+                       wdcal_print_feed($a->get_baseurl() . "/dav/wdcal/");
                        killme();
                } elseif ($a->argc >= 3 && strlen($a->argv[2]) > 0) {
                        wdcal_addRequiredHeadersEdit();
@@ -133,7 +130,8 @@ function dav_init(&$a)
 // The object tree needs in turn to be passed to the server class
        $server = new Sabre_DAV_Server($tree);
 
-       $server->setBaseUri("/" . CALDAV_URL_PREFIX);
+       $url = parse_url($a->get_baseurl());
+       $server->setBaseUri(CALDAV_URL_PREFIX);
 
        $authPlugin = new Sabre_DAV_Auth_Plugin($authBackend, 'SabreDAV');
        $server->addPlugin($authPlugin);
@@ -186,7 +184,7 @@ function dav_content()
                        $cals      = dav_getMyCals($a->user["uid"]);
                        $cals_show = array();
                        foreach ($cals as $e) $cals_show[] = array("ns" => $e->namespace, "id" => $e->namespace_id, "displayname" => $e->displayname);
-                       $x = wdcal_printCalendar($cals, $cals_show, "/dav/wdcal/feed/", "week", 0, 200);
+                       $x = wdcal_printCalendar($cals, $cals_show, $a->get_baseurl() . "/dav/wdcal/feed/", "week", 0, 200);
                }
        }
        return $x;
@@ -223,7 +221,7 @@ function dav_profile_tabs_hook(&$a, &$b)
 {
        $b["tabs"][] = array(
        "label" => t('Calendar'),
-               "url" => "/dav/wdcal/",
+               "url" => $a->get_baseurl() . "/dav/wdcal/",
                "sel" => "",
                "title" => t('Extended calendar with CalDAV-support'),
        );
@@ -281,4 +279,4 @@ function dav_plugin_admin(&$a, &$o)
        $tables = dav_get_create_statements();
        foreach ($tables as $t) $o .= escape_tags($t . "\n\n");
        $o .= "</pre></blockquote>";
-}
\ No newline at end of file
+}