Revision: 1760
Author: andreassolberg
Date: Fri Sep 18 01:22:48 2009
Log: Move clear disco choice
http://code.google.com/p/simplesamlphp/source/detail?r=1760
Added:
/trunk/modules/core/www/cleardiscochoices.php
Deleted:
/trunk/www/cleardiscochoices.php
=======================================
--- /dev/null
+++ /trunk/modules/core/www/cleardiscochoices.php Fri Sep 18 01:22:48 2009
@@ -0,0 +1,38 @@
+<?php
+
+require_once('_include.php');
+
+/**
+ * This page clears the user's IdP discovery choices.
+ */
+
+/* The base path for cookies. This should be the installation directory
for simpleSAMLphp. */
+$config = SimpleSAML_Configuration::getInstance();
+$cookiePath = '/' . $config->getBaseUrl();
+
+/* We delete all cookies which starts with 'idpdisco_' */
+foreach($_COOKIE as $cookieName => $value) {
+ if (substr($cookieName, 0, 9) !== 'idpdisco_') {
+ /* Not a idpdisco cookie. */
+ continue;
+ }
+
+ /* Delete the cookie. We delete it once without the secure flag and
once
with the secure flag. This
+ * ensures that the cookie will be deleted in any case.
+ */
+ setcookie($cookieName, '', time() - 24*60*60, $cookiePath);
+}
+
+
+/* Find where we should go now. */
+if(array_key_exists('ReturnTo', $_REQUEST)) {
+ $returnTo = $_REQUEST['ReturnTo'];
+} else {
+ /* Return to the front page if no other destination is given. This is
the
same as the base cookie path. */
+ $returnTo = $cookiePath;
+}
+
+/* Redirect to destination. */
+SimpleSAML_Utilities::redirect($returnTo);
+
+?>
=======================================
--- /trunk/www/cleardiscochoices.php Mon Nov 10 05:01:19 2008
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-require_once('_include.php');
-
-/**
- * This page clears the user's IdP discovery choices.
- */
-
-/* The base path for cookies. This should be the installation directory
for simpleSAMLphp. */
-$config = SimpleSAML_Configuration::getInstance();
-$cookiePath = '/' . $config->getBaseUrl();
-
-/* We delete all cookies which starts with 'idpdisco_' */
-foreach($_COOKIE as $cookieName => $value) {
- if (substr($cookieName, 0, 9) !== 'idpdisco_') {
- /* Not a idpdisco cookie. */
- continue;
- }
-
- /* Delete the cookie. We delete it once without the secure flag and
once
with the secure flag. This
- * ensures that the cookie will be deleted in any case.
- */
- setcookie($cookieName, '', time() - 24*60*60, $cookiePath);
-}
-
-
-/* Find where we should go now. */
-if(array_key_exists('ReturnTo', $_REQUEST)) {
- $returnTo = $_REQUEST['ReturnTo'];
-} else {
- /* Return to the front page if no other destination is given. This is
the
same as the base cookie path. */
- $returnTo = $cookiePath;
-}
-
-/* Redirect to destination. */
-SimpleSAML_Utilities::redirect($returnTo);
-
-?>
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
