Update of /home/spip-cvs/spip
In directory alan:/tmp/cvs-serv4573
Modified Files:
inc-forum.php3 inc-login.php3 spip_cookie.php3
Log Message:
correction de la classe Link, et suppressions d'appel superflus
Index: inc-login.php3
RCS file: /home/spip-cvs/spip/inc-login.php3,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- inc-login.php3 28 Oct 2004 22:30:05 -0000 1.62
+++ inc-login.php3 30 Oct 2004 09:59:09 -0000 1.63
@@ -13,24 +13,24 @@
include_local ("inc-formulaires.php3");
// gerer l'auth http
-function auth_http($cible, $essai_auth_http) {
+function auth_http($url, $essai_auth_http) {
$lien = " [<a href='" . _DIR_RESTREINT_ABS . "'>"._T('login_espace_prive')."</a>]";
if ($essai_auth_http == 'oui') {
include_ecrire('inc_session.php3');
if (!verifier_php_auth()) {
- $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&url=$url'>"._T('login_nouvelle_tentative')."</a>]";
+ $url = quote_amp(urlencode($url));
+ $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>]";
if (ereg(_DIR_RESTREINT_ABS, $url))
$page_erreur .= $lien;
ask_php_auth($page_erreur);
}
else
- redirige_par_entete($cible->getUrl());
+ redirige_par_entete($url);
}
// 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>] $lien");
+ 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>] $lien");
exit;
}
}
@@ -47,14 +47,14 @@
global $clean_link;
$clean_link->delVar('var_erreur');
$clean_link->delVar('var_login');
- $action = $clean_link->getUrl();
+ $action = urldecode($clean_link->getUrl());
include_ecrire("inc_session.php3");
verifier_visiteur();
if ($auteur_session AND
($auteur_session['statut']=='0minirezo' OR $auteur_session['statut']=='1comite')) {
- if (($cible != $action) && !headers_sent())
+ if (($cible != $action) && !headers_sent())
redirige_par_entete($cible);
echo "<a href='$cible'>"._T('login_par_ici')."</a>\n";
return;
@@ -158,7 +158,7 @@
$src = _DIR_RESTREINT_ABS . 'md5.js';
if ($flag_challenge_md5) echo "<script type=\"text/javascript\" src=\"$src\"></script>\n";
- echo "<form name='form_login' action='./spip_cookie.php3' method='post'";
+ echo "<form name='form_login' action='spip_cookie.php3' method='post'";
if ($flag_challenge_md5) echo " onSubmit='if (this.session_password.value) {
this.session_password_md5.value = calcMD5(\"$alea_actuel\" + this.session_password.value);
this.next_session_password_md5.value = calcMD5(\"$alea_futur\" + this.session_password.value);
Index: spip_cookie.php3
RCS file: /home/spip-cvs/spip/spip_cookie.php3,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- spip_cookie.php3 29 Oct 2004 16:57:45 -0000 1.72
+++ spip_cookie.php3 30 Oct 2004 09:59:09 -0000 1.73
@@ -24,17 +24,14 @@
exit;
}
}
+#spip_log("cookie: $url");
-// determiner ou l'on veut retomber
-if ($url)
- $cible = new Link($url);
-else
- $cible = new Link(_DIR_RESTREINT_ABS);
+if ($url) $url = urldecode($url);
// tentative de connexion en auth_http
if ($essai_auth_http AND !$ignore_auth_http) {
include_local ("inc-login.php3");
- auth_http($cible, $essai_auth_http);
+ auth_http(($url ? $url : _DIR_RESTREINT_ABS), $essai_auth_http);
exit;
}
@@ -56,7 +53,7 @@
}
if ($PHP_AUTH_USER AND !$ignore_auth_http) {
include_local ("inc-login.php3");
- auth_http($cible, 'logout');
+ auth_http(($url ? $url : _DIR_RESTREINT_ABS), 'logout');
}
unset ($auteur_session);
}
@@ -70,14 +67,12 @@
if ($test_echec_cookie == 'oui') {
spip_setcookie('spip_session', 'test_echec_cookie');
redirige_par_entete("spip_login.php3?var_echec_cookie=oui&var_url=" .
- ($url ? rawurlencode($url) : _DIR_RESTREINT_ABS));
+ ($url ? $url : _DIR_RESTREINT_ABS));
}
// Tentative de login
unset ($cookie_session);
-$durl = rawurldecode($url);
-$redirect = (!$url ? _DIR_RESTREINT_ABS : (strpos($durl,"&retour=") ? ($url) : $url));
-#$redirect = ($url ? $url : _DIR_RESTREINT_ABS);
+$redirect = ($url ? $url : _DIR_RESTREINT_ABS);
if ($essai_login == "oui") {
// Recuperer le login en champ hidden
if ($session_login_hidden AND !$session_login)
Index: inc-forum.php3
RCS file: /home/spip-cvs/spip/inc-forum.php3,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- inc-forum.php3 29 Oct 2004 20:02:09 -0000 1.93
+++ inc-forum.php3 30 Oct 2004 09:59:09 -0000 1.94
@@ -368,13 +368,17 @@
if ($args) $url .= (strpos($url,'?') ? $args : ('?' . substr($args,1)));
}
$url = ereg_replace("[?&]var_erreur=[^&]*", '', $url);
- $url = ereg_replace("[?&]var_login[^&]*", '', $url);
- $url = ereg_replace("[?&]var_url[^&]*", '', $url);
+ $url = ereg_replace("[?&]var_login=[^&]*", '', $url);
+ $url = ereg_replace("[?&]var_url=[^&]*", '', $url);
+ $url = ereg_replace("[?&]retour=[^&]*", '', $url);
// url de retour du forum
- $retour_forum = rawurldecode($GLOBALS['HTTP_GET_VARS']['retour']);
- if (!$retour_forum)
- $retour_forum = $url;
- else $retour_forum = ereg_replace('&recalcul=oui','',$retour_forum);
+ if ($retour_forum = rawurldecode($GLOBALS['HTTP_GET_VARS']['retour']))
+ $retour_forum = ereg_replace('&recalcul=oui','',$retour_forum);
+ else {
+ if (!$retour_forum = rawurldecode($GLOBALS['HTTP_POST_VARS']['retour']))
+ $retour_forum = $url;
+ }
+
// debut formulaire forum
$lacible = "