From 026eab44e8a2db3145e8fb82c59efa9386bcd984 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 11 Aug 2010 14:50:22 -0600
Subject: [PATCH] Need full URLs here, because the ajaxui parameter is needed

---
 turba/add.php                             | 2 +-
 turba/addressbooks/create.php             | 2 +-
 turba/addressbooks/delete.php             | 2 +-
 turba/addressbooks/edit.php               | 2 +-
 turba/edit.php                            | 2 +-
 turba/lib/Object.php                      | 5 ++++-
 turba/lib/View/DeleteContact.php          | 2 +-
 turba/lib/View/EditContact.php            | 2 +-
 turba/templates/addressbook_list.php      | 2 +-
 turba/templates/browse/column_headers.inc | 2 +-
 turba/templates/data/import.inc           | 2 +-
 turba/templates/search/header.html.php    | 2 +-
 12 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/turba/add.php b/turba/add.php
index cb8c0edd5..4412c1791 100644
--- a/turba/add.php
+++ b/turba/add.php
@@ -68,5 +68,5 @@ if ($form->validate()) {
 $title = _("New Contact");
 require TURBA_TEMPLATES . '/common-header.inc';
 require TURBA_TEMPLATES . '/menu.inc';
-$form->renderActive(new Horde_Form_Renderer(), $vars, 'add.php', 'post');
+$form->renderActive(new Horde_Form_Renderer(), $vars, Horde::applicationUrl('add.php'), 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff --git a/turba/addressbooks/create.php b/turba/addressbooks/create.php
index ae6c462c6..0feb6ccd5 100644
--- a/turba/addressbooks/create.php
+++ b/turba/addressbooks/create.php
@@ -37,5 +37,5 @@ if ($form->validate($vars)) {
 $title = $form->getTitle();
 require TURBA_TEMPLATES . '/common-header.inc';
 require TURBA_TEMPLATES . '/menu.inc';
-echo $form->renderActive($form->getRenderer(), $vars, 'create.php', 'post');
+echo $form->renderActive($form->getRenderer(), $vars, Horde::applicationUrl('create.php'), 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff --git a/turba/addressbooks/delete.php b/turba/addressbooks/delete.php
index 2665ecf17..c947bb5c7 100644
--- a/turba/addressbooks/delete.php
+++ b/turba/addressbooks/delete.php
@@ -56,5 +56,5 @@ if ($form->validate(new Horde_Variables($_POST))) {
 $title = $form->getTitle();
 require TURBA_TEMPLATES . '/common-header.inc';
 require TURBA_TEMPLATES . '/menu.inc';
-echo $form->renderActive($form->getRenderer(), $vars, 'delete.php', 'post');
+echo $form->renderActive($form->getRenderer(), $vars, Horde::applicationUrl('delete.php'), 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff --git a/turba/addressbooks/edit.php b/turba/addressbooks/edit.php
index 18c670fde..a3b170033 100644
--- a/turba/addressbooks/edit.php
+++ b/turba/addressbooks/edit.php
@@ -56,5 +56,5 @@ $vars->set('description', $addressbook->get('desc'));
 $title = $form->getTitle();
 require TURBA_TEMPLATES . '/common-header.inc';
 require TURBA_TEMPLATES . '/menu.inc';
-echo $form->renderActive($form->getRenderer(), $vars, 'edit.php', 'post');
+echo $form->renderActive($form->getRenderer(), $vars, Horde::applicationUrl('edit.php'), 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff --git a/turba/edit.php b/turba/edit.php
index 96c94c82a..d4ac0500a 100644
--- a/turba/edit.php
+++ b/turba/edit.php
@@ -88,5 +88,5 @@ $title = sprintf(_("Edit \"%s\""), $contact->getValue('name'));
 require TURBA_TEMPLATES . '/common-header.inc';
 require TURBA_TEMPLATES . '/menu.inc';
 $form->setTitle($title);
-$form->renderActive(new Horde_Form_Renderer(), $vars, 'edit.php', 'post');
+$form->renderActive(new Horde_Form_Renderer(), $vars, Horde::applicationUrl('edit.php'), 'post');
 require $registry->get('templates', 'horde') . '/common-footer.inc';
diff --git a/turba/lib/Object.php b/turba/lib/Object.php
index aa21f2687..37c39d0f3 100644
--- a/turba/lib/Object.php
+++ b/turba/lib/Object.php
@@ -454,7 +454,10 @@ class Turba_Object {
      */
     function vfsEditUrl($file)
     {
-        $delform = '<form action="deletefile.php" style="display:inline" method="post">' . Horde_Util::formInput() .
+        $delform = '<form action="' .
+            Horde::applicationUrl('deletefile.php') .
+            '" style="display:inline" method="post">' .
+            Horde_Util::formInput() .
             '<input type="hidden" name="file" value="' . htmlspecialchars($file['name']) . '" />' .
             '<input type="hidden" name="source" value="' . htmlspecialchars($this->driver->name) . '" />' .
             '<input type="hidden" name="key" value="' . htmlspecialchars($this->getValue('__key')) . '" />' .
diff --git a/turba/lib/View/DeleteContact.php b/turba/lib/View/DeleteContact.php
index 5268f8ecd..96bd06d3d 100644
--- a/turba/lib/View/DeleteContact.php
+++ b/turba/lib/View/DeleteContact.php
@@ -46,7 +46,7 @@ class Turba_View_DeleteContact {
 
         echo '<div id="DeleteContact"' . ($active ? '' : ' style="display:none"') . '>';
 ?>
-<form action="delete.php" method="post">
+    <form action="<?php echo Horde::applicationUrl('delete.php') ?>" method="post">
 <?php echo Horde_Util::formInput() ?>
 <input type="hidden" name="url" value="<?php echo htmlspecialchars(Horde_Util::getFormData('url')) ?>" />
 <input type="hidden" name="source" value="<?php echo htmlspecialchars($this->contact->driver->name) ?>" />
diff --git a/turba/lib/View/EditContact.php b/turba/lib/View/EditContact.php
index e04e1d4d2..5ded8f59a 100644
--- a/turba/lib/View/EditContact.php
+++ b/turba/lib/View/EditContact.php
@@ -46,7 +46,7 @@ class Turba_View_EditContact {
 
         echo '<div id="EditContact"' . ($active ? '' : ' style="display:none"') . '>';
         $form = &new Turba_Form_EditContact($vars, $this->contact);
-        $form->renderActive(new Horde_Form_Renderer, $vars, 'edit.php', 'post');
+        $form->renderActive(new Horde_Form_Renderer, $vars, Horde::applicationUrl('edit.php'), 'post');
         echo '</div>';
 
         if ($active && $GLOBALS['browser']->hasFeature('dom')) {
diff --git a/turba/templates/addressbook_list.php b/turba/templates/addressbook_list.php
index 1b26efe00..6fbeabc4f 100644
--- a/turba/templates/addressbook_list.php
+++ b/turba/templates/addressbook_list.php
@@ -3,7 +3,7 @@
 </h1>
 
 <div id="addressbook-list-buttons">
- <form method="get" action="create.php">
+<form method="get" action="<?php echo Horde::applicationUrl('create.php') ?>">
 <?php echo Horde_Util::formInput() ?>
   <input type="submit" class="button" value="<?php echo _("Create a new Address Book") ?>" />
  </form>
diff --git a/turba/templates/browse/column_headers.inc b/turba/templates/browse/column_headers.inc
index 5e2a60af3..d53121f7d 100644
--- a/turba/templates/browse/column_headers.inc
+++ b/turba/templates/browse/column_headers.inc
@@ -1,4 +1,4 @@
-<form method="post" name="contacts" id="contacts" action="browse.php">
+<form method="post" name="contacts" id="contacts" action="<?php echo Horde::applicationUrl('browse.php') ?>">
 <input type="hidden" name="source" value="<?php echo htmlspecialchars($GLOBALS['default_source']) ?>" />
 <?php echo Horde_Util::formInput() ?>
 <table cellspacing="0" width="100%" class="linedRow">
diff --git a/turba/templates/data/import.inc b/turba/templates/data/import.inc
index 2076ad1c0..6803fc710 100644
--- a/turba/templates/data/import.inc
+++ b/turba/templates/data/import.inc
@@ -1,4 +1,4 @@
-<form method="post" name="import_form" enctype="multipart/form-data" action="data.php">
+<form method="post" name="import_form" enctype="multipart/form-data" action="<?php echo Horde::applicationUrl('data.php') ?>">
 <?php Horde_Util::pformInput() ?>
 <input type="hidden" name="actionID" value="<?php echo htmlspecialchars($next_step) ?>" />
 <input type="hidden" name="import_step" value="<?php echo (int)$import_step ?>" />
diff --git a/turba/templates/search/header.html.php b/turba/templates/search/header.html.php
index a3a19524e..726f4c153 100644
--- a/turba/templates/search/header.html.php
+++ b/turba/templates/search/header.html.php
@@ -1,5 +1,5 @@
 <div class="text" style="padding:1em">
-<form name="directory_search" action="search.php" method="get" onsubmit="RedBox.loading(); return true;">
+<form name="directory_search" action="<?php echo Horde::applicationUrl('search.php') ?>" method="get" onsubmit="RedBox.loading(); return true;">
 <?php echo Horde_Util::formInput() ?>
 <?php if ($this->uniqueSource): ?>
 <input type="hidden" id="turbaSearchSource" name="source" value="<?php echo $this->uniqueSource ?>" />
-- 
2.11.0