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

@@ -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>';
 		}
 	}

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,

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);
 	}

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'];

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);
 	

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)) {