GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'uiredesign' of ../evan into uiredesign

Browse Source
This commit is contained in:
sarven 2009-01-15 23:10:44 +00:00
commit 39b5957068
12 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/api.php
View File

@ -174,7 +174,7 @@ class ApiAction extends Action
} }
} }
function is_readonly() function isReadOnly()
{ {
# NOTE: before handle(), can't use $this->arg # NOTE: before handle(), can't use $this->arg
$apiaction = $_REQUEST['apiaction']; $apiaction = $_REQUEST['apiaction'];

2
actions/foaf.php
View File

@ -26,7 +26,7 @@ define('BOTH', 0);
class FoafAction extends Action class FoafAction extends Action
{ {
function is_readonly() function isReadOnly()
{ {
return true; return true;
} }

2
actions/invite.php
View File

@ -22,7 +22,7 @@ if (!defined('LACONICA')) { exit(1); }
class InviteAction extends Action class InviteAction extends Action
{ {
function is_readonly() function isReadOnly()
{ {
return false; return false;
} }

21
actions/login.php
View File

@ -22,7 +22,7 @@ if (!defined('LACONICA')) { exit(1); }
class LoginAction extends Action class LoginAction extends Action
{ {
function is_readonly() function isReadOnly()
{ {
return true; return true;
} }
@ -33,13 +33,13 @@ class LoginAction extends Action
if (common_is_real_login()) { if (common_is_real_login()) {
$this->clientError(_('Already logged in.')); $this->clientError(_('Already logged in.'));
} else if ($_SERVER['REQUEST_METHOD'] == 'POST') { } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$this->check_login(); $this->checkLogin();
} else { } else {
$this->show_form(); $this->showForm();
} }
} }
function check_login() function checkLogin()
{ {
# XXX: login throttle # XXX: login throttle
@ -75,7 +75,7 @@ class LoginAction extends Action
} }
common_redirect($url); common_redirect($url);
} else { } else {
$this->show_form(_('Incorrect username or password.')); $this->showForm(_('Incorrect username or password.'));
return; return;
} }
@ -104,7 +104,7 @@ class LoginAction extends Action
common_redirect($url); common_redirect($url);
} }
function show_form($error=null) function showForm($error=null)
{ {
$this->error = $error; $this->error = $error;
$this->showPage(); $this->showPage();
@ -120,7 +120,7 @@ class LoginAction extends Action
if ($this->error) { if ($this->error) {
$this->element('p', 'error', $this->error); $this->element('p', 'error', $this->error);
} else { } else {
$instr = $this->get_instructions(); $instr = $this->getInstructions();
$output = common_markup_to_html($instr); $output = common_markup_to_html($instr);
$this->raw($output); $this->raw($output);
} }
@ -143,10 +143,9 @@ class LoginAction extends Action
$this->element('a', array('href' => common_local_url('recoverpassword')), $this->element('a', array('href' => common_local_url('recoverpassword')),
_('Lost or forgotten password?')); _('Lost or forgotten password?'));
$this->elementEnd('p'); $this->elementEnd('p');
common_show_footer();
} }
function get_instructions() function getInstructions()
{ {
if (common_logged_in() && if (common_logged_in() &&
!common_is_real_login() && !common_is_real_login() &&
@ -164,8 +163,4 @@ class LoginAction extends Action
'try [OpenID](%%action.openidlogin%%). '); 'try [OpenID](%%action.openidlogin%%). ');
} }
} }
function show_top($error=null)
{
}
} }

2
actions/logout.php
View File

@ -24,7 +24,7 @@ require_once(INSTALLDIR.'/lib/openid.php');
class LogoutAction extends Action class LogoutAction extends Action
{ {
function is_readonly() function isReadOnly()
{ {
return true; return true;
} }

2
actions/publicxrds.php
View File

@ -26,7 +26,7 @@ require_once(INSTALLDIR.'/lib/openid.php');
class PublicxrdsAction extends Action class PublicxrdsAction extends Action
{ {
function is_readonly() function isReadOnly()
{ {
return true; return true;
} }

2
actions/requesttoken.php
View File

@ -24,7 +24,7 @@ require_once(INSTALLDIR.'/lib/omb.php');
class RequesttokenAction extends Action class RequesttokenAction extends Action
{ {
function is_readonly() function isReadOnly()
{ {
return false; return false;
} }

2
actions/sup.php
View File

@ -79,7 +79,7 @@ class SupAction extends Action
return $updates; return $updates;
} }
function is_readonly() function isReadOnly()
{ {
return true; return true;
} }

2
actions/userbyid.php
View File

@ -22,7 +22,7 @@ if (!defined('LACONICA')) { exit(1); }
class UserbyidAction extends Action class UserbyidAction extends Action
{ {
function is_readonly() function isReadOnly()
{ {
return true; return true;
} }

2
actions/xrds.php
View File

@ -24,7 +24,7 @@ require_once(INSTALLDIR.'/lib/omb.php');
class XrdsAction extends Action class XrdsAction extends Action
{ {
function is_readonly() function isReadOnly()
{ {
return true; return true;
} }

2
index.php
View File

@ -55,7 +55,7 @@ if (file_exists($actionfile)) {
$action_obj = new $action_class(); $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'])) { if (is_array($config['db']['mirror'])) {
// "load balancing", ha ha // "load balancing", ha ha
$k = array_rand($config['db']['mirror']); $k = array_rand($config['db']['mirror']);

2
lib/action.php
View File

@ -459,7 +459,7 @@ class Action extends HTMLOutputter // lawsuit
return null; return null;
} }
function is_readonly() function isReadOnly()
{ {
return false; return false;
} }