From bbaf3aace1c4b4c427d2721b09d797037e2237f3 Mon Sep 17 00:00:00 2001
From: "Pierre Habouzit (MadCoder" <pierre.habouzit@m4x.org>
Date: Thu, 13 Jan 2005 07:55:04 +0000
Subject: [PATCH] lint changelog + some cookie and stuff
 bugfixes/simplifications

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-309
---
 ChangeLog                                         |  4 ++--
 htdocs/javascript/do_challenge_response_logged.js |  1 +
 include/xorg/session.inc.php                      |  4 ----
 templates/password_prompt.tpl                     | 17 ++++++-----------
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2ace725..7d1c7f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,13 +31,13 @@ New :
 		- Openweb : update.													-MC
 
 	* Validation :
-		- quite a lot of rewrite, simplifications.							-MC
+		- Quite a lot of rewrite, simplifications.							-MC
 
 Bug/Wish :
 
 	* Core :
-		- #245: Use PEAR::Date to avoid 1970-2038 php limitations.			-MC
 		- #145: Use melix address to log in.								-Car
+		- #245: Use PEAR::Date to avoid 1970-2038 php limitations.			-MC
 
 	* Emails :
 		- #229: Possibility to show our melix address.						-Car
diff --git a/htdocs/javascript/do_challenge_response_logged.js b/htdocs/javascript/do_challenge_response_logged.js
index 0621019..5a9e2ce 100644
--- a/htdocs/javascript/do_challenge_response_logged.js
+++ b/htdocs/javascript/do_challenge_response_logged.js
@@ -38,6 +38,7 @@ function doChallengeResponse() {
         document.forms.loginsub.challenge.value;
 
     document.forms.loginsub.response.value = MD5(str);
+    document.forms.loginsub.remember.value = document.forms.login.remember.checked;
     document.forms.login.password.value = "";
     document.forms.loginsub.submit();
 }
diff --git a/include/xorg/session.inc.php b/include/xorg/session.inc.php
index 18c5fa7..f329f22 100644
--- a/include/xorg/session.inc.php
+++ b/include/xorg/session.inc.php
@@ -157,18 +157,14 @@ class XorgSession extends DiogenesCoreSession
      */
     function doAuthCookie(&$page)
     {
-	global $failed_ORGaccess;
-	// si on est deja connecté, c'est bon, rien à faire
 	if (logged()) {
 	    return;
         }
 
-	// on vient de recevoir une demande d'auth, on passe la main a doAuth
 	if (Env::has('username') and Env::has('response')) {
 	    return $this->doAuth($page);
         }
 
-	// sinon, on vérifie que les bons cookies existent
 	if ($r = try_cookie()) {
 	    return $this->doAuth($page,($r>0));
         }
diff --git a/templates/password_prompt.tpl b/templates/password_prompt.tpl
index 6a54523..5209021 100644
--- a/templates/password_prompt.tpl
+++ b/templates/password_prompt.tpl
@@ -67,21 +67,16 @@ Si tu n'es pas {insert name="getName"}, change le login ci-dessous, ou rends-toi
     </tr>
     <tr style="white-space: nowrap">
       <td class="titre">
-      {if $domains}
         Adresse email :
-      {else}
-        Login (prenom.nom) :
-      {/if}
       </td>
       <td>
-        <input type="text" name="username" size="20" maxlength="50"
-          value="{insert name="getUserName"}" />
-        {if $domains}
-          @
-        <select name="domain">
-        {html_options values=$domains_value output=$domains selected=$r_domain}
+        <input type="text" name="username" size="20" maxlength="50" value="{insert name="getUserName"}" />&nbsp;@&nbsp;<select name="domain">
+          <option value="login">{#globals.mail.domain#} / {#globals.mail.domain2#}</option>
+          <option value="alias" {if $smarty.cookies.ORGdomain eq alias}selected="selected"{/if}>
+          {#globals.mail.alias_dom#} / {#globals.mail.alias_dom2#}
+          </option>
+          {$smarty.cookies.domain}
         </select>
-        {/if}
       </td>
     </tr>
     <tr>
-- 
2.1.4