From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Mon, 10 May 2010 20:11:16 +0000 (-0400)
Subject: use Horde_Url, other H4 changes
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=fc3341c129cc64b6d8584f4405adaf2d020efefc;p=horde.git

use Horde_Url, other H4 changes
---

diff --git a/ansel/image.php b/ansel/image.php
index 478fa1638..4544a0cb7 100644
--- a/ansel/image.php
+++ b/ansel/image.php
@@ -284,12 +284,13 @@ case 'resizeedit':
                                            'page' => $page),
                                      $date),
                                      true);
-    $imageurl = Horde_Util::addParameter('image.php', array_merge(
-                                            array('gallery' => $gallery_id,
-                                                  'slug' => $gallery->get('slug'),
-                                                  'image' => $image_id,
-                                                  'page' => $page),
-                                            $date));
+    $imageurl = Horde::applicationUrl('image.php');
+    $imageurl->add(array_merge(
+                    array('gallery' => $gallery_id,
+                          'slug' => $gallery->get('slug'),
+                          'image' => $image_id,
+                          'page' => $page),
+                    $date));
 
     $galleryurl = Ansel::getUrlFor('view', array_merge(
                                        array('gallery' => $gallery_id,
@@ -370,14 +371,14 @@ case 'watermark':
         $image->watermark('screen', $watermark, $watermark_halign,
                                 $watermark_valign, $watermark_font);
         $image->updateData($image->raw('screen'), 'screen');
-        $imageurl = Horde_Util::addParameter('image.php',array_merge(
-                                       array('gallery' => $gallery_id,
-                                             'image' => $image_id,
-                                             'actionID' => 'editimage',
-                                             'page' => $page),
-                                       $date));
-
-        header('Location: ' . Horde::applicationUrl($imageurl, true));
+        $imageurl = Horde::applicationUrl('image.php', true);
+        $imageurl->add(array_merge(
+                       array('gallery' => $gallery_id,
+                             'image' => $image_id,
+                             'actionID' => 'editimage',
+                             'page' => $page),
+                       $date));
+        header('Location: ' . $imageurl);
         exit;
     }
 
@@ -436,21 +437,22 @@ case 'resize':
             $image->load('full');
             $width = Horde_Util::getFormData('width');
             $height = Horde_Util::getFormData('height');
-            $result = $image->_image->resize($width, $height, true);
+            $result = $image->resize($width, $height, true);
             break;
         }
         if (empty($error)) {
-            $image->updateData($image->_image->raw());
+            $image->updateData($image->raw());
         }
     }
 
-    $imageurl = Horde_Util::addParameter('image.php', array_merge(
-                                                array('gallery' => $gallery_id,
-                                                      'image' => $image_id,
-                                                      'actionID' => 'editimage',
-                                                      'page' => $page),
-                                                $date));
-    header('Location: ' . Horde::applicationUrl($imageurl, true));
+    $imageurl = Horde::applicationUrl('image.php', true);
+    $imageurl->add(array_merge(
+                    array('gallery' => $gallery_id,
+                          'image' => $image_id,
+                          'actionID' => 'editimage',
+                          'page' => $page),
+                    $date));
+    header('Location: ' . $imageurl);
     exit;
 
 case 'setwatermark':
@@ -473,19 +475,20 @@ case 'setwatermark':
     exit;
 
 case 'previewcustomwatermark':
-    $imageurl = Horde_Util::addParameter('image.php', array_merge(
-                                   array('gallery' => $gallery_id,
-                                         'image' => $image_id,
-                                         'page' => $page,
-                                         'watermark' => $watermark,
-                                         'font' => $watermark_font,
-                                         'whalign' => $watermark_halign,
-                                         'wvalign' => $watermark_valign,
-                                         'actionID' => 'previewwatermark'),
-                                   $date));
+    $imageurl = Horde::applicationUrl('image.php', true);
+    $imageurl->add(array_merge(
+                       array('gallery' => $gallery_id,
+                             'image' => $image_id,
+                             'page' => $page,
+                             'watermark' => $watermark,
+                             'font' => $watermark_font,
+                             'whalign' => $watermark_halign,
+                             'wvalign' => $watermark_valign,
+                             'actionID' => 'previewwatermark'),
+                       $date));
 
     echo Horde::wrapInlineScript(array(
-        'window.opener.location.href = "' . Horde::applicationUrl($imageurl)->setRaw(true) . '";',
+        'window.opener.location.href = "' . $imageurl . '";',
         'window.close();'
     ));
     exit;
