Fix WebDAV usage, remove BC code.

diff --git a/kronolith/calendars/index.php b/kronolith/calendars/index.php
index 1443d4f..621c245 100644 (file)
--- a/kronolith/calendars/index.php
+++ b/kronolith/calendars/index.php
@@ -22,10 +22,6 @@ function shorten_url($url, $separator = '...', $first_chunk_length = 35, $last_c
 }
 
 require_once dirname(__FILE__) . '/../lib/base.php';
-require_once 'Horde/RPC.php';
-if (@include_once 'HTTP/WebDAV/Server.php') {
-    require_once 'Horde/RPC/webdav.php';
-}
 
 // Exit if this isn't an authenticated user.
 if (!Horde_Auth::getAuth()) {

diff --git a/kronolith/calendars/info.php b/kronolith/calendars/info.php
index b42f27a..83df7c3 100644 (file)
--- a/kronolith/calendars/info.php
+++ b/kronolith/calendars/info.php
@@ -26,17 +26,10 @@ if (strncmp($calendarId, 'remote_', 7) === 0) {
     }
 } elseif (isset($GLOBALS['all_calendars'][$calendarId])) {
     $calendar = $GLOBALS['all_calendars'][$calendarId];
-
-    $webdav = is_callable(array('HTTP_WebDAV_Server_Horde', 'DELETE'));
     $rewrite = isset($conf['urls']['pretty']) &&
         $conf['urls']['pretty'] == 'rewrite';
-    $subscribe_url = $webdav
-        ? Horde::url($registry->get('webroot', 'horde')
-                     . ($rewrite ? '/rpc/kronolith/' : '/rpc.php/kronolith/'),
-                     true, -1)
-          . $calendar->get('owner') . '/' . $calendar->getName() . '.ics'
-        : Horde_Util::addParameter(Horde::applicationUrl('ics.php', true, -1), 'c',
-                             $calendar->getName());
+    $subscribe_url = Horde::url($registry->get('webroot', 'horde') . ($rewrite ? '/rpc/kronolith/' : '/rpc.php/kronolith/'), true, -1)
+      . $calendar->get('owner') . '/' . $calendar->getName() . '.ics';
 }
 
 if (is_null($calendar)) {

diff --git a/nag/tasklists/index.php b/nag/tasklists/index.php
index ec1aa3c..a2e182f 100644 (file)
--- a/nag/tasklists/index.php
+++ b/nag/tasklists/index.php
@@ -22,9 +22,6 @@ function shorten_url($url, $separator = '...', $first_chunk_length = 35, $last_c
 }
 
 require_once dirname(__FILE__) . '/../lib/base.php';
-if (@include_once 'HTTP/WebDAV/Server.php') {
-    require_once 'Horde/RPC/webdav.php';
-}
 
 /* Exit if this isn't an authenticated user. */
 if (!Horde_Auth::getAuth()) {

diff --git a/nag/tasklists/info.php b/nag/tasklists/info.php
index 62a2e87..6f3369b 100644 (file)
--- a/nag/tasklists/info.php
+++ b/nag/tasklists/info.php
@@ -8,9 +8,6 @@
 
 require_once dirname(__FILE__) . '/../lib/base.php';
 require_once 'Horde/Identity.php';
-if (@include_once 'HTTP/WebDAV/Server.php') {
-    require_once 'Horde/RPC/webdav.php';
-}
 
 // Exit if this isn't an authenticated user.
 if (!Horde_Auth::getAuth()) {
@@ -22,12 +19,8 @@ if (is_a($tasklist, 'PEAR_Error')) {
     exit;
 }
 
-$webdav = is_callable(array('HTTP_WebDAV_Server_Horde', 'DELETE'));
-$subscribe_url = $webdav
-    ? Horde::url($registry->get('webroot', 'horde') . '/rpc.php/nag/', true, -1)
-        . $tasklist->get('owner') . '/' . $tasklist->getName() . '.ics'
-    : Horde_Util::addParameter(Horde::applicationUrl('ics.php', true, -1),
-                         't', $tasklist->getName());
+$subscribe_url = Horde::url($registry->get('webroot', 'horde') . '/rpc.php/nag/', true, -1)
+  . $tasklist->get('owner') . '/' . $tasklist->getName() . '.ics';
 
 $identity = Identity::singleton('none', $tasklist->get('owner'));
 $owner_name = $identity->getValue('fullname');