Fixed issue #11296: Asset directory clearing, use AdminTheme::registe…

…rScriptFile() for all the admin ui scripts registration
LimeSurvey · Jun 2, 2016 · 97b2bf3 · 97b2bf3
1 parent 839b023
commit 97b2bf3
Show file tree

Hide file tree

Showing 12 changed files with 81 additions and 49 deletions.
diff --git a/application/controllers/RegisterController.php b/application/controllers/RegisterController.php
@@ -462,7 +462,7 @@ private function display($iSurveyId)
         if(empty(App()->clientScript->scripts)){
             App()->getClientScript()->registerPackage('jqueryui');
             App()->getClientScript()->registerPackage('jquery-touch-punch');
-            App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts')."survey_runtime.js");
+            App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('generalscripts')."survey_runtime.js");            
             useFirebug();
             $this->render('/register/display',$aViewData);
         }else{

diff --git a/application/controllers/admin/conditionsaction.php b/application/controllers/admin/conditionsaction.php
@@ -1143,7 +1143,7 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
         $aViewUrls = array();
 
         $oQuestion = Question::model()->find('qid=:qid', array(':qid'=>$qid));
-        $aData['oQuestion']=$oQuestion;        
+        $aData['oQuestion']=$oQuestion;
 
         $aData['surveyid'] = $iSurveyID;
         $aData['qid'] = $qid;
@@ -1619,7 +1619,8 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
             if (isset($conditionsList) && is_array($conditionsList))
             {
                 //TIBO
-                App()->getClientScript()->registerScriptFile(Yii::app()->getConfig("generalscripts").'jquery/jquery.multiselect.min.js');
+                $this->registerScriptFile( 'SCRIPT_PATH', 'jquery.multiselect.min.js');
+                $this->registerScriptFile( 'ADMIN_SCRIPT_PATH', 'checkgroup.js');
 
                 // TODO
                 $aViewUrls['output'] .= "<script type='text/javascript'>$(document).ready(function () { $('#copytomultiselect').multiselect( { autoOpen: true, noneSelectedText: '".gT("No questions selected")."', checkAllText: '".gT("Check all")."', uncheckAllText: '".gT("Uncheck all")."', selectedText: '# ".gT("selected")."', beforeclose: function(){ return false;},height: 200 } ); });</script>";

diff --git a/application/controllers/admin/statistics.php b/application/controllers/admin/statistics.php
@@ -812,8 +812,7 @@ public function simpleStatistics($surveyid)
      */
     protected function _renderWrappedTemplate($sAction = 'export', $aViewUrls = array(), $aData = array())
     {
-        $switch = Yii::app()->getBaseUrl(true).'/application/extensions/yiiwheels/widgets/switch/assets/js/bootstrap-switch.min.js ';
-        App()->getClientScript()->registerScriptFile( $switch );
+        $this->registerScriptFile( 'ADMIN_SCRIPT_PATH', 'bootstrap-switch.min.js');
 
         $aData['menu']['closeurl'] = Yii::app()->request->getUrlReferrer(Yii::app()->createUrl("/admin/survey/sa/view/surveyid/".$aData['surveyid']), array('simpleStatistics', 'admin/statistics/sa/index') );
 

diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
@@ -1338,18 +1338,6 @@ public function registerScriptFile( $cPATH, $sFile )
     {
         $oAdminTheme = AdminTheme::getInstance();
         $oAdminTheme->registerScriptFile( $cPATH, $sFile );
-        /*
-        if (!YII_DEBUG)
-        {
-            $path = ($cPATH == 'ADMIN_SCRIPT_PATH')?ADMIN_SCRIPT_PATH:SCRIPT_PATH;                                  // We get the wanted constant
-            App()->getClientScript()->registerScriptFile( App()->getAssetManager()->publish( $path . $sFile ));     // We publish the asset
-        }
-        else
-        {
-            $url = ($cPATH == 'ADMIN_SCRIPT_PATH')?Yii::app()->getConfig('adminscripts'):Yii::app()->getConfig('generalscripts');   // We get the wanted url defined in config
-            App()->getClientScript()->registerScriptFile( $url . $sFile );                                                          // We publish the script
-        }
-        */
     }
 
     /**
@@ -1362,19 +1350,6 @@ public function registerCssFile( $sPath, $sFile )
     {
         $oAdminTheme = AdminTheme::getInstance();
         $oAdminTheme->registerCssFile( $sPath, $sFile );
-        /*
-        if (!YII_DEBUG)
-        {
-            $path = ($sPath == 'PUBLIC')?dirname(Yii::app()->request->scriptFile).'/styles-public/':ADMIN_CSS_PATH;                             // We get the wanted constant
-            App()->getClientScript()->registerCssFile(  App()->getAssetManager()->publish($path.$sFile) );                         // We publish the asset
-        }
-        else
-        {
-            $url = ($sPath == 'PUBLIC')?Yii::app()->getConfig('publicstyleurl'):Yii::app()->getConfig('adminstyleurl').'/css/';     // We get the wanted url defined in config
-            App()->getClientScript()->registerCssFile( $url.$sFile );                                                               // We publish the css file
-
-        }
-        */
     }
 
     protected function _filterImportedResources($extractdir, $destdir)

diff --git a/application/models/UpdateForm.php b/application/models/UpdateForm.php
@@ -377,17 +377,17 @@ public function republishAssets()
         Template::model()->forceAssets();
         AdminTheme::forceAssets();
 
-        // Clear asset directory, but not the directory itself not the index.html at the root ^^
+        // Delete all the content in the asset directory, but not the directory itself nor the index.html file at its root ^^
         $sAssetsDir = Yii::app()->getConfig('tempdir') . '/assets/';
         $dir = dir($sAssetsDir);
         while (false !== $entry = $dir->read())
         {
-            if ($entry == '.' || $entry == '..' ||  $entry == 'index.html' )  {
+            if ($entry == '.' || $entry == '..' ||  $entry == 'index.html' )
+            {
                 continue;
             }
             rmdirr($sAssetsDir . DIRECTORY_SEPARATOR . $entry);
         }
-
     }
 
 

diff --git a/application/views/admin/emailtemplates/emailtemplates_view.php b/application/views/admin/emailtemplates/emailtemplates_view.php
@@ -1,6 +1,7 @@
 <?php
     $surveyinfo = getSurveyInfo($surveyid);
-    App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'emailtemplates.js');
+
+    $this->registerScriptFile( 'ADMIN_SCRIPT_PATH', 'emailtemplates.js');
     App()->getClientScript()->registerCssFile(Yii::app()->getConfig('styleurl') . 'popup-dialog.css');
 
     $count=0;

diff --git a/application/views/admin/export/statistics_subviews/_statistics_view_scripts.php b/application/views/admin/export/statistics_subviews/_statistics_view_scripts.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * This file register chartjs, and define needed js variables for statistics view. 
+ * This file register chartjs, and define needed js variables for statistics view.
  */
 ?>
 <script type='text/javascript'>
@@ -10,7 +10,9 @@
     var showTextInline="<?php echo $showtextinline ?>";
 </script>
 
-<?php App()->getClientScript()->registerScriptFile(Yii::app()->baseUrl.'/third_party/chartjs/Chart.min.js'); ?>
+<?php
+    $this->registerScriptFile( 'ADMIN_SCRIPT_PATH', 'Chart.min.js');
+?>
 
 <script>
     var CSS_COLOR_NAMES = ["AliceBlue","AntiqueWhite","Aqua","Aquamarine","Azure","Beige","Bisque","Black","BlanchedAlmond","Blue","BlueViolet","Brown","BurlyWood","CadetBlue","Chartreuse","Chocolate","Coral","CornflowerBlue","Cornsilk","Crimson","Cyan","DarkBlue","DarkCyan","DarkGoldenRod","DarkGray","DarkGrey","DarkGreen","DarkKhaki","DarkMagenta","DarkOliveGreen","Darkorange","DarkOrchid","DarkRed","DarkSalmon","DarkSeaGreen","DarkSlateBlue","DarkSlateGray","DarkSlateGrey","DarkTurquoise","DarkViolet","DeepPink","DeepSkyBlue","DimGray","DimGrey","DodgerBlue","FireBrick","FloralWhite","ForestGreen","Fuchsia","Gainsboro","GhostWhite","Gold","GoldenRod","Gray","Grey","Green","GreenYellow","HoneyDew","HotPink","IndianRed","Indigo","Ivory","Khaki","Lavender","LavenderBlush","LawnGreen","LemonChiffon","LightBlue","LightCoral","LightCyan","LightGoldenRodYellow","LightGray","LightGrey","LightGreen","LightPink","LightSalmon","LightSeaGreen","LightSkyBlue","LightSlateGray","LightSlateGrey","LightSteelBlue","LightYellow","Lime","LimeGreen","Linen","Magenta","Maroon","MediumAquaMarine","MediumBlue","MediumOrchid","MediumPurple","MediumSeaGreen","MediumSlateBlue","MediumSpringGreen","MediumTurquoise","MediumVioletRed","MidnightBlue","MintCream","MistyRose","Moccasin","NavajoWhite","Navy","OldLace","Olive","OliveDrab","Orange","OrangeRed","Orchid","PaleGoldenRod","PaleGreen","PaleTurquoise","PaleVioletRed","PapayaWhip","PeachPuff","Peru","Pink","Plum","PowderBlue","Purple","Red","RosyBrown","RoyalBlue","SaddleBrown","Salmon","SandyBrown","SeaGreen","SeaShell","Sienna","Silver","SkyBlue","SlateBlue","SlateGray","SlateGrey","Snow","SpringGreen","SteelBlue","Tan","Teal","Thistle","Tomato","Turquoise","Violet","Wheat","White","WhiteSmoke","Yellow","YellowGreen"];

diff --git a/application/views/admin/survey/organizeGroupsAndQuestions_view.php b/application/views/admin/survey/organizeGroupsAndQuestions_view.php
@@ -1,6 +1,6 @@
 <?php
     App()->getClientScript()->registerPackage('jquery-nestedSortable');
-    App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . 'organize.js');
+    $this->registerScriptFile( 'ADMIN_SCRIPT_PATH', 'organize.js');
     App()->getClientScript()->registerCssFile(Yii::app()->getConfig('styleurl') . 'organize.css');
 ?>
 

