Dev: some cleaning

LimeSurvey · Nov 1, 2018 · af6f134 · af6f134
1 parent 126a61d
commit af6f134
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/application/config/config-defaults.php b/application/config/config-defaults.php
@@ -90,7 +90,7 @@
 
 $config['memory_limit'] = '256'; // This sets how much memory LimeSurvey can access in megabytes. 256 MB is the minimum recommended - if you are using PDF functions up to 512 MB may be needed
 
-$config['maximum_unzipped_size'] = '500000000'; // Max size after zip unarchiving in bytes. 
+$config['maximum_unzipped_size'] = '500000000'; // Max size after zip unarchiving in bytes.
 
 $config['showpopups']         = 2; // Show popup messages if mandatory or conditional questions have not been answered correctly.
 //  2 = defined by Theme option (default)

diff --git a/application/core/LSYii_Application.php b/application/core/LSYii_Application.php
@@ -22,15 +22,15 @@
 * @property CLogRouter $log Log router component.
 * @property string $language Returns the language that the user is using and the application should be targeted to.
 * @property CClientScript $clientScript CClientScript manages JavaScript and CSS stylesheets for views.
-* @property CHttpRequest $request The request component. 
+* @property CHttpRequest $request The request component.
 * @property CDbConnection $db The database connection.
 * @property string $baseUrl The relative URL for the application.
 * @property CWebUser $user The user session information.
 * @property LSETwigViewRenderer $twigRenderer Twig rendering plugin
 * @property PluginManager $pluginManager The LimeSurvey Plugin manager
 * @property TbApi $bootstrap The bootstrap renderer
 * @property CHttpSession $session The HTTP session
-* 
+*
 */
 class LSYii_Application extends CWebApplication
 {
@@ -126,10 +126,6 @@ public function setConfigs() {
         $versionConfig = require(__DIR__.'/../config/version.php');
         $updaterVersionConfig = require(__DIR__.'/../config/updater_version.php');
         $this->config = array_merge($this->config,$coreConfig, $emailConfig, $versionConfig, $updaterVersionConfig);
-        if(!file_exists(__DIR__.'/../config/config.php')) {
-            /* Set up not done : then no other part to update */
-            return;
-        }
 
         /* Custom config file */
         $configdir = $coreConfig['configdir'];
@@ -143,7 +139,10 @@ public function setConfigs() {
         }
 
 
-        /* User file config */
+        if(!file_exists(__DIR__.'/../config/config.php')) {
+            /* Set up not done : then no other part to update */
+            return;
+        }/* User file config */
         $userConfigs = require(__DIR__.'/../config/config.php');
         if (is_array($userConfigs['config'])) {
              $this->config = array_merge($this->config, $userConfigs['config']);

diff --git a/application/helpers/admin/htmleditor_helper.php b/application/helpers/admin/htmleditor_helper.php
@@ -221,7 +221,7 @@ function getInlineEditor($fieldtype, $fieldname, $fieldtext, $surveyID = null, $
         . "
             if($('#".$fieldname."').length >0){
                 var $oCKeditorVarName = CKEDITOR.instances['$fieldname'];
-                if ($oCKeditorVarName) { 
+                if ($oCKeditorVarName) {
                         CKEDITOR.remove($oCKeditorVarName);
                     $oCKeditorVarName = null;
                 }
@@ -244,4 +244,3 @@ function getInlineEditor($fieldtype, $fieldname, $fieldtext, $surveyID = null, $
 
         Yii::app()->getClientScript()->registerScript('ckEditorScriptsInline-'.$fieldname, $scriptCode, LSYii_ClientScript::POS_POSTSCRIPT);
     }
-