(no commit message)

diff --git a/.htaccess b/.htaccess
index 47a8cb136b6432e1205797a8525d739ec0837379..ff176b335410624bdcffabf6f0e7b0c9e14e944b 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -41,7 +41,7 @@
        RewriteCond %{REQUEST_FILENAME} -d
        RewriteRule ^.*$ - [NC,L]
        # Finally, redirect all other cases to the index.php
-       RewriteRule ^.*$ index.php/$1 [NC,L]
+       RewriteRule ^.*$ index.php [NC,L]
 </IfModule>
 
 <IfModule mod_headers.c>

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index aa337ad48679f4da6e83a0c19ac9e38abd33b99b..11a97afa92ae5df32592a4caefee100e45ca350e 100644 (file)
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -1,14 +1,5 @@
 [production]
-phpSettings.display_startup_errors = 0
-phpSettings.display_errors = 0
-phpSettings.memory_limit = 256M
-phpSettings.magic_quotes_gpc = 0
-phpSettings.register_globals = 0
-phpSettings.error_log = APPLICATION_PATH "/../log/php_errors.log"
-phpSettings.log_errors= 1
-phpSettings.track_errors = 0
-
-firephp = false
+dev = false
 
 minify.js = true
 minify.css = true
@@ -21,18 +12,12 @@ bin.unzip = /usr/bin/unzip
 bin.cp = /bin/cp
 bin.rm = /bin/rm
 
-includePaths.library = APPLICATION_PATH "/../library"
-bootstrap.path = APPLICATION_PATH "/Bootstrap.php"
-bootstrap.class = "Bootstrap"
 appnamespace = "CCGM"
-resources.view[] =
-
-resources.layout.layoutPath = APPLICATION_PATH "/layouts/scripts/"
 
 timezone = 'Europe/Paris'
 
 session.lifetime = 31536000 ;1 year
-session.adapter = cache
+session.adapter = mysql
 
 webhost = www.ccgm.fr
 
@@ -43,8 +28,8 @@ database.params.password = 6vr7TbBC
 database.params.dbname = ccgmzwgfweb
 
 seo.universalAnalytics = UA-42799235-1
-seo.google = 
-seo.bing = 
+seo.google = ICVt8ZuUETC45t3SdN7L2WzwCPkXmkXbK8u3RtOXypc
+seo.bing = 8986457D1D126C38A815027C839372DC
 
 navigation.containers[]=0;
 navigation.containers[]=-1;
@@ -54,7 +39,6 @@ navigation.containers[]=-3;
 locales.fr = 
 ;locales.en = 
 
-
 acl.perpage = true
 acl.roles[] = superadmin
 acl.roles[] = admin
@@ -63,13 +47,7 @@ mail.test = APPLICATION_PATH "/../data/email/test"
 
 [testing : production]
 
-firephp = true
-profile = true
-
-phpSettings.display_startup_errors = 1
-phpSettings.display_errors = 1
-phpSettings.track_errors = 1
-resources.frontController.params.displayExceptions = 1
+dev = true
 
 httpauth.username = ccgm
 httpauth.password = 20ccgm13

diff --git a/framework/application/views/helpers/Rightbar.php b/framework/application/views/helpers/Rightbar.php
index 82ff6ff88c836f1756171645b535cbbcdba2db9d..374614593906a3506bb3dacac1e9d65a2c0f3257 100644 (file)
--- a/framework/application/views/helpers/Rightbar.php
+++ b/framework/application/views/helpers/Rightbar.php
@@ -14,7 +14,7 @@ class CCGM_View_Helper_Rightbar extends Zend_View_Helper_Abstract {
                
                $this->view->headScript()->addScriptAndStyle('rightbar');
 
-               $res.='<aside id="rightbar">';
+               $res='<aside id="rightbar">';
                $res.=$this->view->imageProcess($s['image'], '', 262, null, array(), 'R');
                $res.='<section>';
                $res.=$this->view->markupDotclear($s['text']);