Index: cvs.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cvslog/cvs.module,v
retrieving revision 1.106.2.19.2.32
diff -u -p -r1.106.2.19.2.32 cvs.module
--- cvs.module	3 Dec 2006 01:56:05 -0000	1.106.2.19.2.32
+++ cvs.module	4 Dec 2006 00:55:56 -0000
@@ -1,6 +1,6 @@
 <?php
 // $Id: cvs.module,v 1.106.2.19.2.32 2006/12/03 01:56:05 dww Exp $
-// $Name:  $
+// $Name: DRUPAL-4-7--2 $
 
 /**
  * @file
@@ -528,6 +528,13 @@ function cvs_user_edit_form($uid) {
     '#collapsed' => FALSE,
   );
   if (user_access('administer CVS')) {
+    // Due to the workaround being used in hook_menu to allow CVS administrators
+    // access to the user's account/edit section, the page title is incorrect.
+    if ($uid != $user->uid) {
+      $account = user_load(array('uid' => $uid));
+      drupal_set_title(check_plain($account->name));
+    }
+
     $form['cvs']['cvs_name'] = array(
       '#type' => 'textfield',
       '#title' => t('CVS username'),
@@ -932,7 +939,6 @@ function cvs_alter_project_release_form(
   unset($form['file']);
 }
 
-
 /**
  * Alters the project_release node form during edits
  * @see cvs_form_alter
@@ -1205,10 +1211,9 @@ function cvs_show_messages_format($resul
   return $output;
 }
 
-
 function cvs_page() {
   _cvs_styles();
-  print theme('page', cvs_show_messages());
+  return cvs_show_messages();
 }
 
 function cvs_page_search() {
@@ -1261,7 +1266,7 @@ function cvs_page_search() {
     $output .= theme('box', t('Search results'), cvs_show_messages());
   }
   
-  print theme('page', $output);
+  return $output;
 }
 
 /**
@@ -1309,7 +1314,7 @@ function cvs_account_tracker() {
     _cvs_styles();
     $_REQUEST['uid'] = $account->uid; 
     drupal_set_title($account->name);
-    print theme('page', cvs_show_messages());
+    return cvs_show_messages();
   }
   else {
     drupal_not_found();
@@ -1330,7 +1335,7 @@ function cvs_mail_user($uid, $extra = ''
       '%manage-cvs-account-url' => url("user/$account->uid/edit/cvs", NULL, NULL, TRUE),
       '%cvs-admin-message' => $extra,
       '%cvs-admin-name' => $user->name,
-      '%motivation-message' =>  wordwrap(check_plain($account->motivation), 72)
+      '%motivation-message' => wordwrap($account->motivation, 72)
     );
     switch ($account->status) {
       case CVS_APPROVED:
@@ -1537,7 +1542,7 @@ function cvs_account_status() {
     $output .= '<ul>'. implode($warnings) .'</ul>';
   }
  
-  print theme('page', $output);
+  return $output;
 }
 
 function cvs_repository() {
@@ -1569,7 +1574,7 @@ function cvs_repository() {
 
   $output = theme('table', $header, $rows);
 
-  print theme('page', $output);
+  return $output;
 }
 
 function cvs_repository_fetch($rid) {
@@ -1636,7 +1641,7 @@ function cvs_repository_edit($rid) {
       drupal_goto('admin/cvs/repositories');
     }
     
-    print theme('page', cvs_repository_form($repo));
+    return cvs_repository_form($repo);
   }
   else {
     drupal_not_found();
@@ -1660,7 +1665,7 @@ function cvs_repository_add() {
     drupal_goto('admin/cvs/repositories');
   }
 
-  print theme('page', cvs_repository_form($repo));
+  return cvs_repository_form($repo);
 }
 
 function cvs_repository_form($repo = 0) {
@@ -1728,7 +1733,6 @@ function cvs_repository_form($repo = 0) 
   $form['submit'] = array('#type' => 'submit', '#value' => t('Save repository'));
 
   return drupal_get_form('cvs_repository_add',$form);
-  print theme('page', $output);
 }
 
 function cvs_explode($text, $delim = ':') {
@@ -1944,10 +1948,41 @@ function cvs_application_page() {
 
   $strings = _cvs_get_strings();
 
-  return $user->uid ? cvs_application_form() : variable_get('cvs_message_anon', $strings['cvs_message_anon']);
+  if ($user->uid) {
+    $result = db_query("SELECT name, 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']) {
+        case CVS_APPROVED:
+          drupal_set_message(t('You have an existing CVS account.'));
+          drupal_goto("user/$user->uid/edit/cvs");
+          break;
+        case CVS_PENDING:
+        case CVS_QUEUED:
+          drupal_set_message(t('Your CVS application has been received and is currently pending review.'));
+          if (module_exist('contact')) {
+            drupal_set_message(t('If there has been an undue delay in the processing of your application, please use the contact form to get in touch with us.'));
+            drupal_goto('contact');
+          }
+          break;
+        case CVS_DECLINED:
+        case CVS_DISABLED:
+          $return = cvs_application_form($application);
+          break;
+      }
+    }
+    else {
+      $return = cvs_application_form();
+    }
+  }
+  else {
+    $return = variable_get('cvs_message_anon', $strings['cvs_message_anon']);
+  }
+
+  return $return;
 }
 
-function cvs_application_form() {
+function cvs_application_form($application = array('name' => '', 'motivation' => '')) {
   global $user;
 
   if (!valid_email_address($user->mail)) {
@@ -1957,9 +1992,23 @@ function cvs_application_form() {
 
   $strings = _cvs_get_strings();
 
-  $cvs_name = strtr(strtolower($user->name), array(' ' => '', '@' => '', '.' => '', '-' => '', '_' => '', '.' => ''));
+  if (empty($application['name'])) {
+    $cvs_name = strtr(strtolower($user->name), array(' ' => '', '@' => '', '.' => '', '-' => '', '_' => '', '.' => ''));
+    $attributes = '';
+  }
+  else {
+    $cvs_name = $application['name'];
+    // Since disabled accounts (possibly with a commit history) are also
+    // eligible for reapplication, the username field is set to disabled.
+    $attributes = array('disabled' => 'disabled');
+    $form['cvs_reapplication'] = array('#type' => 'value', '#value' => 'reapplication');
+    $form['cvs_reapplication_message'] = array(
+      '#type' => 'item',
+      '#value' => t('<p><em>If you are interested in reapplying for a CVS account, please amend your application accordingly and resubmit.</em></p>')
+    );
+  }
 
-  $form['cvs_overview']  = array('#type' => 'fieldset', '#title' => t('Overview'));
+  $form['cvs_overview'] = array('#type' => 'fieldset', '#title' => t('Overview'));
   $form['cvs_overview']['overview'] = array(
     '#type' => 'item',
     '#value' => variable_get('cvs_message_auth', $strings['cvs_message_auth']),
@@ -1974,6 +2023,7 @@ function cvs_application_form() {
     '#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.'),
     '#required' => TRUE,
+    '#attributes' => $attributes
   );
   $form['cvs_details']['cvs_pass'] = array(
     '#type' => 'password_confirm',
@@ -1998,7 +2048,7 @@ function cvs_application_form() {
   $form['cvs_motivation']['motivation'] = array(
     '#type' => 'textarea',
     '#title' => t('Motivation'),
-    '#default_value' => $edit['motivation'],
+    '#default_value' => $application['motivation'],
     '#cols' => 60,
     '#rows' => 9,
     '#description' => variable_get('cvs_motivation_description', $strings['cvs_motivation_description']),
@@ -2013,9 +2063,6 @@ function cvs_application_form() {
 function cvs_application_page_validate($form_id, $form_values) {
   global $user;
 
-  if (db_result(db_query("SELECT name FROM {cvs_accounts} WHERE uid = %d", $user->uid))) {
-    form_set_error('', t('You already requested/have a CVS account.'), 'error');
-  }
   if ($form_values['maintain'] != 1) {
     form_set_error('maintain', t('Your application cannot be considered: CVS accounts are only granted to users wishing to maintain a module, theme or translation.'));
   }
@@ -2025,7 +2072,7 @@ function cvs_application_page_validate($
   if (ereg("[^[:alnum:]]", $form_values['user'])) { 
     form_set_error('user', t('The CVS username you have chosen is invalid.'));
   }
-  if (db_result(db_query("SELECT name FROM {cvs_accounts} WHERE name = '%s'", $form_values['user']))) {
+  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 (strlen($form_values['cvs_pass']) < CVS_MIN_PASS_LENGTH) {
@@ -2033,7 +2080,6 @@ function cvs_application_page_validate($
   }
 }
 
-
 function cvs_application_page_submit($form_id, $form_values) {
   global $user;
 
@@ -2053,20 +2099,22 @@ function cvs_application_page_submit($fo
   $message_variables = array(
     '%account-name' => $user->name,
     '%user-account-url' => url("user/$user->uid", NULL, NULL, TRUE),
-    '%motivation-message' => wordwrap(check_plain($form_values['motivation']), 72),
+    '%motivation-message' => wordwrap($form_values['motivation'], 72),
     '%client-information' => implode("\n", $client_information)
   );
 
+  $subject = isset($form_values['cvs_reapplication']) ? t('CVS account request [reapplication]') : t('CVS account request');
+
   $message = strtr(variable_get('cvs_new_application_email', $strings['cvs_new_application_email']), $message_variables);
-  user_mail(variable_get('cvs_email_address', 'cvs@example.com'), t('CVS account request'), $message, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
+  user_mail(variable_get('cvs_email_address', 'cvs@example.com'), $subject, $message, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
   
   // Send an e-mail to the applicant:
   $from = t('Drupal CVS administrator <%mail>', array('%mail' => variable_get('cvs_email_address', 'cvs@example.com')));
   $message = strtr(variable_get('cvs_received_email', $strings['cvs_received_email']), $message_variables);
-  user_mail($user->mail, t('CVS account request'), $message, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
+  user_mail($user->mail, $subject, $message, "From: $from\nReply-to: $from\nX-Mailer: Drupal\nReturn-path: $from\nErrors-to: $from");
   
-  // Add a record to the database:
-  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); 
+  // Add/update a record to the database:
+  db_query("REPLACE 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); 
 
   // Display a status message:
   drupal_set_message(t('Your CVS account request has been sent to the CVS administrators and will be processed as soon as possible.'));