Revision: 1929 Author: olavmrk Date: Tue Oct 27 06:58:09 2009 Log: SimpleSAML_Auth_State: Add $rawId parameter to saveState.
Merged into 1.5 branch from r1923. http://code.google.com/p/simplesamlphp/source/detail?r=1929 Modified: /branches/simplesamlphp-1.5/lib/SimpleSAML/Auth/State.php ======================================= --- /branches/simplesamlphp-1.5/lib/SimpleSAML/Auth/State.php Sun Jul 12 23:16:58 2009 +++ /branches/simplesamlphp-1.5/lib/SimpleSAML/Auth/State.php Tue Oct 27 06:58:09 2009 @@ -87,11 +87,13 @@ * * @param array &$state The login request state. * @param string $stage The current stage in the login process. + * @param bool $rawId Return a raw ID, without a restart URL. * @return string Identifier which can be used to retrieve the state later. */ - public static function saveState(&$state, $stage) { + public static function saveState(&$state, $stage, $rawId = FALSE) { assert('is_array($state)'); assert('is_string($stage)'); + assert('is_bool($rawId)'); /* Save stage. */ $state[self::STAGE] = $stage; @@ -103,7 +105,7 @@ $id = $state[self::ID]; /* Embed the restart URL in the state identifier, if it is available. */ - if (array_key_exists(self::RESTART, $state)) { + if (array_key_exists(self::RESTART, $state) && !$rawId) { assert('is_string($state[self::RESTART])'); $return = $id . ':' . $state[self::RESTART]; } else { --~--~---------~--~----~------------~-------~--~----~ 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 -~----------~----~----~----~------~----~------~--~---
