From 6fcfc1106f4e27d12acf0aec7be65488f8eca1ea Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Wed, 28 Jul 2010 18:10:00 +0200
Subject: [PATCH] Work on the url parameters directly.

---
 horde/login.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/horde/login.php b/horde/login.php
index 128dafeb5..bbcb028bf 100644
--- a/horde/login.php
+++ b/horde/login.php
@@ -259,9 +259,11 @@ if (!empty($conf['auth']['alternate_login'])) {
     if (empty($url_in)) {
         $url_in = Horde::selfUrl(true, true, true);
     }
-    $anchor =  _addAnchor($url_in, 'param', $vars, $url_anchor);
-    if (strpos($url, '%25u') || strpos($url, '%u')) {
-        $url = str_replace(array('%25u', '%u'), rawurlencode($anchor), $url);
+    $anchor = _addAnchor($url_in, 'param', $vars, $url_anchor);
+    foreach ($url->parameters as $key => $value) {
+        if (strpos($value, '%u')) {
+            $url->parameters[$key] = str_replace('%u', rawurlencode($anchor), $value);
+        }
 
     } else {
         $url->add('url', $anchor);
-- 
2.11.0