From 20dd6bc42e7996970cb1a30e45e5f83ba95e2d41 Mon Sep 17 00:00:00 2001
From: LouisGac <louis.gac@limesurvey.org>
Date: Mon, 21 Mar 2016 12:15:54 +0100
Subject: [PATCH 1/4] Dev: added view for list_dropdown other option.

---
 application/helpers/qanda_helper.php          | 103 ++----------------
 .../questions/list_dropdown/othertext.php     |  39 +++++++
 2 files changed, 50 insertions(+), 92 deletions(-)
 create mode 100644 application/views/survey/questions/list_dropdown/othertext.php

diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
index fd87650d8e1..64335421318 100644
--- a/application/helpers/qanda_helper.php
+++ b/application/helpers/qanda_helper.php
@@ -178,7 +178,8 @@ function retrieveAnswers($ia)
             case 'R': //RANKING STYLE
                 $values=do_ranking($ia);
                 break;
-                case 'M': //Multiple choice checkbox
+
+            case 'M': //Multiple choice checkbox
                 $values=do_multiplechoice($ia);
                 if (count($values[1]) > 1 && $aQuestionAttributes['hide_tip']==0)
                 {
@@ -455,7 +456,6 @@ function file_validation_message($ia)
 // TMSW Validation -> EM
 function mandatory_popup($ia, $notanswered=null)
 {
-
     //This sets the mandatory popup message to show if required
     //Called from question.php, group.php or survey.php
     if ($notanswered === null) {unset($notanswered);}
@@ -484,7 +484,6 @@ function mandatory_popup($ia, $notanswered=null)
 // TMSW Validation -> EM
 function validation_popup($ia, $notvalidated=null)
 {
-
     //This sets the validation popup message to show if required
     //Called from question.php, group.php or survey.php
     if ($notvalidated === null) {unset($notvalidated);}
@@ -655,54 +654,6 @@ function return_timer_script($aQuestionAttributes, $ia, $disable=null)
     return $output;
 }
 
-/**
- * This function returns the default nb-col for bootstrap, based on the length of labels
- */
-function return_object_nb_cols($ansresult, $minLabelSize = 11, $minInputSize=1)
-{
-    // We first check that $minLabelSize and $minInputSize are coherent with a 12 column grid
-    // We give the priority to defined label size
-    if (($minLabelSize + $minInputSize) > 12)
-        $minInputSize = 12 - $minLabelSize;
-
-    $nbColLabelLgLog=0;
-
-    // We define the same col-lg and col-xs for all labels/inputs, on the base of the bigger one.
-    foreach ($ansresult as $ansrow)
-    {
-        // We calculate the needed row to fully display the label
-        $nbCol = round(strlen($ansrow['question'])/10)+1;
-        $nbColLabelLg = ($nbCol > $minLabelSize)?$minLabelSize:$nbCol;
-
-        // If it's the largest one until now, we log it.
-        if ($nbColLabelLg > $nbColLabelLgLog)
-            $nbColLabelLgLog = $nbColLabelLg;
-
-    }
-
-    // We define the XS label size on the base of the LG width
-    $nbColLabelXs = $nbColLabelLgLog + 5;
-    $nbColLabelXs = ($nbColLabelXs > 11)?11:$nbColLabelXs;
-
-    // The input width is defined on the base of the label width
-    $nbColInputLg = 12 - $nbColLabelLgLog;
-    $nbColInputLg = ($nbColInputLg < 1)?12:$nbColInputLg;
-
-    $nbColInputXs = 12 - $nbColLabelXs;
-    $nbColInputXs = ($nbColInputXs < 1)?12:$nbColInputXs;
-
-    // We store the datas in an object before returning them
-    $oNbCols = new stdClass();
-    $oNbCols->nbColLabelXs = $nbColLabelXs;
-    $oNbCols->nbColLabelLg = $nbColLabelLgLog;
-    $oNbCols->nbColInputXs = $nbColInputXs;
-
-    $oNbCols->nbColInputLg = $nbColInputLg;
-
-
-    return $oNbCols;
-}
-
 function return_display_style($ia, $aQuestionAttributes, $thissurvey, $rowname)
 {
     $htmltbody2 = '';
@@ -1461,51 +1412,19 @@ function do_list_dropdown($ia)
 
     if (isset($other) && $other=='Y')
     {
-        $answer .= "\n<script type=\"text/javascript\">\n"
-        ."<!--\n"
-        ."function showhideother(name, value)\n"
-        ."\t{\n"
-        ."\tvar hiddenothername='othertext'+name;\n"
-        ."\tif (value == \"-oth-\")\n"
-        ."{\n"
-        ."document.getElementById(hiddenothername).style.display='';\n"
-        ."document.getElementById(hiddenothername).focus();\n"
-        ."}\n"
-        ."\telse\n"
-        ."{\n"
-        ."document.getElementById(hiddenothername).style.display='none';\n"
-        ."document.getElementById(hiddenothername).value='';\n" // reset othercomment field
-        ."}\n"
-        ."\t}\n"
-        ."//--></script>\n";
-        $answer .= '<br/>';
-        $answer .= '                <input class="form-control" type="text" id="othertext'.$ia[1].'" name="'.$ia[1].'other" style="display:';
-
-        $inputnames[]=$ia[1].'other';
-
-        if ($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]] != '-oth-')
-        {
-            $answer .= 'none';
-        }
-
-        //        // --> START BUG FIX - text field for other was not repopulating when returning to page via << PREV
-        $answer .= '"';
-        //        $thisfieldname=$ia[1].'other';
-        //        if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$thisfieldname])) { $answer .= ' value="'.htmlspecialchars($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$thisfieldname],ENT_QUOTES).'" ';}
-        //        // --> END BUG FIX
-
-        // --> START NEW FEATURE - SAVE
-        $answer .= "  alt='".gT('Other answer')."' onchange='$checkconditionFunction(this.value, this.name, this.type);'";
+        $aData = array();
+        $aData['name']= $ia[1];
+        $aData['checkconditionFunction']=$checkconditionFunction;
+        $aData['display'] = ($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]] != '-oth-')?'display: none;':'';
         $thisfieldname="$ia[1]other";
