From d293fe9fedf628bfe4bf1743f4d6d9c452011465 Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Mon, 19 Jul 2010 13:35:29 -0400 Subject: [PATCH] Ansel_ImageView -> Ansel_ImageGenerator --- ansel/image.php | 4 ++-- ansel/lib/Gallery.php | 4 ++-- ansel/lib/Image.php | 8 ++++---- ansel/lib/{ImageView.php => ImageGenerator.php} | 14 +++++++------- ansel/lib/{ImageView => ImageGenerator}/Mini.php | 4 ++-- ansel/lib/{ImageView => ImageGenerator}/PlainStack.php | 4 ++-- ansel/lib/{ImageView => ImageGenerator}/PolaroidStack.php | 4 ++-- ansel/lib/{ImageView => ImageGenerator}/PolaroidThumb.php | 4 ++-- ansel/lib/{ImageView => ImageGenerator}/PrettyThumb.php | 4 ++-- ansel/lib/{ImageView => ImageGenerator}/RoundedStack.php | 4 ++-- ansel/lib/{ImageView => ImageGenerator}/Screen.php | 4 ++-- .../lib/{ImageView => ImageGenerator}/ShadowSharpThumb.php | 4 ++-- ansel/lib/{ImageView => ImageGenerator}/Thumb.php | 4 ++-- ansel/lib/View/Base.php | 2 +- ansel/templates/image/crop_image.inc | 2 +- ansel/templates/image/edit_image.inc | 2 +- ansel/templates/image/resize_image.inc | 2 +- 17 files changed, 37 insertions(+), 37 deletions(-) rename ansel/lib/{ImageView.php => ImageGenerator.php} (94%) rename ansel/lib/{ImageView => ImageGenerator}/Mini.php (80%) rename ansel/lib/{ImageView => ImageGenerator}/PlainStack.php (90%) rename ansel/lib/{ImageView => ImageGenerator}/PolaroidStack.php (90%) rename ansel/lib/{ImageView => ImageGenerator}/PolaroidThumb.php (90%) rename ansel/lib/{ImageView => ImageGenerator}/PrettyThumb.php (92%) rename ansel/lib/{ImageView => ImageGenerator}/RoundedStack.php (90%) rename ansel/lib/{ImageView => ImageGenerator}/Screen.php (76%) rename ansel/lib/{ImageView => ImageGenerator}/ShadowSharpThumb.php (91%) rename ansel/lib/{ImageView => ImageGenerator}/Thumb.php (78%) diff --git a/ansel/image.php b/ansel/image.php index 5c55eb849..d87a71c31 100644 --- a/ansel/image.php +++ b/ansel/image.php @@ -277,7 +277,7 @@ case 'save': case 'editimage': case 'cropedit': case 'resizeedit': - $imageview_url = Ansel::getUrlFor('view', array_merge( + $ImageGenerator_url = Ansel::getUrlFor('view', array_merge( array('gallery' => $gallery_id, 'image' => $image_id, 'view' => 'Image', @@ -304,7 +304,7 @@ case 'resizeedit': 'horde.error'); /* Return to the image view. */ - header('Location: ' . $imageview_url); + header('Location: ' . $ImageGenerator_url); exit; } diff --git a/ansel/lib/Gallery.php b/ansel/lib/Gallery.php index cce530664..8c9f87f66 100644 --- a/ansel/lib/Gallery.php +++ b/ansel/lib/Gallery.php @@ -627,7 +627,7 @@ class Ansel_Gallery extends Horde_Share_Object_Sql_Hierarchical // Don't already have one, must generate it. $params = array('gallery' => $this, 'style' => $gal_style); try { - $iview = Ansel_ImageView::factory($gal_style['default_galleryimage_type'], $params); + $iview = Ansel_ImageGenerator::factory($gal_style['default_galleryimage_type'], $params); $img = $iview->create(); // Note the gallery_id is negative for generated stacks @@ -913,7 +913,7 @@ class Ansel_Gallery extends Horde_Share_Object_Sql_Hierarchical // Manually convert the charset since we're not going through save() // @TODO: Look at this usage - maybe each app's share object should // have this method or just keep it public? - $data = $this->getshareOb()->toDriverChaset(array($driver_key => $value)); + $data = $this->getshareOb()->toDriverCharset(array($driver_key => $value)); $query = $db->prepare('UPDATE ' . $this->getShareOb()->getTable() . ' SET ' . $driver_key . ' = ? WHERE share_id = ?', null, MDB2_PREPARE_MANIP); if ($GLOBALS['conf']['ansel_cache']['usecache']) { $GLOBALS['injector']->getInstance('Horde_Cache')->expire('Ansel_Gallery' . $this->id); diff --git a/ansel/lib/Image.php b/ansel/lib/Image.php index f4471a3e8..a5a0c7d82 100644 --- a/ansel/lib/Image.php +++ b/ansel/lib/Image.php @@ -401,23 +401,23 @@ class Ansel_Image Implements Iterator } try { - $iview = Ansel_ImageView::factory($viewType, array('image' => $this, 'style' => $style)); + $iview = Ansel_ImageGenerator::factory($viewType, array('image' => $this, 'style' => $style)); } catch (Ansel_Exception $e) { // It could be we don't support the requested effect, try // ansel_default before giving up. if ($view == 'prettythumb') { // If we still fail, the exception gets thrown up the chain. - $iview = Ansel_ImageView::factory('Thumb', array('image' => $this, 'style' => 'ansel_default')); + $iview = Ansel_ImageGenerator::factory('Thumb', array('image' => $this, 'style' => 'ansel_default')); } else { // If it wasn't a prettythumb, then something else must be wrong throw $e; } } - /* Create the ImageView */ + /* Create the ImageGenerator */ $iview->create(); - /* Cache the data from the new imageview */ + /* Cache the data from the new ImageGenerator */ try { $this->_data[$vHash] = $this->_image->raw(); } catch (Horde_Image_Exception $e) { diff --git a/ansel/lib/ImageView.php b/ansel/lib/ImageGenerator.php similarity index 94% rename from ansel/lib/ImageView.php rename to ansel/lib/ImageGenerator.php index 5f09eeaad..1d4719204 100644 --- a/ansel/lib/ImageView.php +++ b/ansel/lib/ImageGenerator.php @@ -15,7 +15,7 @@ * @author Michael J. Rubinsky * @package Ansel */ -class Ansel_ImageView +class Ansel_ImageGenerator { /** * Ansel_Image object that this view is created from. @@ -46,7 +46,7 @@ class Ansel_ImageView protected $_style = array(); /** - * Array of required, supported features for this ImageView to work + * Array of required, supported features for this ImageGenerator to work * * @var array */ @@ -55,7 +55,7 @@ class Ansel_ImageView /** * Const'r * - * @return Horde_ImageView + * @return Horde_ImageGenerator */ public function __construct($params) { @@ -85,20 +85,20 @@ class Ansel_ImageView } /** - * Horde_ImageView factory + * Horde_ImageGenerator factory * * @param string $type The type of concrete instance to return. * @param array $params Additional parameters needed for the instance. * - * @return Ansel_ImageView + * @return Ansel_ImageGenerator * @throws Ansel_Exception */ function factory($type, $params = array()) { $type = basename($type); - $class = 'Ansel_ImageView_' . $type; + $class = 'Ansel_ImageGenerator_' . $type; if (!class_exists($class)) { - include dirname(__FILE__) . '/ImageView/' . $type . '.php'; + include dirname(__FILE__) . '/ImageGenerator/' . $type . '.php'; } if (class_exists($class)) { $view = new $class($params); diff --git a/ansel/lib/ImageView/Mini.php b/ansel/lib/ImageGenerator/Mini.php similarity index 80% rename from ansel/lib/ImageView/Mini.php rename to ansel/lib/ImageGenerator/Mini.php index c09ff570c..f00f9d8ae 100755 --- a/ansel/lib/ImageView/Mini.php +++ b/ansel/lib/ImageGenerator/Mini.php @@ -1,11 +1,11 @@ * @package Ansel */ -class Ansel_ImageView_Mini extends Ansel_ImageView +class Ansel_ImageGenerator_Mini extends Ansel_ImageGenerator { /** * diff --git a/ansel/lib/ImageView/PlainStack.php b/ansel/lib/ImageGenerator/PlainStack.php similarity index 90% rename from ansel/lib/ImageView/PlainStack.php rename to ansel/lib/ImageGenerator/PlainStack.php index b251f46f4..509a03694 100644 --- a/ansel/lib/ImageView/PlainStack.php +++ b/ansel/lib/ImageGenerator/PlainStack.php @@ -1,11 +1,11 @@ * @package Ansel */ -class Ansel_ImageView_PlainStack extends Ansel_ImageView +class Ansel_ImageGenerator_PlainStack extends Ansel_ImageGenerator { public $need = array('PhotoStack'); diff --git a/ansel/lib/ImageView/PolaroidStack.php b/ansel/lib/ImageGenerator/PolaroidStack.php similarity index 90% rename from ansel/lib/ImageView/PolaroidStack.php rename to ansel/lib/ImageGenerator/PolaroidStack.php index 34e0501ec..4befd6921 100644 --- a/ansel/lib/ImageView/PolaroidStack.php +++ b/ansel/lib/ImageGenerator/PolaroidStack.php @@ -1,11 +1,11 @@ * @package Ansel */ -class Ansel_ImageView_PolaroidStack extends Ansel_ImageView +class Ansel_ImageGenerator_PolaroidStack extends Ansel_ImageGenerator { public $need = array('PhotoStack'); diff --git a/ansel/lib/ImageView/PolaroidThumb.php b/ansel/lib/ImageGenerator/PolaroidThumb.php similarity index 90% rename from ansel/lib/ImageView/PolaroidThumb.php rename to ansel/lib/ImageGenerator/PolaroidThumb.php index 07486ca48..fc453d120 100644 --- a/ansel/lib/ImageView/PolaroidThumb.php +++ b/ansel/lib/ImageGenerator/PolaroidThumb.php @@ -1,11 +1,11 @@ * @package Ansel */ -class Ansel_ImageView_PolaroidThumb extends Ansel_ImageView +class Ansel_ImageGenerator_PolaroidThumb extends Ansel_ImageGenerator { public $need = array('PolaroidImage'); diff --git a/ansel/lib/ImageView/PrettyThumb.php b/ansel/lib/ImageGenerator/PrettyThumb.php similarity index 92% rename from ansel/lib/ImageView/PrettyThumb.php rename to ansel/lib/ImageGenerator/PrettyThumb.php index 58d2bc1f2..5fe9df582 100644 --- a/ansel/lib/ImageView/PrettyThumb.php +++ b/ansel/lib/ImageGenerator/PrettyThumb.php @@ -1,11 +1,11 @@ * @package Ansel */ -class Ansel_ImageView_PrettyThumb extends Ansel_ImageView +class Ansel_ImageGenerator_PrettyThumb extends Ansel_ImageGenerator { public $need = array('RoundCorners', 'DropShadow'); diff --git a/ansel/lib/ImageView/RoundedStack.php b/ansel/lib/ImageGenerator/RoundedStack.php similarity index 90% rename from ansel/lib/ImageView/RoundedStack.php rename to ansel/lib/ImageGenerator/RoundedStack.php index 76319b9a4..0cdf0ce18 100644 --- a/ansel/lib/ImageView/RoundedStack.php +++ b/ansel/lib/ImageGenerator/RoundedStack.php @@ -1,12 +1,12 @@ * @package Ansel * */ -class Ansel_ImageView_RoundedStack extends Ansel_ImageView +class Ansel_ImageGenerator_RoundedStack extends Ansel_ImageGenerator { public $need = array('PhotoStack'); diff --git a/ansel/lib/ImageView/Screen.php b/ansel/lib/ImageGenerator/Screen.php similarity index 76% rename from ansel/lib/ImageView/Screen.php rename to ansel/lib/ImageGenerator/Screen.php index d50f11153..448978aba 100755 --- a/ansel/lib/ImageView/Screen.php +++ b/ansel/lib/ImageGenerator/Screen.php @@ -1,11 +1,11 @@ * @package Ansel */ -class Ansel_ImageView_Screen extends Ansel_ImageView +class Ansel_ImageGenerator_Screen extends Ansel_ImageGenerator { /** * diff --git a/ansel/lib/ImageView/ShadowSharpThumb.php b/ansel/lib/ImageGenerator/ShadowSharpThumb.php similarity index 91% rename from ansel/lib/ImageView/ShadowSharpThumb.php rename to ansel/lib/ImageGenerator/ShadowSharpThumb.php index d5b396b72..bf9004fd1 100644 --- a/ansel/lib/ImageView/ShadowSharpThumb.php +++ b/ansel/lib/ImageGenerator/ShadowSharpThumb.php @@ -1,11 +1,11 @@ * @package Ansel */ -class Ansel_ImageView_ShadowSharpThumb extends Ansel_ImageView +class Ansel_ImageGenerator_ShadowSharpThumb extends Ansel_ImageGenerator { public $need = array('DropShadow'); diff --git a/ansel/lib/ImageView/Thumb.php b/ansel/lib/ImageGenerator/Thumb.php similarity index 78% rename from ansel/lib/ImageView/Thumb.php rename to ansel/lib/ImageGenerator/Thumb.php index 62f381d0d..f6203cd08 100755 --- a/ansel/lib/ImageView/Thumb.php +++ b/ansel/lib/ImageGenerator/Thumb.php @@ -1,11 +1,11 @@ * @package Ansel */ -class Ansel_ImageView_Thumb extends Ansel_ImageView +class Ansel_ImageGenerator_Thumb extends Ansel_ImageGenerator { /** * diff --git a/ansel/lib/View/Base.php b/ansel/lib/View/Base.php index 8b49073eb..2e56cedad 100644 --- a/ansel/lib/View/Base.php +++ b/ansel/lib/View/Base.php @@ -221,7 +221,7 @@ abstract class Ansel_View_Base * full - Should a full URL be generated? [false] * from - Starting image count [0] * count - The number of images to include (starting at from) [0] - * image_view - The type of ImageView to obtain the src url for. [screen] + * image_view - The type of ImageGenerator to obtain the src url for. [screen] * view_links - Should the JSON include links to the Image and/or Gallery View? [false] * perpage - Number of images per page [from user prefs] * diff --git a/ansel/templates/image/crop_image.inc b/ansel/templates/image/crop_image.inc index d303faa0b..83cff1f62 100644 --- a/ansel/templates/image/crop_image.inc +++ b/ansel/templates/image/crop_image.inc @@ -90,7 +90,7 @@ $style = $gallery->getStyle(); $image_src = Ansel::getImageUrl($image_id, 'full'); echo $galleryurl->link() . Horde::img('galleries.png') . ' ' . _("Back to gallery") . ' '; -echo $imageview_url->link() . Horde::img('galleries.png') . ' ' . _("Cancel") . ' '; +echo $ImageGenerator_url->link() . Horde::img('galleries.png') . ' ' . _("Cancel") . ' '; if (Ansel::isAvailable('rotate')) { echo $imageurl->copy()->add('actionID', 'previewrotate270')->link() . Horde::img('image/rotate-270.png') . ' ' . _("Rotate Left") . ' '; diff --git a/ansel/templates/image/edit_image.inc b/ansel/templates/image/edit_image.inc index 704037a21..138878fa7 100644 --- a/ansel/templates/image/edit_image.inc +++ b/ansel/templates/image/edit_image.inc @@ -6,7 +6,7 @@ $style = $gallery->getStyle(); $image_src = Ansel::getImageUrl($image_id, 'screen'); echo $galleryurl->link() . Horde::img('galleries.png') . ' ' . _("Back to gallery") . ' '; -echo $imageview_url->link() . Horde::img('galleries.png') . ' ' . _("Cancel") . ' '; +echo $ImageGenerator_url->link() . Horde::img('galleries.png') . ' ' . _("Cancel") . ' '; if (Ansel::isAvailable('rotate')) { echo $imageurl->copy()->add('actionID', 'previewrotate270')->link() . Horde::img('image/rotate-270.png') . ' ' . _("Rotate Left") . ' '; diff --git a/ansel/templates/image/resize_image.inc b/ansel/templates/image/resize_image.inc index 7e655eb17..2ff1d7211 100644 --- a/ansel/templates/image/resize_image.inc +++ b/ansel/templates/image/resize_image.inc @@ -37,7 +37,7 @@ $style = $gallery->getStyle(); $image_src = Ansel::getImageUrl($image_id, 'full'); echo $galleryurl->link() . Horde::img('galleries.png') . ' ' . _("Back to gallery") . ' '; -echo $imageview_url->link() . Horde::img('galleries.png') . ' ' . _("Cancel") . ' '; +echo $ImageGenerator_url->link() . Horde::img('galleries.png') . ' ' . _("Cancel") . ' '; if (Ansel::isAvailable('rotate')) { echo $imageurl->copy()->add('actionID', 'previewrotate270')->link() . Horde::img('image/rotate-270.png') . ' ' . _("Rotate Left") . ' '; -- 2.11.0