'. ''. form_render($form['title'][$nid]) .''. form_render($form['nodes'][$nid]) .'
'. form_render($form['extras'][$nid]));
+ $rows[] = array('');
+ }
+ $output .= theme('table', $header, $rows);
+ $output .= form_render($form);
+ return $output;
+}
+
+/**
+ * Submits the form data for deletion.
+ *
+ * @param $form_id
+ * The unique form identifier.
+ * @param $form_values
+ * The constructed form array.
+ */
+function node_multiple_delete_confirm_submit($form_id, $form_values) {
+
+ // Only checked values will be deleted
+ foreach ($form_values['nodes'] as $nid => $value) {
+
+ // Merge extra confirm data with node
+ $node = node_load($nid);
+ $node = (array) $node;
+ $node = array_merge($node, $form_values['extras'][$nid]);
+ $node = (object) $node;
+
+ node_delete($node);
+ }
+ drupal_set_message(t('The items have been deleted.'));
return 'admin/node';
}
@@ -1344,13 +1423,28 @@ function node_revision_delete($nid, $rev
// Don't delete the current revision
if ($revision != $node->vid) {
$node = node_load($nid, $revision);
+ $did = next_delete_id();
- db_query("DELETE FROM {node_revisions} WHERE nid = %d AND vid = %d", $nid, $revision);
+ $message = t('Revision %title %revision moved to the %trash.', array('%title' => theme('placeholder', $node->title), '%revision' => theme('placeholder', $revision), '%trash' => l(t('trash'), 'admin/trash')));
+
+ // Get node output (filtered and with module-specific fields).
+ if (node_hook($node, 'view')) {
+ node_invoke($node, 'view', false, false);
+ }
+ else {
+ $node = node_prepare($node, false);
+ }
+
+ // Assemble trashbin preview
+ $preview = array('body' => $node->body);
+
+ $trash_data = array('did' => $did, 'rid' => $nid, 'name' => 'node revision', 'url' => "node/$nid/revisions/$revision/view", 'description' => $node->type, 'title' => $node->title, 'preview' => $preview, 'message' => $message);
+ system_trash($trash_data, "DELETE FROM {node_revisions} WHERE nid = %d AND vid = %d", $nid, $revision);
+
+ $node->did = $did;
node_invoke_nodeapi($node, 'delete revision');
- drupal_set_message(t('Deleted %title revision %revision.', array('%title' => theme('placeholder', $node->title), '%revision' => theme('placeholder', $revision))));
watchdog('content', t('%type: deleted %title revision %revision.', array('%type' => theme('placeholder', t($node->type)), '%title' => theme('placeholder', $node->title), '%revision' => theme('placeholder', $revision))));
}
-
else {
drupal_set_message(t('Deletion failed. You tried to delete the current revision.'));
}
@@ -1870,30 +1964,65 @@ function node_form_submit($form_id, $edi
}
/**
- * Menu callback -- ask for confirmation of node deletion
+ * Menu callback -- deletes the node if no extra data is present
+ *
+ * @return
+ * If extra data is present, returns a confirmation form
*/
function node_delete_confirm() {
+
$edit = $_POST['edit'];
- $edit['nid'] = $edit['nid'] ? $edit['nid'] : arg(1);
- $node = node_load($edit['nid']);
+ $nid = $edit['nid'] ? $edit['nid'] : arg(1);
+ $node = node_load($nid);
if (node_access('delete', $node)) {
$form['nid'] = array('#type' => 'value', '#value' => $node->nid);
- $output = confirm_form('node_delete_confirm', $form,
- t('Are you sure you want to delete %title?', array('%title' => theme('placeholder', $node->title))),
- $_GET['destination'] ? $_GET['destination'] : 'node/'. $node->nid, t('This action cannot be undone.'),
- t('Delete'), t('Cancel') );
- }
- return $output;
+ // Check for extra info from modules
+ $extras = node_invoke_nodeapi($node, 'delete pre');
+ $form['extras'] = $extras;
+
+ // No extras, just delete the node
+ if (!count($extras)) {
+ node_delete($node);
+ drupal_goto('node');
+ }
+ else {
+
+ // Cancel deletion if necessary, otherwise display confirm form
+ if (in_array(FALSE, $extras)) {
+ drupal_set_message(t('Deletion cancelled'), 'error');
+ drupal_goto('node/'. $node->nid .'/edit');
+ }
+ else {
+ return confirm_form('node_delete_confirm', $form,
+ t('Are you sure you want to delete %title?', array('%title' => theme('placeholder', $node->title))),
+ $_GET['destination'] ? $_GET['destination'] : 'node/'. $node->nid, t('This action will move the
+ item to the trash'), t('Delete'), t('Cancel'));
+ }
+ }
+ }
}
/**
- * Execute node deletion
+ * Submits the form data for deletion.
+ *
+ * @param $form_id
+ * The unique form identifier.
+ * @param $form_values
+ * The constructed form array.
*/
function node_delete_confirm_submit($form_id, $form_values) {
+
if ($form_values['confirm']) {
- node_delete($form_values['nid']);
+
+ // Merge extra confirm data with node
+ $node = node_load($form_values['nid']);
+ $node = (array) $node;
+ $node = array_merge($node, $form_values);
+ $node = (object) $node;
+
+ node_delete($node);
}
return '';
@@ -1901,29 +2030,68 @@ function node_delete_confirm_submit($for
/**
* Delete a node.
+ *
+ * @param $node
+ * The node to delete. Can pass a node object, node array, or nid.
*/
-function node_delete($nid) {
+function node_delete($node) {
- $node = node_load($nid);
+ // Load the node if nid or array is passed
+ if (is_numeric($node)) {
+ $node = node_load($node);
+ }
+ elseif (is_array($node)) {
+ $node = node_load($node['nid']);
+ }
- if (node_access('delete', $node)) {
- db_query('DELETE FROM {node} WHERE nid = %d', $node->nid);
- db_query('DELETE FROM {node_revisions} WHERE nid = %d', $node->nid);
+ // If the deletion package is just starting, add appropriate data to $node and $trash_data array
+ if (!$node->did) {
+ $node->did = next_delete_id();
+ $trash_data['rid'] = $node->nid;
+ $trash_data['name'] = 'node';
+ $trash_data['url'] = "node/$node->nid";
+ $trash_data['message'] = t('%title moved to the %trash.', array('%title' => theme('placeholder', $node->title), '%trash' => l(t('trash'), 'admin/trash')));
+ }
- // Call the node-specific callback (if any):
- node_invoke($node, 'delete');
- node_invoke_nodeapi($node, 'delete');
-
- // Clear the cache so an anonymous poster can see the node being deleted.
- cache_clear_all();
-
- // Remove this node from the search index if needed.
- if (function_exists('search_wipe')) {
- search_wipe($node->nid, 'node');
- }
- drupal_set_message(t('%title has been deleted.', array('%title' => theme('placeholder', $node->title))));
- watchdog('content', t('%type: deleted %title.', array('%type' => theme('placeholder', t($node->type)), '%title' => theme('placeholder', $node->title))));
+ $trash_data['did'] = $node->did;
+ $trash_data['title'] = $node->title;
+ $trash_data['description'] = $node->type;
+
+ // Get node output (filtered and with module-specific fields).
+ if (node_hook($node, 'view')) {
+ node_invoke($node, 'view', false, false);
+ }
+ else {
+ $node = node_prepare($node, false);
+ }
+ // Allow modules to change $node->body.
+ node_invoke_nodeapi($node, 'view', false, false);
+
+ // Add comments if present
+ $comments = '';
+ if (function_exists('comment_render') && $node->comment) {
+ $comments = comment_render($node);
+ }
+
+ // Assemble trashbin preview
+ $preview['body'] = $node->body . $comments;
+ $trash_data['preview'] = $preview;
+
+ system_trash($trash_data, 'DELETE FROM {node} WHERE nid = %d', $node->nid);
+ system_trash(array(), 'DELETE FROM {node_revisions} WHERE nid = %d', $node->nid);
+
+ // Call the node-specific callback (if any):
+ node_invoke($node, 'delete');
+ node_invoke_nodeapi($node, 'delete');
+
+ // Clear the cache so an anonymous poster can see the node being deleted.
+ cache_clear_all();
+
+ // Remove this node from the search index if needed.
+ if (function_exists('search_wipe')) {
+ search_wipe($node->nid, 'node');
}
+ watchdog('content', t('%type: deleted %title.', array('%type' => theme('placeholder', t($node->type)), '%title' => theme('placeholder', $node->title))));
}
/**
=== modified file 'modules/path.module'
--- modules/path.module
+++ modules/path.module
@@ -58,7 +58,7 @@ function path_menu($may_cache) {
'access' => user_access('administer url aliases'),
'type' => MENU_CALLBACK);
$items[] = array('path' => 'admin/path/delete', 'title' => t('delete alias'),
- 'callback' => 'path_admin_delete_confirm',
+ 'callback' => 'path_admin_delete',
'access' => user_access('administer url aliases'),
'type' => MENU_CALLBACK);
$items[] = array('path' => 'admin/path/list', 'title' => t('list'),
@@ -96,47 +96,39 @@ function path_admin_edit($pid = 0) {
}
/**
- * Menu callback; confirms deleting an URL alias
+ * Menu callback; handles deletion of an URL alias.
**/
-function path_admin_delete_confirm($pid) {
- $path = path_load($pid);
+function path_admin_delete($pid = 0) {
if (user_access('administer url aliases')) {
- $form['pid'] = array('#type' => 'value', '#value' => $pid);
- $output = confirm_form('path_admin_delete_confirm', $form,
- t('Are you sure you want to delete path alias %title?', array('%title' => theme('placeholder', $path['dst']))),
- $_GET['destination'] ? $_GET['destination'] : 'admin/path', t('This action cannot be undone.'),
- t('Delete'), t('Cancel') );
- }
-
- return $output;
-}
+ $did = next_delete_id();
+ $result = db_fetch_object(db_query('SELECT src, dst FROM {url_alias} WHERE pid = %d', $pid));
-/**
- * Execute URL alias deletion
- **/
-function path_admin_delete_confirm_submit($form_id, $form_values) {
- if ($form_values['confirm']) {
- path_admin_delete($form_values['pid']);
- return 'admin/path';
- }
-}
+ // Build trash preview
+ $preview = array('destination' => $result->dst);
-/**
- * Post-confirmation; delete an URL alias.
- */
-function path_admin_delete($pid = 0) {
- db_query('DELETE FROM {url_alias} WHERE pid = %d', $pid);
- drupal_set_message(t('The alias has been deleted.'));
-}
+ $message = t('The alias has been moved to the %trash.', array('%trash' => l(t('trash'), 'admin/trash')));
+ $trash_data = array('did' => $did, 'rid' => $pid, 'name' => 'url alias', 'url' => "admin/path/edit/$pid", 'title' => $result->src, 'preview' => $preview, 'message' => $message);
+ system_trash($trash_data, 'DELETE FROM {url_alias} WHERE pid = %d', $pid);
+ drupal_goto('admin/path');
+ }
+ else {
+ drupal_access_denied();
+ }
+}
/**
* Set an aliased path for a given Drupal path, preventing duplicates.
*/
-function path_set_alias($path = NULL, $alias = NULL, $pid = NULL) {
+function path_set_alias($path = NULL, $alias = NULL, $pid = NULL, $node = NULL) {
if ($path && !$alias) {
- db_query("DELETE FROM {url_alias} WHERE src = '%s'", $path);
+ if ($node->did) {
+ system_trash(array(), "DELETE FROM {url_alias} WHERE src = '%s'", $path);
+ }
+ else {
+ db_query("DELETE FROM {url_alias} WHERE src = '%s'", $path);
+ }
drupal_clear_path_cache();
}
else if (!$path && $alias) {
@@ -239,7 +231,7 @@ function path_nodeapi(&$node, $op, $arg)
case 'delete':
$path = "node/$node->nid";
if (drupal_get_path_alias($path) != $path) {
- path_set_alias($path);
+ path_set_alias($path, NULL, NULL, $node);
}
break;
}
=== modified file 'modules/poll.module'
--- modules/poll.module
+++ modules/poll.module
@@ -84,10 +84,10 @@ function poll_cron() {
/**
* Implementation of hook_delete().
*/
-function poll_delete($node) {
- db_query("DELETE FROM {poll} WHERE nid = %d", $node->nid);
- db_query("DELETE FROM {poll_choices} WHERE nid = %d", $node->nid);
- db_query("DELETE FROM {poll_votes} WHERE nid = %d", $node->nid);
+function poll_delete(&$node) {
+ system_trash(array(), "DELETE FROM {poll_choices} WHERE nid = %d", $node->nid);
+ system_trash(array(), "DELETE FROM {poll_votes} WHERE nid = %d", $node->nid);
+ system_trash(array(), "DELETE FROM {poll} WHERE nid = %d", $node->nid);
}
/**
=== modified file 'modules/profile.module'
--- modules/profile.module
+++ modules/profile.module
@@ -175,7 +175,7 @@ function profile_user($type, &$edit, &$u
case 'categories':
return profile_categories();
case 'delete':
- db_query('DELETE FROM {profile_values} WHERE uid = %d', $user->uid);
+ system_trash(array(), 'DELETE FROM {profile_values} WHERE uid = %d', $user->uid);
}
}
@@ -353,30 +353,28 @@ function profile_field_form_submit($form
* Menu callback; deletes a field from all user profiles.
*/
function profile_field_delete($fid) {
- $field = db_fetch_object(db_query("SELECT title FROM {profile_fields} WHERE fid = %d", $fid));
+ $did = next_delete_id();
+ $field = db_fetch_object(db_query("SELECT title, explanation, category FROM {profile_fields} WHERE fid = %d", $fid));
+
if (!$field) {
drupal_not_found();
return;
}
- $form['fid'] = array('#type' => 'value', '#value' => $fid);
- $form['title'] = array('#type' => 'value', '#value' => $field->title);
- return confirm_form('profile_field_delete', $form, t('Are you sure you want to delete the field %field?', array('%field' => theme('placeholder', $field->title))), 'admin/settings/profile', t('This action cannot be undone. If users have entered values into this field in their profile, these entries will also be deleted. If you want to keep the user-entered data, instead of deleting the field you may wish to ';
+ $node_preview = '';
+ $form['buttons'] = array('#prefix' => '
', '#suffix' => '
');
+ $form['buttons']['recover'] = array('#type' => 'submit', '#value' => t('Recover'));
+ if ($view_all) {
+ $form['buttons']['delete'] = array('#type' => 'button', '#button_type' => 'submit', '#value' => t('Delete'));
+ }
+ $form['dids']['#tree'] = TRUE;
+ $form['dids'][$did] = array('#type' => 'hidden', '#value' => $did);
+
+ $output .= drupal_get_form('system_trash_preview', $form, 'system_admin_trash');
+
+ // Grab preview data
+ $values = array();
+ $data = $insert->preview ? unserialize($insert->preview) : array();
+
+ drupal_set_title(t('Trash preview: %title (%type)', array('%title' => check_plain($insert->title), '%type' => t($insert->description))));
+ $header = array(array('data' => t('Data'), 'colspan' => '2'));
+ $rows = array();
+
+ // Loop through preview array and construct table rows
+ foreach ($data as $preview_section) {
+ foreach ($preview_section as $key => $value) {
+ if ((($insert->name == 'node') || ($insert->name == 'node revision')) && ($key == 'body')) {
+ $node_preview = $value;
+ }
+ else {
+ $rows[] = array('
'. t($key) . ':
', '
'. filter_xss($value) .'
');
+ }
+ }
+ }
+
+ $package_user = user_load(array('uid' => $insert->uid));
+
+ $output .= '
';
+ $output .= '- '. t('Type:') .' '. t($insert->name) .'
';
+ $output .= '- '. t('Trashed:') .' '. format_date($insert->timestamp, 'small') .'
';
+ $output .= '- '. t('Trashed by:') .' '. theme('username', $package_user) .'
';
+ $output .= '
';
+ $output .= $node_preview;
+ if (count($rows)) {
+ $output .= theme('table', $header, $rows);
+ }
+ $output .= '