-        if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$thisfieldname])) { $answer .= " value='".htmlspecialchars($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$thisfieldname],ENT_QUOTES)."' ";}
-        $answer .= ' />';
-        $answer .= "</p>";
-        // --> END NEW FEATURE - SAVE
-        $inputnames[]=$ia[1]."other";
-    }
+        $aData['value'] = (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$thisfieldname]))?htmlspecialchars($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$thisfieldname],ENT_QUOTES):'';
 
+        $answer .= Yii::app()->getController()->renderPartial('/survey/questions/list_dropdown/othertext', $aData, true);
 
+        $inputnames[]=$ia[1].'other';
 
+        // TODO: check if needed : $answer .= "</p>";
+    }
 
     $inputnames[]=$ia[1];
 
diff --git a/application/views/survey/questions/list_dropdown/othertext.php b/application/views/survey/questions/list_dropdown/othertext.php
new file mode 100644
index 00000000000..7c3b8c28287
--- /dev/null
+++ b/application/views/survey/questions/list_dropdown/othertext.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * List DropDown, Other Option
+ *
+ * @var $name           $ia[1]
+ * @var $display
+ * @var $value
+ * @var $checkconditionFunction
+ */
+?>
+<script type="text/javascript">
+    <!--
+        function showhideother(name, value)
+        {
+            var hiddenothername='othertext'+name;
+            if (value == "-oth-")
+            {
+                document.getElementById(hiddenothername).style.display='';
+                document.getElementById(hiddenothername).focus();
+            }
+            else
+            {
+                document.getElementById(hiddenothername).style.display='none';
+                document.getElementById(hiddenothername).value=''  // reset othercomment fiel
+            }
+        }
+    -->
+</script>
+
+<input
+    class="form-control"
+    type="text"
+    id="othertext<?php echo $name; ?>"
+    name="<?php echo $name; ?>other"
+    style='<?php echo $display; ?>'
+    value='<?php echo $value?>'
+    alt='<?php eT('Other answer'); ?>'
+    onchange='<?php echo $checkconditionFunction;?>(this.value, this.name, this.type);'
+/>

From 9f9ceac23427e94e0a296139150b61080239497b Mon Sep 17 00:00:00 2001
From: LouisGac <louis.gac@limesurvey.org>
Date: Mon, 21 Mar 2016 12:22:44 +0100
Subject: [PATCH 2/4] Dev: input type "columns" for question attribute
 "display_columns"

---
 application/helpers/common_helper.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
index 3782ff288c5..8f28c0218f9 100644
--- a/application/helpers/common_helper.php
+++ b/application/helpers/common_helper.php
@@ -2781,7 +2781,8 @@ function questionAttributes($returnByName=false)
         "types"=>"LM",
         'category'=>gT('Display'),
         'sortorder'=>100,
-        'inputtype'=>'integer',
+        //'inputtype'=>'integer',
+        'inputtype'=>'columns',
         'default'=>'1',
         'min'=>'1',
         'max'=>'100',

From 178fb70459f81c61db3ed2063e82fe0fa8f4f5f2 Mon Sep 17 00:00:00 2001
From: LouisGac <louis.gac@limesurvey.org>
Date: Tue, 22 Mar 2016 12:29:56 +0100
Subject: [PATCH 3/4] Dev: quanda cleaning, and views for array 5point question
 type

---
 application/helpers/common_helper.php         |  14 +-
 application/helpers/qanda_helper.php          | 256 +++++++-----------
 .../survey/questions/arrays/5point/close_row  |   0
 .../questions/arrays/5point/close_row.php     |   1 +
 .../questions/arrays/5point/close_table.php   |   3 +
 .../arrays/5point/close_table_head.php        |   3 +
 .../survey/questions/arrays/5point/col.php    |   9 +
 .../survey/questions/arrays/5point/header.php |  12 +
 .../arrays/5point/open_table_head.php         |   9 +
 .../questions/arrays/5point/table_headers     |   4 +
 .../questions/arrays/5point/table_headers.php |  11 +
 .../questions/arrays/5point/td_answertext.php |   9 +
 .../questions/arrays/5point/td_input.php      |  22 ++
 .../questions/arrays/5point/tr_open.php       |  19 ++
 .../views/survey/questions/arrays/header.php  |  14 -
 .../survey/questions/listradio/item_row.php   |   4 -
 .../multiplechoice/item_other_row.php         |   4 -
 .../questions/multiplechoice/item_row.php     |   4 -
 .../views/survey/questions/ranking/script.php |  25 ++
 templates/default/css/template.css            |  13 +-
 20 files changed, 245 insertions(+), 191 deletions(-)
 create mode 100644 application/views/survey/questions/arrays/5point/close_row
 create mode 100644 application/views/survey/questions/arrays/5point/close_row.php
 create mode 100644 application/views/survey/questions/arrays/5point/close_table.php
 create mode 100644 application/views/survey/questions/arrays/5point/close_table_head.php
 create mode 100644 application/views/survey/questions/arrays/5point/col.php
 create mode 100644 application/views/survey/questions/arrays/5point/header.php
 create mode 100644 application/views/survey/questions/arrays/5point/open_table_head.php
 create mode 100644 application/views/survey/questions/arrays/5point/table_headers
 create mode 100644 application/views/survey/questions/arrays/5point/table_headers.php
 create mode 100644 application/views/survey/questions/arrays/5point/td_answertext.php
 create mode 100644 application/views/survey/questions/arrays/5point/td_input.php
 create mode 100644 application/views/survey/questions/arrays/5point/tr_open.php
 delete mode 100644 application/views/survey/questions/arrays/header.php
 create mode 100644 application/views/survey/questions/ranking/script.php

diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
index 8f28c0218f9..6a158054fac 100644
--- a/application/helpers/common_helper.php
+++ b/application/helpers/common_helper.php
@@ -2783,9 +2783,9 @@ function questionAttributes($returnByName=false)
         'sortorder'=>100,
         //'inputtype'=>'integer',
         'inputtype'=>'columns',
