Index: misc/drupal.css =================================================================== RCS file: /cvs/drupal/drupal/misc/drupal.css,v retrieving revision 1.89 diff -u -r1.89 drupal.css --- misc/drupal.css 9 Jan 2005 10:00:22 -0000 1.89 +++ misc/drupal.css 15 Jan 2005 05:30:34 -0000 @@ -330,6 +330,34 @@ #forum td.posts, #forum td.topics, #forum td.replies, #forum td.pager { text-align: center; } +#node-admin-filter { + list-style-type: none; + padding: 0px; + margin: 0px; +} +.node-admin-filter { + float: left; + margin-left: 0.5em; +} +dl.multiselect dd, dl.multiselect .form-item, dl.multiselect select { + font-family: inherit; + font-size: inherit; + width: 13em; +} +dl.multiselect dt, dl.multiselect dd { + float: left; + line-height: 1.75em; + padding: 0px; + margin: 0px 1em 0px 0px; +} +dl.multiselect .form-item { + height: 1.75em; + margin: 0px; +} +#node-admin-update { + margin-top: 1.5em; + clear: left; +} #permissions td.module { font-weight: bold; } cvs server: Diffing modules Index: modules/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node.module,v retrieving revision 1.439 diff -u -r1.439 node.module --- modules/node.module 11 Jan 2005 09:41:49 -0000 1.439 +++ modules/node.module 15 Jan 2005 05:09:03 -0000 @@ -655,6 +655,8 @@ $items[] = array('path' => 'admin/node', 'title' => t('content'), 'callback' => 'node_admin', 'access' => user_access('administer nodes')); + $items[] = array('path' => 'admin/node/action', 'title' => t('content'), + 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/node/overview', 'title' => t('list'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); $items[] = array('path' => 'admin/node/configure', 'title' => t('configure'), @@ -718,81 +720,195 @@ * Generate the content administration overview. */ function node_admin_nodes() { - $filters = array( - array(t('View posts that are new or updated'), 'ORDER BY n.changed DESC'), - array(t('View posts that need approval'), 'WHERE n.status = 0 OR n.moderate = 1 ORDER BY n.changed DESC'), - array(t('View posts that are promoted'), 'WHERE n.status = 1 AND n.promote = 1 ORDER BY n.changed DESC'), - array(t('View posts that are not promoted'), 'WHERE n.status = 1 AND n.promote = 0 ORDER BY n.changed DESC'), - array(t('View posts that are sticky'), 'WHERE n.status = 1 AND n.sticky = 1 ORDER BY n.changed DESC'), - array(t('View posts that are unpublished'), 'WHERE n.status = 0 AND n.moderate = 0 ORDER BY n.changed DESC') - ); - + /* + ** Operations + */ $operations = array( - array(t('Approve the selected posts'), 'UPDATE {node} SET status = 1, moderate = 0 WHERE nid = %d'), - 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') + 'approve' => array(t('Approve the selected posts'), 'UPDATE {node} SET status = 1, moderate = 0 WHERE nid = %d'), + 'promote' => array(t('Promote the selected posts'), 'UPDATE {node} SET status = 1, promote = 1 WHERE nid = %d'), + 'sticky' => array(t('Make the selected posts sticky'), 'UPDATE {node} SET status = 1, sticky = 1 WHERE nid = %d'), + 'demote' => array(t('Demote the selected posts'), 'UPDATE {node} SET promote = 0 WHERE nid = %d'), + 'unpublish' => array(t('Unpublish the selected posts'), 'UPDATE {node} SET status = 0 WHERE nid = %d'), + 'delete' => array(t('Delete the selected posts'), '') ); - // Handle operations: - if (empty($_SESSION['node_overview_filter'])) { - $_SESSION['node_overview_filter'] = 0; - } - + // Handle operations $op = $_POST['op']; - - if ($op == t('Filter') && isset($_POST['edit']['filter'])) { - $_SESSION['node_overview_filter'] = $_POST['edit']['filter']; - } - - if ($op == t('Update') && isset($_POST['edit']['operation']) && isset($_POST['edit']['status'])) { - $operation = $operations[$_POST['edit']['operation']][1]; - foreach ($_POST['edit']['status'] as $nid => $value) { - if ($value) { - db_query($operation, $nid); + $edit = $_POST['edit']; + if (($op == t('Update') || $op == t('Delete')) && isset($edit['operation']) && isset($edit['nodes'])) { + $edit['nodes'] = array_diff($edit['nodes'], array(0)); + if (count($edit['nodes']) == 0) { + form_set_error('', t('Please select some items to perform the update on.')); + } + else { + if ($operations[$edit['operation']][1]) { + // Flag changes + $operation = $operations[$edit['operation']][1]; + foreach ($edit['nodes'] as $nid => $value) { + if ($value) { + db_query($operation, $nid); + } + } + drupal_set_message(t('The update has been performed.')); + } + else if ($edit['operation'] == 'delete') { + // Mass delete + if ($edit['confirm']) { + foreach ($edit['nodes'] as $nid => $value) { + node_delete(array('nid' => $nid, 'confirm' => 1)); + } + drupal_set_message(t('The items have been deleted.')); + } + else { + $list = ''; + + $output = '

