367 lines
11 KiB
Plaintext
367 lines
11 KiB
Plaintext
<?php
|
|
// $Id$
|
|
|
|
/**
|
|
* Implementation of hook_schema().
|
|
*/
|
|
function user_schema() {
|
|
$schema['authmap'] = array(
|
|
'description' => 'Stores distributed authentication mapping.',
|
|
'fields' => array(
|
|
'aid' => array(
|
|
'description' => 'Primary Key: Unique authmap ID.',
|
|
'type' => 'serial',
|
|
'unsigned' => TRUE,
|
|
'not null' => TRUE,
|
|
),
|
|
'uid' => array(
|
|
'type' => 'int',
|
|
'not null' => TRUE,
|
|
'default' => 0,
|
|
'description' => "User's {users}.uid.",
|
|
),
|
|
'authname' => array(
|
|
'type' => 'varchar',
|
|
'length' => 128,
|
|
'not null' => TRUE,
|
|
'default' => '',
|
|
'description' => 'Unique authentication name.',
|
|
),
|
|
'module' => array(
|
|
'type' => 'varchar',
|
|
'length' => 128,
|
|
'not null' => TRUE,
|
|
'default' => '',
|
|
'description' => 'Module which is controlling the authentication.',
|
|
),
|
|
),
|
|
'unique keys' => array(
|
|
'authname' => array('authname'),
|
|
),
|
|
'primary key' => array('aid'),
|
|
);
|
|
|
|
$schema['role_permission'] = array(
|
|
'description' => 'Stores the permissions assigned to user roles.',
|
|
'fields' => array(
|
|
'rid' => array(
|
|
'type' => 'int',
|
|
'unsigned' => TRUE,
|
|
'not null' => TRUE,
|
|
'description' => 'Foreign Key: {role}.rid.',
|
|
),
|
|
'permission' => array(
|
|
'type' => 'varchar',
|
|
'length' => 64,
|
|
'not null' => TRUE,
|
|
'default' => '',
|
|
'description' => 'A single permission granted to the role identified by rid.',
|
|
),
|
|
),
|
|
'primary key' => array('rid', 'permission'),
|
|
'indexes' => array(
|
|
'permission' => array('permission'),
|
|
),
|
|
);
|
|
|
|
$schema['role'] = array(
|
|
'description' => 'Stores user roles.',
|
|
'fields' => array(
|
|
'rid' => array(
|
|
'type' => 'serial',
|
|
'unsigned' => TRUE,
|
|
'not null' => TRUE,
|
|
'description' => 'Primary Key: Unique role ID.',
|
|
),
|
|
'name' => array(
|
|
'type' => 'varchar',
|
|
'length' => 64,
|
|
'not null' => TRUE,
|
|
'default' => '',
|
|
'description' => 'Unique role name.',
|
|
),
|
|
),
|
|
'unique keys' => array(
|
|
'name' => array('name'),
|
|
),
|
|
'primary key' => array('rid'),
|
|
);
|
|
|
|
$schema['users'] = array(
|
|
'description' => 'Stores user data.',
|
|
'fields' => array(
|
|
'uid' => array(
|
|
'type' => 'serial',
|
|
'unsigned' => TRUE,
|
|
'not null' => TRUE,
|
|
'description' => 'Primary Key: Unique user ID.',
|
|
),
|
|
'name' => array(
|
|
'type' => 'varchar',
|
|
'length' => 60,
|
|
'not null' => TRUE,
|
|
'default' => '',
|
|
'description' => 'Unique user name.',
|
|
),
|
|
'pass' => array(
|
|
'type' => 'varchar',
|
|
'length' => 128,
|
|
'not null' => TRUE,
|
|
'default' => '',
|
|
'description' => "User's password (hashed).",
|
|
),
|
|
'mail' => array(
|
|
'type' => 'varchar',
|
|
'length' => 64,
|
|
'not null' => FALSE,
|
|
'default' => '',
|
|
'description' => "User's email address.",
|
|
),
|
|
'theme' => array(
|
|
'type' => 'varchar',
|
|
'length' => 255,
|
|
'not null' => TRUE,
|
|
'default' => '',
|
|
'description' => "User's default theme.",
|
|
),
|
|
'signature' => array(
|
|
'type' => 'varchar',
|
|
'length' => 255,
|
|
'not null' => TRUE,
|
|
'default' => '',
|
|
'description' => "User's signature.",
|
|
),
|
|
'created' => array(
|
|
'type' => 'int',
|
|
'not null' => TRUE,
|
|
'default' => 0,
|
|
'description' => 'Timestamp for when user was created.',
|
|
),
|
|
'access' => array(
|
|
'type' => 'int',
|
|
'not null' => TRUE,
|
|
'default' => 0,
|
|
'description' => 'Timestamp for previous time user accessed the site.',
|
|
),
|
|
'login' => array(
|
|
'type' => 'int',
|
|
'not null' => TRUE,
|
|
'default' => 0,
|
|
'description' => "Timestamp for user's last login.",
|
|
),
|
|
'status' => array(
|
|
'type' => 'int',
|
|
'not null' => TRUE,
|
|
'default' => 0,
|
|
'size' => 'tiny',
|
|
'description' => 'Whether the user is active(1) or blocked(0).',
|
|
),
|
|
'timezone' => array(
|
|
'type' => 'varchar',
|
|
'length' => 32,
|
|
'not null' => FALSE,
|
|
'description' => "User's time zone.",
|
|
),
|
|
'language' => array(
|
|
'type' => 'varchar',
|
|
'length' => 12,
|
|
'not null' => TRUE,
|
|
'default' => '',
|
|
'description' => "User's default language.",
|
|
),
|
|
'picture' => array(
|
|
'type' => 'varchar',
|
|
'length' => 255,
|
|
'not null' => TRUE,
|
|
'default' => '',
|
|
'description' => "Path to the user's uploaded picture.",
|
|
),
|
|
'init' => array(
|
|
'type' => 'varchar',
|
|
'length' => 64,
|
|
'not null' => FALSE,
|
|
'default' => '',
|
|
'description' => 'Email address used for initial account creation.',
|
|
),
|
|
'data' => array(
|
|
'type' => 'text',
|
|
'not null' => FALSE,
|
|
'size' => 'big',
|
|
'serialize' => TRUE,
|
|
'description' => 'A serialized array of name value pairs that are related to the user. Any form values posted during user edit are stored and are loaded into the $user object during user_load(). Use of this field is discouraged and it will likely disappear in a future version of Drupal.',
|
|
),
|
|
),
|
|
'indexes' => array(
|
|
'access' => array('access'),
|
|
'created' => array('created'),
|
|
'mail' => array('mail'),
|
|
),
|
|
'unique keys' => array(
|
|
'name' => array('name'),
|
|
),
|
|
'primary key' => array('uid'),
|
|
);
|
|
|
|
$schema['users_roles'] = array(
|
|
'description' => 'Maps users to roles.',
|
|
'fields' => array(
|
|
'uid' => array(
|
|
'type' => 'int',
|
|
'unsigned' => TRUE,
|
|
'not null' => TRUE,
|
|
'default' => 0,
|
|
'description' => 'Primary Key: {users}.uid for user.',
|
|
),
|
|
'rid' => array(
|
|
'type' => 'int',
|
|
'unsigned' => TRUE,
|
|
'not null' => TRUE,
|
|
'default' => 0,
|
|
'description' => 'Primary Key: {role}.rid for role.',
|
|
),
|
|
),
|
|
'primary key' => array('uid', 'rid'),
|
|
'indexes' => array(
|
|
'rid' => array('rid'),
|
|
),
|
|
);
|
|
|
|
return $schema;
|
|
}
|
|
|
|
/**
|
|
* @defgroup user-updates-6.x-to-7.x User updates from 6.x to 7.x
|
|
* @{
|
|
*/
|
|
|
|
/**
|
|
* Increase the length of the password field to accommodate better hashes.
|
|
*
|
|
* Also re-hashes all current passwords to improve security. This may be a
|
|
* lengthy process, and is performed batch-wise.
|
|
*/
|
|
function user_update_7000(&$sandbox) {
|
|
$ret = array('#finished' => 0);
|
|
// Lower than DRUPAL_HASH_COUNT to make the update run at a reasonable speed.
|
|
$hash_count_log2 = 11;
|
|
// Multi-part update.
|
|
if (!isset($sandbox['user_from'])) {
|
|
db_change_field($ret, 'users', 'pass', 'pass', array('type' => 'varchar', 'length' => 128, 'not null' => TRUE, 'default' => ''));
|
|
$sandbox['user_from'] = 0;
|
|
$sandbox['user_count'] = db_result(db_query("SELECT COUNT(uid) FROM {users}"));
|
|
}
|
|
else {
|
|
require_once DRUPAL_ROOT . '/' . variable_get('password_inc', 'includes/password.inc');
|
|
// Hash again all current hashed passwords.
|
|
$has_rows = FALSE;
|
|
// Update this many per page load.
|
|
$count = 1000;
|
|
$result = db_query_range("SELECT uid, pass FROM {users} WHERE uid > 0 ORDER BY uid", $sandbox['user_from'], $count);
|
|
while ($account = db_fetch_array($result)) {
|
|
$has_rows = TRUE;
|
|
$new_hash = user_hash_password($account['pass'], $hash_count_log2);
|
|
if ($new_hash) {
|
|
// Indicate an updated password.
|
|
$new_hash = 'U' . $new_hash;
|
|
db_query("UPDATE {users} SET pass = '%s' WHERE uid = %d", $new_hash, $account['uid']);
|
|
}
|
|
}
|
|
$ret['#finished'] = $sandbox['user_from']/$sandbox['user_count'];
|
|
$sandbox['user_from'] += $count;
|
|
if (!$has_rows) {
|
|
$ret['#finished'] = 1;
|
|
$ret[] = array('success' => TRUE, 'query' => "UPDATE {users} SET pass = 'U' . user_hash_password(pass) WHERE uid > 0");
|
|
}
|
|
}
|
|
return $ret;
|
|
}
|
|
|
|
/**
|
|
* Remove the 'threshold', 'mode' and 'sort' columns from the {user} table.
|
|
*
|
|
* These fields were previously used to store per-user comment settings.
|
|
*/
|
|
|
|
function user_update_7001() {
|
|
$ret = array();
|
|
db_drop_field($ret, 'users', 'threshold');
|
|
db_drop_field($ret, 'users', 'mode');
|
|
db_drop_field($ret, 'users', 'sort');
|
|
|
|
return $ret;
|
|
}
|
|
|
|
/**
|
|
* Convert user time zones from time zone offsets to time zone names.
|
|
*/
|
|
function user_update_7002(&$sandbox) {
|
|
$ret = array('#finished' => 0);
|
|
|
|
// Multi-part update.
|
|
if (!isset($sandbox['user_from'])) {
|
|
db_change_field($ret, 'users', 'timezone', 'timezone', array('type' => 'varchar', 'length' => 32, 'not null' => FALSE));
|
|
$sandbox['user_from'] = 0;
|
|
$sandbox['user_count'] = db_result(db_query("SELECT COUNT(uid) FROM {users}"));
|
|
$sandbox['user_not_migrated'] = 0;
|
|
}
|
|
else {
|
|
$timezones = system_time_zones();
|
|
// Update this many per page load.
|
|
$count = 10000;
|
|
$contributed_date_module = db_column_exists('users', 'timezone_name');
|
|
$contributed_event_module = db_column_exists('users', 'timezone_id');
|
|
|
|
$results = db_query_range("SELECT uid FROM {users} ORDER BY uid", array(), $sandbox['user_from'], $count);
|
|
foreach ($results as $account) {
|
|
$timezone = NULL;
|
|
// If the contributed Date module has created a users.timezone_name
|
|
// column, use this data to set each user's time zone.
|
|
if ($contributed_date_module) {
|
|
$date_timezone = db_query("SELECT timezone_name FROM {users} WHERE uid = :uid", array(':uid' => $account->uid))->fetchField();
|
|
if (isset($timezones[$date_timezone])) {
|
|
$timezone = $date_timezone;
|
|
}
|
|
}
|
|
// If the contributed Event module has stored user time zone information
|
|
// use that information to update the user accounts.
|
|
if (!$timezone && $contributed_event_module) {
|
|
try {
|
|
$event_timezone = db_query("SELECT t.name FROM {users} u LEFT JOIN {event_timezones} t ON u.timezone_id = t.timezone WHERE u.uid = :uid", array(':uid' => $account->uid))->fetchField();
|
|
$event_timezone = str_replace(' ', '_', $event_timezone);
|
|
if (isset($timezones[$event_timezone])) {
|
|
$timezone = $event_timezone;
|
|
}
|
|
}
|
|
catch (PDOException $e) {
|
|
// Ignore error if event_timezones table does not exist or unexpected
|
|
// schema found.
|
|
}
|
|
}
|
|
if ($timezone) {
|
|
db_query("UPDATE {users} SET timezone = :timezone WHERE uid = :uid", array(':timezone' => $timezone, ':uid' => $account->uid));
|
|
}
|
|
else {
|
|
$sandbox['user_not_migrated']++;
|
|
db_query("UPDATE {users} SET timezone = NULL WHERE uid = :uid", array(':uid' => $account->uid));
|
|
}
|
|
$sandbox['user_from']++;
|
|
}
|
|
|
|
$ret['#finished'] = $sandbox['user_from'] / $sandbox['user_count'];
|
|
if ($sandbox['user_from'] == $sandbox['user_count']) {
|
|
$ret[] = array('success' => TRUE, 'query' => "Migrate user time zones.");
|
|
if ($sandbox['user_not_migrated'] > 0) {
|
|
variable_set('empty_timezone_message', 1);
|
|
drupal_set_message('Some user time zones have been emptied and need to be set to the correct values. Use the new ' . l('time zone options', 'admin/settings/date-time') . ' to choose whether to remind users at login to set the correct time zone.', 'warning');
|
|
}
|
|
}
|
|
}
|
|
return $ret;
|
|
}
|
|
|
|
/**
|
|
* @} End of "defgroup user-updates-6.x-to-7.x"
|
|
* The next series of updates should start at 8000.
|
|
*/
|
|
|