-        'default'=>'1',
+        'default'=>'6',
         'min'=>'1',
-        'max'=>'100',
+        'max'=>'12',
         "help"=>gT('The answer options will be distributed across the number of columns set here'),
         "caption"=>gT('Display columns'));
 
@@ -3583,9 +3583,13 @@ function questionAttributes($returnByName=false)
         "types"=>"KNSTUQ;",
         'category'=>gT('Display'),
         'sortorder'=>100,
-        'inputtype'=>'text',
-        "help"=>gT('Width of text input box'),
-        "caption"=>gT('Input box width'));
+        //'inputtype'=>'text',
+        'inputtype'=>'columns',
+        'default'=>'6',
+        'min'=>'1',
+        'max'=>'12',
+        "help"=>gT('Number of Bootstrap columns for the input box'),
+        "caption"=>gT('Input box columns'));
 
         $qattributes["text_input_columns"]=array(
         "types"=>"Q",
diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
index 64335421318..0a394204353 100644
--- a/application/helpers/qanda_helper.php
+++ b/application/helpers/qanda_helper.php
@@ -1471,21 +1471,9 @@ function do_list_radio($ia)
     $anscount = ($other == 'Y') ? $anscount+1 : $anscount; //COUNT OTHER AS AN ANSWER FOR MANDATORY CHECKING!
     $anscount = ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1)  ? $anscount+1 : $anscount; //Count up if "No answer" is showing
 
-    //// Label and input width
-    // TODO : use a question attribute var
-
-    // label
-    $nbColLabelXs = 10;
-    $nbColLabelLg = 10;
-
-    // Inputs
-    $nbColInputXs = 1;
-    $nbColInputLg = 1;
-
     //// Columns containing answer rows, set by user in question attribute
     /// TODO : move to a dedicated function
 
-
     // setting variables
     $iMaxRowsByColumn = 0; // How many answer rows by column
     $iRowCount = 0;
@@ -1502,7 +1490,6 @@ function do_list_radio($ia)
         // Then, we calculate how many answer rows in each column
         $iMaxRowsByColumn = ceil($anscount / $iNbCols);
         $first = true; // The very first item will open a bootstrap row containing the columns
-
     }
 
     $answer = Yii::app()->getController()->renderPartial('/survey/questions/listradio/listradio_header', array(), true);
@@ -1554,10 +1541,6 @@ function do_list_radio($ia)
             'sDisplayStyle' => $sDisplayStyle,
             'ia'=>$ia,
             'ansrow'=>$ansrow,
-            'nbColLabelXs'=>$nbColLabelXs,
-            'nbColLabelLg'=>$nbColLabelLg,
-            'nbColInputLg'=>$nbColInputLg,
-            'nbColInputXs'=>$nbColInputXs,
             'checkedState'=>$checkedState,
             'myfname'=>$myfname,
         );
@@ -1621,8 +1604,6 @@ function do_list_radio($ia)
             $answer_other = ' value=""';
         }
 
-        //list($htmltbody2, $hiddenfield)=return_array_filter_strings($ia, $aQuestionAttributes, $thissurvey, array("code"=>"other"), $thisfieldname, $trbc, $myfname, "div", "form-group answer-item radio-item other-item other");
-
         ////
         // Open Column
         // The column is opened if user set more than one column in question attribute
@@ -1632,7 +1613,6 @@ function do_list_radio($ia)
         {
             $answer .= Yii::app()->getController()->renderPartial('/survey/questions/listradio/item_column_header', array('iColumnWidth' => $iColumnWidth, 'first'=>false), true);
         }
-
         $sDisplayStyle = return_display_style($ia, $aQuestionAttributes, $thissurvey, $myfname);
 
         ////
@@ -1643,11 +1623,7 @@ function do_list_radio($ia)
             'answer_other'=>$answer_other,
             'myfname'=>$myfname,
             'sDisplayStyle' => $sDisplayStyle,
-            'nbColLabelXs'=>$nbColLabelXs,
-            'nbColLabelLg'=>$nbColLabelLg,
             'othertext'=>$othertext,
-            'nbColInputLg'=>$nbColInputLg,
-            'nbColInputXs'=>$nbColInputXs,
             'checkedState'=>$checkedState,
             'kpclass'=>$kpclass,
             'oth_checkconditionFunction'=>$oth_checkconditionFunction.'(this.value, this.name, this.type)',
@@ -1803,12 +1779,7 @@ function do_listwithcomment($ia)
         }
 
         $fname2 = $ia[1].'comment';
-        if ($anscount > 8) {$tarows = $anscount/1.2;} else {$tarows = 4;}
-        // --> START NEW FEATURE - SAVE
-        //    --> START ORIGINAL
-        //        $answer .= "\t<td valign='top'>\n"
-        //                 . "<textarea class='textarea' name='$ia[1]comment' id='answer$ia[1]comment' rows='$tarows' cols='30'>";
-        //    --> END ORIGINAL
+        $tarows = ($anscount > 8)?$anscount/1.2:4;
 
         $footerData = array(
             'id'=>'answer'.$ia[1].'comment',
@@ -1910,19 +1881,21 @@ function do_ranking($ia)
     // inputnames, answer, among others
     global $thissurvey;
     $imageurl = Yii::app()->getConfig("imageurl");
-
     $checkconditionFunction = "checkconditions";
-
     $aQuestionAttributes = QuestionAttribute::model()->getQuestionAttributes($ia[0]);
+
     if ($aQuestionAttributes['random_order']==1)
     {
         $ansquery = "SELECT * FROM {{answers}} WHERE qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' and scale_id=0 ORDER BY ".dbRandom();
-    } else
+    }
+    else
     {
         $ansquery = "SELECT * FROM {{answers}} WHERE qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' and scale_id=0 ORDER BY sortorder, answer";
     }
