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, 64 insertions, 0 deletions

diff --git a/modules/gallery/controllers/move.php b/modules/gallery/controllers/move.php
new file mode 100644
index 00000000..130c247f
--- /dev/null
+++ b/modules/gallery/controllers/move.php
@@ -0,0 +1,64 @@
+<?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 Move_Controller extends Controller {
+  public function browse($source_id) {
+    $source = ORM::factory("item", $source_id);
+    access::required("edit", $source);
+
+    $view = new View("move_browse.html");
+    $view->source = $source;
+    $view->tree = $this->_get_tree_html($source, ORM::factory("item", 1));
+    print $view;
+  }
+
+  public function save($source_id) {
+    access::verify_csrf();
+    $source = ORM::factory("item", $source_id);
+    $target = ORM::factory("item", $this->input->post("target_id"));
+
+    item::move($source, $target);
+
+    print json_encode(
+      array("result" => "success",
+            "location" => url::site("albums/{$target->id}")));
+  }
+
+  public function show_sub_tree($source_id, $target_id) {
+    $source = ORM::factory("item", $source_id);
+    $target = ORM::factory("item", $target_id);
+    access::required("edit", $source);
+    access::required("view", $target);
+
+    print $this->_get_tree_html($source, $target);
+  }
+
+  private function _get_tree_html($source, $target) {
+    $view = new View("move_tree.html");
+    $view->source = $source;
+    $view->parent = $target;
+    $view->children = ORM::factory("item")
+      ->viewable()
+      ->where("type", "album")
+      ->where("parent_id", $target->id)
+      ->find_all();
+    return $view;
+  }
+
+}