@@ -759,7 +762,7 @@ case 'imagecrop':
             $image = &$ansel_storage->getImage($image_id);
             $image->load('full');
             $image->crop($x1, $y1, $x2, $y2);
-            $image->_image->display();
+            $image->display();
         }
         exit;
 
diff --git a/ansel/templates/image/crop_image.inc b/ansel/templates/image/crop_image.inc
index a8aa034a9..1bc0e5be0 100644
--- a/ansel/templates/image/crop_image.inc
+++ b/ansel/templates/image/crop_image.inc
@@ -89,29 +89,29 @@ function changeRatio()
 $style = $gallery->getStyle();
 $image_src = Ansel::getImageUrl($image_id, 'full');
 
-echo Horde::link($galleryurl) . Horde::img('galleries.png') . ' ' . _("Back to gallery") . '</a> ';
-echo Horde::link($imageview_url) . Horde::img('galleries.png') . ' ' . _("Cancel") . '</a> ';
+echo $galleryurl->link() . Horde::img('galleries.png') . ' ' . _("Back to gallery") . '</a> ';
+echo $imageview_url->link() . Horde::img('galleries.png') . ' ' . _("Cancel") . '</a> ';
 
 if (Ansel::isAvailable('rotate')) {
-    echo Horde::link(Horde_Util::addParameter($imageurl, 'actionID', 'previewrotate270')) . Horde::img('image/rotate-270.png') . ' ' . _("Rotate Left") . '</a> ';
-    echo Horde::link(Horde_Util::addParameter($imageurl, 'actionID', 'previewrotate180')) . Horde::img('image/rotate-180.png') . ' ' . _("Rotate 180") . '</a> ';
-    echo Horde::link(Horde_Util::addParameter($imageurl, 'actionID', 'previewrotate90')) . Horde::img('image/rotate-90.png') . ' ' . _("Rotate Right") . '</a> ';
+    echo $imageurl->copy()->add('actionID', 'previewrotate270')->link() . Horde::img('image/rotate-270.png') . ' ' . _("Rotate Left") . '</a> ';
+    echo $imageurl->copy()->add('actionID', 'previewrotate180')->link() . Horde::img('image/rotate-180.png') . ' ' . _("Rotate 180") . '</a> ';
+    echo $imageurl->copy()->add('actionID', 'previewrotate90')->link() . Horde::img('image/rotate-90.png') . ' ' . _("Rotate Right") . '</a> ';
 }
 if (Ansel::isAvailable('flip')) {
-    echo Horde::link(Horde_Util::addParameter($imageurl, 'actionID', 'previewflip')) . Horde::img('image/flip.png') . ' ' . _("Flip") . '</a> ';
+    echo $imageurl->copy()->add('actionID', 'previewflip')->link() . Horde::img('image/flip.png') . ' ' . _("Flip") . '</a> ';
 }
 if (Ansel::isAvailable('mirror')) {
-    echo Horde::link(Horde_Util::addParameter($imageurl, 'actionID', 'previewmirror')) . Horde::img('image/mirror.png') . ' ' . _("Mirror") . '</a> ';
+    echo $imageurl->copy()->add('actionID', 'previewmirror')->link() . Horde::img('image/mirror.png') . ' ' . _("Mirror") . '</a> ';
 }
 if (Ansel::isAvailable('grayscale')) {
-    echo Horde::link(Horde_Util::addParameter($imageurl, 'actionID', 'previewgrayscale')) . Horde::img('image/grayscale.png') . ' ' . _("Grayscale") . '</a> ';
+    echo $imageurl->copy()->add('actionID', 'previewgrayscale')->link() . Horde::img('image/grayscale.png') . ' ' . _("Grayscale") . '</a> ';
 }
 if (Ansel::isAvailable('text_watermark')) {
-    echo Horde::link('#', '', '', '_blank', Horde::popupJs(Horde::applicationUrl($imageurl), array('params' => array('actionID' => 'setwatermark', 'share' => $gallery->getName()), 'width' => 450, 'height' => 250, 'urlencode' => true)) . 'return false;') . Horde::img('text.png') . ' ' . _("Watermark") . '</a> ';
+    echo Horde::link('#', '', '', '_blank', Horde::popupJs($imageurl, array('params' => array('actionID' => 'setwatermark', 'share' => $gallery->getName()), 'width' => 450, 'height' => 250, 'urlencode' => true)) . 'return false;') . Horde::img('text.png') . ' ' . _("Watermark") . '</a> ';
 }
 $selfUrl = Horde::selfUrl(true);
