Dev: check if admintheme exists, if not, load greengreen

LimeSurvey · Jan 19, 2016 · 04ff617 · 04ff617
1 parent e9516f3
commit 04ff617
Showing 1 changed file with 29 additions and 22 deletions.
diff --git a/application/helpers/globalsettings_helper.php b/application/helpers/globalsettings_helper.php
@@ -18,19 +18,26 @@
 
 function injectglobalsettings()
 {
-	$settings = SettingGlobal::model()->findAll();
+    $settings = SettingGlobal::model()->findAll();
 
     //if ($dbvaluearray!==false)
     if (count($settings) > 0)
     {
         //foreach  ($dbvaluearray as $setting)
         foreach ($settings as $setting)
         {
-            //if (Yii::app()->getConfig($setting->getAttribute('stg_name')) !== false)
-            //{
-                //$$setting['stg_name']=$setting['stg_value'];
-                Yii::app()->setConfig($setting->getAttribute('stg_name'), $setting->getAttribute('stg_value'));
-            //}
+            // We first check if admintheme exist
+            if ($setting->getAttribute('stg_name') == 'admintheme')
+            {
+                // If the directory doesn't exist, we don't do nothing.
+                // So admintheme will have the value defined in the config-default file.
+                if (!is_dir( dirname(Yii::app()->request->scriptFile).'/styles/'.$setting->getAttribute('stg_value') ))
+                {
+                    return;
+                }
+            }
+
+            Yii::app()->setConfig($setting->getAttribute('stg_name'), $setting->getAttribute('stg_value'));
         }
     }
 }
@@ -41,20 +48,20 @@ function getGlobalSetting($settingname)
 
     if ($dbvalue === false)
     {
-    	$dbvalue = SettingGlobal::model()->findByPk($settingname);
+        $dbvalue = SettingGlobal::model()->findByPk($settingname);
 
         if ($dbvalue === null)
         {
             Yii::app()->setConfig($settingname, null);
-			$dbvalue = '';
+            $dbvalue = '';
         }
         else
         {
             $dbvalue = $dbvalue->getAttribute('stg_value');
         }
 
-		if (Yii::app()->getConfig($settingname) !== false)
-		{
+        if (Yii::app()->getConfig($settingname) !== false)
+        {
             // If the setting was not found in the setting table but exists as a variable (from config.php)
             // get it and save it to the table
             setGlobalSetting($settingname, Yii::app()->getConfig($settingname));
@@ -72,18 +79,18 @@ function setGlobalSetting($settingname, $settingvalue)
         return; //don't save
     }
 
-	if ($record = SettingGlobal::model()->findByPk($settingname))
-	{
-		$record->stg_value = $settingvalue;
-		$record->save();
-	}
-	else
-	{
-		$record = new SettingGlobal;
-		$record->stg_name = $settingname;
-		$record->stg_value = $settingvalue;
-		$record->save();
-	}
+    if ($record = SettingGlobal::model()->findByPk($settingname))
+    {
+        $record->stg_value = $settingvalue;
+        $record->save();
+    }
+    else
+    {
+        $record = new SettingGlobal;
+        $record->stg_name = $settingname;
+        $record->stg_value = $settingvalue;
+        $record->save();
+    }
 
     Yii::app()->setConfig($settingname, $settingvalue);
 }