Changeset 26608 for extensions/oAuth/include/functions.inc.php

Timestamp:

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

Author:

mistic100

Message:

finish updating guides, fix flow issues, update language file

File:

• extensions/oAuth/include/functions.inc.php (modified) (3 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(