diff --git a/ecrire/inc/cookie.php b/ecrire/inc/cookie.php index a77839778cd804a3b48c8d2b80dc468d51e9ac4a..3657ca7d4f21a2912f1c7b454af3fd96e7869156 100644 --- a/ecrire/inc/cookie.php +++ b/ecrire/inc/cookie.php @@ -37,7 +37,6 @@ function spip_setcookie ($name='', $value='', $expire=0, $path='AUTO', $domain=' // http://doc.spip.org/@recuperer_cookies_spip function recuperer_cookies_spip($cookie_prefix) { - global $_COOKIE; $prefix_long = strlen($cookie_prefix); foreach ($_COOKIE as $name => $value) { diff --git a/ecrire/inc/utils.php b/ecrire/inc/utils.php index c9c09749decf829c9e47d6b93f8f6a62de5bc298..247cb651a13a8ae4359b0188aba6a640dfd122a2 100644 --- a/ecrire/inc/utils.php +++ b/ecrire/inc/utils.php @@ -1156,19 +1156,6 @@ function spip_initialisation($pi=NULL, $pa=NULL, $ti=NULL, $ta=NULL) { // *********** traiter les variables ************ - // Recuperer les superglobales $_GET si non definies - // (en theorie c'est impossible depuis PHP 4.0.3, cf. track_vars) - // et les identifier aux $HTTP_XX_VARS - foreach (array('_GET', '_POST', '_COOKIE', '_SERVER') as $_table) { - $http_table_vars = 'HTTP'.$_table.'_VARS'; - if (!is_array($GLOBALS[$_table])) { - $GLOBALS[$_table] = array(); - if (is_array($GLOBALS[$http_table_vars])) - $GLOBALS[$_table] = & $GLOBALS[$http_table_vars]; - } - $GLOBALS[$http_table_vars] = & $GLOBALS[$_table]; - } - // // Securite // @@ -1185,8 +1172,7 @@ function spip_initialisation($pi=NULL, $pa=NULL, $ti=NULL, $ta=NULL) { // Par ailleurs on ne veut pas de magic_quotes au cours de l'execution @set_magic_quotes_runtime(0); - // Remplir $GLOBALS avec $_GET et $_POST (methode a revoir pour fonctionner - // completement en respectant register_globals = off) + // Remplir $GLOBALS avec $_GET et $_POST spip_register_globals(); // appliquer le cookie_prefix diff --git a/ecrire/public/parametrer.php b/ecrire/public/parametrer.php index 520b0d6b053f341546750d636a02b56330594df5..35dbcd9e6a2208fd696655477634713c49555263 100644 --- a/ecrire/public/parametrer.php +++ b/ecrire/public/parametrer.php @@ -42,8 +42,6 @@ charger_generer_url(); # pour recuperer_parametres_url // // http://doc.spip.org/@calculer_contexte function calculer_contexte() { - global $_GET, $_POST; - $contexte = array(); foreach($_GET as $var => $val) { if (strpos($var, 'var_') !== 0) diff --git a/ecrire/urls/html.php b/ecrire/urls/html.php index 5358a161b2f7d8902c04639edfa57d868e2b47a8..8bea8fb955627735ed97bcdb7dd0d00a89cf1f06 100644 --- a/ecrire/urls/html.php +++ b/ecrire/urls/html.php @@ -88,8 +88,8 @@ function recuperer_parametres_url($fond, $url) { // on ne redirige pas, on assume le nouveau contexte (si possible) $url_propre = isset($_SERVER['REDIRECT_url_propre']) ? $_SERVER['REDIRECT_url_propre'] : - (isset($GLOBALS['HTTP_ENV_VARS']['url_propre']) ? - $GLOBALS['HTTP_ENV_VARS']['url_propre'] : + (isset($_ENV['url_propre']) ? + $_ENV['url_propre'] : ''); if ($url_propre AND preg_match(',^(article|breve|rubrique|mot|auteur|site)$,', $fond)) { $url_propre = (preg_replace('/^[_+-]{0,2}(.*?)[_+-]{0,2}(\.html)?$/', diff --git a/ecrire/urls/page.php b/ecrire/urls/page.php index f4ea8b65ade280ef31eaf2c69fb960a411a3d2b4..d58edf00b1154154a3dee18b1426f709cdec0c93 100644 --- a/ecrire/urls/page.php +++ b/ecrire/urls/page.php @@ -117,7 +117,7 @@ function recuperer_parametres_url(&$fond, $url) { // on ne redirige pas, on assume le nouveau contexte (si possible) if ( (isset($_SERVER['REDIRECT_url_propre']) AND $url_propre = $_SERVER['REDIRECT_url_propre']) - OR (isset($GLOBALS['HTTP_ENV_VARS']['url_propre']) AND $url_propre = $GLOBALS['HTTP_ENV_VARS']['url_propre']) + OR (isset($_ENV['url_propre']) AND $url_propre = $_ENV['url_propre']) AND preg_match(',^(article|breve|rubrique|mot|auteur|site)$,', $fond)) { $url_propre = (preg_replace('/^[_+-]{0,2}(.*?)[_+-]{0,2}(\.html)?$/', '$1', $url_propre)); diff --git a/ecrire/urls/propres.php b/ecrire/urls/propres.php index 37dcb7dc4809574c60ebd8ffb6a4ae88129e1a11..172e35bb4ab98e160f77f07906f683c586911fc1 100644 --- a/ecrire/urls/propres.php +++ b/ecrire/urls/propres.php @@ -270,12 +270,11 @@ function recuperer_parametres_url(&$fond, $url) { } /* Fin compatibilite anciennes urls */ - // Chercher les valeurs d'environnement qui indiquent l'url-propre if (isset($_SERVER['REDIRECT_url_propre'])) $url_propre = $_SERVER['REDIRECT_url_propre']; - elseif (isset($GLOBALS['HTTP_ENV_VARS']['url_propre'])) - $url_propre = $GLOBALS['HTTP_ENV_VARS']['url_propre']; + elseif (isset($_ENV['url_propre'])) + $url_propre = $_ENV['url_propre']; else { $url = substr($url, strrpos($url, '/') + 1); $url_propre = preg_replace(',[?].*,', '', $url); diff --git a/ecrire/urls/standard.php b/ecrire/urls/standard.php index f1b2e18c165f12f71186eb0e7d5f627aa4029037..173903115976042a4067d9360d2f9ca643ab891b 100644 --- a/ecrire/urls/standard.php +++ b/ecrire/urls/standard.php @@ -67,8 +67,8 @@ function recuperer_parametres_url(&$fond, $url) { // on ne redirige pas, on assume le nouveau contexte (si possible) $url_propre = isset($_SERVER['REDIRECT_url_propre']) ? $_SERVER['REDIRECT_url_propre'] : - (isset($GLOBALS['HTTP_ENV_VARS']['url_propre']) ? - $GLOBALS['HTTP_ENV_VARS']['url_propre'] : + (isset($_ENV['url_propre']) ? + $_ENV['url_propre'] : ''); if ($url_propre AND preg_match(',^(article|breve|rubrique|mot|auteur|site)$,', $fond)) { $url_propre = (preg_replace('/^[_+-]{0,2}(.*?)[_+-]{0,2}(\.html)?$/',