-    $ansresult = Yii::app()->db->createCommand($ansquery)->query()->readAll();   //Checked
+
+    $ansresult = Yii::app()->db->createCommand($ansquery)->query()->readAll();
     $anscount= count($ansresult);
+
     if (trim($aQuestionAttributes["max_answers"])!='')
     {
         $max_answers=trim($aQuestionAttributes["max_answers"]);
@@ -1942,7 +1915,8 @@ function do_ranking($ia)
     if (trim($aQuestionAttributes["min_answers"])!='')
     {
         $min_answers=trim($aQuestionAttributes["min_answers"]);
-    } else {
+    } else
+    {
         $min_answers=0;
     }
     $answer = '';
@@ -2054,16 +2028,16 @@ function do_ranking($ia)
     // hide_tip is managed by css with EM
     $rank_help = gT("Double-click or drag-and-drop items in the left list to move them to the right - your highest ranking item should be on the top right, moving through to your lowest ranking item.",'js');
 
-    $answer .= "<script type='text/javascript'>\n"
-    . "  <!--\n"
-    . "var aRankingTranslations = {
-             choicetitle: '{$choice_title}',
-             ranktitle: '{$rank_title}',
-             rankhelp: '{$rank_help}'
-            };\n"
-    ." doDragDropRank({$ia[0]},{$aQuestionAttributes["showpopups"]},{$aQuestionAttributes["samechoiceheight"]},{$aQuestionAttributes["samelistheight"]});\n"
-    ." -->\n"
-    ."</script>\n";
+    $aData = array();
+    $aData['qid']=$ia[0];
+    $aData['choice_title']=$choice_title;
+    $aData['rank_title']=$rank_title;
+    $aData['rank_help']=$rank_help;
+    $aData['showpopups']=$aQuestionAttributes["showpopups"];
+    $aData['samechoiceheight']=$aQuestionAttributes["samechoiceheight"];
+    $aData['samelistheight']=$aQuestionAttributes["samelistheight"];
+
+    $answer .= Yii::app()->getController()->renderPartial('/survey/questions/ranking/script', $aData, true);
     return array($answer, $inputnames);
 }
 
@@ -2121,20 +2095,11 @@ function do_multiplechoice($ia)
     $anscount = count($ansresult);
     $anscount = ($other == 'Y') ? $anscount+1 : $anscount; //COUNT OTHER AS AN ANSWER FOR MANDATORY CHECKING!
 
-    //// Label and input width
-    // TODO : use a question attribute var
-
-    // label
-    $nbColLabelXs = 10;
-    $nbColLabelLg = 10;
-
-    // Inputs
-    $nbColInputXs = 1;
-    $nbColInputLg = 1;
-
     //// Columns containing answer rows, set by user in question attribute
     /// TODO : move to a dedicated function
 
+    /// IKIKIKI
+
 
     // setting variables
     $iMaxRowsByColumn = 0; // How many answer rows by column
@@ -2215,10 +2180,6 @@ function do_multiplechoice($ia)
             'sDisplayStyle' => $sDisplayStyle,
             'ia'=>$ia,
             'ansrow'=>$ansrow,
-            'nbColLabelXs'=>$nbColLabelXs,
-            'nbColLabelLg'=>$nbColLabelLg,
-            'nbColInputLg'=>$nbColInputLg,
-            'nbColInputXs'=>$nbColInputXs,
             'checkedState'=>$checkedState,
             'sCheckconditionFunction' => $sCheckconditionFunction,
             'myfname'=>$myfname,
@@ -2236,7 +2197,6 @@ function do_multiplechoice($ia)
         if($iNbCols > 1 && $iRowCount == $iMaxRowsByColumn )
         {
             $last = ($i == $anscount)?true:false; // If this loop count equal to the number of answers, then this answer is the last one.
-
             $answer .= Yii::app()->getController()->renderPartial('/survey/questions/multiplechoice/item_column_footer', array('last'=>$last), true);
             $iRowCount = 0;
             $isOpen = false;
@@ -2248,14 +2208,6 @@ function do_multiplechoice($ia)
         $iRowCount++;
         $myfname = $ia[1].'other';
 
-        /////
-        // infos : many parameters of the function return_array_filter_strings are just not used at all in its code.
-        // This is the case of '$ansrow' (here : array("code"=>"other"))
-        // So the value of $htmltbody2, $hiddenfield would be the exact same than before. No need for a second call.
-        // By the way, this function is now replaced by return_display_style($ia, $aQuestionAttributes, $thissurvey, $myfname);
-
-        //list($htmltbody2, $hiddenfield)=return_array_filter_strings($ia, $aQuestionAttributes, $thissurvey, array("code"=>"other"), $myfname, $trbc, $myfname, "li","responsive-content question-item answer-item checkbox-item other-item ");
-
         $checkedState = '';
         // othercbox can be not display, because only input text goes to database
         if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) && trim($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname])!='')
@@ -2305,11 +2257,7 @@ function do_multiplechoice($ia)
         $aData = array(
             'myfname'=>$myfname,
             'sDisplayStyle' => $sDisplayStyle,
-            'nbColLabelXs'=>$nbColLabelXs,
-            'nbColLabelLg'=>$nbColLabelLg,
             'othertext'=>$othertext,
-            'nbColInputLg'=>$nbColInputLg,
-            'nbColInputXs'=>$nbColInputXs,
             'checkedState'=>$checkedState,
             'kpclass'=>$kpclass,
             'sValue'=>$sValue,
@@ -2427,15 +2375,6 @@ function do_multiplechoice_withcomments($ia)
     }
 
     $nbCol = $longest_question;
-    $nbColLabelLg = ($nbCol > 11)?11:$nbCol;
-    $nbColInputLg = 11 - $nbColLabelLg;
-    $nbColInputLg = ($nbColInputLg < 1)?11:$nbColInputLg;
-
-    $nbColLabelXs = $nbColLabelLg + 5;
-    $nbColLabelXs = ($nbColLabelXs > 11)?11:$nbColLabelXs;
-    //$nbColInputXs = 11 - $nbColLabelXs;
-    //$nbColInputXs = ($nbColInputXs < 1)?11:$nbColInputXs;
-    $nbColInputXs = 12;
 
     foreach ($toIterate as $ansrow)
     {
@@ -2550,7 +2489,6 @@ function do_multiplechoice_withcomments($ia)
     }
 
     $answer_main .= Yii::app()->getController()->renderPartial('/survey/questions/multiplechoice_with_comments/footer', array(), true);
