Fix cas in client mode (click two times for login)

pydio · Mar 6, 2015 · a8c00e0 · a8c00e0
1 parent 3bbf76b
commit a8c00e0
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/core/src/plugins/authfront.cas/class.CasAuthFrontend.php b/core/src/plugins/authfront.cas/class.CasAuthFrontend.php
@@ -67,6 +67,7 @@ function tryToLogUser(&$httpVars, $isLast = false)
         $enre = !empty($httpVars['put_action_enable_redirect']);
         $ticket = !empty($httpVars['ticket']);
         $pgt = !empty($_SESSION['phpCAS']['pgt']);
+        $clientModeTicketPendding = isset($_SESSION['AUTHENTICATE_BY_CAS_CLIENT_MOD_TICKET_PENDDING']);
 
         if ($this->cas_modify_login_page) {
 
@@ -76,15 +77,22 @@ function tryToLogUser(&$httpVars, $isLast = false)
                 $_SESSION['AUTHENTICATE_BY_CAS'] = 0;
             }elseif(($flag == 1) && ($enre) && !$logged && !$pgtIou){
                 $_SESSION['AUTHENTICATE_BY_CAS'] = 1;
-            }elseif($pgtIou || $ticket || $pgt){
+            }elseif($pgtIou || $pgt){
                 $_SESSION['AUTHENTICATE_BY_CAS'] = 1;
+            }elseif($ticket){
+                $_SESSION['AUTHENTICATE_BY_CAS'] = 1;
+                $_SESSION['AUTHENTICATE_BY_CAS_CLIENT_MOD_TICKET_PENDDING'] = 1;
             }elseif($logged && $pgtIou){
                 $_SESSION['AUTHENTICATE_BY_CAS'] = 2;
             }else{
                 $_SESSION['AUTHENTICATE_BY_CAS'] = 0;
             }
             if ($_SESSION['AUTHENTICATE_BY_CAS'] < 1) {
-                return false;
+                if($clientModeTicketPendding){
+                    unset($_SESSION['AUTHENTICATE_BY_CAS_CLIENT_MOD_TICKET_PENDDING']);
+                }else{
+                    return false;
+                }
             }
         }