From 26df23f8032097b660bf28b4c98f7839a9644de0 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Sat, 21 Nov 2009 17:31:54 -0700
Subject: [PATCH] Improvements to saveimage script

---
 imp/saveimage.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/imp/saveimage.php b/imp/saveimage.php
index 12189b7b2..59e573905 100644
--- a/imp/saveimage.php
+++ b/imp/saveimage.php
@@ -1,5 +1,7 @@
 <?php
 /**
+ * Save an image to a registry-defined application.
+
  * Copyright 2005-2009 The Horde Project (http://www.horde.org/)
  *
  * See the enclosed file COPYING for license information (GPL). If you
@@ -16,15 +18,14 @@ $id = Horde_Util::getFormData('id');
 $muid = Horde_Util::getFormData('muid');
 
 /* Run through the action handlers. */
-$actionID = Horde_Util::getFormData('actionID');
-switch ($actionID) {
+switch (Horde_Util::getFormData('actionID')) {
 case 'save_image':
     $contents = IMP_Contents::singleton($muid);
     $mime_part = $contents->getMIMEPart($id);
     $image_data = array(
-        'filename' => $mime_part->getName(true),
-        'description' => $mime_part->getDescription(true),
         'data' => $mime_part->getContents(),
+        'description' => $mime_part->getDescription(true),
+        'filename' => $mime_part->getName(true),
         'type' => $mime_part->getType()
     );
     try {
@@ -37,6 +38,11 @@ case 'save_image':
     exit;
 }
 
+if (!$registry->hasMethod('images/selectGalleries') ||
+    !$registry->hasMethod('images/saveImage')) {
+    throw new Horde_Exception(_("Image saving is not available."));
+}
+
 /* Build the template. */
 $t = new Horde_Template();
 $t->setOption('gettext', true);
-- 
2.11.0