From 2157285d9bc3373e9bd2f4d86f558a1b2554f412 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 16 May 2010 22:53:19 -0700
Subject: Rename admin/comments to admin/manage_comments to make room for
 admin/comments to be a settings page.

---
 modules/comment/controllers/admin_comments.php     | 133 ---------------------
 .../comment/controllers/admin_manage_comments.php  | 133 +++++++++++++++++++++
 modules/comment/helpers/comment_event.php          |  10 +-
 modules/comment/views/admin_comments.html.php      |   8 +-
 4 files changed, 146 insertions(+), 138 deletions(-)
 delete mode 100644 modules/comment/controllers/admin_comments.php
 create mode 100644 modules/comment/controllers/admin_manage_comments.php

(limited to 'modules/comment')

diff --git a/modules/comment/controllers/admin_comments.php b/modules/comment/controllers/admin_comments.php
deleted file mode 100644
index 68794638..00000000
--- a/modules/comment/controllers/admin_comments.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2010 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 Admin_Comments_Controller extends Admin_Controller {
-  private static $items_per_page = 20;
-
-  public function index() {
-    // Get rid of old deleted/spam comments once in a while
-    db::build()
-      ->delete("comments")
-      ->where("state", "IN", array("deleted", "spam"))
-      ->where("updated", "<", "UNIX_TIMESTAMP() - 86400 * 7")
-      ->execute();
-
-    // Redirect to the appropriate queue
-    url::redirect("admin/comments/queue/unpublished");
-  }
-
-  public function menu_labels() {
-    $menu = $this->_menu($this->_counts());
-    print json_encode(array((string) $menu->get("unpublished")->label,
-                            (string) $menu->get("published")->label,
-                            (string) $menu->get("spam")->label,
-                            (string) $menu->get("deleted")->label));
-  }
-
-  public function queue($state) {
-    $page = max(Input::instance()->get("page"), 1);
-
-    $view = new Admin_View("admin.html");
-    $view->page_title = t("Manage comments");
-    $view->content = new View("admin_comments.html");
-    $view->content->counts = $this->_counts();
-    $view->content->menu = $this->_menu($view->content->counts);
-    $view->content->state = $state;
-    $view->content->comments = ORM::factory("comment")
-      ->order_by("created", "DESC")
-      ->where("state", "=", $state)
-      ->limit(self::$items_per_page, ($page - 1) * self::$items_per_page)
-      ->find_all();
-    $view->content->pager = new Pagination();
-    $view->content->pager->initialize(
-      array("query_string" => "page",
-            "total_items" => $view->content->counts->$state,
-            "items_per_page" => self::$items_per_page,
-            "style" => "classic"));
-
-    print $view;
-  }
-
-  private function _menu($counts) {
-    return Menu::factory("root")
-      ->append(Menu::factory("link")
-               ->id("unpublished")
-               ->label(t2("Awaiting Moderation (%count)",
-                          "Awaiting Moderation (%count)",
-                          $counts->unpublished))
-               ->url(url::site("admin/comments/queue/unpublished")))
-      ->append(Menu::factory("link")
-               ->id("published")
-               ->label(t2("Approved (%count)",
-                          "Approved (%count)",
-                          $counts->published))
-               ->url(url::site("admin/comments/queue/published")))
-      ->append(Menu::factory("link")
-               ->id("spam")
-               ->label(t2("Spam (%count)",
-                          "Spam (%count)",
-                          $counts->spam))
-               ->url(url::site("admin/comments/queue/spam")))
-      ->append(Menu::factory("link")
-               ->id("deleted")
-               ->label(t2("Recently Deleted (%count)",
-                          "Recently Deleted (%count)",
-                          $counts->deleted))
-               ->url(url::site("admin/comments/queue/deleted")));
-  }
-
-  private function _counts() {
-    $counts = new stdClass();
-    $counts->unpublished = 0;
-    $counts->published = 0;
-    $counts->spam = 0;
-    $counts->deleted = 0;
-    foreach (db::build()
-             ->select("state")
-             ->select(array("c" => 'COUNT("*")'))
-             ->from("comments")
-             ->group_by("state")
-             ->execute() as $row) {
-      $counts->{$row->state} = $row->c;
-    }
-    return $counts;
-  }
-
-  public function set_state($id, $state) {
-    access::verify_csrf();
-
-    $comment = ORM::factory("comment", $id);
-    $orig = clone $comment;
-    if ($comment->loaded()) {
-      $comment->state = $state;
-      $comment->save();
-    }
-  }
-
-  public function delete_all_spam() {
-    access::verify_csrf();
-
-    db::build()
-      ->delete("comments")
-      ->where("state", "=", "spam")
-      ->execute();
-    url::redirect("admin/comments/queue/spam");
-  }
-}
-
diff --git a/modules/comment/controllers/admin_manage_comments.php b/modules/comment/controllers/admin_manage_comments.php
new file mode 100644
index 00000000..338e4799
--- /dev/null
+++ b/modules/comment/controllers/admin_manage_comments.php
@@ -0,0 +1,133 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2010 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 Admin_Manage_Comments_Controller extends Admin_Controller {
+  private static $items_per_page = 20;
+
+  public function index() {
+    // Get rid of old deleted/spam comments once in a while
+    db::build()
+      ->delete("comments")
+      ->where("state", "IN", array("deleted", "spam"))
+      ->where("updated", "<", "UNIX_TIMESTAMP() - 86400 * 7")
+      ->execute();
+
+    // Redirect to the appropriate queue
+    url::redirect("admin/manage_comments/queue/unpublished");
+  }
+
+  public function menu_labels() {
+    $menu = $this->_menu($this->_counts());
+    print json_encode(array((string) $menu->get("unpublished")->label,
+                            (string) $menu->get("published")->label,
+                            (string) $menu->get("spam")->label,
+                            (string) $menu->get("deleted")->label));
+  }
+
+  public function queue($state) {
+    $page = max(Input::instance()->get("page"), 1);
+
+    $view = new Admin_View("admin.html");
+    $view->page_title = t("Manage comments");
+    $view->content = new View("admin_comments.html");
+    $view->content->counts = $this->_counts();
+    $view->content->menu = $this->_menu($view->content->counts);
+    $view->content->state = $state;
+    $view->content->comments = ORM::factory("comment")
+      ->order_by("created", "DESC")
+      ->where("state", "=", $state)
+      ->limit(self::$items_per_page, ($page - 1) * self::$items_per_page)
+      ->find_all();
+    $view->content->pager = new Pagination();
+    $view->content->pager->initialize(
+      array("query_string" => "page",
+            "total_items" => $view->content->counts->$state,
+            "items_per_page" => self::$items_per_page,
+            "style" => "classic"));
+
+    print $view;
+  }
+
+  private function _menu($counts) {
+    return Menu::factory("root")
+      ->append(Menu::factory("link")
+               ->id("unpublished")
+               ->label(t2("Awaiting Moderation (%count)",
+                          "Awaiting Moderation (%count)",
+                          $counts->unpublished))
+               ->url(url::site("admin/manage_comments/queue/unpublished")))
+      ->append(Menu::factory("link")
+               ->id("published")
+               ->label(t2("Approved (%count)",
+                          "Approved (%count)",
+                          $counts->published))
+               ->url(url::site("admin/manage_comments/queue/published")))
+      ->append(Menu::factory("link")
+               ->id("spam")
+               ->label(t2("Spam (%count)",
+                          "Spam (%count)",
+                          $counts->spam))
+               ->url(url::site("admin/manage_comments/queue/spam")))
+      ->append(Menu::factory("link")
+               ->id("deleted")
+               ->label(t2("Recently Deleted (%count)",
+                          "Recently Deleted (%count)",
+                          $counts->deleted))
+               ->url(url::site("admin/manage_comments/queue/deleted")));
+  }
+
+  private function _counts() {
+    $counts = new stdClass();
+    $counts->unpublished = 0;
+    $counts->published = 0;
+    $counts->spam = 0;
+    $counts->deleted = 0;
+    foreach (db::build()
+             ->select("state")
+             ->select(array("c" => 'COUNT("*")'))
+             ->from("comments")
+             ->group_by("state")
+             ->execute() as $row) {
+      $counts->{$row->state} = $row->c;
+    }
+    return $counts;
+  }
+
+  public function set_state($id, $state) {
+    access::verify_csrf();
+
+    $comment = ORM::factory("comment", $id);
+    $orig = clone $comment;
+    if ($comment->loaded()) {
+      $comment->state = $state;
+      $comment->save();
+    }
+  }
+
+  public function delete_all_spam() {
+    access::verify_csrf();
+
+    db::build()
+      ->delete("comments")
+      ->where("state", "=", "spam")
+      ->execute();
+    url::redirect("admin/manage_comments/queue/spam");
+  }
+}
+
diff --git a/modules/comment/helpers/comment_event.php b/modules/comment/helpers/comment_event.php
index 51e663e6..25fd4171 100644
--- a/modules/comment/helpers/comment_event.php
+++ b/modules/comment/helpers/comment_event.php
@@ -51,11 +51,19 @@ class comment_event_Core {
   }
 
   static function admin_menu($menu, $theme) {
+    /*
+    $menu->get("settings_menu")
+      ->append(Menu::factory("link")
+               ->id("comment")
+               ->label(t("Comments"))
+               ->url(url::site("admin/comments")));
+    */
+
     $menu->get("content_menu")
       ->append(Menu::factory("link")
                ->id("comments")
                ->label(t("Comments"))
-               ->url(url::site("admin/comments")));
+               ->url(url::site("admin/manage_comments")));
   }
 
   static function photo_menu($menu, $theme) {
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index f58267bd..34a28986 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <script type="text/javascript">
   var set_state_url =
-    <?= html::js_string(url::site("admin/comments/set_state/__ID__/__STATE__?csrf=$csrf")) ?>;
+    <?= html::js_string(url::site("admin/manage_comments/set_state/__ID__/__STATE__?csrf=$csrf")) ?>;
   function set_state(state, id) {
     $.get(set_state_url.replace("__STATE__", state).replace("__ID__", id),
           {},
@@ -12,7 +12,7 @@
   }
 
   var delete_url =
-    <?= html::js_string(url::site("admin/comments/delete/__ID__?csrf=$csrf")) ?>;
+    <?= html::js_string(url::site("admin/manage_comments/delete/__ID__?csrf=$csrf")) ?>;
 
   function del(id) {
     $.get(delete_url.replace("__ID__", id),
@@ -24,7 +24,7 @@
   }
 
   function update_menu() {
-    $.get(<?= html::js_string(url::site("admin/comments/menu_labels")) ?>, {},
+    $.get(<?= html::js_string(url::site("admin/manage_comments/menu_labels")) ?>, {},
           function(data) {
             for (var i = 0; i < data.length; i++) {
               $("#g-admin-comments-menu li:eq(" + i + ") a").html(data[i]);
@@ -73,7 +73,7 @@
                $counts->spam) ?>
       </p>
       <p>
-        <a href="<?= url::site("admin/comments/delete_all_spam?csrf=$csrf") ?>">
+        <a href="<?= url::site("admin/manage_comments/delete_all_spam?csrf=$csrf") ?>">
           <?= t("Delete all spam") ?>
         </a>
         <? else: ?>
-- 
cgit v1.2.3