summaryrefslogtreecommitdiff
path: root/modules/comment/views
diff options
context:
space:
mode:
Diffstat (limited to 'modules/comment/views')
-rw-r--r--modules/comment/views/admin_comments.html.php200
-rw-r--r--modules/comment/views/admin_manage_comments.html.php201
-rw-r--r--modules/comment/views/comment.mrss.php18
-rw-r--r--modules/comment/views/comments.html.php16
4 files changed, 226 insertions, 209 deletions
diff --git a/modules/comment/views/admin_comments.html.php b/modules/comment/views/admin_comments.html.php
index f58267bd..dc6985b2 100644
--- a/modules/comment/views/admin_comments.html.php
+++ b/modules/comment/views/admin_comments.html.php
@@ -1,201 +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")) ?>;
- 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/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/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">
+ <h1> <?= t("Comment settings") ?> </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/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>
-
+ <?= $form ?>
</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>
diff --git a/modules/comment/views/comment.mrss.php b/modules/comment/views/comment.mrss.php
index c2a4b538..809e7890 100644
--- a/modules/comment/views/comment.mrss.php
+++ b/modules/comment/views/comment.mrss.php
@@ -20,19 +20,19 @@
<? endif ?>
<pubDate><?= $pub_date ?></pubDate>
<lastBuildDate><?= $pub_date ?></lastBuildDate>
- <? foreach ($feed->children as $child): ?>
+ <? foreach ($feed->comments as $comment): ?>
<item>
- <title><?= html::purify($child->title) ?></title>
- <link><?= html::clean($child->item_uri) ?></link>
- <author><?= html::clean($child->author) ?></author>
- <guid isPermaLink="true"><?= $child->item_uri ?></guid>
- <pubDate><?= $child->pub_date ?></pubDate>
+ <title><?= html::purify($comment->title) ?></title>
+ <link><?= html::clean($comment->item_uri) ?></link>
+ <author><?= html::clean($comment->author) ?></author>
+ <guid isPermaLink="true"><?= $comment->item_uri ?></guid>
+ <pubDate><?= $comment->pub_date ?></pubDate>
<content:encoded>
<![CDATA[
- <p><?= nl2br(html::purify($child->text)) ?></p>
+ <p><?= nl2br(html::purify($comment->text)) ?></p>
<p>
- <img alt="" src="<?= $child->thumb_url ?>"
- height="<?= $child->thumb_height ?>" width="<?= $child->thumb_width ?>" />
+ <img alt="" src="<?= $comment->thumb_url ?>"
+ height="<?= $comment->thumb_height ?>" width="<?= $comment->thumb_width ?>" />
<br />
</p>
]]>
diff --git a/modules/comment/views/comments.html.php b/modules/comment/views/comments.html.php
index e4322e08..da45f57b 100644
--- a/modules/comment/views/comments.html.php
+++ b/modules/comment/views/comments.html.php
@@ -1,17 +1,27 @@
<?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">
+ <? if (comment::can_comment()): ?>
<?= t("No comments yet. Be the first to <a %attrs>comment</a>!",
array("attrs" => html::mark_clean("href=\"" . url::site("form/add/comments/{$item->id}") . "\" class=\"showCommentForm\""))) ?>
- </p>
- <ul><li class="g-no-comments">&nbsp;</li></ul>
+ <? else: ?>
+ <?= t("No comments yet.") ?>
+ <? endif ?>
+ </p>
+ <ul>
+ <li class="g-no-comments">&nbsp;</li>
+ </ul>
<? endif ?>
+
<? if ($comments->count()): ?>
<ul>
<? foreach ($comments as $comment): ?>
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-18 10:10:22 +0000