'. t('This module adds an easier way for administrators to filter the - content on a Drupal site for administration purposes.') .'
'; - - $output .= ''. t('It\'s an improvement over the content page in the administration area - of Drupal. It can show on the same page nodes and comments and adds new filters like role - and author.') .'
'; - + $output = ''. t("This module adds an easier way for administrators to filter the content on a Drupal site for administration purposes.") .'
'; + $output .= ''. t("It's an improvement over the content page in the administration area of Drupal. It can show on the same page nodes and comments and adds new filters like role and author.") .'
'; break; } return $output; } - /** * Implementation of hook_perm(). */ function cmf_perm() { - return array('admin cmf module', 'filter and manage site content', 'view user content list'); + return array('filter and manage site content', 'view user content list'); } - /** * Implementation of hook_menu(). */ @@ -62,7 +47,7 @@ 'description' => t('All-in-one advanced filter and management of your site content.'), 'callback' => 'cmf_admin_content_page', 'access' => $manage_access, - ); + ); if (arg(0) == 'user' && is_numeric(arg(1)) && arg(1) > 0) { $items[] = array( @@ -72,26 +57,24 @@ 'callback' => 'cmf_admin_content_page', 'access' => $manage_access || $view_access, 'type' => MENU_LOCAL_TASK, - ); + ); } // } return $items; } - /** * Called when user goes to example.com/admin/content/filter * * @return the HTML generated from the $form data structure - */ + */ function cmf_admin_content_page() { - if (!isset($_SESSION['cmf_content_kind'])) { $_SESSION['cmf_content_kind'] = 'node'; } - + if (arg(0) == 'user' && is_numeric(arg(1)) && arg(1) > 0) { - $true = true; + $true = TRUE; } $output = drupal_get_form('cmf_filter_form', $true); @@ -122,10 +105,9 @@ return $output; } - -/********************** -* FILTERS * -**********************/ +/** + * FILTERS + */ /** * Defines the form for content administration filters. @@ -133,10 +115,10 @@ * @ingroup forms * @see cmf_filter_form_submit() * - * @param (optional) true if the filter to be built serves the user profile page + * @param (optional) TRUE if the filter to be built serves the user profile page. * @return array with forms properties */ -function cmf_filter_form($true = null) { +function cmf_filter_form($true = NULL) { $session = &$_SESSION['cmf_overview_filter']; $session = is_array($session) ? $session : array(); $filters = cmf_filters($true); @@ -146,7 +128,7 @@ '#title' => t('General Settings'), '#collapsible' => TRUE, '#collapsed' => TRUE, - ); + ); $form['general']['max-rows'] = array( '#type' => 'textfield', '#title' => t('Max rows'), @@ -154,7 +136,7 @@ '#default_value' => isset($_SESSION['cmf_max_rows']) ? $_SESSION['cmf_max_rows'] : 50, '#prefix' => '',
'#suffix' => '
',
- );
+ );
$form['general']['kind'] = array(
'#type' => 'select',
'#title' => t('Content'),
@@ -162,46 +144,56 @@
'#default_value' => isset($_SESSION['cmf_content_kind']) ? $_SESSION['cmf_content_kind'] :
'node',
'#prefix' => '',
- );
+ );
$form['general']['buttons']['apply'] = array(
'#type' => 'submit',
'#value' => t('Apply'),
'#suffix' => '
',
- );
-
+ );
$i = 0;
$form['filters'] = array('#type' => 'fieldset',
'#title' => t('Show only items where'),
'#theme' => 'node_filters',
- );
+ );
foreach ($session as $filter) {
list($type, $value) = $filter;
if ($type == 'category') {
// Load term name from DB rather than search and parse options array.
- $value = module_invoke('taxonomy', 'get_term', $value);
+ $value = taxonomy_get_term($value);
$value = $value->name;
}
+ elseif ($type == 'title') {
+ // Just sanitize it and add quotes.
+ $value = "'". $value ."'";
+ }
else {
$value = $filters[$type]['options'][$value];
}
- // avoid not applicable filter verbose
- if ($true && !($type == 'user' || $type == 'blocked' || $type == 'role')) {
- $string = ($i++ ? 'and where %a is %b' :
- '%a is %b');
- $form['filters']['current'][] = array('#value' => t($string,
- array('%a' => $filters[$type]['title'] , '%b' => $value)));
+ // Avoid not applicable filter verbose. Note '%' does check_plain.
+ if ($type == 'title') {
+ if ($i++) {
+ $form['filters']['current'][] = array('#value' => t('and where %a contains %b', array('%a' => $filters[$type]['title'], '%b' => $value)));
+ }
+ else {
+ $form['filters']['current'][] = array('#value' => t('%a contains %b', array('%a' => $filters[$type]['title'], '%b' => $value)));
+ }
}
else {
- $string = ($i++ ? 'and where %a is %b' :
- '%a is %b');
- $form['filters']['current'][] = array('#value' => t($string,
- array('%a' => $filters[$type]['title'] , '%b' => $value)));
+ if ($i++) {
+ $form['filters']['current'][] = array('#value' => t('and where %a is %b', array('%a' => $filters[$type]['title'], '%b' => $value)));
+ }
+ else {
+ $form['filters']['current'][] = array('#value' => t('%a is %b', array('%a' => $filters[$type]['title'], '%b' => $value)));
+ }
}
- // those ifs remove the respective option if it is already being filtered on.
+ // These ifs remove the respective option if it is already being filtered on.
if ($type == 'type') {
unset($filters['type']);
}
+ if ($type == 'title') {
+ unset($filters['title']);
+ }
if ($type == 'user') {
unset($filters['users']);
unset($filters['user']);
@@ -218,7 +210,7 @@
$script = 'document.getElementById(\'edit-user\').style.display="none"';
// $script = 'document.getElementById("edit-user").style.visibility="hidden"';
drupal_add_js($script, 'inline', 'header');
-*/
+ */
// preparing select boxes
foreach ($filters as $key => $filter) {
@@ -230,22 +222,29 @@
'#type' => 'select',
'#options' => $filter['options'],
// '#disabled' => TRUE,
- );
+ );
break;
-
+
case 'users':
$form['filters']['status'][$key] = array(
'#type' => 'textfield',
'#autocomplete_path' => 'user/autocomplete',
- '#size' => 20,
- );
+ '#size' => 39,
+ );
+ break;
+
+ case 'title':
+ $form['filters']['status'][$key] = array(
+ '#type' => 'textfield',
+ '#size' => 39,
+ );
break;
-
+
default:
$form['filters']['status'][$key] = array(
'#type' => 'select',
'#options' => $filter['options'],
- );
+ );
}
}
// building radio buttons
@@ -254,27 +253,26 @@
'#type' => 'radios',
'#options' => $names,
'#default_value' => $keyz[0],
- );
+ );
// building buttons depending on the filter state
$form['filters']['buttons']['submit'] = array(
'#type' => 'submit',
'#value' => (count($session) ? t('Refine') : t('Filter')),
- );
+ );
if (count($session)) {
$form['filters']['buttons']['undo'] = array(
'#type' => 'submit',
'#value' => t('Undo'),
- );
+ );
$form['filters']['buttons']['reset'] = array(
'#type' => 'submit',
'#value' => t('Reset'),
- );
+ );
}
return $form;
}
-
/**
* Handle post-validation form submission.
*
@@ -283,46 +281,45 @@
*
* @param the ID of the passed form
* @param array with the form properties values
- */
+ */
function cmf_filter_form_submit($form_id, $form_values) {
$filters = cmf_filters();
switch ($form_values['op']) {
case t('Filter'):
case t('Refine'):
-
if (isset($form_values['filter'])) {
$filter = $form_values['filter'];
// convert AJAX search value to select box value
if ($filter == 'users') {
$users = cmf_get_users('name');
-
- $uid = db_result(db_query('
- SELECT uid
- FROM {users}
- WHERE name = "%s"',
- $form_values['users']
- ));
-
+ $uid = db_result(db_query('SELECT uid FROM {users} WHERE name = "%s"', $form_values['users']));
$form_values['user'] = $uid;
-
$filter = 'user';
}
+ if ($filter == 'title') {
+ $string = $form_values['title'];
+ $filters['title']['options'][$string] = $string;
+ }
+
// Flatten the options array to accommodate hierarchical/nested options.
$flat_options = form_options_flatten($filters[$filter]['options']);
- if (isset($flat_options[$form_values[$filter]])) {
+ if (isset($flat_options[$form_values[$filter]]) || $filter == 'title') {
$_SESSION['cmf_overview_filter'][] = array($filter, $form_values[$filter]);
}
}
break;
+
case t('Undo'):
array_pop($_SESSION['cmf_overview_filter']);
break;
+
case t('Reset'):
$_SESSION['cmf_overview_filter'] = array();
break;
+
case t('Apply'):
$_SESSION['cmf_max_rows'] = $form_values['max-rows'];
$_SESSION['cmf_content_kind'] = $form_values['kind'];
@@ -354,45 +351,52 @@
return $output;
}
-
/**
* List node administration filters that can be applied.
*
- * @param (optional) true if the filter to be built serves the user profile page
+ * @param (optional) TRUE if the filter to be built serves the user profile page
* @return array with filter properties
*/
-function cmf_filters($true = null) {
+function cmf_filters($true = NULL) {
// Regular filters
- $filters['status'] = array('title' => t('node status'),
- 'options' => array('status-1' => t('published'), 'status-0' => t('not published'),
- 'promote-1' => t('promoted'), 'promote-0' => t('not promoted'),
- 'sticky-1' => t('sticky'), 'sticky-0' => t('not sticky')));
+ $filters['status'] = array(
+ 'title' => t('node status'),
+ 'options' => array(
+ 'status-1' => t('published'),
+ 'status-0' => t('not published'),
+ 'promote-1' => t('promoted'),
+ 'promote-0' => t('not promoted'),
+ 'sticky-1' => t('sticky'),
+ 'sticky-0' => t('not sticky'),
+ ),
+ );
$filters['type'] = array('title' => t('node type'), 'options' => node_get_types('names'));
// The taxonomy filter
if ($taxonomy = module_invoke('taxonomy', 'form_all', 1)) {
$filters['category'] = array('title' => t('category'), 'options' => $taxonomy);
}
- // cmf filters
+ // Cmf filters.
+ $filters['title'] = array('title' => t('title/subject'));
+ // Don't show these on the user page.
if (!$true) {
$filters['user'] = array('title' => t('user list'), 'options' => cmf_get_users('names'));
$filters['users'] = array('title' => t('user name'));
$filters['role'] = array('title' => t('user role'), 'options' => cmf_get_roles('names'));
- $filters['blocked'] = array('title' => t('user status'), 'options' => array(1 => t('active'),
- 0 => t('blocked')));
+ $filters['blocked'] = array('title' => t('user status'),
+ 'options' => array(1 => t('active'), 0 => t('blocked')));
}
return $filters;
}
-
-/**********************
-* QUERIES *
-**********************/
+/**
+ * QUERIES
+ */
/**
* Build the variable parts of the query to be performed regarding the filter status.
*
* @return associative array with WHERE JOIN qury parts and respective arguments
- */
+ */
function cmf_build_filter_query() {
$filters = cmf_filters();
@@ -407,24 +411,34 @@
list($key, $value) = explode('-', $value, 2);
$where[] = 'n.'. $key .' = %d';
break;
+
case 'category':
$table = "tn$index";
$where[] = "$table.tid = %d";
$join .= "INNER JOIN {term_node} $table ON n.nid = $table.nid ";
break;
+
case 'type':
$where[] = "n.type = '%s'";
break;
+
case 'user':
$where[] = "u.uid = %d";
break;
+
case 'role':
$where[] = "u.uid = ur.uid AND ur.rid = %d";
$join .= "INNER JOIN {users_roles} ur ON u.uid = ur.uid ";
break;
+
+ case 'title':
+ $where[] = "n.title LIKE ('%%%s%%')";
+ break;
+
case 'users':
$where[] = "u.name = '%s'";
break;
+
case 'blocked':
$where[] = "u.status = %d AND u.uid != 0";
break;
@@ -436,20 +450,18 @@
return array('where' => $where, 'join' => $join, 'args' => $args);
}
-
/**
* Build the header of the result table.
*
* @return array respecting tablesort_sql()
- */
+ */
function cmf_build_header() {
-
$header = array();
if (user_access('filter and manage site content')) {
$header[] = theme('table_select_header_cell');
}
-
+
switch ($_SESSION['cmf_content_kind']) {
case 'node':
$header[] = array('data' => t('Title'), 'field' => 'title');
@@ -461,6 +473,7 @@
$header[] = array('data' => t('Status'), 'field' => 'status');
$header[] = array('data' => t('Time'), 'field' => 'created', 'sort' => 'desc');
break;
+
case 'comment':
$header[] = array('data' => t('Subject'), 'field' => 'subject');
$header[] = array('data' => t('Kind'));
@@ -471,6 +484,7 @@
$header[] = array('data' => t('Status'), 'field' => 'status');
$header[] = array('data' => t('Time'), 'field' => 'created', 'sort' => 'desc');
break;
+
case 'both':
$header[] = array('data' => t('Title') .'/'. t('Subject'), 'field' => 'title');
$header[] = array('data' => t('Kind'));
@@ -485,85 +499,91 @@
if (user_access('filter and manage site content')) {
$header[] = array('data' => t('Operations'));
}
-
+
return $header;
}
-
/**
- * Permform adjusted query.
+ * Perform adjusted query.
*
* @param array respecting tablesort_sql()
* @return result of permormed query
- */
-function cmf_perform_query($header, $kind = null) {
-
+ */
+function cmf_perform_query($header, $kind = NULL) {
$filter = cmf_build_filter_query();
if (is_null($kind)) {
$kind = $_SESSION['cmf_content_kind'];
}
-
+
if (arg(0) == 'user' && is_numeric(arg(1)) && arg(1) > 0) {
$filter['where'] .= ' AND u.uid = '. arg(1);
}
switch ($kind) {
case 'node':
- return pager_query('
- SELECT n.nid, n.title, n.type, u.name AS username, u.uid, n.status, n.created, n.changed
- FROM {node} n INNER JOIN {users} u ON n.uid = u.uid '. $filter['join'] .
- $filter['where'] .
- tablesort_sql($header),
+ return pager_query('SELECT n.nid, n.title, n.type, u.name AS username, u.uid, n.status, n.created, n.changed
+ FROM {node} n INNER JOIN {users} u ON n.uid = u.uid '
+ . $filter['join']
+ . $filter['where']
+ . tablesort_sql($header),
isset($_SESSION['cmf_max_rows']) ? $_SESSION['cmf_max_rows'] : 50, 0, NULL, $filter['args']
);
break;
+
case 'comment':
- return pager_query('
- SELECT c.cid, c.subject, c.nid, c.comment, c.timestamp AS created, c.status, c.name,
+ return pager_query('SELECT c.cid, c.subject, c.nid, c.comment, c.timestamp AS created, c.status, c.name,
c.homepage, u.name AS username, u.uid, n.type
- FROM {comments} c INNER JOIN {node} n ON c.nid = n.nid INNER JOIN {users} u ON u.uid = c.uid
- '. $filter['join'] .
- $filter['where'] .
- tablesort_sql($header),
+ FROM {comments} c INNER JOIN {node} n ON c.nid = n.nid INNER JOIN {users} u ON u.uid = c.uid '
+ . $filter['join']
+ . $filter['where']
+ . tablesort_sql($header),
isset($_SESSION['cmf_max_rows']) ? $_SESSION['cmf_max_rows'] : 50, 0, NULL, $filter['args']
);
break;
+
case 'both':
$args = array_merge($filter['args'], $filter['args']);
- return pager_query('
- SELECT 0 AS cid, n.nid, n.title, NULL AS comment, n.type, u.name AS username, u.uid,
- n.status, n.created, n.changed
- FROM {node} n INNER JOIN {users} u ON n.uid = u.uid '. $filter['join'] .
- $filter['where'] .'
- UNION
- SELECT c.cid, c.nid, c.subject AS title, c.comment, n.type, u.name AS username, u.uid,
+ $where = $filter['where'];
+ $cwhere = str_replace(array('n.title', 'n.uid'), array('c.subject', 'c.uid'), $where);
+ $count_query = 'SELECT ('
+ .'SELECT COUNT(*) FROM {node} n'
+ .' INNER JOIN {users} u ON n.uid = u.uid '
+ . $filter['join']
+ .' '. $where
+ .') + ('
+ .'SELECT COUNT(*) FROM {comments} c INNER JOIN {node} n ON c.nid = n.nid '
+ .' INNER JOIN {users} u ON u.uid = c.uid '
+ . $filter['join']
+ .' '. $cwhere
+ .') AS count';
+ return pager_query('SELECT 0 AS cid, n.nid, n.title, NULL AS comment, n.type, u.name AS username,
+ u.uid, n.status, n.created, n.changed
+ FROM {node} n INNER JOIN {users} u ON n.uid = u.uid '
+ . $filter['join']
+ .' '. $where
+ .' UNION SELECT c.cid, c.nid, c.subject AS title, c.comment, n.type, u.name AS username, u.uid,
c.status, c.timestamp AS created, 0 AS changed
- FROM {comments} c INNER JOIN {node} n ON c.nid = n.nid INNER JOIN {users} u ON u.uid = c.uid
- '. $filter['join'] .
- $filter['where'] .
- tablesort_sql($header),
- isset($_SESSION['cmf_max_rows']) ? $_SESSION['cmf_max_rows'] : 50, 0, NULL, $args
+ FROM {comments} c INNER JOIN {node} n ON c.nid = n.nid INNER JOIN {users} u ON u.uid = c.uid '
+ . $filter['join']
+ .' '. $cwhere
+ . tablesort_sql($header),
+ isset($_SESSION['cmf_max_rows']) ? $_SESSION['cmf_max_rows'] : 50, 0, $count_query, $args
);
break;
}
}
-
-/**********************
-* RESULTS *
-**********************/
-
+/**
+ * RESULTS
+ */
include(drupal_get_path('module', 'cmf') ."/node.inc");
-
include(drupal_get_path('module', 'cmf') ."/comment.inc");
-
include(drupal_get_path('module', 'cmf') ."/both.inc");
-
-/**********************
-* AUX *
-**********************/
+/**
+ * AUX
+ */
/**
* Builds a list of available users
@@ -572,30 +592,23 @@
* @return array of all available users
*/
function cmf_get_users($op) {
-
switch ($op) {
case 'names':
- $result = db_query('
- SELECT uid, name
- FROM {users}
- WHERE uid != 0
- ORDER BY name'
- );
+ $result = db_query('SELECT uid, name FROM {users} WHERE uid <> 0 ORDER BY name');
break;
}
$users = array();
- $users[0] = variable_get('anonymous', null);
+ $users[0] = variable_get('anonymous', t('anonymous'));
for ($i = 0; $i < db_num_rows($result); $i++) {
$user = db_fetch_object($result);
$users[$user->uid] = $user->name;
}
-
+
return $users;
}
-
/**
* Builds a list of available roles
*
@@ -603,14 +616,9 @@
* @return array of all available roles
*/
function cmf_get_roles($op) {
-
switch ($op) {
case 'names':
- $result = db_query('
- SELECT *
- FROM {role}
- ORDER BY name'
- );
+ $result = db_query('SELECT rid, name FROM {role} ORDER BY name');
break;
}
@@ -620,11 +628,10 @@
$role = db_fetch_object($result);
$roles[$role->rid] = $role->name;
}
-
+
return $roles;
}
-
/**
* Get the html code of an image
*
@@ -632,10 +639,9 @@
* @return html tag img
*/
function _cmf_get_img($action, $title) {
-
$path = base_path() . drupal_get_path('module', 'cmf') .'/images/'. $action .'.png';
- if ($title == null) {
+ if ($title == NULL) {
$html = '