Only in nodeapproval5/: nodeapproval.info
diff -urp nodeapproval/nodeapproval.module nodeapproval5/nodeapproval.module
--- nodeapproval/nodeapproval.module 2006-11-29 12:26:25.000000000 -0500
+++ nodeapproval5/nodeapproval.module 2007-08-03 08:21:19.000000000 -0400
@@ -31,42 +31,43 @@ function nodeapproval_menu($may_cache) {
if ($may_cache) {
$access = user_access('approve nodes');
- if (!module_exist('commentapproval')) {
+ if (!module_exists('commentapproval')) {
$items[] = array(
- 'path' => 'admin/approval',
+ 'path' => 'admin/content/approval',
'title' => t('approval'),
+ 'description' => t('Approve, disapprove, and delete content'),
'access' => $access,
'callback' => 'nodeapproval_admin_overview',
);
$items[] = array(
- 'path' => 'admin/approval/node',
- 'title' => t('nodes'),
+ 'path' => 'admin/content/approval/node',
+ 'title' => t('Nodes'),
'type' => MENU_DEFAULT_LOCAL_TASK,
);
}
else {
$items[] = array(
- 'path' => 'admin/approval/node',
- 'title' => t('nodes'),
+ 'path' => 'admin/content/approval/node',
+ 'title' => t('Nodes'),
'callback' => 'nodeapproval_admin_overview',
'access' => $access,
'type' => MENU_LOCAL_TASK,
);
}
$items[] = array(
- 'path' => 'admin/approval/node/approval',
- 'title' => t('not yet moderated'),
+ 'path' => 'admin/content/approval/node/approval',
+ 'title' => t('Not yet moderated'),
'type' => MENU_DEFAULT_LOCAL_TASK,
'weight' => -1,
);
$items[] = array(
- 'path' => 'admin/approval/node/approve',
- 'title' => t('approved'),
+ 'path' => 'admin/content/approval/node/approve',
+ 'title' => t('Approved'),
'type' => MENU_LOCAL_TASK,
);
$items[] = array(
- 'path' => 'admin/approval/node/disapprove',
- 'title' => t('disapproved'),
+ 'path' => 'admin/content/approval/node/disapprove',
+ 'title' => t('Disapproved'),
'type' => MENU_LOCAL_TASK,
);
}
@@ -144,14 +145,20 @@ function nodeapproval_do_disapprove($nid
* Menu callback; present an administrative node listing.
*/
function nodeapproval_admin_overview($arg1 = NULL, $arg2 = NULL) {
- // Check and see which parameter to use based on whether commentapproval is enabled or not
- $type = module_exist('commentapproval') ? $arg1 : $arg2;
-
- $edit = $_POST['edit'];
+ $edit = $_POST;
if ($edit['operation'] == 'delete') {
return nodeapproval_multiple_delete_confirm();
}
+
+ return drupal_get_form('nodeapproval_admin_overview_form', $arg1, $arg2);
+}
+
+function nodeapproval_admin_overview_form($arg1 = NULL, $arg2 = NULL){
+ // Check and see which parameter to use based on whether commentapproval is enabled or not
+ $type = module_exists('commentapproval') ? $arg1 : $arg2;
+
+
// build an 'Update options' form
$form['options'] = array(
@@ -185,16 +192,20 @@ function nodeapproval_admin_overview($ar
unset($form['header']['#value']['operations']);
}
- // To looad the nodes that we want to display, we first need a list of
+ // To load the nodes that we want to display, we first need a list of
// node types that have not opted out of the approval workflow
- $node_types = array_filter(node_get_types(), create_function('$a', 'return variable_get("approval_". $a, NODEAPPROVAL_ENABLED_BY_DEFAULT);'));
-
+
+ $types = array_filter(node_get_types(), create_function('$a', 'return variable_get("approval_". $a->type, NODEAPPROVAL_ENABLED_BY_DEFAULT);'));
+ $node_types = array();
+ foreach($types as $key => $value){
+ $node_types[$key] = $value->type;
+ }
if (count($node_types) > 0) {
- $node_types_sql = ' AND n.type IN (\''. implode('\', \'', $node_types). '\')';
+ $node_types_sql = ' AND n.type IN (\''. implode('\', \'', $node_types ). '\')';
}
else {
- drupal_set_message(t('There are no node types which are configured to require approval. You can adjust this setting on individual node types from the %types page.', array('%types' => l(t('content type administration'), 'admin/settings/content-types'))));
- return '';
+ drupal_set_message(t('There are no node types which are configured to require approval. You can adjust this setting on individual node types from the %types page.', array('%types' => l(t('content type administration'), 'admin/settings/content-types'))));
+ return '';
}
// Build the SQL
@@ -233,7 +244,11 @@ function nodeapproval_admin_overview($ar
}
$form['nodes'] = array('#type' => 'checkboxes', '#options' => $nodes);
$form['pager'] = array('#value' => theme('pager', NULL, 30, 0));
- return drupal_get_form('nodeapproval_admin_overview', $form);
+ $form['#validate']['nodeapproval_admin_overview_validate'] = array();
+ $form['#submit']['nodeapproval_admin_overview_submit'] = array();
+
+ return $form;
+
}
@@ -241,8 +256,12 @@ function nodeapproval_admin_overview($ar
* List the selected nodes and verify that the admin really wants to delete
* them.
*/
-function nodeapproval_multiple_delete_confirm() {
- $edit = $_POST['edit'];
+function nodeapproval_multiple_delete_confirm(){
+
+ return drupal_get_form('nodeapproval_multiple_delete_confirm_form');
+}
+function nodeapproval_multiple_delete_confirm_form() {
+ $edit = $_POST;
$form['nodes'] = array('#prefix' => '', '#tree' => TRUE);
// array_filter() returns only elements with actual values
@@ -256,16 +275,17 @@ function nodeapproval_multiple_delete_co
}
}
$form['operation'] = array('#type' => 'hidden', '#value' => 'delete');
-
+ $form['#submit']['nodeapproval_multiple_delete_confirm_submit'] = array();
if (!$node_counter) {
drupal_set_message(t('There does not appear to be any content to delete or your selected content was deleted by another administrator.'));
drupal_goto('admin/approval/node');
}
else {
- return confirm_form('nodeapproval_multiple_delete_confirm', $form,
+ return confirm_form( $form,
t('Are you sure you want to delete this content and all of its comments?'),
'admin/node', t('This action cannot be undone.'),
t('Delete content'), t('Cancel'));
+
}
}
@@ -319,29 +339,30 @@ function nodeapproval_admin_overview_sub
cache_clear_all();
drupal_set_message(t('The update ('. check_plain($edit['operation']). ') has been performed.'));
}
+
}
-function theme_nodeapproval_admin_overview($form) {
+function theme_nodeapproval_admin_overview_form($form) {
drupal_set_html_head(theme('stylesheet_import', base_path() . drupal_get_path('module', 'nodeapproval') .'/nodeapproval.css'));
- $output = form_render($form['options']);
+ $output = drupal_render($form['options']);
if (isset($form['title']) && is_array($form['title'])) {
foreach (element_children($form['title']) as $key) {
$row = array();
- $row[] = form_render($form['nodes'][$key]);
- $teaser = form_render($form['teaser'][$key]);
+ $row[] = drupal_render($form['nodes'][$key]);
+ $teaser = drupal_render($form['teaser'][$key]);
if (strlen($teaser) > 512) {
$class = ' class="node-in-table"';
}
else {
$class = '';
}
- $row[] = form_render($form['title'][$key]) . ''. $teaser. '';
- $row[] = form_render($form['username'][$key]);
- $row[] = form_render($form['timestamp'][$key]);
+ $row[] = drupal_render($form['title'][$key]) . ''. $teaser. '';
+ $row[] = drupal_render($form['username'][$key]);
+ $row[] = drupal_render($form['timestamp'][$key]);
if (user_access('administer nodes')) {
- $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;
}
}
@@ -352,10 +373,10 @@ function theme_nodeapproval_admin_overvi
$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