From ce43f29e2ceaac3d638061f81dc6037b5e0018d3 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 27 Aug 2011 11:18:07 -0700
Subject: Refactor the display context code a bit: 1) Move the display context
 code into the controller themselves so that it's    more logically a
 continuation callback from the original controller    rendering code. 2)
 Simplify the display context set/get code and put it in the item helper,   
 it's just a couple of lines of code now. 3) Add more descriptive breadcrumb
 strings

---
 modules/gallery/libraries/Display_Context.php      | 71 ----------------------
 modules/gallery/libraries/Item_Display_Context.php | 44 --------------
 2 files changed, 115 deletions(-)
 delete mode 100644 modules/gallery/libraries/Display_Context.php
 delete mode 100644 modules/gallery/libraries/Item_Display_Context.php

(limited to 'modules/gallery/libraries')

diff --git a/modules/gallery/libraries/Display_Context.php b/modules/gallery/libraries/Display_Context.php
deleted file mode 100644
index 5054cffb..00000000
--- a/modules/gallery/libraries/Display_Context.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2011 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-abstract class Display_Context_Core {
-  private $_display_context_name;
-  private $_data;
-
-  static function factory($display_context_name=null) {
-    if (empty($display_context_name)) {
-      $display_context_id = Session::instance()->get("display_context_id", "");
-      $context = Cache::instance()->get($display_context_id, null);
-      $context = empty($context) ? new Item_Display_Context() : unserialize($context);
-    } else {
-      $class_prefix = ucfirst(strtolower($display_context_name));
-      $class_name = "{$class_prefix}_Display_Context";
-      $context = new $class_name();
-    }
-
-    return $context;
-  }
-
-  protected function __construct($display_context_name) {
-    // $this->reset($display_context_name);
-    $this->_data = array();
-    $this->_display_context_name = $display_context_name;
-  }
-
-  final function get($key) {
-    return empty($this->_data[$key]) ? null : $this->_data[$key];
-  }
-
-  final function set($key, $value=null) {
-    if (is_array($key)) {
-      if ((array)$key == $key) {
-        $this->_data = array_merge($this->_data, $key);
-      } else {
-        $this->_data = array_merge($this->_data, array_fill_keys($key, $value));
-      }
-    } else {
-      $this->_data[$key] = $value;
-    }
-    return $this;
-  }
-
-  final function save() {
-    $context_data = serialize($this);
-    $display_context_id = "display_context_" . md5($context_data);
-    Session::instance()->set("display_context_id", $display_context_id);
-    Cache::instance()->set($display_context_id, $context_data);
-    return $this;
-  }
-
-  abstract function display_context($item);
-}
diff --git a/modules/gallery/libraries/Item_Display_Context.php b/modules/gallery/libraries/Item_Display_Context.php
deleted file mode 100644
index d0562790..00000000
--- a/modules/gallery/libraries/Item_Display_Context.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2011 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-class Item_Display_Context_Core extends Display_Context {
-  protected function __construct() {
-    parent::__construct("item");
-  }
-
-  function display_context($item) {
-    $where = array(array("type", "!=", "album"));
-    $position = item::get_position($item, $where);
-    if ($position > 1) {
-      list ($previous_item, $ignore, $next_item) =
-        $item->parent()->viewable()->children(3, $position - 2, $where);
-    } else {
-      $previous_item = null;
-      list ($next_item) = $item->parent()->viewable()->children(1, $position, $where);
-   }
-
-    return array("position" =>$position,
-                 "previous_item" => $previous_item,
-                 "next_item" =>$next_item,
-                 "sibling_count" => $item->parent()->viewable()->children_count($where),
-                 "parents" => $item->parents()->as_array(),
-                 "breadcrumbs" => Breadcrumb::array_from_item_parents($item));
-  }
-}
-- 
cgit v1.2.3