1 files changed, 32 insertions, 19 deletions
diff --git a/modules/image_block/helpers/image_block_theme.php b/modules/image_block/helpers/image_block_block.php
index 78138b23..d0402eb6 100644
--- a/modules/image_block/helpers/image_block_theme.php
+++ b/modules/image_block/helpers/image_block_block.php
@@ -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, $theme) {
+    $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;
   }
 }