inc-calcul_html4.php inc-formulaires.php3 inc-forum.php3 inc-login.php3 login-dist.html 1.4 1.61 1.74 1.53 1.18 1.5 1.62 1.75 1.54 1.19

Notifications Commit Core
1

Update of /home/spip-cvs/spip
In directory alan:/tmp/cvs-serv29932

Modified Files:
  inc-calcul_html4.php inc-formulaires.php3 inc-forum.php3
  inc-login.php3 login-dist.html
Log Message:
LOGIN_PRIVE compliant, et passage correct par Tidy

Index: login-dist.html

RCS file: /home/spip-cvs/spip/login-dist.html,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- login-dist.html 11 May 2004 22:10:25 -0000 1.18
+++ login-dist.html 21 Jul 2004 14:30:24 -0000 1.19
@@ -1,11 +1,11 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html lang="#LANG">
<head>
-<title><:login_acces_prive:></title>
-<meta http-equiv="Content-Type" content="text/html; charset=#CHARSET">
-<link rel="stylesheet" href="spip_style.css" type="text/css" />
+ <title><:login_acces_prive:></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=#CHARSET">
+ <link rel="stylesheet" href="spip_style.css" type="text/css">
</head>
-<body bgcolor="#ffffff" text="#000000" link="#e86519" vlink="#6e003a" alink="#ff9900" topmargin="0" leftmargin="0" marginwidth="0" marginheight="0" dir="#LANG_DIR">
+<body bgcolor="white" dir="#LANG_DIR">

<br><br><br><center><table width="400"><tr><td width="400">
<div align="center">
@@ -16,5 +16,6 @@
#LOGIN_PRIVE
</td></tr></table></center>

+
</body>
</html>

Index: inc-login.php3

RCS file: /home/spip-cvs/spip/inc-login.php3,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- inc-login.php3 17 Jul 2004 12:56:24 -0000 1.53
+++ inc-login.php3 21 Jul 2004 14:30:24 -0000 1.54
@@ -16,8 +16,8 @@
   if ($essai_auth_http == 'oui') {
     include_ecrire('inc_session.php3');
     if (!verifier_php_auth()) {
- $url = urlencode($cible->getUrl());
- $page_erreur = "<b>"._T('login_connexion_refusee')."</b><p>"._T('login_login_pass_incorrect')."<p>[<a href='./'>"._T('login_retour_site')."</a>] [<a href='./spip_cookie.php3?essai_auth_http=oui&url=$url'>"._T('login_nouvelle_tentative')."</a>]";
+ $url = quote_amp(urlencode($cible->getUrl()));
+ $page_erreur = "<b>"._T('login_connexion_refusee')."</b><p />"._T('login_login_pass_incorrect')."<p />[<a href='./'>"._T('login_retour_site')."</a>] [<a href='./spip_cookie.php3?essai_auth_http=oui&amp;url=$url'>"._T('login_nouvelle_tentative')."</a>]";
       if (ereg("ecrire/", $url))
         $page_erreur .= " [<a href='ecrire/'>"._T('login_espace_prive')."</a>]";
       ask_php_auth($page_erreur);
@@ -29,7 +29,7 @@
   // si demande logout auth_http
   else if ($essai_auth_http == 'logout') {
     include_ecrire('inc_session.php3');
- ask_php_auth("<b>"._T('login_deconnexion_ok')."</b><p>"._T('login_verifiez_navigateur')."<p>[<a href='./'>"._T('login_retour_public')."</a>] [<a href='./spip_cookie.php3?essai_auth_http=oui&redirect=ecrire'>"._T('login_test_navigateur')."</a>] [<a href='ecrire/'>"._T('login_espace_prive')."</a>]");
+ ask_php_auth("<b>"._T('login_deconnexion_ok')."</b><p />"._T('login_verifiez_navigateur')."<p />[<a href='./'>"._T('login_retour_public')."</a>] [<a href='./spip_cookie.php3?essai_auth_http=oui&amp;redirect=ecrire'>"._T('login_test_navigateur')."</a>] [<a href='ecrire/'>"._T('login_espace_prive')."</a>]");
     exit;
   }
}
@@ -157,18 +157,18 @@

   if ($echec_cookie == "oui") {
     echo ouvre_login (_T('erreur_probleme_cookie'));
- echo "<p><b>"._T('login_cookie_oblige')."</b> ";
+ echo "<p /><b>"._T('login_cookie_oblige')."</b> ";
     echo _T('login_cookie_accepte')."\n";
   }
   else {
     echo ouvre_login ();
     echo
       (!$message_login ? '' :
- ("<br>" .
+ ("<br />" .
         _T("forum_vous_enregistrer") .
         " <a $pass_popup>" .
         _T("forum_vous_inscrire") .
- "</a><br><br>\n")) ;
+ "</a><p />\n")) ;
        
   }

