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

diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
new file mode 100644
index 00000000..643dce30
--- /dev/null
+++ b/modules/gallery/controllers/quick.php
@@ -0,0 +1,122 @@
+<?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 Quick_Controller extends Controller {
+  public function pane($id) {
+    $item = ORM::factory("item", $id);
+    if (!$item->loaded) {
+      return "";
+    }
+
+    $view = new View("quick_pane.html");
+    $view->item = $item;
+    $view->page_type = Input::instance()->get("page_type");
+    print $view;
+  }
+
+  public function rotate($id, $dir) {
+    access::verify_csrf();
+    $item = ORM::factory("item", $id);
+    if (!$item->loaded) {
+      return "";
+    }
+
+    $degrees = 0;
+    switch($dir) {
+    case "ccw":
+      $degrees = -90;
+      break;
+
+    case "cw":
+      $degrees = 90;
+      break;
+    }
+
+    if ($degrees) {
+      graphics::rotate($item->file_path(), $item->file_path(), array("degrees" => $degrees));
+
+      list($item->width, $item->height) = getimagesize($item->file_path());
+      $item->resize_dirty= 1;
+      $item->thumb_dirty= 1;
+      $item->save();
+
+      graphics::generate($item);
+
+      $parent = $item->parent();
+      if ($parent->album_cover_item_id == $item->id) {
+        copy($item->thumb_path(), $parent->thumb_path());
+        $parent->thumb_width = $item->thumb_width;
+        $parent->thumb_height = $item->thumb_height;
+        $parent->save();
+      }
+    }
+
+    if (Input::instance()->get("page_type") == "album") {
+      print json_encode(
+        array("src" => $item->thumb_url() . "?rnd=" . rand(),
+              "width" => $item->thumb_width,
+              "height" => $item->thumb_height));
+    } else {
+      print json_encode(
+        array("src" => $item->resize_url() . "?rnd=" . rand(),
+              "width" => $item->resize_width,
+              "height" => $item->resize_height));
+    }
+  }
+
+  public function make_album_cover($id) {
+    access::verify_csrf();
+    item::make_album_cover(ORM::factory("item", $id));
+
+    print json_encode(array("result" => "success"));
+  }
+
+  public function delete($id) {
+    access::verify_csrf();
+    $item = ORM::factory("item", $id);
+    access::required("edit", $item);
+
+    if ($item->is_album()) {
+      $msg = t("Deleted album <b>%title</b>", array("title" => $item->title));
+    } else {
+      $msg = t("Deleted photo <b>%title</b>", array("title" => $item->title));
+    }
+
+    $item->delete();
+    message::success($msg);
+
+    if (Input::instance()->get("page_type") == "album") {
+      print json_encode(array("result" => "success", "reload" => 1));
+    } else {
+      print json_encode(array("result" => "success",
+                              "location" => url::site("albums/$parent->id")));
+    }
+  }
+
+  public function form_edit($id) {
+    $item = ORM::factory("item", $id);
+    access::required("edit", $item);
+    if ($item->is_album()) {
+      $form = album::get_edit_form($item);
+    } else {
+      $form = photo::get_edit_form($item);
+    }
+    print $form;
+  }
+}