From ad0e7254eb6e6a763c9b4d0a7252dc5982a814be Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 14 May 2010 16:19:53 -0700
Subject: Require a well-formed email address for all comments.

---
 modules/comment/controllers/comments.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules/comment/controllers')

diff --git a/modules/comment/controllers/comments.php b/modules/comment/controllers/comments.php
index 9e0f86d2..465b1bcd 100644
--- a/modules/comment/controllers/comments.php
+++ b/modules/comment/controllers/comments.php
@@ -58,6 +58,7 @@ class Comments_Controller extends Controller {
               "view" => (string) $view,
               "form" => (string) comment::get_add_form($item)));
     } else {
+      $form = comment::prefill_add_form($form);
       print json_encode(array("result" => "error", "form" => (string) $form));
     }
   }
@@ -69,6 +70,6 @@ class Comments_Controller extends Controller {
     $item = ORM::factory("item", $item_id);
     access::required("view", $item);
 
-    print comment::get_add_form($item);
+    print comment::prefill_add_form(comment::get_add_form($item));
   }
 }
-- 
cgit v1.2.3


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/controllers')

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


From ab204d27201951c7915cf0eb871751b145e398aa Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 16 May 2010 23:01:57 -0700
Subject: Rename the admin_comments view to admin_manage_comments to match the
 controller.

---
 .../comment/controllers/admin_manage_comments.php  |   2 +-
 modules/comment/views/admin_comments.html.php      | 201 ---------------------
 .../comment/views/admin_manage_comments.html.php   | 201 +++++++++++++++++++++
 3 files changed, 202 insertions(+), 202 deletions(-)
 delete mode 100644 modules/comment/views/admin_comments.html.php
 create mode 100644 modules/comment/views/admin_manage_comments.html.php

(limited to 'modules/comment/controllers')

