diff options
| -rw-r--r-- | actions/api.php | 2 | ||||
| -rw-r--r-- | actions/foaf.php | 2 | ||||
| -rw-r--r-- | actions/invite.php | 2 | ||||
| -rw-r--r-- | actions/login.php | 21 | ||||
| -rw-r--r-- | actions/logout.php | 2 | ||||
| -rw-r--r-- | actions/publicxrds.php | 2 | ||||
| -rw-r--r-- | actions/requesttoken.php | 2 | ||||
| -rw-r--r-- | actions/sup.php | 2 | ||||
| -rw-r--r-- | actions/userbyid.php | 2 | ||||
| -rw-r--r-- | actions/xrds.php | 2 | ||||
| -rw-r--r-- | index.php | 2 | ||||
| -rw-r--r-- | lib/action.php | 2 |
12 files changed, 19 insertions, 24 deletions
diff --git a/actions/api.php b/actions/api.php index 64971774d..47c119605 100644 --- a/actions/api.php +++ b/actions/api.php @@ -174,7 +174,7 @@ class ApiAction extends Action } } - function is_readonly() + function isReadOnly() { # NOTE: before handle(), can't use $this->arg $apiaction = $_REQUEST['apiaction']; diff --git a/actions/foaf.php b/actions/foaf.php index a0f8a1ff3..9fa321d4a 100644 --- a/actions/foaf.php +++ b/actions/foaf.php @@ -26,7 +26,7 @@ define('BOTH', 0); class FoafAction extends Action { - function is_readonly() + function isReadOnly() { return true; } diff --git a/actions/invite.php b/actions/invite.php index 879264deb..95d96bcde 100644 --- a/actions/invite.php +++ b/actions/invite.php @@ -22,7 +22,7 @@ if (!defined('LACONICA')) { exit(1); } class InviteAction extends Action { - function is_readonly() + function isReadOnly() { return false; } diff --git a/actions/login.php b/actions/login.php index 5226458fb..7ae1ed41d 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->raw($output); } @@ -143,10 +143,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() && @@ -164,8 +163,4 @@ class LoginAction extends Action 'try [OpenID](%%action.openidlogin%%). '); } } - - function show_top($error=null) - { - } } diff --git a/actions/logout.php b/actions/logout.php index 3001f3613..86d6270ab 100644 --- a/actions/logout.php +++ b/actions/logout.php @@ -24,7 +24,7 @@ require_once(INSTALLDIR.'/lib/openid.php'); class LogoutAction extends Action { - function is_readonly() + function isReadOnly() { return true; } diff --git a/actions/publicxrds.php b/actions/publicxrds.php index f66e34533..e765fb1c9 100644 --- a/actions/publicxrds.php +++ b/actions/publicxrds.php @@ -26,7 +26,7 @@ require_once(INSTALLDIR.'/lib/openid.php'); class PublicxrdsAction extends Action { - function is_readonly() + function isReadOnly() { return true; } diff --git a/actions/requesttoken.php b/actions/requesttoken.php index 378db4403..5058deedb 100644 --- a/actions/requesttoken.php +++ b/actions/requesttoken.php @@ -24,7 +24,7 @@ require_once(INSTALLDIR.'/lib/omb.php'); class RequesttokenAction extends Action { - function is_readonly() + function isReadOnly() { return false; } diff --git a/actions/sup.php b/actions/sup.php index 6a1897585..38e2e2e59 100644 --- a/actions/sup.php +++ b/actions/sup.php @@ -79,7 +79,7 @@ class SupAction extends Action return $updates; } - function is_readonly() + function isReadOnly() { return true; } diff --git a/actions/userbyid.php b/actions/userbyid.php index 3ff2c9c41..4bb896c38 100644 --- a/actions/userbyid.php +++ b/actions/userbyid.php @@ -22,7 +22,7 @@ if (!defined('LACONICA')) { exit(1); } class UserbyidAction extends Action { - function is_readonly() + function isReadOnly() { return true; } diff --git a/actions/xrds.php b/actions/xrds.php index 7cb2cd210..14cb9d503 100644 --- a/actions/xrds.php +++ b/actions/xrds.php @@ -24,7 +24,7 @@ require_once(INSTALLDIR.'/lib/omb.php'); class XrdsAction extends Action { - function is_readonly() + function isReadOnly() { return true; } @@ -55,7 +55,7 @@ if (file_exists($actionfile)) { $action_obj = new $action_class(); - if ($config['db']['mirror'] && $action_obj->is_readonly()) { + if ($config['db']['mirror'] && $action_obj->isReadOnly()) { if (is_array($config['db']['mirror'])) { // "load balancing", ha ha $k = array_rand($config['db']['mirror']); diff --git a/lib/action.php b/lib/action.php index 33b138905..cc385a086 100644 --- a/lib/action.php +++ b/lib/action.php @@ -459,7 +459,7 @@ class Action extends HTMLOutputter // lawsuit return null; } - function is_readonly() + function isReadOnly() { return false; } |