'. t('Are you sure you want to delete these items?') .'

'. $list; + $output .= form_hidden('operation', 'delete'); + $output .= form_hidden('confirm', 1); + $output .= form_submit(t('Delete')); + $output = form($output); + return $output; + } } } - - drupal_set_message(t('The update has been performed.')); } - $filter = $_SESSION['node_overview_filter']; + /* + ** Filters + */ + $node_types = drupal_map_assoc(node_list()); + foreach ($node_types as $k => $v) { + $node_types[$k] = node_invoke($v, 'node_name'); + } + // Merge all vocabularies into one for retrieving $value below + $taxonomy = taxonomy_form_all(); + $terms = array(); + foreach ($taxonomy as $key => $value) { + $terms = $terms + $value; + } + // Regular filters + $filters = array( + 'status' => array('title' => t('status'), + 'options' => array('status-1' => t('published'), 'status-0' => t('not published'), + 'moderate-1' => t('in moderation'), 'moderate-0' => t('not in moderation'), + 'promote-1' => t('promoted'), 'promote-0' => t('not promoted'), + 'sticky-1' => t('sticky'), 'sticky-0' => t('not sticky'))), + 'type' => array('title' => t('type'), 'where' => "n.type = '%s'", + 'options' => $node_types), + 'category' => array('title' => t('category'), 'where' => 'tn.tid = %d', + 'options' => $terms, 'join' => 'INNER JOIN {term_node} tn ON n.nid = tn.nid')); + + // Initialize/reset filters + if (empty($_SESSION['node_overview_filter']) || $op == t('Reset')) { + $_SESSION['node_overview_filter'] = array(); + } + $session = &$_SESSION['node_overview_filter']; + $filter = $edit['filter']; + if (($op == t('Filter') || $op == t('Refine')) && isset($filter)) { + if (isset($filters[$filter]['options'][$edit[$filter]])) { + $session[] = array($filter, $edit[$filter]); + } + } + if ($op == t('Undo')) { + array_pop($session); + } + if ($op != '') { + drupal_goto('admin/node'); + } - // Render filter form: + /* + ** Form + */ + // Existing filters + $output = ''; - $form = form_select(NULL, 'filter', $filter, $options); - $form .= form_submit(t('Filter')); - - $output .= '

'. t('Filter options') .'

