From 992cf22c795100a4f42c17c38cf1aaa2029af279 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 21 Nov 2008 07:06:11 +0000
Subject: Revert module block approach

---
 core/helpers/core_installer.php | 10 ---------
 core/helpers/dynamic_block.php  | 48 -----------------------------------------
 2 files changed, 58 deletions(-)
 delete mode 100644 core/helpers/dynamic_block.php

(limited to 'core/helpers')

diff --git a/core/helpers/core_installer.php b/core/helpers/core_installer.php
index c627145a..e0e4f7d9 100644
--- a/core/helpers/core_installer.php
+++ b/core/helpers/core_installer.php
@@ -62,15 +62,6 @@ class core_installer {
                    KEY `type` (`type`))
                  ENGINE=InnoDB DEFAULT CHARSET=utf8;");
 
-      $db->query("CREATE TABLE `blocks` (
-                   `id` int(9) NOT NULL auto_increment,
-                   `module` char(255) NOT NULL,
-                   `type` char(32) NOT NULL,
-                   `method` char(255) NOT NULL,
-                   PRIMARY KEY (`id`),
-                   UNIQUE KEY(`type`, `module`))
-                 ENGINE=InnoDB DEFAULT CHARSET=utf8;");
-
       foreach (array("albums", "resizes") as $dir) {
         @mkdir(VARPATH . $dir);
       }
@@ -93,7 +84,6 @@ class core_installer {
     $db = Database::instance();
     $db->query("DROP TABLE IF EXISTS `items`;");
     $db->query("DROP TABLE IF EXISTS `modules`;");
-    $db->query("DROP TABLE IF EXISTS `blocks`;");
     system("/bin/rm -rf " . VARPATH . "albums");
     system("/bin/rm -rf " . VARPATH . "resizes");
   }
diff --git a/core/helpers/dynamic_block.php b/core/helpers/dynamic_block.php
deleted file mode 100644
index db302bc9..00000000
--- a/core/helpers/dynamic_block.php
+++ /dev/null
@@ -1,48 +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 dynamic_block_Core{
-  const HEAD_LINK = "link";
-  const HEAD_SCRIPT = "script";
-  const HEADER_TYPE = "header";
-  const FOOTER_TYPE = "footer";
-  const SIDE_BAR_TYPE = "sidebar";
-  const CONTENT_ALBUM = "album";
-  const CONTENT_PHOTO = "photo";
-  
-  public static function define_blocks($module, $callbacks) {
-    // @todo create unit test for this
-    foreach ($callbacks as $type => $method) {
-      $block = ORM::factory("block");
-      $block->module = $module;
-      $block->type = $type;
-      $block->method = $method;
-      $block->save();
-    }
-  }
-
-  public static function remove_blocks($module) {
-    // @todo and don't forget one for this
-    try {
-      ORM::factory("block")->where("module",$module)->find()->delete();
-    } catch (Exception $e) {
-      Kohana::log("error", $e);
-    }
-  }
-}
-- 
cgit v1.2.3