diff --git a/VERSIONS_HOTLINE/32400 b/VERSIONS_HOTLINE/32400 new file mode 100644 index 0000000000000000000000000000000000000000..7a9ca206276a925bb172bcfd66316ee26e611d17 --- /dev/null +++ b/VERSIONS_HOTLINE/32400 @@ -0,0 +1 @@ + - ticket #32400 : Cosmogramme : erreur sur certains écrans en accédant sans répétition du nom de domaine \ No newline at end of file diff --git a/cosmogramme/cosmozend/index.php b/cosmogramme/cosmozend/index.php index 984d6ed3627078fd75188a08b3c55c6596fb1b51..5a13c4cc9b171a4ca7bdf6a15debc6e31829a7f3 100644 --- a/cosmogramme/cosmozend/index.php +++ b/cosmogramme/cosmozend/index.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 */ date_default_timezone_set('Europe/Paris'); @@ -28,7 +28,6 @@ require_once $cosmozendPath . '/../storm_init.php'; set_include_path( $cosmozendPath . PATH_SEPARATOR . $cosmozendPath . '/application' -. PATH_SEPARATOR . $cosmozendPath . '/library' . PATH_SEPARATOR . get_include_path()); Zend_Session::start(); @@ -38,9 +37,10 @@ Zend_Layout::getMvcInstance() ->addHelperPath('ZendAfi/View/Helper', 'ZendAfi_View_Helper'); $front = Zend_Controller_Front::getInstance() - ->throwExceptions(true) - ->addModuleDirectory($cosmozendPath . '/application/modules') - ->setDefaultModule('opac') - ->registerPlugin(new ZendAfi_Controller_Plugin_CosmoAuth()); + ->throwExceptions(true) + ->addModuleDirectory($cosmozendPath . '/application/modules') + ->setDefaultModule('opac') + ->registerPlugin(new ZendAfi_Controller_Plugin_CosmoAuth()) + ->registerPlugin(new ZendAfi_Controller_Plugin_CosmoBaseUrl()); $front->dispatch(); \ No newline at end of file diff --git a/library/ZendAfi/Controller/Plugin/CosmoBaseUrl.php b/library/ZendAfi/Controller/Plugin/CosmoBaseUrl.php new file mode 100644 index 0000000000000000000000000000000000000000..ab1c17c5efc78739593c9fdb26f9a62de12f93b9 --- /dev/null +++ b/library/ZendAfi/Controller/Plugin/CosmoBaseUrl.php @@ -0,0 +1,30 @@ +<?php +/** + * Copyright (c) 2012-2016, Agence Française Informatique (AFI). All rights reserved. + * + * BOKEH is free software; you can redistribute it and/or modify + * it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by + * the Free Software Foundation. + * + * There are special exceptions to the terms and conditions of the AGPL as it + * is applied to this software (see README file). + * + * BOKEH is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * 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 + */ + + +class ZendAfi_Controller_Plugin_CosmoBaseUrl extends Zend_Controller_Plugin_Abstract { + public function routeStartup(Zend_Controller_Request_Abstract $request) { + // while cosmozend is not a bokeh module, base url detection is not compatible with rewrite to subdir + // @see http://forge.afi-sa.fr/issues/32400 + if ('' == $request->getBaseUrl()) + $request->setBaseUrl('/cosmogramme/cosmozend'); + } +} \ No newline at end of file