@@ -196,39 +196,39 @@
     if ($flag_challenge_md5) {
       // si jaja actif, on affiche le login en 'dur', et on le passe en champ hidden
       echo "<script type=\"text/javascript\"><!--\n" .
- "document.write('".addslashes(_T('login_login'))." <b>$login</b> <br><font size=\\'2\\'>[<a href=\\'spip_cookie.php3?cookie_admin=non&url=".rawurlencode($action)."\\'>"._T('login_autre_identifiant')."</a>]</font>');\n" .
+ "document.write('".addslashes(_T('login_login'))." <b>$login</b> <br .><font size=\\'2\\'>[<a href=\\'spip_cookie.php3?cookie_admin=non&amp;url=".rawurlencode($action)."\\'>"._T('login_autre_identifiant')."</a>]</font>');\n" .
         "//--></script>\n";
- echo "<input type='hidden' name='session_login_hidden' value='$login'>";
+ echo "<input type='hidden' name='session_login_hidden' value='$login' />";

       // si jaja inactif, le login est modifiable (puisque le challenge n'est pas utilise)
       echo "<noscript>";
       echo "<font face='Georgia, Garamond, Times, serif' size='3'>";
- echo _T('login_non_securise')." <a href=\"".$clean_link->getUrl()."\">"._T('login_recharger')."</a>.<p></font>\n";
+ echo _T('login_non_securise')." <a href=\"".quote_amp($clean_link->getUrl())."\">"._T('login_recharger')."</a>.<p /></font>\n";
     }
- echo "<label><b>"._T('login_login2')."</b><br></label>";
- echo "<input type='text' name='session_login' class='forml' value=\"$login\" size='40'>\n";
+ echo "<label><b>"._T('login_login2')."</b><br /></label>";
+ echo "<input type='text' name='session_login' class='forml' value=\"$login\" size='40' />\n";
     if ($flag_challenge_md5) echo "</noscript>\n";

- echo "<br><br>\n<label><b>"._T('login_pass2')."</b><br></label>";
- echo "<input type='password' name='session_password' class='forml' value=\"\" size='40'>\n";
- echo "<input type='hidden' name='essai_login' value='oui'>\n";
+ echo "<p />\n<label><b>"._T('login_pass2')."</b><br /></label>";
+ echo "<input type='password' name='session_password' class='forml' value=\"\" size='40' />\n";
+ echo "<input type='hidden' name='essai_login' value='oui' />\n";

- echo "<br>&nbsp;&nbsp;&nbsp;&nbsp;<input type='checkbox' name='session_remember' value='oui' id='session_remember'$rester_checked> ";
+ echo "<br />&nbsp;&nbsp;&nbsp;&nbsp;<input type='checkbox' name='session_remember' value='oui' id='session_remember'$rester_checked /> ";
     echo "<label for='session_remember'>"._T('login_rester_identifie')."</label>";

- echo "<input type='hidden' name='url' value='$url'>\n";
- echo "<input type='hidden' name='session_password_md5' value=''>\n";
- echo "<input type='hidden' name='next_session_password_md5' value=''>\n";
- echo "<div align='right'><input type='submit' class='spip_bouton' value='"._T('bouton_valider')."'></div>\n";
+ echo "<input type='hidden' name='url' value='$url' />\n";
+ echo "<input type='hidden' name='session_password_md5' value='' />\n";
+ echo "<input type='hidden' name='next_session_password_md5' value='' />\n";
+ echo "<div align='right'><input type='submit' class='spip_bouton' value='"._T('bouton_valider')."' /></div>\n";
     echo "</div>";
     echo "</form>";
   }
   else { // demander seulement le login
-
+ $action = quote_amp($action);
     echo "<form name='form_login' action='$action' method='post'>\n";
     echo "<div class='spip_encadrer' style='text-align:".$GLOBALS["spip_lang_left"].";'>";
     if ($erreur) echo "<span style='color:red;'><b>$erreur</b></span><p />";
- echo "<label><b>"._T('login_login2')."</b><br></label>";
+ echo "<label><b>"._T('login_login2')."</b><br /></label>";
     echo "<input type='text' name='var_login' class='forml' value=\"\" size='40' />\n";

     echo "<input type='hidden' name='var_url' value='$url' />\n";

Index: inc-formulaires.php3

RCS file: /home/spip-cvs/spip/inc-formulaires.php3,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- inc-formulaires.php3 16 Jul 2004 07:20:02 -0000 1.61
+++ inc-formulaires.php3 21 Jul 2004 14:30:24 -0000 1.62
@@ -394,7 +394,7 @@

     $link = new Link;
     $url = $link->getUrl();
- $url = ereg_replace("\&", "&amp;", $url);
+ $url = quote_amp($url);
     echo "<form method='get' action='$url' style='border: 0px; margin: 0px;'>\n";
     echo "<div><b>"._T('form_pet_votre_nom')."</b></div>";
     echo "<div><input type=\"text\" class=\"forml\" name=\"nom_inscription\" value=\"\" size=\"30\" /></div>";

Index: inc-calcul_html4.php

RCS file: /home/spip-cvs/spip/inc-calcul_html4.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- inc-calcul_html4.php 20 Jul 2004 12:26:05 -0000 1.4
+++ inc-calcul_html4.php 21 Jul 2004 14:30:24 -0000 1.5
@@ -111,7 +111,7 @@
   if (!$retour_forum)
     $retour_forum = rawurlencode($url);
   else $retour_forum = ereg_replace('&recalcul=oui','',$retour_forum);
- $retour_forum = ereg_replace("\&","&amp;", $retour_forum);
+ $retour_forum = quote_amp($retour_forum);

   $cache = $Cache[cache];
   
Index: inc-forum.php3

RCS file: /home/spip-cvs/spip/inc-forum.php3,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- inc-forum.php3 17 Jul 2004 13:19:45 -0000 1.74
+++ inc-forum.php3 21 Jul 2004 14:30:24 -0000 1.75
@@ -133,7 +133,7 @@
   else $table = '';

- $url = ereg_replace("\&", "&amp;", $url);
+ $url = quote_amp($url);
   return ("<form action='$url' method='post' name='formulaire'>\n$hidden" .
     boutonne("type='hidden'", 'id_message', $id_message) .
     boutonne("type='hidden'", 'alea', $alea) .