Changeset 23815


Ignore:
Timestamp:
Jul 7, 2013, 12:14:47 AM (11 years ago)
Author:
mistic100
Message:

compatibility fix with Crypto Captcha

Location:
extensions/oAuth
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • extensions/oAuth/include/public_events.inc.php

    r23808 r23815  
    8787          register_user($_POST['login'],
    8888                        hash('sha1', $oauth_id.$conf['secret_key']),
    89                         $_POST['mail_address'],
    90                         true,
    91                         $page['errors']);
     89                        $_POST['mail_address']
     90                        );
    9291                       
    9392        if (count($page['errors']) == 0)
     
    115114        // overwrite fields with remote datas
    116115        $_POST['login'] = $remote_user->displayName;
    117         $_POST['mail_adress'] = $remote_user->email;
     116        $_POST['mail_address'] = $remote_user->email;
    118117      }
    119118     
  • extensions/oAuth/main.inc.php

    r23808 r23815  
    117117 
    118118  // in case of registration aborded
    119   if ( script_basename() != 'register' and ($data=pwg_get_session_var('oauth_new_user')) !== null )
    120   {
    121     pwg_unset_session_var('oauth_new_user');
     119  // DON'T WORK, because potentially executed by sub-scripts like Secureimage for Crypto Captcha
     120  // if ( script_basename() != 'register' and ($data=pwg_get_session_var('oauth_new_user')) !== null )
     121  // {
     122    // pwg_unset_session_var('oauth_new_user');
    122123   
    123     require_once(OAUTH_PATH . 'include/hybridauth/Hybrid/Auth.php');
     124    // require_once(OAUTH_PATH . 'include/hybridauth/Hybrid/Auth.php');
    124125   
    125     try {
    126       $hybridauth = new Hybrid_Auth($hybridauth_conf);
    127       $adapter = $hybridauth->getAdapter($data[0]);
    128       $adapter->logout();
    129     }
    130     catch (Exception $e) {
    131     }
    132   }
     126    // try {
     127      // $hybridauth = new Hybrid_Auth($hybridauth_conf);
     128      // $adapter = $hybridauth->getAdapter($data[0]);
     129      // $adapter->logout();
     130    // }
     131    // catch (Exception $e) {
     132    // }
     133  // }
    133134}
    134135
Note: See TracChangeset for help on using the changeset viewer.