From ec459bf42ea73a4cdc3cc94e7d2712cfc00e9328 Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Fri, 31 Jul 2009 13:02:05 -0400 Subject: [PATCH] Horde 4 refactoring for GalleryRenderer objects --- .../Base.php} | 50 ++++++++++------------ ansel/lib/View/GalleryRenderer/Gallery.php | 8 ++-- ansel/lib/View/GalleryRenderer/GalleryLightbox.php | 8 ++-- 3 files changed, 30 insertions(+), 36 deletions(-) rename ansel/lib/View/{GalleryRenderer.php => GalleryRenderer/Base.php} (88%) diff --git a/ansel/lib/View/GalleryRenderer.php b/ansel/lib/View/GalleryRenderer/Base.php similarity index 88% rename from ansel/lib/View/GalleryRenderer.php rename to ansel/lib/View/GalleryRenderer/Base.php index 3056fd4fa..1b3a66dd5 100644 --- a/ansel/lib/View/GalleryRenderer.php +++ b/ansel/lib/View/GalleryRenderer/Base.php @@ -10,35 +10,35 @@ * @author Michael J. Rubinsky * @package Ansel */ -class Ansel_View_GalleryRenderer { - +abstract class Ansel_View_GalleryRenderer_Base +{ /** * The Ansel_View_Gallery object that this Renderer belongs to. * * @var Ansel_View_Gallery */ - var $view; + public $view; /** * The gallery id for this view's gallery * * @var integer */ - var $galleryId; + public $galleryId; // TODO: probably can remove this (get the id from the view's gallery) /** * Gallery slug for current gallery. * * @var string */ - var $gallerySlug; + var $gallerySlug; // Ditto. /** * The current page we are viewing - * + * //TODO: use __get() for these type of things... * @var integer */ - var $page = 0; + public $page = 0; /** * The display mode of the current gallery. @@ -47,42 +47,42 @@ class Ansel_View_GalleryRenderer { * * @var integer */ - var $mode; + public $mode; /** * The style definition array for this gallery. * * @var array */ - var $style; + public $style; /** * Holds number of tiles to display per page * * @var integer */ - var $perpage; + public $perpage; /** * The tile number we are starting with on the current page. * * @var integer */ - var $pagestart; + public $pagestart; /** * The last tile number on the current page. * * @var integer */ - var $pageend; + public $pageend; /** * The total number of tiles that this view contains * * @var integer */ - var $numTiles; + public $numTiles; /** * The Ansel_Image or Ansel_DateGallery objects that appear on the current @@ -90,14 +90,14 @@ class Ansel_View_GalleryRenderer { * * @var array of Ansel_Image or Ansel_DateGallery objects. */ - var $children; + public $children; /** * If we are grouping by date, this holds the currently selected date parts. * * @var array containing sufficient date parts for the current depth. */ - var $date = array(); + public $date = array(); /** * Constructor @@ -106,7 +106,7 @@ class Ansel_View_GalleryRenderer { * * @return Ansel_View_Renderer_Gallery */ - function Ansel_View_GalleryRenderer($view) + public function __construct($view) { $this->view = $view; } @@ -115,8 +115,10 @@ class Ansel_View_GalleryRenderer { * Initialize the renderer. This *must* be called before any attempt is made * to display or otherwise interact with the renderer. * + * @TODO: Not sure why I didn't put this in the const'r - try moving it. + * */ - function init() + public function init() { global $prefs, $conf; @@ -184,7 +186,7 @@ class Ansel_View_GalleryRenderer { * Other view classes can override this if they need anything special. * */ - function fetchChildren($noauto) + public function fetchChildren($noauto) { /* Total number of tiles for this gallery view */ $this->numTiles = $this->view->gallery->countGalleryChildren(PERMS_SHOW, false, $noauto); @@ -206,14 +208,6 @@ class Ansel_View_GalleryRenderer { * * @return string */ - function html() - { - if (is_a($this->view->gallery, 'PEAR_Error')) { - echo htmlspecialchars($this->view->gallery->getMessage(), ENT_COMPAT, Horde_Nls::getCharset()); - return; - } - - return $this->_html(); - } - + abstract public function html(); + abstract protected function _init(); } diff --git a/ansel/lib/View/GalleryRenderer/Gallery.php b/ansel/lib/View/GalleryRenderer/Gallery.php index f806a4b20..b901ca2ea 100644 --- a/ansel/lib/View/GalleryRenderer/Gallery.php +++ b/ansel/lib/View/GalleryRenderer/Gallery.php @@ -11,13 +11,13 @@ * @author Michael J. Rubinsky * @package Ansel */ -class Ansel_View_GalleryRenderer_Gallery extends Ansel_View_GalleryRenderer { - +class Ansel_View_GalleryRenderer_Gallery extends Ansel_View_GalleryRenderer_Base +{ /** * Perform any tasks that should be performed before the view is rendered. * */ - function _init() + protected function _init() { } @@ -27,7 +27,7 @@ class Ansel_View_GalleryRenderer_Gallery extends Ansel_View_GalleryRenderer { * @return string The HTML. * */ - function _html() + public function html() { global $conf, $prefs, $registry; diff --git a/ansel/lib/View/GalleryRenderer/GalleryLightbox.php b/ansel/lib/View/GalleryRenderer/GalleryLightbox.php index d70051b4b..f4f062d82 100644 --- a/ansel/lib/View/GalleryRenderer/GalleryLightbox.php +++ b/ansel/lib/View/GalleryRenderer/GalleryLightbox.php @@ -11,13 +11,13 @@ * @author Michael J. Rubinsky * @package Ansel */ -class Ansel_View_GalleryRenderer_GalleryLightbox extends Ansel_View_GalleryRenderer { - +class Ansel_View_GalleryRenderer_GalleryLightbox extends Ansel_View_GalleryRenderer_Base +{ /** * Perform any tasks that should be performed before the view is rendered. * */ - function _init() + protected function _init() { if (empty($this->view->_params['image_onclick'])) { $this->view->_params['image_onclick'] = 'return lb.start(%i);'; @@ -36,7 +36,7 @@ class Ansel_View_GalleryRenderer_GalleryLightbox extends Ansel_View_GalleryRende * * @return string The HTML */ - function _html() + public function html() { global $conf, $prefs, $registry; -- 2.11.0