Since organize is now in the preview stage and will probably be

rewritten by beta2, pull all of its "tenticles" back into itself and
out of core or tags module.

3 files changed, 0 insertions, 180 deletions

diff --git a/core/controllers/core_organize.php b/core/controllers/core_organize.php
deleted file mode 100644
index ca73076d..00000000
--- a/core/controllers/core_organize.php
+++ /dev/null
@@ -1,99 +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 Core_Organize_Controller extends Controller {
-  public function general() {
-    access::verify_csrf();
-
-    $itemids = Input::instance()->post("item");
-    $item = ORM::factory("item")
-      ->in("id", $itemids[0])
-      ->find();
-    access::required("edit", $item);
-
-    $form = core_organize::get_general_edit_form($item);
-    if ($form->validate()) {
-      $orig = clone $item;
-      $item->title = $form->title->value;
-      $item->description = $form->description->value;
-      $item->rename($form->dirname->value);
-      $item->save();
-
-      module::event("item_updated", $orig, $item);
-
-      if ($item->is_album()) {
-        log::success("content", "Updated album", "<a href=\"albums/$item->id\">view</a>");
-        $message = t("Saved album %album_title", array("album_title" => $item->title));
-      } else {
-        log::success("content", "Updated photo", "<a href=\"photos/$item->id\">view</a>");
-        $message = t("Saved photo %photo_title", array("photo_title" => $item->title));
-      }
-      print json_encode(array("form" => $form->__toString(), "message" => $message));
-    } else {
-      print json_encode(array("form" => $form->__toString()));
-    }
-  }
-
-  public function sort() {
-    access::verify_csrf();
-
-    $itemids = Input::instance()->post("item");
-    $item = ORM::factory("item")
-      ->in("id", $itemids[0])
-      ->find();
-    access::required("edit", $item);
-
-    $form = core_organize::get_sort_edit_form($item);
-    if ($form->validate()) {
-      $orig = clone $item;
-      $item->sort_column = $form->column->value;
-      $item->sort_order = $form->direction->value;
-      $item->save();
-
-      module::event("item_updated", $orig, $item);
-
-      log::success("content", "Updated album", "<a href=\"albums/$item->id\">view</a>");
-      $message = t("Saved album %album_title", array("album_title" => $item->title));
-      print json_encode(array("form" => $form->__toString(), "message" => $message));
-    } else {
-      print json_encode(array("form" => $form->__toString()));
-    }
-  }
-
-  public function reset_general() {
-    $itemids = Input::instance()->get("item");
-    $item = ORM::factory("item")
-      ->in("id", $itemids[0])
-      ->find();
-    access::required("edit", $item);
-
-    print core_organize::get_general_edit_form($item);
-  }
-
-  public function reset_sort() {
-    $itemids = Input::instance()->get("item");
-    $item = ORM::factory("item")
-      ->in("id", $itemids[0])
-      ->find();
-    access::required("edit", $item);
-
-    print core_organize::get_sort_edit_form($item);
-  }
-
-}
diff --git a/core/helpers/core_event.php b/core/helpers/core_event.php
index 2116eb78..bbb53cc9 100644
--- a/core/helpers/core_event.php
+++ b/core/helpers/core_event.php
@@ -35,24 +35,6 @@ class core_event_Core {
     access::delete_item($item);
   }
 
-  static function organize_form_creation($event_parms) {
-    if (count($event_parms->itemids) > 1) {
-      return ;
-    }
-
-    $item = ORM::factory("item")
-      ->in("id", $event_parms->itemids[0])
-      ->find();
-
-    $event_parms->panes[] = array("label" => $item->is_album() ? t("Edit Album") : t("Edit Photo"),
-                                  "content" => core_organize::get_general_edit_form($item));
-
-    if ($item->is_album()) {
-      $event_parms->panes[] = array("label" => t("Sort Order"),
-                                    "content" => core_organize::get_sort_edit_form($item));
-    }
-  }
-
   static function user_login($user) {
     // If this user is an admin, check to see if there are any post-install tasks that we need
     // to run and take care of those now.
diff --git a/core/helpers/core_organize.php b/core/helpers/core_organize.php
deleted file mode 100644
index 585e8253..00000000
--- a/core/helpers/core_organize.php
+++ /dev/null
@@ -1,63 +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 core_organize_Core {
-  static function get_general_edit_form($item) {
-    $generalPane = new Forge("core_organize/__FUNCTION__", "", "post",
-                             array("id" => "gEditGeneral", "ref" => "general"));
-    // In this case we know there is only 1 item, but in general we should loop
-    // and create multiple hidden items.
-    $generalPane->hidden("item[]")->value($item->id);
-    $generalPane->input("title")->label(t("Title"))->value($item->title);
-    $generalPane->textarea("description")->label(t("Description"))->value($item->description);
-    $generalPane->input("dirname")->label(t("Path Name"))->value($item->name)
-      ->callback("item::validate_no_slashes")
-      ->error_messages("no_slashes", t("The directory name can't contain a \"/\""))
-      ->callback("item::validate_no_trailing_period")
-      ->error_messages("no_trailing_period", t("The directory name can't end in \".\""))
-      ->callback("item::validate_no_name_conflict")
-      ->error_messages("conflict", t("The path name is not unique"));
-
-    return $generalPane;
-  }
-
-  static function get_sort_edit_form($item) {
-    $sortPane = new Forge("core_organize/__FUNCTION__", "", "post",
-                          array("id" => "gEditSort", "ref" => "sort"));
-    $sortPane->hidden("item[]")->value($item->id);
-    $sortPane->dropdown("column", array("id" => "gAlbumSortColumn"))
-      ->label(t("Sort by"))
-      ->options(array("weight" => t("Default"),
-                      "captured" => t("Capture Date"),
-                      "created" => t("Creation Date"),
-                      "title" => t("Title"),
-                      "updated" => t("Updated Date"),
-                      "view_count" => t("Number of views"),
-                      "rand_key" => t("Random")))
-      ->selected($item->sort_column);
-    $sortPane->dropdown("direction", array("id" => "gAlbumSortDirection"))
-      ->label(t("Order"))
-      ->options(array("ASC" => t("Ascending"),
-                      "DESC" => t("Descending")))
-      ->selected($item->sort_order);
-
-    return $sortPane;
-  }
-}