Index: cvs.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/cvslog/cvs.module,v
retrieving revision 1.133
diff -u -F^f -b -r1.133 cvs.module
--- cvs.module	25 Dec 2006 21:39:16 -0000	1.133
+++ cvs.module	28 Dec 2006 00:51:47 -0000
@@ -253,7 +253,7 @@ function cvs_menu($may_cache) {
           );
           $items[] = array(
             'path' => 'node/'. arg(1) .'/cvs-access/delete',
-            'callback' => 'cvs_project_delete_access',
+            'callback' => 'cvs_project_delete_access_page',
             'callback arguments' => array('nid' => arg(1), 'uid' => arg(4)),
             'type' => MENU_CALLBACK,
             'access' => TRUE,
@@ -2264,7 +2264,7 @@ function _cvs_import_existing_projects()
 /**
  * Provides the "CVS access" tab on project nodes
  */
-function theme_cvs_project_access($form) {
+function theme_cvs_project_access_form($form) {
   $nid = arg(1);
   $node = node_load($nid);
 
@@ -2314,7 +2314,7 @@ function cvs_project_access_form() {
   return $form;
 }
 
-function cvs_project_access_validate($form_id, $form_values, $form) {
+function cvs_project_access_form_validate($form_id, $form_values, $form) {
   if (empty($form_values['user'])) {
     form_set_error('user', t('You must specify a valid user name.'));
     return;
@@ -2338,7 +2338,7 @@ function cvs_project_access_validate($fo
   form_set_value($form['uid'], $user_result->uid);
 }
 
-function cvs_project_access_submit($form_id, $form_values) {
+function cvs_project_access_form_submit($form_id, $form_values) {
   $nid = arg(1);
   $uid = $form_values['uid'];
   db_query("INSERT INTO {cvs_project_maintainers} (nid, uid) VALUES (%d, %d)", $nid, $uid);
@@ -2351,11 +2351,17 @@ function cvs_project_access_submit($form
 /**
  * Callback for removing a uid as a cvs maintainer from a given project.
  */
+function cvs_project_delete_access_page($nid, $uid) {
+  return drupal_get_form('cvs_project_delete_access', $nid, $uid);
+}
+
+/**
+ * Confirm form for removing a uid as a cvs maintainer from a given project.
+ */
 function cvs_project_delete_access($nid, $uid) {
-  $user = db_fetch_object(db_query("SELECT name, uid FROM {users} WHERE uid = %d", $uid));
   $form['nid'] = array('#type' => 'value', '#value' => $nid);
   $form['uid'] = array('#type' => 'value', '#value' => $uid);
-  $form['user'] = array('#type' => 'value', '#value' => $user);
+  $user = user_load(array('uid' => $uid));
 
   return confirm_form('cvs_project_delete_access_confirm', $form,
             t('Are you sure you want to delete CVS access for !user?',
@@ -2373,7 +2379,7 @@ function cvs_project_delete_access($nid,
 function cvs_project_delete_access_confirm_submit($form_id, $form_values) {
   $nid = $form_values['nid'];
   $uid = $form_values['uid'];
-  $user = $form_values['user'];
+  $user = user_load(array('uid' => $uid));
   db_query("DELETE FROM {cvs_project_maintainers} WHERE nid = %d AND uid = %d", $nid, $uid);
   drupal_set_message(t('CVS access for !user has been deleted.', array('!user' => theme('username', $user))));
   drupal_goto("node/$nid/cvs-access");