? .DS_Store ? LICENSE.txt Index: CHANGELOG.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/zeitgeist/CHANGELOG.txt,v retrieving revision 1.6.6.7 diff -u -p -r1.6.6.7 CHANGELOG.txt --- CHANGELOG.txt 30 Aug 2010 19:23:50 -0000 1.6.6.7 +++ CHANGELOG.txt 7 Nov 2010 18:18:33 -0000 @@ -1,5 +1,5 @@ $Id: CHANGELOG.txt,v 1.6.6.7 2010/08/30 19:23:50 fgm Exp $ -$Name: $ +$Name: DRUPAL-6--1 $ 2010-10-30 / 1.9.6.8 BUG #897686 by fgm: incorrect use of field alias in ZG report Index: zeitgeist.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/zeitgeist/Attic/zeitgeist.admin.inc,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 zeitgeist.admin.inc --- zeitgeist.admin.inc 29 Aug 2010 18:24:26 -0000 1.1.2.1 +++ zeitgeist.admin.inc 7 Nov 2010 18:18:37 -0000 @@ -80,6 +80,13 @@ function _zeitgeist_admin_settings() { '#collapsible' => TRUE, '#collapsed' => TRUE, ); + $form['zeitgeist-display']['zeitgeist-latest'][ZGVARLATESTLOGGEDIN] = array + ( + '#type' => 'checkbox', + '#title' => t('Only display searches of logged in user'), + '#description' => t('Only display the latest searches of logged in user'), + '#default_value' => variable_get(ZGVARLATESTLOGGEDIN,0), + ); $form['zeitgeist-display']['zeitgeist-latest'][ZGVARLATESTCOUNT] = array ( '#type' => 'textfield', Index: zeitgeist.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/zeitgeist/Attic/zeitgeist.info,v retrieving revision 1.1.4.4 diff -u -p -r1.1.4.4 zeitgeist.info --- zeitgeist.info 29 Aug 2010 18:24:26 -0000 1.1.4.4 +++ zeitgeist.info 7 Nov 2010 18:18:37 -0000 @@ -5,3 +5,10 @@ dependencies[] = search package = Search core = 6.x php = 5.1 + +; Information added by drupal.org packaging script on 2010-08-31 +version = "6.x-1.x-dev" +core = "6.x" +project = "zeitgeist" +datestamp = "1283214220" + Index: zeitgeist.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/zeitgeist/Attic/zeitgeist.install,v retrieving revision 1.1.6.6 diff -u -p -r1.1.6.6 zeitgeist.install --- zeitgeist.install 29 Aug 2010 18:24:26 -0000 1.1.6.6 +++ zeitgeist.install 7 Nov 2010 18:18:39 -0000 @@ -20,6 +20,13 @@ function zeitgeist_schema() { $t = get_t(); $schema['zeitgeist'] = array( 'fields' => array( + 'uid' => array( + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + 'description' => $t('The searcher\'s user id.'), + ), 'search' => array( 'type' => 'varchar', 'length' => 80, Index: zeitgeist.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/zeitgeist/zeitgeist.module,v retrieving revision 1.9.6.8 diff -u -p -r1.9.6.8 zeitgeist.module --- zeitgeist.module 30 Aug 2010 19:23:34 -0000 1.9.6.8 +++ zeitgeist.module 7 Nov 2010 18:18:42 -0000 @@ -84,18 +84,20 @@ define('ZGVALIDATEDISPLAY', 2); // U /* * Module persistent variables: names */ -define('ZGVARLATESTCLEAR', 'zeitgeist_latest_clear'); // What is the data of the latest history clear ? -define('ZGVARLATESTCOUNT', 'zeitgeist_latest_count'); // How many recent searches are displayed in their block ? -define('ZGVARLATESTCACHE', 'zeitgeist_latest_cache'); // Block minimum caching duration in minutes -define('ZGVARTOPCOUNT', 'zeitgeist_top_count'); // How many top queries are displayed in their block ? -define('ZGVARTOPSPAN', 'zeitgeist_top_span'); // ZG span for the top queries block -define('ZGVARTOPCACHE', 'zeitgeist_top_cache'); // Block minimum caching duration in minutes -define('ZGVARHISTORY', 'zeitgeist_history'); // How long does the module keep its historical data. -define('ZGVARNOFOLLOW', 'zeitgeist_nofollow'); // Emit a rel=nofollow attribute in feature blocks -define('ZGVARPAGEHEIGHT', 'zeitgeist_page_height'); // Number of rows on the zeitgeist pager -define('ZGVARRECORDEMPTY', 'zeitgeist_record_empty'); // Record empty searches -define('ZGVARTYPE', 'zeitgeist_type'); // Display search type in "recent searches" blocks -define('ZGVARVALIDATION', 'zeitgeist_validation'); // Configure handling of HTML search strings +define('ZGVARLATESTCLEAR', 'zeitgeist_latest_clear'); // What is the data of the latest history clear ? +define('ZGVARLATESTCOUNT', 'zeitgeist_latest_count'); // How many recent searches are displayed in their block ? +define('ZGVARLATESTCACHE', 'zeitgeist_latest_cache'); // Block minimum caching duration in minutes +define('ZGVARTOPCOUNT', 'zeitgeist_top_count'); // How many top queries are displayed in their block ? +define('ZGVARTOPSPAN', 'zeitgeist_top_span'); // ZG span for the top queries block +define('ZGVARTOPCACHE', 'zeitgeist_top_cache'); // Block minimum caching duration in minutes +define('ZGVARHISTORY', 'zeitgeist_history'); // How long does the module keep its historical data. +define('ZGVARNOFOLLOW', 'zeitgeist_nofollow'); // Emit a rel=nofollow attribute in feature blocks +define('ZGVARPAGEHEIGHT', 'zeitgeist_page_height'); // Number of rows on the zeitgeist pager +define('ZGVARRECORDEMPTY', 'zeitgeist_record_empty'); // Record empty searches +define('ZGVARTYPE', 'zeitgeist_type'); // Display search type in "recent searches" blocks +define('ZGVARVALIDATION', 'zeitgeist_validation'); // Configure handling of HTML search strings +define('ZGVARLATESTLOGGEDIN','zeitgeist_latest_logged_in'); // Restrict recent search display to current user + /* * Module persistent variables: default values @@ -149,6 +151,7 @@ function zeitgeist_help($path, $arg) { * Implement hook_menu(). */ function zeitgeist_menu() { + $items = array(); $items[ZGPATHSETTINGS] = array( @@ -296,6 +299,8 @@ function zeitgeist_block($op = 'list', $ * @return void */ function _zeitgeist_store_search($keys, $kind, $ts = NULL) { + global $user; + $uid = $user->uid; $do_store = empty($keys) ? variable_get(ZGVARRECORDEMPTY, ZGDEFRECORDEMPTY) // Make sure we do want to store an empty search : TRUE; @@ -307,10 +312,10 @@ function _zeitgeist_store_search($keys, if (!isset($ts)) { $ts = time(); } - $sq = 'INSERT INTO ' . ZGTABLE . ' (search, category, ts) ' - . "VALUES ('%s', '%s', %d) "; + $sq = 'INSERT INTO ' . ZGTABLE . ' (uid,search, category, ts) ' + . "VALUES ('%d','%s', '%s', %d) "; // No access control on logging, so no db_rewrite_sql(). - db_query($sq, $keys, $kind, $ts); + db_query($sq, $uid, $keys, $kind, $ts); } /** @@ -328,8 +333,11 @@ function _zeitgeist_block_latest($count // We query an unlimited range because of potential duplicates $sq = 'SELECT zg.search, zg.category ' - . 'FROM ' . ZGTABLE . ' zg ' - . 'ORDER BY zg.ts DESC' ; + . 'FROM ' . ZGTABLE . ' zg '; + if (variable_get(ZGVARLATESTLOGGEDIN,0)) { + $sq .= 'WHERE uid = ' . $user->uid . ' '; + } + $sq .= 'ORDER BY zg.ts DESC' ; $sq = db_rewrite_sql($sq, 'zg', 'search'); $q = db_query($sq); $ar = array();