summaryrefslogtreecommitdiff
path: root/actions/login.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-01-15 23:09:16 +0000
committerEvan Prodromou <evan@controlyourself.ca>2009-01-15 23:09:16 +0000
commitba9f1f603b5d832d8dd2f2b910ddf90bf32181b8 (patch)
tree9322078a149d78da415f0ee940d6f772cbba9111 /actions/login.php
parentf294eab92a4e44c0ad8790b7875173a1340f4b5c (diff)
All actions now use isReadOnly()
Diffstat (limited to 'actions/login.php')
-rw-r--r--actions/login.php21
1 files changed, 8 insertions, 13 deletions
diff --git a/actions/login.php b/actions/login.php
index 060d16ad6..cd337bd39 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -22,7 +22,7 @@ if (!defined('LACONICA')) { exit(1); }
class LoginAction extends Action
{
- function is_readonly()
+ function isReadOnly()
{
return true;
}
@@ -33,13 +33,13 @@ class LoginAction extends Action
if (common_is_real_login()) {
$this->clientError(_('Already logged in.'));
} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
- $this->check_login();
+ $this->checkLogin();
} else {
- $this->show_form();
+ $this->showForm();
}
}
- function check_login()
+ function checkLogin()
{
# XXX: login throttle
@@ -75,7 +75,7 @@ class LoginAction extends Action
}
common_redirect($url);
} else {
- $this->show_form(_('Incorrect username or password.'));
+ $this->showForm(_('Incorrect username or password.'));
return;
}
@@ -104,7 +104,7 @@ class LoginAction extends Action
common_redirect($url);
}
- function show_form($error=null)
+ function showForm($error=null)
{
$this->error = $error;
$this->showPage();
@@ -120,7 +120,7 @@ class LoginAction extends Action
if ($this->error) {
$this->element('p', 'error', $this->error);
} else {
- $instr = $this->get_instructions();
+ $instr = $this->getInstructions();
$output = common_markup_to_html($instr);
$this->elementStart('div', 'instructions');
$this->raw($output);
@@ -145,10 +145,9 @@ class LoginAction extends Action
$this->element('a', array('href' => common_local_url('recoverpassword')),
_('Lost or forgotten password?'));
$this->elementEnd('p');
- common_show_footer();
}
- function get_instructions()
+ function getInstructions()
{
if (common_logged_in() &&
!common_is_real_login() &&
@@ -166,8 +165,4 @@ class LoginAction extends Action
'try [OpenID](%%action.openidlogin%%). ');
}
}
-
- function show_top($error=null)
- {
- }
}