From 1a00e0f7942d3b50ec5b0a7b6e4b666c429927a7 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue, 30 Aug 2011 22:11:30 -0700
Subject: [PATCH] Use the new display context approach to provide the context
 for an item.

---
 3.0/modules/dynamic/controllers/dynamic.php   | 52 +++++++++++++----
 .../libraries/Dynamic_Display_Context.php     | 56 -------------------
 2 files changed, 41 insertions(+), 67 deletions(-)
 delete mode 100644 3.0/modules/dynamic/libraries/Dynamic_Display_Context.php

diff --git a/3.0/modules/dynamic/controllers/dynamic.php b/3.0/modules/dynamic/controllers/dynamic.php
index 598c64f6..5cd2e222 100644
--- a/3.0/modules/dynamic/controllers/dynamic.php
+++ b/3.0/modules/dynamic/controllers/dynamic.php
@@ -50,24 +50,54 @@ class Dynamic_Controller extends Controller {
     $max_pages = max(ceil($children_count / $page_size), 1);
 
     // Make sure that the page references a valid offset
-    if ($page < 1 || ($children_count && $page > ceil($children_count / $page_size))) {
-      throw new Kohana_404_Exception();
+    if ($page < 1) {
+      url::redirect(url::merge(array("page" => 1)));
+    } else if ($page > $max_pages) {
+      url::redirect(url::merge(array("page" => $max_pages)));
     }
 
-    Display_Context::factory("dynamic")
-      ->set(array("dynamic_type" => $album_defn, "path" => $album))
-      ->save();
-
+    $root = item::root();
     $template = new Theme_View("page.html", "collection", "dynamic");
-    $template->set_global("page", $page);
-    $template->set_global("page_size", $page_size);
-    $template->set_global("max_pages", $max_pages);
-    $template->set_global("children", dynamic::items($album_defn->key_field, $page_size, $offset));
-    $template->set_global("children_count", $children_count);
+    $template->set_global(
+      array("page" => $page,
+            "max_pages" => $max_pages,
+            "page_size" => $page_size,
+            "children" => dynamic::items($album_defn->key_field, $page_size, $offset),
+            "breadcrumbs" => array(
+              Breadcrumb::instance($root->title, $root->url())->set_first(),
+              Breadcrumb::instance($album_defn->title,
+                                   url::site("dynamic/$album"))->set_last()),
+            "children_count" => $children_count));
     $template->content = new View("dynamic.html");
     $template->content->title = t($album_defn->title);
 
     print $template;
+
+    item::set_display_context_callback("Dynamic_Controller::get_display_context",
+                                       $album_defn, $album);
   }
 
+  static function get_display_context($item, $album_defn, $path) {
+    $where = array(array("type", "!=", "album"));
+
+    $position = dynamic::get_position($album_defn, $item, $where);
+    if ($position > 1) {
+      list ($previous_item, $ignore, $next_item) =
+        dynamic::items($album_defn->key_field, 3, $position - 2);
+    } else {
+      $previous_item = null;
+      list ($next_item) = dynamic::items($album_defn->key_field, 1, $position);
+    }
+
+    $root = item::root();
+    return array("position" => $position,
+                 "previous_item" => $previous_item,
+                 "next_item" => $next_item,
+                 "sibling_count" => dynamic::get_display_count($album_defn),
+                 "breadcrumbs" => array(
+                   Breadcrumb::instance($root->title, $root->url())->set_first(),
+                   Breadcrumb::instance($album_defn->title,
+                                        url::site("dynamic/$path?show={$item->id}")),
+                   Breadcrumb::instance($item->title, $item->url())->set_last()));
+  }
 }
\ No newline at end of file
diff --git a/3.0/modules/dynamic/libraries/Dynamic_Display_Context.php b/3.0/modules/dynamic/libraries/Dynamic_Display_Context.php
deleted file mode 100644
index 97381272..00000000
--- a/3.0/modules/dynamic/libraries/Dynamic_Display_Context.php
+++ /dev/null
@@ -1,56 +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 Dynamic_Display_Context_Core extends Display_Context {
-  protected function __construct() {
-    parent::__construct("dynamic");
-  }
-
-  function display_context($item) {
-    $dynamic_type_definition = $this->get("dynamic_type");
-
-    $position = dynamic::get_position($dynamic_type_definition, $item);
-    if ($position > 1) {
-      list ($previous_item, $ignore, $next_item) = dynamic::items($dynamic_type_definition->key_field, 3, $position - 2);
-    } else {
-      $previous_item = null;
-      list ($next_item) = dynamic::items($dynamic_type_definition->key_field, 1, $position);
-    }
-
-    $root = item::root();
-    return array("position" =>$position,
-                 "previous_item" => $previous_item,
-                 "next_item" =>$next_item,
-                 "sibling_count" => dynamic::get_display_count($dynamic_type_definition),
-                 "breadcrumbs" => array(
-                   Breadcrumb::instance($root->title, $root->url())->set_first(),
-                   Breadcrumb::instance($dynamic_type_definition->title, $this->_url("show={$item->id}")),
-                   Breadcrumb::instance($item->title, $item->url())->set_last()));
-  }
-
-  private function _url($query=null) {
-    $albumPath = $this->get("path");
-    $url = url::site("dynamic/$albumPath");
-    if ($query) {
-      $url .= "?$query";
-    }
-    return $url;
-  }
-}