Permalink
Browse files

Create a module setting for the number of random images to show in the

sidebar. Fixes #1499.
  • Loading branch information...
1 parent 27bec84 commit b176fe4324385d614ed9065a41713294e8e85c8e @bharat bharat committed Nov 21, 2010
View
20 modules/image_block/helpers/image_block_block.php
@@ -29,16 +29,24 @@ static function get($block_id, $theme) {
// The random_query approach is flawed and doesn't always return a
// result when there actually is one. Retry a *few* times.
// @todo Consider another fallback if further optimizations are necessary.
- $attempts = 0;
- do {
- $item = item::random_query()->where("type", "!=", "album")->find_all(1)->current();
- } while (!$item && $attempts++ < 3);
- if ($item && $item->loaded()) {
+ $image_count = module::get_var("image_block", "image_count");
+ $items = array();
+ for ($i = 0; $i < $image_count; $i++) {
+ $attempts = 0;
+ $item = null;
+ do {
+ $item = item::random_query()->where("type", "!=", "album")->find_all(1)->current();
+ } while (!$item && $attempts++ < 3);
+ if ($item) {
+ $items[] = $item;
+ }
+ }
+ if ($items) {
$block = new Block();
$block->css_id = "g-image-block";
$block->title = t("Random image");
$block->content = new View("image_block_block.html");
- $block->content->item = $item;
+ $block->content->items = $items;
}
break;
}
View
29 modules/image_block/helpers/image_block_installer.php
@@ -0,0 +1,29 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 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 upgrade($version) {
+ $db = Database::instance();
+ if ($version == 1) {
+ module::set_var("image_block", "image_count", "1");
+ module::set_version("image_block", $version = 2);
+ }
+ }
+}
View
2 modules/image_block/module.info
@@ -1,3 +1,3 @@
name = "Image Block"
description = "Display a random image in the sidebar"
-version = 1
+version = 2
View
2 modules/image_block/views/image_block_block.html.php
@@ -1,6 +1,8 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
+<? foreach ($items as $item): ?>
<div class="g-image-block">
<a href="<?= $item->url() ?>">
<?= $item->thumb_img(array("class" => "g-thumbnail")) ?>
</a>
</div>
+<? endforeach ?>

0 comments on commit b176fe4

Please sign in to comment.