Fixed issue: Images in theme options completely broken

LimeSurvey · Mar 29, 2018 · 9b59a69 · 9b59a69
1 parent f8c1d5a
commit 9b59a69
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/application/core/LS_Twig_Extension.php b/application/core/LS_Twig_Extension.php
@@ -254,8 +254,8 @@ public static function image($sImagePath, $alt = '', $htmlOptions = array( ))
             $sUrlImgAsset = self::assetPublish($oTemplate->path.$sImagePath);
         }
 
-        if (@is_array(getimagesize(Yii::app()->getConfig('rootdir').$sImagePath))) {
-            $sUrlImgAsset = self::assetPublish($sImagePath);
+        if (@is_array(getimagesize(Yii::app()->getConfig('rootdir').'/'.$sImagePath))) {
+            $sUrlImgAsset = self::assetPublish(Yii::app()->getConfig('rootdir').'/'.$sImagePath);
         }
 
 
@@ -272,17 +272,17 @@ public static function imageSrc($sImagePath, $default = './files/pattern.png')
     {
         // Reccurence on templates to find the file
         $oTemplate = self::getTemplateForRessource($sImagePath);
-        $sUrlImgAsset =  '';
+        $sUrlImgAsset =  $sImagePath;
 
 
         if ($oTemplate) {
             $sUrlImgAsset = self::assetPublish($oTemplate->path.$sImagePath);
         } 
 
-        if (@is_array(getimagesize(Yii::app()->getConfig('rootdir').$sImagePath))) {
-            $sUrlImgAsset = self::assetPublish(Yii::app()->getConfig('rootdir').$sImagePath);
+        if (@is_array(getimagesize(Yii::app()->getConfig('rootdir').'/'.$sImagePath))) {
+            $sUrlImgAsset = self::assetPublish(Yii::app()->getConfig('rootdir').'/'.$sImagePath);
         }
-
+        $myTemplateAsset = $sUrlImgAsset;
         return $sUrlImgAsset;
     }
 

diff --git a/application/models/TemplateConfiguration.php b/application/models/TemplateConfiguration.php
@@ -603,17 +603,17 @@ public function getHasOptionPage()
     private function _filterImages($file)
     {
         if(file_exists($this->filesPath.$file['name'])) {
-            $imagePath = $this->filesPath.$file['name'];
-            $fileRoot = './files';
+            $imagePath = $this->filesPath.'/'.$file['name'];
+            $fileRoot = '/files';
         } else {
             $imagePath = $this->generalFilesPath.$file['name'] ;
-            $fileRoot = Yii::app()->getConfig("userthemerooturl").'/generalfiles/';
+            $fileRoot = Yii::app()->getConfig("userthemerooturl").'/generalfiles';
         }
 
 
         $checkImage = getimagesize($imagePath);
         if (!($checkImage === false || !in_array($checkImage[2], [IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_GIF]))) {
-                    return ['filepath' => $fileRoot.$file['name'], 'filename'=>$file['name']];
+                return ['filepath' => $fileRoot.'/'.$file['name'], 'filepathOptions' => $imagePath ,'filename'=>$file['name']];
         }
     }
 

diff --git a/application/views/admin/survey/Question/advanced_settings_view.php b/application/views/admin/survey/Question/advanced_settings_view.php
@@ -46,7 +46,7 @@
         <!-- Input -->
         <div class="">
             <?php
-                $readonly = $aAttribute['readonly'] || ($aAttribute['readonly_when_active'] && $bIsActive);
+                $readonly = $aAttribute['readonly'] || (isset($aAttribute['readonly_when_active']) && $aAttribute['readonly_when_active'] && $bIsActive);
                 switch ($aAttribute['inputtype'])
                 {
                     // Switch

diff --git a/themes/survey/bootswatch/options/options.twig b/themes/survey/bootswatch/options/options.twig
@@ -176,7 +176,7 @@
                                 {% endif %}
 
                                 {% for image in templateConfiguration.imageFileList %}
-                                    <option data-lightbox-src="{{imageSrc(image.filepath)}}" value="{{image.filepath}}">{{image.filename}}</option>
+                                    <option data-lightbox-src="{{imageSrc(image.filepathOptions)}}" value="{{image.filepath}}">{{image.filename}}</option>
                                 {% endfor %}
                             </select>
                         </div>

diff --git a/themes/survey/fruity/options/options.twig b/themes/survey/fruity/options/options.twig
@@ -593,7 +593,7 @@
                                 {% endif %}
 
                                 {% for image in templateConfiguration.imageFileList %}
-                                    <option data-lightbox-src="{{imageSrc(image.filepath)}}" value="{{image.filepath}}">{{image.filename}}</option>
+                                    <option data-lightbox-src="{{imageSrc(image.filepathOptions)}}" value="{{image.filepath}}">{{image.filename}}</option>
                                 {% endfor %}
                             </select>
                         </div>

diff --git a/themes/survey/vanilla/options/options.twig b/themes/survey/vanilla/options/options.twig
@@ -190,7 +190,7 @@
                                 {% endif %}
 
                                 {% for image in templateConfiguration.imageFileList %}
-                                    <option data-lightbox-src="{{imageSrc(image.filepath)}}" value="{{image.filepath}}">{{image.filename}}</option>
+                                    <option data-lightbox-src="{{imageSrc(image.filepathOptions)}}" value="{{image.filepath}}">{{image.filename}}</option>
                                 {% endfor %}
                             </select>
                         </div>