diff options
Diffstat (limited to 'modules/comment/controllers')
| -rw-r--r-- | modules/comment/controllers/comment.php | 88 | ||||
| -rw-r--r-- | modules/comment/controllers/comments.php | 76 |
2 files changed, 96 insertions, 68 deletions
diff --git a/modules/comment/controllers/comment.php b/modules/comment/controllers/comment.php index d2135cf9..a8f52443 100644 --- a/modules/comment/controllers/comment.php +++ b/modules/comment/controllers/comment.php @@ -21,50 +21,29 @@ class Comment_Controller extends REST_Controller { protected $resource_type = "comment"; /** - * Return the form for adding comments. + * Present a form for editing a comment + * @see Rest_Controller::form($resource) */ - public function _get_form($comment) { - $form = new Forge(url::current(true), "", "post", array("id" => "gComment")); - $group = $form->group(_("Add Comment")); - $group->input("author") - ->label(_("Author")) - ->id("gAuthor") - ->class(null) - ->value($comment->author); - $group->input("email") - ->label(_("Email")) - ->id("gEmail") - ->class(null) - ->value($comment->email); - $group->textarea("text") - ->label(_("Text")) - ->id("gText") - ->class(null) - ->value($comment->text); - $group->hidden("item_id") - ->value($comment->item_id); - $group->submit(_("Add")); - - $this->_add_validation_rules(ORM::factory("comment")->validation_rules, $form); - - return $form; + public function _form($comment) { + $form = comment::get_edit_form($comment); + print $form->render("form.html"); } /** - * @todo Refactor this into a more generic location + * Get an existing comment. + * @see Rest_Controller::_get($resource) */ - private function _add_validation_rules($rules, $form) { - foreach ($form->inputs as $name => $input) { - if (isset($input->inputs)) { - $this->_add_validation_rules($rules, $input); - } - if (isset($rules[$name])) { - $input->rules($rules[$name]); - } - } + public function _get($comment) { + $v = new View("comment.html"); + $v->comment = $comment; + print $v; } - public function add($item_id) { + /** + * Update existing comment. + * @see Rest_Controller::_put($resource) + */ + public function _put($comment) { $comment = ORM::factory('comment'); $comment->item_id = $item_id; @@ -77,43 +56,16 @@ class Comment_Controller extends REST_Controller { $comment->datetime = time(); $comment->item_id = $this->input->post('item_id'); $comment->save(); - - $data = array('valid' => true, 'html' => sprintf(comment::show_comment_list($item_id))); - } else { - $data = array('valid' => false, 'html' => sprintf($form->render())); + return; } - - if (request::method() == "get") { - print $data['html']; - } else if (request::method() == "post") { - print json_encode($data); - } - } - - public function get_item_comments($item_id) { - print comment::show_comment_list($item_id); - } - - /** - * Get an existing comment. - * @see Rest_Controller::_get($resource) - */ - public function _get($user) { - throw new Exception("@todo Comment_Controller::_get NOT IMPLEMENTED"); - } - - /** - * Update existing comment. - * @see Rest_Controller::_put($resource) - */ - public function _put($resource) { - throw new Exception("@todo Comment_Controller::_put NOT IMPLEMENTED"); + print $form->render(); } /** + * Add a new comment * @see Rest_Controller::_post($resource) */ - public function _post($user) { + public function _post($comment) { throw new Exception("@todo Comment_Controller::_post NOT IMPLEMENTED"); } diff --git a/modules/comment/controllers/comments.php b/modules/comment/controllers/comments.php new file mode 100644 index 00000000..a0233a0b --- /dev/null +++ b/modules/comment/controllers/comments.php @@ -0,0 +1,76 @@ +<?php defined("SYSPATH") or die("No direct script access."); +/** + * Gallery - a web based photo album viewer and editor + * Copyright (C) 2000-2008 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_Controller extends REST_Controller { + protected $resource_type = "item"; + + /** + * Present a form for adding a new comment to this item + * @see Rest_Controller::form($resource) + */ + public function _form($item) { + $form = comment::get_add_form($item); + print $form->render("form.html"); + } + + /** + * Show the comment collection + * @see Rest_Controller::_get($resource) + */ + public function _get($item) { + print comment::get_comments($item); + } + + /** + * Update existing comment collection. + * @see Rest_Controller::_put($resource) + */ + public function _put($item) { + throw new Exception("@todo Comment_Controller::_put NOT IMPLEMENTED"); + } + + /** + * Add a new comment to the collection + * @see Rest_Controller::_post($resource) + */ + public function _post($item) { + $form = comment::get_add_form($item); + if ($form->validate()) { + $comment = ORM::factory('comment'); + $comment->author = $this->input->post('author'); + $comment->email = $this->input->post('email'); + $comment->text = $this->input->post('text'); + $comment->datetime = time(); + $comment->item_id = $item->id; + $comment->save(); + + header("HTTP/1.1 201 Created"); + header("Location: " . url::site("comment/{$comment->id}")); + } + print $form->render("form.html"); + } + + /** + * Delete existing comment collection. + * @see Rest_Controller::_delete($resource) + */ + public function _delete($item) { + throw new Exception("@todo Comment_Controller::_delete NOT IMPLEMENTED"); + } +} |