-
     $answer = $answer_main;
 
     if($aQuestionAttributes['commented_checkbox']!="allways" && $aQuestionAttributes['commented_checkbox_auto'])
@@ -3787,7 +3725,6 @@ function do_yesno($ia)
 {
     $checkconditionFunction = "checkconditions";
 
-
     $yChecked = $nChecked = $naChecked = '';
     if ($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]] == 'Y')
     {
@@ -3925,7 +3862,6 @@ function do_array_5point($ia)
     } else {
         $right_exists=false;
     }
-    // $right_exists is a flag to find out if there are any right hand answer parts. If there arent we can leave out the right td column
 
 
     if ($aQuestionAttributes['random_order']==1) {
@@ -3942,132 +3878,146 @@ function do_array_5point($ia)
 
     $fn = 1;
 
-
-
     $headerDatas = array(
         'extraclass'=>$extraclass,
-        'caption'=>$caption,
-        'answerwidth'=>$answerwidth,
     );
-    $answer = '<div class="no-more-tables no-more-tables-5-point">';
-    $answer .= Yii::app()->getController()->renderPartial('/survey/questions/arrays/header', $headerDatas, true);
+    //$answer = '<div class="no-more-tables no-more-tables-5-point">';
+    $answer = Yii::app()->getController()->renderPartial('/survey/questions/arrays/5point/header', $headerDatas, true);
 
     $odd_even = '';
 
     for ($xc=1; $xc<=5; $xc++)
     {
         $odd_even = alternation($odd_even);
-        //$answer .= "<col class=\"$odd_even\" width=\"$cellwidth%\" />\n";
-        // width obsolete
-        $answer .= "<col class=\"$odd_even\" style='width: $cellwidth%;' />\n";
+        //$answer .= "<col class=\"$odd_even\" style='width: $cellwidth%;' />\n";
+        $answer .= Yii::app()->getController()->renderPartial('/survey/questions/arrays/5point/col', array('odd_even'=>$odd_even,'cellwidth'=>$cellwidth), true);
     }
     if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory
     {
         $odd_even = alternation($odd_even);
-        //$answer .= "<col class=\"col-no-answer $odd_even\" width=\"$cellwidth%\" />\n";
-        // width obsolete
-        $answer .= "<col class=\"col-no-answer $odd_even\" style='width: $cellwidth%;' />\n";
+        //$answer .= "<col class=\"col-no-answer $odd_even\" style='width: $cellwidth%;' />\n";
+        $answer .= Yii::app()->getController()->renderPartial('/survey/questions/arrays/5point/col', array('odd_even'=>$odd_even,'cellwidth'=>$cellwidth), true);
     }
-    $answer .= "\t</colgroup>\n\n"
-    . "\t<thead>\n<tr class=\"array1 dontread\">\n"
-    . "\t<th>&nbsp;</th>\n";
+
+    $answer .= Yii::app()->getController()->renderPartial('/survey/questions/arrays/5point/open_table_head', array(), true);
+
+
     for ($xc=1; $xc<=5; $xc++)
     {
-        $answer .= "\t<th class='th-1'>$xc</th>\n";
+        $answer .= Yii::app()->getController()->renderPartial('/survey/questions/arrays/5point/table_headers', array(
+            'class'=>'th-1',
+            'style'=>'',
+            'th_content'=>$xc,
+        ), true);
+        //$answer .= "\t<th class='th-1'>$xc</th>\n";
     }
+
     if ($right_exists)
     {
-        //$answer .= "\t<td width='$answerwidth%'>&nbsp;</td>\n";
-        $answer .= "\t<td style='width: $answerwidth%;'>&nbsp;</td>\n";
+        $answer .= Yii::app()->getController()->renderPartial('/survey/questions/arrays/5point/table_headers', array(
+            'class'=>'',
+            'style'=>'width: '.$answerwidth.'%;',
+            'th_content'=>'&nbsp;',
+        ), true);
     }
     if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory
     {
-        $answer .= "\t<th class='th-2'>".gT('No answer')."</th>\n";
+        $answer .= Yii::app()->getController()->renderPartial('/survey/questions/arrays/5point/table_headers', array(
+            'class'=>'th-2',
+            'style'=>'',
+            'th_content'=>gT('No answer'),
+        ), true);
     }
-    $answer .= "</tr></thead>\n";
+    $answer .= Yii::app()->getController()->renderPartial('/survey/questions/arrays/5point/close_table_head', array(), true);
 
-    $answer_t_content = '<tbody>';
+
+    $answer_t_content = '';
     $trbc = '';
     $n=0;
-    //return array($answer, $inputnames);
+
     foreach ($aSubquestions as $ansrow)
     {
         $myfname = $ia[1].$ansrow['title'];
-
         $answertext = $ansrow['question'];
-        if (strpos($answertext,'|')) {$answertext=substr($answertext,0,strpos($answertext,'|'));}
-
-        /* Check if this item has not been answered */
-        if ($ia[6]=='Y' && in_array($myfname,$aMandatoryViolationSubQ))
+        if (strpos($answertext,'|'))
         {
-            // $answertext = "<span class=\"errormandatory\">{$answertext}</span>";
-            $answertext ='
-                        <div class="alert alert-danger" role="alert">'.
-                                $answertext
-                            .'
-                        </div>';
+            $answertext=substr($answertext,0,strpos($answertext,'|'));
         }
 
+        /* Check if this item has not been answered */
+        $error = ($ia[6]=='Y' && in_array($myfname,$aMandatoryViolationSubQ))?true:false;
         $trbc = alternation($trbc , 'row');
 
-        // Get array_filter stuff
-        list($htmltbody2, $hiddenfield)=return_array_filter_strings($ia, $aQuestionAttributes, $thissurvey, $ansrow, $myfname, $trbc, $myfname,"tr","$trbc answers-list radio-list");
+        /* Check for array_filter  */
+        $sDisplayStyle = return_display_style($ia, $aQuestionAttributes, $thissurvey, $myfname);
+
+        // Value
+        $value = (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname])) ? $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] : '';
+
+        $answer_t_content .= Yii::app()->getController()->renderPartial('/survey/questions/arrays/5point/tr_open', array(
+                    'myfname'=>$myfname,
+                    'answerwidth'=>$answerwidth,
+                    'answertext'=>$answertext,
+                    'value'=>$value,
+                    'error'=>$error,
+                    'sDisplayStyle'=>$sDisplayStyle
+                ), true);
 
