Update of /home/spip-cvs/spip
In directory miel:/tmp/cvs-serv2584
Modified Files:
inc-login.php3 inc-public-global.php3
Log Message:
login : ignorer (Ã partir de mes_options) remote_user et/ou http_auth_user
permet de fonctionner sous un .htaccess global ("extranet") ou sur des serveurs mal configurés (qui forcent 'root')
Index: inc-login.php3
RCS file: /home/spip-cvs/spip/inc-login.php3,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- inc-login.php3 1 Oct 2003 20:10:18 -0000 1.38
+++ inc-login.php3 23 Oct 2003 23:32:25 -0000 1.39
@@ -65,7 +65,7 @@
$echec_cookie = ($GLOBALS['spip_session'] != 'test_echec_cookie');
global $auteur_session;
- global $spip_session, $PHP_AUTH_USER;
+ global $spip_session, $PHP_AUTH_USER, $ignore_auth_http;
global $spip_admin;
global $php_module;
global $clean_link;
@@ -206,7 +206,7 @@
// Gerer le focus
echo "<script type=\"text/javascript\"><!--\n" . $js_focus . "\n//--></script>\n";
- if ($echec_cookie == "oui" AND $php_module) {
+ if ($echec_cookie == "oui" AND $php_module AND !$ignore_auth_http) {
echo "<form action='spip_cookie.php3' method='get'>";
echo "<fieldset>\n<p>";
echo _T('login_preferez_refuser')." \n";
Index: inc-public-global.php3
RCS file: /home/spip-cvs/spip/inc-public-global.php3,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- inc-public-global.php3 28 Sep 2003 18:07:30 -0000 1.78
+++ inc-public-global.php3 23 Oct 2003 23:32:25 -0000 1.79
@@ -74,7 +74,7 @@
// Authentification
//
-if ($HTTP_COOKIE_VARS['spip_session'] OR $PHP_AUTH_USER) {
+if ($HTTP_COOKIE_VARS['spip_session'] OR ($PHP_AUTH_USER AND !$ignore_auth_http)) {
include_ecrire ("inc_session.php3");
verifier_visiteur();
}