Fixed issue: custom css/js not loaded on extended themes

LimeSurvey · Feb 9, 2018 · bcda36f · bcda36f · Shnoulle · Feb 12, 2018
1 parent e600c10
commit bcda36f
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 2 deletions.
diff --git a/application/controllers/admin/themes.php b/application/controllers/admin/themes.php
@@ -637,7 +637,6 @@ public function templatesavechanges()
                         $this->getController()->redirect(array("admin/themes/sa/upload"));
                     }
 
-
                     //$savefilename = $oEditedTemplate
                     if (!file_exists($oEditedTemplate->path.$relativePathEditfile) && !file_exists($oEditedTemplate->viewPath.$relativePathEditfile)) {
                         $oEditedTemplate->extendsFile($relativePathEditfile);
@@ -659,6 +658,11 @@ public function templatesavechanges()
 
                         $oEditedTemplate->actualizeLastUpdate();
 
+                        // If the file is an asset file, we refresh asset number
+                        if (in_array($relativePathEditfile, $cssfiles) || in_array($relativePathEditfile, $jsfiles)){
+                            SettingGlobal::increaseAssetsversionnumber();
+                        }
+
                         fclose($handle);
                     } else {
                         Yii::app()->user->setFlash('error', "The file $savefilename is not writable");
@@ -671,7 +675,7 @@ public function templatesavechanges()
             Yii::app()->setFlashMessage(gT("We are sorry but you don't have permissions to do this."), 'error');
         }
 
-        $this->getController()->redirect(array('admin/themes/', 'sa'=>'view', 'editfile'=>$relativePathEditfile, 'screenname'=>$screenname, 'templatename'=>$sTemplateName));
+        $this->getController()->redirect(array('admin/themes/', 'sa'=>'view', 'editfile'=>$relativePathEditfile, 'screenname'=>$screenname, 'templatename'=>$sTemplateName), true );
     }
 
     /**

diff --git a/application/models/SettingGlobal.php b/application/models/SettingGlobal.php
@@ -70,4 +70,47 @@ public function updateSetting($settingname, $settingvalue)
         }
 
     }
+
+
+    /**
+     * Increase the asset version number in version.php
+     * This will force the refresh of the assets folders content
+     */
+    static public function increaseAssetsversionnumber()
+    {
+        @ini_set('auto_detect_line_endings', true);
+        $sRootdir      = Yii::app()->getConfig("rootdir");
+        $versionlines = file($sRootdir.DIRECTORY_SEPARATOR.'application'.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'version.php');
+        $handle       = fopen($sRootdir.DIRECTORY_SEPARATOR.'application'.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'version.php', "w");
+        $iAssetNumber = self::generateAssetVersionNumber(Yii::app()->getConfig("assetsversionnumber"));
+
+        foreach ($versionlines as $line) {
+            if (strpos($line, 'assetsversionnumber') !== false) {
+                $line = '$config[\'assetsversionnumber\'] = '.$iAssetNumber.';'."\r\n";
+            }
+            fwrite($handle, $line);
+        }
+        fclose($handle);
+        Yii::app()->setConfig("assetsversionnumber", $iAssetNumber);
+        return;
+    }
+
+    /**
+     * with comfortUpate, we increase the asset number by one.
+     * so to be sure that the asset number from comfortUpdate will be different from the one generated here, we index it by 100000
+     *
+     * @param int $iAssetNumber the current asset number
+     * @return int the new asset number
+     */
+    static public function generateAssetVersionNumber($iAssetNumber)
+    {
+        while ( $iAssetNumber == Yii::app()->getConfig("assetsversionnumber")) {
+            if ($iAssetNumber > 100000){
+                $iAssetNumber++;
+            }else{
+                $iAssetNumber = Yii::app()->getConfig("assetsversionnumber") + 100000;
+            }
+        }
+        return $iAssetNumber;
+    }
 }