Merge branch 'master' of /var/www/mublog

Conflicts:

	actions/api.php
	actions/deletenotice.php
	actions/recoverpassword.php
	actions/remotesubscribe.php
	actions/tag.php
	actions/tagrss.php
	actions/twitapiaccount.php
	actions/twitapiusers.php
	classes/Notice.php
	classes/User.php
	lib/common.php
	lib/language.php
	lib/subs.php
	lib/twitterapi.php
	lib/util.php
	scripts/inbox_users.php
	scripts/update_translations.php

Merged development trunk into laconica head. woohoo!

1 files changed, 81 insertions, 62 deletions

diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index 1b289dbea..ec5361c8b 100644
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -21,72 +21,91 @@ if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/openid.php');
 
-class OpenidloginAction extends Action {
+class OpenidloginAction extends Action
+{
+    function handle($args)
+    {
+        parent::handle($args);
+        if (common_logged_in()) {
+            $this->clientError(_('Already logged in.'));
+        } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+            $openid_url = $this->trimmed('openid_url');
 
-	function handle($args) {
-		parent::handle($args);
-		if (common_logged_in()) {
-			common_user_error(_('Already logged in.'));
-		} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-			$openid_url = $this->trimmed('openid_url');
+            # CSRF protection
+            $token = $this->trimmed('token');
+            if (!$token || $token != common_session_token()) {
+                $this->showForm(_('There was a problem with your session token. Try again, please.'), $openid_url);
+                return;
+            }
 
-			# CSRF protection
-			$token = $this->trimmed('token');
-			if (!$token || $token != common_session_token()) {
-				$this->show_form(_('There was a problem with your session token. Try again, please.'), $openid_url);
-				return;
-			}
+            $rememberme = $this->boolean('rememberme');
 
-			$rememberme = $this->boolean('rememberme');
-			
-			common_ensure_session();
-			
-			$_SESSION['openid_rememberme'] = $rememberme;
-			
-			$result = oid_authenticate($openid_url,
-									   'finishopenidlogin');
-			
-			if (is_string($result)) { # error message
-				unset($_SESSION['openid_rememberme']);
-				$this->show_form($result, $openid_url);
-			}
-		} else {
-			$openid_url = oid_get_last();
-			$this->show_form(NULL, $openid_url);
-		}
-	}
+            common_ensure_session();
 
-	function get_instructions() {
-		return _('Login with an [OpenID](%%doc.openid%%) account.');
-	}
+            $_SESSION['openid_rememberme'] = $rememberme;
 
-	function show_top($error=NULL) {
-		if ($error) {
-			common_element('div', array('class' => 'error'), $error);
-		} else {
-			$instr = $this->get_instructions();
-			$output = common_markup_to_html($instr);
-			common_element_start('div', 'instructions');
-			common_raw($output);
-			common_element_end('div');
-		}
-	}
+            $result = oid_authenticate($openid_url,
+                                       'finishopenidlogin');
 
-	function show_form($error=NULL, $openid_url) {
-		common_show_header(_('OpenID Login'), NULL, $error, array($this, 'show_top'));
-		$formaction = common_local_url('openidlogin');
-		common_element_start('form', array('method' => 'post',
-										   'id' => 'openidlogin',
-										   'action' => $formaction));
-		common_hidden('token', common_session_token());
-		common_input('openid_url', _('OpenID URL'),
-					 $openid_url,
-					 _('Your OpenID URL'));
-		common_checkbox('rememberme', _('Remember me'), false,
-		                _('Automatically login in the future; ' .
-		                   'not for shared computers!'));
-		common_submit('submit', _('Login'));
-		common_element_end('form');
-		common_show_footer();
-	}
+            if (is_string($result)) { # error message
+                unset($_SESSION['openid_rememberme']);
+                $this->showForm($result, $openid_url);
+            }
+        } else {
+            $openid_url = oid_get_last();
+            $this->showForm(null, $openid_url);
+        }
+    }
+
+    function getInstructions()
+    {
+        return _('Login with an [OpenID](%%doc.openid%%) account.');
+    }
+
+    function showPageNotice()
+    {
+        if ($this->error) {
+            $this->element('div', array('class' => 'error'), $this->error);
+        } else {
+            $instr = $this->getInstructions();
+            $output = common_markup_to_html($instr);
+            $this->elementStart('div', 'instructions');
+            $this->raw($output);
+            $this->elementEnd('div');
+        }
+    }
+
+    function title()
+    {
+        return _('OpenID Login');
+    }
+
+    function showForm($error=null, $openid_url)
+    {
+        $this->error = $error;
+        $this->openid_url = $openid_url;
+        $this->showPage();
+    }
+
+    function showContent() {
+        $formaction = common_local_url('openidlogin');
+        $this->elementStart('form', array('method' => 'post',
+                                           'id' => 'openidlogin',
+                                           'action' => $formaction));
+        $this->hidden('token', common_session_token());
+        $this->input('openid_url', _('OpenID URL'),
+                     $this->openid_url,
+                     _('Your OpenID URL'));
+        $this->checkbox('rememberme', _('Remember me'), false,
+                        _('Automatically login in the future; ' .
+                           'not for shared computers!'));
+        $this->submit('submit', _('Login'));
+        $this->elementEnd('form');
+    }
+
+    function showLocalNav()
+    {
+        $nav = new LoginGroupNav($this);
+        $nav->show();
+    }
 }