Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Refactor sidebar_blocks into a separate function and then call block_…

…manager::get_html(site.sidebar). Convert image_block to use block management instead of theme::sidebar_blocks
  • Loading branch information...
commit 39a40e49a19f00baeeeefe375d67e915ccc7e09a 1 parent d77045f
Tim Almdal talmdal authored
7 modules/gallery/libraries/Theme_View.php
View
@@ -154,6 +154,13 @@ public function messages() {
}
/**
+ * Print out the sidebar.
+ */
+ public function sidebar_blocks() {
+ return block_manager::get_html("site.sidebar");
+ }
+
+ /**
* Handle all theme functions that insert module content.
*/
public function __call($function, $args) {
51 modules/image_block/helpers/image_block_theme.php → modules/image_block/helpers/image_block_block.php
View
@@ -17,34 +17,47 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/
-class image_block_theme_Core {
- static function sidebar_blocks($theme) {
- $block = new Block();
- $block->css_id = "gImageBlock";
- $block->title = t("Random Image");
- $block->content = new View("image_block_block.html");
+class image_block_block_Core {
+ static function get_site_list() {
+ return array("random_image" => t("Random Image"));
+ }
- $random = ((float)mt_rand()) / (float)mt_getrandmax();
+ static function get($block_id) {
+ $block = new Block();
+ switch ($block_id) {
+ case "random_image":
+ $block = new Block();
+ $block->css_id = "gImageBlock";
+ $block->title = t("Random Image");
+ $block->content = new View("image_block_block.html");
- $items = ORM::factory("item")
- ->viewable()
- ->where("type !=", "album")
- ->where("rand_key < ", $random)
- ->orderby(array("rand_key" => "DESC"))
- ->find_all(1);
+ $random = ((float)mt_rand()) / (float)mt_getrandmax();
- if ($items->count() == 0) {
- // Try once more. If this fails, just ditch the block altogether
$items = ORM::factory("item")
->viewable()
->where("type !=", "album")
- ->where("rand_key >= ", $random)
+ ->where("rand_key < ", $random)
->orderby(array("rand_key" => "DESC"))
->find_all(1);
- }
- $block->content->item = $items->current();
+ if ($items->count() == 0) {
+ // Try once more. If this fails, just ditch the block altogether
+ $items = ORM::factory("item")
+ ->viewable()
+ ->where("type !=", "album")
+ ->where("rand_key >= ", $random)
+ ->orderby(array("rand_key" => "DESC"))
+ ->find_all(1);
+ }
+
+ if ($items->count() > 0) {
+ $block->content->item = $items->current();
+ } else {
+ $block = "";
+ }
+ break;
+ }
- return $items->count() == 0 ? "" : $block;
+ return $block;
}
}
32 modules/image_block/helpers/image_block_installer.php
View
@@ -0,0 +1,32 @@
+<?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 image_block_installer {
+ static function install() {
+ block_manager::add("site.sidebar", "image_block", "random_image");
+ module::set_version("image_block", 2);
+ }
+
+ static function upgrade($version) {
+ if ($version == 1) {
+ block_manager::add("site.sidebar", "image_block", "random_image");
+ module::set_version("image_block", 2);
+ }
+ }
+}
2  modules/image_block/module.info
View
@@ -1,3 +1,3 @@
name = "Image Block"
description = "Display a random image in the sidebar"
-version = 1
+version = 2
Please sign in to comment.
Something went wrong with that request. Please try again.