Sending authid and protocol from shib sso service as well. some cleanup

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@583 44740490-163a-0410-bde0-09ae8108e29a

www/saml2/idp/SSOService.php

@@ -187,8 +187,7 @@ if($needAuth && !$isPassive) {
 	$authId = SimpleSAML_Utilities::generateID();
 	$session->setAuthnRequest('saml2', $authId, $requestcache);
 
-	$redirectTo = SimpleSAML_Utilities::selfURLNoQuery() .
-		'?RequestID=' . urlencode($authId);
+	$redirectTo = SimpleSAML_Utilities::selfURLNoQuery() . '?RequestID=' . urlencode($authId);
 	$authurl = '/' . $config->getBaseURL() . $idpmetadata['auth'];
 
 	SimpleSAML_Utilities::redirect($authurl, array(

www/shib13/idp/SSOService.php

@@ -123,11 +123,14 @@ if (!$session->isAuthenticated($authority) ) {
 	$authId = SimpleSAML_Utilities::generateID();
 	$session->setAuthnRequest('shib13', $authId, $requestcache);
 
-
-	$relaystate = SimpleSAML_Utilities::selfURLNoQuery() . '?RequestID=' . urlencode($authId);
-	$authurl = SimpleSAML_Utilities::addURLparameter('/' . $config->getBaseURL() . $idpmetadata['auth'], 
-		'RelayState=' . urlencode($relaystate));
-	SimpleSAML_Utilities::redirect($authurl);
+	$redirectTo = SimpleSAML_Utilities::selfURLNoQuery() . '?RequestID=' . urlencode($authId);
+	$authurl = '/' . $config->getBaseURL() . $idpmetadata['auth'];
+
+	SimpleSAML_Utilities::redirect($authurl, array(
+		'RelayState' => $redirectTo,
+		'AuthId' => $authId,
+		'protocol' => 'shib13',
+	));
 	
 	
 /*