-        $answer_t_content .= $htmltbody2
-        //. "\t<th class=\"answertext\" width=\"$answerwidth%\">\n$answertext\n"
-        . "\t<th class=\"answertext\" style='width: $answerwidth%;'>\n$answertext\n"
-        . $hiddenfield
-        . "<input type=\"hidden\" name=\"java$myfname\" id=\"java$myfname\" value=\"";
-        if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]))
-        {
-            $answer_t_content .= $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname];
-        }
-        $answer_t_content .= "\" />\n\t</th>\n";
         for ($i=1; $i<=5; $i++)
         {
-            $answer_t_content .= "\t<td data-title='$i' class=\"answer-cell-1 answer_cell_00$i answer-item radio-item\">\n"
-            ."\n\t<label for=\"answer$myfname-$i\"><input class=\"radio\" type=\"radio\" name=\"$myfname\" id=\"answer$myfname-$i\" value=\"$i\"";
-            if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) && $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] == $i)
-            {
-                $answer_t_content .= CHECKED;
-            }
-            $answer_t_content .= " onclick=\"$checkconditionFunction(this.value, this.name, this.type)\" />"
-            //. "<label class=\"hide read\" for=\"answer$myfname-$i\">{$i}</label>\n"
-            . "</label>\n</td>\n";
+            $CHECKED = (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) && $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] == $i)?'CHECKED':'';
+            $answer_t_content .= Yii::app()->getController()->renderPartial('/survey/questions/arrays/5point/td_input', array(
+                'i'=>$i,
+                'myfname'=>$myfname,
+                'CHECKED'=>$CHECKED,
+                'checkconditionFunction'=>$checkconditionFunction,
+                'value'=>$i,
+            ), true);
         }
 
         $answertext2 = $ansrow['question'];
         if (strpos($answertext2,'|'))
         {
             $answertext2=substr($answertext2,strpos($answertext2,'|')+1);
-            //$answer_t_content .= "\t<td class=\"answertextright\" style='text-align:left;' width=\"$answerwidth%\">$answertext2</td>\n";
-            $answer_t_content .= "\t<td class=\"answertextright\" style='text-align:left; width: $answerwidth%;' >$answertext2</td>\n";
+            //$answer_t_content .= "\t<td class=\"answertextright\" style='text-align:left; width: $answerwidth%;' >$answertext2</td>\n";
+            $answer_t_content .= Yii::app()->getController()->renderPartial('/survey/questions/arrays/5point/td_answertext', array(
+                'answerwidth'=>$answerwidth,
+                'answertext2'=>$answertext2,
+            ), true);
         }
         elseif ($right_exists)
         {
             //$answer_t_content .= "\t<td class=\"answertextright\" style='text-align:left;' width=\"$answerwidth%\">&nbsp;</td>\n";
-            $answer_t_content .= "\t<td class=\"answertextright\" style='text-align:left; width: $answerwidth%;' >&nbsp;</td>\n";
+            $answer_t_content .= Yii::app()->getController()->renderPartial('/survey/questions/arrays/5point/td_answertext', array(
+                'answerwidth'=>$answerwidth,
+                'answertext2'=>'&nbsp;',
+            ), true);
         }
 
         if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1)
         {
-            $answer_t_content .= "\t<td data-title='" . gT("No answer") . "' class=\"answer-item radio-item noanswer-item\">\n"
-            ."\n\t<label for=\"answer$myfname-\"><input class=\"radio\" type=\"radio\" name=\"$myfname\" id=\"answer$myfname-\" value=\"\" ";
-            if (!isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) || $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] == '')
-            {
-                $answer_t_content .= CHECKED;
-            }
-            $answer_t_content .= " onclick='$checkconditionFunction(this.value, this.name, this.type)'  />\n"
-            //."<label class=\"hide read\" for=\"answer$myfname-\">".gT('No answer')."</label>"
-            ."</label></td>\n";
+            $CHECKED = (!isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) || $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] == '')?'CHECKED':'';
+            $answer_t_content .= Yii::app()->getController()->renderPartial('/survey/questions/arrays/5point/td_input', array(
+                'i'=>gT("No answer"),
+                'myfname'=>$myfname,
+                'CHECKED'=>$CHECKED,
+                'checkconditionFunction'=>$checkconditionFunction,
+                'value'=>'',
+            ), true);
+
         }
 
-        $answer_t_content .= "</tr>\n";
+        //$answer_t_content .= "</tr>\n";
+        $answer_t_content .= Yii::app()->getController()->renderPartial('/survey/questions/arrays/5point/close_row', array(), true);
+
         $fn++;
         $inputnames[]=$myfname;
     }
 
-    $answer .= $answer_t_content . "\n</tbody>\t</table>\n</div>\n";
+    $answer .= $answer_t_content;
+     //$answer .  "\n</tbody>\t</table>\n</div>\n";
+    $answer .= Yii::app()->getController()->renderPartial('/survey/questions/arrays/5point/close_table', array(), true);
+
     return array($answer, $inputnames);
 }
 
