Changeset 26608 for extensions/oAuth/include

Timestamp:

Jan 11, 2014, 12:08:40 PM (11 years ago)

Author:

mistic100

Message:

finish updating guides, fix flow issues, update language file

Location:

extensions/oAuth/include

Files:

• functions.inc.php (modified) (3 diffs)
• providers_stats.inc.php (modified) (2 diffs)
• public_events.inc.php (modified) (4 diffs)

extensions/oAuth/include/functions.inc.php

@@ -45 +45 @@
       'providers' => $hybridauth_conf['providers'],
       'persona_email' => @$persona_email,
+      'key' => get_ephemeral_key(0),
       ));
     $template->assign(array(
@@ -81 +82 @@
 }
 
+function get_servername($with_port=false)
+{
+  $scheme = 'http';
+  if ( (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') || $_SERVER['SERVER_PORT'] == 443 )
+  {
+    $scheme = 'https';
+  }
+  
+  $servername = $scheme . '://' . $_SERVER['HTTP_HOST'];
+  if ($with_port)
+  {
+    $servername.= ':' . $_SERVER['SERVER_PORT'];
+  }
+    
+  return $servername;
+}
+
 // http://www.sitepoint.com/authenticate-users-with-mozilla-persona/
 function persona_verify()
@@ -93 +111 @@
     );
 
-  $scheme = 'http';
-  if ( (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') || $_SERVER['SERVER_PORT'] == 443 )
-  {
-    $scheme = 'https';
-  }
-  $audience = sprintf(
-    '%s://%s:%s',
-    $scheme,
-    $_SERVER['HTTP_HOST'],
-    $_SERVER['SERVER_PORT']
-    );
-
-  $params = 'assertion=' . urlencode($assert) . '&audience=' . urlencode($audience);
+  $params = 'assertion=' . urlencode($assert) . '&audience=' . urlencode(get_servername(true));
 
   $options = array(

extensions/oAuth/include/providers_stats.inc.php

@@ -33 +33 @@
     'label'             => 'Tumblr',
     'provider_name'     => 'Tumblr',
+    'callback'          => true,
     'new_app_link'      => 'http://www.tumblr.com/oauth/apps',
   ),
@@ -38 +39 @@
     'label'             => 'Twitter',
     'provider_name'     => 'Twitter',
+    'callback'          => true,
     'new_app_link'      => 'https://dev.twitter.com/apps',
   ),

extensions/oAuth/include/public_events.inc.php

@@ -69 +69 @@
       {
         $template->assign('OAUTH_USER', array(
-          'provider' => $provider,
+          'provider' => 'Persona',
           'username' => $user_identifier,
           'u_profile' => null,
@@ -96 +96 @@
       
         $template->assign('OAUTH_USER', array(
-          'provider' => $provider,
+          'provider' => $hybridauth_conf['providers'][$provider]['name'],
           'username' => $remote_user->displayName,
           'u_profile' => $remote_user->profileURL,
@@ -191 +191 @@
     {
       $template->assign('OAUTH_USER', array(
-        'provider' => $provider,
+        'provider' => 'Persona',
         'username' => $user_identifier,
         'u_profile' => null,
@@ -206 +206 @@
       
       $template->assign('OAUTH_USER', array(
-        'provider' => $provider,
+        'provider' => $hybridauth_conf['providers'][$provider]['name'],
         'username' => $remote_user->displayName,
         'u_profile' => $remote_user->profileURL,