From 82040fc6a3496b22787867329581ede6301264b5 Mon Sep 17 00:00:00 2001
From: Anders Lund <anders.lund@uninett.no>
Date: Thu, 12 Jun 2008 11:48:50 +0000
Subject: [PATCH] Updated to work with latest commit of login-feide module

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@643 44740490-163a-0410-bde0-09ae8108e29a
---
 templates/default/login-feide.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/templates/default/login-feide.php b/templates/default/login-feide.php
index e2448a7f6..27164e97b 100644
--- a/templates/default/login-feide.php
+++ b/templates/default/login-feide.php
@@ -20,7 +20,7 @@
 
 		<?php if ($this->data['selectorg']) { ?>
 		<div id="orgframe">
-			<form action="?" method="post" name="f">
+			<form action="?" method="get" name="f">
 			<fieldset>
 			<legend>Choose your home organization</legend>
 				<select name="org" tabindex="1">
@@ -33,6 +33,8 @@
 				?>
 				</select><br />
 				<input type="hidden" name="RelayState" value="<?php echo htmlspecialchars($this->data['relaystate']); ?>" />
+                                <input type="hidden" name="protocol" value="<?php echo htmlspecialchars($this->data['protocol']); ?>" />
+                                <input type="hidden" name="AuthId" value="<?php echo htmlspecialchars($this->data['authid']); ?>" />
 				<input type="submit" id="submit" value="Next" />
 			</fieldset>
 			</form>
@@ -57,6 +59,8 @@
 				<input type="password" id="password" name="password" /><br />
 
 				<input type="hidden" name="RelayState" value="<?php echo htmlspecialchars($this->data['relaystate']); ?>" />
+                                <input type="hidden" name="protocol" value="<?php echo htmlspecialchars($this->data['protocol']); ?>" />
+                                <input type="hidden" name="AuthId" value="<?php echo htmlspecialchars($this->data['authid']); ?>" />
 				<input type="hidden" name="org" value="<?php echo $this->data['org']; ?>" />
 				<input type="submit" id="submit" value="Login" />
 			</fieldset>
@@ -64,12 +68,14 @@
 		</div>
 
 		<div id="rechooseorgframe">
-			<form action="?" method="post" name="g">
+			<form action="?" method="get" name="g">
 			<fieldset>
 			<legend>Change your home organization</legend>
 			<p>You have chosen <b><?php echo $this->data['ldapconfig'][$this->data['org']]['description']; ?></b> as your home organization. If this is wrong you may choose
 			another one.</p>
 				<input type="hidden" name="RelayState" value="<?php echo htmlspecialchars($this->data['relaystate']); ?>" />
+                                <input type="hidden" name="protocol" value="<?php echo htmlspecialchars($this->data['protocol']); ?>" />
+                                <input type="hidden" name="AuthId" value="<?php echo htmlspecialchars($this->data['authid']); ?>" />
 				<input type="hidden" name="action" value="change_org" />
 				<input type="submit" id="submit" value="Choose home organization" />
 			</fieldset>
-- 
GitLab