diff --git a/application/views/survey/questions/arrays/5point/close_row b/application/views/survey/questions/arrays/5point/close_row
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/application/views/survey/questions/arrays/5point/close_row.php b/application/views/survey/questions/arrays/5point/close_row.php
new file mode 100644
index 00000000000..2301952637f
--- /dev/null
+++ b/application/views/survey/questions/arrays/5point/close_row.php
@@ -0,0 +1 @@
+</tr>
diff --git a/application/views/survey/questions/arrays/5point/close_table.php b/application/views/survey/questions/arrays/5point/close_table.php
new file mode 100644
index 00000000000..9d199b15a13
--- /dev/null
+++ b/application/views/survey/questions/arrays/5point/close_table.php
@@ -0,0 +1,3 @@
+        </tbody>
+    </table>
+</div>
diff --git a/application/views/survey/questions/arrays/5point/close_table_head.php b/application/views/survey/questions/arrays/5point/close_table_head.php
new file mode 100644
index 00000000000..d447dd4e98a
--- /dev/null
+++ b/application/views/survey/questions/arrays/5point/close_table_head.php
@@ -0,0 +1,3 @@
+    </tr>
+</thead>
+<tbody>
diff --git a/application/views/survey/questions/arrays/5point/col.php b/application/views/survey/questions/arrays/5point/col.php
new file mode 100644
index 00000000000..6810f878839
--- /dev/null
+++ b/application/views/survey/questions/arrays/5point/col.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Array 5pointchoice, column
+ *
+ * @var $odd_even
+ * @var $cellwidth
+ */
+?>
+<col class="<?php echo $odd_even; ?>" style='width: <?php echo $cellwidth; ?>%;' />
diff --git a/application/views/survey/questions/arrays/5point/header.php b/application/views/survey/questions/arrays/5point/header.php
new file mode 100644
index 00000000000..72a7a85850b
--- /dev/null
+++ b/application/views/survey/questions/arrays/5point/header.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * array 5 point choice Html : Header
+ * @var $extraclass
+ *
+ */
+?>
+<div class="no-more-tables no-more-tables-5-point">
+    <!-- Array 5 point choice -->
+    <table class="table question subquestion-list questions-list <?php echo $extraclass; ?>">
+        <colgroup class="col-responses">
+            <col class="col-answers" />
diff --git a/application/views/survey/questions/arrays/5point/open_table_head.php b/application/views/survey/questions/arrays/5point/open_table_head.php
new file mode 100644
index 00000000000..e27deef1f34
--- /dev/null
+++ b/application/views/survey/questions/arrays/5point/open_table_head.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ *
+ */
+?>
+</colgroup>
+<thead>
+    <tr class="array1 dontread">
+        <th>&nbsp;</th>
diff --git a/application/views/survey/questions/arrays/5point/table_headers b/application/views/survey/questions/arrays/5point/table_headers
new file mode 100644
index 00000000000..2e436b53360
--- /dev/null
+++ b/application/views/survey/questions/arrays/5point/table_headers
@@ -0,0 +1,4 @@
+
+<th class='<?php echo $class'>
+    <?php echo $th_content;?>
+</th>
diff --git a/application/views/survey/questions/arrays/5point/table_headers.php b/application/views/survey/questions/arrays/5point/table_headers.php
new file mode 100644
index 00000000000..4ec06026181
--- /dev/null
+++ b/application/views/survey/questions/arrays/5point/table_headers.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ *
+ * @var $class
+ * @var $style
+ * @var $th_content
+ */
+?>
+<th class='<?php echo $class; ?>' style=<?php echo $style; ?>>
+    <?php echo $th_content;?>
+</th>
diff --git a/application/views/survey/questions/arrays/5point/td_answertext.php b/application/views/survey/questions/arrays/5point/td_answertext.php
new file mode 100644
index 00000000000..56db690d0f2
--- /dev/null
+++ b/application/views/survey/questions/arrays/5point/td_answertext.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * @var $answerwidth
+ * @var $answertext2
+ */
+?>
+<td class="answertextright" style='text-align:left; width: <?php echo $answerwidth; ?>%;'>
+    <?php echo $answertext2;?>
+</td>
diff --git a/application/views/survey/questions/arrays/5point/td_input.php b/application/views/survey/questions/arrays/5point/td_input.php
new file mode 100644
index 00000000000..211ecde5711
--- /dev/null
+++ b/application/views/survey/questions/arrays/5point/td_input.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @var $i
+ * @var $myfname
+ * @var $CHECKED
+ * @var $checkconditionFunction
+ * @var $value
+ */
+?>
+<td data-title='<?php echo $i;?>' class="answer-cell-1 answer_cell_00<?php echo $i;?> answer-item radio-item">
+    <label for="answer<?php echo $myfname;?>-<?php echo $i; ?>">
+        <input
+            class="radio"
+            type="radio"
+            name="<?php echo $myfname; ?>"
+            id="answer<?php echo $myfname; ?>-<?php echo $i;?>"
+            value="<?php echo $value; ?>"
+            <?php echo $CHECKED;?>
+            onclick="<?php echo $checkconditionFunction; ?>(this.value, this.name, this.type)"
+         />
+    </label>
+</td>
diff --git a/application/views/survey/questions/arrays/5point/tr_open.php b/application/views/survey/questions/arrays/5point/tr_open.php
new file mode 100644
index 00000000000..0294186ae9c
--- /dev/null
+++ b/application/views/survey/questions/arrays/5point/tr_open.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @var $myfname
+ * @var $answerwidth
+ * @var $answertext
+ * @var $value
+ */
+?>
+<tr id="javatbd<?php echo $myfname;?>" class="well answers-list radio-list"  <?php echo $sDisplayStyle; ?>>
+    <th class="answertext" style="width: <?php echo $answerwidth;?>%;">
+        <?php if($error): ?>
+            <div class="alert alert-danger" role="alert">
+                <?php echo $answertext;?>
+            </div>
+        <?php else: ?>
+            <?php echo $answertext;?>
+        <?php endif;?>
+        <input name="java<?php echo $myfname;?>" id="java<?php echo $myfname;?>" value="<?php echo $value;?>" type="hidden">
+    </th>
diff --git a/application/views/survey/questions/arrays/header.php b/application/views/survey/questions/arrays/header.php
deleted file mode 100644
index 3b320dd2ae8..00000000000
--- a/application/views/survey/questions/arrays/header.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * array 5 point choice Html : Header
- * @var $extraclass
- * @var $caption
- * @var $answerwidth
- *
- * TODO : replace  summary="<?php echo $caption; ?>" by valid HTML
- */
-?>
-<!-- Array 5 point choice -->
-<table class="table question subquestion-list questions-list <?php echo $extraclass; ?>">
-    <colgroup class="col-responses">
-        <col class="col-answers" />
diff --git a/application/views/survey/questions/listradio/item_row.php b/application/views/survey/questions/listradio/item_row.php
index 44a6b86933d..0af0504edbb 100644
--- a/application/views/survey/questions/listradio/item_row.php
+++ b/application/views/survey/questions/listradio/item_row.php
@@ -4,10 +4,6 @@
  *
  * @var $ia
  * @var $ansrow
