Merge branch 'master' of git://github.com/gallery/gallery3

7 files changed, 222 insertions, 10 deletions

diff --git a/modules/comment/helpers/comment.php b/modules/comment/helpers/comment.php
index e3486e83..92a286c7 100644
--- a/modules/comment/helpers/comment.php
+++ b/modules/comment/helpers/comment.php
@@ -33,7 +33,9 @@ class comment_Core {
       ->error_messages("required", t("You must enter a name for yourself"));
     $group->input("email")
       ->label(t("Email (hidden)"))
-      ->id("g-email");
+      ->id("g-email")
+      ->error_messages("required", t("You must enter a valid email address"))
+      ->error_messages("invalid", t("You must enter a valid email address"));
     $group->input("url")
       ->label(t("Website (hidden)"))
       ->id("g-url");
@@ -45,14 +47,23 @@ class comment_Core {
     module::event("comment_add_form", $form);
     $group->submit("")->value(t("Add"))->class("ui-state-default ui-corner-all");
 
+    return $form;
+  }
+
+  static function prefill_add_form($form) {
     $active = identity::active_user();
     if (!$active->guest) {
+      $group = $form->add_comment;
       $group->inputs["name"]->value($active->full_name)->disabled("disabled");
       $group->email->value($active->email)->disabled("disabled");
       $group->url->value($active->url)->disabled("disabled");
     }
-
     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 51e663e6..33d4cd05 100644
--- a/modules/comment/helpers/comment_event.php
+++ b/modules/comment/helpers/comment_event.php
@@ -51,11 +51,17 @@ 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/helpers/comment_installer.php b/modules/comment/helpers/comment_installer.php
index 9ca47f1a..18d51758 100644
--- a/modules/comment/helpers/comment_installer.php
+++ b/modules/comment/helpers/comment_installer.php
@@ -47,14 +47,20 @@ 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) {
     $db = Database::instance();
     if ($version == 1) {
       $db->query("ALTER TABLE {comments} CHANGE `state` `state` varchar(15) default 'unpublished'");
-      module::set_version("comment", 2);
+      module::set_version("comment", $version = 2);
+    }
+
+    if ($version == 2) {
+      module::set_var("comment", "access_permissions", "everybody");
+      module::set_version("comment", $version = 3);
     }
   }
 
diff --git a/modules/comment/helpers/comment_rest.php b/modules/comment/helpers/comment_rest.php
new file mode 100644
index 00000000..bd3011cc
--- /dev/null
+++ b/modules/comment/helpers/comment_rest.php
@@ -0,0 +1,74 @@
+<?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 comment_rest_Core {
+  static function get($request) {
+    $comment = rest::resolve($request->url);
+    access::required("view", $comment->item());
+
+    return array(
+      "url" => $request->url,
+      "entity" => $comment->as_restful_array(),
+      "relationships" => rest::relationships("comment", $comment));
+  }
+
+  static function put($request) {
+    // Only admins can edit comments, for now
+    if (!identity::active_user()->admin) {
+      access::forbidden();
+    }
+
+    $comment = rest::resolve($request->url);
+    $comment = ORM::factory("comment");
+    $comment->text = $request->params->text;
+    $comment->save();
+  }
+
+  static function delete($request) {
+    if (!identity::active_user()->admin) {
+      access::forbidden();
+    }
+
+    $comment = rest::resolve($request->url);
+    access::required("edit", $comment->item());
+
+    $comment->delete();
+  }
+
+  static function relationships($resource_type, $resource) {
+    switch ($resource_type) {
+    case "item":
+      return array(
+        "comments" => array(
+          "url" => rest::url("item_comments", $resource)));
+    }
+  }
+
+  static function resolve($id) {
+    $comment = ORM::factory("comment", $id);
+    if (!access::can("view", $comment->item())) {
+      throw new Kohana_404_Exception();
+    }
+    return $comment;
+  }
+
+  static function url($comment) {
+    return url::abs_site("rest/comment/{$comment->id}");
+  }
+}
diff --git a/modules/comment/helpers/comment_rss.php b/modules/comment/helpers/comment_rss.php
index eee6f750..26d98d21 100644
--- a/modules/comment/helpers/comment_rss.php
+++ b/modules/comment/helpers/comment_rss.php
@@ -35,19 +35,22 @@ class comment_rss_Core {
 
     $comments = ORM::factory("comment")
       ->viewable()
-      ->where("state", "=", "published")
-      ->order_by("created", "DESC");
+      ->where("comments.state", "=", "published")
+      ->order_by("comments.created", "DESC");
 
     if ($feed_id == "item") {
-      $comments->where("item_id", "=", $id);
+      $item = ORM::factory("item", $id);
+      $comments
+        ->where("items.left_ptr", ">=", $item->left_ptr)
+        ->where("items.right_ptr", "<=", $item->right_ptr);
     }
 
     $feed = new stdClass();
     $feed->view = "comment.mrss";
-    $feed->children = array();
+    $feed->comments = array();
     foreach ($comments->find_all($limit, $offset) as $comment) {
       $item = $comment->item();
-      $feed->children[] = new ArrayObject(
+      $feed->comments[] = new ArrayObject(
         array("pub_date" => date("D, d M Y H:i:s T", $comment->created),
               "text" => nl2br(html::purify($comment->text)),
               "thumb_url" => $item->thumb_url(),
diff --git a/modules/comment/helpers/comments_rest.php b/modules/comment/helpers/comments_rest.php
new file mode 100644
index 00000000..1cedb80b
--- /dev/null
+++ b/modules/comment/helpers/comments_rest.php
@@ -0,0 +1,62 @@
+<?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 comments_rest_Core {
+  /**
+   * Possible request parameters:
+   *   start=#
+   *     start at the Nth comment (zero based)
+   *
+   *   num=#
+   *     return up to N comments (max 100)
+   */
+  static function get($request) {
+    $comments = array();
+
+    $p = $request->params;
+    $num = isset($p->num) ? min((int)$p->num, 100) : 10;
+    $start = isset($p->start) ? (int)$p->start : 0;
+
+    foreach (ORM::factory("comment")->viewable()->find_all($num, $start) as $comment) {
+      $comments[] = rest::url("comment", $comment);
+    }
+    return array("url" => rest::url("comments"),
+                 "members" => $comments);
+  }
+
+
+  static function post($request) {
+    $entity = $request->params->entity;
+
+    $item = rest::resolve($entity->item);
+    access::required("edit", $item);
+
+    $comment = ORM::factory("comment");
+    $comment->author_id = identity::active_user()->id;
+    $comment->item_id = $item->id;
+    $comment->text = $entity->text;
+    $comment->save();
+
+    return array("url" => rest::url("comment", $comment));
+  }
+
+  static function url() {
+    return url::abs_site("rest/comments");
+  }
+}
diff --git a/modules/comment/helpers/item_comments_rest.php b/modules/comment/helpers/item_comments_rest.php
new file mode 100644
index 00000000..1fe5c35f
--- /dev/null
+++ b/modules/comment/helpers/item_comments_rest.php
@@ -0,0 +1,50 @@
+<?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 item_comments_rest_Core {
+  static function get($request) {
+    $item = rest::resolve($request->url);
+    access::required("view", $item);
+
+    $comments = array();
+    foreach (ORM::factory("comment")
+             ->viewable()
+             ->where("item_id", "=", $item->id)
+             ->order_by("created", "DESC")
+             ->find_all() as $comment) {
+      $comments[] = rest::url("comment", $comment);
+    }
+
+    return array(
+      "url" => $request->url,
+      "members" => $comments);
+  }
+
+  static function resolve($id) {
+    $item = ORM::factory("item", $id);
+    if (!access::can("view", $item)) {
+      throw new Kohana_404_Exception();
+    }
+    return $item;
+  }
+
+  static function url($item) {
+    return url::abs_site("rest/item_comments/{$item->id}");
+  }
+}