Updated Cloudy theme default avatars and minor CSS

[quix0rs-gnu-social.git] / lib / openid.php

diff --git a/lib/openid.php b/lib/openid.php
index ebc5ed168dc70235f844ba053f312336bf98a905..3af7a39cfa2a807718fafbdd864e16af90bd7cd7 100644 (file)
--- a/lib/openid.php
+++ b/lib/openid.php
@@ -31,8 +31,9 @@ require_once('Auth/OpenID/MySQLStore.php');
 define('OPENID_COOKIE_EXPIRY', round(365.25 * 24 * 60 * 60));
 define('OPENID_COOKIE_KEY', 'lastusedopenid');
 
-function oid_store() {
-    static $store = NULL;
+function oid_store()
+{
+    static $store = null;
     if (!$store) {
         # Can't be called statically
         $user = new User();
@@ -42,32 +43,40 @@ function oid_store() {
     return $store;
 }
 
-function oid_consumer() {
+function oid_consumer()
+{
     $store = oid_store();
     $consumer = new Auth_OpenID_Consumer($store);
     return $consumer;
 }
 
-function oid_clear_last() {
+function oid_clear_last()
+{
     oid_set_last('');
 }
 
-function oid_set_last($openid_url) {
+function oid_set_last($openid_url)
+{
     common_set_cookie(OPENID_COOKIE_KEY,
                      $openid_url,
                      time() + OPENID_COOKIE_EXPIRY);
 }
 
-function oid_get_last() {
+function oid_get_last()
+{
+    if (empty($_COOKIE[OPENID_COOKIE_KEY])) {
+        return null;
+    }
     $openid_url = $_COOKIE[OPENID_COOKIE_KEY];
     if ($openid_url && strlen($openid_url) > 0) {
         return $openid_url;
     } else {
-        return NULL;
+        return null;
     }
 }
 
-function oid_link_user($id, $canonical, $display) {
+function oid_link_user($id, $canonical, $display)
+{
 
     $oid = new User_openid();
     $oid->user_id = $id;
@@ -84,8 +93,9 @@ function oid_link_user($id, $canonical, $display) {
     return true;
 }
 
-function oid_get_user($openid_url) {
-    $user = NULL;
+function oid_get_user($openid_url)
+{
+    $user = null;
     $oid = User_openid::staticGet('canonical', $openid_url);
     if ($oid) {
         $user = User::staticGet('id', $oid->user_id);
@@ -93,7 +103,8 @@ function oid_get_user($openid_url) {
     return $user;
 }
 
-function oid_check_immediate($openid_url, $backto=NULL) {
+function oid_check_immediate($openid_url, $backto=null)
+{
     if (!$backto) {
         $action = $_REQUEST['action'];
         $args = common_copy_args($_GET);
@@ -113,7 +124,8 @@ function oid_check_immediate($openid_url, $backto=NULL) {
                      true);
 }
 
-function oid_authenticate($openid_url, $returnto, $immediate=false) {
+function oid_authenticate($openid_url, $returnto, $immediate=false)
+{
 
     $consumer = oid_consumer();
 
@@ -148,7 +160,7 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) {
         $auth_request->addExtension($sreg_request);
     }
 
-    $trust_root = common_local_url('public');
+    $trust_root = common_root_url(true);
     $process_url = common_local_url($returnto);
 
     if ($auth_request->shouldSendRedirect()) {
@@ -159,7 +171,7 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) {
         } else if (Auth_OpenID::isFailure($redirect_url)) {
             return sprintf(_('Could not redirect to server: %s'), $redirect_url->message);
         } else {
-            common_redirect($redirect_url);
+            common_redirect($redirect_url, 303);
         }
     } else {
         // Generate form markup and render it.
@@ -175,22 +187,21 @@ function oid_authenticate($openid_url, $returnto, $immediate=false) {
         // Display an error if the form markup couldn't be generated;
         // otherwise, render the HTML.
         if (Auth_OpenID::isFailure($form_html)) {
-            $this->show_form(sprintf(_('Could not create OpenID form: %s'), $form_html->message));
+            common_server_error(sprintf(_('Could not create OpenID form: %s'), $form_html->message));
         } else {
-            common_show_header(_('OpenID Auto-Submit'), NULL, NULL, '_oid_print_instructions');
-            common_raw($form_html);
-            common_element('script', NULL,
-                           '$(document).ready(function() { ' .
-                           '    $("#'. $form_id .'").submit(); '.
-                           '});');
-            common_show_footer();
+            $action = new AutosubmitAction(); // see below
+            $action->form_html = $form_html;
+            $action->form_id = $form_id;
+            $action->prepare(array('action' => 'autosubmit'));
+            $action->handle(array('action' => 'autosubmit'));
         }
     }
 }
 
 # Half-assed attempt at a module-private function
 
-function _oid_print_instructions() {
+function _oid_print_instructions()
+{
     common_element('div', 'instructions',
                    _('This form should automatically submit itself. '.
                       'If not, click the submit button to go to your '.
@@ -199,7 +210,8 @@ function _oid_print_instructions() {
 
 # update a user from sreg parameters
 
-function oid_update_user(&$user, &$sreg) {
+function oid_update_user(&$user, &$sreg)
+{
 
     $profile = $user->getProfile();
 
@@ -240,3 +252,29 @@ function oid_update_user(&$user, &$sreg) {
 
     return true;
 }
+
+class AutosubmitAction extends Action
+{
+    var $form_html = null;
+    var $form_id = null;
+
+    function handle($args)
+    {
+        parent::handle($args);
+        $this->showPage();
+    }
+
+    function title()
+    {
+        return _('OpenID Auto-Submit');
+    }
+
+    function showContent()
+    {
+        $this->raw($this->form_html);
+        $this->element('script', null,
+                       '$(document).ready(function() { ' .
+                       '    $(\'#'. $this->form_id .'\').submit(); '.
+                       '});');
+    }
+}