- * @var $nbColLabelXs
- * @var $nbColLabelLg
- * @var $nbColInputLg
- * @var $nbColInputXs
  * @var $checkedState
  * @var $myfname
  */
diff --git a/application/views/survey/questions/multiplechoice/item_other_row.php b/application/views/survey/questions/multiplechoice/item_other_row.php
index 1fff7f4e4f5..ec18292739c 100644
--- a/application/views/survey/questions/multiplechoice/item_other_row.php
+++ b/application/views/survey/questions/multiplechoice/item_other_row.php
@@ -6,11 +6,7 @@
  * @var $sDisable
  * @var $sDisplayStyle
  * @var $myfname
- * @var $nbColLabelXs
- * @var $nbColLabelLg
  * @var $othertext
- * @var $nbColInputLg
- * @var $nbColInputXs
  * @var $checkedState
  * @var $kpclass
  * @var $sValue
diff --git a/application/views/survey/questions/multiplechoice/item_row.php b/application/views/survey/questions/multiplechoice/item_row.php
index c13dc6f32fe..c16f3c5e495 100644
--- a/application/views/survey/questions/multiplechoice/item_row.php
+++ b/application/views/survey/questions/multiplechoice/item_row.php
@@ -5,10 +5,6 @@
  * @var $hiddenfield
  * @var $ia
  * @var $ansrow
- * @var $nbColLabelXs
- * @var $nbColLabelLg
- * @var $nbColInputLg
- * @var $nbColInputXs
  * @var $checkedState
  * @var $sCheckconditionFunction
  * @var $myfname
diff --git a/application/views/survey/questions/ranking/script.php b/application/views/survey/questions/ranking/script.php
new file mode 100644
index 00000000000..fb4ac2c5076
--- /dev/null
+++ b/application/views/survey/questions/ranking/script.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * JavaScript snippet for ranking question
+ * TODO: create a js file, and move variable to data- HTML5 element in the HTML view.
+ *
+ * @var $qid                            $ia[0]
+ * @var $choice_title
+ * @var $rank_title
+ * @var $rank_help
+ * @var $showpopups                     $aQuestionAttributes["showpopups"]
+ * @var $samechoiceheight               $aQuestionAttributes["samechoiceheight"]
+ * @var $samelistheight                 $aQuestionAttributes["samelistheight"]
+ */
+?>
+<script type='text/javascript'>
+    <!--
+    var aRankingTranslations = {
+         choicetitle: '<?php echo $choice_title;?>',
+         ranktitle: '<?php echo $rank_title;?>',
+         rankhelp: '<?php echo $rank_help;?>'
+        };
+
+    doDragDropRank(<?php echo $qid; ?>, <?php echo $showpopups;?>,<?php echo $samechoiceheight;?>,<?php echo $samelistheight;?>);
+    -->
+</script>
diff --git a/templates/default/css/template.css b/templates/default/css/template.css
index ff4dcbb56d2..b4edd6ba800 100644
--- a/templates/default/css/template.css
+++ b/templates/default/css/template.css
@@ -449,7 +449,6 @@ input[type="radio"],
 .radio input[type="radio"],
 .radio-inline input[type="radio"] {
   position: relative;
-  margin-top: 6px;
   margin-right: 4px;
   vertical-align: top;
   border: none;
@@ -826,20 +825,20 @@ table {
     }
 
     .no-more-tables tr,
-    .array-by-columns-div .radio-list { 
-        border: 1px solid #ccc; 
+    .array-by-columns-div .radio-list {
+        border: 1px solid #ccc;
         padding: 1em;
     }
 
     /* Line header ; color is h4 color */
     .no-more-tables tr th,
-    .array-by-columns-div .answertext { 
-        font-size: 1.1em; 
-        text-align: center; 
+    .array-by-columns-div .answertext {
+        font-size: 1.1em;
+        text-align: center;
         color: #317eac;
     }
 
-    .array-by-columns-div .answertext { 
+    .array-by-columns-div .answertext {
         padding: 8px;
         text-align: left;
         font-weight: bold;

From e00444409209377214b2f74afcda00b8fa378ccf Mon Sep 17 00:00:00 2001
From: Denis Chenu <denis@sondages.pro>
Date: Tue, 22 Mar 2016 16:39:45 +0100
Subject: [PATCH 4/4] fixed issue #10809: I cant open a survey in Arabic
 Language Dev: rtl css need XML object too

---
 application/helpers/replacements_helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/helpers/replacements_helper.php b/application/helpers/replacements_helper.php
index b8d880ef15f..937594f248a 100644
--- a/application/helpers/replacements_helper.php
+++ b/application/helpers/replacements_helper.php
@@ -176,7 +176,7 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de
         /* RTL CSS */
         if (getLanguageRTL(App()->language))
         {
-            $aCssFiles = (array) $oTemplate->config->files->rtl->css->filename;
+            $aCssFiles = $oTemplate->config->files->rtl->css->filename;
             if(!YII_DEBUG)
             {
                 foreach($aCssFiles as $sCssFile)