From 5b733e26a7ccdf654aa5c7acacd7b56010fe9ecb Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Mon, 2 Dec 2013 13:49:14 +0000 Subject: [PATCH] --- .htaccess | 2 +- framework/application/Bootstrap.php | 9 ------ framework/application/configs/application.ini | 23 +++++++++++---- framework/application/configs/settings.0.ini | 28 +++++++++++++++++++ .../configs/{settings.ini => settings.1.ini} | 15 ++++++---- index.php | 8 ++++-- 6 files changed, 62 insertions(+), 23 deletions(-) create mode 100644 framework/application/configs/settings.0.ini rename framework/application/configs/{settings.ini => settings.1.ini} (54%) diff --git a/.htaccess b/.htaccess index afe4127..2642a62 100644 --- a/.htaccess +++ b/.htaccess @@ -25,7 +25,7 @@ RewriteEngine on RewriteBase / # Redirection to www. subdomain - RewriteCond %{HTTP_HOST} !^www.ccgm.fr$ + RewriteCond %{HTTP_HOST} ^ccgm.fr$ RewriteRule ^(.*)$ http://www.ccgm.fr/$1 [R=301,L] # Redirect auth header to env RewriteRule ^.*$ - [E=REMOTE_USER:%{HTTP:Authorization}] diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php index bd0c4af..253d7b3 100644 --- a/framework/application/Bootstrap.php +++ b/framework/application/Bootstrap.php @@ -9,14 +9,6 @@ class Bootstrap extends CubeIT_Bootstrap { $this->bootstrap('scripts'); } - protected function _initScripts() { - $view = $this->getView(); - $this->view->headScript()->addTooltip(); - parent::_initScripts(); - $view->headMeta()->setViewport(1024); - $view->headScript()->addWebFont(array('google' => array('families' => array('Ubuntu:500italic,300,300italic,500,400italic')))); - } - protected function _initRouter($initCms = true, $standard = true) { $router = parent::_initRouter($initCms, $standard); return $router; @@ -110,4 +102,3 @@ class Bootstrap extends CubeIT_Bootstrap { } } - diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini index 2500b57..4f051eb 100644 --- a/framework/application/configs/application.ini +++ b/framework/application/configs/application.ini @@ -1,5 +1,5 @@ -[production] -dev = true +[base] +dev = false minify.js = true minify.css = true @@ -36,9 +36,6 @@ navigation.containers[]=-1; navigation.containers[]=-2; navigation.containers[]=-3; -locales.fr = -;locales.en = - acl.perpage = false acl.roles[] = superadmin acl.roles[] = admin @@ -48,6 +45,22 @@ mail.test = APPLICATION_PATH "/../data/email/test" mailjet.username = a0efe78a914ae9b7b972618c6c3e1803 mailjet.password = b4d51c4c1d0193f9b0963c2c374dd882 +locales.fr = +[production : base] +variant = 0 + +[medecins : base] +dev=false + +variant = 1 +webhost = medecins.ccgm.fr + +seo.robots=false +seo.universalAnalytics = UA-42799235-2 + +httpauth.username = ccgm +httpauth.password = 20ccgm13 + [testing : production] dev = true diff --git a/framework/application/configs/settings.0.ini b/framework/application/configs/settings.0.ini new file mode 100644 index 0000000..eecc20e --- /dev/null +++ b/framework/application/configs/settings.0.ini @@ -0,0 +1,28 @@ +[production] +topimage.3558.image = "524d26c0-centre.jpg" +copyright = "©CCGM - Tous droits réservés" +longTitle.fr = "Centre de Cancérologie du Grand Montpellier - CCGM" +description.fr = "Le Centre de Cancérologie du Grand Montpellier (CCGM) est le centre libéral de Radiothérapie et d’Oncologie de Montpellier résultant de la fusion des services de Radiothérapie de la clinique Clémentville et de la clinique Saint Roch." +footer.infos = "Infos pratiques" +footer.horaires = "Le centre vous accueille du lundi au vendredi, de 8h à 19h. +Permanence téléphonique le samedi, de 9h à 12h." +footer.adresse.titre = "Centre de Cancérologie du Grand Montpellier" +footer.adresse.contenu = "Clinique Clémentville +25, rue de Clémentville +34070 MONTPELLIER +Tél : 04 67 92 61 55 - Fax : 04 67 92 95 06" +footer.urgences.titre = "Urgences - Hospitalisation" +footer.urgences.contenu = "Clinique tél : 08 26 88 88 84" +footer.logos.0.nom = "Montpellier - Institut du sein" +footer.logos.0.logo.9773.image = "5209f28f-institut-du-sein.png" +footer.logos.0.url = "http://www.le-mis.fr" +footer.logos.1.nom = "3C - Secteur libéral montpelliérais" +footer.logos.1.logo.9634.image = "5209f2fb-3c.png" +footer.logos.1.url = "" +footer.logos.2.nom = "Onco Languedoc-Roussillon" +footer.logos.2.logo.4587.image = "5209f33d-onco.png" +footer.logos.2.url = "http://www.oncolr.org/" +footer.logos.3.nom = "OC Santé" +footer.logos.3.logo.9874.image = "524ae4c0-ocsante.png" +footer.logos.3.url = "http://www.oc-sante.fr/" + diff --git a/framework/application/configs/settings.ini b/framework/application/configs/settings.1.ini similarity index 54% rename from framework/application/configs/settings.ini rename to framework/application/configs/settings.1.ini index 874a4b9..db4f825 100644 --- a/framework/application/configs/settings.ini +++ b/framework/application/configs/settings.1.ini @@ -1,7 +1,8 @@ [production] +topimage.3558.image = "524d26c0-centre.jpg" copyright = "©CCGM - Tous droits réservés" -longTitle.fr = "Centre de Cancérologie du Grand Montpellier" -description.fr = "Centre de Cancérologie du Grand Montpellier" +longTitle.fr = "Centre de Cancérologie du Grand Montpellier - CCGM" +description.fr = "Le Centre de Cancérologie du Grand Montpellier (CCGM) est le centre libéral de Radiothérapie et d’Oncologie de Montpellier résultant de la fusion des services de Radiothérapie de la clinique Clémentville et de la clinique Saint Roch." footer.infos = "Infos pratiques" footer.horaires = "Le centre vous accueille du lundi au vendredi, de 8h à 19h. Permanence téléphonique le samedi, de 9h à 12h." @@ -13,12 +14,14 @@ Tél : 04 67 92 61 55 - Fax : 04 67 92 95 06" footer.urgences.titre = "Urgences - Hospitalisation" footer.urgences.contenu = "Clinique tél : 08 26 88 88 84" footer.logos.0.nom = "Montpellier - Institut du sein" -footer.logos.0.logo.4359.image = "5209f28f-institut-du-sein.png" +footer.logos.0.logo.9773.image = "5209f28f-institut-du-sein.png" footer.logos.0.url = "http://www.le-mis.fr" footer.logos.1.nom = "3C - Secteur libéral montpelliérais" -footer.logos.1.logo.3349.image = "5209f2fb-3c.png" +footer.logos.1.logo.9634.image = "5209f2fb-3c.png" footer.logos.1.url = "" footer.logos.2.nom = "Onco Languedoc-Roussillon" -footer.logos.2.logo.7181.image = "5209f33d-onco.png" +footer.logos.2.logo.4587.image = "5209f33d-onco.png" footer.logos.2.url = "http://www.oncolr.org/" - +footer.logos.3.nom = "OC Santé" +footer.logos.3.logo.9874.image = "524ae4c0-ocsante.png" +footer.logos.3.url = "http://www.oc-sante.fr/" \ No newline at end of file diff --git a/index.php b/index.php index 744428e..7277588 100644 --- a/index.php +++ b/index.php @@ -4,6 +4,10 @@ $start = microtime(true); ini_set('log_errors', '1'); ini_set('error_log', dirname(__FILE__) . '/log/php_error.log'); -define('APPLICATION_ENV', 'production'); +if ($_SERVER['HTTP_HOST'] == 'www.ccgm.fr') { + define('APPLICATION_ENV', 'production'); +} else if ($_SERVER['HTTP_HOST'] == 'medecins.ccgm.fr') { + define('APPLICATION_ENV', 'medecins'); +} -include dirname(__FILE__) . '/CubeIT/common.php'; \ No newline at end of file +include dirname(__FILE__) . '/CubeIT/common.php'; -- 2.39.5