Index: node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node.module,v retrieving revision 1.362 diff -u -r1.362 node.module --- node.module 22 Jun 2004 20:24:27 -0000 1.362 +++ node.module 29 Jun 2004 21:27:31 -0000 @@ -729,7 +729,8 @@ array(t('Promote the selected posts'), 'UPDATE {node} SET status = 1, promote = 1 WHERE nid = %d'), array(t('Make the selected posts sticky'), 'UPDATE {node} SET status = 1, sticky = 1 WHERE nid = %d'), array(t('Demote the selected posts'), 'UPDATE {node} SET promote = 0 WHERE nid = %d'), - array(t('Unpublish the selected posts'), 'UPDATE {node} SET status = 0 WHERE nid = %d') + array(t('Unpublish the selected posts'), 'UPDATE {node} SET status = 0 WHERE nid = %d'), + array(t("Delete the selected posts"), "") ); // Handle operations: @@ -743,17 +744,40 @@ $_SESSION['node_overview_filter'] = $_POST['edit']['filter']; } - if ($op == t('Update') && isset($_POST['edit']['operation']) && isset($_POST['edit']['status'])) { + if ($op == t('Update') && isset($_POST['edit']['operation']) && isset($_POST['edit']['status']) && $_POST["edit"]["operation"] != 5 && $_POST["edit"]["operation"] != 6) { $operation = $operations[$_POST['edit']['operation']][1]; foreach ($_POST['edit']['status'] as $nid => $value) { if ($value) { db_query($operation, $nid); } } - drupal_set_message(t('the update has been performed.')); } - + elseif (isset($_POST["edit"]["confirm"]) && $_POST["edit"]["operation"] != 5) { + //delete was confirmed + foreach ($_POST["edit"]["status"] as $nid => $value) { + if ($value) { + $node = node_load(array("nid"=>$nid)); + node_delete(array("nid"=>$nid, "confirm"=>1)); + drupal_set_message(t("%name was deleted.",array('%name'=>$node->title))); + } + } + + } + elseif (($_POST["edit"]["operation"] == 5) && isset($_POST["edit"]["status"])) { + //confirm deletion + array_push($operations, array(t("Confirm deleting the selected posts"), "")); + drupal_set_message(t("please confirm the deletion in the Update options.")); + + foreach ($_POST["edit"]["status"] as $nid => $value) { + if ($value) { + $output .= form_hidden("confirm", 1); + break; + } + } + $selected_op = 6; + } + $filter = $_SESSION['node_overview_filter']; // Render filter form: @@ -778,8 +802,8 @@ foreach ($operations as $key => $value) { $options[] = $value[0]; } - - $form = form_select(NULL, 'operation', 0, $options, NULL, ($disabled ? 'disabled="disabled"' : '')); + + $form = form_select(NULL, 'operation', $selected_op, $options, NULL, ($disabled ? 'disabled="disabled"' : '')); $form .= form_submit(t('Update'), 'op', ($disabled ? array('disabled' => 'disabled') : array())); $output .= '