From 9c43e8fc7a192dfe768c76a539373915bddaa0aa Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Fri, 29 Jun 2001 22:08:57 +0000
Subject: Extremely large commit:

- Fixed tiny quote problem in account.php.

- Fixed tiny bug in comment.inc.

- Fixed tiny bug in comment.module.

- Fixed tiny bug in meta.module.

- Simplified user_access() API.

- Rewrote link system: still needs fine-tuning and testing so don't
  upgrade if you are running a production site. ;)

  Updated all modules and themes to reflect this change.  All other
  themes and modules need updating too!
---
 modules/comment.module | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'modules/comment.module')

diff --git a/modules/comment.module b/modules/comment.module
index ad9924603..5f4dd09fd 100644
--- a/modules/comment.module
+++ b/modules/comment.module
@@ -4,13 +4,21 @@ function comment_search($keys) {
   global $user;
   $result = db_query("SELECT c.*, u.userid FROM comments c LEFT JOIN users u ON c.author = u.id WHERE c.subject LIKE '%$keys%' OR c.comment LIKE '%$keys%' ORDER BY c.timestamp DESC LIMIT 20");
   while ($comment = db_fetch_object($result)) {
-    $find[$i++] = array("title" => check_output($comment->subject), "link" => (user_access($user, "edit user comments") ? "admin.php?mod=comment&op=edit&id=$comment->cid" : "node.php?id=$comment->lid&cid=$comment->cid"), "user" => $comment->userid, "date" => $comment->timestamp);
+    $find[$i++] = array("title" => check_output($comment->subject), "link" => (user_access("administer comments") ? "admin.php?mod=comment&op=edit&id=$comment->cid" : "node.php?id=$comment->lid&cid=$comment->cid"), "user" => $comment->userid, "date" => $comment->timestamp);
   }
   return $find;
 }
 
 function comment_perm() {
-  return array("view comments", "post comments", "edit comments");
+  return array("access comments", "post comments", "administer comments");
+}
+
+function comment_link($type) {
+  if ($type == "admin" and user_access("administer comments")) {
+    $links[] = "<a href=\"admin.php?mod=comment\">comments</a>";
+  }
+
+  return $links ? $links : array();
 }
 
 function comment_edit($id) {
@@ -46,9 +54,9 @@ function comment_overview() {
 }
 
 function comment_admin() {
-  global $user, $op, $id, $edit, $mod, $keys, $order;
+  global $op, $id, $edit, $mod, $keys, $order;
 
-  if (user_access($user, "edit comments")) {
+  if (user_access("administer comments")) {
 
     print "<SMALL><A HREF=\"admin.php?mod=comment\">overview</A> | <A HREF=\"admin.php?mod=comment&op=search\">search comment</A></SMALL><HR>\n";
 
-- 
cgit v1.2.3