Index: openid.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/openid/openid.module,v
retrieving revision 1.2.2.7
diff -r1.2.2.7 openid.module
9a10,14
>  * Define a message telling users why they are not auto-registered
>  */
> define('OPENID_BYPASS_AUTO_REG_MSG', variable_get('openid_bypass_auto_reg_message', "Your OpenID identity has been confirmed.  We would like a few more pieces of information from you."));
> 
> /**
21a27,35
>     $items[] = array(
>       'path' => 'admin/settings/openid',
>       'title' => t('OpenID'),
>       'description' => t('Administer OpenID'),
>       'callback' => 'drupal_get_form',
>       'callback arguments' => 'openid_admin_settings',
>       'access' => user_access('administer openid settings'),
>       );
>     
53a68,97
>  * hook_perm
>  */
> function openid_perm() {
>   return array('administer openid settings');
> }
> 
> function openid_admin_settings() {
>   $form['openid'] = array(
>     '#type' => 'fieldset',
>     '#title' => t('OpenId Registration Configuration'),
>     '#collapsible' => TRUE,
>   );
>   
>   $form['openid']['openid_bypass_auto_reg'] = array(
>     '#type' => 'checkbox',
>     '#title' => t('Bypass OpenId Auto Registration'),
>     '#description' => t('Enable this to bypass auto registration.  Users are brought to the user_register form with information prefilled from the OpenID response. This is useful their are additional registration fields for users to fill out.'),
>     '#default_value' => variable_get('openid_bypass_auto_reg', FALSE),
>   );
>   
>   $form['openid']['openid_bypass_auto_reg_message'] = array (
>     '#type' => 'textarea',
>     '#title' => t('Message to explain to users why they are still seeing the registration form.'),
>     '#default_value' => OPENID_BYPASS_AUTO_REG_MSG,
>   );
>   
>   return system_settings_form($form);
> }
> 
> /**
120,121c164
<     // If user_email_verification is off, hide the password field and just fill
<     // with random password to avoid confusion.
---
> 
468a512
>         
471c515
<     if (form_get_errors()) {
---
>     if (form_get_errors() || variable_get('openid_bypass_auto_reg', FALSE)) {
474,475c518,525
<       drupal_set_message(t('OpenID registration failed for the reasons listed. You may register now, or if you already have an account you can <a href="@login">log in</a> now and add your OpenID under "My Account"', array('@login' => url('user/login'))), 'error');
<        $_SESSION['openid']['values'] = $edit;
---
>       if (form_get_errors()) {
>         drupal_set_message(t('OpenID registration failed for the reasons listed. You may register now, or if you already have an account you can <a href="@login">log in</a> now and add your OpenID under "My Account"', array('@login' => url('user/login'))), 'error');
>       }
>       
>       if(variable_get('openid_bypass_auto_reg', FALSE)) {
>         drupal_set_message(OPENID_BYPASS_AUTO_REG_MSG, 'status');
>       }
>       $_SESSION['openid']['values'] = $form['#post'];  //use #post if we truely want other modules to use the saved session data