From 8eadddfa873c4c0e8f14adc079c18a1f8fb0fa44 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 22 Nov 2008 05:51:15 +0000
Subject: Convert gmaps, info, and tag modules to the new block module

---
 core/libraries/Theme.php                  |  9 ---------
 modules/gmaps/helpers/gmaps.php           | 29 ---------------------------
 modules/gmaps/helpers/gmaps_block.php     | 29 +++++++++++++++++++++++++++
 modules/gmaps/helpers/gmaps_installer.php | 33 +++++++++++++++++++++++++++++++
 modules/info/helpers/info.php             | 29 ---------------------------
 modules/info/helpers/info_block.php       | 29 +++++++++++++++++++++++++++
 modules/info/helpers/info_installer.php   | 33 +++++++++++++++++++++++++++++++
 modules/tag/helpers/tag.php               | 29 ---------------------------
 modules/tag/helpers/tag_block.php         | 29 +++++++++++++++++++++++++++
 modules/tag/helpers/tag_installer.php     | 33 +++++++++++++++++++++++++++++++
 themes/default/views/sidebar.html.php     |  3 ---
 11 files changed, 186 insertions(+), 99 deletions(-)
 delete mode 100644 modules/gmaps/helpers/gmaps.php
 create mode 100644 modules/gmaps/helpers/gmaps_block.php
 create mode 100644 modules/gmaps/helpers/gmaps_installer.php
 delete mode 100644 modules/info/helpers/info.php
 create mode 100644 modules/info/helpers/info_block.php
 create mode 100644 modules/info/helpers/info_installer.php
 delete mode 100644 modules/tag/helpers/tag.php
 create mode 100644 modules/tag/helpers/tag_block.php
 create mode 100644 modules/tag/helpers/tag_installer.php

diff --git a/core/libraries/Theme.php b/core/libraries/Theme.php
index 66d0d640..f95ef569 100644
--- a/core/libraries/Theme.php
+++ b/core/libraries/Theme.php
@@ -57,13 +57,4 @@ class Theme_Core {
     return new View("in_place_edit.html");
   }
 
-  public function blocks() {
-    /** @todo: make this data driven */
-    $blocks = array(
-      'tag' => tag::block($this),
-      'info' => info::block($this),
-      'gmaps' => gmaps::block($this),
-    );
-    return $blocks;
-  }
 }
diff --git a/modules/gmaps/helpers/gmaps.php b/modules/gmaps/helpers/gmaps.php
deleted file mode 100644
index 3257e760..00000000
--- a/modules/gmaps/helpers/gmaps.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 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 Gmaps_Core {
-  public static function block($theme) {
-    $block = new Block();
-    $block->id = "gMaps";
-    $block->title = _("Location");
-    $block->content = new View("gmaps_block.html");
-    return $block;
-  }
-}
\ No newline at end of file
diff --git a/modules/gmaps/helpers/gmaps_block.php b/modules/gmaps/helpers/gmaps_block.php
new file mode 100644
index 00000000..1620e881
--- /dev/null
+++ b/modules/gmaps/helpers/gmaps_block.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-2008 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 gmaps_block_Core {
+  public static function sidebar($theme) {
+    $block = new Block();
+    $block->id = "gMaps";
+    $block->title = _("Location");
+    $block->content = new View("gmaps_block.html");
+    return $block;
+  }
+}
\ No newline at end of file
diff --git a/modules/gmaps/helpers/gmaps_installer.php b/modules/gmaps/helpers/gmaps_installer.php
new file mode 100644
index 00000000..8238ec88
--- /dev/null
+++ b/modules/gmaps/helpers/gmaps_installer.php
@@ -0,0 +1,33 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 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 gmaps_installer {
+  public static function install() {
+    Kohana::log("debug", "gmaps_installer::install");
+    $version = module::get_version("gmaps");
+    Kohana::log("debug", "gmaps: $version");
+    if ($version == 0) {
+      module::set_version("gmaps", 1);
+    }
+  }
+
+  public static function uninstall() {
+    module::delete("gmaps");
+  }
+}
diff --git a/modules/info/helpers/info.php b/modules/info/helpers/info.php
deleted file mode 100644
index 75ec03d6..00000000
--- a/modules/info/helpers/info.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 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 Info_Core {
-  public static function block($theme) {
-    $block = new Block();
-    $block->id = "gMetadata";
-    $block->title = _("Item Info");
-    $block->content = new View("info_block.html");
-    return $block;
-  }
-}
\ No newline at end of file
diff --git a/modules/info/helpers/info_block.php b/modules/info/helpers/info_block.php
new file mode 100644
index 00000000..65b60289
--- /dev/null
+++ b/modules/info/helpers/info_block.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-2008 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 info_block_Core {
+  public static function sidebar($theme) {
+    $block = new Block();
+    $block->id = "gMetadata";
+    $block->title = _("Item Info");
+    $block->content = new View("info_block.html");
+    return $block;
+  }
+}
\ No newline at end of file
diff --git a/modules/info/helpers/info_installer.php b/modules/info/helpers/info_installer.php
new file mode 100644
index 00000000..edf55c5d
--- /dev/null
+++ b/modules/info/helpers/info_installer.php
@@ -0,0 +1,33 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 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 info_installer {
+  public static function install() {
+    Kohana::log("debug", "info_installer::install");
+    $version = module::get_version("info");
+    Kohana::log("debug", "info: $version");
+    if ($version == 0) {
+      module::set_version("info", 1);
+    }
+  }
+
+  public static function uninstall() {
+    module::delete("info");
+  }
+}
diff --git a/modules/tag/helpers/tag.php b/modules/tag/helpers/tag.php
deleted file mode 100644
index 3fe97a7d..00000000
--- a/modules/tag/helpers/tag.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2008 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 Tag_Core {
-  public static function block($theme) {
-    $block = new Block();
-    $block->id = "gTag";
-    $block->title = _("Tags");
-    $block->content = new View("tag_block.html");
-    return $block;
-  }
-}
\ No newline at end of file
diff --git a/modules/tag/helpers/tag_block.php b/modules/tag/helpers/tag_block.php
new file mode 100644
index 00000000..63486435
--- /dev/null
+++ b/modules/tag/helpers/tag_block.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-2008 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 tag_block_Core {
+  public static function sidebar($theme) {
+    $block = new Block();
+    $block->id = "gTag";
+    $block->title = _("Tags");
+    $block->content = new View("tag_block.html");
+    return $block;
+  }
+}
\ No newline at end of file
diff --git a/modules/tag/helpers/tag_installer.php b/modules/tag/helpers/tag_installer.php
new file mode 100644
index 00000000..03823ff3
--- /dev/null
+++ b/modules/tag/helpers/tag_installer.php
@@ -0,0 +1,33 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2008 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 tag_installer {
+  public static function install() {
+    Kohana::log("debug", "tag_installer::install");
+    $version = module::get_version("tags");
+    Kohana::log("debug", "tag: $version");
+    if ($version == 0) {
+      module::set_version("tag", 1);
+    }
+  }
+
+  public static function uninstall() {
+    module::delete("tag");
+  }
+}
diff --git a/themes/default/views/sidebar.html.php b/themes/default/views/sidebar.html.php
index 10f56178..fc47d72e 100644
--- a/themes/default/views/sidebar.html.php
+++ b/themes/default/views/sidebar.html.php
@@ -1,5 +1,2 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
 <?= View::sidebar($theme) ?>
-<? foreach ($theme->blocks() as $block): ?>
-  <?= $block ?>
-<? endforeach ?>
-- 
cgit v1.2.3