';
$output .= $image;
@@ -696,7 +961,11 @@
*
* @ingroup themeable
*/
-function theme_user_titles_my_title_block($name = NULL, $posts = NULL, $units = NULL, $title = NULL) {
+function theme_user_titles_my_title_block($variables) {
+ $name = $variables['name'];
+ $posts = $variables['posts'];
+ $units = $variables['units'];
+ $title = $variables['title'];
$output = '';
if (!is_null($name) || !is_null($posts) || !is_null($title)) {
$label_class = 'label';
@@ -747,40 +1016,30 @@
}
/**
- * Helper function for autocompletion
+ * Built-in hook implementation that counts nodes
*/
-function user_titles_autocomplete($rids, $string = '') {
- // The user enters a comma-separated list of titles. We only autocomplete the last title.
- $array = drupal_explode_tags($string);
-
- $rids = explode(',', $rids);
- foreach ($rids as $rid) {
- $in .= $in ? ', %d' : '%d';
- $query_vars[] = $rid;
- }
-
- // Fetch last tag
- $last_string = trim(array_pop($array));
- $query_vars[] = $last_string;
-
- $matches = array();
- if ($last_string != '') {
- $result = db_query_range("SELECT tid, title
- FROM {user_titles}
- WHERE rid IN ($in)
- AND LOWER(title) LIKE LOWER('%%%s%%')", $query_vars, 0, 10);
-
- $prefix = count($array) ? implode(', ', $array) . ', ' : '';
-
- while ($title = db_fetch_object($result)) {
- $t = $title->title;
- // Commas and quotes in terms are special cases, so encode 'em.
- if (strpos($title->title, ',') !== FALSE || strpos($title->title, '"') !== FALSE) {
- $t = '"' . str_replace('"', '""', $title->title) . '"';
+function user_titles_user_titles($op, $uid = NULL) {
+ switch ($op) {
+ case 'register':
+ return 'user_titles';
+ case 'name':
+ return t('Post count');
+ case 'description':
+ return t('Built-in, see below');
+ case 'units':
+ return t('Posts');
+ case 'url':
+ // No url implemented
+ return;
+ case 'get':
+ $query = db_select('user_titles_posts', 'u');
+ $query->addField('u', 'posts');
+ $query->condition('uid', $uid);
+ $res = $query->execute()->fetchField();
+ if ($res === FALSE) {
+ $res = user_titles_update_post_count($uid);
}
- $matches[$prefix . $t] = check_plain($title->title);
- }
+ return $res;
}
-
- drupal_json($matches);
}
+
diff -ruN user_titles/ut_views/ut_views.info user_titles.diff/ut_views/ut_views.info
--- user_titles/ut_views/ut_views.info 2011-10-17 14:36:10.000000000 -0500
+++ user_titles.diff/ut_views/ut_views.info 1969-12-31 19:00:00.000000000 -0500
@@ -1,6 +0,0 @@
-name = User titles views
-description = Adds views support to user titles
-core = 6.x
-dependencies[] = user_titles
-dependencies[] = views
-package = User titles
diff -ruN user_titles/ut_views/ut_views.module user_titles.diff/ut_views/ut_views.module
--- user_titles/ut_views/ut_views.module 2011-10-17 14:36:10.000000000 -0500
+++ user_titles.diff/ut_views/ut_views.module 1969-12-31 19:00:00.000000000 -0500
@@ -1,16 +0,0 @@
- 2.0,
- 'path' => drupal_get_path('module', 'ut_views'),
- );
-}
diff -ruN user_titles/ut_views/ut_views.views.inc user_titles.diff/ut_views/ut_views.views.inc
--- user_titles/ut_views/ut_views.views.inc 2011-10-17 14:36:10.000000000 -0500
+++ user_titles.diff/ut_views/ut_views.views.inc 1969-12-31 19:00:00.000000000 -0500
@@ -1,147 +0,0 @@
- array(
- 'left_table' => 'user_titles_users',
- 'left_field' => 'tid',
- 'field' => 'tid',
- ),
- // user_titles links to node_revisions through user_titles_users via tid.
- 'node_revisions' => array(
- 'left_table' => 'user_titles_users',
- 'left_field' => 'tid',
- 'field' => 'tid',
- ),
- // user_titles links to users through user_titles_users via tid.
- 'users' => array(
- 'left_table' => 'user_titles_users',
- 'left_field' => 'tid',
- 'field' => 'tid',
- ),
- );
-
- $data['user_titles_users']['table']['group'] = t('User titles');
-
- $data['user_titles_users']['table']['join'] = array(
- 'user_titles' => array(
- 'left_field' => 'tid',
- 'field' => 'tid',
- ),
- 'users' => array(
- 'left_field' => 'uid',
- 'field' => 'uid',
- ),
- 'node' => array(
- 'left_field' => 'uid',
- 'field' => 'uid',
- ),
- 'node_revisions' => array(
- 'left_field' => 'uid',
- 'field' => 'uid',
- ),
- );
-
- // Describe the title column of the user_titles table.
- $data['user_titles']['title'] = array(
- 'title' => t('Title'),
- 'help' => t("A user's current title."),
- 'field' => array(
- 'handler' => 'views_handler_field',
- 'click sortable' => TRUE,
- ),
- 'argument' => array(
- 'handler' => 'views_handler_argument_string',
- 'help' => t('User title.'),
-// 'many to one' => TRUE,
- 'empty field name' => t('No title'),
- ),
- 'sort' => array(
- 'handler' => 'views_handler_sort',
- ),
- );
-
- $data['user_titles']['tid'] = array(
- 'title' => t('Title'),
- 'help' => t("A user's current title ID."),
- 'filter' => array(
- 'title' => t('Title'),
- 'handler' => 'views_handler_filter_user_title_tid',
- 'numeric' => TRUE,
- 'allow empty' => TRUE,
- ),
- );
-
- // Describe the image column of the user_titles table.
- $data['user_titles']['image'] = array(
- 'title' => t('Title image'),
- 'help' => t("A user's current title image."), // The help that appears on the UI,
- 'field' => array(
- 'handler' => 'views_handler_field_user_titles_image',
- 'click sortable' => TRUE,
- ),
-/*
- 'filter' => array(
- 'handler' => 'views_handler_filter_numeric',
- ),
-*/
- 'sort' => array(
- 'handler' => 'views_handler_sort_user_titles_image',
- ),
- );
-
- return $data;
-}
-
-/**
- * Implementation of hook_views_handlers()
- */
-function user_titles_views_handlers() {
- return array(
- 'info' => array(
- 'path' => drupal_get_path('module', 'ut_views'),
- ),
- 'handlers' => array(
- // field handlers
- 'views_handler_field_user_title_image' => array(
- 'parent' => 'views_handler_field',
- ),
- // filter handlers
- 'views_handler_filter_user_title_tid' => array(
- 'parent' => 'views_handler_filter_many_to_one',
- ),
- // sort handlers
- 'views_handler_sort_user_title_image' => array(
- 'parent' => 'views_handler_sort',
- ),
- ),
- );
-}
-
-/**
- * Implementation of hook_views_plugins()
- */
-function user_titles_views_plugins() {
- return array(
- 'module' => 'ut_views',
- 'argument validator' => array(
- 'user_title' => array(
- 'title' => t('User title'),
- 'handler' => 'views_plugin_argument_validate_user_title',
- 'path' => drupal_get_path('module', 'ut_views'),
- ),
- ),
- );
-}
diff -ruN user_titles/ut_views/views_handler_field_user_title_image.inc user_titles.diff/ut_views/views_handler_field_user_title_image.inc
--- user_titles/ut_views/views_handler_field_user_title_image.inc 2011-10-17 14:36:10.000000000 -0500
+++ user_titles.diff/ut_views/views_handler_field_user_title_image.inc 1969-12-31 19:00:00.000000000 -0500
@@ -1,27 +0,0 @@
-additional_fields['image_title'] = 'image_title';
- }
-
- function element_type() {
- return 'div';
- }
-
- function render($values) {
- $title = $values->{$this->aliases['image_title']};
- $src = $values->{$this->field_alias};
-
- return theme('image', $src, $title, $title);
- }
-}
diff -ruN user_titles/ut_views/views_handler_filter_user_title_tid.inc user_titles.diff/ut_views/views_handler_filter_user_title_tid.inc
--- user_titles/ut_views/views_handler_filter_user_title_tid.inc 2011-10-17 14:36:10.000000000 -0500
+++ user_titles.diff/ut_views/views_handler_filter_user_title_tid.inc 1969-12-31 19:00:00.000000000 -0500
@@ -1,298 +0,0 @@
- 'textfield');
- $options['rids'] = array('default' => array());
-
- return $options;
- }
-
- function extra_options_form(&$form, &$form_state) {
- $roles = user_titles_get_roles();
- foreach ($roles as $rid => $role) {
- $options[$rid] = check_plain($role);
- }
-
- $form['rids'] = array(
- '#prefix' => '
',
- '#suffix' => '
',
- '#type' => 'checkboxes',
- '#title' => t('Roles'),
- '#options' => $options,
- '#description' => t('Select which roles to show terms for in the regular options.'),
- '#default_value' => $this->options['rids'],
- );
-
- $form['markup_start'] = array(
- '#value' => '
',
- );
-
- $form['type'] = array(
- '#type' => 'radios',
- '#title' => t('Selection type'),
- '#options' => array('select' => t('Dropdown'), 'textfield' => t('Autocomplete')),
- '#default_value' => $this->options['type'],
- );
-
- $form['markup_end'] = array(
- '#value' => '
',
- );
- }
-
- function value_form(&$form, &$form_state) {
- $all_roles = user_titles_get_roles();
- $selection = array_filter($this->options['rids']);
- $roles = empty($selection) ? array_keys($all_roles) : $selection;
- $role_names = '';
- $rids = '';
- $in = '';
- $query_vars = array();
- foreach ($roles as $rid) {
- $role_names .= $role_names ? ', ' . $all_roles[$rid] : $all_roles[$rid];
- $rids .= $rids ? ",$rid" : $rid;
- $in .= $in ? ', %d' : '%d';
- $query_vars[] = $rid;
- }
-
- if ($this->options['type'] == 'textfield') {
- $default = '';
- if ($this->value) {
- if (is_array($this->value)) {
- foreach ($this->value as $tid) {
- $in .= $in ? ', %d' : '%d';
- }
- $result = db_query("SELECT * FROM {user_titles} ut WHERE ut.tid IN ($in)", $this->value);
- }
- else {
- $result = db_query("SELECT * FROM {user_titles} ut WHERE ut.tid = %d", $this->value);
- }
-
- while ($title = db_fetch_object($result)) {
- $default .= $default ? ", {$title->title}" : $title->title;
- }
- }
-
- $form['value'] = array(
- '#title' => !empty($selection) ? format_plural(count($selection), 'Select titles from role: @role_names', 'Select titles from roles: @role_names', array('@role_names' => $role_names)) : t('Select titles'),
- '#type' => 'textfield',
- '#default_value' => $default,
- );
-
- $form['value']['#autocomplete_path'] = 'user-titles/autocomplete/' . $rids;
- }
- else {
- $options = array();
- $result = db_query("SELECT * FROM {user_titles} WHERE rid IN ($in) ORDER BY value", $query_vars);
- while ($title = db_fetch_object($result)) {
- $options[$title->tid] = $title->title;
- }
-
- $default_value = (array) $this->value;
-
- if (!empty($form_state['exposed'])) {
- $identifier = $this->options['expose']['identifier'];
-
- if (!empty($this->options['expose']['reduce'])) {
- $options = $this->reduce_value_options($options);
-
- if (empty($this->options['expose']['single']) && !empty($this->options['expose']['optional'])) {
- $default_value = array();
- }
- }
-
- if (!empty($this->options['expose']['single'])) {
- if (!empty($this->options['expose']['optional']) && (empty($default_value) || !empty($this->options['expose']['reduce']))) {
- $default_value = 'All';
- }
- else if (empty($default_value)) {
- $keys = array_keys($options);
- $default_value = array_shift($keys);
- }
- else {
- $copy = $default_value;
- $default_value = array_shift($copy);
- }
- }
- }
- $form['value'] = array(
- '#type' => 'select',
- '#title' => !empty($selection) ? format_plural(count($selection), 'Select titles from role: @role_names', 'Select titles from roles: @role_names', array('@role_names' => $role_names)) : t('Select titles'),
- '#multiple' => TRUE,
- '#options' => $options,
- '#size' => min(9, count($options)),
- '#default_value' => $default_value,
- );
-
- if (!empty($form_state['exposed']) && !isset($form_state['input'][$identifier])) {
- $form_state['input'][$identifier] = $default_value;
- }
- }
-
- if (empty($form_state['exposed'])) {
- // Retain the helper option
- $this->helper->options_form($form, $form_state);
- }
- }
-
- function value_validate(&$form, &$form_state) {
- // We only validate if they've chosen the text field style.
- if ($this->options['type'] != 'textfield') {
- return;
- }
-
- $values = drupal_explode_tags($form_state['values']['options']['value']);
- $tids = $this->validate_title_strings($form['value'], $values);
-
- if ($tids) {
- $form_state['values']['options']['value'] = $tids;
- }
- }
-
- function accept_exposed_input($input) {
- if (empty($this->options['exposed'])) {
- return TRUE;
- }
-
- // If it's optional and there's no value don't bother filtering.
- if ($this->options['expose']['optional'] && empty($this->validated_exposed_input)) {
- return FALSE;
- }
-
- $rc = parent::accept_exposed_input($input);
- if ($rc) {
- // If we have previously validated input, override.
- if (isset($this->validated_exposed_input)) {
- $this->value = $this->validated_exposed_input;
- }
- }
-
- return $rc;
- }
-
- function exposed_validate(&$form, &$form_state) {
- if (empty($this->options['exposed'])) {
- return;
- }
-
- $identifier = $this->options['expose']['identifier'];
-
- // We only validate if they've chosen the text field style.
- if ($this->options['type'] != 'textfield') {
- if ($form_state['values'][$identifier] != 'All') {
- $this->validated_exposed_input = (array) $form_state['values'][$identifier];
- }
- return;
- }
-
- if (empty($this->options['expose']['identifier'])) {
- return;
- }
-
- $values = drupal_explode_tags($form_state['values'][$identifier]);
-
- $tids = $this->validate_title_strings($form[$identifier], $values);
- if ($tids) {
- $this->validated_exposed_input = $tids;
- }
- }
-
- /**
- * Validate the user string. Since this can come from either the form
- * or the exposed filter, this is abstracted out a bit so it can
- * handle the multiple input sources.
- */
- function validate_title_strings(&$form, $values) {
- if (empty($values)) {
- return array();
- }
-
- $tids = array();
- $placeholders = array();
- $query_args = array();
- $results = array();
- $title_in = '';
- foreach ($values as $value) {
- $missing[strtolower($value)] = TRUE;
- $query_args[] = $value;
- $title_in .= $title_in ? ", '%s'" : "'%s'";
- }
-
- if (!$query_args) {
- return;
- }
-
- // add the taxonomy vid to the argument list.
- $rid_in = '';
- foreach ($this->options['rids'] as $rid => $value) {
- if ($value) {
- $query_args[] = $rid;
- $rid_in .= $rid_in ? ", %d" : "%d";
- }
- }
-
- if ($rid_in) {
- $result = db_query("SELECT * FROM {user_titles} WHERE title IN ($title_in) AND rid IN ($rid_in)", $query_args);
- }
- else {
- $result = db_query("SELECT * FROM {user_titles} WHERE title IN ($title_in)", $query_args);
- }
- while ($title = db_fetch_object($result)) {
- unset($missing[strtolower($title->title)]);
- $tids[] = $title->tid;
- }
-
- if ($missing) {
- form_error($form, format_plural(count($missing), 'Unable to find title: @titles', 'Unable to find titles: @titles', array('@titles' => implode(', ', array_keys($missing)))));
- }
-
- return $tids;
- }
-
- function value_submit($form, &$form_state) {
- // prevent array_filter from messing up our arrays in parent submit.
- }
-
- function expose_form_right(&$form, &$form_state) {
- parent::expose_form_right($form, $form_state);
- if ($this->options['type'] != 'select') {
- unset($form['expose']['reduce']);
- }
- }
-
- function admin_summary() {
- // set up $this->value_options for the parent summary
- $this->value_options = array();
-
- if ($this->value) {
- if (is_array($this->value)) {
- foreach ($this->value as $tid) {
- $in .= $in ? ', %d' : '%d';
- }
- $result = db_query("SELECT * FROM {user_titles} ut WHERE ut.tid IN ($in)", $this->value);
- }
- else {
- $result = db_query("SELECT * FROM {user_titles} ut WHERE ut.tid = %d", $this->value);
- }
-
- while ($title = db_fetch_object($result)) {
- $this->value_options[$title->tid] = $title->title;
- }
- }
- return parent::admin_summary();
- }
-}
diff -ruN user_titles/ut_views/views_handler_sort_user_title_image.inc user_titles.diff/ut_views/views_handler_sort_user_title_image.inc
--- user_titles/ut_views/views_handler_sort_user_title_image.inc 2011-10-17 14:36:10.000000000 -0500
+++ user_titles.diff/ut_views/views_handler_sort_user_title_image.inc 1969-12-31 19:00:00.000000000 -0500
@@ -1,55 +0,0 @@
- 'has_image');
-
- return $options;
- }
-
- function options_form(&$form, &$form_state) {
- parent::options_form($form, $form_state);
-
- $form['sort_by'] = array(
- '#type' => 'radios',
- '#title' => t('Sort by'),
- '#options' => array(
- 'has_image' => t('Has image?'),
- 'file_path' => t('File path'),
- ),
- '#description' => t('How to sort. Either by whether or not there is a file or by the file name.'),
- '#default_value' => $this->options['sort_by'],
- );
- }
-
- /**
- * Called to add the sort to a query.
- */
- function query() {
- $this->ensure_my_table();
- switch ($this->options['sort_by']) {
- case 'has_image':
- default:
- $formula = "IF(CHAR_LENGTH($this->table_alias.$this->real_field) > 0, 1, 0)";
- $this->query->add_orderby(NULL, $formula, $this->options['order'], $this->table_alias . '_' . $this->field . '_' . $this->options['sort_by']);
- return;
- case 'file_path':
- $this->query->add_orderby($this->table_alias, $this->real_field, $this->options['order']);
- return;
- }
- }
-}
diff -ruN user_titles/ut_views/views_plugin_argument_validate_user_title.inc user_titles.diff/ut_views/views_plugin_argument_validate_user_title.inc
--- user_titles/ut_views/views_plugin_argument_validate_user_title.inc 2011-10-17 14:36:10.000000000 -0500
+++ user_titles.diff/ut_views/views_plugin_argument_validate_user_title.inc 1969-12-31 19:00:00.000000000 -0500
@@ -1,55 +0,0 @@
- $role) {
- $options[$rid] = check_plain($role);
- }
-
- $form['validate_argument_role'] = array(
- '#type' => 'checkboxes',
- '#prefix' => '
',
- '#suffix' => '
',
- '#title' => t('Roles'),
- '#options' => $options,
- '#default_value' => isset($this->argument->options['validate_argument_role']) ? $this->argument->options['validate_argument_role'] : array(),
- '#description' => t('If you wish to validate for specific roles, check them; if none are checked, all titles will pass.'),
- );
-
- $form['validate_argument_transform'] = array(
- '#type' => 'checkbox',
- '#title' => t('Transform dashes in URL to spaces in title arguments'),
- '#default_value' => isset($this->argument->options['validate_argument_transform']) ? $this->argument->options['validate_argument_transform'] : FALSE,
- );
- }
-
- function validate_argument($argument) {
- $rids = isset($this->argument->options['validate_argument_role']) ? array_filter($this->argument->options['validate_argument_role']) : array();
- $transform = isset($this->argument->options['validate_argument_transform']) ? $this->argument->options['validate_argument_transform'] : FALSE;
-
- $and = '';
- if (!empty($rids)) {
- $and = " AND rid IN(" . implode(', ', $rids) . ')';
- }
- if ($transform) {
- $result = db_fetch_object(db_query("SELECT * FROM {user_titles} WHERE replace(title, ' ', '-') = '%s'$and", $argument));
- }
- else {
- $result = db_fetch_object(db_query("SELECT * FROM {user_titles} WHERE title = '%s'$and", $argument));
- }
- if (!$result) {
- return FALSE;
- }
-
- return TRUE;
- }
-}