Remove BC webdav stuff. Use pretty URLs in Nag.

diff --git a/kronolith/calendars/index.php b/kronolith/calendars/index.php
index 93c7a66..65425f2 100644 (file)
--- a/kronolith/calendars/index.php
+++ b/kronolith/calendars/index.php
@@ -29,20 +29,19 @@ if (!Horde_Auth::getAuth()) {
     exit;
 }
 
-$webdav = is_callable(array('HTTP_WebDAV_Server_Horde', 'DELETE'));
-$rewrite = isset($conf['urls']['pretty']) &&
-    $conf['urls']['pretty'] == 'rewrite';
 $edit_url_base = Horde::applicationUrl('calendars/edit.php');
 $remote_edit_url_base = Horde::applicationUrl('calendars/remote_edit.php');
 $delete_url_base = Horde::applicationUrl('calendars/delete.php');
 $remote_unsubscribe_url_base = Horde::applicationUrl('calendars/remote_unsubscribe.php');
 $perms_url_base = Horde::applicationUrl('perms.php', true);
 $display_url_base = Horde::applicationUrl('month.php', true, -1);
-$subscribe_url_base = $webdav ?
-    Horde::url($registry->get('webroot', 'horde')
-               . ($rewrite ? '/rpc/kronolith/' : '/rpc.php/kronolith/'),
-               true, -1) :
-    Horde_Util::addParameter(Horde::applicationUrl('ics.php', true, -1), 'c', '');
+$subscribe_url_base = $registry->get('webroot', 'horde');
+if (isset($conf['urls']['pretty']) && $conf['urls']['pretty'] == 'rewrite') {
+    $subscribe_url_base .= '/rpc/kronolith/';
+} else {
+    $subscribe_url_base .= '/rpc.php/kronolith/';
+}
+$subscribe_url_base = Horde::url($subscribe_url_base, true, -1);
 
 $calendars = array();
 $sorted_calendars = array();

diff --git a/nag/tasklists/index.php b/nag/tasklists/index.php
index 0db3a41..1d2c751 100644 (file)
--- a/nag/tasklists/index.php
+++ b/nag/tasklists/index.php
@@ -29,14 +29,17 @@ if (!Horde_Auth::getAuth()) {
     exit;
 }
 
-$webdav = is_callable(array('HTTP_WebDAV_Server_Horde', 'DELETE'));
 $edit_url_base = Horde::applicationUrl('tasklists/edit.php');
 $perms_url_base = Horde::url($registry->get('webroot', 'horde') . '/services/shares/edit.php?app=nag', true);
 $delete_url_base = Horde::applicationUrl('tasklists/delete.php');
 $display_url_base = Horde::applicationUrl('list.php', true, -1);
-$subscribe_url_base = $webdav
-    ? Horde::url($registry->get('webroot', 'horde') . '/rpc.php/nag/', true, -1)
-    : Horde::applicationUrl('ics.php', true, -1);
+$subscribe_url_base = $registry->get('webroot', 'horde');
+if (isset($conf['urls']['pretty']) && $conf['urls']['pretty'] == 'rewrite') {
+    $subscribe_url_base .= '/rpc/nag/';
+} else {
+    $subscribe_url_base .= '/rpc.php/nag/';
+}
+$subscribe_url_base = Horde::url($subscribe_url_base, true, -1);
 
 $tasklists = Nag::listTasklists(true);
 $sorted_tasklists = array();