Merge branch 'master' into nightly

[quix0rs-gnu-social.git] / plugins / CasAuthentication / actions / caslogin.php

diff --git a/plugins/CasAuthentication/actions/caslogin.php b/plugins/CasAuthentication/actions/caslogin.php
index 0e16427184b45ee03fe3d1cee6a1d4bd66694436..7310072d92b770b0290495ee4b874b5f31230227 100644 (file)
--- a/plugins/CasAuthentication/actions/caslogin.php
+++ b/plugins/CasAuthentication/actions/caslogin.php
@@ -21,9 +21,9 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 class CasloginAction extends Action
 {
-    function handle($args)
+    function handle()
     {
-        parent::handle($args);
+        parent::handle();
         if (common_is_real_login()) {
             // TRANS: Client error displayed when trying to log in while already logged on.
             $this->clientError(_m('Already logged in.'));
@@ -34,19 +34,17 @@ class CasloginAction extends Action
             phpCAS::handleLogoutRequests();
             phpCAS::forceAuthentication();
             global $casTempPassword;
-            $casTempPassword = common_good_rand(16);
+            $casTempPassword = common_random_hexstr(16);
             $user = common_check_user(phpCAS::getUser(), $casTempPassword);
             if (!$user) {
                 // TRANS: Server error displayed when trying to log in with incorrect username or password.
                 $this->serverError(_m('Incorrect username or password.'));
-                return;
             }
 
             // success!
             if (!common_set_user($user)) {
                 // TRANS: Server error displayed when login fails in CAS authentication plugin.
                 $this->serverError(_m('Error setting user. You are probably not authorized.'));
-                return;
             }
 
             common_real_login(true);