' : $_GET['q'];
- $links = language_negotiation_get_switch_links($type, $path);
-
- if (isset($links->links) && count($links->links > 1)) {
- $class = "language-switcher-{$links->provider}";
- $variables = array('links' => $links->links, 'attributes' => array('class' => array($class)));
- $block['content'] = theme('links', $variables);
- $block['subject'] = t('Languages');
- return $block;
- }
- }
-}
-
-/**
* Theme locale translation filter selector.
*
* @ingroup themeable
Index: modules/menu/menu.block.inc
===================================================================
RCS file: modules/menu/menu.block.inc
diff -N modules/menu/menu.block.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/menu/menu.block.inc 12 Nov 2009 22:36:32 -0000
@@ -0,0 +1,52 @@
+ $title) {
+ // Default "Navigation" block is handled by user.module.
+ $blocks[$name]['info'] = check_plain($title);
+ // Menu blocks can't be cached because each menu item can have
+ // a custom access callback. menu.inc manages its own caching.
+ $blocks[$name]['cache'] = DRUPAL_NO_CACHE;
+ }
+ return $blocks;
+}
+
+/**
+ * Implement hook_block_view().
+ */
+function menu_block_view($delta = '') {
+ $menus = menu_get_menus(FALSE);
+ $data['subject'] = check_plain($menus[$delta]);
+ $data['content'] = menu_tree($delta);
+ // Add contextual links for this block.
+ if (!empty($data['content'])) {
+ $data['content']['#contextual_links']['menu'] = array('admin/structure/menu/manage', array($delta));
+ }
+ return $data;
+}
+
+/**
+ * Implement hook_block_view_alter().
+ */
+function menu_block_view_alter(&$data, $block) {
+ // Add contextual links for system menu blocks.
+ if ($block->module == 'system' && !empty($data['content'])) {
+ $system_menus = menu_list_system_menus();
+ if (isset($system_menus[$block->delta])) {
+ $data['content']['#contextual_links']['menu'] = array('admin/structure/menu/manage', array($block->delta));
+ }
+ }
+}
+
Index: modules/menu/menu.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.info,v
retrieving revision 1.9
diff -u -p -r1.9 menu.info
--- modules/menu/menu.info 8 Jun 2009 09:23:52 -0000 1.9
+++ modules/menu/menu.info 12 Nov 2009 22:36:32 -0000
@@ -8,3 +8,4 @@ files[] = menu.module
files[] = menu.admin.inc
files[] = menu.install
files[] = menu.test
+files[] = menu.block.inc
Index: modules/menu/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v
retrieving revision 1.217
diff -u -p -r1.217 menu.module
--- modules/menu/menu.module 8 Nov 2009 10:02:41 -0000 1.217
+++ modules/menu/menu.module 12 Nov 2009 22:36:32 -0000
@@ -405,50 +405,6 @@ function menu_reset_item($item) {
}
/**
- * Implement hook_block_info().
- */
-function menu_block_info() {
- $menus = menu_get_menus(FALSE);
-
- $blocks = array();
- foreach ($menus as $name => $title) {
- // Default "Navigation" block is handled by user.module.
- $blocks[$name]['info'] = check_plain($title);
- // Menu blocks can't be cached because each menu item can have
- // a custom access callback. menu.inc manages its own caching.
- $blocks[$name]['cache'] = DRUPAL_NO_CACHE;
- }
- return $blocks;
-}
-
-/**
- * Implement hook_block_view().
- */
-function menu_block_view($delta = '') {
- $menus = menu_get_menus(FALSE);
- $data['subject'] = check_plain($menus[$delta]);
- $data['content'] = menu_tree($delta);
- // Add contextual links for this block.
- if (!empty($data['content'])) {
- $data['content']['#contextual_links']['menu'] = array('admin/structure/menu/manage', array($delta));
- }
- return $data;
-}
-
-/**
- * Implement hook_block_view_alter().
- */
-function menu_block_view_alter(&$data, $block) {
- // Add contextual links for system menu blocks.
- if ($block->module == 'system' && !empty($data['content'])) {
- $system_menus = menu_list_system_menus();
- if (isset($system_menus[$block->delta])) {
- $data['content']['#contextual_links']['menu'] = array('admin/structure/menu/manage', array($block->delta));
- }
- }
-}
-
-/**
* Implement hook_node_insert().
*/
function menu_node_insert($node) {
Index: modules/node/node.block.inc
===================================================================
RCS file: modules/node/node.block.inc
diff -N modules/node/node.block.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/node/node.block.inc 12 Nov 2009 22:36:25 -0000
@@ -0,0 +1,28 @@
+ url('rss.xml'), 'title' => t('Syndicate')));
+
+ return $block;
+}
+
Index: modules/node/node.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.info,v
retrieving revision 1.12
diff -u -p -r1.12 node.info
--- modules/node/node.info 19 Aug 2009 20:19:36 -0000 1.12
+++ modules/node/node.info 12 Nov 2009 22:36:30 -0000
@@ -12,3 +12,5 @@ files[] = node.install
files[] = node.test
files[] = node.tokens.inc
required = TRUE
+files[] = node.block.inc
+files[] = node.search.inc
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1166
diff -u -p -r1.1166 node.module
--- modules/node/node.module 8 Nov 2009 10:02:41 -0000 1.1166
+++ modules/node/node.module 12 Nov 2009 22:36:30 -0000
@@ -1444,170 +1444,6 @@ function _node_rankings(SelectQueryExten
}
/**
- * Implement hook_search_info().
- */
-function node_search_info() {
- return array(
- 'title' => 'Content',
- 'path' => 'node',
- );
-}
-
-/**
- * Implement hook_search_access().
- */
-function node_search_access() {
- return user_access('access content');
-}
-
-/**
- * Implement hook_search_reset().
- */
-function node_search_reset() {
- db_update('search_dataset')
- ->fields(array('reindex' => REQUEST_TIME))
- ->condition('type', 'node')
- ->execute();
-}
-
-/**
- * Implement hook_search_status().
- */
-function node_search_status() {
- $total = db_query('SELECT COUNT(*) FROM {node} WHERE status = :status', array(':status' => NODE_PUBLISHED))->fetchField();
- $remaining = db_query("SELECT COUNT(*) FROM {node} n LEFT JOIN {search_dataset} d ON d.type = 'node' AND d.sid = n.nid WHERE n.status = :status AND d.sid IS NULL OR d.reindex <> 0", array(':status' => NODE_PUBLISHED))->fetchField();
- return array('remaining' => $remaining, 'total' => $total);
-}
-
-/**
- * Implement hook_search_admin().
- */
-function node_search_admin() {
- // Output form for defining rank factor weights.
- $form['content_ranking'] = array(
- '#type' => 'fieldset',
- '#title' => t('Content ranking'),
- );
- $form['content_ranking']['#theme'] = 'node_search_admin';
- $form['content_ranking']['info'] = array(
- '#value' => '' . t('The following numbers control which properties the content search should favor when ordering the results. Higher numbers mean more influence, zero means the property is ignored. Changing these numbers does not require the search index to be rebuilt. Changes take effect immediately.') . ''
- );
-
- // Note: reversed to reflect that higher number = higher ranking.
- $options = drupal_map_assoc(range(0, 10));
- foreach (module_invoke_all('ranking') as $var => $values) {
- $form['content_ranking']['factors']['node_rank_' . $var] = array(
- '#title' => $values['title'],
- '#type' => 'select',
- '#options' => $options,
- '#default_value' => variable_get('node_rank_' . $var, 0),
- );
- }
- return $form;
-}
-
-/**
- * Implement hook_search_execute().
- */
-function node_search_execute($keys = NULL) {
- // Build matching conditions
- $query = db_select('search_index', 'i', array('target' => 'slave'))->extend('SearchQuery')->extend('PagerDefault');
- $query->join('node', 'n', 'n.nid = i.sid');
- $query
- ->condition('n.status', 1)
- ->addTag('node_access')
- ->searchExpression($keys, 'node');
-
- // Insert special keywords.
- $query->setOption('type', 'n.type');
- $query->setOption('language', 'n.language');
- if ($query->setOption('term', 'tn.nid')) {
- $query->join('taxonomy_term_node', 'tn', 'n.vid = tn.vid');
- }
- // Only continue if the first pass query matches.
- if (!$query->executeFirstPass()) {
- return array();
- }
-
- // Add the ranking expressions.
- _node_rankings($query);
-
- // Add a count query.
- $inner_query = clone $query;
- $count_query = db_select($inner_query->fields('i', array('sid')), NULL, array('target' => 'slave'));
- $count_query->addExpression('COUNT(*)');
- $query->setCountQuery($count_query);
- $find = $query
- ->limit(10)
- ->execute();
-
- // Load results.
- $results = array();
- foreach ($find as $item) {
- // Render the node.
- $node = node_load($item->sid);
- $build = node_build($node, 'search_result');
- unset($build['#theme']);
- $node->rendered = drupal_render($build);
-
- // Fetch comments for snippet.
- $node->rendered .= ' ' . module_invoke('comment', 'node_update_index', $node);
- // Fetch terms for snippet.
- $node->rendered .= ' ' . module_invoke('taxonomy', 'node_update_index', $node);
-
- $extra = module_invoke_all('node_search_result', $node);
-
- $results[] = array(
- 'link' => url('node/' . $item->sid, array('absolute' => TRUE)),
- 'type' => check_plain(node_type_get_name($node)),
- 'title' => $node->title[FIELD_LANGUAGE_NONE][0]['value'],
- 'user' => theme('username', array('account' => $node)),
- 'date' => $node->changed,
- 'node' => $node,
- 'extra' => $extra,
- 'score' => $item->calculated_score,
- 'snippet' => search_excerpt($keys, $node->rendered),
- );
- }
- return $results;
-}
-
-/**
- * Implement hook_ranking().
- */
-function node_ranking() {
- // Create the ranking array and add the basic ranking options.
- $ranking = array(
- 'relevance' => array(
- 'title' => t('Keyword relevance'),
- // Average relevance values hover around 0.15
- 'score' => 'i.relevance',
- ),
- 'sticky' => array(
- 'title' => t('Content is sticky at top of lists'),
- // The sticky flag is either 0 or 1, which is automatically normalized.
- 'score' => 'n.sticky',
- ),
- 'promote' => array(
- 'title' => t('Content is promoted to the front page'),
- // The promote flag is either 0 or 1, which is automatically normalized.
- 'score' => 'n.promote',
- ),
- );
-
- // Add relevance based on creation or changed date.
- if ($node_cron_last = variable_get('node_cron_last', 0)) {
- $ranking['recent'] = array(
- 'title' => t('Recently posted'),
- // Exponential decay with half-life of 6 months, starting at last indexed node
- 'score' => 'POW(2.0, (GREATEST(n.created, n.changed) - :node_cron_last) * 6.43e-8)',
- 'arguments' => array(':node_cron_last' => $node_cron_last),
- );
- }
- return $ranking;
-}
-
-/**
* Implement hook_user_cancel().
*/
function node_user_cancel($edit, $account, $method) {
@@ -1969,26 +1805,6 @@ function node_revision_list($node) {
}
/**
- * Implement hook_block_info().
- */
-function node_block_info() {
- $blocks['syndicate']['info'] = t('Syndicate');
- // Not worth caching.
- $blocks['syndicate']['cache'] = DRUPAL_NO_CACHE;
- return $blocks;
-}
-
-/**
- * Implement hook_block_view().
- */
-function node_block_view($delta = '') {
- $block['subject'] = t('Syndicate');
- $block['content'] = theme('feed_icon', array('url' => url('rss.xml'), 'title' => t('Syndicate')));
-
- return $block;
-}
-
-/**
* A generic function for generating RSS feeds from a set of nodes.
*
* @param $nids
@@ -2164,19 +1980,6 @@ function node_page_view($node) {
}
/**
- * Implement hook_update_index().
- */
-function node_update_index() {
- $limit = (int)variable_get('search_cron_limit', 100);
-
- $result = db_query_range("SELECT n.nid FROM {node} n LEFT JOIN {search_dataset} d ON d.type = 'node' AND d.sid = n.nid WHERE d.sid IS NULL OR d.reindex <> 0 ORDER BY d.reindex ASC, n.nid ASC", 0, $limit, array(), array('target' => 'slave'));
-
- foreach ($result as $node) {
- _node_index_node($node);
- }
-}
-
-/**
* Index a single node.
*
* @param $node
Index: modules/node/node.search.inc
===================================================================
RCS file: modules/node/node.search.inc
diff -N modules/node/node.search.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/node/node.search.inc 12 Nov 2009 22:36:30 -0000
@@ -0,0 +1,185 @@
+ 'Content',
+ 'path' => 'node',
+ );
+}
+
+/**
+ * Implement hook_search_access().
+ */
+function node_search_access() {
+ return user_access('access content');
+}
+
+/**
+ * Implement hook_search_execute().
+ */
+function node_search_execute($keys = NULL) {
+ // Build matching conditions
+ $query = db_select('search_index', 'i', array('target' => 'slave'))->extend('SearchQuery')->extend('PagerDefault');
+ $query->join('node', 'n', 'n.nid = i.sid');
+ $query
+ ->condition('n.status', 1)
+ ->addTag('node_access')
+ ->searchExpression($keys, 'node');
+
+ // Insert special keywords.
+ $query->setOption('type', 'n.type');
+ $query->setOption('language', 'n.language');
+ if ($query->setOption('term', 'tn.nid')) {
+ $query->join('taxonomy_term_node', 'tn', 'n.vid = tn.vid');
+ }
+ // Only continue if the first pass query matches.
+ if (!$query->executeFirstPass()) {
+ return array();
+ }
+
+ // Add the ranking expressions.
+ _node_rankings($query);
+
+ // Add a count query.
+ $inner_query = clone $query;
+ $count_query = db_select($inner_query->fields('i', array('sid')), NULL, array('target' => 'slave'));
+ $count_query->addExpression('COUNT(*)');
+ $query->setCountQuery($count_query);
+ $find = $query
+ ->limit(10)
+ ->execute();
+
+ // Load results.
+ $results = array();
+ foreach ($find as $item) {
+ // Render the node.
+ $node = node_load($item->sid);
+ $build = node_build($node, 'search_result');
+ unset($build['#theme']);
+ $node->rendered = drupal_render($build);
+
+ // Fetch comments for snippet.
+ $node->rendered .= ' ' . module_invoke('comment', 'node_update_index', $node);
+ // Fetch terms for snippet.
+ $node->rendered .= ' ' . module_invoke('taxonomy', 'node_update_index', $node);
+
+ $extra = module_invoke_all('node_search_result', $node);
+
+ $results[] = array(
+ 'link' => url('node/' . $item->sid, array('absolute' => TRUE)),
+ 'type' => check_plain(node_type_get_name($node)),
+ 'title' => $node->title[FIELD_LANGUAGE_NONE][0]['value'],
+ 'user' => theme('username', array('account' => $node)),
+ 'date' => $node->changed,
+ 'node' => $node,
+ 'extra' => $extra,
+ 'score' => $item->calculated_score,
+ 'snippet' => search_excerpt($keys, $node->rendered),
+ );
+ }
+ return $results;
+}
+
+/**
+ * Implement hook_search_admin().
+ */
+function node_search_admin() {
+ // Output form for defining rank factor weights.
+ $form['content_ranking'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Content ranking'),
+ );
+ $form['content_ranking']['#theme'] = 'node_search_admin';
+ $form['content_ranking']['info'] = array(
+ '#value' => '' . t('The following numbers control which properties the content search should favor when ordering the results. Higher numbers mean more influence, zero means the property is ignored. Changing these numbers does not require the search index to be rebuilt. Changes take effect immediately.') . ''
+ );
+
+ // Note: reversed to reflect that higher number = higher ranking.
+ $options = drupal_map_assoc(range(0, 10));
+ foreach (module_invoke_all('ranking') as $var => $values) {
+ $form['content_ranking']['factors']['node_rank_' . $var] = array(
+ '#title' => $values['title'],
+ '#type' => 'select',
+ '#options' => $options,
+ '#default_value' => variable_get('node_rank_' . $var, 0),
+ );
+ }
+ return $form;
+}
+
+/**
+ * Implement hook_search_status().
+ */
+function node_search_status() {
+ $total = db_query('SELECT COUNT(*) FROM {node} WHERE status = :status', array(':status' => NODE_PUBLISHED))->fetchField();
+ $remaining = db_query("SELECT COUNT(*) FROM {node} n LEFT JOIN {search_dataset} d ON d.type = 'node' AND d.sid = n.nid WHERE n.status = :status AND d.sid IS NULL OR d.reindex <> 0", array(':status' => NODE_PUBLISHED))->fetchField();
+ return array('remaining' => $remaining, 'total' => $total);
+}
+
+/**
+ * Implement hook_search_reset().
+ */
+function node_search_reset() {
+ db_update('search_dataset')
+ ->fields(array('reindex' => REQUEST_TIME))
+ ->condition('type', 'node')
+ ->execute();
+}
+
+/**
+ * Implement hook_update_index().
+ */
+function node_update_index() {
+ $limit = (int)variable_get('search_cron_limit', 100);
+
+ $result = db_query_range("SELECT n.nid FROM {node} n LEFT JOIN {search_dataset} d ON d.type = 'node' AND d.sid = n.nid WHERE d.sid IS NULL OR d.reindex <> 0 ORDER BY d.reindex ASC, n.nid ASC", 0, $limit, array(), array('target' => 'slave'));
+
+ foreach ($result as $node) {
+ _node_index_node($node);
+ }
+}
+
+/**
+ * Implement hook_ranking().
+ */
+function node_ranking() {
+ // Create the ranking array and add the basic ranking options.
+ $ranking = array(
+ 'relevance' => array(
+ 'title' => t('Keyword relevance'),
+ // Average relevance values hover around 0.15
+ 'score' => 'i.relevance',
+ ),
+ 'sticky' => array(
+ 'title' => t('Content is sticky at top of lists'),
+ // The sticky flag is either 0 or 1, which is automatically normalized.
+ 'score' => 'n.sticky',
+ ),
+ 'promote' => array(
+ 'title' => t('Content is promoted to the front page'),
+ // The promote flag is either 0 or 1, which is automatically normalized.
+ 'score' => 'n.promote',
+ ),
+ );
+
+ // Add relevance based on creation or changed date.
+ if ($node_cron_last = variable_get('node_cron_last', 0)) {
+ $ranking['recent'] = array(
+ 'title' => t('Recently posted'),
+ // Exponential decay with half-life of 6 months, starting at last indexed node
+ 'score' => 'POW(2.0, (GREATEST(n.created, n.changed) - :node_cron_last) * 6.43e-8)',
+ 'arguments' => array(':node_cron_last' => $node_cron_last),
+ );
+ }
+ return $ranking;
+}
+
Index: modules/path/path.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/path/path.info,v
retrieving revision 1.8
diff -u -p -r1.8 path.info
--- modules/path/path.info 8 Jun 2009 09:23:53 -0000 1.8
+++ modules/path/path.info 12 Nov 2009 22:36:22 -0000
@@ -7,3 +7,4 @@ core = 7.x
files[] = path.module
files[] = path.admin.inc
files[] = path.test
+files[] = path.taxonomy.inc
Index: modules/path/path.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/path/path.module,v
retrieving revision 1.175
diff -u -p -r1.175 path.module
--- modules/path/path.module 8 Nov 2009 10:02:41 -0000 1.175
+++ modules/path/path.module 12 Nov 2009 22:36:22 -0000
@@ -258,49 +258,3 @@ function path_form_taxonomy_form_term_al
}
}
-/**
- * Implement hook_taxonomy_term_insert().
- */
-function path_taxonomy_term_insert($term) {
- if (isset($term->path)) {
- $path = $term->path;
- $path['alias'] = trim($path['alias']);
- // Only save a non-empty alias.
- if (!empty($path['alias'])) {
- // Ensure fields for programmatic executions.
- $path['source'] = 'taxonomy/term/' . $term->tid;
- $path['language'] = '';
- path_save($path);
- }
- }
-}
-
-/**
- * Implement hook_taxonomy_term_update().
- */
-function path_taxonomy_term_update($term) {
- if (isset($term->path)) {
- $path = $term->path;
- $path['alias'] = trim($path['alias']);
- // Delete old alias if user erased it.
- if (!empty($path['pid']) && empty($path['alias'])) {
- path_delete($path['pid']);
- }
- // Only save a non-empty alias.
- if (!empty($path['alias'])) {
- // Ensure fields for programmatic executions.
- $path['source'] = 'taxonomy/term/' . $term->tid;
- $path['language'] = '';
- path_save($path);
- }
- }
-}
-
-/**
- * Implement hook_taxonomy_term_delete().
- */
-function path_taxonomy_term_delete($term) {
- // Delete all aliases associated with this term.
- path_delete(array('source' => 'taxonomy/term/' . $term->tid));
-}
-
Index: modules/path/path.taxonomy.inc
===================================================================
RCS file: modules/path/path.taxonomy.inc
diff -N modules/path/path.taxonomy.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/path/path.taxonomy.inc 12 Nov 2009 22:36:22 -0000
@@ -0,0 +1,54 @@
+path)) {
+ $path = $term->path;
+ $path['alias'] = trim($path['alias']);
+ // Only save a non-empty alias.
+ if (!empty($path['alias'])) {
+ // Ensure fields for programmatic executions.
+ $path['source'] = 'taxonomy/term/' . $term->tid;
+ $path['language'] = '';
+ path_save($path);
+ }
+ }
+}
+
+/**
+ * Implement hook_taxonomy_term_update().
+ */
+function path_taxonomy_term_update($term) {
+ if (isset($term->path)) {
+ $path = $term->path;
+ $path['alias'] = trim($path['alias']);
+ // Delete old alias if user erased it.
+ if (!empty($path['pid']) && empty($path['alias'])) {
+ path_delete($path['pid']);
+ }
+ // Only save a non-empty alias.
+ if (!empty($path['alias'])) {
+ // Ensure fields for programmatic executions.
+ $path['source'] = 'taxonomy/term/' . $term->tid;
+ $path['language'] = '';
+ path_save($path);
+ }
+ }
+}
+
+/**
+ * Implement hook_taxonomy_term_delete().
+ */
+function path_taxonomy_term_delete($term) {
+ // Delete all aliases associated with this term.
+ path_delete(array('source' => 'taxonomy/term/' . $term->tid));
+}
+
Index: modules/poll/poll.block.inc
===================================================================
RCS file: modules/poll/poll.block.inc
diff -N modules/poll/poll.block.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/poll/poll.block.inc 12 Nov 2009 22:36:20 -0000
@@ -0,0 +1,48 @@
+join('poll', 'p', 'p.nid = n.nid');
+ $select->fields('n', array('nid'))
+ ->condition('n.status', 1)
+ ->condition('p.active', 1)
+ ->orderBy('n.created', 'DESC')
+ ->range(0, 1)
+ ->addTag('node_access');
+
+ $record = $select->execute()->fetchObject();
+ if ($record) {
+ $poll = node_load($record->nid);
+ if ($poll->nid) {
+ $poll = poll_block_latest_poll_view($poll);
+ $block['subject'] = t('Poll');
+ $block['content'] = $poll->content;
+ return $block;
+ }
+ }
+ }
+}
+
Index: modules/poll/poll.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.info,v
retrieving revision 1.10
diff -u -p -r1.10 poll.info
--- modules/poll/poll.info 19 Aug 2009 20:19:36 -0000 1.10
+++ modules/poll/poll.info 12 Nov 2009 22:36:20 -0000
@@ -9,3 +9,4 @@ files[] = poll.pages.inc
files[] = poll.install
files[] = poll.test
files[] = poll.tokens.inc
+files[] = poll.block.inc
Index: modules/poll/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v
retrieving revision 1.323
diff -u -p -r1.323 poll.module
--- modules/poll/poll.module 8 Nov 2009 10:02:41 -0000 1.323
+++ modules/poll/poll.module 12 Nov 2009 22:36:20 -0000
@@ -117,46 +117,6 @@ function _poll_menu_access($node, $perm,
}
/**
- * Implement hook_block_info().
- */
-function poll_block_info() {
- if (user_access('access content')) {
- $blocks['recent']['info'] = t('Most recent poll');
- return $blocks;
- }
-}
-
-/**
- * Implement hook_block_view().
- *
- * Generates a block containing the latest poll.
- */
-function poll_block_view($delta = '') {
- if (user_access('access content')) {
- // Retrieve the latest poll.
- $select = db_select('node', 'n');
- $select->join('poll', 'p', 'p.nid = n.nid');
- $select->fields('n', array('nid'))
- ->condition('n.status', 1)
- ->condition('p.active', 1)
- ->orderBy('n.created', 'DESC')
- ->range(0, 1)
- ->addTag('node_access');
-
- $record = $select->execute()->fetchObject();
- if ($record) {
- $poll = node_load($record->nid);
- if ($poll->nid) {
- $poll = poll_block_latest_poll_view($poll);
- $block['subject'] = t('Poll');
- $block['content'] = $poll->content;
- return $block;
- }
- }
- }
-}
-
-/**
* Implement hook_cron().
*
* Closes polls that have exceeded their allowed runtime.
Index: modules/profile/profile.block.inc
===================================================================
RCS file: modules/profile/profile.block.inc
diff -N modules/profile/profile.block.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/profile/profile.block.inc 12 Nov 2009 22:36:19 -0000
@@ -0,0 +1,76 @@
+ array(PROFILE_PUBLIC, PROFILE_PUBLIC_LISTINGS)));
+ foreach ($result as $record) {
+ $fields[$record->name] = check_plain($record->title);
+ }
+ $fields['user_profile'] = t('Link to full user profile');
+ $form['profile_block_author_fields'] = array(
+ '#type' => 'checkboxes',
+ '#title' => t('Profile fields to display'),
+ '#default_value' => variable_get('profile_block_author_fields', array()),
+ '#options' => $fields,
+ '#description' => t('Select which profile fields you wish to display in the block. Only fields designated as public in the profile field configuration are available.', array('@profile-admin' => url('admin/config/people/profile'))),
+ );
+ return $form;
+}
+
+/**
+ * Implement hook_block_save().
+ */
+function profile_block_save($delta = '', $edit = array()) {
+ variable_set('profile_block_author_fields', $edit['profile_block_author_fields']);
+}
+
+/**
+ * Implement hook_block_view().
+ */
+function profile_block_view($delta = '') {
+ if (user_access('access user profiles')) {
+ $output = '';
+ if ((arg(0) == 'node') && is_numeric(arg(1)) && (arg(2) == NULL)) {
+ $node = node_load(arg(1));
+ $account = user_load(array('uid' => $node->uid));
+
+ if ($use_fields = variable_get('profile_block_author_fields', array())) {
+ // Compile a list of fields to show.
+ $fields = array();
+ $result = db_query('SELECT name, title, weight, visibility FROM {profile_field} WHERE visibility IN (:visibility) ORDER BY weight', array(':visibility' => array(PROFILE_PUBLIC, PROFILE_PUBLIC_LISTINGS)));
+ foreach ($result as $record) {
+ // Ensure that field is displayed only if it is among the defined block fields and, if it is private, the user has appropriate permissions.
+ if (isset($use_fields[$record->name]) && $use_fields[$record->name]) {
+ $fields[] = $record;
+ }
+ }
+ }
+
+ if (!empty($fields)) {
+ $profile = _profile_update_user_fields($fields, $account);
+ $output .= theme('profile_block', array('account' => $account, 'fields' => $profile));
+ }
+
+ if (isset($use_fields['user_profile']) && $use_fields['user_profile']) {
+ $output .= '' . l(t('View full user profile'), 'user/' . $account->uid) . '
';
+ }
+ }
+
+ if ($output) {
+ $block['subject'] = t('About %name', array('%name' => format_username($account)));
+ $block['content'] = $output;
+ return $block;
+ }
+ }
+}
+
Index: modules/profile/profile.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.info,v
retrieving revision 1.9
diff -u -p -r1.9 profile.info
--- modules/profile/profile.info 8 Jun 2009 09:23:53 -0000 1.9
+++ modules/profile/profile.info 12 Nov 2009 22:36:19 -0000
@@ -9,3 +9,4 @@ files[] = profile.admin.inc
files[] = profile.pages.inc
files[] = profile.install
files[] = profile.test
+files[] = profile.block.inc
Index: modules/profile/profile.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.module,v
retrieving revision 1.281
diff -u -p -r1.281 profile.module
--- modules/profile/profile.module 1 Nov 2009 21:26:44 -0000 1.281
+++ modules/profile/profile.module 12 Nov 2009 22:36:19 -0000
@@ -142,74 +142,6 @@ function profile_menu() {
}
/**
- * Implement hook_block_configure().
- */
-function profile_block_configure($delta = '') {
- // Compile a list of fields to show
- $fields = array();
- $result = db_query('SELECT name, title, weight, visibility FROM {profile_field} WHERE visibility IN (:visibility) ORDER BY weight', array(':visibility' => array(PROFILE_PUBLIC, PROFILE_PUBLIC_LISTINGS)));
- foreach ($result as $record) {
- $fields[$record->name] = check_plain($record->title);
- }
- $fields['user_profile'] = t('Link to full user profile');
- $form['profile_block_author_fields'] = array(
- '#type' => 'checkboxes',
- '#title' => t('Profile fields to display'),
- '#default_value' => variable_get('profile_block_author_fields', array()),
- '#options' => $fields,
- '#description' => t('Select which profile fields you wish to display in the block. Only fields designated as public in the profile field configuration are available.', array('@profile-admin' => url('admin/config/people/profile'))),
- );
- return $form;
-}
-
-/**
- * Implement hook_block_save().
- */
-function profile_block_save($delta = '', $edit = array()) {
- variable_set('profile_block_author_fields', $edit['profile_block_author_fields']);
-}
-
-/**
- * Implement hook_block_view().
- */
-function profile_block_view($delta = '') {
- if (user_access('access user profiles')) {
- $output = '';
- if ((arg(0) == 'node') && is_numeric(arg(1)) && (arg(2) == NULL)) {
- $node = node_load(arg(1));
- $account = user_load(array('uid' => $node->uid));
-
- if ($use_fields = variable_get('profile_block_author_fields', array())) {
- // Compile a list of fields to show.
- $fields = array();
- $result = db_query('SELECT name, title, weight, visibility FROM {profile_field} WHERE visibility IN (:visibility) ORDER BY weight', array(':visibility' => array(PROFILE_PUBLIC, PROFILE_PUBLIC_LISTINGS)));
- foreach ($result as $record) {
- // Ensure that field is displayed only if it is among the defined block fields and, if it is private, the user has appropriate permissions.
- if (isset($use_fields[$record->name]) && $use_fields[$record->name]) {
- $fields[] = $record;
- }
- }
- }
-
- if (!empty($fields)) {
- $profile = _profile_update_user_fields($fields, $account);
- $output .= theme('profile_block', array('account' => $account, 'fields' => $profile));
- }
-
- if (isset($use_fields['user_profile']) && $use_fields['user_profile']) {
- $output .= '' . l(t('View full user profile'), 'user/' . $account->uid) . '
';
- }
- }
-
- if ($output) {
- $block['subject'] = t('About %name', array('%name' => format_username($account)));
- $block['content'] = $output;
- return $block;
- }
- }
-}
-
-/**
* Implement hook_user_presave().
*/
function profile_user_presave(&$edit, $account, $category) {
Index: modules/search/search.block.inc
===================================================================
RCS file: modules/search/search.block.inc
diff -N modules/search/search.block.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/search/search.block.inc 12 Nov 2009 22:36:15 -0000
@@ -0,0 +1,28 @@
+nid);
+}
+
+/**
+ * Implement hook_comment_update().
+ */
+function search_comment_update($comment) {
+ // Reindex the node when comments are changed.
+ search_touch_node($comment->nid);
+}
+
+/**
+ * Implement hook_comment_delete().
+ */
+function search_comment_delete($comment) {
+ // Reindex the node when comments are deleted.
+ search_touch_node($comment->nid);
+}
+
+/**
+ * Implement hook_comment_publish().
+ */
+function search_comment_publish($comment) {
+ // Reindex the node when comments are published.
+ search_touch_node($comment->nid);
+}
+
+/**
+ * Implement hook_comment_unpublish().
+ */
+function search_comment_unpublish($comment) {
+ // Reindex the node when comments are unpublished.
+ search_touch_node($comment->nid);
+}
+
Index: modules/search/search.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.info,v
retrieving revision 1.10
diff -u -p -r1.10 search.info
--- modules/search/search.info 29 Aug 2009 10:46:41 -0000 1.10
+++ modules/search/search.info 12 Nov 2009 22:36:17 -0000
@@ -10,3 +10,6 @@ files[] = search.pages.inc
files[] = search.install
files[] = search.test
files[] = search.extender.inc
+files[] = search.block.inc
+files[] = search.comment.inc
+files[] = search.search.inc
Index: modules/search/search.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/search/search.module,v
retrieving revision 1.324
diff -u -p -r1.324 search.module
--- modules/search/search.module 8 Nov 2009 10:02:41 -0000 1.324
+++ modules/search/search.module 12 Nov 2009 22:36:17 -0000
@@ -91,6 +91,24 @@ define('PREG_CLASS_CJK', '\x{3041}-\x{30
'\x{4e00}-\x{9fbb}\x{f900}-\x{fad9}');
/**
+ * Implements hook_hook_info().
+ */
+function search_hook_info() {
+ $hooks['search_info'] = array('group' => 'search');
+ $hooks['search_page'] = array('group' => 'search');
+ $hooks['search_access'] = array('group' => 'search');
+ $hooks['search_execute'] = array('group' => 'search');
+ $hooks['search_admin'] = array('group' => 'search');
+ $hooks['search_status'] = array('group' => 'search');
+ $hooks['search_reset'] = array('group' => 'search');
+ $hooks['update_index'] = array('group' => 'search');
+ $hooks['node_update_index'] = array('group' => 'search');
+ $hooks['search_preprocess'] = array('group' => 'search');
+ $hooks['ranking'] = array('group' => 'search');
+ return $hooks;
+}
+
+/**
* Implement hook_help().
*/
function search_help($path, $arg) {
@@ -158,26 +176,6 @@ function search_permission() {
}
/**
- * Implement hook_block_info().
- */
-function search_block_info() {
- $blocks['form']['info'] = t('Search form');
- // Not worth caching.
- $blocks['form']['cache'] = DRUPAL_NO_CACHE;
- return $blocks;
-}
-
-/**
- * Implement hook_block_view().
- */
-function search_block_view($delta = '') {
- if (user_access('search content')) {
- $block['content'] = drupal_get_form('search_block_form');
- return $block;
- }
-}
-
-/**
* Implement hook_menu().
*/
function search_menu() {
@@ -712,21 +710,6 @@ function search_touch_node($nid) {
}
/**
- * Implement hook_node_update_index().
- */
-function search_node_update_index($node) {
- // Transplant links to a node into the target node.
- $result = db_query("SELECT caption FROM {search_node_links} WHERE nid = :nid", array(':nid' => $node->nid), array('target' => 'slave'));
- $output = array();
- foreach ($result as $link) {
- $output[] = $link->caption;
- }
- if (count($output)) {
- return '(' . implode(', ', $output) . ')';
- }
-}
-
-/**
* Implement hook_node_update().
*/
function search_node_update($node) {
@@ -736,46 +719,6 @@ function search_node_update($node) {
}
/**
- * Implement hook_comment_insert().
- */
-function search_comment_insert($comment) {
- // Reindex the node when comments are added.
- search_touch_node($comment->nid);
-}
-
-/**
- * Implement hook_comment_update().
- */
-function search_comment_update($comment) {
- // Reindex the node when comments are changed.
- search_touch_node($comment->nid);
-}
-
-/**
- * Implement hook_comment_delete().
- */
-function search_comment_delete($comment) {
- // Reindex the node when comments are deleted.
- search_touch_node($comment->nid);
-}
-
-/**
- * Implement hook_comment_publish().
- */
-function search_comment_publish($comment) {
- // Reindex the node when comments are published.
- search_touch_node($comment->nid);
-}
-
-/**
- * Implement hook_comment_unpublish().
- */
-function search_comment_unpublish($comment) {
- // Reindex the node when comments are unpublished.
- search_touch_node($comment->nid);
-}
-
-/**
* Extract a module-specific search option from a search query. e.g. 'type:book'
*/
function search_expression_extract($keys, $option) {
Index: modules/search/search.search.inc
===================================================================
RCS file: modules/search/search.search.inc
diff -N modules/search/search.search.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/search/search.search.inc 12 Nov 2009 22:36:17 -0000
@@ -0,0 +1,23 @@
+ $node->nid), array('target' => 'slave'));
+ $output = array();
+ foreach ($result as $link) {
+ $output[] = $link->caption;
+ }
+ if (count($output)) {
+ return '(' . implode(', ', $output) . ')';
+ }
+}
+
Index: modules/shortcut/shortcut.block.inc
===================================================================
RCS file: modules/shortcut/shortcut.block.inc
diff -N modules/shortcut/shortcut.block.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/shortcut/shortcut.block.inc 12 Nov 2009 22:36:13 -0000
@@ -0,0 +1,31 @@
+ $shortcut_set->title));
+ $data['content'] = shortcut_renderable_links($shortcut_set);
+ return $data;
+ }
+}
+
Index: modules/shortcut/shortcut.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/shortcut/shortcut.info,v
retrieving revision 1.1
diff -u -p -r1.1 shortcut.info
--- modules/shortcut/shortcut.info 17 Oct 2009 00:51:52 -0000 1.1
+++ modules/shortcut/shortcut.info 12 Nov 2009 22:36:13 -0000
@@ -7,3 +7,4 @@ core = 7.x
files[] = shortcut.module
files[] = shortcut.admin.inc
files[] = shortcut.install
+files[] = shortcut.block.inc
Index: modules/shortcut/shortcut.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/shortcut/shortcut.module,v
retrieving revision 1.5
diff -u -p -r1.5 shortcut.module
--- modules/shortcut/shortcut.module 11 Nov 2009 06:56:52 -0000 1.5
+++ modules/shortcut/shortcut.module 12 Nov 2009 22:36:13 -0000
@@ -120,29 +120,6 @@ function shortcut_theme() {
}
/**
- * Implement hook_block_info().
- */
-function shortcut_block_info() {
- $blocks['shortcuts']['info'] = t('Shortcuts');
- // Shortcut blocks can't be cached because each menu item can have a custom
- // access callback. menu.inc manages its own caching.
- $blocks['shortcuts']['cache'] = DRUPAL_NO_CACHE;
- return $blocks;
-}
-
-/**
- * Implement hook_block_view().
- */
-function shortcut_block_view($delta = '') {
- if ($delta == 'shortcuts') {
- $shortcut_set = shortcut_current_displayed_set();
- $data['subject'] = t('@shortcut_set shortcuts', array('@shortcut_set' => $shortcut_set->title));
- $data['content'] = shortcut_renderable_links($shortcut_set);
- return $data;
- }
-}
-
-/**
* Access callback for editing a shortcut set.
*
* @param $shortcut_set
Index: modules/statistics/statistics.block.inc
===================================================================
RCS file: modules/statistics/statistics.block.inc
diff -N modules/statistics/statistics.block.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/statistics/statistics.block.inc 12 Nov 2009 22:36:12 -0000
@@ -0,0 +1,71 @@
+ t('Disabled')) + drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30, 40));
+ $form['statistics_block_top_day_num'] = array('#type' => 'select', '#title' => t("Number of day's top views to display"), '#default_value' => variable_get('statistics_block_top_day_num', 0), '#options' => $numbers, '#description' => t('How many content items to display in "day" list.'));
+ $form['statistics_block_top_all_num'] = array('#type' => 'select', '#title' => t('Number of all time views to display'), '#default_value' => variable_get('statistics_block_top_all_num', 0), '#options' => $numbers, '#description' => t('How many content items to display in "all time" list.'));
+ $form['statistics_block_top_last_num'] = array('#type' => 'select', '#title' => t('Number of most recent views to display'), '#default_value' => variable_get('statistics_block_top_last_num', 0), '#options' => $numbers, '#description' => t('How many content items to display in "recently viewed" list.'));
+ return $form;
+}
+
+/**
+ * Implement hook_block_save().
+ */
+function statistics_block_save($delta = '', $edit = array()) {
+ variable_set('statistics_block_top_day_num', $edit['statistics_block_top_day_num']);
+ variable_set('statistics_block_top_all_num', $edit['statistics_block_top_all_num']);
+ variable_set('statistics_block_top_last_num', $edit['statistics_block_top_last_num']);
+}
+
+/**
+ * Implement hook_block_view().
+ */
+function statistics_block_view($delta = '') {
+ if (user_access('access content')) {
+ $content = array();
+
+ $daytop = variable_get('statistics_block_top_day_num', 0);
+ if ($daytop && ($result = statistics_title_list('daycount', $daytop)) && ($node_title_list = node_title_list($result, t("Today's:")))) {
+ $content[] = $node_title_list;
+ }
+
+ $alltimetop = variable_get('statistics_block_top_all_num', 0);
+ if ($alltimetop && ($result = statistics_title_list('totalcount', $alltimetop)) && ($node_title_list = node_title_list($result, t('All time:')))) {
+ $content[] = $node_title_list;
+ }
+
+ $lasttop = variable_get('statistics_block_top_last_num', 0);
+ if ($lasttop && ($result = statistics_title_list('timestamp', $lasttop)) && ($node_title_list = node_title_list($result, t('Last viewed:')))) {
+ $content[] = $node_title_list;
+ }
+
+ if (count($content)) {
+ $block['content'] = implode('
', $content);
+ $block['subject'] = t('Popular content');
+ return $block;
+ }
+ }
+}
+
Index: modules/statistics/statistics.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.info,v
retrieving revision 1.10
diff -u -p -r1.10 statistics.info
--- modules/statistics/statistics.info 19 Aug 2009 20:19:36 -0000 1.10
+++ modules/statistics/statistics.info 12 Nov 2009 22:36:13 -0000
@@ -10,3 +10,5 @@ files[] = statistics.pages.inc
files[] = statistics.install
files[] = statistics.test
files[] = statistics.tokens.inc
+files[] = statistics.block.inc
+files[] = statistics.search.inc
Index: modules/statistics/statistics.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.module,v
retrieving revision 1.324
diff -u -p -r1.324 statistics.module
--- modules/statistics/statistics.module 8 Nov 2009 10:02:41 -0000 1.324
+++ modules/statistics/statistics.module 12 Nov 2009 22:36:13 -0000
@@ -294,69 +294,6 @@ function statistics_get($nid) {
}
/**
- * Implement hook_block_info().
- */
-function statistics_block_info() {
- if (variable_get('statistics_count_content_views', 0)) {
- $blocks['popular']['info'] = t('Popular content');
- // Too dynamic to cache.
- $blocks['popular']['cache'] = DRUPAL_NO_CACHE;
- return $blocks;
- }
-}
-
-/**
- * Implement hook_block_configure().
- */
-function statistics_block_configure($delta = '') {
- // Popular content block settings
- $numbers = array('0' => t('Disabled')) + drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30, 40));
- $form['statistics_block_top_day_num'] = array('#type' => 'select', '#title' => t("Number of day's top views to display"), '#default_value' => variable_get('statistics_block_top_day_num', 0), '#options' => $numbers, '#description' => t('How many content items to display in "day" list.'));
- $form['statistics_block_top_all_num'] = array('#type' => 'select', '#title' => t('Number of all time views to display'), '#default_value' => variable_get('statistics_block_top_all_num', 0), '#options' => $numbers, '#description' => t('How many content items to display in "all time" list.'));
- $form['statistics_block_top_last_num'] = array('#type' => 'select', '#title' => t('Number of most recent views to display'), '#default_value' => variable_get('statistics_block_top_last_num', 0), '#options' => $numbers, '#description' => t('How many content items to display in "recently viewed" list.'));
- return $form;
-}
-
-/**
- * Implement hook_block_save().
- */
-function statistics_block_save($delta = '', $edit = array()) {
- variable_set('statistics_block_top_day_num', $edit['statistics_block_top_day_num']);
- variable_set('statistics_block_top_all_num', $edit['statistics_block_top_all_num']);
- variable_set('statistics_block_top_last_num', $edit['statistics_block_top_last_num']);
-}
-
-/**
- * Implement hook_block_view().
- */
-function statistics_block_view($delta = '') {
- if (user_access('access content')) {
- $content = array();
-
- $daytop = variable_get('statistics_block_top_day_num', 0);
- if ($daytop && ($result = statistics_title_list('daycount', $daytop)) && ($node_title_list = node_title_list($result, t("Today's:")))) {
- $content[] = $node_title_list;
- }
-
- $alltimetop = variable_get('statistics_block_top_all_num', 0);
- if ($alltimetop && ($result = statistics_title_list('totalcount', $alltimetop)) && ($node_title_list = node_title_list($result, t('All time:')))) {
- $content[] = $node_title_list;
- }
-
- $lasttop = variable_get('statistics_block_top_last_num', 0);
- if ($lasttop && ($result = statistics_title_list('timestamp', $lasttop)) && ($node_title_list = node_title_list($result, t('Last viewed:')))) {
- $content[] = $node_title_list;
- }
-
- if (count($content)) {
- $block['content'] = implode('
', $content);
- $block['subject'] = t('Popular content');
- return $block;
- }
- }
-}
-
-/**
* It is possible to adjust the width of columns generated by the
* statistics module.
*/
@@ -383,31 +320,3 @@ function statistics_node_delete($node) {
->execute();
}
-/**
- * Implement hook_ranking().
- */
-function statistics_ranking() {
- if (variable_get('statistics_count_content_views', 0)) {
- return array(
- 'views' => array(
- 'title' => t('Number of views'),
- 'join' => array(
- 'type' => 'LEFT',
- 'table' => 'node_counter',
- 'alias' => 'node_counter',
- 'on' => 'node_counter.nid = i.sid',
- ),
- // Inverse law that maps the highest view count on the site to 1 and 0 to 0.
- 'score' => '2.0 - 2.0 / (1.0 + node_counter.totalcount * CAST(:scale AS DECIMAL))',
- 'arguments' => array(':scale' => variable_get('node_cron_views_scale', 0)),
- ),
- );
- }
-}
-
-/**
- * Implement hook_update_index().
- */
-function statistics_update_index() {
- variable_set('node_cron_views_scale', 1.0 / max(1, db_query('SELECT MAX(totalcount) FROM {node_counter}')->fetchField()));
-}
Index: modules/statistics/statistics.search.inc
===================================================================
RCS file: modules/statistics/statistics.search.inc
diff -N modules/statistics/statistics.search.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/statistics/statistics.search.inc 12 Nov 2009 22:36:13 -0000
@@ -0,0 +1,36 @@
+fetchField()));
+}
+/**
+ * Implement hook_ranking().
+ */
+function statistics_ranking() {
+ if (variable_get('statistics_count_content_views', 0)) {
+ return array(
+ 'views' => array(
+ 'title' => t('Number of views'),
+ 'join' => array(
+ 'type' => 'LEFT',
+ 'table' => 'node_counter',
+ 'alias' => 'node_counter',
+ 'on' => 'node_counter.nid = i.sid',
+ ),
+ // Inverse law that maps the highest view count on the site to 1 and 0 to 0.
+ 'score' => '2.0 - 2.0 / (1.0 + node_counter.totalcount * CAST(:scale AS DECIMAL))',
+ 'arguments' => array(':scale' => variable_get('node_cron_views_scale', 0)),
+ ),
+ );
+ }
+}
+
Index: modules/system/system.block.inc
===================================================================
RCS file: modules/system/system.block.inc
diff -N modules/system/system.block.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/system/system.block.inc 12 Nov 2009 22:36:03 -0000
@@ -0,0 +1,69 @@
+ t('Main page content'),
+ // Cached elsewhere.
+ 'cache' => DRUPAL_NO_CACHE,
+ );
+ $blocks['powered-by'] = array(
+ 'info' => t('Powered by Drupal'),
+ 'weight' => '10',
+ 'cache' => DRUPAL_NO_CACHE,
+ );
+ $blocks['help'] = array(
+ 'info' => t('System help'),
+ 'weight' => '5',
+ );
+ // System-defined menu blocks.
+ foreach (menu_list_system_menus() as $menu_name => $title) {
+ $blocks[$menu_name]['info'] = t($title);
+ // Menu blocks can't be cached because each menu item can have
+ // a custom access callback. menu.inc manages its own caching.
+ $blocks[$menu_name]['cache'] = DRUPAL_NO_CACHE;
+ }
+ return $blocks;
+}
+
+/**
+ * Implement hook_block_view().
+ *
+ * Generate a block with a promotional link to Drupal.org and
+ * all system menu blocks.
+ */
+function system_block_view($delta = '') {
+ $block = array();
+ switch ($delta) {
+ case 'main':
+ $block['subject'] = NULL;
+ $block['content'] = drupal_set_page_content();
+ return $block;
+ case 'powered-by':
+ $block['subject'] = NULL;
+ $block['content'] = theme('system_powered_by');
+ return $block;
+ case 'help':
+ $block['subject'] = NULL;
+ $block['content'] = menu_get_active_help();
+ return $block;
+ default:
+ // All system menu blocks.
+ $system_menus = menu_list_system_menus();
+ if (isset($system_menus[$delta])) {
+ $block['subject'] = t($system_menus[$delta]);
+ $block['content'] = menu_tree($delta);
+ return $block;
+ }
+ break;
+ }
+}
+
Index: modules/system/system.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.info,v
retrieving revision 1.18
diff -u -p -r1.18 system.info
--- modules/system/system.info 15 Oct 2009 21:19:31 -0000 1.18
+++ modules/system/system.info 12 Nov 2009 22:36:03 -0000
@@ -16,3 +16,4 @@ files[] = system.tokens.inc
files[] = system.updater.inc
files[] = mail.sending.inc
required = TRUE
+files[] = system.block.inc
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.840
diff -u -p -r1.840 system.module
--- modules/system/system.module 11 Nov 2009 17:14:59 -0000 1.840
+++ modules/system/system.module 12 Nov 2009 22:36:03 -0000
@@ -1803,67 +1803,6 @@ function system_user_timezone(&$form, &$
}
/**
- * Implement hook_block_info().
- */
-function system_block_info() {
- $blocks['main'] = array(
- 'info' => t('Main page content'),
- // Cached elsewhere.
- 'cache' => DRUPAL_NO_CACHE,
- );
- $blocks['powered-by'] = array(
- 'info' => t('Powered by Drupal'),
- 'weight' => '10',
- 'cache' => DRUPAL_NO_CACHE,
- );
- $blocks['help'] = array(
- 'info' => t('System help'),
- 'weight' => '5',
- );
- // System-defined menu blocks.
- foreach (menu_list_system_menus() as $menu_name => $title) {
- $blocks[$menu_name]['info'] = t($title);
- // Menu blocks can't be cached because each menu item can have
- // a custom access callback. menu.inc manages its own caching.
- $blocks[$menu_name]['cache'] = DRUPAL_NO_CACHE;
- }
- return $blocks;
-}
-
-/**
- * Implement hook_block_view().
- *
- * Generate a block with a promotional link to Drupal.org and
- * all system menu blocks.
- */
-function system_block_view($delta = '') {
- $block = array();
- switch ($delta) {
- case 'main':
- $block['subject'] = NULL;
- $block['content'] = drupal_set_page_content();
- return $block;
- case 'powered-by':
- $block['subject'] = NULL;
- $block['content'] = theme('system_powered_by');
- return $block;
- case 'help':
- $block['subject'] = NULL;
- $block['content'] = menu_get_active_help();
- return $block;
- default:
- // All system menu blocks.
- $system_menus = menu_list_system_menus();
- if (isset($system_menus[$delta])) {
- $block['subject'] = t($system_menus[$delta]);
- $block['content'] = menu_tree($delta);
- return $block;
- }
- break;
- }
-}
-
-/**
* Provide a single block on the administration overview page.
*
* @param $item
Index: modules/taxonomy/taxonomy.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.info,v
retrieving revision 1.10
diff -u -p -r1.10 taxonomy.info
--- modules/taxonomy/taxonomy.info 19 Aug 2009 20:19:37 -0000 1.10
+++ modules/taxonomy/taxonomy.info 12 Nov 2009 22:36:00 -0000
@@ -10,3 +10,4 @@ files[] = taxonomy.pages.inc
files[] = taxonomy.install
files[] = taxonomy.test
files[] = taxonomy.tokens.inc
+files[] = taxonomy.taxonomy.inc
Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.537
diff -u -p -r1.537 taxonomy.module
--- modules/taxonomy/taxonomy.module 11 Nov 2009 17:10:49 -0000 1.537
+++ modules/taxonomy/taxonomy.module 12 Nov 2009 22:36:00 -0000
@@ -7,6 +7,21 @@
*/
/**
+ * Implements hook_hook_info().
+ */
+function taxonomy_hook_info() {
+ $hooks['taxonomy_vocabulary_insert'] = array('group' => 'taxonomy');
+ $hooks['taxonomy_vocabulary_load'] = array('group' => 'taxonomy');
+ $hooks['taxonomy_vocabulary_update'] = array('group' => 'taxonomy');
+ $hooks['taxonomy_vocabulary_delete'] = array('group' => 'taxonomy');
+ $hooks['taxonomy_term_insert'] = array('group' => 'taxonomy');
+ $hooks['taxonomy_term_load'] = array('group' => 'taxonomy');
+ $hooks['taxonomy_term_update'] = array('group' => 'taxonomy');
+ $hooks['taxonomy_term_delete'] = array('group' => 'taxonomy');
+ return $hooks;
+}
+
+/**
* Implement hook_permission().
*/
function taxonomy_permission() {
@@ -1432,15 +1447,5 @@ function taxonomy_node_delete($node) {
}
/**
- * Implement hook_taxonomy_term_delete().
- */
-function taxonomy_taxonomy_term_delete($term) {
- if (variable_get('taxonomy_maintain_index_table', TRUE)) {
- // Clean up the {taxonomy_index} table when terms are deleted.
- db_delete('taxonomy_index')->condition('tid', $term->tid)->execute();
- }
-}
-
-/**
* @} End of "defgroup taxonomy indexing"
*/
Index: modules/taxonomy/taxonomy.taxonomy.inc
===================================================================
RCS file: modules/taxonomy/taxonomy.taxonomy.inc
diff -N modules/taxonomy/taxonomy.taxonomy.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/taxonomy/taxonomy.taxonomy.inc 12 Nov 2009 22:36:00 -0000
@@ -0,0 +1,18 @@
+condition('tid', $term->tid)->execute();
+ }
+}
+
Index: modules/tracker/tracker.comment.inc
===================================================================
RCS file: modules/tracker/tracker.comment.inc
diff -N modules/tracker/tracker.comment.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/tracker/tracker.comment.inc 12 Nov 2009 22:35:58 -0000
@@ -0,0 +1,47 @@
+nid, $comment->uid, $comment->changed);
+}
+
+/**
+ * Implement hook_comment_publish().
+ *
+ * This actually handles the insert and update of published nodes since
+ * comment_save() calls hook_comment_publish() for all published comments.
+ */
+function tracker_comment_publish($comment) {
+ _tracker_add($comment->nid, $comment->uid, $comment->changed);
+}
+
+/**
+ * Implement hook_comment_unpublish().
+ */
+function tracker_comment_unpublish($comment) {
+ _tracker_remove($comment->nid, $comment->uid, $comment->changed);
+}
+
Index: modules/tracker/tracker.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/tracker/tracker.info,v
retrieving revision 1.9
diff -u -p -r1.9 tracker.info
--- modules/tracker/tracker.info 8 Jun 2009 09:23:54 -0000 1.9
+++ modules/tracker/tracker.info 12 Nov 2009 22:35:58 -0000
@@ -8,3 +8,4 @@ core = 7.x
files[] = tracker.module
files[] = tracker.pages.inc
files[] = tracker.test
+files[] = tracker.comment.inc
Index: modules/tracker/tracker.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/tracker/tracker.module,v
retrieving revision 1.167
diff -u -p -r1.167 tracker.module
--- modules/tracker/tracker.module 8 Nov 2009 10:02:41 -0000 1.167
+++ modules/tracker/tracker.module 12 Nov 2009 22:35:58 -0000
@@ -177,45 +177,6 @@ function tracker_node_delete($node, $arg
}
/**
- * Implement hook_comment_update().
- *
- * Comment module doesn't call hook_comment_unpublish() when saving individual
- * comments so we need to check for those here.
- */
-function tracker_comment_update($comment) {
- $comment = (array) $comment;
- // comment_save() calls hook_comment_publish() for all published comments
- // so we to handle all other values here.
- if ($comment['status'] != COMMENT_PUBLISHED) {
- _tracker_remove($comment['nid'], $comment['uid'], $comment['timestamp']);
- }
-}
-
-/**
- * Implement hook_comment_publish().
- *
- * This actually handles the insert and update of published nodes since
- * comment_save() calls hook_comment_publish() for all published comments.
- */
-function tracker_comment_publish($comment) {
- _tracker_add($comment->nid, $comment->uid, $comment->changed);
-}
-
-/**
- * Implement hook_comment_unpublish().
- */
-function tracker_comment_unpublish($comment) {
- _tracker_remove($comment->nid, $comment->uid, $comment->changed);
-}
-
-/**
- * Implement hook_comment_delete().
- */
-function tracker_comment_delete($comment) {
- _tracker_remove($comment->nid, $comment->uid, $comment->changed);
-}
-
-/**
* Update indexing tables when a node is added, updated or commented on.
*
* @param $nid
Index: modules/trigger/trigger.comment.inc
===================================================================
RCS file: modules/trigger/trigger.comment.inc
diff -N modules/trigger/trigger.comment.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/trigger/trigger.comment.inc 12 Nov 2009 22:35:55 -0000
@@ -0,0 +1,43 @@
+ 'select',
+ '#title' => t('Number of users to display'),
+ '#default_value' => variable_get('user_block_whois_new_count', 5),
+ '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)),
+ );
+ return $form;
+
+ case 'online':
+ $period = drupal_map_assoc(array(30, 60, 120, 180, 300, 600, 900, 1800, 2700, 3600, 5400, 7200, 10800, 21600, 43200, 86400), 'format_interval');
+ $form['user_block_seconds_online'] = array('#type' => 'select', '#title' => t('User activity'), '#default_value' => variable_get('user_block_seconds_online', 900), '#options' => $period, '#description' => t('A user is considered online for this long after they have last viewed a page.'));
+ $form['user_block_max_list_count'] = array('#type' => 'select', '#title' => t('User list length'), '#default_value' => variable_get('user_block_max_list_count', 10), '#options' => drupal_map_assoc(array(0, 5, 10, 15, 20, 25, 30, 40, 50, 75, 100)), '#description' => t('Maximum number of currently online users to display.'));
+ return $form;
+ }
+}
+
+/**
+ * Implement hook_block_save().
+ */
+function user_block_save($delta = '', $edit = array()) {
+ global $user;
+
+ switch ($delta) {
+ case 'new':
+ variable_set('user_block_whois_new_count', $edit['user_block_whois_new_count']);
+ break;
+
+ case 'online':
+ variable_set('user_block_seconds_online', $edit['user_block_seconds_online']);
+ variable_set('user_block_max_list_count', $edit['user_block_max_list_count']);
+ break;
+ }
+}
+
+/**
+ * Implement hook_block_view().
+ */
+function user_block_view($delta = '') {
+ global $user;
+
+ $block = array();
+
+ switch ($delta) {
+ case 'login':
+ // For usability's sake, avoid showing two login forms on one page.
+ if (!$user->uid && !(arg(0) == 'user' && !is_numeric(arg(1)))) {
+
+ $block['subject'] = t('User login');
+ $block['content'] = drupal_get_form('user_login_block');
+ }
+ return $block;
+
+ case 'new':
+ if (user_access('access content')) {
+ // Retrieve a list of new users who have subsequently accessed the site successfully.
+ $items = db_query_range('SELECT uid, name FROM {users} WHERE status <> 0 AND access <> 0 ORDER BY created DESC', 0, variable_get('user_block_whois_new_count', 5))->fetchAll();
+ $output = theme('user_list', array('users' => $items));
+
+ $block['subject'] = t('Who\'s new');
+ $block['content'] = $output;
+ }
+ return $block;
+
+ case 'online':
+ if (user_access('access content')) {
+ // Count users active within the defined period.
+ $interval = REQUEST_TIME - variable_get('user_block_seconds_online', 900);
+
+ // Perform database queries to gather online user lists. We use s.timestamp
+ // rather than u.access because it is much faster.
+ $authenticated_count = db_query("SELECT COUNT(DISTINCT s.uid) FROM {sessions} s WHERE s.timestamp >= :timestamp AND s.uid > 0", array(':timestamp' => $interval))->fetchField();
+
+ $output = format_plural($authenticated_count, 'There is currently 1 user online.', 'There are currently @count users online.');
+
+ // Display a list of currently online users.
+ $max_users = variable_get('user_block_max_list_count', 10);
+ if ($authenticated_count && $max_users) {
+ $items = db_query_range('SELECT u.uid, u.name, MAX(s.timestamp) AS max_timestamp FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.timestamp >= :interval AND s.uid > 0 GROUP BY u.uid, u.name ORDER BY max_timestamp DESC', 0, $max_users, array(':interval' => $interval))->fetchAll();
+ $output .= theme('user_list', array('users' => $items));
+ }
+
+ $block['subject'] = t('Who\'s online');
+ $block['content'] = $output;
+ }
+ return $block;
+ }
+}
+
Index: modules/user/user.comment.inc
===================================================================
RCS file: modules/user/user.comment.inc
diff -N modules/user/user.comment.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/user/user.comment.inc 12 Nov 2009 22:35:47 -0000
@@ -0,0 +1,20 @@
+signature)) {
+ $comment->signature = check_markup($comment->signature, $comment->format, '', TRUE);
+ }
+ else {
+ $comment->signature = '';
+ }
+}
+
Index: modules/user/user.info
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.info,v
retrieving revision 1.12
diff -u -p -r1.12 user.info
--- modules/user/user.info 19 Aug 2009 20:19:37 -0000 1.12
+++ modules/user/user.info 12 Nov 2009 22:35:50 -0000
@@ -11,3 +11,6 @@ files[] = user.install
files[] = user.test
files[] = user.tokens.inc
required = TRUE
+files[] = user.block.inc
+files[] = user.comment.inc
+files[] = user.search.inc
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1078
diff -u -p -r1.1078 user.module
--- modules/user/user.module 12 Nov 2009 07:00:48 -0000 1.1078
+++ modules/user/user.module 12 Nov 2009 22:35:50 -0000
@@ -778,49 +778,6 @@ function user_file_delete($file) {
}
/**
- * Implement hook_search_info().
- */
-function user_search_info() {
- return array(
- 'title' => 'Users',
- );
-}
-
-/**
- * Implement hook_search_access().
- */
-function user_search_access() {
- return user_access('access user profiles');
-}
-
-/**
- * Implement hook_search_execute().
- */
-function user_search_execute($keys = NULL) {
- $find = array();
- // Replace wildcards with MySQL/PostgreSQL wildcards.
- $keys = preg_replace('!\*+!', '%', $keys);
- $query = db_select('users')->extend('PagerDefault');
- $query->fields('users', array('name', 'uid', 'mail'));
- if (user_access('administer users')) {
- // Administrators can also search in the otherwise private email field.
- $query->condition(db_or()->
- where('LOWER(name) LIKE LOWER(:name)', array(':name' => "%$keys%"))->
- where('LOWER(mail) LIKE LOWER(:mail)', array(':mail' => "%$keys%")));
- }
- else {
- $query->where('LOWER(name) LIKE LOWER(:name)', array(':name' => "%$keys%"));
- }
- $result = $query
- ->limit(15)
- ->execute();
- foreach ($result as $account) {
- $find[] = array('title' => $account->name . ' (' . $account->mail . ')', 'link' => url('user/' . $account->uid, array('absolute' => TRUE)));
- }
- return $find;
-}
-
-/**
* Implement hook_element_info().
*/
function user_element_info() {
@@ -1106,120 +1063,6 @@ function user_login_block($form) {
}
/**
- * Implement hook_block_info().
- */
-function user_block_info() {
- global $user;
-
- $blocks['login']['info'] = t('User login');
- // Not worth caching.
- $blocks['login']['cache'] = DRUPAL_NO_CACHE;
-
- $blocks['new']['info'] = t('Who\'s new');
-
- // Too dynamic to cache.
- $blocks['online']['info'] = t('Who\'s online');
- $blocks['online']['cache'] = DRUPAL_NO_CACHE;
- return $blocks;
-}
-
-/**
- * Implement hook_block_configure().
- */
-function user_block_configure($delta = '') {
- global $user;
-
- switch ($delta) {
- case 'new':
- $form['user_block_whois_new_count'] = array(
- '#type' => 'select',
- '#title' => t('Number of users to display'),
- '#default_value' => variable_get('user_block_whois_new_count', 5),
- '#options' => drupal_map_assoc(array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)),
- );
- return $form;
-
- case 'online':
- $period = drupal_map_assoc(array(30, 60, 120, 180, 300, 600, 900, 1800, 2700, 3600, 5400, 7200, 10800, 21600, 43200, 86400), 'format_interval');
- $form['user_block_seconds_online'] = array('#type' => 'select', '#title' => t('User activity'), '#default_value' => variable_get('user_block_seconds_online', 900), '#options' => $period, '#description' => t('A user is considered online for this long after they have last viewed a page.'));
- $form['user_block_max_list_count'] = array('#type' => 'select', '#title' => t('User list length'), '#default_value' => variable_get('user_block_max_list_count', 10), '#options' => drupal_map_assoc(array(0, 5, 10, 15, 20, 25, 30, 40, 50, 75, 100)), '#description' => t('Maximum number of currently online users to display.'));
- return $form;
- }
-}
-
-/**
- * Implement hook_block_save().
- */
-function user_block_save($delta = '', $edit = array()) {
- global $user;
-
- switch ($delta) {
- case 'new':
- variable_set('user_block_whois_new_count', $edit['user_block_whois_new_count']);
- break;
-
- case 'online':
- variable_set('user_block_seconds_online', $edit['user_block_seconds_online']);
- variable_set('user_block_max_list_count', $edit['user_block_max_list_count']);
- break;
- }
-}
-
-/**
- * Implement hook_block_view().
- */
-function user_block_view($delta = '') {
- global $user;
-
- $block = array();
-
- switch ($delta) {
- case 'login':
- // For usability's sake, avoid showing two login forms on one page.
- if (!$user->uid && !(arg(0) == 'user' && !is_numeric(arg(1)))) {
-
- $block['subject'] = t('User login');
- $block['content'] = drupal_get_form('user_login_block');
- }
- return $block;
-
- case 'new':
- if (user_access('access content')) {
- // Retrieve a list of new users who have subsequently accessed the site successfully.
- $items = db_query_range('SELECT uid, name FROM {users} WHERE status <> 0 AND access <> 0 ORDER BY created DESC', 0, variable_get('user_block_whois_new_count', 5))->fetchAll();
- $output = theme('user_list', array('users' => $items));
-
- $block['subject'] = t('Who\'s new');
- $block['content'] = $output;
- }
- return $block;
-
- case 'online':
- if (user_access('access content')) {
- // Count users active within the defined period.
- $interval = REQUEST_TIME - variable_get('user_block_seconds_online', 900);
-
- // Perform database queries to gather online user lists. We use s.timestamp
- // rather than u.access because it is much faster.
- $authenticated_count = db_query("SELECT COUNT(DISTINCT s.uid) FROM {sessions} s WHERE s.timestamp >= :timestamp AND s.uid > 0", array(':timestamp' => $interval))->fetchField();
-
- $output = format_plural($authenticated_count, 'There is currently 1 user online.', 'There are currently @count users online.');
-
- // Display a list of currently online users.
- $max_users = variable_get('user_block_max_list_count', 10);
- if ($authenticated_count && $max_users) {
- $items = db_query_range('SELECT u.uid, u.name, MAX(s.timestamp) AS max_timestamp FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.timestamp >= :interval AND s.uid > 0 GROUP BY u.uid, u.name ORDER BY max_timestamp DESC', 0, $max_users, array(':interval' => $interval))->fetchAll();
- $output .= theme('user_list', array('users' => $items));
- }
-
- $block['subject'] = t('Who\'s online');
- $block['content'] = $output;
- }
- return $block;
- }
-}
-
-/**
* Process variables for user-picture.tpl.php.
*
* The $variables array contains the following arguments:
@@ -2854,18 +2697,6 @@ function user_forms() {
}
/**
- * Implement hook_comment_view().
- */
-function user_comment_view($comment) {
- if (variable_get('user_signatures', 0) && !empty($comment->signature)) {
- $comment->signature = check_markup($comment->signature, $comment->format, '', TRUE);
- }
- else {
- $comment->signature = '';
- }
-}
-
-/**
* Theme output of user signature.
*
* @ingroup themeable
Index: modules/user/user.search.inc
===================================================================
RCS file: modules/user/user.search.inc
diff -N modules/user/user.search.inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ modules/user/user.search.inc 12 Nov 2009 22:35:50 -0000
@@ -0,0 +1,51 @@
+ 'Users',
+ );
+}
+
+/**
+ * Implement hook_search_access().
+ */
+function user_search_access() {
+ return user_access('access user profiles');
+}
+
+/**
+ * Implement hook_search_execute().
+ */
+function user_search_execute($keys = NULL) {
+ $find = array();
+ // Replace wildcards with MySQL/PostgreSQL wildcards.
+ $keys = preg_replace('!\*+!', '%', $keys);
+ $query = db_select('users')->extend('PagerDefault');
+ $query->fields('users', array('name', 'uid', 'mail'));
+ if (user_access('administer users')) {
+ // Administrators can also search in the otherwise private email field.
+ $query->condition(db_or()->
+ where('LOWER(name) LIKE LOWER(:name)', array(':name' => "%$keys%"))->
+ where('LOWER(mail) LIKE LOWER(:mail)', array(':mail' => "%$keys%")));
+ }
+ else {
+ $query->where('LOWER(name) LIKE LOWER(:name)', array(':name' => "%$keys%"));
+ }
+ $result = $query
+ ->limit(15)
+ ->execute();
+ foreach ($result as $account) {
+ $find[] = array('title' => $account->name . ' (' . $account->mail . ')', 'link' => url('user/' . $account->uid, array('absolute' => TRUE)));
+ }
+ return $find;
+}
+