';
- $author = form_autocomplete(t('Authored by'), 'name', $edit->name, 30, 60, 'user/autocomplete');
+ $author = form_autocomplete(t('Authored by'), 'name', $edit->name, 30, 60, 'user');
$author .= form_textfield(t('Authored on'), 'date', $edit->date, 30, 25, NULL, NULL, TRUE);
$output .= '
';
Index: modules/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.501
diff -u -F^f -r1.501 user.module
--- modules/user.module 11 Aug 2005 13:52:44 -0000 1.501
+++ modules/user.module 18 Aug 2005 17:13:04 -0000
@@ -661,9 +661,6 @@ function user_menu($may_cache) {
$items[] = array('path' => 'user', 'title' => t('user account'),
'callback' => 'user_page', 'access' => TRUE, 'type' => MENU_CALLBACK);
- $items[] = array('path' => 'user/autocomplete', 'title' => t('user autocomplete'),
- 'callback' => 'user_autocomplete', 'access' => $admin_access, 'type' => MENU_CALLBACK);
-
//registration and login pages.
$items[] = array('path' => 'user/login', 'title' => t('log in'),
'type' => MENU_DEFAULT_LOCAL_TASK);
@@ -1902,12 +1909,14 @@ function _user_forms(&$edit, $account, $
* Retrieve a pipe delimited string of autocomplete suggestions for existing users
*/
function user_autocomplete($string) {
- $matches = array();
- $result = db_query_range('SELECT name FROM {users} WHERE LOWER(name) LIKE LOWER("%%%s%%")', $string, 0, 10);
- while ($user = db_fetch_object($result)) {
- $matches[$user->name] = check_plain($user->name);
+ if (user_access('administer users')) {
+ $matches = array();
+ $result = db_query_range('SELECT name FROM {users} WHERE LOWER(name) LIKE LOWER("%%%s%%")', $string, 0, 10);
+ while ($user = db_fetch_object($result)) {
+ $matches[$user->name] = check_plain($user->name);
+ }
+ print drupal_implode_autocomplete($matches);
}
- print drupal_implode_autocomplete($matches);
exit();
}
Index: modules/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy.module,v
retrieving revision 1.217
diff -u -F^f -r1.217 taxonomy.module
--- modules/taxonomy.module 25 Jul 2005 04:55:37 -0000 1.217
+++ modules/taxonomy.module 18 Aug 2005 17:13:05 -0000
@@ -81,10 +81,6 @@ function taxonomy_menu($may_cache) {
'access' => user_access('access content'),
'type' => MENU_CALLBACK);
- $items[] = array('path' => 'taxonomy/autocomplete', 'title' => t('autocomplete taxonomy'),
- 'callback' => 'taxonomy_autocomplete',
- 'access' => user_access('access content'),
- 'type' => MENU_CALLBACK);
}
else {
if (is_numeric(arg(2))) {
@@ -1266,32 +1261,34 @@ function _taxonomy_get_tid_from_term($te
* Helper function for autocompletion
*/
function taxonomy_autocomplete($vid, $string = '') {
- // The user enters a comma-separated list of tags. We only autocomplete the last tag.
- // This regexp allows the following types of user input:
- // this, "somecmpany, llc", "and ""this"" w,o.rks", foo bar
- $regexp = '%(?:^|,\ *)("(?>[^"]*)(?>""[^"]* )*"|(?: [^",]*))%x';
- preg_match_all($regexp, $string, $matches);
- $array = $matches[1];
-
- // Fetch last tag
- $last_string = trim(array_pop($array));
- if ($last_string != '') {
- $result = db_query_range("SELECT name FROM {term_data} WHERE vid = %d AND LOWER(name) LIKE LOWER('%%%s%%')", $vid, $last_string, 0, 10);
-
- $prefix = count($array) ? implode(', ', $array) .', ' : '';
-
- $matches = array();
- while ($tag = db_fetch_object($result)) {
- $n = $tag->name;
- // Commas and quotes in terms are special cases, so encode 'em.
- if (preg_match('/,/', $tag->name) || preg_match('/"/', $tag->name)) {
- $n = '"'. preg_replace('/"/', '""', $tag->name) .'"';
+ if (user_access('access content')) {
+ // The user enters a comma-separated list of tags. We only autocomplete the last tag.
+ // This regexp allows the following types of user input:
+ // this, "somecmpany, llc", "and ""this"" w,o.rks", foo bar
+ $regexp = '%(?:^|,\ *)("(?>[^"]*)(?>""[^"]* )*"|(?: [^",]*))%x';
+ preg_match_all($regexp, $string, $matches);
+ $array = $matches[1];
+
+ // Fetch last tag
+ $last_string = trim(array_pop($array));
+ if ($last_string != '') {
+ $result = db_query_range("SELECT name FROM {term_data} WHERE vid = %d AND LOWER(name) LIKE LOWER('%%%s%%')", $vid, $last_string, 0, 10);
+
+ $prefix = count($array) ? implode(', ', $array) .', ' : '';
+
+ $matches = array();
+ while ($tag = db_fetch_object($result)) {
+ $n = $tag->name;
+ // Commas and quotes in terms are special cases, so encode 'em.
+ if (preg_match('/,/', $tag->name) || preg_match('/"/', $tag->name)) {
+ $n = '"'. preg_replace('/"/', '""', $tag->name) .'"';
+ }
+ $matches[$prefix . $n] = check_plain($tag->name);
}
- $matches[$prefix . $n] = check_plain($tag->name);
+ print drupal_implode_autocomplete($matches);
}
- print drupal_implode_autocomplete($matches);
- exit();
}
+ exit();
}
?>
Index: misc/autocomplete.js
===================================================================
RCS file: /cvs/drupal/drupal/misc/autocomplete.js,v
retrieving revision 1.4
diff -u -F^f -r1.4 autocomplete.js
--- misc/autocomplete.js 11 Aug 2005 13:00:17 -0000 1.4
+++ misc/autocomplete.js 18 Aug 2005 17:13:05 -0000
@@ -242,7 +242,7 @@ function ACDB(uri) {
var db = this;
this.timer = setTimeout(function() {
addClass(db.owner.input, 'throbbing');
- HTTPGet(db.uri +'/'+ searchString +'/'+ db.max, db.receive, db);
+ HTTPGet(db.uri +'&i='+ searchString +'&d='+ db.max, db.receive, db);
}, this.delay);
}