? files
? sites/drumm-laptop.6
? sites/drumm-laptop.6-api
? sites/drumm-laptop.6-slow
? sites/drumm-laptop.delocalized
? sites/drumm-laptop.mocks
? sites/all/modules
? sites/all/themes
? sites/default/files
? sites/default/settings.php
Index: modules/openid/openid.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/openid/openid.module,v
retrieving revision 1.19.2.2
diff -u -F^f -r1.19.2.2 openid.module
--- modules/openid/openid.module	14 Apr 2008 20:24:05 -0000	1.19.2.2
+++ modules/openid/openid.module	26 May 2008 09:14:27 -0000
@@ -28,8 +28,8 @@ function openid_menu() {
   );
   $items['user/%user/openid/delete'] = array(
     'title' => 'Delete OpenID',
-    'page callback' => 'openid_user_delete',
-    'page arguments' => array(1),
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('openid_user_delete_form', 1),
     'access callback' => 'user_edit_access',
     'access arguments' => array(1),
     'type' => MENU_CALLBACK,
Index: modules/openid/openid.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/openid/openid.pages.inc,v
retrieving revision 1.5
diff -u -F^f -r1.5 openid.pages.inc
--- modules/openid/openid.pages.inc	30 Jan 2008 22:11:22 -0000	1.5
+++ modules/openid/openid.pages.inc	26 May 2008 09:14:27 -0000
@@ -82,10 +82,15 @@ function openid_user_add_validate($form,
 /**
  * Menu callback; Delete the specified OpenID identity from the system.
  */
-function openid_user_delete($account, $aid = 0) {
-  db_query("DELETE FROM {authmap} WHERE uid=%d AND aid=%d AND module='openid'", $account->uid, $aid);
+function openid_user_delete_form($form_state, $account, $aid = 0) {
+  $authname = db_result(db_query('SELECT authname FROM {authmap} WHERE uid = %d AND aid = %d', $account->uid, $aid));
+  return confirm_form(array(), t('Are you sure you want to delete the OpenID %authname for %user?', array('%authname' => $authname, '%user' => $account->name)), 'user/'. $account->uid .'/openid');
+}
+
+function openid_user_delete_form_submit(&$form_state, $form_values) {
+  db_query("DELETE FROM {authmap} WHERE uid = %d AND aid = %d AND module = 'openid'", $form_state['#parameters'][2]->uid, $form_state['#parameters'][3]);
   if (db_affected_rows()) {
     drupal_set_message(t('OpenID deleted.'));
   }
-  drupal_goto('user/'. $account->uid .'/openid');
+  $form_state['#redirect'] = 'user/'. $form_state['#parameters'][2]->uid .'/openid';
 }