Revision: 2055
Author: olavmrk
Date: Wed Dec 16 06:09:00 2009
Log: Use the new argument to getModuleURL.
http://code.google.com/p/simplesamlphp/source/detail?r=2055
Modified:
/trunk/lib/SimpleSAML/Auth/Simple.php
/trunk/lib/SimpleSAML/Utilities.php
/trunk/modules/consent/www/noconsent.php
/trunk/modules/core/templates/frontpage_federation.tpl.php
/trunk/modules/cron/www/croninfo.php
/trunk/modules/saml/lib/Auth/Source/SP.php
/trunk/modules/saml2/lib/Auth/Source/SP.php
=======================================
--- /trunk/lib/SimpleSAML/Auth/Simple.php Wed Nov 18 00:15:27 2009
+++ /trunk/lib/SimpleSAML/Auth/Simple.php Wed Dec 16 06:09:00 2009
@@ -190,8 +190,7 @@
$returnTo = SimpleSAML_Utilities::selfURL();
}
- $login = SimpleSAML_Module::getModuleURL('core/as_login.php');
- $login = SimpleSAML_Utilities::addURLparameter($login, array(
+ $login = SimpleSAML_Module::getModuleURL('core/as_login.php',
array(
'AuthId' => $this->authSource,
'ReturnTo' => $returnTo,
));
@@ -216,8 +215,7 @@
$returnTo = SimpleSAML_Utilities::selfURL();
}
- $logout = SimpleSAML_Module::getModuleURL('core/as_logout.php');
- $logout = SimpleSAML_Utilities::addURLparameter($logout, array(
+ $logout = SimpleSAML_Module::getModuleURL('core/as_logout.php',
array(
'AuthId' => $this->authSource,
'ReturnTo' => $returnTo,
));
=======================================
--- /trunk/lib/SimpleSAML/Utilities.php Wed Dec 2 03:52:09 2009
+++ /trunk/lib/SimpleSAML/Utilities.php Wed Dec 16 06:09:00 2009
@@ -1771,7 +1771,7 @@
$returnTo = SimpleSAML_Utilities::selfURL();
}
- return
SimpleSAML_Module::getModuleURL('core/login-admin.php?ReturnTo=' .
urlencode($returnTo));
+ return SimpleSAML_Module::getModuleURL('core/login-admin.php',
array('ReturnTo' => $returnTo));
}
@@ -1845,10 +1845,7 @@
$session = SimpleSAML_Session::getInstance();
$session->setData('core_postdatalink', $id, $postData);
- return SimpleSAML_Utilities::addURLParameter(
-
SimpleSAML_Module::getModuleURL('core/postredirect.php'),
- array('RedirId' => $id)
- );
+ return SimpleSAML_Module::getModuleURL('core/postredirect.php',
array('RedirId' => $id));
}
=======================================
--- /trunk/modules/consent/www/noconsent.php Tue Jan 27 00:33:58 2009
+++ /trunk/modules/consent/www/noconsent.php Wed Dec 16 06:09:00 2009
@@ -14,8 +14,7 @@
$id = $_REQUEST['StateId'];
$state = SimpleSAML_Auth_State::loadState($id, 'consent:request');
-$resumeFrom = SimpleSAML_Module::getModuleURL('consent/getconsent.php');
-$resumeFrom = SimpleSAML_Utilities::addURLParameter($resumeFrom,
array('StateId' => $id));
+$resumeFrom = SimpleSAML_Module::getModuleURL('consent/getconsent.php',
array('StateId' => $id));
$aboutService = NULL;
if(isset($state['Destination']['url.about']) ){
=======================================
--- /trunk/modules/core/templates/frontpage_federation.tpl.php Mon Oct 5
06:01:13 2009
+++ /trunk/modules/core/templates/frontpage_federation.tpl.php Wed Dec 16
06:09:00 2009
@@ -78,7 +78,7 @@
foreach($set AS $entry) {
echo '<li>';
echo ('<a href="' .
-
SimpleSAML_Module::getModuleURL('core/show_metadata.php?entityid=' .
urlencode($entry['entityid']) . '&set=' . urlencode($setkey) ) .
+
htmlspecialchars(SimpleSAML_Module::getModuleURL('core/show_metadata.php',
array('entityid' => $entry['entityid'], 'set' => $setkey ))) .
'">');
if (array_key_exists('name', $entry)) {
echo
$this->getTranslation(SimpleSAML_Utilities::arrayize($entry['name'], 'en'));
=======================================
--- /trunk/modules/cron/www/croninfo.php Mon Nov 30 01:25:58 2009
+++ /trunk/modules/cron/www/croninfo.php Wed Dec 16 06:09:00 2009
@@ -28,7 +28,7 @@
$urls = array();
foreach ($tags AS $tag) {
$urls[] = array(
- 'href' => SimpleSAML_Module::getModuleURL('cron/cron.php?key='
.
$key . '&tag=' . $tag),
+ 'href' => SimpleSAML_Module::getModuleURL('cron/cron.php',
array('key'
=> $key, 'tag' => $tag)),
'tag' => $tag,
'int' => (array_key_exists($tag, $def) ? $def[$tag] :
$def['default']),
);
=======================================
--- /trunk/modules/saml/lib/Auth/Source/SP.php Wed Nov 18 00:15:40 2009
+++ /trunk/modules/saml/lib/Auth/Source/SP.php Wed Dec 16 06:09:00 2009
@@ -260,8 +260,7 @@
$discoURL =
SimpleSAML_Module::getModuleURL('saml/disco.php');
}
- $returnTo =
SimpleSAML_Module::getModuleURL('saml/sp/discoresp.php');
- $returnTo = SimpleSAML_Utilities::addURLparameter($returnTo,
array('AuthID' => $id));
+ $returnTo =
SimpleSAML_Module::getModuleURL('saml/sp/discoresp.php',
array('AuthID' => $id));
SimpleSAML_Utilities::redirect($discoURL, array(
'entityID' => $this->entityId,
=======================================
--- /trunk/modules/saml2/lib/Auth/Source/SP.php Tue Sep 29 04:12:45 2009
+++ /trunk/modules/saml2/lib/Auth/Source/SP.php Wed Dec 16 06:09:00 2009
@@ -156,8 +156,7 @@
$discoURL =
SimpleSAML_Module::getModuleURL('saml2/disco.php');
}
- $returnTo =
SimpleSAML_Module::getModuleURL('saml2/sp/discoresp.php');
- $returnTo = SimpleSAML_Utilities::addURLparameter($returnTo,
array('AuthID' => $id));
+ $returnTo =
SimpleSAML_Module::getModuleURL('saml2/sp/discoresp.php',
array('AuthID' => $id));
SimpleSAML_Utilities::redirect($discoURL, array(
'entityID' => $this->entityId,
--
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.
