diff --git a/cosmogramme/php/_init.php b/cosmogramme/php/_init.php index b738723d7486359a828ffb1cf8c9a730cdc42930..2bc3a250266dca366c589feb5e7585c0fdec2d42 100644 --- a/cosmogramme/php/_init.php +++ b/cosmogramme/php/_init.php @@ -33,10 +33,10 @@ date_default_timezone_set('Europe/Paris'); require_once 'classe_cosmopaths.php'; $cosmo_path = new CosmoPaths(); -$site = '/' . $cosmo_path->getSite() . '/'; +$site = '/'; $cfgfile = $cosmo_path->getConfigPath(); -define('BASE_URL', $cosmo_path->getBaseUrl()); +define('BASE_URL', ''); define('USERFILESPATH', $cosmo_path->getUserfilesPath()); diff --git a/cosmogramme/php/classes/classe_cosmopaths.php b/cosmogramme/php/classes/classe_cosmopaths.php index 1b601c610fb0d9a4d1f4ca0ac12e1b1d2a699975..b383f123d8748eff1940193936425790d002143d 100644 --- a/cosmogramme/php/classes/classe_cosmopaths.php +++ b/cosmogramme/php/classes/classe_cosmopaths.php @@ -62,7 +62,7 @@ class CosmoPaths { public function getBaseUrl() { - return '/' . $this->getSite() . '/'; + return '/'; } diff --git a/includes.php b/includes.php index 9e7bbb81843ba980de79c41cbc4d63865ff5f18f..08d3633846750d5087c7e4562b7184eeceeca58d 100644 --- a/includes.php +++ b/includes.php @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE * along with BOKEH; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ $base_path = realpath(dirname(__FILE__)); set_include_path($base_path . '/library' . PATH_SEPARATOR . @@ -26,14 +26,6 @@ set_include_path($base_path . '/library' . PATH_SEPARATOR . // Includes de base include_once "local.php"; -$site= substr($_SERVER['SCRIPT_NAME'], 1, strpos($_SERVER['SCRIPT_NAME'], "index.php") -2); -$parts=explode('/', $site); -if(!file_exists("../" . end($parts))) { - echo "Erreur de vhost !" ; - exit ; -} - -define("BASE_URL", "/" . $site) ; function rootUrl() { return (!isset($_SERVER['HTTPS']) || !$_SERVER['HTTPS'] || $_SERVER['HTTPS'] == 'off' ? 'http://' : 'https://') @@ -42,6 +34,7 @@ function rootUrl() { } define('ROOT_URL', rootUrl()); +define("BASE_URL", "") ; include_once "fonctions/fonctions.php"; require_once "Zend/Loader.php"; require_once "library/startup.php";