diff --git a/modules/comment/controllers/admin_manage_comments.php b/modules/comment/controllers/admin_manage_comments.php
index 338e4799..bc1c9e64 100644
--- a/modules/comment/controllers/admin_manage_comments.php
+++ b/modules/comment/controllers/admin_manage_comments.php
@@ -45,7 +45,7 @@ class Admin_Manage_Comments_Controller extends Admin_Controller {
 
     $view = new Admin_View("admin.html");
     $view->page_title = t("Manage comments");
-    $view->content = new View("admin_comments.html");
+    $view->content = new View("admin_manage_comments.html");
     $view->content->counts = $this->_counts();
     $view->content->menu = $this->_menu($view->content->counts);
     $view->content->state = $state;
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
deleted file mode 100644
index 34a28986..00000000
--- a/modules/comment/views/admin_comments.html.php
+++ /dev/null
@@ -1,201 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.") ?>
-<script type="text/javascript">
-  var set_state_url =
-    <?= 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),
-          {},
-          function() {
-            $("#g-comment-" + id).slideUp();
-            update_menu();
-          });
-  }
-
-  var delete_url =
-    <?= html::js_string(url::site("admin/manage_comments/delete/__ID__?csrf=$csrf")) ?>;
-
-  function del(id) {
-    $.get(delete_url.replace("__ID__", id),
-          {},
-          function() {
-            $("#g-comment-" + id).slideUp();
-            update_menu();
-          });
-  }
-
-  function update_menu() {
-    $.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]);
-            }
-          },
-          "json");
-  }
-</script>
-
-<div id="g-admin-comments" class="g-block">
-  <h1> <?= t("Manage comments") ?> </h1>
-
-  <div class="g-block-content">
-    <!-- @todo: Highlight active menu option -->
-    <div id="g-admin-comments-menu" class="ui-helper-clearfix">
-      <?= $menu->render() ?>
-    </div>
-
-    <!-- @todo: Remove after setting active option? -->
-    <h2>
-      <? if ($state == "published"): ?>
-      <?= t("Approved comments") ?>
-      <? elseif ($state == "unpublished"): ?>
-      <?= t("Comments awaiting moderation") ?>
-      <? elseif ($state == "spam"): ?>
-      <?= t("Spam comments") ?>
-      <? elseif ($state == "deleted"): ?>
-      <?= t("Recently deleted comments") ?>
-      <? endif ?>
-    </h2>
-
-    <? if ($state == "spam"): ?>
-    <div>
-      <? $spam_caught = module::get_var("comment", "spam_caught") ?>
-      <? if ($spam_caught > 0): ?>
-      <p>
-        <?= t2("Gallery has caught %count spam for you since you installed spam filtering.",
-               "Gallery has caught %count spam for you since you installed spam filtering.",
-               $spam_caught) ?>
-      </p>
-      <? endif ?>
-      <p>
-        <? if ($counts->spam): ?>
-        <?= t2("There is currently one comment in your spam queue.  You can delete it with a single click, but there is no undo operation so you may want to check the message first to make sure that it really is spam.",
-               "There are currently %count comments in your spam queue.  You can delete them all with a single click, but there is no undo operation so you may want to check the messages first to make sure that they really are spam.  All spam messages will be deleted after 7 days automatically.",
-               $counts->spam) ?>
-      </p>
-      <p>
-        <a href="<?= url::site("admin/manage_comments/delete_all_spam?csrf=$csrf") ?>">
-          <?= t("Delete all spam") ?>
-        </a>
-        <? else: ?>
-        <?= t("Your spam queue is empty!") ?>
-        <? endif ?>
-      </p>
-    </div>
-    <? endif ?>
-
-    <? if ($state == "deleted"): ?>
-    <div>
-      <p>
-        <?= t("These are messages that have been recently deleted.  They will be permanently erased automatically after 7 days.") ?>
-      </p>
-    </div>
-    <? endif ?>
-
-    <table id="g-admin-comments-list">
-      <tr>
-        <th>
-          <?= t("Author") ?>
-        </th>
-        <th>
-          <?= t("Comment") ?>
-        </th>
-        <th>
-          <?= t("Actions") ?>
-        </th>
-      </tr>
-      <? foreach ($comments as $comment): ?>
-      <tr id="g-comment-<?= $comment->id ?>" class="<?= text::alternate("g-odd", "g-even") ?>">
-        <td>
-          <a href="#">
-            <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
-                 class="g-avatar"
-                 alt="<?= html::clean_attribute($comment->author_name()) ?>"
-                 width="40"
-                 height="40" />
-          </a>
-          <p><a href="mailto:<?= html::clean_attribute($comment->author_email()) ?>"
-                title="<?= html::clean_attribute($comment->author_email()) ?>"> <?= html::clean($comment->author_name()) ?> </a></p>
-        </td>
-        <td>
-          <div class="g-right">
-            <? $item = $comment->item() ?>
-            <div class="g-item g-photo">
-              <a href="<?= $item->url() ?>">
-                <? if ($item->has_thumb()): ?>
-                <img src="<?= $item->thumb_url() ?>"
-                   alt="<?= html::purify($item->title)->for_html_attr() ?>"
-                   <?= photo::img_dimensions($item->thumb_width, $item->thumb_height, 75) ?>
-                />
-                <? else: ?>
-                <?= t("No thumbnail") ?>
-                <? endif ?>
-              </a>
-            </div>
-          </div>
-          <p><?= gallery::date($comment->created) ?></p>
-             <?= nl2br(html::purify($comment->text)) ?>
-        </td>
-        <td>
-          <ul class="g-buttonset-vertical">
-          <? if ($comment->state != "unpublished"): ?>
-            <li>
-              <a href="javascript:set_state('unpublished',<?=$comment->id?>)"
-                  class="g-button ui-state-default ui-icon-left">
-                <span class="ui-icon ui-icon-check"></span>
-                <?= t("Unapprove") ?>
-              </a>
-            </li>
-          <? endif ?>
-          <? if ($comment->state != "published"): ?>
-            <li>
-              <a href="javascript:set_state('published',<?=$comment->id?>)"
-                  class="g-button ui-state-default ui-icon-left">
-                <span class="ui-icon ui-icon-check"></span>
-                <?= t("Approve") ?>
-              </a>
-            </li>
-          <? endif ?>
-          <? if ($comment->state != "spam"): ?>
-            <li>
-              <a href="javascript:set_state('spam',<?=$comment->id?>)"
-                  class="g-button ui-state-default ui-icon-left">
-                <span class="ui-icon ui-icon-cancel"></span>
-                <?= t("Spam") ?>
-              </a>
-            </li>
-          <? endif ?>
-            <!--
-            <li>
-              <a href="javascript:reply(<?=$comment->id?>)"
-                  class="g-button ui-state-default ui-icon-left">
-                <span class="ui-icon ui-icon-arrowreturnthick-1-w"></span>
-                <?= t("Reply") ?>
-              </a>
-            </li>
-            <li>
-              <a href="javascript:Edit(<?=$comment->id?>)"
-                  class="g-button ui-state-default ui-icon-left">
-                <span class="ui-icon ui-icon-pencil"></span>
-                <?= t("Edit") ?>
-              </a>
-            </li>
-            -->
-            <li>
-              <a href="javascript:set_state('deleted',<?=$comment->id?>)"
-                  class="g-button ui-state-default ui-icon-left">
-                <span class="ui-icon ui-icon-trash"></span>
-                <?= t("Delete") ?>
-              </a>
-            </li>
-          </ul>
-        </td>
-      </tr>
-      <? endforeach ?>
-    </table>
-
-    <div class="g-paginator">
-      <?= $pager ?>
-    </div>
-
-  </div>
-</div>
diff --git a/modules/comment/views/admin_manage_comments.html.php b/modules/comment/views/admin_manage_comments.html.php
new file mode 100644
index 00000000..34a28986
--- /dev/null
+++ b/modules/comment/views/admin_manage_comments.html.php
@@ -0,0 +1,201 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<script type="text/javascript">
+  var set_state_url =
+    <?= 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),
+          {},
+          function() {
+            $("#g-comment-" + id).slideUp();
+            update_menu();
+          });
+  }
+
+  var delete_url =
+    <?= html::js_string(url::site("admin/manage_comments/delete/__ID__?csrf=$csrf")) ?>;
+
+  function del(id) {
+    $.get(delete_url.replace("__ID__", id),
+          {},
+          function() {
+            $("#g-comment-" + id).slideUp();
+            update_menu();
+          });
+  }
+
+  function update_menu() {
+    $.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]);
+            }
+          },
+          "json");
+  }
+</script>
+
+<div id="g-admin-comments" class="g-block">
+  <h1> <?= t("Manage comments") ?> </h1>
+
+  <div class="g-block-content">
+    <!-- @todo: Highlight active menu option -->
+    <div id="g-admin-comments-menu" class="ui-helper-clearfix">
+      <?= $menu->render() ?>
+    </div>
+
+    <!-- @todo: Remove after setting active option? -->
+    <h2>
+      <? if ($state == "published"): ?>
+      <?= t("Approved comments") ?>
+      <? elseif ($state == "unpublished"): ?>
+      <?= t("Comments awaiting moderation") ?>
+      <? elseif ($state == "spam"): ?>
+      <?= t("Spam comments") ?>
+      <? elseif ($state == "deleted"): ?>
+      <?= t("Recently deleted comments") ?>
+      <? endif ?>
+    </h2>
+
+    <? if ($state == "spam"): ?>
+    <div>
+      <? $spam_caught = module::get_var("comment", "spam_caught") ?>
+      <? if ($spam_caught > 0): ?>
+      <p>
+        <?= t2("Gallery has caught %count spam for you since you installed spam filtering.",
+               "Gallery has caught %count spam for you since you installed spam filtering.",
+               $spam_caught) ?>
+      </p>
+      <? endif ?>
+      <p>
+        <? if ($counts->spam): ?>
+        <?= t2("There is currently one comment in your spam queue.  You can delete it with a single click, but there is no undo operation so you may want to check the message first to make sure that it really is spam.",
+               "There are currently %count comments in your spam queue.  You can delete them all with a single click, but there is no undo operation so you may want to check the messages first to make sure that they really are spam.  All spam messages will be deleted after 7 days automatically.",
+               $counts->spam) ?>
+      </p>
+      <p>
+        <a href="<?= url::site("admin/manage_comments/delete_all_spam?csrf=$csrf") ?>">
+          <?= t("Delete all spam") ?>
+        </a>
+        <? else: ?>
+        <?= t("Your spam queue is empty!") ?>
+        <? endif ?>
+      </p>
+    </div>
+    <? endif ?>
+
+    <? if ($state == "deleted"): ?>
+    <div>
+      <p>
+        <?= t("These are messages that have been recently deleted.  They will be permanently erased automatically after 7 days.") ?>
+      </p>
+    </div>
+    <? endif ?>
+
+    <table id="g-admin-comments-list">
+      <tr>
+        <th>
+          <?= t("Author") ?>
+        </th>
+        <th>
+          <?= t("Comment") ?>
+        </th>
+        <th>
+          <?= t("Actions") ?>
+        </th>
+      </tr>
+      <? foreach ($comments as $comment): ?>
+      <tr id="g-comment-<?= $comment->id ?>" class="<?= text::alternate("g-odd", "g-even") ?>">
+        <td>
+          <a href="#">
+            <img src="<?= $comment->author()->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
+                 class="g-avatar"
+                 alt="<?= html::clean_attribute($comment->author_name()) ?>"
+                 width="40"
+                 height="40" />
+          </a>
+          <p><a href="mailto:<?= html::clean_attribute($comment->author_email()) ?>"
+                title="<?= html::clean_attribute($comment->author_email()) ?>"> <?= html::clean($comment->author_name()) ?> </a></p>
+        </td>
+        <td>
+          <div class="g-right">
+            <? $item = $comment->item() ?>
+            <div class="g-item g-photo">
+              <a href="<?= $item->url() ?>">
+                <? if ($item->has_thumb()): ?>
+                <img src="<?= $item->thumb_url() ?>"
+                   alt="<?= html::purify($item->title)->for_html_attr() ?>"
+                   <?= photo::img_dimensions($item->thumb_width, $item->thumb_height, 75) ?>
+                />
+                <? else: ?>
+                <?= t("No thumbnail") ?>
+                <? endif ?>
+              </a>
+            </div>
+          </div>
+          <p><?= gallery::date($comment->created) ?></p>
+             <?= nl2br(html::purify($comment->text)) ?>
+        </td>
+        <td>
+          <ul class="g-buttonset-vertical">
+          <? if ($comment->state != "unpublished"): ?>
+            <li>
+              <a href="javascript:set_state('unpublished',<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-check"></span>
+                <?= t("Unapprove") ?>
+              </a>
+            </li>
+          <? endif ?>
+          <? if ($comment->state != "published"): ?>
+            <li>
+              <a href="javascript:set_state('published',<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-check"></span>
+                <?= t("Approve") ?>
+              </a>
+            </li>
+          <? endif ?>
+          <? if ($comment->state != "spam"): ?>
+            <li>
+              <a href="javascript:set_state('spam',<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-cancel"></span>
+                <?= t("Spam") ?>
+              </a>
+            </li>
+          <? endif ?>
+            <!--
+            <li>
+              <a href="javascript:reply(<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-arrowreturnthick-1-w"></span>
+                <?= t("Reply") ?>
+              </a>
+            </li>
+            <li>
+              <a href="javascript:Edit(<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-pencil"></span>
+                <?= t("Edit") ?>
+              </a>
+            </li>
+            -->
+            <li>
+              <a href="javascript:set_state('deleted',<?=$comment->id?>)"
+                  class="g-button ui-state-default ui-icon-left">
+                <span class="ui-icon ui-icon-trash"></span>
+                <?= t("Delete") ?>
+              </a>
+            </li>
+          </ul>
+        </td>
+      </tr>
+      <? endforeach ?>
+    </table>
+
+    <div class="g-paginator">
+      <?= $pager ?>
+    </div>
+
+  </div>
+</div>
-- 
cgit v1.2.3


