From 7862e8b02ddd41eb68e858278cd909c8ff371550 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 10 Jul 2009 09:59:04 +0800
Subject: Created the dynamic albums module which provides a dynamic album
 containing either recent updates or most viewed images.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/dynamic/controllers/dynamic.php | 94 +++++++++++++++++++++++++++++++++
 1 file changed, 94 insertions(+)
 create mode 100644 modules/dynamic/controllers/dynamic.php

(limited to 'modules/dynamic/controllers/dynamic.php')

diff --git a/modules/dynamic/controllers/dynamic.php b/modules/dynamic/controllers/dynamic.php
new file mode 100644
index 00000000..b1fde2ac
--- /dev/null
+++ b/modules/dynamic/controllers/dynamic.php
@@ -0,0 +1,94 @@
+<?php defined("SYSPATH") or die("No direct script access.");/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 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_Controller extends Controller {
+  public function updates() {
+    $page_size = module::get_var("gallery", "page_size", 9);
+    $page = $this->input->get("page", "1");
+
+    $children_count = ORM::factory("item")
+      ->viewable()
+      ->where("type !=", "album")
+      ->count_all();
+    $offset = ($page-1) * $page_size;
+    print $children_count;
+
+    $max_pages = ceil($children_count / $page_size);
+    print $max_pages;
+
+    // Make sure that the page references a valid offset
+    if ($page < 1 || ($children_count && $page > ceil($children_count / $page_size))) {
+      Kohana::show_404();
+    }
+
+    $template = new Theme_View("page.html", "dynamic");
+    $template->set_global("page_size", $page_size);
+    $template->set_global("children", ORM::factory("item")
+                          ->viewable()
+                          ->where("type !=", "album")
+                          ->orderby("created", "DESC")
+                          ->find_all($page_size, $offset));
+    $template->set_global("children_count", $children_count);
+    $template->content = new View("dynamic.html");
+    $template->content->title = t("Recent Updates");
+
+    print $template;
+    print $this->_show("updates");
+  }
+
+  public function popular() {
+    print $this->_show("popular");
+  }
+
+  private function _show($album) {
+    $page_size = module::get_var("gallery", "page_size", 9);
+    $page = $this->input->get("page", "1");
+
+    $album_defn = unserialize(module::get_var("dynamic", $album));
+    $children_count = $album_defn->limit;
+    if (empty($children_count)) {
+      $children_count = ORM::factory("item")
+        ->viewable()
+        ->where("type !=", "album")
+        ->count_all();
+    }
+
+    $offset = ($page-1) * $page_size;
+
+    $max_pages = ceil($children_count / $page_size);
+
+    // Make sure that the page references a valid offset
+    if ($page < 1 || ($children_count && $page > ceil($children_count / $page_size))) {
+      Kohana::show_404();
+    }
+
+    $template = new Theme_View("page.html", "dynamic");
+    $template->set_global("page_size", $page_size);
+    $template->set_global("children", ORM::factory("item")
+                          ->viewable()
+                          ->where("type !=", "album")
+                          ->orderby($album_defn->key_field, "DESC")
+                          ->find_all($page_size, $offset));
+    $template->set_global("children_count", $children_count);
+    $template->content = new View("dynamic.html");
+    $template->content->title = t($album_defn->title);
+
+    print $template;
+  }
+
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 4b28f7f50e0901ee3abe864a3881ff11d08a73ce Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 10 Jul 2009 10:15:14 +0800
Subject: A few minor changes to add to the dynamic albums module 1) cleanun
 the two displays of the recent changes page 2) change the name to recent
 changes. 3) Change the description in module.info Not quite ready for prime
 time, some issues with the limit to be resolved

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/dynamic/controllers/dynamic.php       | 30 ---------------------------
 modules/dynamic/helpers/dynamic_installer.php |  2 +-
 modules/dynamic/module.info                   |  2 +-
 3 files changed, 2 insertions(+), 32 deletions(-)

(limited to 'modules/dynamic/controllers/dynamic.php')

diff --git a/modules/dynamic/controllers/dynamic.php b/modules/dynamic/controllers/dynamic.php
index b1fde2ac..6b5f2915 100644
--- a/modules/dynamic/controllers/dynamic.php
+++ b/modules/dynamic/controllers/dynamic.php
@@ -18,36 +18,6 @@
  */
 class Dynamic_Controller extends Controller {
   public function updates() {
-    $page_size = module::get_var("gallery", "page_size", 9);
-    $page = $this->input->get("page", "1");
-
-    $children_count = ORM::factory("item")
-      ->viewable()
-      ->where("type !=", "album")
-      ->count_all();
-    $offset = ($page-1) * $page_size;
-    print $children_count;
-
-    $max_pages = ceil($children_count / $page_size);
-    print $max_pages;
-
-    // Make sure that the page references a valid offset
-    if ($page < 1 || ($children_count && $page > ceil($children_count / $page_size))) {
-      Kohana::show_404();
-    }
-
-    $template = new Theme_View("page.html", "dynamic");
-    $template->set_global("page_size", $page_size);
-    $template->set_global("children", ORM::factory("item")
-                          ->viewable()
-                          ->where("type !=", "album")
-                          ->orderby("created", "DESC")
-                          ->find_all($page_size, $offset));
-    $template->set_global("children_count", $children_count);
-    $template->content = new View("dynamic.html");
-    $template->content->title = t("Recent Updates");
-
-    print $template;
     print $this->_show("updates");
   }
 
diff --git a/modules/dynamic/helpers/dynamic_installer.php b/modules/dynamic/helpers/dynamic_installer.php
index 8780864b..66d6298d 100644
--- a/modules/dynamic/helpers/dynamic_installer.php
+++ b/modules/dynamic/helpers/dynamic_installer.php
@@ -31,7 +31,7 @@ class dynamic_installer {
                                               "limit" => null,
                                               "description" => "",
                                               "key_field" => "created",
-                                              "title" => t("Recent Updates"))));
+                                              "title" => t("Recent Changes"))));
       module::set_version("dynamic", 1);
     }
   }
diff --git a/modules/dynamic/module.info b/modules/dynamic/module.info
index 4167df4b..aa5e0432 100644
--- a/modules/dynamic/module.info
+++ b/modules/dynamic/module.info
@@ -1,3 +1,3 @@
 name = Dynamic
-description = Dynamic album
+description = Adds the Recent Changes and Most Viewed dynamic albums
 version = 1
-- 
cgit v1.2.3