merge from CVS, fix for Bug: 9002

diff --git a/ansel/docs/CHANGES b/ansel/docs/CHANGES
index 34cc945..4ed56e4 100644 (file)
--- a/ansel/docs/CHANGES
+++ b/ansel/docs/CHANGES
@@ -10,7 +10,7 @@ v2.0-git
 v1.1.2-cvs
 ----------
 
-
+[mjr] Fix adding a face name from the gallery faces view (Bug #9002).
 
 
 ------

diff --git a/ansel/faces/delete.php b/ansel/faces/delete.php
deleted file mode 100644 (file)
index 54148a5..0000000
--- a/ansel/faces/delete.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Delete a face from an image.
- *
- * Copyright 2008-2010 The Horde Project (http://www.horde.org/)
- *
- * See the enclosed file COPYING for license information (GPL). If you
- * did not receive this file, see http://www.fsf.org/copyleft/gpl.html.
- *
- * @author Duck <duck@obala.net>
- */
-
-require_once dirname(__FILE__) . '/../lib/Application.php';
-Horde_Registry::appInit('ansel');
-
-$image_id = (int)Horde_Util::getFormData('image');
-$face_id = (int)Horde_Util::getFormData('face');
-
-$image = &$ansel_storage->getImage($image_id);
-if (is_a($image, 'PEAR_Error')) {
-    die($image->getMessage());
-}
-
-$gallery = &$ansel_storage->getGallery($image->gallery);
-if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) {
-    die(_("Access denied editing the photo."));
-}
-
-$faces = Ansel_Faces::factory();
-$result = $faces->delete($image, $face_id);
-

diff --git a/ansel/faces/image.php b/ansel/faces/image.php
index 0b10481..2d6ad8e 100644 (file)
--- a/ansel/faces/image.php
+++ b/ansel/faces/image.php
@@ -17,8 +17,8 @@ $faces = Ansel_Faces::factory();
 
 $name = '';
 $autocreate = true;
-$image_id = (int)Horde_Util::getFormData('image');
-$reload = (int)Horde_Util::getFormData('reload');
+$image_id = (int)Horde_Util::getPost('image');
+$reload = (int)Horde_Util::gePost('reload');
 $result = $faces->getImageFacesData($image_id);
 
 // Attempt to get faces from the picture if we don't already have results,

diff --git a/ansel/templates/faces/gallery.inc b/ansel/templates/faces/gallery.inc
index d4d3736..4656e40 100644 (file)
--- a/ansel/templates/faces/gallery.inc
+++ b/ansel/templates/faces/gallery.inc
@@ -37,9 +37,7 @@ var imgids = <?php echo Horde_Serialize::serialize($imageids, Horde_Serialize::J
 function proccessImageFaces(image_id, reget) {
     var url = '<?php echo Horde::applicationUrl('faces/image.php'); ?>';
     $('processface' + image_id).innerHTML = '<?php echo _("Loading...") ?>';
-    var params = new Object();
-    params.reload = reget;
-    params.image = image_id;
+    var params = {'reload':reget, 'image': image_id};
     new Ajax.Updater({success:'processface' + image_id},
                      url,
                      {
@@ -50,15 +48,25 @@ function proccessImageFaces(image_id, reget) {
 }
 
 function deleteFace(image_id, face_id) {
-    var url = '<?php echo Horde_Util::addParameter(Horde::applicationUrl('faces/delete.php'), 'face', null, false); ?>';
-    new Ajax.Request(url + face_id + '&image=' + image_id);
+    var url = '<?php echo Horde::applicationUrl(Util::addParameter('xrequest.php', array('requestType' => 'EditFaces'))); ?>';
+    var params = {'image': image_id, face: face_id};
+    new Ajax.Request(url + '/action=delete',
+                     {
+                         method: 'post',
+                         parameters: params
+                     });
     $('face' + face_id).remove();
 }
 
 function setFaceName(image_id, face_id) {
-    var params = 'action=setname/face=' + face_id + '/image=' + image_id + '/facename=' + encodeURIComponent($F('facename' + face_id));
-    var url = '<?php echo Horde::applicationUrl(Horde_Util::addParameter('xrequest.php', array('requestType' => 'EditFaces'))); ?>';
-    new Ajax.Updater({success: 'face' + face_id}, url + '/' + params);
+    var params = {face: face_id, 'image': image_id, facename: encodeURIComponent($F('facename' + face_id))};
+    var url = '<?php echo Horde::applicationUrl(Util::addParameter('xrequest.php', array('requestType' => 'EditFaces'))); ?>';
+    new Ajax.Updater({success: 'face' + face_id},
+                     url + '/action=setname',
+                     {
+                         method: 'post',
+                         parameters: params
+                     });
 }
 
 Event.observe(window, 'load', function() {