Revision: 2041 Author: olavmrk Date: Fri Dec 4 03:17:14 2009 Log: Auth_Default: Add initLogoutReturn().
Merged into 1.5 branch from r2019. http://code.google.com/p/simplesamlphp/source/detail?r=2041 Modified: /branches/simplesamlphp-1.5/lib/SimpleSAML/Auth/Default.php ======================================= --- /branches/simplesamlphp-1.5/lib/SimpleSAML/Auth/Default.php Fri Dec 4 03:15:40 2009 +++ /branches/simplesamlphp-1.5/lib/SimpleSAML/Auth/Default.php Fri Dec 4 03:17:14 2009 @@ -115,11 +115,11 @@ * Start logout. * * This function starts a logout operation from the current authentication source. This function - * never returns. + * will return if the logout operation does not require a redirect. * * @param string $returnURL The URL we should redirect the user to after logging out. */ - public static function initLogout($returnURL) { + public static function initLogoutReturn($returnURL) { assert('is_string($returnURL)'); $session = SimpleSAML_Session::getInstance(); @@ -138,6 +138,21 @@ } $as->logout($state); + } + + + /** + * Start logout. + * + * This function starts a logout operation from the current authentication source. This function + * never returns. + * + * @param string $returnURL The URL we should redirect the user to after logging out. + */ + public static function initLogout($returnURL) { + assert('is_string($returnURL)'); + + self::initLogoutReturn($returnURL); self::logoutCompleted($state); } -- You received this message because you are subscribed to the Google Groups "simpleSAMLphp commits" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/simplesamlphp-commits?hl=en.