'; - $output .= "
$form
"; - - // Render operations form: - $result = pager_query('SELECT n.*, u.name, u.uid FROM {node} n INNER JOIN {users} u ON n.uid = u.uid '. $filters[$filter][1], 50); + // Build query + $where = $args = array(); + $join = ''; + foreach ($session as $filter) { + list($key, $value) = $filter; + if ($key == 'status') { + // Note: no exploit hole as $value has already been checked + list($key, $value) = explode('-', $value, 2); + $where[] = 'n.'. $key .' = %d'; + } + else { + $where[] = $filters[$key]['where']; + } + $args[] = $value; + $join .= $filters[$key]['join']; + } + $where = count($where) ? 'WHERE '. implode(' AND ', $where) : ''; + $result = pager_query('SELECT n.*, u.name, u.uid FROM {node} n '. $join .' INNER JOIN {users} u ON n.uid = u.uid '. $where, 50, 0, NULL, $args); // Make sure the update controls are disabled if we don't have any rows to select from. $disabled = !db_num_rows($result); + // Operations form $options = array(); foreach ($operations as $key => $value) { - $options[] = $value[0]; + $options[$key] = $value[0]; } - - $form = form_select(NULL, 'operation', 0, $options, NULL, ($disabled ? 'disabled="disabled"' : '')); + $form = form_select(NULL, 'operation', 'approve', $options, NULL, ($disabled ? 'disabled="disabled"' : '')); $form .= form_submit(t('Update'), 'op', ($disabled ? array('disabled' => 'disabled') : array())); - $output .= '

'. t('Update options') .'

'; + $output .= '

'. t('Update options') .'

'; $output .= "
$form
"; // Overview table: $header = array(NULL, t('Title'), t('Type'), t('Author'), t('Status'), array('data' => t('Operations'), 'colspan' => '2')); while ($node = db_fetch_object($result)) { - $rows[] = array(form_checkbox(NULL, 'status]['. $node->nid, 1, 0), l($node->title, 'node/'. $node->nid) .' '. (node_is_new($node->nid, $node->changed) ? theme_mark() : ''), node_invoke($node, 'node_name'), format_name($node), ($node->status ? t('published') : t('not published')), l(t('edit'), 'node/'. $node->nid .'/edit'), l(t('delete'), 'admin/node/delete/'. $node->nid)); + $rows[] = array(form_checkbox(NULL, 'nodes]['. $node->nid, 1, 0), + l($node->title, 'node/'. $node->nid) .' '. (node_is_new($node->nid, $node->changed) ? theme_mark() : ''), + node_invoke($node, 'node_name'), + format_name($node), + ($node->status ? t('published') : t('not published')), + l(t('edit'), 'node/'. $node->nid .'/edit'), + l(t('delete'), 'admin/node/delete/'. $node->nid)); } if ($pager = theme('pager', NULL, 50, 0)) { @@ -803,9 +919,8 @@ $rows[] = array(array('data' => t('No posts available.'), 'colspan' => '7')); } - $output .= '

'. $filters[$filter][0] .'

'; $output .= theme('table', $header, $rows); - return form($output); + return form($output, 'post', url('admin/node/action')); } /** @@ -975,12 +1090,6 @@ case 'search': case t('Search'): $output = search_form(url('admin/node/search'), $_POST['edit']['keys'], 'node') . search_data($_POST['edit']['keys'], 'node'); - break; - case 'delete': - $output = node_delete(array('nid' => arg(3))); - break; - case t('Delete'): - $output = node_delete($edit); break; default: $output = node_admin_nodes(); Index: modules/taxonomy.module =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy.module,v retrieving revision 1.163 diff -u -r1.163 taxonomy.module --- modules/taxonomy.module 28 Dec 2004 22:42:47 -0000 1.163 +++ modules/taxonomy.module 11 Jan 2005 12:31:59 -0000 @@ -389,6 +389,25 @@ } /** +* Generate a set of options for selecting a term from all vocabularies. Can be +* passed to form_select. +*/ +function taxonomy_form_all($value = 0, $help = NULL, $name = 'taxonomy') { + $vocabularies = taxonomy_get_vocabularies(); + $options = array(); + foreach ($vocabularies as $vid => $vocabulary) { + $tree = taxonomy_get_tree($vid); + $options[$vocabulary->name] = array(); + if ($tree) { + foreach ($tree as $term) { + $options[$vocabulary->name][$term->tid] = _taxonomy_depth($term->depth, '-') . $term->name; + } + } + } + return $options; +} + +/** * Return an array of all vocabulary objects. * * @param $type