-echo Horde::link(Horde::applicationUrl(Horde_Util::addParameter($selfUrl, array('actionID' => 'cropedit')))) . Horde::img('image/crop.png') . _("Crop") . '</a>';
-echo Horde::link(Horde::applicationUrl(Horde_Util::addParameter($selfUrl, array('actionID' => 'resizeedit')))) . Horde::img('image/ratio.png') . _("Resize") . '</a>';
+echo $selfUrl->copy()->add('actionID','cropedit')->link() . Horde::img('image/crop.png') . _("Crop") . '</a>';
+echo $selfUrl->copy()->add('actionID', 'resizeedit')->link() . Horde::img('image/ratio.png') . _("Resize") . '</a>';
 ?>
 </div>
 <br />
@@ -123,7 +123,7 @@ echo Horde::link(Horde::applicationUrl(Horde_Util::addParameter($selfUrl, array(
     <?php $caption = $image->caption ? $image->caption : $image->filename; echo Horde_Text_Filter::filter($caption, 'text2html', array('parselevel' => Horde_Text_Filter_Text2html::MICRO)) ?>
 </div>
 <div style="text-align:center;width:25%;float:left;position:relative;">
-<form method="post" action="<?php echo Horde::applicationUrl(Horde_Util::addParameter($imageurl, 'actionID', 'previewcrop'));?>">
+<form method="post" action="<?php echo $imageurl->copy()->add('actionID', 'previewcrop');?>">
   <input type="hidden" name="image_id" id="image_id" value="<?php echo (int)$image_id ?>" />
   <input type="hidden" name="x1" id="x1" value="<?php echo $x1 ?>" />
   <input type="hidden" name="y1" id="y1" value="<?php echo $y1 ?>" />
diff --git a/ansel/templates/image/edit_image.inc b/ansel/templates/image/edit_image.inc
index 2cabfe63d..0265d41e0 100644
--- a/ansel/templates/image/edit_image.inc
+++ b/ansel/templates/image/edit_image.inc
@@ -5,31 +5,30 @@
 $style = $gallery->getStyle();
 $image_src = Ansel::getImageUrl($image_id, 'screen');
 
-echo Horde::link($galleryurl) . Horde::img('galleries.png') . ' ' . _("Back to gallery") . '</a> ';
-echo Horde::link($imageview_url) . Horde::img('galleries.png') . ' ' . _("Cancel") . '</a> ';
+echo $galleryurl->link() . Horde::img('galleries.png') . ' ' . _("Back to gallery") . '</a> ';
+echo $imageview_url->link() . Horde::img('galleries.png') . ' ' . _("Cancel") . '</a> ';
 
 if (Ansel::isAvailable('rotate')) {
-    echo Horde::link(Horde::applicationUrl(Util::addParameter($imageurl, 'actionID', 'previewrotate270'))) . Horde::img('image/rotate-270.png', '', '', $registry->getImageDir('horde')) . ' ' . _("Rotate Left") . '</a> ';
-    echo Horde::link(Horde::applicationUrl(Util::addParameter($imageurl, 'actionID', 'previewrotate180'))) . Horde::img('image/rotate-180.png', '', '', $registry->getImageDir('horde')) . ' ' . _("Rotate 180") . '</a> ';
-    echo Horde::link(Horde::applicationUrl(Util::addParameter($imageurl, 'actionID', 'previewrotate90'))) . Horde::img('image/rotate-90.png', '', '', $registry->getImageDir('horde')) . ' ' . _("Rotate Right") . '</a> ';
+    echo $imageurl->copy()->add('actionID', 'previewrotate270')->link() . Horde::img('image/rotate-270.png') . ' ' . _("Rotate Left") . '</a> ';
+    echo $imageurl->copy()->add('actionID', 'previewrotate180')->link() . Horde::img('image/rotate-180.png') . ' ' . _("Rotate 180") . '</a> ';
+    echo $imageurl->copy()->add('actionID', 'previewrotate90')->link() . Horde::img('image/rotate-90.png') . ' ' . _("Rotate Right") . '</a> ';
 }
 if (Ansel::isAvailable('flip')) {
-    echo Horde::link(Horde::applicationUrl(Horde_Util::addParameter($imageurl, 'actionID', 'previewflip'))) . Horde::img('image/flip.png') . ' ' . _("Flip") . '</a> ';
+    echo $imageurl->copy()->add('actionID', 'previewflip')->link() . Horde::img('image/flip.png') . ' ' . _("Flip") . '</a> ';
 }
 if (Ansel::isAvailable('mirror')) {
-    echo Horde::link(Horde::applicationUrl(Horde_Util::addParameter($imageurl, 'actionID', 'previewmirror'))) . Horde::img('image/mirror.png') . ' ' . _("Mirror") . '</a> ';
+    echo $imageurl->copy()->add('actionID', 'previewmirror')->link() . Horde::img('image/mirror.png') . ' ' . _("Mirror") . '</a> ';
 }
 if (Ansel::isAvailable('grayscale')) {
-    echo Horde::link(Horde::applicationUrl(Horde_Util::addParameter($imageurl, 'actionID', 'previewgrayscale'))) . Horde::img('image/grayscale.png') . ' ' . _("Grayscale") . '</a> ';
+    echo $imageurl->copy()->add('actionID', 'previewgrayscale')->link() . Horde::img('image/grayscale.png') . ' ' . _("Grayscale") . '</a> ';
 }
 if (Ansel::isAvailable('TextWatermark')) {
     echo Horde::link('#', '', '', '_blank', Horde::popupJs(Horde::applicationUrl($imageurl), array('params' => array('actionID' => 'setwatermark', 'share' => $gallery->getName()), 'width' => 450, 'height' => 250, 'urlencode' => true)) . 'return false;') . Horde::img('text.png') . ' ' . _("Watermark") . '</a> ';
 }
 
 $selfUrl = Horde::selfUrl(true);
-echo Horde::link(Horde::applicationUrl(Horde_Util::addParameter($selfUrl, array('actionID' => 'cropedit')))) . Horde::img('image/crop.png') . _("Crop") . '</a>';
-echo Horde::link(Horde::applicationUrl(Horde_Util::addParameter($selfUrl, array('actionID' => 'resizeedit')))) . Horde::img('image/ratio.png') . _("Resize") . '</a>';
-
+echo $selfUrl->copy()->add('actionID', 'cropedit')->link() . Horde::img('image/crop.png') . _("Crop") . '</a>';
+echo $selfUrl->copy()->add('actionID', 'resizeedit')->link() . Horde::img('image/ratio.png') . _("Resize") . '</a>';
 ?>
 </div>
 <br />
diff --git a/ansel/templates/image/preview_cropimage.inc b/ansel/templates/image/preview_cropimage.inc
index be13582df..186965f72 100644
--- a/ansel/templates/image/preview_cropimage.inc
+++ b/ansel/templates/image/preview_cropimage.inc
@@ -1,25 +1,27 @@
 <h1 class="header"><?php echo htmlspecialchars($title, ENT_COMPAT, Horde_Nls::getCharset()) ?></h1>
 <?php
-$base_url = Horde_Util::addParameter('image.php', array_merge(
-                                            array('gallery' => $gallery_id,
-                                                  'image' => $image_id,
-                                                  'page' => $page,
-                                                  'params' => $params),
-                                            $date));
+$base_url = Horde::applicationUrl('image.php');
+$base_url = $base_url->copy()->add(array_merge(
+                            array('gallery' => $gallery_id,
+                                  'image' => $image_id,
+                                  'page' => $page,
+                                  'params' => $params),
+                            $date));
 
-$edit_url = Horde_Util::addParameter($base_url, 'actionID', 'editimage');
-$save_url = Horde_Util::addParameter($base_url, 'actionID', $action);
-$image_url = Horde::applicationUrl(Horde_Util::addParameter($base_url, array('actionID' => 'image' . $action,
-                                                                       'view' => 'full')));
+$edit_url = $base_url->copy()->add('actionID', 'editimage');
+$save_url = $base_url->copy()->add('actionID', $action);
+$image_url = $base_url->copy()->add(array(
+    'actionID' => 'image' . $action,
+    'view' => 'full'));
 ?>
 <div class="control anselActions" style="text-align:center;">
 <?php
 if ($gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) {
-    echo Horde::link(Horde::applicationUrl($save_url), _("Save Change"))
+    echo $save_url->link(array('title' => _("Save Change")))
              . Horde::img('save.png') . ' ' . _("Save Change") . '</a> ';
 }
 if ($gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) {
-    echo Horde::link(Horde::applicationUrl($edit_url), _("Cancel Change"))
+    echo $edit_url->link(array('title' => _("Cancel Change")))
              . Horde::img('delete.png') . ' ' . _("Cancel Change") . '</a>';
 }
 ?>
diff --git a/ansel/templates/image/preview_image.inc b/ansel/templates/image/preview_image.inc
index a4b5462f9..eed0f22a1 100644
--- a/ansel/templates/image/preview_image.inc
+++ b/ansel/templates/image/preview_image.inc
@@ -1,28 +1,31 @@
 <h1 class="header"><?php echo htmlspecialchars($title, ENT_COMPAT, Horde_Nls::getCharset()) ?></h1>
 <?php
-$base_url = Horde_Util::addParameter('image.php', array_merge(
-                                            array('gallery' => $gallery_id,
-                                                  'image' => $image_id,
-                                                  'page' => $page,
-                                                  'watermark' => $watermark,
-                                                  'whalign' => $watermark_halign,
-                                                  'wvalign' => $watermark_valign,
-                                                  'font' => $watermark_font),
-                                            $date));
+$base_url = Horde::applicationUrl('image.php');
 
-$edit_url = Horde_Util::addParameter($base_url, 'actionID', 'editimage');
-$save_url = Horde_Util::addParameter($base_url, 'actionID', $action);
-$image_url = Horde::applicationUrl(Horde_Util::addParameter($base_url, array('actionID' => 'image' . $action,
-                                                                             'view' => 'screen')));
+$base_url->add(array_merge(
+                array('gallery' => $gallery_id,
+                      'image' => $image_id,
+                      'page' => $page,
+                      'watermark' => $watermark,
+                      'whalign' => $watermark_halign,
+                      'wvalign' => $watermark_valign,
+                      'font' => $watermark_font),
+                $date));
+
+$edit_url = $base_url->copy()->add('actionID', 'editimage');
+$save_url = $base_url->copy()->add('actionID', $action);
+$image_url = $base_url->copy()->add(array(
+                                    'actionID' => 'image' . $action,
+                                    'view' => 'screen'));
 ?>
 <div class="control anselActions" style="text-align:center;">
 <?php
 if ($gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) {
-    echo Horde::link(Horde::applicationUrl($save_url), _("Save Change"))
+    echo $save_url->link(array('title' => _("Save Change")))
              . Horde::img('save.png') . ' ' . _("Save Change") . '</a> ';
 }
 if ($gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) {
-    echo Horde::link(Horde::applicationUrl($edit_url), _("Cancel Change"))
+    echo $edit_url->link(array('title' => _("Cancel Change")))
              . Horde::img('delete.png') . ' ' . _("Cancel Change") . '</a>';
 }
 ?>
diff --git a/ansel/templates/image/resize_image.inc b/ansel/templates/image/resize_image.inc
index 39b2e108e..e5d12f12f 100644
--- a/ansel/templates/image/resize_image.inc
+++ b/ansel/templates/image/resize_image.inc
@@ -36,34 +36,34 @@ function resetImage()
 $style = $gallery->getStyle();
 $image_src = Ansel::getImageUrl($image_id, 'full');
 
-echo Horde::link($galleryurl) . Horde::img('galleries.png') . ' ' . _("Back to gallery") . '</a> ';
-echo Horde::link($imageview_url) . Horde::img('galleries.png') . ' ' . _("Cancel") . '</a> ';
+echo $galleryurl->link() . Horde::img('galleries.png') . ' ' . _("Back to gallery") . '</a> ';
+echo $imageview_url->link() . Horde::img('galleries.png') . ' ' . _("Cancel") . '</a> ';
 
 if (Ansel::isAvailable('rotate')) {
-    echo Horde::link(Horde_Util::addParameter($imageurl, 'actionID', 'previewrotate270')) . Horde::img('image/rotate-270.png') . ' ' . _("Rotate Left") . '</a> ';
-    echo Horde::link(Horde_Util::addParameter($imageurl, 'actionID', 'previewrotate180')) . Horde::img('image/rotate-180.png') . ' ' . _("Rotate 180") . '</a> ';
-    echo Horde::link(Horde_Util::addParameter($imageurl, 'actionID', 'previewrotate90')) . Horde::img('image/rotate-90.png') . ' ' . _("Rotate Right") . '</a> ';
+    echo $imageurl->copy()->add('actionID', 'previewrotate270')->link() . Horde::img('image/rotate-270.png') . ' ' . _("Rotate Left") . '</a> ';
+    echo $imageurl->copy()->add('actionID', 'previewrotate180')->link() . Horde::img('image/rotate-180.png') . ' ' . _("Rotate 180") . '</a> ';
+    echo $imageurl->copy()->add('actionID', 'previewrotate90')->link() . Horde::img('image/rotate-90.png') . ' ' . _("Rotate Right") . '</a> ';
 }
 if (Ansel::isAvailable('flip')) {
-    echo Horde::link(Horde_Util::addParameter($imageurl, 'actionID', 'previewflip')) . Horde::img('image/flip.png') . ' ' . _("Flip") . '</a> ';
+    echo $imageurl->copy()->add('actionID', 'previewflip')->link() . Horde::img('image/flip.png') . ' ' . _("Flip") . '</a> ';
 }
 if (Ansel::isAvailable('mirror')) {
-    echo Horde::link(Horde_Util::addParameter($imageurl, 'actionID', 'previewmirror')) . Horde::img('image/mirror.png') . ' ' . _("Mirror") . '</a> ';
+    echo $imageurl->copy()->add('actionID', 'previewmirror')->link() . Horde::img('image/mirror.png') . ' ' . _("Mirror") . '</a> ';
 }
 if (Ansel::isAvailable('grayscale')) {
-    echo Horde::link(Horde_Util::addParameter($imageurl, 'actionID', 'previewgrayscale')) . Horde::img('image/grayscale.png') . ' ' . _("Grayscale") . '</a> ';
+    echo $imageurl->copy()->add('actionID', 'previewgrayscale')->link() . Horde::img('image/grayscale.png') . ' ' . _("Grayscale") . '</a> ';
 }
 if (Ansel::isAvailable('text_watermark')) {
     echo Horde::link('#', '', '', '_blank', Horde::popupJs(Horde::applicationUrl($imageurl), array('params' => array('actionID' => 'setwatermark', 'share' => $gallery->getName()), 'width' => 450, 'height' => 250, 'urlencode' => true)) . 'return false;') . Horde::img('text.png') . ' ' . _("Watermark") . '</a> ';
 }
 
 $selfUrl = Horde::selfUrl(true);
-echo Horde::link(Horde::applicationUrl(Horde_Util::addParameter($selfUrl, array('actionID' => 'cropedit')))) . Horde::img('image/crop.png') . _("Crop") . '</a>';
+echo $selfUrl->copy()->add(array('actionID' => 'cropedit'))->link() . Horde::img('image/crop.png') . _("Crop") . '</a>';
 
-echo Horde::link(Horde::applicationUrl(Horde_Util::addParameter($selfUrl, array('actionID' => 'resizeedit')))) . Horde::img('image/ratio.png') . _("Resize") . '</a>';
+echo $selfUrl->copy()->add(array('actionID' => 'resizeedit'))->link() . Horde::img('image/ratio.png') . _("Resize") . '</a>';
 ?>
 </div>
-<form method="post" action="<?php echo Horde::applicationUrl(Horde_Util::addParameter($imageurl, 'actionID', 'resize'));?>">
+<form method="post" action="<?php echo $imageurl->copy()->add('actionID', 'resize');?>">
 <div style="width:100%;text-align:center;margin-top:5px;margin-bottom:5px;">
   <?php echo _("width") ?>:
   <input type="text" name="width" id="width" size="5" readonly="readonly" value="<?php echo (int)$geometry['width'] ?>"/>
diff --git a/ansel/templates/image/upload.inc b/ansel/templates/image/upload.inc
index 49a02d345..f881443db 100644
--- a/ansel/templates/image/upload.inc
+++ b/ansel/templates/image/upload.inc
@@ -35,6 +35,7 @@ $lbcssurl = Horde::url($GLOBALS['registry']->get('themesuri', 'ansel') . '/light
 </td>
 </tr></table>
 <?php if (!empty($haveImages)):?>
+<?php $uploadpreview_url = Horde::applicationUrl('img/upload_preview.php');?>
 <script type="text/javascript">
 // <![CDATA[
 // Delay response
@@ -58,7 +59,7 @@ var carousel = null;
 
 function runTest() {
     updateCarouselSize();
-    carousel = new UI.Ajax.Carousel("horizontal_carousel", {url: "<?php echo Horde_Util::addParameter(Horde::applicationUrl('img/upload_preview.php'), 'gallery', $gallery->id) ?>", elementSize: 90})
+    carousel = new UI.Ajax.Carousel("horizontal_carousel", {url: "<?php echo $uploadpreview_url->add('gallery', $gallery->id) ?>", elementSize: 90})
         .observe("request:started", function() {
             $('spinner').show().morph("opacity:0.8", {duration:0.5});
         })