git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit ba9f1f60 authored by Evan Prodromou's avatar Evan Prodromou

All actions now use isReadOnly()

parent f294eab9
......@@ -174,7 +174,7 @@ class ApiAction extends Action
}
}
function is_readonly()
function isReadOnly()
{
# NOTE: before handle(), can't use $this->arg
$apiaction = $_REQUEST['apiaction'];
......
......@@ -26,7 +26,7 @@ define('BOTH', 0);
class FoafAction extends Action
{
function is_readonly()
function isReadOnly()
{
return true;
}
......
......@@ -22,7 +22,7 @@ if (!defined('LACONICA')) { exit(1); }
class InviteAction extends Action
{
function is_readonly()
function isReadOnly()
{
return false;
}
......
......@@ -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)
{
}
}
......@@ -24,7 +24,7 @@ require_once(INSTALLDIR.'/lib/openid.php');
class LogoutAction extends Action
{
function is_readonly()
function isReadOnly()
{
return true;
}
......
......@@ -26,7 +26,7 @@ require_once(INSTALLDIR.'/lib/openid.php');
class PublicxrdsAction extends Action
{
function is_readonly()
function isReadOnly()
{
return true;
}
......
......@@ -24,7 +24,7 @@ require_once(INSTALLDIR.'/lib/omb.php');
class RequesttokenAction extends Action
{
function is_readonly()
function isReadOnly()
{
return false;
}
......
......@@ -79,7 +79,7 @@ class SupAction extends Action
return $updates;
}
function is_readonly()
function isReadOnly()
{
return true;
}
......
......@@ -22,7 +22,7 @@ if (!defined('LACONICA')) { exit(1); }
class UserbyidAction extends Action
{
function is_readonly()
function isReadOnly()
{
return true;
}
......
......@@ -24,7 +24,7 @@ require_once(INSTALLDIR.'/lib/omb.php');
class XrdsAction extends Action
{
function is_readonly()
function isReadOnly()
{
return true;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment