To display the name of a registered user, use this instead:
global $user;
-if ($user->uid) {
+if ($user->userid) {
print t(\'Welcome @name! Thank you for visiting.\', array(\'@name\' => $user->name));
}
else {
Index: modules/php/php.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/php/php.test,v
retrieving revision 1.5
diff -u -p -r1.5 php.test
--- modules/php/php.test 20 Oct 2008 13:04:27 -0000 1.5
+++ modules/php/php.test 24 Nov 2008 10:02:24 -0000
@@ -28,7 +28,7 @@ class PHPTestCase extends DrupalWebTestC
* @return stdObject Node object.
*/
function createNodeWithCode($user) {
- $node = $this->drupalCreateNode(array('uid' => $user->uid));
+ $node = $this->drupalCreateNode(array('userid' => $user->userid));
$edit = array();
$edit['body'] = '';
$this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
@@ -115,4 +115,4 @@ class PHPAccessTestCase extends PHPTestC
$this->drupalGet('node/' . $node->nid . '/edit');
$this->assertNoFieldByName('body_format', '3', t('Format not available.'));
}
-}
\ No newline at end of file
+}
Index: modules/poll/poll.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.install,v
retrieving revision 1.16
diff -u -p -r1.16 poll.install
--- modules/poll/poll.install 15 Nov 2008 13:01:08 -0000 1.16
+++ modules/poll/poll.install 24 Nov 2008 10:02:24 -0000
@@ -106,12 +106,11 @@ function poll_schema() {
'not null' => TRUE,
'description' => 'The {poll} node this vote is for.',
),
- 'uid' => array(
+ 'userid' => array(
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
- 'default' => 0,
- 'description' => 'The {users}.uid this vote is from unless the voter was anonymous.',
+ 'description' => 'The {users}.userid this vote is from unless the voter was anonymous.',
),
'hostname' => array(
'type' => 'varchar',
@@ -121,13 +120,36 @@ function poll_schema() {
'description' => 'The IP address this vote is from unless the voter was logged in.',
),
),
- 'primary key' => array('nid', 'uid', 'hostname'),
+ 'primary key' => array('nid', 'userid', 'hostname'),
'indexes' => array(
'chid' => array('chid'),
'hostname' => array('hostname'),
- 'uid' => array('uid'),
+ 'userid' => array('userid'),
),
);
return $schema;
}
+
+/**
+ * @defgroup updates-6.x-to-7.x Poll updates from 6.x to 7.x
+ * @{
+ */
+
+/**
+ * Replace Oracle reserved word 'uid'.
+ */
+function poll_update_7000(() {
+ $ret = array();
+ db_drop_primary_key($ret, 'poll_votes');
+ db_drop_index($ret, 'poll_votes', 'uid');
+ db_change_field($ret, 'poll_votes', 'uid', 'userid', array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE));
+ db_add_index($ret, 'poll_votes', 'userid', array('userid'));
+ db_add_primary_key($ret, 'poll_votes', array('nid', 'userid', 'hostname'));
+ return $ret;
+}
+
+/**
+ * @} End of "defgroup updates-6.x-to-7.x"
+ * The next series of updates should start at 8000.
+ */
Index: modules/poll/poll.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.module,v
retrieving revision 1.277
diff -u -p -r1.277 poll.module
--- modules/poll/poll.module 12 Oct 2008 04:30:07 -0000 1.277
+++ modules/poll/poll.module 24 Nov 2008 10:02:24 -0000
@@ -81,9 +81,9 @@ function poll_access($op, $node, $accoun
case 'create':
return user_access('create poll content', $account);
case 'update':
- return user_access('edit any poll content', $account) || (user_access('edit own poll content', $account) && ($node->uid == $account->uid));
+ return user_access('edit any poll content', $account) || (user_access('edit own poll content', $account) && ($node->userid == $account->userid));
case 'delete':
- return user_access('delete any poll content', $account) || (user_access('delete own poll content', $account) && ($node->uid == $account->uid));
+ return user_access('delete any poll content', $account) || (user_access('delete own poll content', $account) && ($node->userid == $account->userid));
}
}
@@ -197,7 +197,7 @@ function poll_node_info() {
function poll_form(&$node, $form_state) {
global $user;
- $admin = user_access('administer nodes') || user_access('edit any poll content') || (user_access('edit own poll content') && $user->uid == $node->uid);
+ $admin = user_access('administer nodes') || user_access('edit any poll content') || (user_access('edit own poll content') && $user->userid == $node->userid);
$type = node_get_types('type', $node);
@@ -465,8 +465,8 @@ function poll_load($node) {
// Determine whether or not this user is allowed to vote.
$poll->allowvotes = FALSE;
if (user_access('vote on polls') && $poll->active) {
- if ($user->uid) {
- $result = db_fetch_object(db_query('SELECT chid FROM {poll_votes} WHERE nid = %d AND uid = %d', $node->nid, $user->uid));
+ if ($user->userid) {
+ $result = db_fetch_object(db_query('SELECT chid FROM {poll_votes} WHERE nid = %d AND userid = %d', $node->nid, $user->userid));
}
else {
$result = db_fetch_object(db_query("SELECT chid FROM {poll_votes} WHERE nid = %d AND hostname = '%s'", $node->nid, ip_address()));
@@ -647,8 +647,8 @@ function poll_vote($form, &$form_state)
$choice = $form_state['values']['choice'];
global $user;
- if ($user->uid) {
- db_query('INSERT INTO {poll_votes} (nid, chid, uid) VALUES (%d, %d, %d)', $node->nid, $choice, $user->uid);
+ if ($user->userid) {
+ db_query('INSERT INTO {poll_votes} (nid, chid, userid) VALUES (%d, %d, %d)', $node->nid, $choice, $user->userid);
}
else {
db_query("INSERT INTO {poll_votes} (nid, chid, hostname) VALUES (%d, %d, '%s')", $node->nid, $choice, ip_address());
@@ -822,8 +822,8 @@ function poll_cancel($form, &$form_state
$node = node_load($form['#nid']);
global $user;
- if ($user->uid) {
- db_query('DELETE FROM {poll_votes} WHERE nid = %d and uid = %d', $node->nid, $user->uid);
+ if ($user->userid) {
+ db_query('DELETE FROM {poll_votes} WHERE nid = %d and userid = %d', $node->nid, $user->userid);
}
else {
db_query("DELETE FROM {poll_votes} WHERE nid = %d and hostname = '%s'", $node->nid, ip_address());
@@ -837,6 +837,6 @@ function poll_cancel($form, &$form_state
* Implementation of hook_user_delete().
*/
function poll_user_delete(&$edit, &$user) {
- db_query('UPDATE {poll_votes} SET uid = 0 WHERE uid = %d', $user->uid);
+ db_query('UPDATE {poll_votes} SET userid = 0 WHERE userid = %d', $user->userid);
}
Index: modules/poll/poll.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/poll/poll.pages.inc,v
retrieving revision 1.9
diff -u -p -r1.9 poll.pages.inc
--- modules/poll/poll.pages.inc 13 Oct 2008 00:33:03 -0000 1.9
+++ modules/poll/poll.pages.inc 24 Nov 2008 10:02:24 -0000
@@ -35,7 +35,7 @@ function poll_votes($node) {
$header[] = array('data' => t('Vote'), 'field' => 'pv.chorder');
$header[] = array('data' => t('Vote'), 'field' => 'pc.weight');
- $result = pager_query("SELECT pv.chid, pv.uid, pv.hostname, u.name FROM {poll_votes} pv INNER JOIN {poll_choices} pc ON pv.chid = pc.chid LEFT JOIN {users} u ON pv.uid = u.uid WHERE pv.nid = %d". tablesort_sql($header), 20, 0, NULL, $node->nid);
+ $result = pager_query("SELECT pv.chid, pv.userid, pv.hostname, u.name FROM {poll_votes} pv INNER JOIN {poll_choices} pc ON pv.chid = pc.chid LEFT JOIN {users} u ON pv.userid = u.userid WHERE pv.nid = %d". tablesort_sql($header), 20, 0, NULL, $node->nid);
$rows = array();
while ($vote = db_fetch_object($result)) {
$rows[] = array(
Index: modules/profile/profile.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.install,v
retrieving revision 1.14
diff -u -p -r1.14 profile.install
--- modules/profile/profile.install 15 Nov 2008 13:01:08 -0000 1.14
+++ modules/profile/profile.install 24 Nov 2008 10:02:24 -0000
@@ -127,12 +127,11 @@ function profile_schema() {
'default' => 0,
'description' => 'The {profile_fields}.fid of the field.',
),
- 'uid' => array(
+ 'userid' => array(
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
- 'default' => 0,
- 'description' => 'The {users}.uid of the profile user.',
+ 'description' => 'The {users}.userid of the profile user.',
),
'value' => array(
'type' => 'text',
@@ -140,7 +139,7 @@ function profile_schema() {
'description' => 'The value for the field.',
),
),
- 'primary key' => array('uid', 'fid'),
+ 'primary key' => array('userid', 'fid'),
'indexes' => array(
'fid' => array('fid'),
),
@@ -148,3 +147,24 @@ function profile_schema() {
return $schema;
}
+
+/**
+ * @defgroup updates-6.x-to-7.x Profile updates from 6.x to 7.x
+ * @{
+ */
+
+/**
+ * Replace Oracle reserved word 'uid'.
+ */
+function profile_update_7000(() {
+ $ret = array();
+ db_drop_primary_key($ret, 'profile_values');
+ db_change_field($ret, 'profile_values', 'uid', 'userid', array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE));
+ db_add_primary_key($ret, 'profile_values', array('userid', 'fid'));
+ return $ret;
+}
+
+/**
+ * @} End of "defgroup updates-6.x-to-7.x"
+ * The next series of updates should start at 8000.
+ */
Index: modules/profile/profile.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.module,v
retrieving revision 1.246
diff -u -p -r1.246 profile.module
--- modules/profile/profile.module 12 Oct 2008 04:30:08 -0000 1.246
+++ modules/profile/profile.module 24 Nov 2008 10:02:24 -0000
@@ -160,7 +160,7 @@ function profile_block($op = 'list', $de
$output = '';
if ((arg(0) == 'node') && is_numeric(arg(1)) && (arg(2) == NULL)) {
$node = node_load(arg(1));
- $account = user_load(array('uid' => $node->uid));
+ $account = user_load(array('userid' => $node->userid));
if ($use_fields = variable_get('profile_block_author_fields', array())) {
// Compile a list of fields to show.
@@ -180,7 +180,7 @@ function profile_block($op = 'list', $de
}
if (isset($use_fields['user_profile']) && $use_fields['user_profile']) {
- $output .= '' . l(t('View full user profile'), 'user/' . $account->uid) . '';
+ $output .= '' . l(t('View full user profile'), 'user/' . $account->userid) . '';
}
}
@@ -253,11 +253,11 @@ function profile_user_categories(&$edit,
* Implementation of hook_user_delete().
*/
function profile_user_delete(&$edit, &$user, $category = NULL) {
- db_query('DELETE FROM {profile_values} WHERE uid = %d', $user->uid);
+ db_query('DELETE FROM {profile_values} WHERE userid = %d', $user->userid);
}
function profile_load_profile(&$user) {
- $result = db_query('SELECT f.name, f.type, v.value FROM {profile_fields} f INNER JOIN {profile_values} v ON f.fid = v.fid WHERE uid = %d', $user->uid);
+ $result = db_query('SELECT f.name, f.type, v.value FROM {profile_fields} f INNER JOIN {profile_values} v ON f.fid = v.fid WHERE userid = %d', $user->userid);
while ($field = db_fetch_object($result)) {
if (empty($user->{$field->name})) {
$user->{$field->name} = _profile_field_serialize($field->type) ? unserialize($field->value) : $field->value;
@@ -271,8 +271,8 @@ function profile_save_profile(&$edit, &$
if (_profile_field_serialize($field->type)) {
$edit[$field->name] = serialize($edit[$field->name]);
}
- db_query("DELETE FROM {profile_values} WHERE fid = %d AND uid = %d", $field->fid, $user->uid);
- db_query("INSERT INTO {profile_values} (fid, uid, value) VALUES (%d, %d, '%s')", $field->fid, $user->uid, $edit[$field->name]);
+ db_query("DELETE FROM {profile_values} WHERE fid = %d AND userid = %d", $field->fid, $user->userid);
+ db_query("INSERT INTO {profile_values} (fid, userid, value) VALUES (%d, %d, '%s')", $field->fid, $user->userid, $edit[$field->name]);
// Mark field as handled (prevents saving to user->data).
$edit[$field->name] = NULL;
}
@@ -330,7 +330,7 @@ function profile_view_profile(&$user) {
profile_load_profile($user);
// Show private fields to administrators and people viewing their own account.
- if (user_access('administer users') || $GLOBALS['user']->uid == $user->uid) {
+ if (user_access('administer users') || $GLOBALS['user']->userid == $user->userid) {
$result = db_query('SELECT * FROM {profile_fields} WHERE visibility != %d ORDER BY category, weight', PROFILE_HIDDEN);
}
else {
@@ -498,7 +498,7 @@ function profile_categories() {
* Menu item access callback - check if a user has access to a profile category.
*/
function profile_category_access($account, $category) {
- if (user_access('administer users') && $account->uid > 0) {
+ if (user_access('administer users') && $account->userid > 0) {
return TRUE;
}
else {
Index: modules/profile/profile.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.pages.inc,v
retrieving revision 1.9
diff -u -p -r1.9 profile.pages.inc
--- modules/profile/profile.pages.inc 2 Nov 2008 16:11:31 -0000 1.9
+++ modules/profile/profile.pages.inc 24 Nov 2008 10:02:24 -0000
@@ -55,11 +55,11 @@ function profile_browse() {
}
// Extract the affected users:
- $result = pager_query("SELECT u.uid, u.access FROM {users} u INNER JOIN {profile_values} v ON u.uid = v.uid WHERE v.fid = %d AND $query AND u.access != 0 AND u.status != 0 ORDER BY u.access DESC", 20, 0, NULL, $arguments);
+ $result = pager_query("SELECT u.userid, u.access FROM {users} u INNER JOIN {profile_values} v ON u.userid = v.userid WHERE v.fid = %d AND $query AND u.access != 0 AND u.status != 0 ORDER BY u.access DESC", 20, 0, NULL, $arguments);
$content = '';
while ($account = db_fetch_object($result)) {
- $account = user_load(array('uid' => $account->uid));
+ $account = user_load(array('userid' => $account->userid));
$profile = _profile_update_user_fields($fields, $account);
$content .= theme('profile_listing', $account, $profile);
}
@@ -88,11 +88,11 @@ function profile_browse() {
}
// Extract the affected users:
- $result = pager_query('SELECT uid, access FROM {users} WHERE uid > 0 AND status != 0 AND access != 0 ORDER BY access DESC', 20, 0, NULL);
+ $result = pager_query('SELECT userid, access FROM {users} WHERE userid > 0 AND status != 0 AND access != 0 ORDER BY access DESC', 20, 0, NULL);
$content = '';
while ($account = db_fetch_object($result)) {
- $account = user_load(array('uid' => $account->uid));
+ $account = user_load(array('userid' => $account->userid));
$profile = _profile_update_user_fields($fields, $account);
$content .= theme('profile_listing', $account, $profile);
}
Index: modules/profile/profile.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/profile/profile.test,v
retrieving revision 1.7
diff -u -p -r1.7 profile.test
--- modules/profile/profile.test 10 Oct 2008 07:49:49 -0000 1.7
+++ modules/profile/profile.test 24 Nov 2008 10:02:24 -0000
@@ -41,7 +41,7 @@ class ProfileTestCase extends DrupalWebT
$this->assertTrue($fid, t('New Profile field has been entered in the database'));
// Check that the new field is appearing on the user edit form.
- $this->drupalGet('user/' . $this->admin_user->uid . '/edit/' . $category);
+ $this->drupalGet('user/' . $this->admin_user->userid . '/edit/' . $category);
// Checking field.
if ($type == 'date') {
@@ -86,10 +86,10 @@ class ProfileTestCase extends DrupalWebT
$edit = array(
$field['form_name'] => $value,
);
- $this->drupalPost('user/' . $this->normal_user->uid . '/edit/' . $field['category'], $edit, t('Save'));
+ $this->drupalPost('user/' . $this->normal_user->userid . '/edit/' . $field['category'], $edit, t('Save'));
// Check profile page.
- $content = $this->drupalGet('user/' . $this->normal_user->uid);
+ $content = $this->drupalGet('user/' . $this->normal_user->userid);
$this->assertText($field['title'], t('Found profile field with title %title', array('%title' => $field['title'])));
if ($field['type'] != 'checkbox') {
@@ -206,10 +206,10 @@ class ProfileTestDate extends ProfileTes
$field['form_name'] . '[year]' => 1983,
);
- $this->drupalPost('user/' . $this->normal_user->uid . '/edit/' . $field['category'], $edit, t('Save'));
+ $this->drupalPost('user/' . $this->normal_user->userid . '/edit/' . $field['category'], $edit, t('Save'));
// Check profile page.
- $this->drupalGet('user/' . $this->normal_user->uid);
+ $this->drupalGet('user/' . $this->normal_user->userid);
$this->assertText($field['title'], t('Found profile field with title %title', array('%title' => $field['title'])));
$this->assertText('01/09/1983', t('Found date profile field.'));
@@ -240,10 +240,10 @@ class ProfileTestWeights extends Profile
$this->setProfileField($field1, $this->randomName(4, 'first_'));
$this->setProfileField($field2, $this->randomName(4, 'second_'));
- $profile_edit = $this->drupalGet('user/' . $this->normal_user->uid . '/edit/' . $category);
+ $profile_edit = $this->drupalGet('user/' . $this->normal_user->userid . '/edit/' . $category);
$this->assertTrue(strpos($profile_edit, $field1['title']) > strpos($profile_edit, $field2['title']), t('Profile field weights are respected on the user edit form.'));
- $profile_page = $this->drupalGet('user/' . $this->normal_user->uid);
+ $profile_page = $this->drupalGet('user/' . $this->normal_user->userid);
$this->assertTrue(strpos($profile_page, $field1['title']) > strpos($profile_page, $field2['title']), t('Profile field weights are respected on the user profile page.'));
}
}
@@ -283,7 +283,7 @@ class ProfileTestAutocomplete extends Pr
$field_html = '';
// Check that autocompletion html is found on the user's profile edit page.
- $this->drupalGet('user/' . $this->admin_user->uid . '/edit/' . $category);
+ $this->drupalGet('user/' . $this->admin_user->userid . '/edit/' . $category);
$this->assertRaw($autocomplete_html, t('Autocomplete found.'));
$this->assertRaw('misc/autocomplete.js', t('Autocomplete JavaScript found.'));
$this->assertRaw('class="form-text form-autocomplete"', t('Autocomplete form element class found.'));
@@ -299,7 +299,7 @@ class ProfileTestAutocomplete extends Pr
$this->drupalLogin($this->normal_user);
// Check that autocompletion html is not found on the user's profile edit page.
- $this->drupalGet('user/' . $this->normal_user->uid . '/edit/' . $category);
+ $this->drupalGet('user/' . $this->normal_user->userid . '/edit/' . $category);
$this->assertNoRaw($autocomplete_html, t('Autocomplete not found.'));
// User should be denied access to the profile autocomplete path.
Index: modules/simpletest/drupal_web_test_case.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/drupal_web_test_case.php,v
retrieving revision 1.59
diff -u -p -r1.59 drupal_web_test_case.php
--- modules/simpletest/drupal_web_test_case.php 24 Nov 2008 04:22:02 -0000 1.59
+++ modules/simpletest/drupal_web_test_case.php 24 Nov 2008 10:02:24 -0000
@@ -387,9 +387,9 @@ class DrupalWebTestCase {
if (isset($defaults['created'])) {
$defaults['date'] = format_date($defaults['created'], 'custom', 'Y-m-d H:i:s O');
}
- if (empty($settings['uid'])) {
+ if (empty($settings['userid'])) {
global $user;
- $defaults['uid'] = $user->uid;
+ $defaults['userid'] = $user->userid;
}
$node = ($settings + $defaults);
$node = (object)$node;
@@ -397,7 +397,7 @@ class DrupalWebTestCase {
node_save($node);
// small hack to link revisions to our test user
- db_query('UPDATE {node_revisions} SET uid = %d WHERE vid = %d', $node->uid, $node->vid);
+ db_query('UPDATE {node_revisions} SET userid = %d WHERE vid = %d', $node->userid, $node->vid);
return $node;
}
@@ -547,8 +547,8 @@ class DrupalWebTestCase {
$account = user_save('', $edit);
- $this->assertTrue(!empty($account->uid), t('User created with name %name and pass %pass', array('%name' => $edit['name'], '%pass' => $edit['pass'])), t('User login'));
- if (empty($account->uid)) {
+ $this->assertTrue(!empty($account->userid), t('User created with name %name and pass %pass', array('%name' => $edit['name'], '%pass' => $edit['pass'])), t('User login'));
+ if (empty($account->userid)) {
return FALSE;
}
Index: modules/simpletest/tests/file.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/file.test,v
retrieving revision 1.12
diff -u -p -r1.12 file.test
--- modules/simpletest/tests/file.test 16 Nov 2008 19:41:14 -0000 1.12
+++ modules/simpletest/tests/file.test 24 Nov 2008 10:02:24 -0000
@@ -83,7 +83,7 @@ class FileTestCase extends DrupalWebTest
$file->filepath = $filepath;
$file->filename = basename($file->filepath);
$file->filemime = 'text/plain';
- $file->uid = 1;
+ $file->userid = 1;
$file->timestamp = REQUEST_TIME;
$file->filesize = filesize($file->filepath);
$file->status = FILE_STATUS_TEMPORARY;
@@ -267,13 +267,13 @@ class FileValidatorTest extends DrupalWe
$original_user = $user;
drupal_save_session(FALSE);
- // Run these test as uid = 1.
- $user = user_load(array('uid' => 1));
+ // Run these test as userid = 1.
+ $user = user_load(array('userid' => 1));
$file = new stdClass();
$file->filesize = 999999;
$errors = file_validate_size($file, 1, 1);
- $this->assertEqual(count($errors), 0, t('No size limits enforced on uid=1.'), 'File');
+ $this->assertEqual(count($errors), 0, t('No size limits enforced on userid=1.'), 'File');
// Run these tests as a regular user.
$user = $this->drupalCreateUser();
@@ -944,7 +944,7 @@ class FileLoadTest extends FileHookTestC
function testFileLoad() {
// Create a new file object.
$file = array(
- 'uid' => 1,
+ 'userid' => 1,
'filename' => 'druplicon.png',
'filepath' => 'misc/druplicon.png',
'filemime' => 'image/png',
@@ -992,7 +992,7 @@ class FileSaveTest extends FileHookTestC
function testFileSave() {
// Create a new file object.
$file = array(
- 'uid' => 1,
+ 'userid' => 1,
'filename' => 'druplicon.png',
'filepath' => 'misc/druplicon.png',
'filemime' => 'image/png',
@@ -1112,4 +1112,4 @@ class FileSaveDataTest extends FileHookT
$file = file_save_data($contents, 'asdf.txt', FILE_EXISTS_ERROR);
$this->assertFalse($file, t("Overwriting a file fails when FILE_EXISTS_ERROR is specified."));
}
-}
\ No newline at end of file
+}
Index: modules/simpletest/tests/menu.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/menu.test,v
retrieving revision 1.3
diff -u -p -r1.3 menu.test
--- modules/simpletest/tests/menu.test 20 Nov 2008 07:18:59 -0000 1.3
+++ modules/simpletest/tests/menu.test 24 Nov 2008 10:02:24 -0000
@@ -51,7 +51,7 @@ class MenuRebuildTestCase extends Drupal
'group' => t('Menu'),
);
}
-
+
/**
* Test if the 'menu_rebuild_needed' variable triggers a menu_rebuild() call.
*/
@@ -75,5 +75,5 @@ class MenuRebuildTestCase extends Drupal
$admin_exists = db_result(db_query("SELECT path from {menu_router} WHERE path = 'admin'"));
$this->assertEqual($admin_exists, 'admin', t("The menu has been rebuilt, the path 'admin' now exists again."));
}
-
+
}
Index: modules/simpletest/tests/session.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/session.test,v
retrieving revision 1.5
diff -u -p -r1.5 session.test
--- modules/simpletest/tests/session.test 24 Nov 2008 06:12:45 -0000 1.5
+++ modules/simpletest/tests/session.test 24 Nov 2008 10:02:24 -0000
@@ -91,7 +91,7 @@ class SessionTestCase extends DrupalWebT
function testDataPersistence() {
$user = $this->drupalCreateUser(array('access content'));
// Enable sessions.
- $this->sessionReset($user->uid);
+ $this->sessionReset($user->userid);
$this->drupalLogin($user);
$this->session_count_authenticated = $this->session_count++;
@@ -112,7 +112,7 @@ class SessionTestCase extends DrupalWebT
// Switch browser cookie to anonymous user, then back to user 1.
$this->sessionReset();
- $this->sessionReset($user->uid);
+ $this->sessionReset($user->userid);
$this->assertText($value_1, t('Session data persists through browser close.'), t('Session'));
// Logout the user and make sure the stored value no longer persists.
@@ -138,13 +138,13 @@ class SessionTestCase extends DrupalWebT
// Logout and get first user back in. Sessions shouldn't persist through
// logout, so the data won't be on the page.
$this->drupalLogin($user);
- $this->sessionReset($user->uid);
+ $this->sessionReset($user->userid);
$this->drupalGet('session-test/get');
$this->assertNoText($value_1, t('Session has persisted for an authenticated user after logging out and then back in.'), t('Session'));
// Logout and create another user.
$user2 = $this->drupalCreateUser(array('access content'));
- $this->sessionReset($user2->uid);
+ $this->sessionReset($user2->userid);
$this->drupalLogin($user2);
$this->session_count_authenticated = $this->session_count++;
@@ -168,14 +168,14 @@ class SessionTestCase extends DrupalWebT
/**
* Reset the cookie file so that it refers to the specified user.
*
- * @param $uid User id to set as the active session.
+ * @param $userid User id to set as the active session.
*/
- function sessionReset($uid = 0) {
+ function sessionReset($userid = 0) {
// Close the internal browser.
$this->curlClose();
// Change cookie file for user.
- $this->cookie_file = file_directory_temp() . '/cookie.' . $uid . '.txt';
+ $this->cookie_file = file_directory_temp() . '/cookie.' . $userid . '.txt';
$this->curl_options[CURLOPT_COOKIEFILE] = $this->cookie_file;
$this->curl_options[CURLOPT_COOKIESESSION] = TRUE;
$this->drupalGet('session-test/get');
Index: modules/statistics/statistics.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.admin.inc,v
retrieving revision 1.14
diff -u -p -r1.14 statistics.admin.inc
--- modules/statistics/statistics.admin.inc 13 Oct 2008 00:33:04 -0000 1.14
+++ modules/statistics/statistics.admin.inc 24 Nov 2008 10:02:24 -0000
@@ -17,7 +17,7 @@ function statistics_recent_hits() {
array('data' => t('Operations'))
);
- $sql = 'SELECT a.aid, a.path, a.title, a.uid, u.name, a.timestamp FROM {accesslog} a LEFT JOIN {users} u ON u.uid = a.uid' . tablesort_sql($header);
+ $sql = 'SELECT a.aid, a.path, a.title, a.userid, u.name, a.timestamp FROM {accesslog} a LEFT JOIN {users} u ON u.userid = a.userid' . tablesort_sql($header);
$result = pager_query($sql, 30);
$rows = array();
@@ -82,15 +82,15 @@ function statistics_top_visitors() {
array('data' => user_access('block IP addresses') ? t('Operations') : '', 'colspan' => 2),
);
- $sql = "SELECT COUNT(a.uid) AS hits, a.uid, u.name, a.hostname, SUM(a.timer) AS total, bl.iid FROM {accesslog} a LEFT JOIN {blocked_ips} bl ON a.hostname = bl.ip LEFT JOIN {users} u ON a.uid = u.uid GROUP BY a.hostname, a.uid, u.name, bl.iid" . tablesort_sql($header);
- $sql_cnt = "SELECT COUNT(DISTINCT(CONCAT(uid, hostname))) FROM {accesslog}";
+ $sql = "SELECT COUNT(a.userid) AS hits, a.userid, u.name, a.hostname, SUM(a.timer) AS total, bl.iid FROM {accesslog} a LEFT JOIN {blocked_ips} bl ON a.hostname = bl.ip LEFT JOIN {users} u ON a.userid = u.userid GROUP BY a.hostname, a.userid, u.name, bl.iid" . tablesort_sql($header);
+ $sql_cnt = "SELECT COUNT(DISTINCT(CONCAT(userid, hostname))) FROM {accesslog}";
$result = pager_query($sql, 30, 0, $sql_cnt);
$rows = array();
while ($account = db_fetch_object($result)) {
$qs = drupal_get_destination();
$ban_link = $account->iid ? l(t('unblock IP address'), "admin/settings/ip-blocking/delete/$account->iid", array('query' => $qs)) : l(t('block IP address'), "admin/settings/ip-blocking/$account->hostname", array('query' => $qs));
- $rows[] = array($account->hits, ($account->uid ? theme('username', $account) : $account->hostname), format_interval(round($account->total / 1000)), (user_access('block IP addresses') && !$account->uid) ? $ban_link : '');
+ $rows[] = array($account->hits, ($account->userid ? theme('username', $account) : $account->hostname), format_interval(round($account->total / 1000)), (user_access('block IP addresses') && !$account->userid) ? $ban_link : '');
}
if (empty($rows)) {
@@ -138,7 +138,7 @@ function statistics_top_referrers() {
* Menu callback; Displays recent page accesses.
*/
function statistics_access_log($aid) {
- $result = db_query('SELECT a.*, u.name FROM {accesslog} a LEFT JOIN {users} u ON a.uid = u.uid WHERE aid = %d', $aid);
+ $result = db_query('SELECT a.*, u.name FROM {accesslog} a LEFT JOIN {users} u ON a.userid = u.userid WHERE aid = %d', $aid);
if ($access = db_fetch_object($result)) {
$rows[] = array(
array('data' => t('URL'), 'header' => TRUE),
Index: modules/statistics/statistics.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.install,v
retrieving revision 1.14
diff -u -p -r1.14 statistics.install
--- modules/statistics/statistics.install 15 Nov 2008 13:01:09 -0000 1.14
+++ modules/statistics/statistics.install 24 Nov 2008 10:02:24 -0000
@@ -87,12 +87,11 @@ function statistics_schema() {
'not null' => FALSE,
'description' => 'Hostname of user that visited the page.',
),
- 'uid' => array(
+ 'userid' => array(
'type' => 'int',
'unsigned' => TRUE,
'not null' => FALSE,
- 'default' => 0,
- 'description' => 'User {users}.uid that visited the page.',
+ 'description' => 'User {users}.userid that visited the page.',
),
'timer' => array(
'type' => 'int',
@@ -111,7 +110,7 @@ function statistics_schema() {
),
'indexes' => array(
'accesslog_timestamp' => array('timestamp'),
- 'uid' => array('uid'),
+ 'userid' => array('userid'),
),
'primary key' => array('aid'),
);
@@ -119,3 +118,23 @@ function statistics_schema() {
return $schema;
}
+/**
+ * @defgroup updates-6.x-to-7.x Statistics updates from 6.x to 7.x
+ * @{
+ */
+
+/**
+ * Replace Oracle reserved word 'uid'.
+ */
+function statistics_update_7000(() {
+ $ret = array();
+ db_drop_index($ret, 'accesslog', 'uid');
+ db_change_field($ret, 'accesslog', 'uid', 'userid', array('type' => 'int', 'unsigned' => TRUE, 'not null' => FALSE));
+ db_add_index($ret, 'accesslog', 'userid', array('userid'));
+ return $ret;
+}
+
+/**
+ * @} End of "defgroup updates-6.x-to-7.x"
+ * The next series of updates should start at 8000.
+ */
Index: modules/statistics/statistics.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.module,v
retrieving revision 1.286
diff -u -p -r1.286 statistics.module
--- modules/statistics/statistics.module 9 Oct 2008 15:15:53 -0000 1.286
+++ modules/statistics/statistics.module 24 Nov 2008 10:02:24 -0000
@@ -71,7 +71,7 @@ function statistics_exit() {
'path' => $_GET['q'],
'url' => $_SERVER['HTTP_REFERER'],
'hostname' => ip_address(),
- 'uid' => $user->uid,
+ 'userid' => $user->userid,
'sid' => session_id(),
'timer' => timer_read('page'),
'timestamp' => REQUEST_TIME,
@@ -183,7 +183,7 @@ function statistics_menu() {
* Implementation of hook_user_delete().
*/
function statistics_user_delete(&$edit, &$user, $category) {
- db_query('UPDATE {accesslog} SET uid = 0 WHERE uid = %d', $user->uid);
+ db_query('UPDATE {accesslog} SET userid = 0 WHERE userid = %d', $user->userid);
}
/**
@@ -215,12 +215,12 @@ function statistics_cron() {
* number of rows to be returned.
*
* @return
- * A query result containing n.nid, n.title, u.uid, u.name of the selected node(s)
+ * A query result containing n.nid, n.title, u.userid, u.name of the selected node(s)
* or FALSE if the query could not be executed correctly.
*/
function statistics_title_list($dbfield, $dbrows) {
if (in_array($dbfield, array('totalcount', 'daycount', 'timestamp'))) {
- return db_query_range(db_rewrite_sql("SELECT n.nid, n.title, u.uid, u.name FROM {node} n INNER JOIN {node_counter} s ON n.nid = s.nid INNER JOIN {users} u ON n.uid = u.uid WHERE s." . $dbfield . " != 0 AND n.status = 1 ORDER BY s." . $dbfield . " DESC"), 0, $dbrows);
+ return db_query_range(db_rewrite_sql("SELECT n.nid, n.title, u.userid, u.name FROM {node} n INNER JOIN {node_counter} s ON n.nid = s.nid INNER JOIN {users} u ON n.userid = u.userid WHERE s." . $dbfield . " != 0 AND n.status = 1 ORDER BY s." . $dbfield . " DESC"), 0, $dbrows);
}
return FALSE;
}
Index: modules/statistics/statistics.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.pages.inc,v
retrieving revision 1.6
diff -u -p -r1.6 statistics.pages.inc
--- modules/statistics/statistics.pages.inc 13 Oct 2008 00:33:04 -0000 1.6
+++ modules/statistics/statistics.pages.inc 24 Nov 2008 10:02:24 -0000
@@ -15,7 +15,7 @@ function statistics_node_tracker() {
array('data' => t('User'), 'field' => 'u.name'),
array('data' => t('Operations')));
- $result = pager_query('SELECT a.aid, a.timestamp, a.url, a.uid, u.name FROM {accesslog} a LEFT JOIN {users} u ON a.uid = u.uid WHERE a.path LIKE \'node/%d%%\'' . tablesort_sql($header), 30, 0, NULL, $node->nid);
+ $result = pager_query('SELECT a.aid, a.timestamp, a.url, a.userid, u.name FROM {accesslog} a LEFT JOIN {users} u ON a.userid = u.userid WHERE a.path LIKE \'node/%d%%\'' . tablesort_sql($header), 30, 0, NULL, $node->nid);
$rows = array();
while ($log = db_fetch_object($result)) {
$rows[] = array(
@@ -40,14 +40,14 @@ function statistics_node_tracker() {
}
function statistics_user_tracker() {
- if ($account = user_load(array('uid' => arg(1)))) {
+ if ($account = user_load(array('userid' => arg(1)))) {
$header = array(
array('data' => t('Timestamp'), 'field' => 'timestamp', 'sort' => 'desc'),
array('data' => t('Page'), 'field' => 'path'),
array('data' => t('Operations')));
- $result = pager_query('SELECT aid, timestamp, path, title FROM {accesslog} WHERE uid = %d' . tablesort_sql($header), 30, 0, NULL, $account->uid);
+ $result = pager_query('SELECT aid, timestamp, path, title FROM {accesslog} WHERE userid = %d' . tablesort_sql($header), 30, 0, NULL, $account->userid);
$rows = array();
while ($log = db_fetch_object($result)) {
$rows[] = array(
Index: modules/statistics/statistics.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/statistics/statistics.test,v
retrieving revision 1.4
diff -u -p -r1.4 statistics.test
--- modules/statistics/statistics.test 17 Sep 2008 07:11:58 -0000 1.4
+++ modules/statistics/statistics.test 24 Nov 2008 10:02:24 -0000
@@ -23,7 +23,7 @@ class StatisticsBlockVisitorsTestCase ex
$this->blocking_user = $this->drupalCreateUser(array('block IP addresses', 'access statistics'));
// Insert dummy access by anonymous user into access log.
- db_query("INSERT INTO {accesslog} (title, path, url, hostname, uid, sid, timer, timestamp) values('%s', '%s', '%s', '%s', %d, '%s', %d, %d)", 'test', 'node/1', 'http://example.com', '192.168.1.1', '0', '10', '10', REQUEST_TIME);
+ db_query("INSERT INTO {accesslog} (title, path, url, hostname, userid, sid, timer, timestamp) values('%s', '%s', '%s', '%s', %d, '%s', %d, %d)", 'test', 'node/1', 'http://example.com', '192.168.1.1', '0', '10', '10', REQUEST_TIME);
}
/**
Index: modules/syslog/syslog.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/syslog/syslog.module,v
retrieving revision 1.18
diff -u -p -r1.18 syslog.module
--- modules/syslog/syslog.module 31 Aug 2008 09:15:13 -0000 1.18
+++ modules/syslog/syslog.module 24 Nov 2008 10:02:24 -0000
@@ -101,7 +101,7 @@ function theme_syslog_format($entry) {
$message .= '|' . $entry['ip'];
$message .= '|' . $entry['request_uri'];
$message .= '|' . $entry['referer'];
- $message .= '|' . $entry['user']->uid;
+ $message .= '|' . $entry['user']->userid;
$message .= '|' . strip_tags($entry['link']);
$message .= '|' . strip_tags(is_null($entry['variables']) ? $entry['message'] : strtr($entry['message'], $entry['variables']));
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.107
diff -u -p -r1.107 system.admin.inc
--- modules/system/system.admin.inc 24 Nov 2008 00:40:45 -0000 1.107
+++ modules/system/system.admin.inc 24 Nov 2008 10:02:24 -0000
@@ -1798,9 +1798,9 @@ function system_status($check = FALSE) {
if ($check) {
return drupal_requirements_severity($requirements) == REQUIREMENT_ERROR;
}
- // MySQL import might have set the uid of the anonymous user to autoincrement
+ // MySQL import might have set the userid of the anonymous user to autoincrement
// value. Let's try fixing it. See http://drupal.org/node/204411
- db_query("UPDATE {users} SET uid = uid - uid WHERE name = '' AND pass = '' AND status = 0");
+ db_query("UPDATE {users} SET userid = userid - userid WHERE name = '' AND pass = '' AND status = 0");
return theme('status_report', $requirements);
}
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.286
diff -u -p -r1.286 system.install
--- modules/system/system.install 24 Nov 2008 04:22:02 -0000 1.286
+++ modules/system/system.install 24 Nov 2008 10:02:24 -0000
@@ -347,21 +347,21 @@ function system_install() {
// Load system theme data appropriately.
system_theme_data();
- // Inserting uid 0 here confuses MySQL -- the next user might be created as
- // uid 2 which is not what we want. So we insert the first user here, the
- // anonymous user. uid is 1 here for now, but very soon it will be changed
+ // Inserting userid 0 here confuses MySQL -- the next user might be created as
+ // userid 2 which is not what we want. So we insert the first user here, the
+ // anonymous user. userid is 1 here for now, but very soon it will be changed
// to 0.
db_query("INSERT INTO {users} (name, mail) VALUES('%s', '%s')", '', '');
// We need some placeholders here as name and mail are uniques and data is
- // presumed to be a serialized array. Install will change uid 1 immediately
- // anyways. So we insert the superuser here, the uid is 2 here for now, but
+ // presumed to be a serialized array. Install will change userid 1 immediately
+ // anyways. So we insert the superuser here, the userid is 2 here for now, but
// very soon it will be changed to 1.
- db_query("INSERT INTO {users} (name, mail, created, status, data) VALUES('%s', '%s', %d, %d, '%s')", 'placeholder-for-uid-1', 'placeholder-for-uid-1', REQUEST_TIME, 1, serialize(array()));
- // This sets the above two users uid 0 (anonymous). We avoid an explicit 0
+ db_query("INSERT INTO {users} (name, mail, created, status, data) VALUES('%s', '%s', %d, %d, '%s')", 'placeholder-for-userid-1', 'placeholder-for-userid-1', REQUEST_TIME, 1, serialize(array()));
+ // This sets the above two users userid 0 (anonymous). We avoid an explicit 0
// otherwise MySQL might insert the next auto_increment value.
- db_query("UPDATE {users} SET uid = uid - uid WHERE name = '%s'", '');
- // This sets uid 1 (superuser). We skip uid 2 but that's not a big problem.
- db_query("UPDATE {users} SET uid = 1 WHERE name = '%s'", 'placeholder-for-uid-1');
+ db_query("UPDATE {users} SET userid = userid - userid WHERE name = '%s'", '');
+ // This sets userid 1 (superuser). We skip userid 2 but that's not a big problem.
+ db_query("UPDATE {users} SET userid = 1 WHERE name = '%s'", 'placeholder-for-userid-1');
// Built-in roles.
db_query("INSERT INTO {role} (name) VALUES ('%s')", 'anonymous user');
@@ -619,12 +619,11 @@ function system_schema() {
'unsigned' => TRUE,
'not null' => TRUE,
),
- 'uid' => array(
- 'description' => 'The {users}.uid of the user who is associated with the file.',
+ 'userid' => array(
+ 'description' => 'The {users}.userid of the user who is associated with the file.',
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
- 'default' => 0,
),
'filename' => array(
'description' => 'Name of the file with no path components. This may differ from the basename of the filepath if the file is renamed to avoid overwriting an existing file.',
@@ -669,7 +668,7 @@ function system_schema() {
),
),
'indexes' => array(
- 'uid' => array('uid'),
+ 'userid' => array('userid'),
'status' => array('status'),
'timestamp' => array('timestamp'),
),
@@ -714,11 +713,11 @@ function system_schema() {
$schema['history'] = array(
'description' => 'A record of which {users} have read which {node}s.',
'fields' => array(
- 'uid' => array(
- 'description' => 'The {users}.uid that read the {node} nid.',
+ 'userid' => array(
+ 'description' => 'The {users}.userid that read the {node} nid.',
'type' => 'int',
+ 'unsigned' => TRUE,
'not null' => TRUE,
- 'default' => 0,
),
'nid' => array(
'description' => 'The {node}.nid that was read.',
@@ -733,7 +732,7 @@ function system_schema() {
'default' => 0,
),
),
- 'primary key' => array('uid', 'nid'),
+ 'primary key' => array('userid', 'nid'),
'indexes' => array(
'nid' => array('nid'),
),
@@ -754,7 +753,7 @@ function system_schema() {
'not null' => TRUE,
),
'to_arg_functions' => array(
- 'description' => 'A serialized array of function names (like user_uid_optional_to_arg) to be called to replace a part of the router path with another string.',
+ 'description' => 'A serialized array of function names (like user_userid_optional_to_arg) to be called to replace a part of the router path with another string.',
'type' => 'text',
'not null' => TRUE,
),
@@ -1125,8 +1124,8 @@ function system_schema() {
$schema['sessions'] = array(
'description' => "Drupal's session handlers read and write into the sessions table. Each record represents a user session, either anonymous or authenticated.",
'fields' => array(
- 'uid' => array(
- 'description' => 'The {users}.uid corresponding to a session, or 0 for anonymous user.',
+ 'userid' => array(
+ 'description' => 'The {users}.userid corresponding to a session, or 0 for anonymous user.',
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
@@ -1167,7 +1166,7 @@ function system_schema() {
'primary key' => array('sid'),
'indexes' => array(
'timestamp' => array('timestamp'),
- 'uid' => array('uid'),
+ 'userid' => array('userid'),
),
);
@@ -3131,6 +3130,52 @@ function system_update_7013() {
}
/**
+ * Replace Oracle reserved words 'uid' and 'access'.
+ */
+function system_update_7014() {
+ $ret = array();
+
+ db_drop_index($ret, 'watchdog', 'uid');
+ db_change_field($ret, 'watchdog', 'uid', 'userid', array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE));
+ db_add_index($ret, 'watchdog', 'userid', array('userid'));
+
+ db_drop_index($ret, 'node', 'uid');
+ db_change_field($ret, 'node', 'uid', 'userid', array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE));
+ db_add_index($ret, 'node', 'userid', array('userid'));
+
+ db_drop_index($ret, 'node_revisions', 'uid');
+ db_change_field($ret, 'node_revisions', 'uid', 'userid', array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE));
+ db_add_index($ret, 'node_revisions', 'userid', array('userid'));
+
+ db_drop_index($ret, 'files', 'uid');
+ db_change_field($ret, 'files', 'uid', 'userid', array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE));
+ db_add_index($ret, 'files', 'userid', array('userid'));
+
+ db_drop_primary_key($ret, 'history');
+ db_change_field($ret, 'history', 'uid', 'userid', array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE));
+ db_add_primary_key($ret, 'history', array('userid', 'nid'));
+
+ db_drop_index($ret, 'sessions', 'uid');
+ db_change_field($ret, 'sessions', 'uid', 'userid', array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE));
+ db_add_index($ret, 'sessions', 'userid', array('userid'));
+
+ db_change_field($ret, 'authmap', 'uid', 'userid', array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE));
+
+ db_drop_primary_key($ret, 'users');
+ db_drop_index($ret, 'users', 'access');
+ db_change_field($ret, 'users', 'uid', 'userid', array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE));
+ db_change_field($ret, 'users', 'access', 'lastaccess', array('type' => 'int', 'not null' => TRUE, 'default' => 0));
+ db_add_index($ret, 'users', 'lastaccess', array('lastaccess'));
+ db_add_primary_key($ret, 'users', array('userid'));
+
+ db_drop_primary_key($ret, 'users_roles');
+ db_change_field($ret, 'users_roles', 'uid', 'userid', array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE));
+ db_add_primary_key($ret, 'users_roles', array('userid', 'rid'));
+
+ return $ret;
+}
+
+/**
* @} End of "defgroup updates-6.x-to-7.x"
* The next series of updates should start at 8000.
*/
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.645
diff -u -p -r1.645 system.module
--- modules/system/system.module 24 Nov 2008 00:40:45 -0000 1.645
+++ modules/system/system.module 24 Nov 2008 10:02:24 -0000
@@ -807,7 +807,7 @@ function system_user_register(&$edit, &$
function system_user_login(&$edit, &$user, $category = NULL) {
// If the user has a NULL time zone, notify them to set a time zone.
if (!$user->timezone && variable_get('configurable_timezones', 1) && variable_get('empty_timezone_message', 0)) {
- drupal_set_message(t('Please configure your account time zone setting.', array('@user-edit' => url("user/$user->uid/edit", array('query' => drupal_get_destination(), 'fragment' => 'edit-timezone')))));
+ drupal_set_message(t('Please configure your account time zone setting.', array('@user-edit' => url("user/$user->userid/edit", array('query' => drupal_get_destination(), 'fragment' => 'edit-timezone')))));
}
}
@@ -825,11 +825,11 @@ function system_user_timezone(&$edit, &$
$form['timezone']['timezone'] = array(
'#type' => 'select',
'#title' => t('Time zone'),
- '#default_value' => $edit['timezone'] ? $edit['timezone'] : ($edit['uid'] == $user->uid ? variable_get('date_default_timezone', '') : ''),
- '#options' => system_time_zones(($edit['uid'] != $user->uid)),
+ '#default_value' => $edit['timezone'] ? $edit['timezone'] : ($edit['userid'] == $user->userid ? variable_get('date_default_timezone', '') : ''),
+ '#options' => system_time_zones(($edit['userid'] != $user->userid)),
'#description' => t('Select the desired local time and time zone. Dates and times throughout this site will be displayed using this time zone.'),
);
- if (!$edit['timezone'] && $edit['uid'] == $user->uid) {
+ if (!$edit['timezone'] && $edit['userid'] == $user->userid) {
$form['timezone']['#description'] = t('Your time zone setting will be automatically detected if possible. Please confirm the selection and click save.');
$form['timezone']['timezone']['#attributes'] = array('class' => 'timezone-detect');
drupal_add_js('misc/timezone.js');
@@ -1968,7 +1968,7 @@ function system_send_email_action($objec
if (isset($node)) {
if (!isset($account)) {
- $account = user_load(array('uid' => $node->uid));
+ $account = user_load(array('userid' => $node->userid));
}
if ($recipient == '%author') {
$recipient = $account->mail;
@@ -2020,7 +2020,7 @@ function system_mail($key, &$message, $p
if (isset($params['node'])) {
$node = $params['node'];
$variables += array(
- '%uid' => $node->uid,
+ '%userid' => $node->userid,
'%node_url' => url('node/' . $node->nid, array('absolute' => TRUE)),
'%node_type' => node_get_types('name', $node),
'%title' => $node->title,
@@ -2094,7 +2094,7 @@ function system_message_action(&$object,
if (isset($node) && is_object($node)) {
$variables = array_merge($variables, array(
- '%uid' => $node->uid,
+ '%userid' => $node->userid,
'%node_url' => url('node/' . $node->nid, array('absolute' => TRUE)),
'%node_type' => check_plain(node_get_types('name', $node)),
'%title' => filter_xss($node->title),
Index: modules/tracker/tracker.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/tracker/tracker.module,v
retrieving revision 1.157
diff -u -p -r1.157 tracker.module
--- modules/tracker/tracker.module 6 May 2008 12:18:51 -0000 1.157
+++ modules/tracker/tracker.module 24 Nov 2008 10:02:24 -0000
@@ -33,7 +33,7 @@ function tracker_menu() {
'title' => 'All recent posts',
'type' => MENU_DEFAULT_LOCAL_TASK,
);
- $items['tracker/%user_uid_optional'] = array(
+ $items['tracker/%user_userid_optional'] = array(
'title' => 'My recent posts',
'access callback' => '_tracker_myrecent_access',
'access arguments' => array(1),
@@ -57,11 +57,11 @@ function tracker_menu() {
}
/**
- * Access callback for tracker/%user_uid_optional
+ * Access callback for tracker/%user_userid_optional
*/
function _tracker_myrecent_access($account) {
// This path is only allowed for authenticated users looking at their own posts.
- return $account->uid && ($GLOBALS['user']->uid == $account->uid) && user_access('access content');
+ return $account->userid && ($GLOBALS['user']->userid == $account->userid) && user_access('access content');
}
/**
Index: modules/tracker/tracker.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/tracker/tracker.pages.inc,v
retrieving revision 1.12
diff -u -p -r1.12 tracker.pages.inc
--- modules/tracker/tracker.pages.inc 26 Oct 2008 18:06:39 -0000 1.12
+++ modules/tracker/tracker.pages.inc 24 Nov 2008 10:02:25 -0000
@@ -22,14 +22,14 @@ function tracker_page($account = NULL, $
drupal_set_title($account->name);
}
// TODO: These queries are very expensive, see http://drupal.org/node/105639
- $sql = 'SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, GREATEST(n.changed, l.last_comment_timestamp) AS last_updated, l.comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {users} u ON n.uid = u.uid LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = %d OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d) ORDER BY last_updated DESC';
+ $sql = 'SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.userid, u.name, GREATEST(n.changed, l.last_comment_timestamp) AS last_updated, l.comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {users} u ON n.userid = u.userid LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = %d OR c.status IS NULL) WHERE n.status = 1 AND (n.userid = %d OR c.userid = %d) ORDER BY last_updated DESC';
$sql = db_rewrite_sql($sql);
- $sql_count = 'SELECT COUNT(DISTINCT(n.nid)) FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = %d OR c.status IS NULL) WHERE n.status = 1 AND (n.uid = %d OR c.uid = %d)';
+ $sql_count = 'SELECT COUNT(DISTINCT(n.nid)) FROM {node} n LEFT JOIN {comments} c ON n.nid = c.nid AND (c.status = %d OR c.status IS NULL) WHERE n.status = 1 AND (n.userid = %d OR c.userid = %d)';
$sql_count = db_rewrite_sql($sql_count);
- $result = pager_query($sql, 25, 0, $sql_count, COMMENT_PUBLISHED, $account->uid, $account->uid);
+ $result = pager_query($sql, 25, 0, $sql_count, COMMENT_PUBLISHED, $account->userid, $account->userid);
}
else {
- $sql = 'SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.uid, u.name, GREATEST(n.changed, l.last_comment_timestamp) AS last_updated, l.comment_count FROM {node} n INNER JOIN {users} u ON n.uid = u.uid INNER JOIN {node_comment_statistics} l ON n.nid = l.nid WHERE n.status = 1 ORDER BY last_updated DESC';
+ $sql = 'SELECT DISTINCT(n.nid), n.title, n.type, n.changed, n.userid, u.name, GREATEST(n.changed, l.last_comment_timestamp) AS last_updated, l.comment_count FROM {node} n INNER JOIN {users} u ON n.userid = u.userid INNER JOIN {node_comment_statistics} l ON n.nid = l.nid WHERE n.status = 1 ORDER BY last_updated DESC';
$sql = db_rewrite_sql($sql);
$sql_count = 'SELECT COUNT(n.nid) FROM {node} n WHERE n.status = 1';
$sql_count = db_rewrite_sql($sql_count);
Index: modules/tracker/tracker.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/tracker/tracker.test,v
retrieving revision 1.4
diff -u -p -r1.4 tracker.test
--- modules/tracker/tracker.test 21 Sep 2008 22:15:52 -0000 1.4
+++ modules/tracker/tracker.test 24 Nov 2008 10:02:25 -0000
@@ -58,18 +58,18 @@ class TrackerTest extends DrupalWebTestC
$page1 = array(
'title' => $this->randomName(4, 'published_'),
- 'uid' => $this->user->uid,
+ 'userid' => $this->user->userid,
'status' => 1,
);
$page2 = array(
'title' => $this->randomName(4, 'unpublished_'),
- 'uid' => $this->user->uid,
+ 'userid' => $this->user->userid,
'status' => 0,
);
$this->drupalCreateNode($page1);
$this->drupalCreateNode($page2);
- $this->drupalGet('user/' . $this->user->uid . '/track');
+ $this->drupalGet('user/' . $this->user->userid . '/track');
$this->assertText($page1['title'], t("Nodes show up in the author's tracker listing."));
$this->assertNoText($page2['title'], t("Unpublished nodes do not show up in the author's tracker listing."));
}
Index: modules/trigger/trigger.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/trigger/trigger.module,v
retrieving revision 1.22
diff -u -p -r1.22 trigger.module
--- modules/trigger/trigger.module 11 Nov 2008 16:49:38 -0000 1.22
+++ modules/trigger/trigger.module 24 Nov 2008 10:02:25 -0000
@@ -195,7 +195,7 @@ function _trigger_normalize_node_context
// An action that works on users is being called in a node context.
// Load the user object of the node's author.
case 'user':
- return user_load(array('uid' => $node->uid));
+ return user_load(array('userid' => $node->userid));
}
}
@@ -299,7 +299,7 @@ function _trigger_normalize_comment_cont
// An action that works on users is being called in a comment context.
case 'user':
- return user_load(array('uid' => is_array($comment) ? $comment['uid'] : $comment->uid));
+ return user_load(array('userid' => is_array($comment) ? $comment['userid'] : $comment->userid));
}
}
Index: modules/upload/upload.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/upload/upload.module,v
retrieving revision 1.217
diff -u -p -r1.217 upload.module
--- modules/upload/upload.module 24 Nov 2008 00:40:45 -0000 1.217
+++ modules/upload/upload.module 24 Nov 2008 10:02:25 -0000
@@ -429,13 +429,13 @@ function theme_upload_attachments($files
/**
* Determine how much disk space is occupied by a user's uploaded files.
*
- * @param $uid
+ * @param $userid
* The integer user id of a user.
* @return
* The amount of disk space used by the user in bytes.
*/
-function upload_space_used($uid) {
- return file_space_used($uid);
+function upload_space_used($userid) {
+ return file_space_used($userid);
}
/**
@@ -525,7 +525,7 @@ function _upload_form($node) {
$limit_description .= t('Images may not be larger than %resolution. ', array('%resolution' => $limits['resolution']));
}
}
- if ($user->uid != 1) {
+ if ($user->userid != 1) {
$limit_description .= t('Only files with the following extensions may be uploaded: %extensions. ', array('%extensions' => $limits['extensions']));
}
Index: modules/user/user.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.admin.inc,v
retrieving revision 1.33
diff -u -p -r1.33 user.admin.inc
--- modules/user/user.admin.inc 16 Nov 2008 15:10:49 -0000 1.33
+++ modules/user/user.admin.inc 24 Nov 2008 10:02:25 -0000
@@ -135,13 +135,13 @@ function user_admin_account() {
array('data' => t('Status'), 'field' => 'u.status'),
t('Roles'),
array('data' => t('Member for'), 'field' => 'u.created', 'sort' => 'desc'),
- array('data' => t('Last access'), 'field' => 'u.access'),
+ array('data' => t('Last access'), 'field' => 'u.lastaccess'),
t('Operations')
);
- $sql = 'SELECT DISTINCT u.uid, u.name, u.status, u.created, u.access FROM {users} u LEFT JOIN {users_roles} ur ON u.uid = ur.uid ' . $filter['join'] . ' WHERE u.uid != 0 ' . $filter['where'];
+ $sql = 'SELECT DISTINCT u.userid, u.name, u.status, u.created, u.lastaccess FROM {users} u LEFT JOIN {users_roles} ur ON u.userid = ur.userid ' . $filter['join'] . ' WHERE u.userid != 0 ' . $filter['where'];
$sql .= tablesort_sql($header);
- $query_count = 'SELECT COUNT(DISTINCT u.uid) FROM {users} u LEFT JOIN {users_roles} ur ON u.uid = ur.uid ' . $filter['join'] . ' WHERE u.uid != 0 ' . $filter['where'];
+ $query_count = 'SELECT COUNT(DISTINCT u.userid) FROM {users} u LEFT JOIN {users_roles} ur ON u.userid = ur.userid ' . $filter['join'] . ' WHERE u.userid != 0 ' . $filter['where'];
$result = pager_query($sql, 50, 0, $query_count, $filter['args']);
$form['options'] = array(
@@ -170,19 +170,19 @@ function user_admin_account() {
$roles = user_roles(TRUE);
$accounts = array();
while ($account = db_fetch_object($result)) {
- $accounts[$account->uid] = '';
- $form['name'][$account->uid] = array('#markup' => theme('username', $account));
- $form['status'][$account->uid] = array('#markup' => $status[$account->status]);
+ $accounts[$account->userid] = '';
+ $form['name'][$account->userid] = array('#markup' => theme('username', $account));
+ $form['status'][$account->userid] = array('#markup' => $status[$account->status]);
$users_roles = array();
- $roles_result = db_query('SELECT rid FROM {users_roles} WHERE uid = %d', $account->uid);
+ $roles_result = db_query('SELECT rid FROM {users_roles} WHERE userid = %d', $account->userid);
while ($user_role = db_fetch_object($roles_result)) {
$users_roles[] = $roles[$user_role->rid];
}
asort($users_roles);
- $form['roles'][$account->uid][0] = array('#markup' => theme('item_list', $users_roles));
- $form['member_for'][$account->uid] = array('#markup' => format_interval(REQUEST_TIME - $account->created));
- $form['last_access'][$account->uid] = array('#markup' => $account->access ? t('@time ago', array('@time' => format_interval(REQUEST_TIME - $account->access))) : t('never'));
- $form['operations'][$account->uid] = array('#markup' => l(t('edit'), "user/$account->uid/edit", array('query' => $destination)));
+ $form['roles'][$account->userid][0] = array('#markup' => theme('item_list', $users_roles));
+ $form['member_for'][$account->userid] = array('#markup' => format_interval(REQUEST_TIME - $account->created));
+ $form['lastaccess'][$account->userid] = array('#markup' => $account->lastaccess ? t('@time ago', array('@time' => format_interval(REQUEST_TIME - $account->lastaccess))) : t('never'));
+ $form['operations'][$account->userid] = array('#markup' => l(t('edit'), "user/$account->userid/edit", array('query' => $destination)));
}
$form['accounts'] = array(
'#type' => 'checkboxes',
@@ -712,7 +712,7 @@ function theme_user_admin_account($form)
array('data' => t('Status'), 'field' => 'u.status'),
t('Roles'),
array('data' => t('Member for'), 'field' => 'u.created', 'sort' => 'desc'),
- array('data' => t('Last access'), 'field' => 'u.access'),
+ array('data' => t('Last access'), 'field' => 'u.lastaccess'),
t('Operations')
);
@@ -725,7 +725,7 @@ function theme_user_admin_account($form)
drupal_render($form['status'][$key]),
drupal_render($form['roles'][$key]),
drupal_render($form['member_for'][$key]),
- drupal_render($form['last_access'][$key]),
+ drupal_render($form['lastaccess'][$key]),
drupal_render($form['operations'][$key]),
);
}
Index: modules/user/user.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.install,v
retrieving revision 1.15
diff -u -p -r1.15 user.install
--- modules/user/user.install 20 Nov 2008 06:56:17 -0000 1.15
+++ modules/user/user.install 24 Nov 2008 10:02:25 -0000
@@ -14,11 +14,11 @@ function user_schema() {
'unsigned' => TRUE,
'not null' => TRUE,
),
- 'uid' => array(
+ 'userid' => array(
'type' => 'int',
+ 'unsigned' => TRUE,
'not null' => TRUE,
- 'default' => 0,
- 'description' => "User's {users}.uid.",
+ 'description' => "User's {users}.id.",
),
'authname' => array(
'type' => 'varchar',
@@ -90,7 +90,7 @@ function user_schema() {
$schema['users'] = array(
'description' => 'Stores user data.',
'fields' => array(
- 'uid' => array(
+ 'userid' => array(
'type' => 'serial',
'unsigned' => TRUE,
'not null' => TRUE,
@@ -137,7 +137,7 @@ function user_schema() {
'default' => 0,
'description' => 'Timestamp for when user was created.',
),
- 'access' => array(
+ 'lastaccess' => array(
'type' => 'int',
'not null' => TRUE,
'default' => 0,
@@ -192,25 +192,24 @@ function user_schema() {
),
),
'indexes' => array(
- 'access' => array('access'),
+ 'lastaccess' => array('lastaccess'),
'created' => array('created'),
'mail' => array('mail'),
),
'unique keys' => array(
'name' => array('name'),
),
- 'primary key' => array('uid'),
+ 'primary key' => array('userid'),
);
$schema['users_roles'] = array(
'description' => 'Maps users to roles.',
'fields' => array(
- 'uid' => array(
+ 'userid' => array(
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
- 'default' => 0,
- 'description' => 'Primary Key: {users}.uid for user.',
+ 'description' => 'Primary Key: {users}.id for user.',
),
'rid' => array(
'type' => 'int',
@@ -220,7 +219,7 @@ function user_schema() {
'description' => 'Primary Key: {role}.rid for role.',
),
),
- 'primary key' => array('uid', 'rid'),
+ 'primary key' => array('userid', 'rid'),
'indexes' => array(
'rid' => array('rid'),
),
@@ -230,7 +229,7 @@ function user_schema() {
}
/**
- * @defgroup user-updates-6.x-to-7.x User updates from 6.x to 7.x
+ * @defgroup updates-6.x-to-7.x User updates from 6.x to 7.x
* @{
*/
@@ -360,7 +359,6 @@ function user_update_7002(&$sandbox) {
}
/**
- * @} End of "defgroup user-updates-6.x-to-7.x"
+ * @} End of "defgroup updates-6.x-to-7.x"
* The next series of updates should start at 8000.
*/
-
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.941
diff -u -p -r1.941 user.module
--- modules/user/user.module 24 Nov 2008 06:12:46 -0000 1.941
+++ modules/user/user.module 24 Nov 2008 10:02:25 -0000
@@ -83,7 +83,7 @@ function user_theme() {
}
function user_external_load($authname) {
- $result = db_query("SELECT uid FROM {authmap} WHERE authname = '%s'", $authname);
+ $result = db_query("SELECT userid FROM {authmap} WHERE authname = '%s'", $authname);
if ($user = db_fetch_array($result)) {
return user_load($user);
@@ -149,14 +149,14 @@ function user_load($array = array()) {
$params = array();
if (is_numeric($array)) {
- $array = array('uid' => $array);
+ $array = array('userid' => $array);
}
elseif (!is_array($array)) {
return FALSE;
}
foreach ($array as $key => $value) {
- if ($key == 'uid' || $key == 'status') {
+ if ($key == 'userid' || $key == 'status') {
$query[] = "$key = %d";
$params[] = $value;
}
@@ -175,13 +175,13 @@ function user_load($array = array()) {
$user = drupal_unpack($user);
$user->roles = array();
- if ($user->uid) {
+ if ($user->userid) {
$user->roles[DRUPAL_AUTHENTICATED_RID] = 'authenticated user';
}
else {
$user->roles[DRUPAL_ANONYMOUS_RID] = 'anonymous user';
}
- $result = db_query('SELECT r.rid, r.name FROM {role} r INNER JOIN {users_roles} ur ON ur.rid = r.rid WHERE ur.uid = %d', $user->uid);
+ $result = db_query('SELECT r.rid, r.name FROM {role} r INNER JOIN {users_roles} ur ON ur.rid = r.rid WHERE ur.userid = %d', $user->userid);
while ($role = db_fetch_object($result)) {
$user->roles[$role->rid] = $role->name;
}
@@ -198,7 +198,7 @@ function user_load($array = array()) {
* Save changes to a user account or add a new user.
*
* @param $account
- * The $user object for the user to modify or add. If $user->uid is
+ * The $user object for the user to modify or add. If $user->userid is
* omitted, a new user will be added.
*
* @param $edit
@@ -232,13 +232,13 @@ function user_save($account, $edit = arr
unset($edit['pass']);
}
- if (is_object($account) && $account->uid) {
+ if (is_object($account) && $account->userid) {
user_module_invoke('update', $edit, $account, $category);
- $data = unserialize(db_result(db_query('SELECT data FROM {users} WHERE uid = %d', $account->uid)));
+ $data = unserialize(db_result(db_query('SELECT data FROM {users} WHERE userid = %d', $account->userid)));
// Consider users edited by an administrator as logged in, if they haven't
// already, so anonymous users can view the profile (if allowed).
- if (empty($edit['access']) && empty($account->access) && user_access('administer users')) {
- $edit['access'] = REQUEST_TIME;
+ if (empty($edit['lastaccess']) && empty($account->lastaccess) && user_access('administer users')) {
+ $edit['lastaccess'] = REQUEST_TIME;
}
foreach ($edit as $key => $value) {
// Fields that don't pertain to the users or user_roles
@@ -254,9 +254,9 @@ function user_save($account, $edit = arr
}
$edit['data'] = $data;
- $edit['uid'] = $account->uid;
+ $edit['userid'] = $account->userid;
// Save changes to the users table.
- $success = drupal_write_record('users', $edit, 'uid');
+ $success = drupal_write_record('users', $edit, 'userid');
if (!$success) {
// The query failed - better to abort the save than risk further data loss.
return FALSE;
@@ -264,29 +264,29 @@ function user_save($account, $edit = arr
// Reload user roles if provided.
if (isset($edit['roles']) && is_array($edit['roles'])) {
- db_query('DELETE FROM {users_roles} WHERE uid = %d', $account->uid);
+ db_query('DELETE FROM {users_roles} WHERE userid = %d', $account->userid);
foreach (array_keys($edit['roles']) as $rid) {
if (!in_array($rid, array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID))) {
- db_query('INSERT INTO {users_roles} (uid, rid) VALUES (%d, %d)', $account->uid, $rid);
+ db_query('INSERT INTO {users_roles} (userid, rid) VALUES (%d, %d)', $account->userid, $rid);
}
}
}
// Delete a blocked user's sessions to kick them if they are online.
if (isset($edit['status']) && $edit['status'] == 0) {
- drupal_session_destroy_uid($account->uid);
+ drupal_session_destroy_userid($account->userid);
}
// If the password changed, delete all open sessions and recreate
// the current one.
if (!empty($edit['pass'])) {
- drupal_session_destroy_uid($account->uid);
+ drupal_session_destroy_userid($account->userid);
drupal_session_regenerate();
}
// Refresh user object.
- $user = user_load(array('uid' => $account->uid));
+ $user = user_load(array('userid' => $account->userid));
// Send emails after we have the new user object.
if (isset($edit['status']) && $edit['status'] != $account->status) {
@@ -304,19 +304,19 @@ function user_save($account, $edit = arr
}
// Consider users created by an administrator as already logged in, so
// anonymous users can view the profile (if allowed).
- if (empty($edit['access']) && user_access('administer users')) {
- $edit['access'] = REQUEST_TIME;
+ if (empty($edit['lastaccess']) && user_access('administer users')) {
+ $edit['lastaccess'] = REQUEST_TIME;
}
$success = drupal_write_record('users', $edit);
if (!$success) {
- // On a failed INSERT some other existing user's uid may be returned.
+ // On a failed INSERT some other existing user's userid may be returned.
// We must abort to avoid overwriting their account.
return FALSE;
}
// Build the initial user object.
- $user = user_load(array('uid' => $edit['uid']));
+ $user = user_load(array('userid' => $edit['userid']));
user_module_invoke('insert', $edit, $user, $category);
@@ -329,22 +329,22 @@ function user_save($account, $edit = arr
}
}
if (!empty($data)) {
- $data_array = array('uid' => $user->uid, 'data' => $data);
- drupal_write_record('users', $data_array, 'uid');
+ $data_array = array('userid' => $user->userid, 'data' => $data);
+ drupal_write_record('users', $data_array, 'userid');
}
// Save user roles (delete just to be safe).
if (isset($edit['roles']) && is_array($edit['roles'])) {
- db_query('DELETE FROM {users_roles} WHERE uid = %d', $edit['uid']);
+ db_query('DELETE FROM {users_roles} WHERE userid = %d', $edit['userid']);
foreach (array_keys($edit['roles']) as $rid) {
if (!in_array($rid, array(DRUPAL_ANONYMOUS_RID, DRUPAL_AUTHENTICATED_RID))) {
- db_query('INSERT INTO {users_roles} (uid, rid) VALUES (%d, %d)', $edit['uid'], $rid);
+ db_query('INSERT INTO {users_roles} (userid, rid) VALUES (%d, %d)', $edit['userid'], $rid);
}
}
}
// Build the finished user object.
- $user = user_load(array('uid' => $edit['uid']));
+ $user = user_load(array('userid' => $edit['userid']));
}
return $user;
@@ -412,7 +412,7 @@ function user_validate_picture(&$form, &
// files table as a temporary file. We'll make a copy and let the garbage
// collector delete the original upload.
$info = image_get_info($file->filepath);
- $destination = file_create_path(variable_get('user_picture_path', 'pictures') . '/picture-' . $form['#uid'] . '.' . $info['extension']);
+ $destination = file_create_path(variable_get('user_picture_path', 'pictures') . '/picture-' . $form['#userid'] . '.' . $info['extension']);
if ($filepath = file_unmanaged_copy($file->filepath, $destination, FILE_EXISTS_REPLACE)) {
$form_state['values']['picture'] = $filepath;
}
@@ -534,23 +534,23 @@ function user_access($string, $account =
}
// User #1 has all privileges:
- if ($account->uid == 1) {
+ if ($account->userid == 1) {
return TRUE;
}
// To reduce the number of SQL queries, we cache the user's permissions
// in a static variable.
- if (!isset($perm[$account->uid])) {
+ if (!isset($perm[$account->userid])) {
$role_permissions = user_role_permissions($account->roles, $reset);
$perms = array();
foreach ($role_permissions as $one_role) {
$perms += $one_role;
}
- $perm[$account->uid] = $perms;
+ $perm[$account->userid] = $perms;
}
- return isset($perm[$account->uid][$string]);
+ return isset($perm[$account->userid][$string]);
}
/**
@@ -616,15 +616,15 @@ function user_search($op = 'search', $ke
$keys = preg_replace('!\*+!', '%', $keys);
if (user_access('administer users')) {
// Administrators can also search in the otherwise private email field.
- $result = pager_query("SELECT name, uid, mail FROM {users} WHERE LOWER(name) LIKE LOWER('%%%s%%') OR LOWER(mail) LIKE LOWER('%%%s%%')", 15, 0, NULL, $keys, $keys);
+ $result = pager_query("SELECT name, userid, mail FROM {users} WHERE LOWER(name) LIKE LOWER('%%%s%%') OR LOWER(mail) LIKE LOWER('%%%s%%')", 15, 0, NULL, $keys, $keys);
while ($account = db_fetch_object($result)) {
- $find[] = array('title' => $account->name . ' (' . $account->mail . ')', 'link' => url('user/' . $account->uid, array('absolute' => TRUE)));
+ $find[] = array('title' => $account->name . ' (' . $account->mail . ')', 'link' => url('user/' . $account->userid, array('absolute' => TRUE)));
}
}
else {
- $result = pager_query("SELECT name, uid FROM {users} WHERE LOWER(name) LIKE LOWER('%%%s%%')", 15, 0, NULL, $keys);
+ $result = pager_query("SELECT name, userid FROM {users} WHERE LOWER(name) LIKE LOWER('%%%s%%')", 15, 0, NULL, $keys);
while ($account = db_fetch_object($result)) {
- $find[] = array('title' => $account->name, 'link' => url('user/' . $account->uid, array('absolute' => TRUE)));
+ $find[] = array('title' => $account->name, 'link' => url('user/' . $account->userid, array('absolute' => TRUE)));
}
}
return $find;
@@ -784,7 +784,7 @@ function user_block($op = 'list', $delta
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)))) {
+ if (!$user->userid && !(arg(0) == 'user' && !is_numeric(arg(1)))) {
$block['subject'] = t('User login');
$block['content'] = drupal_get_form('user_login_block');
@@ -793,7 +793,7 @@ function user_block($op = 'list', $delta
case 'navigation':
if ($menu = menu_tree()) {
- $block['subject'] = $user->uid ? check_plain($user->name) : t('Navigation');
+ $block['subject'] = $user->userid ? check_plain($user->name) : t('Navigation');
$block['content'] = $menu;
}
return $block;
@@ -801,7 +801,7 @@ function user_block($op = 'list', $delta
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', array(), 0, variable_get('user_block_whois_new_count', 5))->fetchAll();
+ $items = db_query_range('SELECT userid, name FROM {users} WHERE status != 0 AND lastaccess != 0 ORDER BY created DESC', array(), 0, variable_get('user_block_whois_new_count', 5))->fetchAll();
$output = theme('user_list', $items);
$block['subject'] = t('Who\'s new');
@@ -817,7 +817,7 @@ function user_block($op = 'list', $delta
// Perform database queries to gather online user lists. We use s.timestamp
// rather than u.access because it is much faster.
$anonymous_count = drupal_session_count($interval);
- $authenticated_count = db_query("SELECT COUNT(DISTINCT s.uid) FROM {sessions} s WHERE s.timestamp >= :timestamp AND s.uid > 0", array(':timestamp' => $interval))->fetchField();
+ $authenticated_count = db_query("SELECT COUNT(DISTINCT s.userid) FROM {sessions} s WHERE s.timestamp >= :timestamp AND s.userid > 0", array(':timestamp' => $interval))->fetchField();
// Format the output with proper grammar.
if ($anonymous_count == 1 && $authenticated_count == 1) {
@@ -830,7 +830,7 @@ function user_block($op = 'list', $delta
// 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', array(':interval' => $interval), 0, $max_users)->fetchAll();
+ $items = db_query_range('SELECT u.userid, u.name, MAX(s.timestamp) AS max_timestamp FROM {users} u INNER JOIN {sessions} s ON u.userid = s.userid WHERE s.timestamp >= :interval AND s.userid > 0 GROUP BY u.userid, u.name ORDER BY max_timestamp DESC', array(':interval' => $interval), 0, $max_users)->fetchAll();
$output .= theme('user_list', $items, t('Online users'));
}
@@ -864,9 +864,9 @@ function template_preprocess_user_pictur
if (isset($picture)) {
$alt = t("@user's picture", array('@user' => $account->name ? $account->name : variable_get('anonymous', t('Anonymous'))));
$variables['picture'] = theme('image', $picture, $alt, $alt, '', FALSE);
- if (!empty($account->uid) && user_access('access user profiles')) {
+ if (!empty($account->userid) && user_access('access user profiles')) {
$attributes = array('attributes' => array('title' => t('View user profile.')), 'html' => TRUE);
- $variables['picture'] = l($variables['picture'], "user/$account->uid", $attributes);
+ $variables['picture'] = l($variables['picture'], "user/$account->userid", $attributes);
}
}
}
@@ -876,7 +876,7 @@ function template_preprocess_user_pictur
* Make a list of users.
*
* @param $users
- * An array with user objects. Should contain at least the name and uid.
+ * An array with user objects. Should contain at least the name and userid.
* @param $title
* (optional) Title to pass on to theme_item_list().
*
@@ -893,11 +893,11 @@ function theme_user_list($users, $title
function user_is_anonymous() {
// Menu administrators can see items for anonymous when administering.
- return !$GLOBALS['user']->uid || !empty($GLOBALS['menu_admin']);
+ return !$GLOBALS['user']->userid || !empty($GLOBALS['menu_admin']);
}
function user_is_logged_in() {
- return (bool)$GLOBALS['user']->uid;
+ return (bool)$GLOBALS['user']->userid;
}
function user_register_access() {
@@ -905,14 +905,14 @@ function user_register_access() {
}
function user_view_access($account) {
- return $account && $account->uid &&
+ return $account && $account->userid &&
(
// Always let users view their own profile.
- ($GLOBALS['user']->uid == $account->uid) ||
+ ($GLOBALS['user']->userid == $account->userid) ||
// Administrators can view all accounts.
user_access('administer users') ||
// The user is not blocked and logged in at least once.
- ($account->access && $account->status && user_access('access user profiles'))
+ ($account->lastaccess && $account->status && user_access('access user profiles'))
);
}
@@ -920,11 +920,11 @@ function user_view_access($account) {
* Access callback for user account editing.
*/
function user_edit_access($account) {
- return (($GLOBALS['user']->uid == $account->uid) || user_access('administer users')) && $account->uid > 0;
+ return (($GLOBALS['user']->userid == $account->userid) || user_access('administer users')) && $account->userid > 0;
}
function user_load_self($arg) {
- $arg[1] = user_load($GLOBALS['user']->uid);
+ $arg[1] = user_load($GLOBALS['user']->userid);
return $arg;
}
@@ -1040,7 +1040,7 @@ function user_menu() {
'weight' => 10,
);
- $items['user/%user_uid_optional'] = array(
+ $items['user/%user_userid_optional'] = array(
'title' => 'My account',
'title callback' => 'user_page_title',
'title arguments' => array(1),
@@ -1109,22 +1109,22 @@ function user_init() {
drupal_add_css(drupal_get_path('module', 'user') . '/user.css');
}
-function user_uid_optional_load($arg) {
- return user_load(isset($arg) ? $arg : $GLOBALS['user']->uid);
+function user_userid_optional_load($arg) {
+ return user_load(isset($arg) ? $arg : $GLOBALS['user']->userid);
}
/**
* Return a user object after checking if any profile category in the path exists.
*/
-function user_category_load($uid, &$map, $index) {
+function user_category_load($userid, &$map, $index) {
static $user_categories, $accounts;
// Cache $account - this load function will get called for each profile tab.
- if (!isset($accounts[$uid])) {
- $accounts[$uid] = user_load($uid);
+ if (!isset($accounts[$userid])) {
+ $accounts[$userid] = user_load($userid);
}
$valid = TRUE;
- if ($account = $accounts[$uid]) {
+ if ($account = $accounts[$userid]) {
// Since the path is like user/%/edit/category_name, the category name will
// be at a position 2 beyond the index corresponding to the % wildcard.
$category_index = $index + 2;
@@ -1155,18 +1155,18 @@ function user_category_load($uid, &$map,
/**
* Returns the user id of the currently logged in user.
*/
-function user_uid_optional_to_arg($arg) {
- // Give back the current user uid when called from eg. tracker, aka.
- // with an empty arg. Also use the current user uid when called from
+function user_userid_optional_to_arg($arg) {
+ // Give back the current user userid when called from eg. tracker, aka.
+ // with an empty arg. Also use the current user userid when called from
// the menu with a % for the current account link.
- return empty($arg) || $arg == '%' ? $GLOBALS['user']->uid : $arg;
+ return empty($arg) || $arg == '%' ? $GLOBALS['user']->userid : $arg;
}
/**
* Menu item title callback - use the user name if it's not the current user.
*/
function user_page_title($account) {
- if ($account->uid == $GLOBALS['user']->uid) {
+ if ($account->userid == $GLOBALS['user']->userid) {
return t('My account');
}
return $account->name;
@@ -1209,7 +1209,7 @@ function user_set_authmaps($account, $au
if ($value) {
db_merge('authmap')
->key(array(
- 'uid' => $account->uid,
+ 'userid' => $account->userid,
'module' => $module[1],
))
->fields(array(
@@ -1218,7 +1218,7 @@ function user_set_authmaps($account, $au
->execute();
}
else {
- db_delete('authmap')->condition('uid', $account->uid)->condition('module', $module[1])->execute();
+ db_delete('authmap')->condition('userid', $account->userid)->condition('module', $module[1])->execute();
}
}
}
@@ -1232,8 +1232,8 @@ function user_login(&$form_state) {
global $user;
// If we are already logged on, go to the user page instead.
- if ($user->uid) {
- drupal_goto('user/' . $user->uid);
+ if ($user->userid) {
+ drupal_goto('user/' . $user->userid);
}
// Display login form:
@@ -1303,7 +1303,7 @@ function user_login_authenticate_validat
*/
function user_login_final_validate($form, &$form_state) {
global $user;
- if (!$user->uid) {
+ if (!$user->userid) {
form_set_error('name', t('Sorry, unrecognized username or password. Have you forgotten your password?', array('@password' => url('user/password'))));
watchdog('user', 'Login attempt failed for %user.', array('%user' => $form_state['values']['name']));
}
@@ -1333,10 +1333,10 @@ function user_authenticate($form_values
if (user_needs_new_hash($account)) {
$new_hash = user_hash_password($password);
if ($new_hash) {
- db_query("UPDATE {users} SET pass = '%s' WHERE uid = %d", $new_hash, $account->uid);
+ db_query("UPDATE {users} SET pass = '%s' WHERE userid = %d", $new_hash, $account->userid);
}
}
- $account = user_load(array('uid' => $account->uid, 'status' => 1));
+ $account = user_load(array('userid' => $account->userid, 'status' => 1));
$user = $account;
user_authenticate_finalize($form_values);
return $user;
@@ -1360,7 +1360,7 @@ function user_authenticate_finalize(&$ed
// Update the user table timestamp noting user has logged in.
// This is also used to invalidate one-time login links.
$user->login = REQUEST_TIME;
- db_query("UPDATE {users} SET login = %d WHERE uid = %d", $user->login, $user->uid);
+ db_query("UPDATE {users} SET login = %d WHERE userid = %d", $user->login, $user->userid);
// Regenerate the session ID to prevent against session fixation attacks.
// This is called before hook_user in case one of those functions fails
// or incorrectly does a redirect which would leave the old session in place.
@@ -1376,8 +1376,8 @@ function user_authenticate_finalize(&$ed
*/
function user_login_submit($form, &$form_state) {
global $user;
- if ($user->uid) {
- $form_state['redirect'] = 'user/' . $user->uid;
+ if ($user->userid) {
+ $form_state['redirect'] = 'user/' . $user->userid;
return;
}
}
@@ -1391,7 +1391,7 @@ function user_external_login_register($n
global $user;
$existing_user = user_load(array('name' => $name));
- if (isset($existing_user->uid)) {
+ if (isset($existing_user->userid)) {
$user = $existing_user;
}
else {
@@ -1401,7 +1401,7 @@ function user_external_login_register($n
'pass' => user_password(),
'init' => $name,
'status' => 1,
- 'access' => REQUEST_TIME
+ 'lastaccess' => REQUEST_TIME
);
$account = user_save('', $userinfo);
// Terminate if an error occured during user_save().
@@ -1411,20 +1411,20 @@ function user_external_login_register($n
}
user_set_authmaps($account, array("authname_$module" => $name));
$user = $account;
- watchdog('user', 'New external user: %name using module %module.', array('%name' => $name, '%module' => $module), WATCHDOG_NOTICE, l(t('edit'), 'user/' . $user->uid . '/edit'));
+ watchdog('user', 'New external user: %name using module %module.', array('%name' => $name, '%module' => $module), WATCHDOG_NOTICE, l(t('edit'), 'user/' . $user->userid . '/edit'));
}
}
function user_pass_reset_url($account) {
$timestamp = REQUEST_TIME;
- return url("user/reset/$account->uid/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login), array('absolute' => TRUE));
+ return url("user/reset/$account->userid/$timestamp/" . user_pass_rehash($account->pass, $timestamp, $account->login), array('absolute' => TRUE));
}
function user_pass_rehash($password, $timestamp, $login) {
return md5($timestamp . $password . $login);
}
-function user_edit_form(&$form_state, $uid, $edit, $register = FALSE) {
+function user_edit_form(&$form_state, $userid, $edit, $register = FALSE) {
_user_password_dynamic_validation();
$admin = user_access('administer users');
@@ -1529,19 +1529,19 @@ function user_edit_form(&$form_state, $u
$form['picture']['picture_upload'] = array('#type' => 'file', '#title' => t('Upload picture'), '#size' => 48, '#description' => t('Your virtual face or picture. Maximum dimensions are %dimensions and the maximum size is %size kB.', array('%dimensions' => variable_get('user_picture_dimensions', '85x85'), '%size' => variable_get('user_picture_file_size', '30'))) . ' ' . variable_get('user_picture_guidelines', ''));
$form['#validate'][] = 'user_validate_picture';
}
- $form['#uid'] = $uid;
+ $form['#userid'] = $userid;
return $form;
}
-function _user_edit_validate($uid, &$edit) {
- $user = user_load(array('uid' => $uid));
+function _user_edit_validate($userid, &$edit) {
+ $user = user_load(array('userid' => $userid));
// Validate the username:
- if (user_access('change own username') || user_access('administer users') || !$user->uid) {
+ if (user_access('change own username') || user_access('administer users') || !$user->userid) {
if ($error = user_validate_name($edit['name'])) {
form_set_error('name', $error);
}
- elseif (db_result(db_query("SELECT COUNT(*) FROM {users} WHERE uid != %d AND LOWER(name) = LOWER('%s')", $uid, $edit['name'])) > 0) {
+ elseif (db_result(db_query("SELECT COUNT(*) FROM {users} WHERE userid != %d AND LOWER(name) = LOWER('%s')", $userid, $edit['name'])) > 0) {
form_set_error('name', t('The name %name is already taken.', array('%name' => $edit['name'])));
}
}
@@ -1550,13 +1550,13 @@ function _user_edit_validate($uid, &$edi
if ($error = user_validate_mail($edit['mail'])) {
form_set_error('mail', $error);
}
- elseif (db_result(db_query("SELECT COUNT(*) FROM {users} WHERE uid != %d AND LOWER(mail) = LOWER('%s')", $uid, $edit['mail'])) > 0) {
+ elseif (db_result(db_query("SELECT COUNT(*) FROM {users} WHERE userid != %d AND LOWER(mail) = LOWER('%s')", $userid, $edit['mail'])) > 0) {
form_set_error('mail', t('The e-mail address %email is already registered. Have you forgotten your password?', array('%email' => $edit['mail'], '@password' => url('user/password'))));
}
}
-function _user_edit_submit($uid, &$edit) {
- $user = user_load(array('uid' => $uid));
+function _user_edit_submit($userid, &$edit) {
+ $user = user_load(array('userid' => $userid));
// Delete picture if requested, and if no replacement picture was given.
if (!empty($edit['picture_delete'])) {
if ($user->picture && file_exists($user->picture)) {
@@ -1573,16 +1573,16 @@ function _user_edit_submit($uid, &$edit)
* Delete a user.
*
* @param $edit An array of submitted form values.
- * @param $uid The user ID of the user to delete.
+ * @param $userid The user ID of the user to delete.
*/
-function user_delete($edit, $uid) {
- $account = user_load(array('uid' => $uid));
- drupal_session_destroy_uid($uid);
+function user_delete($edit, $userid) {
+ $account = user_load(array('userid' => $userid));
+ drupal_session_destroy_userid($userid);
_user_mail_notify('status_deleted', $account);
module_invoke_all('user_delete', $edit, $account);
- db_query('DELETE FROM {users} WHERE uid = %d', $uid);
- db_query('DELETE FROM {users_roles} WHERE uid = %d', $uid);
- db_query('DELETE FROM {authmap} WHERE uid = %d', $uid);
+ db_query('DELETE FROM {users} WHERE userid = %d', $userid);
+ db_query('DELETE FROM {users_roles} WHERE userid = %d', $userid);
+ db_query('DELETE FROM {authmap} WHERE userid = %d', $userid);
$variables = array('%name' => $account->name, '%email' => '<' . $account->mail . '>');
watchdog('user', 'Deleted user: %name %email.', $variables, WATCHDOG_NOTICE);
}
@@ -1787,8 +1787,8 @@ function user_user_operations($form_stat
* Callback function for admin mass unblocking users.
*/
function user_user_operations_unblock($accounts) {
- foreach ($accounts as $uid) {
- $account = user_load(array('uid' => (int)$uid));
+ foreach ($accounts as $userid) {
+ $account = user_load(array('userid' => (int)$userid));
// Skip unblocking user if they are already unblocked.
if ($account !== FALSE && $account->status == 0) {
user_save($account, array('status' => 1));
@@ -1800,8 +1800,8 @@ function user_user_operations_unblock($a
* Callback function for admin mass blocking users.
*/
function user_user_operations_block($accounts) {
- foreach ($accounts as $uid) {
- $account = user_load(array('uid' => (int)$uid));
+ foreach ($accounts as $userid) {
+ $account = user_load(array('userid' => (int)$userid));
// Skip blocking user if they are already blocked.
if ($account !== FALSE && $account->status == 1) {
user_save($account, array('status' => 0));
@@ -1819,8 +1819,8 @@ function user_multiple_role_edit($accoun
switch ($operation) {
case 'add_role':
- foreach ($accounts as $uid) {
- $account = user_load(array('uid' => (int)$uid));
+ foreach ($accounts as $userid) {
+ $account = user_load(array('userid' => (int)$userid));
// Skip adding the role to the user if they already have it.
if ($account !== FALSE && !isset($account->roles[$rid])) {
$roles = $account->roles + array($rid => $role_name);
@@ -1829,8 +1829,8 @@ function user_multiple_role_edit($accoun
}
break;
case 'remove_role':
- foreach ($accounts as $uid) {
- $account = user_load(array('uid' => (int)$uid));
+ foreach ($accounts as $userid) {
+ $account = user_load(array('userid' => (int)$userid));
// Skip removing the role from the user if they already don't have it.
if ($account !== FALSE && isset($account->roles[$rid])) {
$roles = array_diff($account->roles, array($rid => $role_name));
@@ -1846,9 +1846,9 @@ function user_multiple_delete_confirm(&$
$form['accounts'] = array('#prefix' => 'Your password is %pass. You may change your password below.
', array('%pass' => $pass))); @@ -2304,7 +2304,7 @@ function user_register_submit($form, &$f // Add plain text password into user account to generate mail tokens. $account->password = $pass; if ($admin && !$notify) { - drupal_set_message(t('Created a new user account for %name. No e-mail has been sent.', array('@url' => url("user/$account->uid"), '%name' => $account->name))); + drupal_set_message(t('Created a new user account for %name. No e-mail has been sent.', array('@url' => url("user/$account->userid"), '%name' => $account->name))); } elseif (!variable_get('user_email_verification', TRUE) && $account->status && !$admin) { // No e-mail verification is required, create new user account, and login @@ -2321,7 +2321,7 @@ function user_register_submit($form, &$f $op = $notify ? 'register_admin_created' : 'register_no_approval_required'; _user_mail_notify($op, $account); if ($notify) { - drupal_set_message(t('Password and further instructions have been e-mailed to the new user %name.', array('@url' => url("user/$account->uid"), '%name' => $account->name))); + drupal_set_message(t('Password and further instructions have been e-mailed to the new user %name.', array('@url' => url("user/$account->userid"), '%name' => $account->name))); } else { drupal_set_message(t('Your password and further instructions have been sent to your e-mail address.')); @@ -2353,8 +2353,8 @@ function user_register() { $admin = user_access('administer users'); // If we aren't admin but already logged on, go to the user page instead. - if (!$admin && $user->uid) { - drupal_goto('user/' . $user->uid); + if (!$admin && $user->userid) { + drupal_goto('user/' . $user->userid); } $form = array(); Index: modules/user/user.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.pages.inc,v retrieving revision 1.24 diff -u -p -r1.24 user.pages.inc --- modules/user/user.pages.inc 24 Nov 2008 00:40:45 -0000 1.24 +++ modules/user/user.pages.inc 24 Nov 2008 10:02:25 -0000 @@ -49,7 +49,7 @@ function user_pass_validate($form, &$for // No success, try to load by name. $account = user_load(array('name' => $name, 'status' => 1)); } - if (isset($account->uid)) { + if (isset($account->userid)) { form_set_value(array('#parents' => array('account')), $account, $form_state); } else { @@ -73,11 +73,11 @@ function user_pass_submit($form, &$form_ /** * Menu callback; process one time login link and redirects to the user page on success. */ -function user_pass_reset(&$form_state, $uid, $timestamp, $hashed_pass, $action = NULL) { +function user_pass_reset(&$form_state, $userid, $timestamp, $hashed_pass, $action = NULL) { global $user; // Check if the user is already logged in. The back button is often the culprit here. - if ($user->uid) { + if ($user->userid) { drupal_set_message(t('You have already used this one-time login link. It is not necessary to use this link to login anymore. You are already logged in.')); drupal_goto(); } @@ -86,13 +86,13 @@ function user_pass_reset(&$form_state, $ $timeout = 86400; $current = REQUEST_TIME; // Some redundant checks for extra security ? - if ($timestamp < $current && $account = user_load(array('uid' => $uid, 'status' => 1)) ) { + if ($timestamp < $current && $account = user_load(array('userid' => $userid, 'status' => 1)) ) { // No time out for first time login. if ($account->login && $current - $timestamp > $timeout) { drupal_set_message(t('You have tried to use a one-time login link that has expired. Please request a new one using the form below.')); drupal_goto('user/password'); } - elseif ($account->uid && $timestamp > $account->login && $timestamp < $current && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login)) { + elseif ($account->userid && $timestamp > $account->login && $timestamp < $current && $hashed_pass == user_pass_rehash($account->pass, $timestamp, $account->login)) { // First stage is a confirmation form, then login if ($action == 'login') { watchdog('user', 'User %name used one-time login link at time %timestamp.', array('%name' => $account->name, '%timestamp' => $timestamp)); @@ -102,13 +102,13 @@ function user_pass_reset(&$form_state, $ // user, which invalidates further use of the one-time login link. user_authenticate_finalize($form_state['values']); drupal_set_message(t('You have just used your one-time login link. It is no longer necessary to use this link to login. Please change your password.')); - drupal_goto('user/' . $user->uid . '/edit'); + drupal_goto('user/' . $user->userid . '/edit'); } else { $form['message'] = array('#markup' => t('This is a one-time login for %user_name and will expire on %expiration_date.
Click on this button to login to the site and change your password.
', array('%user_name' => $account->name, '%expiration_date' => format_date($timestamp + $timeout)))); $form['help'] = array('#markup' => '' . t('This login can be used only once.') . '
'); $form['submit'] = array('#type' => 'submit', '#value' => t('Log in')); - $form['#action'] = url("user/reset/$uid/$timestamp/$hashed_pass/login"); + $form['#action'] = url("user/reset/$userid/$timestamp/$hashed_pass/login"); return $form; } } @@ -257,7 +257,7 @@ function user_profile_form($form_state, function user_profile_form_validate($form, &$form_state) { user_module_invoke('validate', $form_state['values'], $form_state['values']['_account'], $form_state['values']['_category']); // Validate input to ensure that non-privileged users can't alter protected data. - if ((!user_access('administer users') && array_intersect(array_keys($form_state['values']), array('uid', 'init', 'session'))) || (!user_access('administer permissions') && isset($form_state['values']['roles']))) { + if ((!user_access('administer users') && array_intersect(array_keys($form_state['values']), array('userid', 'init', 'session'))) || (!user_access('administer permissions') && isset($form_state['values']['roles']))) { watchdog('security', 'Detected malicious attempt to alter protected user fields.', array(), WATCHDOG_WARNING); // set this to a value type field form_set_error('category', t('Detected malicious attempt to alter protected user fields.')); @@ -290,8 +290,8 @@ function user_edit_delete_submit($form, $destination = drupal_get_destination(); unset($_REQUEST['destination']); } - // Note: We redirect from user/uid/edit to user/uid/delete to make the tabs disappear. - $form_state['redirect'] = array("user/" . $form_state['values']['_account']->uid . "/delete", $destination); + // Note: We redirect from user/userid/edit to user/userid/delete to make the tabs disappear. + $form_state['redirect'] = array("user/" . $form_state['values']['_account']->userid . "/delete", $destination); } /** @@ -306,7 +306,7 @@ function user_confirm_delete(&$form_stat return confirm_form($form, t('Are you sure you want to delete the account %name?', array('%name' => $account->name)), - 'user/' . $account->uid, + 'user/' . $account->userid, t('All submissions made by this user will be attributed to the anonymous account. This action cannot be undone.'), t('Delete'), t('Cancel')); } @@ -315,7 +315,7 @@ function user_confirm_delete(&$form_stat * Submit function for the confirm form for user deletion. */ function user_confirm_delete_submit($form, &$form_state) { - user_delete($form_state['values'], $form_state['values']['_account']->uid); + user_delete($form_state['values'], $form_state['values']['_account']->userid); drupal_set_message(t('%name has been deleted.', array('%name' => $form_state['values']['_account']->name))); if (!isset($_REQUEST['destination'])) { @@ -326,7 +326,7 @@ function user_confirm_delete_submit($for function user_edit_validate($form, &$form_state) { user_module_invoke('validate', $form_state['values'], $form_state['values']['_account'], $form_state['values']['_category']); // Validate input to ensure that non-privileged users can't alter protected data. - if ((!user_access('administer users') && array_intersect(array_keys($form_state['values']), array('uid', 'init', 'session'))) || (!user_access('administer permissions') && isset($form_state['values']['roles']))) { + if ((!user_access('administer users') && array_intersect(array_keys($form_state['values']), array('userid', 'init', 'session'))) || (!user_access('administer permissions') && isset($form_state['values']['roles']))) { watchdog('security', 'Detected malicious attempt to alter protected user fields.', array(), WATCHDOG_WARNING); // set this to a value type field form_set_error('category', t('Detected malicious attempt to alter protected user fields.')); @@ -355,8 +355,8 @@ function user_edit_submit($form, &$form_ */ function user_page() { global $user; - if ($user->uid) { - menu_set_active_item('user/' . $user->uid); + if ($user->userid) { + menu_set_active_item('user/' . $user->userid); return menu_execute_active_handler(); } else { Index: modules/user/user.test =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.test,v retrieving revision 1.21 diff -u -p -r1.21 user.test --- modules/user/user.test 23 Nov 2008 15:55:43 -0000 1.21 +++ modules/user/user.test 24 Nov 2008 10:02:25 -0000 @@ -36,7 +36,7 @@ class UserRegistrationTestCase extends D // Check database for created user. $user = user_load($edit); $this->assertTrue($user, t('User found in database.')); - $this->assertTrue($user->uid > 0, t('User has valid user id.')); + $this->assertTrue($user->userid > 0, t('User has valid user id.')); // Check user fields. $this->assertEqual($user->name, $name, t('Username matches.')); @@ -77,7 +77,7 @@ class UserRegistrationTestCase extends D // Make sure password changes are present in database. require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'includes/password.inc'); - $user = user_load(array('uid' => $user->uid)); + $user = user_load(array('userid' => $user->userid)); $this->assertTrue(user_check_password($new_pass, $user), t('Correct password in database.')); // Logout of user account. @@ -190,7 +190,7 @@ class UserDeleteTestCase extends DrupalW $this->drupalLogin($admin_user); // Delete user. - $this->drupalGet('user/' . $user->uid . '/edit'); + $this->drupalGet('user/' . $user->userid . '/edit'); $this->drupalPost(NULL, NULL, t('Delete')); $this->assertRaw(t('Are you sure you want to delete the account %name?', array('%name' => $user->name)), t('[confirm deletion] Asks for confirmation.')); $this->assertText(t('All submissions made by this user will be attributed to the anonymous account. This action cannot be undone.'), t('[confirm deletion] Inform that all submissions will be attributed to anonymouse account.')); @@ -407,11 +407,11 @@ class UserPictureTestCase extends Drupal function saveUserPicture($image) { $edit = array('files[picture_upload]' => realpath($image->filename)); - $this->drupalPost('user/' . $this->user->uid.'/edit', $edit, t('Save')); + $this->drupalPost('user/' . $this->user->userid.'/edit', $edit, t('Save')); $img_info = image_get_info($image->filename); $picture_dir = variable_get('user_picture_path', 'pictures'); - $pic_path = file_directory_path() . '/' . $picture_dir . '/picture-' . $this->user->uid . '.' . $img_info['extension']; + $pic_path = file_directory_path() . '/' . $picture_dir . '/picture-' . $this->user->userid . '.' . $img_info['extension']; return $pic_path; } @@ -517,7 +517,7 @@ class UserAdminTestCase extends DrupalWe $this->assertEqual($account->status, 1, 'User B not blocked'); $edit = array(); $edit['operation'] = 'block'; - $edit['accounts['. $account->uid .']'] = TRUE; + $edit['accounts['. $account->userid .']'] = TRUE; $this->drupalPost('admin/user/user', $edit, t('Update')); $account = user_load(array('name' => $user_b->name)); $this->assertEqual($account->status, 0, 'User B blocked'); @@ -571,7 +571,7 @@ class UserTimeZoneFunctionalTest extends $edit = array(); $edit['mail'] = $web_user->mail; $edit['timezone'] = 'America/Santiago'; - $this->drupalPost("user/$web_user->uid/edit", $edit, t('Save')); + $this->drupalPost("user/$web_user->userid/edit", $edit, t('Save')); $this->assertText(t('The changes have been saved.'), t('Time zone changed to Santiago time.')); // Confirm date format and time zone.