diff --git a/htdocs/install/check.php b/htdocs/install/check.php index 189dccd4e5f..3d6dd0cc7b2 100644 --- a/htdocs/install/check.php +++ b/htdocs/install/check.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2006 Laurent Destailleur + * Copyright (C) 2004-2007 Laurent Destailleur * Copyright (C) 2005 Marc Barilley / Océbo * * This program is free software; you can redistribute it and/or modify @@ -66,6 +66,17 @@ else print 'Ok '.$langs->trans("PHPVersion")." ".versiontostring(versionphp())."
\n"; } +// Check PHP support for $_POST +if (! isset($_GET["testget"]) && ! isset($_POST["testpost"])) +{ + print 'Error '.$langs->trans("PHPSupportPOSTGETKo")."
\n"; + $checksok=0; +} +else +{ + print 'Ok '.$langs->trans("PHPSupportPOSTGETOk")."
\n"; +} + // Si session non actives if (! function_exists("session_id")) { diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php index 52d383c4615..3fce55ff5d9 100644 --- a/htdocs/install/fileconf.php +++ b/htdocs/install/fileconf.php @@ -122,17 +122,24 @@ if (isset($main_url) && $main_url) $dolibarr_main_url_root=$main_url; if (! isset($dolibarr_main_url_root) || strlen($dolibarr_main_url_root) == 0) { - if (isset($_SERVER["SCRIPT_URI"])) { # Si défini + # Si défini (Ex: Apache sous Linux) + if (isset($_SERVER["SCRIPT_URI"])) { $dolibarr_main_url_root=$_SERVER["SCRIPT_URI"]; } - else { # SCRIPT_URI n'est pas toujours défini (Exemple: Apache 2.0.44 pour Windows) + # Si défini (Ex: Apache sous Caudium) + elseif (isset($_SERVER["SERVER_URL"]) && isset($_SERVER["DOCUMENT_URI"])) { + $dolibarr_main_url_root=$_SERVER["SERVER_URL"].$_SERVER["DOCUMENT_URI"]; + } + # Si SCRIPT_URI, SERVER_URL, DOCUMENT_URI non défini (Ex: Apache 2.0.44 pour Windows) + else { $dolibarr_main_url_root="http://".$_SERVER["SERVER_NAME"].$_SERVER["SCRIPT_NAME"]; } - $dolibarr_main_url_root = substr($dolibarr_main_url_root,0,strlen($dolibarr_main_url_root)-12); # Nettoyage de l'URL proposée - $dolibarr_main_url_root = ereg_replace('\/$','',$dolibarr_main_url_root); # Supprime le / - $dolibarr_main_url_root = ereg_replace('\/index\.php$','',$dolibarr_main_url_root); # Supprime le /index.php - $dolibarr_main_url_root = ereg_replace('\/install$','',$dolibarr_main_url_root); # Supprime le /install +// $dolibarr_main_url_root = substr($dolibarr_main_url_root,0,strlen($dolibarr_main_url_root)-12); + $dolibarr_main_url_root = ereg_replace('\/fileconf\.php$','',$dolibarr_main_url_root); # Supprime le /fileconf.php + $dolibarr_main_url_root = ereg_replace('\/$','',$dolibarr_main_url_root); # Supprime le / + $dolibarr_main_url_root = ereg_replace('\/index\.php$','',$dolibarr_main_url_root); # Supprime le /index.php + $dolibarr_main_url_root = ereg_replace('\/install$','',$dolibarr_main_url_root); # Supprime le /install } print $dolibarr_main_url_root; diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php index e2ac20b3702..8f20bd1056e 100644 --- a/htdocs/install/inc.php +++ b/htdocs/install/inc.php @@ -108,7 +108,7 @@ function pHeader($soutitre,$next,$action='set') print ''; print ''.$langs->trans("DolibarrSetup").''; - print '
'; + print ''; print ''; print '';