petits bugs sur le formulaire de login (stephane laurent)

formulaires/formulaire_login.html

@@ -27,7 +27,7 @@
 	alt="[(#ENV{login_alt})]" /></div>]
 	<input type="hidden" name="session_login_hidden" value="(#ENV{login})" />
 <script type="text/javascript"><!--
-document.write("<:login_login:>&nbsp;<strong>[(#ENV{login_alt})]<" + "/strong><br />&#91;<a style='color: #e86519' href='spip_cookie.php3?cookie_admin=non[&amp;url=(#ENV{url}|urlencode)][&amp;retour=(#ENV{self}|urlencode)]'><font size='2'><:login_autre_identifiant:><" + "/font><" + "/a>&#93;")
+document.write("<:login_login:>&nbsp;<strong>[(#ENV{login_alt})]<" + "/strong><br />&#91;<a style='color: #e86519' href='spip_cookie.php3?cookie_admin=non[&amp;url=(#ENV*{url}|urlencode)][&amp;retour=(#ENV*{self}|urlencode)]'><font size='2'><:login_autre_identifiant:><" + "/font><" + "/a>&#93;")
 //--></script>
 <noscript>
 	<p class='notes' style='font-size: 130%'>

spip_cookie.php3

@@ -171,10 +171,11 @@ if ($essai_login == "oui") {
 // cookie d'admin ?
 if ($cookie_admin == "non") {
 	if (!$retour)
-		$retour = 'spip_login.php3?var_url='.urlencode($url);
+		$retour = 'spip_login.php3?url='.urlencode($url);
 
 	spip_setcookie('spip_admin', $spip_admin, time() - 3600 * 24);
-	$redirect = ereg_replace("([?&])var_login=[^&]*", '\1', $retour);
+	$redirect = ereg_replace("([?&])var_login=[^&]*&?", '\1', $retour);
+	$redirect = ereg_replace("([?&])var_erreur=[^&]*&?", '\1', $redirect);
 	$redirect .= (strpos($redirect, "?") ? "&" : "?") . "var_login=-1";
 }
 else if ($cookie_admin AND $spip_admin != $cookie_admin) {