Moved configuration to internal configuration file.

LimeSurvey · Jan 12, 2015 · 334529f · 334529f
1 parent 9341264
commit 334529f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 22 deletions.
diff --git a/application/config/internal.php b/application/config/internal.php
@@ -44,13 +44,16 @@
             'showScriptName' => true,
         ),
         'assetManager' => array(
-            'baseUrl' => '/tmp/assets'
+            'baseUrl' => '/tmp/assets',
+            'basePath'=> dirname(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.'assets'
+
         ),
         'request' => array(
             'class'=>'LSHttpRequest',
             'noCsrfValidationRoutes'=>array(
                 'remotecontrol'
             ),
+
             'enableCsrfValidation'=>true,    // CSRF protection
             'enableCookieValidation'=>false   // Enable to activate cookie protection
         ),
@@ -72,6 +75,11 @@
             'schemaCachingDuration' => 3600,
             'class' => 'DbConnection'
         ),
+        'session' => [
+            'cookieParams' => array(
+                'httponly' => true,
+            ),
+        ],
         'messages' => array(
             'class' => 'CGettextMessageSource',
             'cachingDuration'=>3600,

diff --git a/application/core/LSYii_Application.php b/application/core/LSYii_Application.php
@@ -80,28 +80,9 @@ public function __construct($config = null)
                 $config['components']['db']['enableParamLogging'] = true;
             }
         }
+
 
-        if (!isset($config['components']['request']))
-        {
-            $config['components']['request']=array();
-        }
-        if (!isset($config['components']['session']))
-        {
-            $config['components']['session']=array();
-        }
-        $config['components']['session']=array_merge_recursive($config['components']['session'],array(
-            'cookieParams' => array(
-                'httponly' => true,
-            ),
-        ));
-
-        if (!isset($config['components']['assetManager']))
-        {
-            $config['components']['assetManager']=array();
-        }
-        $config['components']['assetManager']=array_merge_recursive($config['components']['assetManager'],array(
-            'basePath'=> dirname(dirname(dirname(__FILE__))).DIRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.'assets'   // Enable to activate cookie protection
-        ));
+
 
         parent::__construct($config);
         Yii::setPathOfAlias('bootstrap' , Yii::getPathOfAlias('ext.bootstrap'));