Fixed issue #06169 - Timer message not displayed correctly. The js_he…

…ader_includes function was adding extra directory information to any call to include js files that didn't start with http - breaking any relative url's included.

application/helpers/qanda_helper.php

@@ -568,7 +568,8 @@ function return_timer_script($aQuestionAttributes, $ia, $disable=null) {
     global $thissurvey;
 
     $clang = Yii::app()->lang;
-    header_includes(Yii::app()->getConfig("generalscripts").'coookies.js');
+    header_includes(Yii::app()->getConfig("generalscripts").'coookies.js', 'js');
+
     /* The following lines cover for previewing questions, because no $_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['fieldarray'] exists.
     This just stops error messages occuring */
     if(!isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['fieldarray']))
@@ -1324,7 +1325,6 @@ function do_language($ia)
 function do_list_dropdown($ia)
 {
     global $dropdownthreshold;
-    global $js_header_includes;
 
     $clang=Yii::app()->lang;
 
@@ -1351,7 +1351,6 @@ function do_list_dropdown($ia)
     //Time Limit Code
     if (trim($aQuestionAttributes['time_limit'])!='')
     {
-        $js_header_includes[] = '/scripts/coookies.js';
         $answer .= return_timer_script($aQuestionAttributes, $ia);
     }
     //End Time Limit Code
@@ -1608,7 +1607,6 @@ function do_list_dropdown($ia)
 function do_list_radio($ia)
 {
     global $dropdownthreshold;
-    global $js_header_includes;
     global $thissurvey;
     $clang=Yii::app()->lang;
     if ($thissurvey['nokeyboard']=='Y')
@@ -1678,7 +1676,6 @@ function do_list_radio($ia)
     //Time Limit Code
     if (trim($aQuestionAttributes['time_limit'])!='')
     {
-        $js_header_includes[] = '/scripts/coookies.js';
         $answer .= return_timer_script($aQuestionAttributes, $ia);
     }
     //End Time Limit Code

application/helpers/replacements_helper.php

@@ -166,7 +166,7 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de
         if($js_header_includes){
             foreach ($js_header_includes as $jsinclude)
             {
-                if (substr($jsinclude,0,4) == 'http')
+                if (substr($jsinclude,0,4) == 'http' || substr($jsinclude,0,strlen(Yii::app()->getConfig('generalscripts'))) == Yii::app()->getConfig('generalscripts'))
                     $_templatejs .= "<script type='text/javascript' src='{$jsinclude}'></script>\n";
                 else
                     $_templatejs .= "<script type='text/javascript' src='".Yii::app()->baseUrl.$jsinclude."'></script>\n";