add version info to OpenID plugin

[quix0rs-gnu-social.git] / actions / login.php

diff --git a/actions/login.php b/actions/login.php
index 63955e3f59fa8cc9a360979f5353706f81c60ff2..c775fa6924e2372ae7e99114c90d7f055c180cc3 100644 (file)
--- 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();
@@ -164,7 +168,7 @@ class LoginAction extends Action
         } else {
             $url = common_local_url('all',
                                     array('nickname' =>
-                                          $nickname));
+                                          $user->nickname));
         }
 
         common_redirect($url, 303);