diff --git a/application/views/admin/token/bounce.php b/application/views/admin/token/bounce.php
@@ -107,20 +107,21 @@
                                 </div>
                             </div>
                         </div>
-
-                        </div>
-                        <!-- buttons -->
-                        <div class="buttons control-group  hidden">
-                            <button name="save" value="save" class="btn" type="submit">Save bounce settings</button>
-                            <a class="btn btn-link button" href="/LimeSurveyNext/index.php/admin/tokens?sa=index&amp;surveyid=274928">
-                                Cancel
-                            </a>
-                        </div>
-
-
+                    </div>
+
+                    <!-- buttons -->
+                    <div class="buttons control-group  hidden">
+                        <button name="save" value="save" class="btn" type="submit">Save bounce settings</button>
+                        <a class="btn btn-link button" href="/LimeSurveyNext/index.php/admin/tokens?sa=index&amp;surveyid=274928">
+                            Cancel
+                        </a>
+                    </div>
                 </form>
             </div> <!-- bouncesettingsdiv -->
         </div> <!-- col -->
     </div> <!-- Row -->
 </div> <!-- Side body -->
-<?php App()->getClientScript()->registerScriptFile(Yii::app()->getConfig('adminscripts') . "tokenbounce.js"); ?>
+
+<?php
+    $this->registerScriptFile( 'ADMIN_SCRIPT_PATH', 'tokenbounce.js');
+?>
diff --git a/scripts/admin/Chart.min.js b/scripts/admin/Chart.min.js