From a9ffc6cd9eb43947b5363bff284a3e99540002ce Mon Sep 17 00:00:00 2001
From: Olav Morken <olav.morken@uninett.no>
Date: Wed, 2 Jul 2008 07:21:59 +0000
Subject: [PATCH] Change all in-tree uses of
SimpleSAML_Utilities::addURLparameter to pass the parameter as an array.
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@742 44740490-163a-0410-bde0-09ae8108e29a
---
templates/default/includes/header.php | 2 +-
www/index.php | 2 +-
www/openid/provider/server.php | 4 ++--
www/saml2/sp/metadata.php | 2 +-
www/shib13/idp/metadata.php | 2 +-
www/shib13/sp/metadata.php | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/templates/default/includes/header.php b/templates/default/includes/header.php
index a51b46edd..0b7f9ecca 100644
--- a/templates/default/includes/header.php
+++ b/templates/default/includes/header.php
@@ -67,7 +67,7 @@ if (empty($_POST) ) {
if ($current) {
$textarray[] = $langnames[$lang];
} else {
- $textarray[] = '<a href="' . htmlspecialchars(SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURL(), 'language=' . $lang)) . '">' .
+ $textarray[] = '<a href="' . htmlspecialchars(SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURL(), array('language' => $lang))) . '">' .
$langnames[$lang] . '</a>';
}
}
diff --git a/www/index.php b/www/index.php
index e32ff3c2e..ace4668df 100644
--- a/www/index.php
+++ b/www/index.php
@@ -75,7 +75,7 @@ if ($publishURL !== NULL) {
}
$url = SimpleSAML_Utilities::resolveURL($url);
- $linkTarget = SimpleSAML_Utilities::addURLparameter($publishURL, 'url=' . urlencode($url));
+ $linkTarget = SimpleSAML_Utilities::addURLparameter($publishURL, array('url' => $url));
$links[] = array(
'href' => $linkTarget,
'text' => 'link_publish_' . $name,
diff --git a/www/openid/provider/server.php b/www/openid/provider/server.php
index cec31827f..70c5b07fc 100644
--- a/www/openid/provider/server.php
+++ b/www/openid/provider/server.php
@@ -93,7 +93,7 @@ function action_default()
$relaystate = SimpleSAML_Utilities::selfURLNoQuery() . '?RelayState=' . urlencode($_GET['RelayState']) .
'&RequestID=' . urlencode($requestid);
$authurl = SimpleSAML_Utilities::addURLparameter('/' . $config->getBaseURL() . $idpmeta['auth'],
- 'RelayState=' . urlencode($relaystate));
+ array('RelayState' => $relaystate));
$t->data['initssourl'] = $authurl;
$t->data['openiddelegation'] = $delegationprefix . $username;
@@ -211,7 +211,7 @@ function check_authenticated_user() {
$relaystate = SimpleSAML_Utilities::selfURLNoQuery() . '/login';
$authurl = SimpleSAML_Utilities::addURLparameter('/' . $config->getBaseURL() . $idpmeta['auth'],
- 'RelayState=' . urlencode($relaystate));
+ array('RelayState' => $relaystate));
SimpleSAML_Utilities::redirect($authurl);
}
diff --git a/www/saml2/sp/metadata.php b/www/saml2/sp/metadata.php
index 9c63b93ee..e31e3a1a5 100644
--- a/www/saml2/sp/metadata.php
+++ b/www/saml2/sp/metadata.php
@@ -89,7 +89,7 @@ try {
$t->data['header'] = 'saml20-sp';
$t->data['metadata'] = htmlentities($metaxml);
$t->data['metadataflat'] = htmlentities($metaflat);
- $t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery(), 'output=xml');
+ $t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery(), array('output' => 'xml'));
if (array_key_exists($defaultidp, $send_metadata_to_idp)) {
$t->data['sendmetadatato'] = $send_metadata_to_idp[$defaultidp]['address'];
diff --git a/www/shib13/idp/metadata.php b/www/shib13/idp/metadata.php
index 0bbf24adc..a38285b4d 100644
--- a/www/shib13/idp/metadata.php
+++ b/www/shib13/idp/metadata.php
@@ -81,7 +81,7 @@ try {
$t->data['header'] = 'shib13-idp';
- $t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery(), 'output=xml');
+ $t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery(), array('output' => 'xml'));
$t->data['metadata'] = htmlspecialchars($metaxml);
$t->data['metadataflat'] = htmlspecialchars($metaflat);
diff --git a/www/shib13/sp/metadata.php b/www/shib13/sp/metadata.php
index cdf0a17fa..f886eb930 100644
--- a/www/shib13/sp/metadata.php
+++ b/www/shib13/sp/metadata.php
@@ -62,7 +62,7 @@ try {
$t->data['header'] = 'shib13-sp';
$t->data['metadata'] = htmlspecialchars($metaxml);
$t->data['metadataflat'] = htmlspecialchars($metaflat);
- $t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery(), 'output=xml');
+ $t->data['metaurl'] = SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURLNoQuery(), array('output' => 'xml'));
/*
if (array_key_exists($defaultidp, $send_metadata_to_idp)) {
--
GitLab