From 7f11545142f8b9959af8ae4bc0f0c3257d6f966b Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Fri, 22 Jan 2010 15:29:47 -0700 Subject: [PATCH] Use 'uid' instead of 'muid' --- imp/lib/Contents.php | 2 +- imp/saveimage.php | 6 +++--- imp/templates/saveimage/saveimage.html | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/imp/lib/Contents.php b/imp/lib/Contents.php index 4e78bc483..abf285468 100644 --- a/imp/lib/Contents.php +++ b/imp/lib/Contents.php @@ -693,7 +693,7 @@ class IMP_Contents if (($mask && self::SUMMARY_IMAGE_SAVE) && $GLOBALS['registry']->hasMethod('images/selectGalleries') && ($mime_part->getPrimaryType() == 'image')) { - $part['img_save'] = Horde::link('#', _("Save Image in Gallery"), 'saveImgAtc', null, Horde::popupJs(Horde::applicationUrl('saveimage.php'), array('params' => array('muid' => ($this->_uid . IMP::IDX_SEP . $this->_mailbox), 'id' => $id), 'height' => 200, 'width' => 450)) . 'return false;') . ''; + $part['img_save'] = Horde::link('#', _("Save Image in Gallery"), 'saveImgAtc', null, Horde::popupJs(Horde::applicationUrl('saveimage.php'), array('params' => array('uid' => ($this->_uid . IMP::IDX_SEP . $this->_mailbox), 'id' => $id), 'height' => 200, 'width' => 450)) . 'return false;') . ''; } /* Strip Attachment? Allow stripping of base parts other than the diff --git a/imp/saveimage.php b/imp/saveimage.php index 8f875754c..c36fdbfd5 100644 --- a/imp/saveimage.php +++ b/imp/saveimage.php @@ -15,12 +15,12 @@ require_once dirname(__FILE__) . '/lib/Application.php'; Horde_Registry::appInit('imp'); $id = Horde_Util::getFormData('id'); -$muid = Horde_Util::getFormData('muid'); +$uid = Horde_Util::getFormData('uid'); /* Run through the action handlers. */ switch (Horde_Util::getFormData('actionID')) { case 'save_image': - $contents = IMP_Contents::singleton($muid); + $contents = IMP_Contents::singleton($uid); $mime_part = $contents->getMIMEPart($id); $image_data = array( 'data' => $mime_part->getContents(), @@ -48,7 +48,7 @@ $t = new Horde_Template(); $t->setOption('gettext', true); $t->set('action', Horde::applicationUrl('saveimage.php')); $t->set('id', htmlspecialchars($id)); -$t->set('muid', htmlspecialchars($muid)); +$t->set('uid', htmlspecialchars($uid)); $t->set('image_img', Horde::img('mime/image.png', _("Image"), null, $registry->getImageDir('horde'))); /* Build the list of galleries. */ diff --git a/imp/templates/saveimage/saveimage.html b/imp/templates/saveimage/saveimage.html index 153f1b70a..92a7e0928 100644 --- a/imp/templates/saveimage/saveimage.html +++ b/imp/templates/saveimage/saveimage.html @@ -1,7 +1,7 @@
- +

-- 2.11.0