Changeset 26626 for extensions/oAuth/include

Timestamp:

Jan 11, 2014, 3:50:26 PM (10 years ago)

Author:

mistic100

Message:

add 'allow_merge_accounts' parameter

File:

• extensions/oAuth/include/public_events.inc.php (modified) (5 diffs)

extensions/oAuth/include/public_events.inc.php

@@ -56 +56 @@
 function oauth_begin_register()
 {
-  global $conf, $template, $hybridauth_conf, $page;
+  global $conf, $template, $hybridauth_conf, $page, $user;
   
   if ($hybridauth_conf['enabled'] == 0)
@@ -110 +110 @@
       $page['infos'][] = l10n('Your registration is almost done, please complete the registration form.');
       
-      // form submited
+      // register form submited
       if (isset($_POST['submit']))
       {
@@ -141 +141 @@
         unset($_POST['submit']);
       }
+      // login form submited
+      else if (isset($_POST['login']) && $conf['oauth']['allow_merge_accounts'])
+      {
+        if ($conf['insensitive_case_logon'] == true)
+        {
+          $_POST['username'] = search_case_username($_POST['username']);
+        }
+        
+        if ( pwg_login(false, $_POST['username'], $_POST['password'], false) )
+        {
+          pwg_unset_session_var('oauth_new_user');
+          
+          // update oauth field
+          $query = '
+UPDATE ' . USER_INFOS_TABLE . '
+  SET oauth_id = "' . $oauth_id . '"
+  WHERE user_id = ' . $user['id'] . '
+;';
+          pwg_query($query);
+
+          redirect('profile.php');
+        }
+        else
+        {
+          $page['errors'][] = l10n('Invalid password!');
+        }
+      }
       else
       {
@@ -158 +185 @@
       // template
       $template->assign('OAUTH_PATH', OAUTH_PATH);
-      $template->set_prefilter('register', 'oauth_add_profile_prefilter');
-      $template->set_prefilter('register', 'oauth_remove_password_fields_prefilter');
+      if ($conf['oauth']['allow_merge_accounts'])
+      {
+        $template->assign('OAUTH_LOGIN_IN_REGISTER', true);
+        $template->set_prefilter('register', 'oauth_add_login_in_register');
+      }
+      else
+      {
+        $template->set_prefilter('register', 'oauth_add_profile_prefilter');
+        $template->set_prefilter('register', 'oauth_remove_password_fields_prefilter');
+      }
     }
     catch (Exception $e)
@@ -335 +370 @@
   return preg_replace($search, '$1 '.$add, $content);
 }
+
+function oauth_add_login_in_register($content)
+{
+  $search[0] = '<form method="post" action="{$F_ACTION}"';
+  $replace[0] = file_get_contents(OAUTH_PATH . 'template/register.tpl') . $search[0];
+  
+  $search[1] = '{\'Enter your personnal informations\'|@translate}';
+  $replace[1] = '{\'Create a new account\'|@translate}';
+  
+  return str_replace($search, $replace, $content);
+}