Only in commentapproval: commentapproval.info
diff -urp commentapproval.1/commentapproval.module commentapproval/commentapproval.module
--- commentapproval.1/commentapproval.module 2006-11-29 08:28:20.000000000 -0500
+++ commentapproval/commentapproval.module 2007-08-03 08:21:13.000000000 -0400
@@ -33,32 +33,33 @@ function commentapproval_menu($may_cache
if ($may_cache) {
$access = user_access('approve comments');
$items[] = array(
- 'path' => 'admin/approval',
- 'title' => t('approval'),
+ 'path' => 'admin/content/approval',
+ 'title' => t('Approval'),
+ 'description' => t('Approve, disapprove, and delete content'),
'access' => $access,
- 'callback' => 'commentapproval_admin_overview',
+ 'callback' => 'commentapproval_admin_overview',
);
$items[] = array(
- 'path' => 'admin/approval/comment',
- 'title' => t('comments'),
+ 'path' => 'admin/content/approval/comment',
+ 'title' => t('Comments'),
'type' => MENU_DEFAULT_LOCAL_TASK,
);
- $items[] = array(
- 'path' => 'admin/approval/comment/approval',
- 'title' => t('not yet moderated'),
- 'type' => MENU_DEFAULT_LOCAL_TASK,
- 'weight' => -1,
- );
- $items[] = array(
- 'path' => 'admin/approval/comment/approve',
- 'title' => t('approved'),
- 'type' => MENU_LOCAL_TASK,
- );
- $items[] = array(
- 'path' => 'admin/approval/comment/disapprove',
- 'title' => t('disapproved'),
- 'type' => MENU_LOCAL_TASK,
- );
+ $items[] = array(
+ 'path' => 'admin/content/approval/comment/approval',
+ 'title' => t('Not yet moderated'),
+ 'type' => MENU_DEFAULT_LOCAL_TASK,
+ 'weight' => -1,
+ );
+ $items[] = array(
+ 'path' => 'admin/content/approval/comment/approve',
+ 'title' => t('Approved'),
+ 'type' => MENU_LOCAL_TASK,
+ );
+ $items[] = array(
+ 'path' => 'admin/content/approval/comment/disapprove',
+ 'title' => t('Disapproved'),
+ 'type' => MENU_LOCAL_TASK,
+ );
}
return $items;
}
@@ -116,39 +117,70 @@ function commentapproval_do_disapprove($
* Menu callback; present an administrative comment listing.
*/
function commentapproval_admin_overview($arg1 = NULL, $type = NULL) {
- $edit = $_POST['edit'];
+ $edit = $_POST;
if ($edit['operation'] == 'delete') {
- return comment_multiple_delete_confirm();
+ return drupal_get_form('comment_multiple_delete_confirm');
}
+ return drupal_get_form('commentapproval_admin_overview_form', $arg1, $type);
+}
+
+function commentapproval_admin_overview_form($arg1 = NULL, $type = NULL){
+
+
// build an 'Update options' form
$form['options'] = array(
'#type' => 'fieldset', '#title' => t('Update options'),
'#prefix' => '', '#suffix' => '
'
);
- $options = array();
+
// bind identifier, text and callbacks.
$operations = commentapproval_operations();
// unset the operation for the current screen since the comment already has that state
unset($operations[$type]);
-
+ $options = array();
foreach ($operations as $key => $value) {
$options[$key] = $value['text'];
}
- $form['options']['operation'] = array('#type' => 'select', '#options' => $options, '#default_value' => 'approve');
- $form['options']['submit'] = array('#type' => 'submit', '#value' => t('Update'));
+ $form['options']['operation'] = array(
+ '#type' => 'select',
+ '#options' => $options,
+ '#default_value' => 'approve'
+ );
+ $form['options']['submit'] = array(
+ '#type' => 'submit',
+ '#value' => t('Update')
+ );
// load the comments that we want to display
- $form['header'] = array('#type' => 'value', '#value' => array(
- NULL,
- array('data' => t('Subject'), 'field' => 'subject'),
- array('data' => t('Author'), 'field' => 'name'),
- array('data' => t('Time'), 'field' => 'timestamp', 'sort' => 'desc'),
- 'operations' => array('data' => t('Operations')),
- array('data' => t('Published'), 'field' => 'status'),
- ));
+ $form['header'] = array(
+ '#type' => 'value',
+ '#value' => array(
+ NULL ,
+ array(
+ 'data' => t('Subject'),
+ 'field' => 'subject'
+ ),
+ array(
+ 'data' => t('Author'),
+ 'field' => 'name'
+ ),
+ array(
+ 'data' => t('Time'),
+ 'field' => 'timestamp',
+ 'sort' => 'desc'
+ ),
+ 'operations' => array(
+ 'data' => t('Operations')
+ ),
+ array(
+ 'data' => t('Published'),
+ 'field' => 'status'
+ ),
+ )
+ );
if (!user_access('administer comments')) {
// unset the column that contains the 'edit' link if the user isn't able to administer comments
unset($form['header']['#value']['operations']);
@@ -189,11 +221,13 @@ function commentapproval_admin_overview(
$form['operations'][$comment->cid] = array('#value' => l(t('edit'), 'comment/edit/'. $comment->cid, array(), $destination));
}
}
+
$form['comments'] = array('#type' => 'checkboxes', '#options' => $comments);
$form['pager'] = array('#value' => theme('pager', NULL, 50, 0));
- return drupal_get_form('commentapproval_admin_overview', $form);
+ $form['#validate']['commentapproval_admin_overview_validate'] = array();
+ $form['#submit']['commentapproval_admin_overview_submit'] = array();
+ return $form;
}
-
/**
* We can't execute any 'Update options' if no comments were selected.
*/
@@ -209,6 +243,7 @@ function commentapproval_admin_overview_
* publishing, unpublishing or deleting.
*/
function commentapproval_admin_overview_submit($form_id, $edit) {
+
$operations = commentapproval_operations();
if ($operations[$edit['operation']]['callback']) {
// extract the appropriate database query operation
@@ -231,29 +266,30 @@ function commentapproval_admin_overview_
cache_clear_all();
drupal_set_message(t('The update ('. check_plain($edit['operation']). ') has been performed.'));
}
+
}
-function theme_commentapproval_admin_overview($form) {
+function theme_commentapproval_admin_overview_form($form) {
drupal_set_html_head(theme('stylesheet_import', base_path() . drupal_get_path('module', 'commentapproval') .'/commentapproval.css'));
- $output = form_render($form['options']);
+ $output = drupal_render($form['options']);
if (isset($form['subject']) && is_array($form['subject'])) {
foreach (element_children($form['subject']) as $key) {
$row = array();
- $row[] = form_render($form['comments'][$key]);
- $comment = form_render($form['comment'][$key]);
+ $row[] = drupal_render($form['comments'][$key]);
+ $comment = drupal_render($form['comment'][$key]);
if (strlen($comment) > 512) {
$class = ' class="comment-in-table"';
}
else {
$class = '';
}
- $row[] = form_render($form['subject'][$key]) . ''. $comment. '';
- $row[] = form_render($form['username'][$key]);
- $row[] = form_render($form['timestamp'][$key]);
+ $row[] = drupal_render($form['subject'][$key]) . ''. $comment. '';
+ $row[] = drupal_render($form['username'][$key]);
+ $row[] = drupal_render($form['timestamp'][$key]);
if (user_access('administer comments')) {
- $row[] = form_render($form['operations'][$key]);
+ $row[] = drupal_render($form['operations'][$key]);
}
- $row[] = form_render($form['status'][$key]);
+ $row[] = drupal_render($form['status'][$key]);
$rows[] = $row;
}
}
@@ -263,10 +299,10 @@ function theme_commentapproval_admin_ove
$output .= theme('table', $form['header']['#value'], $rows);
if ($form['pager']['#value']) {
- $output .= form_render($form['pager']);
+ $output .= drupal_render($form['pager']);
}
- $output .= form_render($form);
-
+ $output .= drupal_render($form);
+
return $output;
}
\ No newline at end of file