Changeset 26605 for extensions/oAuth/include/public_events.inc.php

Timestamp:

Jan 11, 2014, 1:27:14 AM (10 years ago)

Author:

mistic100

Message:

add Persona authentification

File:

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

extensions/oAuth/include/public_events.inc.php

@@ -9 +9 @@
   global $template, $conf, $hybridauth_conf;
   
-  if ($hybridauth_conf['enabled'] > 0)
+  if ($hybridauth_conf['enabled'] == 0)
   {
     return;
@@ -37 +37 @@
   {
     list($oauth_id) = pwg_db_fetch_row($result);
-    list($provider) = explode('---', $oauth_id);
+    list($provider) = explode('---', $oauth_id, 2);
     $_SESSION['page_errors'][] = l10n('You registered with a %s account, please sign in with the same account.', $provider);
     
@@ -65 +65 @@
     list($provider, $user_identifier) = pwg_get_session_var('oauth_new_user');
     
-    require_once(OAUTH_PATH . 'include/hybridauth/Hybrid/Auth.php');
-    
     try {
-      $hybridauth = new Hybrid_Auth($hybridauth_conf);
-      $adapter = $hybridauth->authenticate($provider);
-      $remote_user = $adapter->getUserProfile();
-      
-      // security, check remote identifier
-      if ($remote_user->identifier != $user_identifier)
+      if ($provider == 'Persona')
       {
-        pwg_unset_session_var('oauth_new_user');
-        throw new Exception('Hacking attempt!', 403);
+        $template->assign('OAUTH_USER', array(
+          'provider' => $provider,
+          'username' => $user_identifier,
+          'u_profile' => null,
+          'avatar' => null,
+          ));
+        
+        oauth_assign_template_vars();
+        $template->append('OAUTH', array('persona_email'=>$user_identifier), true);
+      
+        $conf['oauth']['include_common_template'] = true;
       }
-    
-      $template->assign('OAUTH_USER', array(
-        'provider' => $provider,
-        'username' => $remote_user->displayName,
-        'u_profile' => $remote_user->profileURL,
-        'avatar' => $remote_user->photoURL,
-        ));
+      else
+      {
+        require_once(OAUTH_PATH . 'include/hybridauth/Hybrid/Auth.php');
         
+        $hybridauth = new Hybrid_Auth($hybridauth_conf);
+        $adapter = $hybridauth->authenticate($provider);
+        $remote_user = $adapter->getUserProfile();
+        
+        // security, check remote identifier
+        if ($remote_user->identifier != $user_identifier)
+        {
+          pwg_unset_session_var('oauth_new_user');
+          throw new Exception('Hacking attempt!', 403);
+        }
+      
+        $template->assign('OAUTH_USER', array(
+          'provider' => $provider,
+          'username' => $remote_user->displayName,
+          'u_profile' => $remote_user->profileURL,
+          'avatar' => $remote_user->photoURL,
+          ));
+      }
+      
+      $oauth_id = $provider.'---'.$user_identifier;
+      
       $page['infos'][] = l10n('Your registration is almost done, please complete the registration form.');
-      
-      $oauth_id = $provider.'---'.$remote_user->identifier;
       
       // form submited
@@ -124 +141 @@
       {
         // overwrite fields with remote datas
-        $_POST['login'] = $remote_user->displayName;
-        $_POST['mail_address'] = $remote_user->email;
+        if ($provider == 'Persona')
+        {
+          $_POST['login'] = '';
+          $_POST['mail_address'] = $user_identifier;
+        }
+        else
+        {
+          $_POST['login'] = $remote_user->displayName;
+          $_POST['mail_address'] = $remote_user->email;
+        }
       }
       
@@ -133 +158 @@
       $template->set_prefilter('register', 'oauth_remove_password_fields_prefilter');
     }
-    catch (Exception $e) {
+    catch (Exception $e)
+    {
       $page['errors'][] = l10n('An error occured, please contact the gallery owner. <i>Error code : %s</i>', $e->getCode());
     }
@@ -152 +178 @@
 function oauth_begin_profile()
 {
-  global $template, $user, $hybridauth_conf, $page;
-  
-  $oauth_id = get_oauth_id($user['id']);
-  
-  if (!isset($oauth_id))
-  {
-    return;
-  }
-  
-  list($provider) = explode('---', $oauth_id);
-  
-  require_once(OAUTH_PATH . 'include/hybridauth/Hybrid/Auth.php');
+  global $template, $user, $hybridauth_conf, $page, $user;
+  
+  if (empty($user['oauth_id']))
+  {
+    return;
+  }
+  
+  list($provider, $user_identifier) = explode('---', $user['oauth_id'], 2);
   
   try {
-    $hybridauth = new Hybrid_Auth($hybridauth_conf);
-    $adapter = $hybridauth->getAdapter($provider);
-    $remote_user = $adapter->getUserProfile();
-    
-    $template->assign('OAUTH_USER', array(
-      'provider' => $provider,
-      'username' => $remote_user->displayName,
-      'u_profile' => $remote_user->profileURL,
-      'avatar' => $remote_user->photoURL,
-      ));
+    if ($provider == 'Persona')
+    {
+      $template->assign('OAUTH_USER', array(
+        'provider' => $provider,
+        'username' => $user_identifier,
+        'u_profile' => null,
+        'avatar' => null,
+        ));
+    }
+    else
+    {
+      require_once(OAUTH_PATH . 'include/hybridauth/Hybrid/Auth.php');
+      
+      $hybridauth = new Hybrid_Auth($hybridauth_conf);
+      $adapter = $hybridauth->getAdapter($provider);
+      $remote_user = $adapter->getUserProfile();
+      
+      $template->assign('OAUTH_USER', array(
+        'provider' => $provider,
+        'username' => $remote_user->displayName,
+        'u_profile' => $remote_user->profileURL,
+        'avatar' => $remote_user->photoURL,
+        ));
+    }
     
     $template->assign('OAUTH_PATH', OAUTH_PATH);
@@ -181 +217 @@
     $template->set_prefilter('profile_content', 'oauth_remove_password_fields_prefilter');
   }
-  catch (Exception $e) {
+  catch (Exception $e)
+  {
     $page['errors'][] = l10n('An error occured, please contact the gallery owner. <i>Error code : %s</i>', $e->getCode());
   }
@@ -201 +238 @@
   }
 
-  list($provider) = explode('---', $oauth_id);
-  
-  require_once(OAUTH_PATH . 'include/hybridauth/Hybrid/Auth.php');
-  
-  try {
-    $hybridauth = new Hybrid_Auth($hybridauth_conf);
-    $adapter = $hybridauth->getAdapter($provider);
-    $adapter->logout();
-  }
-  catch (Exception $e) {
-    $_SESSION['page_errors'][] = l10n('An error occured, please contact the gallery owner. <i>Error code : %s</i>', $e->getCode());
+  list($provider, $identifier) = explode('---', $oauth_id, 2);
+  
+  
+  if ($provider != 'Persona')
+  {
+    require_once(OAUTH_PATH . 'include/hybridauth/Hybrid/Auth.php');
+    
+    try {
+      $hybridauth = new Hybrid_Auth($hybridauth_conf);
+      $adapter = $hybridauth->getAdapter($provider);
+      $adapter->logout();
+    }
+    catch (Exception $e) {
+      $_SESSION['page_errors'][] = l10n('An error occured, please contact the gallery owner. <i>Error code : %s</i>', $e->getCode());
+    }
   }
 }
@@ -233 +274 @@
   }
   
-  oauth_assign_template_vars(get_gallery_home_url());
+  $u_redirect = !empty($_GET['redirect']) ? urldecode($_GET['redirect']) : get_gallery_home_url();
+  oauth_assign_template_vars($u_redirect);
   
   $template->set_prefilter('menubar', 'oauth_add_menubar_buttons_prefilter');
 }
 
-function oauth_include_template()
+
+/**
+ * load common javascript
+ */
+function oauth_page_header()
 {
   global $conf, $template;
-  
+
   if (isset($conf['oauth']['include_common_template']))
   {