Index: cvs.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cvslog/cvs.install,v
retrieving revision 1.11
diff -u -F^f -b -r1.11 cvs.install
--- cvs.install 10 Jan 2007 09:31:02 -0000 1.11
+++ cvs.install 19 Jul 2007 06:10:05 -0000
@@ -6,23 +6,21 @@
* Implementation of hook_install()
*/
function cvs_install() {
- $ret = array();
-
switch ($GLOBALS['db_type']) {
case 'mysqli':
case 'mysql':
- $ret[] = db_query("CREATE TABLE {cvs_accounts} (
+ db_query("CREATE TABLE {cvs_accounts} (
uid int(10) unsigned NOT NULL default '0',
- name varchar(64) NOT NULL default '',
+ cvs_user varchar(64) NOT NULL default '',
pass varchar(64) NOT NULL default '',
motivation text,
status int(2) NOT NULL default '0',
- PRIMARY KEY (name),
+ PRIMARY KEY (cvs_user),
KEY uid (uid))
/*!40100 DEFAULT CHARACTER SET utf8 */"
);
- $ret[] = db_query("CREATE TABLE {cvs_files} (
+ db_query("CREATE TABLE {cvs_files} (
cid int(10) unsigned NOT NULL default '0',
rid int(10) unsigned NOT NULL default '0',
uid int(10) unsigned NOT NULL default '0',
@@ -41,12 +39,12 @@ function cvs_install() {
/*!40100 DEFAULT CHARACTER SET utf8 */"
);
- $ret[] = db_query("CREATE TABLE {cvs_messages} (
+ db_query("CREATE TABLE {cvs_messages} (
cid int(10) unsigned NOT NULL default '0',
rid int(10) unsigned NOT NULL default '0',
uid int(10) unsigned NOT NULL default '0',
created int(10) unsigned NOT NULL default '0',
- user varchar(255) NOT NULL default '',
+ cvs_user varchar(255) NOT NULL default '',
message text,
PRIMARY KEY (cid),
KEY uid (uid),
@@ -55,7 +53,7 @@ function cvs_install() {
/*!40100 DEFAULT CHARACTER SET utf8 */"
);
- $ret[] = db_query("CREATE TABLE {cvs_projects} (
+ db_query("CREATE TABLE {cvs_projects} (
nid int(10) unsigned NOT NULL default '0',
rid int(10) unsigned NOT NULL default '0',
directory varchar(255) NOT NULL default '',
@@ -64,7 +62,7 @@ function cvs_install() {
/*!40100 DEFAULT CHARACTER SET utf8 */"
);
- $ret[] = db_query("CREATE TABLE {cvs_tags} (
+ db_query("CREATE TABLE {cvs_tags} (
nid int unsigned NOT NULL default '0',
tag varchar(255) NOT NULL default '',
branch tinyint unsigned NOT NULL default '0',
@@ -73,14 +71,14 @@ function cvs_install() {
/*!40100 DEFAULT CHARACTER SET utf8 */"
);
- $ret[] = db_query("CREATE TABLE {cvs_project_maintainers} (
+ db_query("CREATE TABLE {cvs_project_maintainers} (
nid int(10) unsigned NOT NULL default '0',
uid int(10) unsigned NOT NULL default '0',
PRIMARY KEY (nid, uid))
/*!40100 DEFAULT CHARACTER SET utf8 */"
);
- $ret[] = db_query("CREATE TABLE {cvs_repositories} (
+ db_query("CREATE TABLE {cvs_repositories} (
rid int(10) unsigned NOT NULL auto_increment,
name varchar(255) NOT NULL default '',
root varchar(255) NOT NULL default '',
@@ -96,11 +94,86 @@ function cvs_install() {
);
break;
case 'pgsql':
+ db_query("CREATE TABLE {cvs_accounts} (
+ uid int NOT NULL default '0',
+ cvs_user varchar(64) NOT NULL default '',
+ pass varchar(64) NOT NULL default '',
+ motivation text,
+ status int NOT NULL default '0',
+ PRIMARY KEY (cvs_user))"
+ );
+ db_query("CREATE INDEX {cvs_accounts}_uid_idx ON {cvs_accounts} (uid)");
+
+ db_query("CREATE TABLE {cvs_files} (
+ cid int NOT NULL default '0',
+ rid int NOT NULL default '0',
+ uid int NOT NULL default '0',
+ nid int NOT NULL default '0',
+ file varchar(255) NOT NULL default '',
+ branch varchar(255) NOT NULL default '',
+ revision varchar(255) NOT NULL default '',
+ lines_added int NOT NULL default '0',
+ lines_removed int NOT NULL default '0')"
+ );
+ db_query("CREATE INDEX {cvs_files}_cid_idx ON {cvs_files} (cid)");
+ db_query("CREATE INDEX {cvs_files}_nid_idx ON {cvs_files} (nid)");
+ db_query("CREATE INDEX {cvs_files}_rid_idx ON {cvs_files} (rid)");
+ db_query("CREATE INDEX {cvs_files}_uid_idx ON {cvs_files} (uid)");
+ db_query("CREATE INDEX {cvs_files}_file_idx ON {cvs_files} (file)");
+ db_query("CREATE INDEX {cvs_files}_branch_idx ON {cvs_files} (branch)");
+
+ db_query("CREATE TABLE {cvs_messages} (
+ cid int NOT NULL default '0',
+ rid int NOT NULL default '0',
+ uid int NOT NULL default '0',
+ created int NOT NULL default '0',
+ cvs_user varchar(255) NOT NULL default '',
+ message text,
+ PRIMARY KEY (cid))"
+ );
+ db_query("CREATE INDEX {cvs_messages}_uid_idx ON {cvs_messages} (uid)");
+ db_query("CREATE INDEX {cvs_messages}_created_idx ON {cvs_messages} (created)");
+ db_query("CREATE INDEX {cvs_messages}_rid_idx ON {cvs_messages} (rid)");
+
+ db_query("CREATE TABLE {cvs_projects} (
+ nid int NOT NULL default '0',
+ rid int NOT NULL default '0',
+ directory varchar(255) NOT NULL default '',
+ PRIMARY KEY (nid))"
+ );
+ db_query("CREATE INDEX {cvs_projects}_directory_idx ON {cvs_projects} (directory)");
+
+ db_query("CREATE TABLE {cvs_tags} (
+ nid int NOT NULL default '0',
+ tag varchar(255) NOT NULL default '',
+ branch smallint NOT NULL default '0',
+ PRIMARY KEY (nid, tag))"
+ );
+ db_query("CREATE INDEX {cvs_tags}_tag_idx ON {cvs_tags} (tag)");
+
+ db_query("CREATE TABLE {cvs_project_maintainers} (
+ nid int NOT NULL default '0',
+ uid int NOT NULL default '0',
+ PRIMARY KEY (nid, uid))"
+ );
+
+ db_query("CREATE TABLE {cvs_repositories} (
+ rid serial,
+ name varchar(255) NOT NULL default '',
+ root varchar(255) NOT NULL default '',
+ modules varchar(255) NOT NULL default '',
+ diffurl varchar(255) NOT NULL default '',
+ newurl varchar(255) NOT NULL default '',
+ trackerurl varchar(255) NOT NULL default '',
+ method smallint NOT NULL default '0',
+ updated int NOT NULL default '0',
+ PRIMARY KEY (rid),
+ UNIQUE (name))"
+ );
break;
}
- $ret[] = db_query("UPDATE {system} SET weight = 3 WHERE name = 'cvs'");
- return $ret;
+ db_query("UPDATE {system} SET weight = 3 WHERE name = 'cvs'");
}
function cvs_update_1() {
@@ -178,3 +251,62 @@ function cvs_update_6() {
variable_del('cvs_allow_repo_selection');
return $ret;
}
+
+function cvs_update_7() {
+ $ret = array();
+ switch ($GLOBALS['db_type']) {
+ case 'mysql':
+ case 'mysqli':
+ $ret[] = update_sql("ALTER TABLE {cvs_accounts} CHANGE name cvs_user varchar(64) NOT NULL default ''");
+ $ret[] = update_sql("ALTER TABLE {cvs_messages} CHANGE user cvs_user varchar(255) NOT NULL default ''");
+ break;
+ }
+ return $ret;
+}
+
+function cvs_uninstall() {
+
+ // Drop tables.
+ $tables = array(
+ 'cvs_accounts',
+ 'cvs_files',
+ 'cvs_messages',
+ 'cvs_projects',
+ 'cvs_tags',
+ 'cvs_project_maintainers',
+ 'cvs_repositories',
+ );
+ foreach ($tables as $table) {
+ if (db_table_exists($table)) {
+ db_query("DROP TABLE {%s}", $table);
+ }
+ }
+
+ // Remove variables.
+ db_query("DELETE FROM {variable} WHERE name LIKE 'cvs_directory_tid_%'");
+ $variables = array(
+ 'cvs_email_address',
+ 'cvs_use_file',
+ 'cvs_default_repo',
+ 'cvs_restrict_project_creation',
+ 'cvs_directory_validate_by_type',
+ 'cvs_validate_by_short_name',
+ 'cvs_directory_validate_dir_root_by_case',
+ 'cvs_list_per_page',
+ 'cvs_message_anon',
+ 'cvs_message_auth',
+ 'cvs_motivation_description',
+ 'cvs_received_email',
+ 'cvs_new_application_email',
+ 'cvs_approved_email',
+ 'cvs_pending_email',
+ 'cvs_declined_email',
+ 'cvs_disabled_email',
+ 'cvs_message_new_release_branch',
+ 'cvs_message_new_release_tag',
+ 'cvs_pager',
+ );
+ foreach ($variables as $variable) {
+ variable_del($variable);
+ }
+}
Index: cvs.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cvslog/cvs.module,v
retrieving revision 1.155
diff -u -F^f -b -r1.155 cvs.module
--- cvs.module 13 Jul 2007 06:39:23 -0000 1.155
+++ cvs.module 19 Jul 2007 06:10:06 -0000
@@ -561,8 +561,8 @@ function cvs_form_alter($form_id, &$form
function cvs_user_edit_form($uid) {
global $user;
- $result = db_fetch_object(db_query("SELECT name, motivation, status FROM {cvs_accounts} WHERE uid = %d", $uid));
- $cvs_name = $result->name;
+ $result = db_fetch_object(db_query("SELECT cvs_user, motivation, status FROM {cvs_accounts} WHERE uid = %d", $uid));
+ $cvs_user = $result->cvs_user;
$cvs_status = $result->status;
$cvs_motivation = $result->motivation;
@@ -578,10 +578,10 @@ function cvs_user_edit_form($uid) {
$account = user_load(array('uid' => $uid));
drupal_set_title(check_plain($account->name));
- $form['cvs']['cvs_name'] = array(
+ $form['cvs']['cvs_user'] = array(
'#type' => 'textfield',
'#title' => t('CVS username'),
- '#default_value' => $cvs_name,
+ '#default_value' => $cvs_user,
'#size' => 30,
'#maxlength' => 64,
'#description' => t('The CVS username associated with this account. This field is used to link CVS messages to user accounts.'),
@@ -616,12 +616,12 @@ function cvs_user_edit_form($uid) {
'#description' => t('The message you want to send to the user. This can be the reason for declining the application or an additional message after approval (used in e-mail).'),
);
}
- elseif (strlen($cvs_name) && $uid == $user->uid) {
+ elseif (strlen($cvs_user) && $uid == $user->uid) {
if($cvs_status) {
- $form['cvs']['cvs_name'] = array(
+ $form['cvs']['cvs_user'] = array(
'#type' => 'item',
'#title' => t('CVS username'),
- '#value' => $cvs_name,
+ '#value' => $cvs_user,
'#description' => t('Your CVS username. This field can only be edited by administrators and is used to link your CVS messages to your user account.'),
);
$form['cvs']['cvs_pass'] = array(
@@ -631,19 +631,19 @@ function cvs_user_edit_form($uid) {
);
}
else {
- $form['cvs']['cvs_name'] = array(
+ $form['cvs']['cvs_user'] = array(
'#type' => 'item',
'#title' => t('CVS username'),
- '#value' => $cvs_name,
+ '#value' => $cvs_user,
'#description' => t('Your CVS username associated with this account. Your CVS application has not been approved yet, it has been declined, or your account got blocked.'),
);
}
}
else {
- $form['cvs']['cvs_name'] = array(
+ $form['cvs']['cvs_user'] = array(
'#type' => 'item',
'#title' => t('CVS username'),
- '#value' => $cvs_name,
+ '#value' => $cvs_user,
'#description' => t('The CVS username associated with this account.'),
);
}
@@ -657,11 +657,11 @@ function cvs_user_edit_form($uid) {
* Validate CVS user edit form submission.
*/
function cvs_user_edit_form_validate($form_id, $form_values) {
- if (isset($form_values['cvs_name'])) {
+ if (isset($form_values['cvs_user'])) {
// Check for duplicates:
- $id = db_result(db_query("SELECT uid FROM {cvs_accounts} WHERE name = '%s' AND uid != %d", $form_values['cvs_name'], $form_values['cvs_uid']));
+ $id = db_result(db_query("SELECT uid FROM {cvs_accounts} WHERE cvs_user = '%s' AND uid != %d", $form_values['cvs_user'], $form_values['cvs_uid']));
if ($id != 0) {
- form_set_error('cvs_name', t('The specified CVS username is already in use by user #!id.', array('!id' => $id)));
+ form_set_error('cvs_user', t('The specified CVS username is already in use by user #!id.', array('!id' => $id)));
}
}
if (!empty($form_values['cvs_pass']) && strlen($form_values['cvs_pass']) < CVS_MIN_PASS_LENGTH) {
@@ -675,8 +675,8 @@ function cvs_user_edit_form_validate($fo
function cvs_user_edit_form_submit($form_id, $form_values) {
global $user;
- $result = db_fetch_object(db_query("SELECT name, status FROM {cvs_accounts} WHERE uid = %d", $form_values['cvs_uid']));
- $cvs_name = $result->name;
+ $result = db_fetch_object(db_query("SELECT cvs_user, status FROM {cvs_accounts} WHERE uid = %d", $form_values['cvs_uid']));
+ $cvs_user = $result->cvs_user;
$cvs_status = $result->status;
if (user_access('administer CVS') && isset($form_values['cvs_status'])) {
@@ -687,19 +687,19 @@ function cvs_user_edit_form_submit($form
$form_values['cvs_status'] = CVS_PENDING;
}
if (isset($form_values['cvs_pass']) && strlen($form_values['cvs_pass'])) {
- db_query("UPDATE {cvs_accounts} SET name = '%s', status = %d, pass = '%s' WHERE uid = %d", $form_values['cvs_name'], $form_values['cvs_status'], crypt($form_values['cvs_pass']), $form_values['cvs_uid']);
+ db_query("UPDATE {cvs_accounts} SET cvs_user = '%s', status = %d, pass = '%s' WHERE uid = %d", $form_values['cvs_user'], $form_values['cvs_status'], crypt($form_values['cvs_pass']), $form_values['cvs_uid']);
}
else {
- db_query("UPDATE {cvs_accounts} SET name = '%s', status = %d WHERE uid = %d", $form_values['cvs_name'], $form_values['cvs_status'], $form_values['cvs_uid']);
+ db_query("UPDATE {cvs_accounts} SET cvs_user = '%s', status = %d WHERE uid = %d", $form_values['cvs_user'], $form_values['cvs_status'], $form_values['cvs_uid']);
}
- db_query("UPDATE {cvs_messages} SET user = '%s' WHERE uid = %d", $form_values['cvs_name'], $form_values['cvs_uid']);
+ db_query("UPDATE {cvs_messages} SET cvs_user = '%s' WHERE uid = %d", $form_values['cvs_user'], $form_values['cvs_uid']);
if ($form_values['send_mail']) {
cvs_mail_user($form_values['cvs_uid'], $form_values['message']);
}
- drupal_set_message(t('The CVS account %account has been updated successfully.', array('%account' => $form_values['cvs_name'])));
+ drupal_set_message(t('The CVS account %account has been updated successfully.', array('%account' => $form_values['cvs_user'])));
return 'admin/project/cvs-accounts';
}
- elseif (strlen($cvs_name) && $form_values['cvs_uid'] == $user->uid && isset($form_values['cvs_pass']) && strlen($form_values['cvs_pass'])) {
+ elseif (strlen($cvs_user) && $form_values['cvs_uid'] == $user->uid && isset($form_values['cvs_pass']) && strlen($form_values['cvs_pass'])) {
if($cvs_status) {
db_query("UPDATE {cvs_accounts} SET pass = '%s' WHERE uid = %d", crypt($form_values['cvs_pass']), $form_values['cvs_uid']);
drupal_set_message(t('Your CVS password has been updated successfully.'));
@@ -1214,7 +1214,7 @@ function cvs_show_messages() {
$attributes['commit'] = $_REQUEST['commit'];
}
if ($_REQUEST['user']) {
- $where[] = "m.user = '". db_escape_string($_REQUEST['user']) ."' OR u.name = '". db_escape_string($_REQUEST['user']) ."'";
+ $where[] = "m.cvs_user = '". db_escape_string($_REQUEST['user']) ."' OR u.name = '". db_escape_string($_REQUEST['user']) ."'";
$attributes['user'] = $_REQUEST['user'];
}
if (is_numeric($_REQUEST['uid'])) {
@@ -1499,17 +1499,17 @@ function cvs_account() {
$where = $_SESSION['cvs_list_view_filter'] != -1 ? 'WHERE a.status = %d ' : ' ';
if (isset($_SESSION['cvs_list_view_filter'])) {
- $sql = 'SELECT DISTINCT(a.name) AS cvs_name, MIN(c.created) AS first_commit, MAX(c.created) AS last_commit, COUNT(c.cid) AS commits, a.status AS status, a.uid, u.name FROM {cvs_accounts} a LEFT JOIN {cvs_messages} c ON a.uid = c.uid INNER JOIN {users} u ON u.uid = a.uid '. $where .'GROUP BY cvs_name '. tablesort_sql($header);
+ $sql = 'SELECT DISTINCT(a.cvs_user), MIN(c.created) AS first_commit, MAX(c.created) AS last_commit, COUNT(c.cid) AS commits, a.status AS status, a.uid, u.name FROM {cvs_accounts} a LEFT JOIN {cvs_messages} c ON a.uid = c.uid INNER JOIN {users} u ON u.uid = a.uid '. $where .'GROUP BY a.cvs_user '. tablesort_sql($header);
$result = pager_query($sql, variable_get('cvs_list_per_page', 20), 0, 'SELECT COUNT(*) FROM {cvs_accounts} a '. $where, $_SESSION['cvs_list_view_filter']);
}
else {
- $sql = 'SELECT DISTINCT(a.name) AS cvs_name, MIN(c.created) AS first_commit, MAX(c.created) AS last_commit, COUNT(c.cid) AS commits, a.status AS status, a.uid, u.name FROM {cvs_accounts} a LEFT JOIN {cvs_messages} c ON a.uid = c.uid INNER JOIN {users} u ON u.uid = a.uid GROUP BY cvs_name '. tablesort_sql($header);
+ $sql = 'SELECT DISTINCT(a.cvs_user), MIN(c.created) AS first_commit, MAX(c.created) AS last_commit, COUNT(c.cid) AS commits, a.status AS status, a.uid, u.name FROM {cvs_accounts} a LEFT JOIN {cvs_messages} c ON a.uid = c.uid INNER JOIN {users} u ON u.uid = a.uid GROUP BY a.cvs_user '. tablesort_sql($header);
$result = pager_query($sql, variable_get('cvs_list_per_page', 20), 0, 'SELECT COUNT(*) FROM {cvs_accounts} a');
}
while ($user = db_fetch_object($result)) {
$rows[] = array(
- $user->uid ? theme('username', $user) : $user->cvs_name,
+ $user->uid ? theme('username', $user) : $user->cvs_user,
$user->commits,
$user->commits ? t('!time ago', array('!time' => format_interval(time() - $user->first_commit, 1))) : t('n/a'),
$user->commits ? t('!time ago', array('!time' => format_interval(time() - $user->last_commit, 1))) : t('n/a'),
@@ -1577,13 +1577,13 @@ function cvs_account_import_submit($form
foreach ($lines as $line) {
list($name, $pass, $user) = explode(':', $line);
if ($name && $pass && $user) {
- if (db_result(db_query("SELECT name FROM {cvs_accounts} WHERE name = '%s'", $name))) {
- db_query("UPDATE {cvs_accounts} SET pass = '%s', status = %d WHERE name = '%s'", $pass, CVS_APPROVED, $name);
+ if (db_result(db_query("SELECT cvs_user FROM {cvs_accounts} WHERE cvs_user = '%s'", $name))) {
+ db_query("UPDATE {cvs_accounts} SET pass = '%s', status = %d WHERE cvs_user = '%s'", $pass, CVS_APPROVED, $name);
$names[] = t('updated !name', array('!name' => $name));
}
else {
$uid = db_result(db_query("SELECT uid FROM {users} WHERE name = '%s'", $name));
- db_query("INSERT INTO {cvs_accounts} (uid, name, pass, status) VALUES (%d, '%s', '%s', %d)", $uid, $name, $pass, CVS_APPROVED);
+ db_query("INSERT INTO {cvs_accounts} (uid, cvs_user, pass, status) VALUES (%d, '%s', '%s', %d)", $uid, $name, $pass, CVS_APPROVED);
$names[] = t('added !name', array('!name' => $name));
}
}
@@ -1600,7 +1600,7 @@ function cvs_account_import_submit($form
}
function cvs_account_export() {
- $result = db_query("SELECT * FROM {cvs_accounts} WHERE pass != '' AND status = %d ORDER BY name", CVS_APPROVED);
+ $result = db_query("SELECT * FROM {cvs_accounts} WHERE pass != '' AND status = %d ORDER BY cvs_user", CVS_APPROVED);
while ($account = db_fetch_object($result)) {
if ($account->uid) {
$output .= '# '. url("user/$account->uid", NULL, NULL, TRUE) ."\n";
@@ -2005,7 +2005,7 @@ function cvs_process_log(&$logs, $path,
// Only store any of this stuff if we're not in $only_tags mode
if (!$only_tags) {
- $uid = db_result(db_query("SELECT uid FROM {cvs_accounts} WHERE name = '%s'", $entry->user));
+ $uid = db_result(db_query("SELECT uid FROM {cvs_accounts} WHERE cvs_user = '%s'", $entry->user));
$result = db_query("SELECT cid FROM {cvs_messages} WHERE created - %d < 60 AND message = '%s'", $entry->date, $entry->comment);
if (db_num_rows($result) > 0) {
@@ -2013,7 +2013,7 @@ function cvs_process_log(&$logs, $path,
}
else {
$entry->cid = db_next_id('{cvs_messages}_cid');
- db_query("INSERT INTO {cvs_messages} (cid, rid, uid, created, user, message) VALUES (%d, %d, %d, %d, '%s', '%s')", $entry->cid, $repo->rid, $uid, $entry->date, $entry->user, $entry->comment);
+ db_query("INSERT INTO {cvs_messages} (cid, rid, uid, created, cvs_user, message) VALUES (%d, %d, %d, %d, '%s', '%s')", $entry->cid, $repo->rid, $uid, $entry->date, $entry->user, $entry->comment);
}
$result = db_query("SELECT cid FROM {cvs_files} WHERE cid = %d AND file = '%s' AND revision = '%s'", $entry->cid, $log->file, $entry->revision);
@@ -2079,7 +2079,7 @@ function cvs_application_page() {
$strings = _cvs_get_strings();
if ($user->uid) {
- $result = db_query("SELECT name, motivation, status FROM {cvs_accounts} WHERE uid = %d", $user->uid);
+ $result = db_query("SELECT cvs_user, motivation, status FROM {cvs_accounts} WHERE uid = %d", $user->uid);
if ($application = db_fetch_array($result)) {
// Check if the user already has an account or is reapplying.
switch ($application['status']) {
@@ -2112,7 +2112,7 @@ function cvs_application_page() {
return $output;
}
-function cvs_application_form($application = array('name' => '', 'motivation' => '')) {
+function cvs_application_form($application = array('cvs_user' => '', 'motivation' => '')) {
global $user;
if (!valid_email_address($user->mail)) {
@@ -2122,12 +2122,12 @@ function cvs_application_form($applicati
$strings = _cvs_get_strings();
- if (empty($application['name'])) {
- $cvs_name = strtr(strtolower($user->name), array(' ' => '', '@' => '', '.' => '', '-' => '', '_' => '', '.' => ''));
+ if (empty($application['cvs_user'])) {
+ $cvs_user = strtr(strtolower($user->name), array(' ' => '', '@' => '', '.' => '', '-' => '', '_' => '', '.' => ''));
$attributes = '';
}
else {
- $cvs_name = $application['name'];
+ $cvs_user = $application['cvs_user'];
// Since disabled accounts (possibly with a commit history) are also
// eligible for reapplication, the username field is set to disabled.
$attributes = array('disabled' => 'disabled');
@@ -2145,10 +2145,10 @@ function cvs_application_form($applicati
);
$form['cvs_details'] = array('#type' => 'fieldset', '#title' => t('Account details'));
- $form['cvs_details']['user'] = array(
+ $form['cvs_details']['cvs_user'] = array(
'#type' => 'textfield',
'#title' => t('CVS username'),
- '#default_value' => $cvs_name,
+ '#default_value' => $cvs_user,
'#size' => 30,
'#maxlength' => 50,
'#description' => t('Choose a username to access the CVS repository with. CVS usernames should be lowercase. Spaces or other special characters are not allowed.'),
@@ -2199,11 +2199,11 @@ function cvs_application_form_validate($
if ($form_values['license'] != 1) {
form_set_error('license', t('Your application cannot be considered: all contributions in the CVS repository must be licensed under the terms of the GPL.'));
}
- if (ereg("[^[:alnum:]]", $form_values['user'])) {
- form_set_error('user', t('The CVS username you have chosen is invalid.'));
+ if (ereg("[^[:alnum:]]", $form_values['cvs_user'])) {
+ form_set_error('cvs_user', t('The CVS username you have chosen is invalid.'));
}
- if (db_result(db_query("SELECT name FROM {cvs_accounts} WHERE name = '%s' AND uid != %d", $form_values['user'], $user->uid))) {
- form_set_error('user', t('The CVS username you have chosen is already in use.'));
+ if (db_result(db_query("SELECT cvs_user FROM {cvs_accounts} WHERE cvs_user = '%s' AND uid != %d", $form_values['cvs_user'], $user->uid))) {
+ form_set_error('cvs_user', t('The CVS username you have chosen is already in use.'));
}
if (strlen($form_values['cvs_pass']) < CVS_MIN_PASS_LENGTH) {
form_set_error('cvs_pass', t('The CVS password you have chosen is too short (it must be at least !min characters long).', array('!min' => CVS_MIN_PASS_LENGTH)));
@@ -2239,7 +2239,7 @@ function cvs_application_form_submit($fo
$subject = t('CVS account request [reapplication]');
}
else {
- db_query("INSERT INTO {cvs_accounts} (uid, name, pass, motivation, status) VALUES (%d, '%s', '%s', '%s', %d)", $user->uid, $form_values['user'], $form_values['cvs_pass'], $form_values['motivation'], CVS_QUEUED);
+ db_query("INSERT INTO {cvs_accounts} (uid, cvs_user, pass, motivation, status) VALUES (%d, '%s', '%s', '%s', %d)", $user->uid, $form_values['cvs_user'], $form_values['cvs_pass'], $form_values['motivation'], CVS_QUEUED);
$subject = t('CVS account request');
}
@@ -2264,10 +2264,10 @@ function _cvs_import_existing_accounts()
print "updating {cvs_messages}-table ...
";
db_query('DELETE FROM {cvs_accounts}');
- $result = db_query('SELECT DISTINCT(c.user) AS name, u.uid FROM {cvs_messages} c INNER JOIN {users} u ON c.user = u.name GROUP BY c.name ORDER BY c.created ASC');
+ $result = db_query('SELECT DISTINCT(c.cvs_user), u.uid FROM {cvs_messages} c INNER JOIN {users} u ON c.cvs_user = u.name GROUP BY c.cvs_user ORDER BY c.created ASC');
while ($user = db_fetch_object($result)) {
- db_query("INSERT INTO {cvs_accounts} (uid, name) VALUES (%d, '%s')", $user->uid, $user->name);
- db_query("UPDATE {cvs_messages} SET uid = %d WHERE user = '%s'", $user->uid, $user->name);
+ db_query("INSERT INTO {cvs_accounts} (uid, cvs_user) VALUES (%d, '%s')", $user->uid, $user->cvs_user);
+ db_query("UPDATE {cvs_messages} SET uid = %d WHERE cvs_user = '%s'", $user->uid, $user->cvs_user);
}
print "updating {cvs_files}-table ...
";
@@ -2286,7 +2286,7 @@ function _cvs_update_authors() {
db_query("UPDATE {cvs_messages} SET uid = 0");
$result = db_query('SELECT * FROM {cvs_accounts}');
while ($user = db_fetch_object($result)) {
- db_query("UPDATE {cvs_messages} SET uid = %d WHERE user = '%s'", $user->uid, $user->name);
+ db_query("UPDATE {cvs_messages} SET uid = %d WHERE cvs_user = '%s'", $user->uid, $user->cvs_user);
}
print "updating {cvs_files}-table ...
";
Index: xcvs/xcvs-db.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cvslog/xcvs/xcvs-db.php,v
retrieving revision 1.6
diff -u -F^f -b -r1.6 xcvs-db.php
--- xcvs/xcvs-db.php 13 Jul 2007 06:24:51 -0000 1.6
+++ xcvs/xcvs-db.php 19 Jul 2007 06:10:06 -0000
@@ -35,7 +35,7 @@ function xcvs_db_connect($xcvs) {
*/
function xcvs_db_get_drupal_uid($user) {
// See if there's an approved CVS account that matches this CVS username.
- $result = mysql_query("SELECT uid FROM cvs_accounts WHERE name = '". mysql_real_escape_string($user) ."' AND status = 1");
+ $result = mysql_query("SELECT uid FROM cvs_accounts WHERE cvs_user = '". mysql_real_escape_string($user) ."' AND status = 1");
if ($result && mysql_num_rows($result) > 0) {
$uid = mysql_result($result, 0);
}
Index: xcvs/xcvs-loginfo.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cvslog/xcvs/xcvs-loginfo.php,v
retrieving revision 1.9
diff -u -F^f -b -r1.9 xcvs-loginfo.php
--- xcvs/xcvs-loginfo.php 15 Mar 2007 00:47:08 -0000 1.9
+++ xcvs/xcvs-loginfo.php 19 Jul 2007 06:10:06 -0000
@@ -208,9 +208,9 @@ function xcvs_init($argc, $argv) {
$cid = xcvs_next_id('cvs_messages_cid');
- $uid = mysql_result(mysql_query("SELECT uid FROM cvs_accounts WHERE name = '". mysql_escape_string($user) ."'"), 0);
+ $uid = mysql_result(mysql_query("SELECT uid FROM cvs_accounts WHERE cvs_user = '". mysql_escape_string($user) ."'"), 0);
- mysql_query("INSERT INTO cvs_messages (cid, rid, uid, created, user, message) VALUES ($cid, $xcvs[cvs_repo_id], $uid, ". time() .", '$user', '". mysql_escape_string($message) ."')");
+ mysql_query("INSERT INTO cvs_messages (cid, rid, uid, created, cvs_user, message) VALUES ($cid, $xcvs[cvs_repo_id], $uid, ". time() .", '$user', '". mysql_escape_string($message) ."')");
foreach ($cvslog_files as $cvslog_file) {
$project = mysql_query("SELECT nid FROM cvs_projects WHERE rid = ". $xcvs[cvs_repo_id] ." AND '". mysql_escape_string($cvslog_file->file) ."' LIKE CONCAT(directory, '%')");