X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=actions%2Flogin.php;h=c775fa6924e2372ae7e99114c90d7f055c180cc3;hb=c622d144400026dac65c39303994d11f114c0f5b;hp=cee29fd09e2e698f60339686ecdb35ea98ff68f3;hpb=a151ab7b996be99e5f01a4793dbad453a5ac5bd6;p=quix0rs-gnu-social.git

diff --git a/actions/login.php b/actions/login.php
index cee29fd09e..c775fa6924 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -75,11 +75,15 @@ class LoginAction extends Action
     function handle($args)
     {
         parent::handle($args);
+
+        $disabled = common_config('logincommand','disabled');
+        $disabled = isset($disabled) && $disabled;
+
         if (common_is_real_login()) {
             $this->clientError(_('Already logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->checkLogin();
-        } else if (isset($args['user_id']) && isset($args['token'])){
+        } else if (!$disabled && isset($args['user_id']) && isset($args['token'])){
             $this->checkLogin($args['user_id'],$args['token']);
         } else {
             common_ensure_session();