File tree Expand file tree Collapse file tree 1 file changed +5
-4
lines changed Expand file tree Collapse file tree 1 file changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -361,7 +361,8 @@ public function getServerLoginURL($gateway=false,$renew=false)
361
361
phpCAS::traceBegin ();
362
362
// the URL is build only when needed
363
363
if ( empty ($ this ->_server ['login_url ' ]) ) {
364
- $ this ->_server ['login_url ' ] = $ this ->_buildQueryUrl ($ this ->_getServerBaseURL ().'login ' ,'service= ' .urlencode ($ this ->getURL ()));
364
+ $ provider = request ()->query ('provider ' );
365
+ $ this ->_server ['login_url ' ] = $ this ->_buildQueryUrl ($ this ->_getServerBaseURL ().'login ' ,'provider= ' . $ provider .'&service= ' .urlencode ($ this ->getURL ()));
365
366
}
366
367
$ url = $ this ->_server ['login_url ' ];
367
368
if ($ renew ) {
@@ -462,7 +463,7 @@ public function getServerServiceValidateURL()
462
463
break ;
463
464
case CAS_VERSION_2_0 :
464
465
$ this ->_server ['service_validate_url ' ] = $ this ->_getServerBaseURL ()
465
- .'serviceValidate ' ;
466
+ .'proxyValidate ' ;
466
467
break ;
467
468
case CAS_VERSION_3_0 :
468
469
$ this ->_server ['service_validate_url ' ] = $ this ->_getServerBaseURL ()
@@ -1890,8 +1891,8 @@ public function logout($params)
1890
1891
$ cas_url = $ this ->getServerLogoutURL ();
1891
1892
$ paramSeparator = '? ' ;
1892
1893
if (isset ($ params ['url ' ])) {
1893
- $ cas_url = $ cas_url . $ paramSeparator . "url = "
1894
- . urlencode ($ params ['url ' ]);
1894
+ $ cas_url = $ cas_url . $ paramSeparator . "destination = "
1895
+ . urlencode ($ params ['url ' ]). ' &gateway=true ' ;
1895
1896
$ paramSeparator = '& ' ;
1896
1897
}
1897
1898
if (isset ($ params ['service ' ])) {
You can’t perform that action at this time.
0 commit comments