Skip to content
Snippets Groups Projects
Commit bbb41d0f authored by Dries Buytaert's avatar Dries Buytaert
Browse files 

- Patch by JonBob: updated the comment module to take advantage of the latest
  menu system improvements.
parent f163fa99
No related branches found
No related tags found
2 merge requests!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!789Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
Show whitespace changes
Inline Side-by-side
modules/comment.module
+ 27
− 13
View file @ bbb41d0f
...@@ -97,6 +97,8 @@ function comment_menu() { ...@@ -97,6 +97,8 @@ function comment_menu() {
'callback' => 'comment_delete', 'access' => $access, 'type' => MENU_CALLBACK); 'callback' => 'comment_delete', 'access' => $access, 'type' => MENU_CALLBACK);
// Tabs: // Tabs:
$items[] = array('path' => 'admin/comment/list', 'title' => t('list'),
'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
$items[] = array('path' => 'admin/comment/configure', 'title' => t('configure'), $items[] = array('path' => 'admin/comment/configure', 'title' => t('configure'),
'callback' => 'comment_configure', 'access' => $access, 'type' => MENU_LOCAL_TASK); 'callback' => 'comment_configure', 'access' => $access, 'type' => MENU_LOCAL_TASK);
if (module_exist('search')) { if (module_exist('search')) {
...@@ -105,24 +107,25 @@ function comment_menu() { ...@@ -105,24 +107,25 @@ function comment_menu() {
} }
// Subtabs: // Subtabs:
$items[] = array('path' => 'admin/comment/new', 'title' => t('new comments'), $items[] = array('path' => 'admin/comment/list/new', 'title' => t('new comments'),
'callback' => 'comment_admin_overview', 'access' => $access, 'type' => MENU_LOCAL_SUBTASK); 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
$items[] = array('path' => 'admin/comment/approval', 'title' => t('approval queue'), $items[] = array('path' => 'admin/comment/list/approval', 'title' => t('approval queue'),
'callback' => 'comment_admin_overview', 'access' => $access, 'type' => MENU_LOCAL_SUBTASK); 'callback' => 'comment_admin_overview', 'access' => $access,
'callback arguments' => 'approval',
'type' => MENU_LOCAL_TASK);
$items[] = array('path' => 'admin/comment/configure/settings', 'title' => t('settings'), $items[] = array('path' => 'admin/comment/configure/settings', 'title' => t('settings'),
'callback' => 'comment_configure', 'access' => $access, 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
'type' => MENU_LOCAL_SUBTASK, 'weight' => -1);
$access = user_access('administer comments') && user_access('administer moderation'); $access = user_access('administer comments') && user_access('administer moderation');
$items[] = array('path' => 'admin/comment/configure/matrix', 'title' => t('moderation matrix'), $items[] = array('path' => 'admin/comment/configure/matrix', 'title' => t('moderation matrix'),
'callback' => 'comment_matrix_settings', 'access' => $access, 'type' => MENU_LOCAL_SUBTASK); 'callback' => 'comment_matrix_settings', 'access' => $access, 'type' => MENU_LOCAL_TASK);
$items[] = array('path' => 'admin/comment/configure/thresholds', 'title' => t('moderation thresholds'), $items[] = array('path' => 'admin/comment/configure/thresholds', 'title' => t('moderation thresholds'),
'callback' => 'comment_threshold_settings', 'access' => $access, 'type' => MENU_LOCAL_SUBTASK); 'callback' => 'comment_threshold_settings', 'access' => $access, 'type' => MENU_LOCAL_TASK);
$items[] = array('path' => 'admin/comment/configure/roles', 'title' => t('moderation roles'), $items[] = array('path' => 'admin/comment/configure/roles', 'title' => t('moderation roles'),
'callback' => 'comment_role_settings', 'access' => $access, 'type' => MENU_LOCAL_SUBTASK); 'callback' => 'comment_role_settings', 'access' => $access, 'type' => MENU_LOCAL_TASK);
$items[] = array('path' => 'admin/comment/configure/votes', 'title' => t('moderation votes'), $items[] = array('path' => 'admin/comment/configure/votes', 'title' => t('moderation votes'),
'callback' => 'comment_vote_settings', 'access' => $access,'type' => MENU_LOCAL_SUBTASK); 'callback' => 'comment_vote_settings', 'access' => $access,'type' => MENU_LOCAL_TASK);
$access = user_access('post comments'); $access = user_access('post comments');
$items[] = array('path' => 'comment/reply', 'title' => t('reply to comment'), $items[] = array('path' => 'comment/reply', 'title' => t('reply to comment'),
...@@ -283,6 +286,8 @@ function comment_node_link($node) { ...@@ -283,6 +286,8 @@ function comment_node_link($node) {
* This search function uses search.module's built-in content index by * This search function uses search.module's built-in content index by
* calling do_search(). The "nid" identifier in the select is used to * calling do_search(). The "nid" identifier in the select is used to
* present search results in the context of their associated node. * present search results in the context of their associated node.
*
* This function doubles as a menu callback for the administrative comment search.
*/ */
function comment_search($keys = NULL) { function comment_search($keys = NULL) {
if (!$keys) { if (!$keys) {
...@@ -929,6 +934,9 @@ function comment_render($node, $cid = 0) { ...@@ -929,6 +934,9 @@ function comment_render($node, $cid = 0) {
return $output; return $output;
} }
/**
* Menu callback; edit a comment from the administrative interface.
*/
function comment_admin_edit($cid) { function comment_admin_edit($cid) {
// comment edits need to be saved. // comment edits need to be saved.
...@@ -957,13 +965,16 @@ function comment_admin_edit($cid) { ...@@ -957,13 +965,16 @@ function comment_admin_edit($cid) {
} }
} }
/**
* Menu callback; delete a comment.
*/
function comment_delete($cid) { function comment_delete($cid) {
$comment = db_fetch_object(db_query('SELECT c.*, u.name AS registered_name, u.uid FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE c.cid = %d', $cid)); $comment = db_fetch_object(db_query('SELECT c.*, u.name AS registered_name, u.uid FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE c.cid = %d', $cid));
$comment->name = $comment->registered_name ? $comment->registered_name : $comment->name; $comment->name = $comment->registered_name ? $comment->registered_name : $comment->name;
$output = ''; $output = '';
// we'll only delete if the user has confirmed the // We'll only delete if the user has confirmed the
// deletion using the form in our else clause below. // deletion using the form in our else clause below.
if ($comment->cid && $_POST['op'] == t('Delete comment')) { if ($comment->cid && $_POST['op'] == t('Delete comment')) {
drupal_set_message(t('the comment and all its replies have been deleted.')); drupal_set_message(t('the comment and all its replies have been deleted.'));
...@@ -995,7 +1006,10 @@ function comment_save($id, $edit) { ...@@ -995,7 +1006,10 @@ function comment_save($id, $edit) {
drupal_set_message(t('the comment has been saved.')); drupal_set_message(t('the comment has been saved.'));
} }
function comment_admin_overview() { /**
* Menu callback; present an administrative comment listing.
*/
function comment_admin_overview($type = 'new') {
$header = array( $header = array(
array('data' => t('subject'), 'field' => 'subject'), array('data' => t('subject'), 'field' => 'subject'),
...@@ -1005,7 +1019,7 @@ function comment_admin_overview() { ...@@ -1005,7 +1019,7 @@ function comment_admin_overview() {
array('data' => t('operations'), 'colspan' => 2) array('data' => t('operations'), 'colspan' => 2)
); );
$status = (arg(2) == 'approval') ? 1 : 0; $status = ($type == 'approval') ? 1 : 0;
$sql = 'SELECT c.subject, c.nid, c.cid, c.comment, c.timestamp, c.status, c.name, c.homepage, u.name AS registered_name, u.uid FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE c.status = '. check_query($status); $sql = 'SELECT c.subject, c.nid, c.cid, c.comment, c.timestamp, c.status, c.name, c.homepage, u.name AS registered_name, u.uid FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE c.status = '. check_query($status);
$sql .= tablesort_sql($header); $sql .= tablesort_sql($header);
$result = pager_query($sql, 50); $result = pager_query($sql, 50);
......
modules/comment/comment.module
+ 27
− 13
View file @ bbb41d0f
...@@ -97,6 +97,8 @@ function comment_menu() { ...@@ -97,6 +97,8 @@ function comment_menu() {
'callback' => 'comment_delete', 'access' => $access, 'type' => MENU_CALLBACK); 'callback' => 'comment_delete', 'access' => $access, 'type' => MENU_CALLBACK);
// Tabs: // Tabs:
$items[] = array('path' => 'admin/comment/list', 'title' => t('list'),
'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
$items[] = array('path' => 'admin/comment/configure', 'title' => t('configure'), $items[] = array('path' => 'admin/comment/configure', 'title' => t('configure'),
'callback' => 'comment_configure', 'access' => $access, 'type' => MENU_LOCAL_TASK); 'callback' => 'comment_configure', 'access' => $access, 'type' => MENU_LOCAL_TASK);
if (module_exist('search')) { if (module_exist('search')) {
...@@ -105,24 +107,25 @@ function comment_menu() { ...@@ -105,24 +107,25 @@ function comment_menu() {
} }
// Subtabs: // Subtabs:
$items[] = array('path' => 'admin/comment/new', 'title' => t('new comments'), $items[] = array('path' => 'admin/comment/list/new', 'title' => t('new comments'),
'callback' => 'comment_admin_overview', 'access' => $access, 'type' => MENU_LOCAL_SUBTASK); 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
$items[] = array('path' => 'admin/comment/approval', 'title' => t('approval queue'), $items[] = array('path' => 'admin/comment/list/approval', 'title' => t('approval queue'),
'callback' => 'comment_admin_overview', 'access' => $access, 'type' => MENU_LOCAL_SUBTASK); 'callback' => 'comment_admin_overview', 'access' => $access,
'callback arguments' => 'approval',
'type' => MENU_LOCAL_TASK);
$items[] = array('path' => 'admin/comment/configure/settings', 'title' => t('settings'), $items[] = array('path' => 'admin/comment/configure/settings', 'title' => t('settings'),
'callback' => 'comment_configure', 'access' => $access, 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10);
'type' => MENU_LOCAL_SUBTASK, 'weight' => -1);
$access = user_access('administer comments') && user_access('administer moderation'); $access = user_access('administer comments') && user_access('administer moderation');
$items[] = array('path' => 'admin/comment/configure/matrix', 'title' => t('moderation matrix'), $items[] = array('path' => 'admin/comment/configure/matrix', 'title' => t('moderation matrix'),
'callback' => 'comment_matrix_settings', 'access' => $access, 'type' => MENU_LOCAL_SUBTASK); 'callback' => 'comment_matrix_settings', 'access' => $access, 'type' => MENU_LOCAL_TASK);
$items[] = array('path' => 'admin/comment/configure/thresholds', 'title' => t('moderation thresholds'), $items[] = array('path' => 'admin/comment/configure/thresholds', 'title' => t('moderation thresholds'),
'callback' => 'comment_threshold_settings', 'access' => $access, 'type' => MENU_LOCAL_SUBTASK); 'callback' => 'comment_threshold_settings', 'access' => $access, 'type' => MENU_LOCAL_TASK);
$items[] = array('path' => 'admin/comment/configure/roles', 'title' => t('moderation roles'), $items[] = array('path' => 'admin/comment/configure/roles', 'title' => t('moderation roles'),
'callback' => 'comment_role_settings', 'access' => $access, 'type' => MENU_LOCAL_SUBTASK); 'callback' => 'comment_role_settings', 'access' => $access, 'type' => MENU_LOCAL_TASK);
$items[] = array('path' => 'admin/comment/configure/votes', 'title' => t('moderation votes'), $items[] = array('path' => 'admin/comment/configure/votes', 'title' => t('moderation votes'),
'callback' => 'comment_vote_settings', 'access' => $access,'type' => MENU_LOCAL_SUBTASK); 'callback' => 'comment_vote_settings', 'access' => $access,'type' => MENU_LOCAL_TASK);
$access = user_access('post comments'); $access = user_access('post comments');
$items[] = array('path' => 'comment/reply', 'title' => t('reply to comment'), $items[] = array('path' => 'comment/reply', 'title' => t('reply to comment'),
...@@ -283,6 +286,8 @@ function comment_node_link($node) { ...@@ -283,6 +286,8 @@ function comment_node_link($node) {
* This search function uses search.module's built-in content index by * This search function uses search.module's built-in content index by
* calling do_search(). The "nid" identifier in the select is used to * calling do_search(). The "nid" identifier in the select is used to
* present search results in the context of their associated node. * present search results in the context of their associated node.
*
* This function doubles as a menu callback for the administrative comment search.
*/ */
function comment_search($keys = NULL) { function comment_search($keys = NULL) {
if (!$keys) { if (!$keys) {
...@@ -929,6 +934,9 @@ function comment_render($node, $cid = 0) { ...@@ -929,6 +934,9 @@ function comment_render($node, $cid = 0) {
return $output; return $output;
} }
/**
* Menu callback; edit a comment from the administrative interface.
*/
function comment_admin_edit($cid) { function comment_admin_edit($cid) {
// comment edits need to be saved. // comment edits need to be saved.
...@@ -957,13 +965,16 @@ function comment_admin_edit($cid) { ...@@ -957,13 +965,16 @@ function comment_admin_edit($cid) {
} }
} }
/**
* Menu callback; delete a comment.
*/
function comment_delete($cid) { function comment_delete($cid) {
$comment = db_fetch_object(db_query('SELECT c.*, u.name AS registered_name, u.uid FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE c.cid = %d', $cid)); $comment = db_fetch_object(db_query('SELECT c.*, u.name AS registered_name, u.uid FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE c.cid = %d', $cid));
$comment->name = $comment->registered_name ? $comment->registered_name : $comment->name; $comment->name = $comment->registered_name ? $comment->registered_name : $comment->name;
$output = ''; $output = '';
// we'll only delete if the user has confirmed the // We'll only delete if the user has confirmed the
// deletion using the form in our else clause below. // deletion using the form in our else clause below.
if ($comment->cid && $_POST['op'] == t('Delete comment')) { if ($comment->cid && $_POST['op'] == t('Delete comment')) {
drupal_set_message(t('the comment and all its replies have been deleted.')); drupal_set_message(t('the comment and all its replies have been deleted.'));
...@@ -995,7 +1006,10 @@ function comment_save($id, $edit) { ...@@ -995,7 +1006,10 @@ function comment_save($id, $edit) {
drupal_set_message(t('the comment has been saved.')); drupal_set_message(t('the comment has been saved.'));
} }
function comment_admin_overview() { /**
* Menu callback; present an administrative comment listing.
*/
function comment_admin_overview($type = 'new') {
$header = array( $header = array(
array('data' => t('subject'), 'field' => 'subject'), array('data' => t('subject'), 'field' => 'subject'),
...@@ -1005,7 +1019,7 @@ function comment_admin_overview() { ...@@ -1005,7 +1019,7 @@ function comment_admin_overview() {
array('data' => t('operations'), 'colspan' => 2) array('data' => t('operations'), 'colspan' => 2)
); );
$status = (arg(2) == 'approval') ? 1 : 0; $status = ($type == 'approval') ? 1 : 0;
$sql = 'SELECT c.subject, c.nid, c.cid, c.comment, c.timestamp, c.status, c.name, c.homepage, u.name AS registered_name, u.uid FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE c.status = '. check_query($status); $sql = 'SELECT c.subject, c.nid, c.cid, c.comment, c.timestamp, c.status, c.name, c.homepage, u.name AS registered_name, u.uid FROM {comments} c INNER JOIN {users} u ON u.uid = c.uid WHERE c.status = '. check_query($status);
$sql .= tablesort_sql($header); $sql .= tablesort_sql($header);
$result = pager_query($sql, 50); $result = pager_query($sql, 50);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment