Update of /home/spip-cvs/spip
In directory alan:/tmp/cvs-serv15505
Modified Files:
inc-login.php3
Log Message:
LOGIN perd l'entete
Index: inc-login.php3
RCS file: /home/spip-cvs/spip/inc-login.php3,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- inc-login.php3 22 Oct 2004 21:48:04 -0000 1.59
+++ inc-login.php3 25 Oct 2004 23:33:33 -0000 1.60
@@ -5,6 +5,7 @@
if (defined("_INC_LOGIN")) return;
define("_INC_LOGIN", "1");
+
include_ecrire ("inc_meta.php3");
include_ecrire ("inc_session.php3");
include_ecrire ("inc_filtres.php3");
@@ -72,7 +73,6 @@
global $php_module;
global $clean_link;
-
if (!$cible) {
if ($GLOBALS['var_url']) $cible = new Link($GLOBALS['var_url']);
else if ($prive) $cible = new Link('ecrire/');
@@ -87,9 +87,11 @@
include_ecrire("inc_session.php3");
verifier_visiteur();
+
if ($auteur_session AND !$logout AND
($auteur_session['statut']=='0minirezo' OR $auteur_session['statut']=='1comite')) {
- if ($url != $GLOBALS['clean_link']->getUrl())
+ if (($url != $GLOBALS['clean_link']->getUrl()) &&
+ !headers_sent())
redirige_par_entete($url);
echo "<a href='$url'>"._T('login_par_ici')."</a>\n";
return;
@@ -147,7 +149,7 @@
@spip_setcookie("spip_admin", "", time() - 3600);
}
}
-
+
// javascript pour le focus
if ($login)
$js_focus = 'document.form_login.session_password.focus();';