From 87fde3f360d557d48241d09cae4f25949e748d4f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 5 Jun 2010 23:35:32 -0700
Subject: Create a UI under Admin > Settings > Comments where you can limit
 comments only to registered users.  It's simplistic, but is better than
 adding a permission since generally this setting will be used Gallery-wide.

Fixes ticket #1002
---
 modules/comment/controllers/admin_comments.php | 52 ++++++++++++++++++++++++++
 modules/comment/controllers/comments.php       |  6 +++
 modules/comment/helpers/comment.php            |  5 +++
 modules/comment/helpers/comment_event.php      |  2 -
 modules/comment/helpers/comment_installer.php  |  8 +++-
 modules/comment/module.info                    |  2 +-
 modules/comment/views/admin_comments.html.php  |  7 ++++
 modules/comment/views/comments.html.php        |  5 ++-
 8 files changed, 82 insertions(+), 5 deletions(-)
 create mode 100644 modules/comment/controllers/admin_comments.php
 create mode 100644 modules/comment/views/admin_comments.html.php

(limited to 'modules/comment/controllers')

diff --git a/modules/comment/controllers/admin_comments.php b/modules/comment/controllers/admin_comments.php
new file mode 100644
index 00000000..fda3873c
--- /dev/null
+++ b/modules/comment/controllers/admin_comments.php
@@ -0,0 +1,52 @@
+<?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 {
+  public function index() {
+    $view = new Admin_View("admin.html");
+    $view->page_title = t("Comment settings");
+    $view->content = new View("admin_comments.html");
+    $view->content->form = $this->_get_admin_form();
+    print $view;
+  }
+
+  public function save() {
+    access::verify_csrf();
+    $form = $this->_get_admin_form();
+    $form->validate();
+    module::set_var("comment", "access_permissions",
+                    $form->comment_settings->access_permissions->value);
+    message::success(t("Comment settings updated"));
+    url::redirect("admin/comments");
+  }
+
+  private function _get_admin_form() {
+    $form = new Forge("admin/comments/save", "", "post",
+                      array("id" => "g-comments-admin-form"));
+    $comment_settings = $form->group("comment_settings")->label(t("Permissions"));
+    $comment_settings->dropdown("access_permissions")
+      ->label(t("Who can leave comments?"))
+      ->options(array("everybody" => t("Everybody"),
+                      "registered_users" => t("Only registered users")))
+      ->selected(module::get_var("comment", "access_permissions"));
+    $comment_settings->submit("save")->value(t("Save"));
+    return $form;
+  }
+}
+
diff --git a/modules/comment/controllers/comments.php b/modules/comment/controllers/comments.php
index 465b1bcd..c42ad24e 100644
--- a/modules/comment/controllers/comments.php
+++ b/modules/comment/controllers/comments.php
@@ -24,6 +24,9 @@ class Comments_Controller extends Controller {
   public function create($id) {
     $item = ORM::factory("item", $id);
     access::required("view", $item);
+    if (!comment::can_comment()) {
+      access::forbidden();
+    }
 
     $form = comment::get_add_form($item);
     try {
@@ -69,6 +72,9 @@ class Comments_Controller extends Controller {
   public function form_add($item_id) {
     $item = ORM::factory("item", $item_id);
     access::required("view", $item);
+    if (!comment::can_comment()) {
+      access::forbidden();
+    }
 
     print comment::prefill_add_form(comment::get_add_form($item));
   }
diff --git a/modules/comment/helpers/comment.php b/modules/comment/helpers/comment.php
index 94b14d0d..92a286c7 100644
--- a/modules/comment/helpers/comment.php
+++ b/modules/comment/helpers/comment.php
@@ -60,5 +60,10 @@ class comment_Core {
     }
     return $form;
   }
+
+  static function can_comment() {
+    return !identity::active_user()->guest ||
+      module::get_var("comment", "access_permissions") == "everybody";
+  }
 }
 
diff --git a/modules/comment/helpers/comment_event.php b/modules/comment/helpers/comment_event.php
index 25fd4171..33d4cd05 100644
--- a/modules/comment/helpers/comment_event.php
+++ b/modules/comment/helpers/comment_event.php
@@ -51,13 +51,11 @@ 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")
diff --git a/modules/comment/helpers/comment_installer.php b/modules/comment/helpers/comment_installer.php
index 9ca47f1a..7a32bf67 100644
--- a/modules/comment/helpers/comment_installer.php
+++ b/modules/comment/helpers/comment_installer.php
@@ -47,7 +47,8 @@ class comment_installer {
                DEFAULT CHARSET=utf8;");
 
     module::set_var("comment", "spam_caught", 0);
-    module::set_version("comment", 2);
+    module::set_var("comment", "access_permissions", "everybody");
+    module::set_version("comment", 3);
   }
 
   static function upgrade($version) {
@@ -56,6 +57,11 @@ class comment_installer {
       $db->query("ALTER TABLE {comments} CHANGE `state` `state` varchar(15) default 'unpublished'");
       module::set_version("comment", 2);
     }
+
+    if ($version == 2) {
+      module::set_var("comment", "access_permissions", "everybody");
+      module::set_version("comment", 3);
+    }
   }
 
   static function uninstall() {
diff --git a/modules/comment/module.info b/modules/comment/module.info
index c371cf27..cd34f140 100644
--- a/modules/comment/module.info
+++ b/modules/comment/module.info
@@ -1,3 +1,3 @@
 name = "Comments"
 description = "Allows users and guests to leave comments on photos and albums."
-version = 2
+version = 3
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
new file mode 100644
index 00000000..dc6985b2
--- /dev/null
+++ b/modules/comment/views/admin_comments.html.php
@@ -0,0 +1,7 @@
+<?php defined("SYSPATH") or die("No direct script access.") ?>
+<div class="g-block">
+  <h1> <?= t("Comment settings") ?> </h1>
+  <div class="g-block-content">
+    <?= $form ?>
+  </div>
+</div>
diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index e4322e08..9a608a43 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -1,9 +1,12 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-  <a href="<?= url::site("form/add/comments/{$item->id}") ?>#comment-form" id="g-add-comment"
+<? if (comment::can_comment()): ?>
+<a href="<?= url::site("form/add/comments/{$item->id}") ?>#comment-form" id="g-add-comment"
    class="g-button ui-corner-all ui-icon-left ui-state-default">
   <span class="ui-icon ui-icon-comment"></span>
   <?= t("Add a comment") ?>
 </a>
+<? endif ?>
+
 <div id="g-comment-detail">
   <? if (!$comments->count()): ?>
   <p class="g-no-comments">
-- 
cgit v1.2.3