From 5471c93ec14588d867aa97659eb52d1a741696fa Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Sun, 8 Nov 2009 16:03:45 -0500
Subject: [PATCH] Fix tag actions, now works properly using POST

---
 ansel/js/tagactions.js              | 14 ++++++--------
 ansel/lib/Ajax/Imple/TagActions.php | 13 +++++--------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/ansel/js/tagactions.js b/ansel/js/tagactions.js
index 985044d26..5d3c767ff 100755
--- a/ansel/js/tagactions.js
+++ b/ansel/js/tagactions.js
@@ -1,10 +1,9 @@
 function addTag()
 {
     if (!$('addtag').value.blank()) {
-        var params = new Object();
-        params.action = 'add';
-        params[Ansel.ajax.tagActions.input] = $('addtag').value;
-        new Ajax.Request(Ansel.ajax.tagActions.url,
+        var params = {};
+        params.params = "tags=" + encodeURIComponent($('addtag').value);
+        new Ajax.Request(Ansel.ajax.tagActions.url + "/action=add/post=params",
                          {
                             method: 'post',
                             parameters: params,
@@ -22,10 +21,9 @@ function addTag()
 
 function removeTag(tagid)
 {
-    var params = new Object();
-    params.action = 'remove';
-    params[Ansel.ajax.tagActions.input] = tagid;
-    new Ajax.Request(Ansel.ajax.tagActions.url,
+    var params = {};
+    params.params = "tags=" + tagid;
+    new Ajax.Request(Ansel.ajax.tagActions.url + "/action=remove/post=params",
                     {
                         method: 'post',
                         parameters: params,
diff --git a/ansel/lib/Ajax/Imple/TagActions.php b/ansel/lib/Ajax/Imple/TagActions.php
index 3e9644f13..f0fcd7dee 100644
--- a/ansel/lib/Ajax/Imple/TagActions.php
+++ b/ansel/lib/Ajax/Imple/TagActions.php
@@ -15,8 +15,7 @@ class Ansel_Ajax_Imple_TagActions extends Horde_Ajax_Imple_Base
         // Include the js
         Horde::addScriptFile('tagactions.js');
 
-        $url = $this->_getUrl('TagActions', 'ansel', array('input' => 'tags',
-                                                           'gallery' => $this->_params['gallery'],
+        $url = $this->_getUrl('TagActions', 'ansel', array('gallery' => $this->_params['gallery'],
                                                            'image' =>  (isset($this->_params['image']) ? $this->_params['image'] : 0)));
         $params = array('url' => $url,
                         'gallery' => $this->_params['gallery'],
@@ -25,7 +24,6 @@ class Ansel_Ajax_Imple_TagActions extends Horde_Ajax_Imple_Base
                         'input' => 'tags');
         $js = array();
         $js[] = "Ansel.ajax['tagActions'] = " . Horde_Serialize::serialize($params, Horde_Serialize::JSON) . ";";
-        // TODO: Attach the Add & Delete actions too
         $js[] = "Event.observe(Ansel.ajax.tagActions.bindTo.add, 'click', function(event) {addTag(); Event.stop(event)});";
 
         Horde::addInlineScript($js, 'dom');
@@ -35,15 +33,14 @@ class Ansel_Ajax_Imple_TagActions extends Horde_Ajax_Imple_Base
     {
         include_once dirname(__FILE__) . '/../../base.php';
 
-        /* Require a POST for the action parameter and the tags parameter */
-        $action = Horde_Util::getPost('action');
-        if (empty($action) || empty($args['input'])) {
+        $action = $args['action'];
+        $tags = $post['tags'];
+        if (empty($action) || empty($tags)) {
             return array('response' => '0');
         }
 
         $gallery = $args['gallery'];
         $image = isset($args['image']) ? $args['image'] : null;
-
         if ($image) {
             $id = $image;
             $type = 'image';
@@ -51,7 +48,7 @@ class Ansel_Ajax_Imple_TagActions extends Horde_Ajax_Imple_Base
             $id = $gallery;
             $type = 'gallery';
         }
-        $tags = Horde_Util::getPost($args['input']);
+
         if (!is_numeric($id)) {
             return array('response' => 0,
                          'message' => sprintf(_("Invalid input %s"), htmlspecialchars($id)));
-- 
2.11.0