Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#448878 by brianV: Convert node.admin.inc to DBTNG.

merge-requests/26/head
Angie Byron 2009-07-21 01:36:51 +00:00
parent 60ea0a7cfb
commit 49724906a4
1 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
modules/node/node.admin.inc
View File

@ -104,38 +104,32 @@ function node_filters() {
} }
/** /**
* Build query for node administration filters based on session. * Apply filters for node administration filters based on session.
*
* @param $query
* A SelectQuery to which the filters should be applied.
*/ */
function node_build_filter_query() { function node_build_filter_query(SelectQueryInterface $query) {
// Build query // Build query
$where = $args = array();
$join = '';
$filter_data = isset($_SESSION['node_overview_filter']) ? $_SESSION['node_overview_filter'] : array(); $filter_data = isset($_SESSION['node_overview_filter']) ? $_SESSION['node_overview_filter'] : array();
$counter = 0;
foreach ($filter_data as $index => $filter) { foreach ($filter_data as $index => $filter) {
list($key, $value) = $filter; list($key, $value) = $filter;
switch ($key) { switch ($key) {
case 'term':
$index = 'tn' . $counter++;
$query->join('taxonomy_term_node', $index, "n.nid = $index.nid");
$query->condition($index . '.tid', $value);
break;
case 'status': case 'status':
// Note: no exploitable hole as $key/$value have already been checked when submitted // Note: no exploitable hole as $key/$value have already been checked when submitted
list($key, $value) = explode('-', $value, 2); list($key, $value) = explode('-', $value, 2);
$where[] = 'n.' . $key . ' = %d';
break;
case 'term':
$table = "tn$index";
$where[] = "$table.tid = %d";
$join .= "INNER JOIN {taxonomy_term_node} $table ON n.nid = $table.nid ";
break;
case 'type': case 'type':
$where[] = "n.type = '%s'";
break;
case 'language': case 'language':
$where[] = "n.language = '%s'"; $query->condition('n.' . $key, $value);
break; break;
} }
$args[] = $value;
} }
$where = count($where) ? 'WHERE ' . implode(' AND ', $where) : '';
return array('where' => $where, 'join' => $join, 'args' => $args);
} }
/** /**
@ -419,11 +413,15 @@ function node_admin_nodes() {
'#value' => $header, '#value' => $header,
); );
// Build the query and load the nodes we want to display. $query = db_select('node', 'n')->extend('PagerDefault')->extend('TableSort');
$filter = node_build_filter_query(); $query->join('users', 'u', 'n.uid = u.uid');
node_build_filter_query($query);
$sort = tablesort_sql($header, '', 'n.changed DESC'); $result = $query
$result = pager_query(db_rewrite_sql('SELECT n.*, u.name FROM {node} n ' . $filter['join'] . ' INNER JOIN {users} u ON n.uid = u.uid ' . $filter['where'] . $sort), 50, 0, NULL, $filter['args']); ->fields('n')
->fields('u', array('name'))
->limit(50)
->execute();
// Build the 'Update options' form. // Build the 'Update options' form.
$form['options'] = array( $form['options'] = array(
@ -450,7 +448,7 @@ function node_admin_nodes() {
$languages = language_list(); $languages = language_list();
$destination = drupal_get_destination(); $destination = drupal_get_destination();
$nodes = array(); $nodes = array();
while ($node = db_fetch_object($result)) { foreach ($result as $node) {
$nodes[$node->nid] = ''; $nodes[$node->nid] = '';
$options = empty($node->language) ? array() : array('language' => $languages[$node->language]); $options = empty($node->language) ? array() : array('language' => $languages[$node->language]);
$form['title'][$node->nid] = array('#markup' => l($node->title, 'node/' . $node->nid, $options) . ' ' . theme('mark', node_mark($node->nid, $node->changed))); $form['title'][$node->nid] = array('#markup' => l($node->title, 'node/' . $node->nid, $options) . ' ' . theme('mark', node_mark($node->nid, $node->changed)));