wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed incorrect disabling of login_token.

Browse Source
This commit is contained in:
Craig Andrews 2009-12-10 13:22:46 -05:00
parent b07e1143cc
commit b36ec6da87
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
actions/login.php
View File

@ -77,12 +77,13 @@ class LoginAction extends Action
parent::handle($args); parent::handle($args);
$disabled = common_config('logincommand','disabled'); $disabled = common_config('logincommand','disabled');
$disabled = isset($disabled) && $disabled;
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->checkLogin(); $this->checkLogin();
} else if (!isset($disabled) && isset($args['user_id']) && isset($args['token'])){ } else if (!$disabled && isset($args['user_id']) && isset($args['token'])){
$this->checkLogin($args['user_id'],$args['token']); $this->checkLogin($args['user_id'],$args['token']);
} else { } else {
common_ensure_session(); common_ensure_session();

3
lib/command.php
View File

@ -584,7 +584,8 @@ class LoginCommand extends Command
function execute($channel) function execute($channel)
{ {
$disabled = common_config('logincommand','disabled'); $disabled = common_config('logincommand','disabled');
if(isset($disabled) && $disabled) { $disabled = isset($disabled) && $disabled;
if($disabled) {
$channel->error($this->user, _('Login command is disabled')); $channel->error($this->user, _('Login command is disabled'));
return; return;
} }