Index: modules/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment.module,v
retrieving revision 1.369
diff -u -r1.369 comment.module
--- modules/comment.module 7 Sep 2005 20:45:53 -0000 1.369
+++ modules/comment.module 13 Sep 2005 20:03:09 -0000
@@ -31,39 +31,19 @@
Flat — Displays the posts in chronological order, with no threading whatsoever.
Expanded — Displays the title and text for each post.
Collapsed — Displays only the title for each post.
- When a user chooses save settings, the comments are then redisplayed using the user's new choices. Administrators can set the default settings for the comment control panel, along with other comment defaults, in administer » comments » configure. NOTE: When comment moderation is enabled, users will have another control panel option to control thresholds (see below).
+ When a user chooses save settings, the comments are then redisplayed using the user's new choices. Administrators can set the default settings for the comment control panel, along with other comment defaults, in administer » comments » configure.
Additional comment configurations
Comments behave like other user submissions in Drupal. Filters, smileys and HTML that work in nodes will also work with comments. Administrators can control access to various comment module functions through administer » access control » permissions. Know that in a new Drupal installation, all comment permissions are disabled by default. The choice of which permissions to grant to which roles (groups of users) is left up to the site administrator. The following permissions:
- Access comments — Allows users to view comments.
- Administrate comments — Allows users complete control over configuring, editing and deleting all comments.
- - Moderate comments — Allows users to rate comment postings (see more on moderation below).
- Post comments — Allows users to post comments into an administrator moderation queue.
- Post comments without approval — Allows users to directly post comments, bypassing the moderation queue.
Notification of new comments
Drupal provides specific features to inform site members when new comments have been posted.
Drupal displays the total number of comments attached to each node, and tracks comments read by individual site members. Members which have logged in will see a notice accompanying nodes which contain comments they have not read. Some administrators may want to download, install and configure the notify module. Users can then request that Drupal send them an e-mail when new comments are posted (the notify module requires that cron.php be configured properly).
- The tracker module, disabled by default, displays all the site's recent posts. There is a link to the recent posts page in the navigation block. This page is a useful way to browse new or updated nodes and comments. Content which the user has not yet read is tagged with a red star (this graphic depends on the current theme). Visit the comment board for any node, and Drupal will display a red \"new\" label beside the text of unread comments.
-
- Comment moderation
- On sites with active commenting from users, the administrator can turn over comment moderation to the community.
- With comment moderation, each comment is automatically assigned an initial rating. As users read comments, they can apply a vote which affects the comment rating. At the same time, users have an additional option in the control panel which allows them to set a threshold for the comments they wish to view. Those comments with ratings lower than the set threshold will not be shown. To enable moderation, the administrator must grant moderate comments permissions. Then, a number of options in administer » comments » configure must be configured.
-
- Moderation votes
- The first step is to create moderation labels which allow users to rate a comment. Go to administer » comments » configure » moderation votes. In the vote field, enter the textual labels which users will see when casting their votes. Some examples are
- - Excellent +3
- Insightful +2
- Useful +1
- Redundant -1
- Flame -3
- So that users know how their votes affect the comment, these examples include the vote value as part of the label, although that is optional. Using the weight option, you can control the order in which the votes appear to users. Setting the weight heavier (positive numbers) will make the vote label appear at the bottom of the list. Lighter (a negative number) will push it to the top. To encourage positive voting, a useful order might be higher values, positive votes, at the top, with negative votes at the bottom.
-
- Moderator vote/values matrix
- Next go to administer » comments » configure » moderation matrix. Enter the values for the vote labels for each permission role in the vote matrix. The values entered here will be used to create the rating for each comment. NOTE: Comment ratings are calculated by averaging user votes with the initial rating.
-
- Creating comment thresholds
- In administer » comments » configure » moderation thresholds, you'll have to create some comment thresholds to make the comment rating system useful. When comment moderation is enabled and the thresholds are created, users will find another comment control panel option for selecting their thresholds. They'll use the thresholds you enter here to filter out comments with low ratings. Consequently, you'll probably want to create more than one threshold to give users some flexibility in filtering comments.
- When creating the thresholds, note that the Minimum score is asking you for the lowest rating that a comment can have in order to be displayed. To see a common example of how thresholds work, you might visit Slashdot and view one of their comment boards associated with a story. You can reset the thresholds in their comment control panel.
-
- Initial comment scores
- Finally, you may want to enter some initial comment scores. In administer » comments » configure » moderation roles you can assign a beginning rating for all comments posted by a particular permission role. If you do not assign any initial scores, Drupal will assign a rating of 0 as the default.
", array('%comment-config' => url('admin/comment/configure'), '%permissions' => url('admin/access/permissions'), '%tracker' => url('tracker'), '%download-notify' => 'http://drupal.org/project/releases', '%comment-votes' => url('admin/comment/configure/votes'), '%comment-matrix' => url('admin/comment/configure/matrix'), '%comment-thresholds' => url('admin/comment/configure/thresholds'), '%slashdot' => ' http://slashdot.org', '%comment-initial' => url('admin/comment/configure/roles')));
+ The tracker module, disabled by default, displays all the site's recent posts. There is a link to the recent posts page in the navigation block. This page is a useful way to browse new or updated nodes and comments. Content which the user has not yet read is tagged with a red star (this graphic depends on the current theme). Visit the comment board for any node, and Drupal will display a red \"new\" label beside the text of unread comments.
", array('%comment-config' => url('admin/comment/configure'), '%permissions' => url('admin/access/permissions'), '%tracker' => url('tracker'), '%download-notify' => 'http://drupal.org/project/releases', '%comment-initial' => url('admin/comment/configure/roles')));
case 'admin/comment':
case 'admin/comment/new':
return t("Below is a list of the latest comments posted to your site. Click on a subject to see the comment, the author's name to edit the author's user information , \"edit\" to modify the text, and \"delete\" to remove their submission.
");
@@ -72,14 +52,6 @@
case 'admin/comment/configure':
case 'admin/comment/configure/settings':
return t("Comments can be attached to any node, and their settings are below. The display comes in two types: a \"flat list\" where everything is flush to the left side, and comments come in chronological order, and a \"threaded list\" where replies to other comments are placed immediately below and slightly indented, forming an outline. They also come in two styles: \"expanded\", where you see both the title and the contents, and \"collapsed\" where you only see the title. Preview comment forces a user to look at their comment by clicking on a \"Preview\" button before they can actually add the comment.
");
- case 'admin/comment/configure/matrix':
- return t("Here you assign a value to each item in the comment moderation dropdown menu. This value is added to the vote total, which is then divided by the number of users who have voted and rounded off to the nearest integer.
- In order to use comment moderation, every text box on this page should be populated.
- You must assign the \"moderate comments\" permission to at least one role in order to use this page.
- Every box not filled in will have a value of zero, which will have the effect of lowering a comments overall score.
");
- case 'admin/comment/configure/roles':
- return t("You can setup the initial vote value of a comment posted by each user role using these forms. This value is used before any other users vote on the comment. Blank entries are valued at zero.
");
- case 'admin/comment/configure/thresholds':
- return t("Use these forms to setup the name and minimum \"cut off\" score to help your users hide comments they don't want to see. These thresholds appear in the user's comment control panel. Click \"edit threshold\" to modify the values of an already existing configuration. To delete a setting, \"edit\" it first, and then choose \"delete threshold\".
");
- case 'admin/comment/configure/votes':
- return t('Create and control the possible comment moderation votes here. "Weight" lets you set the order of the drop down menu. Click "edit" to edit a current vote weight. To delete a name/weight combination go to the "edit" area. To delete a setting, "edit" it first, and then choose "delete vote".
');
case 'admin/modules#description':
return t('Allows users to comment on and discuss published content.');
}
@@ -113,16 +85,6 @@
$items[] = array('path' => 'admin/comment/configure/settings', 'title' => t('settings'),
'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
- $access = user_access('administer comments') && user_access('administer moderation');
- $items[] = array('path' => 'admin/comment/configure/matrix', 'title' => t('moderation matrix'),
- 'callback' => 'comment_matrix_settings', 'access' => $access, 'type' => MENU_LOCAL_TASK);
- $items[] = array('path' => 'admin/comment/configure/thresholds', 'title' => t('moderation thresholds'),
- 'callback' => 'comment_threshold_settings', 'access' => $access, 'type' => MENU_LOCAL_TASK);
- $items[] = array('path' => 'admin/comment/configure/roles', 'title' => t('moderation roles'),
- 'callback' => 'comment_role_settings', 'access' => $access, 'type' => MENU_LOCAL_TASK);
- $items[] = array('path' => 'admin/comment/configure/votes', 'title' => t('moderation votes'),
- 'callback' => 'comment_vote_settings', 'access' => $access,'type' => MENU_LOCAL_TASK);
-
$access = user_access('post comments');
$items[] = array('path' => 'comment/reply', 'title' => t('reply to comment'),
'callback' => 'comment_save_settings', 'access' => 1, 'type' => MENU_CALLBACK);
@@ -153,7 +115,7 @@
* Implementation of hook_perm().
*/
function comment_perm() {
- return array('access comments', 'post comments', 'administer comments', 'moderate comments', 'post comments without approval', 'administer moderation');
+ return array('access comments', 'post comments', 'administer comments', 'post comments without approval');
}
/**
@@ -321,16 +283,6 @@
$group .= form_radios(t('Comment subject field'), 'comment_subject_field', variable_get('comment_subject_field', 1), array(t('Disabled'), t('Enabled')), t('Can users provide a unique subject for their comments?'));
$group .= form_radios(t('Preview comment'), 'comment_preview', variable_get('comment_preview', 1), array(t('Optional'), t('Required')));
$group .= form_radios(t('Location of comment submission form'), 'comment_form_location', variable_get('comment_form_location', 0), array(t('Display on separate page'), t('Display below post or comments')));
- $output .= form_group(t('Comment posting settings'), $group);
-
- $result = db_query('SELECT fid, filter FROM {moderation_filters} ');
- while ($filter = db_fetch_object($result)) {
- $thresholds[$filter->fid] = ($filter->filter);
- }
- if ($thresholds) {
- $group = form_select(t('Default threshold'), 'comment_default_threshold', variable_get('comment_default_threshold', 0), $thresholds, t('Thresholds are values below which comments are hidden. These thresholds are useful for busy sites which want to hide poor comments from most users.'));
- $output .= form_group(t('Comment moderation settings'), $group);
- }
return system_settings_form($output);
}
@@ -435,6 +387,9 @@
function comment_validate($edit) {
global $user;
+ // Invoke other validation handlers
+ module_invoke_all('comment', 'validate', $edit);
+
// only admins can change these fields
if (!user_access('administer comments')) {
$edit['uid'] = $user->uid;
@@ -744,10 +699,6 @@
}
}
- if ($moderation = comment_moderation_form($comment)) {
- $links[] = $moderation;
- }
-
return $links;
}
@@ -756,7 +707,6 @@
$mode = $_GET['mode'];
$order = $_GET['order'];
- $threshold = $_GET['threshold'];
$comments_per_page = $_GET['comments_per_page'];
$comment_page = $_GET['comment_page'];
@@ -776,10 +726,6 @@
if (empty($order)) {
$order = $user->sort ? $user->sort : ($_SESSION['comment_sort'] ? $_SESSION['comment_sort'] : variable_get('comment_default_order', 1));
}
- if (empty($threshold)) {
- $threshold = $user->threshold ? $user->threshold : ($_SESSION['comment_threshold'] ? $_SESSION['comment_threshold'] : variable_get('comment_default_threshold', 0));
- }
- $threshold_min = db_result(db_query('SELECT minimum FROM {moderation_filters} WHERE fid = %d', $threshold));
if (empty($comments_per_page)) {
$comments_per_page = $user->comments_per_page ? $user->comments_per_page : ($_SESSION['comment_comments_per_page'] ? $_SESSION['comment_comments_per_page'] : variable_get('comment_default_per_page', '50'));
@@ -800,9 +746,6 @@
$output .= theme('comment_view', $comment, theme('links', module_invoke_all('link', 'comment', $comment, 1)));
}
- if ((comment_user_can_moderate($node)) && $user->uid != $comment->uid && !(comment_already_moderated($user->uid, $comment->users))) {
- $output .= ''. form_submit(t('Moderate comment')) .'
';
- }
$output .= '';
}
else {
@@ -899,11 +842,11 @@
}
}
- // Start a form, for use with comment control and moderation.
+ // Start a form, for use with comment control.
$result = pager_query($query, $comments_per_page, 0, "SELECT COUNT(*) FROM {comments} WHERE status = %d AND nid = %d", $nid, COMMENT_PUBLISHED);
if (db_num_rows($result) && (variable_get('comment_controls', 3) == 0 || variable_get('comment_controls', 3) == 2)) {
$output .= '';
}
@@ -917,16 +860,16 @@
$comment->depth = count(explode('.', $comment->thread)) - 1;
if ($mode == 1) {
- $output .= theme('comment_flat_collapsed', $comment, $threshold_min);
+ $output .= theme('comment_flat_collapsed', $comment);
}
else if ($mode == 2) {
- $output .= theme('comment_flat_expanded', $comment, $threshold_min);
+ $output .= theme('comment_flat_expanded', $comment);
}
else if ($mode == 3) {
- $output .= theme('comment_thread_min', $comment, $threshold_min);
+ $output .= theme('comment_thread_min', $comment);
}
else if ($mode == 4) {
- $output .= theme('comment_thread_max', $comment, $threshold_min);
+ $output .= theme('comment_thread_max', $comment);
}
}
@@ -936,15 +879,11 @@
$output .= $pager;
}
- if (db_num_rows($result) && comment_user_can_moderate($node)) {
- $output .= '';
- }
-
$output .= '';
if (db_num_rows($result) && (variable_get('comment_controls', 3) == 1 || variable_get('comment_controls', 3) == 2)) {
$output .= '';
}
@@ -1040,265 +979,23 @@
}
/**
- * Menu callback; presents the moderation vote matrix.
- */
-function comment_matrix_settings() {
-
- if ($edit = $_POST['edit']) {
- db_query('DELETE FROM {moderation_roles} ');
- foreach ($edit as $role_id => $votes) {
- foreach ($votes as $mid => $value) {
- $sql = "('$mid', '$role_id', '". ($value ? $value : 0) ."')";
- db_query('INSERT INTO {moderation_roles} (mid, rid, value) VALUES '. $sql);
- }
- }
- drupal_set_message(t('The vote values have been saved.'));
- }
-
- $output .= ''. t('Moderation vote/value matrix') .'
';
-
- $result = db_query("SELECT r.rid, r.name FROM {role} r, {permission} p WHERE r.rid = p.rid AND p.perm LIKE '%moderate comments%'");
- $role_names = array();
- while ($role = db_fetch_object($result)) {
- $role_names[$role->rid] = $role->name;
- }
-
- $result = db_query('SELECT rid, mid, value FROM {moderation_roles} ');
- while ($role = db_fetch_object($result)) {
- $mod_roles[$role->rid][$role->mid] = $role->value;
- }
-
- $header = array_merge(array(t('Votes')), array_values($role_names));
-
- $result = db_query('SELECT mid, vote FROM {moderation_votes} ORDER BY weight');
- while ($vote = db_fetch_object($result)) {
- $row = array($vote->vote);
- foreach (array_keys($role_names) as $rid) {
- $row[] = array('data' => form_textfield(NULL, "$rid][$vote->mid", $mod_roles[$rid][$vote->mid], 15, 3));
- }
- $rows[] = $row;
- }
- if (!$rows) {
- $rows[] = array(array('data' => t('No votes have been defined.'), 'colspan' => '5'));
- }
-
- $output .= theme('table', $header, $rows);
- if ($rows) { $output .= '
'. form_submit(t('Submit votes')); }
-
- return form($output);
-}
-
-/**
- * Menu callback; allows admin to set default scores for different roles.
- */
-function comment_role_settings() {
-
- $edit = $_POST['edit'];
-
- $output .= ''. t('Initial comment scores') .'
';
-
- if ($edit) {
- variable_set('comment_roles', $edit);
- drupal_set_message(t('The comment scores have been saved.'));
- }
-
- $start_values = variable_get('comment_roles', array());
-
- $result = db_query("SELECT r.rid, r.name FROM {role} r, {permission} p WHERE r.rid = p.rid AND p.perm LIKE '%post comments%'");
-
- $header = array(t('User role'), t('Initial score'));
-
- while ($role = db_fetch_object($result)) {
- $rows[] = array($role->name, array('data' => form_textfield(NULL, $role->rid, $start_values[$role->rid], 15, 3), 'align' => 'center'));
- }
-
- $output .= theme('table', $header, $rows);
- $output .= '
'. form_submit(t('Save scores'));
-
- return form($output);
-}
-
-/**
- * Menu callback; displays page for assigning names to vote values.
- */
-function comment_vote_settings($mid = 0) {
- $op = $_POST['op'];
- $edit = $_POST['edit'];
-
- if ($op == t('Save vote')) {
- db_query("UPDATE {moderation_votes} SET vote = '%s', weight = %d WHERE mid = %d", $edit['vote'], $edit['weight'], $mid);
- $mid = 0; // zero it out so we return to the overview.
- drupal_set_message(t('The vote has been saved.'));
- }
- else if ($op == t('Delete vote')) {
- db_query('DELETE FROM {moderation_votes} WHERE mid = %d', $mid);
- db_query('DELETE FROM {moderation_roles} WHERE mid = %d', $mid);
- $mid = 0; // zero it out so we return to the overview.
- drupal_set_message(t('The vote has been deleted.'));
- }
- else if ($op == t('Add new vote')) {
- db_query("INSERT INTO {moderation_votes} (vote, weight) VALUES ('%s', %d)", $edit['vote'], $edit['weight']);
- $mid = 0; // zero it out so we return to the overview.
- drupal_set_message(t('The vote has been added.'));
- }
-
- $output .= ''. t('Moderation votes overview') .'
';
-
- // load up and show any vote types previously defined.
- $header = array(t('Votes'), t('Weight'), t('Operations'));
- $result = db_query('SELECT mid, vote, weight FROM {moderation_votes} ORDER BY weight');
- while ($vote = db_fetch_object($result)) {
- $rows[] = array($vote->vote, array('data' => $vote->weight), array('data' => l(t('edit'), "admin/comment/configure/votes/$vote->mid")));
- }
- if (!$rows) {
- $rows[] = array(array('data' => t('No vote types have been defined.'), 'colspan' => '3'));
- }
- $output .= theme('table', $header, $rows);
-
- if ($mid) { // if we're not saving, deleting, or adding, we must be editing, so prefill the form fields.
- $vote = db_fetch_object(db_query('SELECT vote, weight FROM {moderation_votes} WHERE mid = %d', $mid));
- }
-
- $output .= '
'. (isset($mid) ? t('Edit moderation option') : t('Add new moderation option')) .'
';
- $form .= form_textfield(t('Vote'), 'vote', $vote->vote, 30, 64, t('The name of this vote. Example: "off topic", "excellent", "sucky".'));
- $form .= form_textfield(t('Weight'), 'weight', $vote->weight, 30, 64, t('Used to order votes in the comment control box; heavier sink.'));
- if ($mid) {
- $form .= form_submit(t('Save vote'));
- $form .= form_submit(t('Delete vote'));
- }
- else {
- $form .= form_submit(t('Add new vote'));
- }
-
- return $output . form($form);
-}
-
-/**
- * Menu callback; displays settings for thresholds at which comments are displayed.
- */
-function comment_threshold_settings($fid = 0) {
- $op = $_POST['op'];
- $edit = $_POST['edit'];
-
- if ($op == t('Save threshold')) {
- db_query("UPDATE {moderation_filters} SET filter = '%s', minimum = %d WHERE fid = %d", $edit['filter'], $edit['minimum'], $fid);
- $fid = 0; // zero it out so we return to the overview.
- drupal_set_message(t('The threshold has been saved.'));
- }
- else if ($op == t('Delete threshold')) {
- db_query('DELETE FROM {moderation_filters} WHERE fid = %d', $fid);
- $fid = 0; // zero it out so we return to the overview.
- drupal_set_message(t('The threshold has been deleted.'));
- }
- else if ($op == t('Add new threshold')) {
- db_query("INSERT INTO {moderation_filters} (filter, minimum) VALUES ('%s', %d)", $edit['filter'], $edit['minimum']);
- $fid = 0; // zero it out so we return to the overview.
- drupal_set_message(t('The threshold has been added.'));
- }
-
- $output .= ''. t('Comment threshold overview') .'
';
-
- // load up and show any thresholds previously defined.
- $header = array(t('Name'), t('Minimum score'), t('Operations'));
- $result = db_query('SELECT fid, filter, minimum FROM {moderation_filters} ORDER BY minimum');
- while ($filter = db_fetch_object($result)) {
- $rows[] = array($filter->filter, array('data' => $filter->minimum), array('data' => l(t('edit'), "admin/comment/configure/thresholds/$filter->fid")));
- }
- if (!$rows) {
- $rows[] = array(array('data' => t('No thresholds have been defined.'), 'colspan' => '3'));
- }
- $output .= theme('table', $header, $rows);
-
- if ($fid) { // if we're not saving, deleting, or adding, we must be editing, so prefill the form fields.
- $filter = db_fetch_object(db_query('SELECT filter, fid, minimum FROM {moderation_filters} WHERE fid = %d', $fid));
- }
-
- $output .= '
'. (isset($fid) ? t('Edit threshold') : t('Add new threshold')) .'
';
- $form .= form_textfield(t('Threshold name'), 'filter', $filter->filter, 30, 64, t('The name of this threshold. Example: "good comments", "+1 comments", "everything".'));
- $form .= form_textfield(t('Minimum score'), 'minimum', $filter->minimum, 30, 64, t('Show all comments whose score is larger or equal to the provided minimal score. Range: -127 +128'));
- if ($fid) {
- $form .= form_submit(t('Save threshold'));
- $form .= form_submit(t('Delete threshold'));
- }
- else {
- $form .= form_submit(t('Add new threshold'));
- }
-
- return $output . form($form);
-}
-
-/**
*** misc functions: helpers, privates, history
**/
-
-function comment_visible($comment, $threshold = 0) {
- if ($comment->score >= $threshold) {
- return 1;
- }
- else {
- return 0;
- }
-}
-
-function comment_moderate() {
- global $user;
-
- if ($moderation = $_POST['edit']['moderation']) {
- $result = db_query('SELECT DISTINCT mid, value, ABS(value) FROM {moderation_roles} WHERE rid IN (%s) ORDER BY mid, ABS(value), value', implode(', ', array_keys($user->roles)));
- while ($mod = db_fetch_object($result)) {
- $votes[$mod->mid] = $mod->value;
- }
-
- $node = node_load(db_result(db_query('SELECT nid FROM {comments} WHERE cid = %d', key($moderation))));
-
- if (user_access('administer comments') || comment_user_can_moderate($node)) {
- foreach ($moderation as $cid => $vote) {
- if ($vote) {
- $comment = db_fetch_object(db_query('SELECT * FROM {comments} WHERE cid = %d', $cid));
- $users = unserialize($comment->users);
- if ($user->uid != $comment->uid && !(comment_already_moderated($user->uid, $comment->users))) {
- $users[$user->uid] = $vote;
- $tot_score = 0;
- foreach ($users as $uid => $vote) {
- if ($uid) {
- $tot_score = $tot_score + $votes[$vote];
- }
- else {
- // vote 0 is the start value
- $tot_score = $tot_score + $vote;
- }
- }
- $new_score = round($tot_score / count($users));
- db_query("UPDATE {comments} SET score = '$new_score', users = '%s' WHERE cid = %d", serialize($users), $cid);
-
- module_invoke_all('comment', 'moderate', $cid, $vote);
- }
- }
- }
- }
- }
-}
-
function comment_save_settings() {
global $user;
$edit = $_POST['edit'];
$mode = $edit['mode'];
$order = $edit['order'];
- $threshold = $edit['threshold'];
$comments_per_page = $edit['comments_per_page'];
- if ($edit['moderation']) {
- comment_moderate();
- }
- else if ($user->uid) {
- $user = user_save($user, array('mode' => $mode, 'sort' => $order, 'threshold' => $threshold, 'comments_per_page' => $comments_per_page));
+ if ($user->uid) {
+ $user = user_save($user, array('mode' => $mode, 'sort' => $order, 'comments_per_page' => $comments_per_page));
}
else {
$_SESSION['comment_mode'] = $mode;
$_SESSION['comment_sort'] = $order;
- $_SESSION['comment_threshold'] = $threshold;
$_SESSION['comment_comments_per_page'] = $comments_per_page;
}
@@ -1353,20 +1050,6 @@
}
-function comment_user_can_moderate($node) {
- global $user;
- return (user_access('moderate comments'));
- // TODO: || (($user->uid == $node->uid) && user_access("moderate comments in owned node")));
-}
-
-function comment_already_moderated($uid, $users) {
- $comment_users = unserialize($users);
- if (!$comment_users) {
- $comment_users = array();
- }
- return in_array($uid, array_keys($comment_users));
-}
-
/*
** Renderer or visualization functions this can be optionally
** overridden by themes.
@@ -1412,6 +1095,9 @@
$form .= form_textfield(t('E-mail'), 'mail', $edit['mail'], 30, 64, t('The content of this field is kept private and will not be shown publicly.'), NULL, TRUE);
$form .= form_textfield(t('Homepage'), 'homepage', $edit['homepage'], 30, 255);
}
+
+ // Prepend extra form additions
+ $form .= implode('', module_invoke_all('comment', 'form pre', $edit));
if (variable_get('comment_subject_field', 1)) {
$form .= form_textfield(t('Subject'), 'subject', $edit['subject'], 60, 64);
@@ -1419,6 +1105,9 @@
$form .= form_textarea(t('Comment'), 'comment', $edit['comment'] ? $edit['comment'] : $user->signature, 60, 15, '', NULL, TRUE);
+ // Append extra form additions
+ $form .= implode('', module_invoke_all('comment', 'form post', $edit));
+
$form .= filter_form('format', $edit['format']);
$form .= form_hidden('cid', $edit['cid']);
$form .= form_hidden('pid', $edit['pid']);
@@ -1434,8 +1123,17 @@
$form .= form_submit(t('Post comment'));
}
- $destination = $_REQUEST['destination'] ? 'destination='. $_REQUEST['destination'] : '';
- return theme('box', $title, form($form, 'post', url('comment/reply/'. $edit['nid'], $destination)));
+ $attributes = array();
+ $attributes[] = array('id' => 'comment-form');
+ if ($_REQUEST['destination']) {
+ $attributes[] = array('destination' => $_REQUEST['destination']);
+ }
+ $extra = module_invoke_all('comment', 'form param', $edit);
+ if (is_array($extra)) {
+ $attributes = array_merge($extra, $attributes);
+ }
+
+ return theme('box', $title, form($form, 'post', url('comment/reply/'. $edit['nid'], $attributes)));
}
function theme_comment_preview($comment, $links = '', $visible = 1) {
@@ -1458,6 +1156,10 @@
// Switch to folded/unfolded view of the comment
if ($visible) {
$comment->comment = check_markup($comment->comment, $comment->format, FALSE);
+
+ // Comment API hook
+ $comment->comment .= implode('', module_invoke_all('comment', 'view', $comment));
+
$output .= theme('comment', $comment, $links);
}
else {
@@ -1467,16 +1169,9 @@
return $output;
}
-function theme_comment_controls($threshold = 1, $mode = 3, $order = 1, $comments_per_page = 50) {
+function theme_comment_controls($mode = 3, $order = 1, $comments_per_page = 50) {
static $output;
$options = array();
- $result = db_query('SELECT fid, filter FROM {moderation_filters} ');
- $filters = array();
- $filters[0] = t('-- threshold --');
-
- while($filter = db_fetch_object($result)) {
- $filters[$filter->fid] = $filter->filter;
- }
if (!$output) {
$output .= '';
@@ -1488,13 +1183,6 @@
}
$output .= form_select(NULL, 'comments_per_page', $comments_per_page, $options);
- if ($filters) {
- $output .= form_select(NULL, 'threshold', $threshold, $filters);
- }
- else {
- $output .= form_hidden('threshold', $threshold);
- }
-
$output .= ' '. form_submit(t('Save settings'));
$output .= '
';
@@ -1504,33 +1192,9 @@
return theme('box', t('Comment viewing options'), $output);
}
-function comment_moderation_form($comment) {
- global $comment_votes, $user, $node;
- static $votes;
-
- $op = $_POST['op'];
-
- if ((comment_user_can_moderate($node)) && $user->uid != $comment->uid && !(comment_already_moderated($user->uid, $comment->users))) {
- // comment hasn't been moderated yet:
- if (!isset($votes) && $user->roles) {
- $result = db_query('SELECT v.mid, v.vote, MAX(v.weight) AS weight, MAX(r.value) AS value FROM {moderation_votes} v INNER JOIN {moderation_roles} r ON r.mid = v.mid WHERE r.rid IN (%s) GROUP BY v.mid, v.vote ORDER BY weight', implode(', ', array_keys($user->roles)));
- $votes = array(0 => t('defer until later'));
- while ($vote = db_fetch_object($result)) {
- if ($vote->value != 0) {
- $votes[$vote->mid] = $vote->vote;
- }
- }
- }
- if (count($votes) > 1) {
- return form_select(t('Moderation'), 'moderation]['. $comment->cid, 0, $votes);
- }
- }
-}
-
function theme_comment($comment, $links = 0) {
$output = "