Merge commit 'refs/merge-requests/159' of git://gitorious.org/statusnet/mainline...

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

diff --git a/plugins/CasAuthentication/caslogin.php b/plugins/CasAuthentication/caslogin.php
index 846774e7c671a88cd3c4fae15d88bdff1cc97c42..0e16427184b45ee03fe3d1cee6a1d4bd66694436 100644 (file)
--- a/plugins/CasAuthentication/caslogin.php
+++ b/plugins/CasAuthentication/caslogin.php
@@ -25,10 +25,11 @@ class CasloginAction extends Action
     {
         parent::handle($args);
         if (common_is_real_login()) {
+            // TRANS: Client error displayed when trying to log in while already logged on.
             $this->clientError(_m('Already logged in.'));
         } else {
             global $casSettings;
-            phpCAS::client(CAS_VERSION_2_0,$casSettings['server'],$casSettings['port'],$casSettings['path']);
+            phpCAS::client(CAS_VERSION_2_0,$casSettings['server'],$casSettings['port'],$casSettings['path'],false);
             phpCAS::setNoCasServerValidation();
             phpCAS::handleLogoutRequests();
             phpCAS::forceAuthentication();
@@ -36,12 +37,14 @@ class CasloginAction extends Action
             $casTempPassword = common_good_rand(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;
             }