Restructure things so that the application is now just another module.

Kohana makes this type of transition fairly straightforward in that
all controllers/helpers/etc are still located in the cascading
filesystem without any extra effort, except that I've temporarily
added a hack to force modules/gallery into the module path.

Rename what's left of "core" to be "application" so that it conforms
more closely to the Kohana standard (basically, just
application/config/config.php which is the minimal thing that you need
in the application directory)

There's still considerable work left to be done here.

1 files changed, 0 insertions, 67 deletions

diff --git a/core/helpers/block_manager.php b/core/helpers/block_manager.php
deleted file mode 100644
index 022626e5..00000000
--- a/core/helpers/block_manager.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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 block_manager_Core {
-  static function get_active($location) {
-    return unserialize(module::get_var("core", "blocks_$location", "a:0:{}"));
-  }
-
-  static function set_active($location, $blocks) {
-    module::set_var("core", "blocks_$location", serialize($blocks));
-  }
-
-  static function add($location, $module_name, $block_id) {
-    $blocks = self::get_active($location);
-    $blocks[rand()] = array($module_name, $block_id);
-    self::set_active($location, $blocks);
-  }
-
-  static function remove($location, $block_id) {
-    $blocks = self::get_active($location);
-    unset($blocks[$block_id]);
-    self::set_active($location, $blocks);
-  }
-
-  static function get_available() {
-    $blocks = array();
-
-    foreach (module::active() as $module) {
-      $class_name = "{$module->name}_block";
-      if (method_exists($class_name, "get_list")) {
-        foreach (call_user_func(array($class_name, "get_list")) as $id => $title) {
-          $blocks["{$module->name}:$id"] = $title;
-        }
-      }
-    }
-    return $blocks;
-  }
-
-  static function get_html($location) {
-    $active = self::get_active($location);
-    $result = "";
-    foreach ($active as $id => $desc) {
-      if (method_exists("$desc[0]_block", "get")) {
-        $block = call_user_func(array("$desc[0]_block", "get"), $desc[1]);
-        $block->id = $id;
-        $result .= $block;
-      }
-    }
-    return $result;
-  }
-}