From 6028bfc51a269a72c8da8d710c9eb154e4dcbfb9 Mon Sep 17 00:00:00 2001
From: LouisGac <louis.gac@limesurvey.org>
Date: Fri, 20 Jan 2017 11:28:24 +0100
Subject: [PATCH] Dev: removed raw filters

---
 application/core/LSETwigViewRenderer.php               |  3 ++-
 templates/default/views/question.twig                  | 10 +++++-----
 templates/default/views/subviews/LEMDebug.twig         |  4 ++--
 templates/default/views/subviews/language_changer.twig |  2 --
 templates/default/views/subviews/nav_bar.twig          |  2 +-
 .../subviews/navigation/language_changer_top_menu.twig |  1 -
 .../views/subviews/navigation/question_index_menu.twig |  4 ++--
 templates/default/views/subviews/start_form.twig       |  1 -
 8 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/application/core/LSETwigViewRenderer.php b/application/core/LSETwigViewRenderer.php
index 9a2944da213..a5f88d2ad00 100644
--- a/application/core/LSETwigViewRenderer.php
+++ b/application/core/LSETwigViewRenderer.php
@@ -47,7 +47,8 @@ public function addExtensions($extensions)
                 $sandbox    = new Twig_Extension_Sandbox($policy, true);
 
                 $this->_twig->addExtension($sandbox);
-            }else{
+            }
+            else{
                 $this->_twig->addExtension(new $extName());
             }
         }
diff --git a/templates/default/views/question.twig b/templates/default/views/question.twig
index 3959ea9c6fe..fbc17f8248b 100644
--- a/templates/default/views/question.twig
+++ b/templates/default/views/question.twig
@@ -39,22 +39,22 @@
 
     <!-- LimeSurvey valid message and help -->
     <div class="question-valid-container bg-primary text-info col-xs-12">
-        {{ aQuestion.valid_message      | raw }}
-        {{ aQuestion.man_message        | raw }}
-        {{ aQuestion.file_valid_message | raw }}
+        {{ aQuestion.valid_message      }}
+        {{ aQuestion.man_message        }}
+        {{ aQuestion.file_valid_message }}
     </div>
 
     <!-- Answer -->
     <div class="answer-container  col-xs-12">
         {# NOTE: If you want to customize the question rendering, use a question template #}
-        {{ aQuestion.answer |  raw }}
+        {{ aQuestion.answer }}
     </div>
 
     <!-- Survey question help -->
     <div class="question-help-container text-info col-xs-12">
         {% if aQuestion.help.show %}
             <div class="ls-questionhelp">
-                {{ aQuestion.help.txt | raw }}
+                {{ aQuestion.help.txt  }}
             </div>
         {% endif %}
     </div>
diff --git a/templates/default/views/subviews/LEMDebug.twig b/templates/default/views/subviews/LEMDebug.twig
index 710073d19c4..7c0ba3b87eb 100644
--- a/templates/default/views/subviews/LEMDebug.twig
+++ b/templates/default/views/subviews/LEMDebug.twig
@@ -1,6 +1,6 @@
 {# Data shown when LEM debug timing mode is ON #}
 {% if aSurveyInfo.aLEM.debugtimming.show %}
-    {{ aSurveyInfo.aLEM.debugtimming.script | raw }}
+    {{ aSurveyInfo.aLEM.debugtimming.script }}
 {% endif %}
 
 {# Data shown when LEM debug validation mode is ON #}
@@ -9,7 +9,7 @@
         <tr>
             <td align='left'>
                 <b>Group/Question Validation Results:</b>
-                {{ aSurveyInfo.aLEM.debugvalidation.message | raw }}
+                {{ aSurveyInfo.aLEM.debugvalidation.message }}
             </td>
         </tr>
     </table>
diff --git a/templates/default/views/subviews/language_changer.twig b/templates/default/views/subviews/language_changer.twig
index 5777813be68..65bcdcbfc82 100644
--- a/templates/default/views/subviews/language_changer.twig
+++ b/templates/default/views/subviews/language_changer.twig
@@ -30,7 +30,6 @@
                         aLCD.aListLang,
                         htmlOptions
                     )
-                    | raw
                 }}
 
             </label>
@@ -50,7 +49,6 @@
                         ("Change the language" | gT ),
                         htmlOptions
                         )
-                        | raw
                     }}
                 {% endif %}
         </div>
diff --git a/templates/default/views/subviews/nav_bar.twig b/templates/default/views/subviews/nav_bar.twig
index 1d125967e4a..7c972e7629b 100644
--- a/templates/default/views/subviews/nav_bar.twig
+++ b/templates/default/views/subviews/nav_bar.twig
@@ -24,7 +24,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
         </button>
-        <div class="navbar-brand" >{{ aSurveyInfo.name | raw }}</div>
+        <div class="navbar-brand" >{{ aSurveyInfo.name }}</div>
     </div>
     <div id="navbar" class="collapse navbar-collapse">
         <ul class="nav navbar-nav navbar-right navbar-action-link">
diff --git a/templates/default/views/subviews/navigation/language_changer_top_menu.twig b/templates/default/views/subviews/navigation/language_changer_top_menu.twig
index bb4cfe13e0c..62d57304f40 100644
--- a/templates/default/views/subviews/navigation/language_changer_top_menu.twig
+++ b/templates/default/views/subviews/navigation/language_changer_top_menu.twig
@@ -68,7 +68,6 @@
         ("Change the language" | gT ),
         aButtonhtmlOptions
         )
-        | raw
     }}
 
 {% endif %}
diff --git a/templates/default/views/subviews/navigation/question_index_menu.twig b/templates/default/views/subviews/navigation/question_index_menu.twig
index d8aeeb3a1ba..f0b177d9e59 100644
--- a/templates/default/views/subviews/navigation/question_index_menu.twig
+++ b/templates/default/views/subviews/navigation/question_index_menu.twig
@@ -72,7 +72,7 @@
                 {# TODO: move back this logic to SurveyRuntime, and provide a ready to use indexItem.statusClass #}
                 <li>
                     <div class="dropdown-header">
-                        {{ flatEllipsizeText(group.text, true, 30, " &hellip; ", 0.6 ) | raw }}
+                        {{ flatEllipsizeText(group.text, true, 30, " &hellip; ", 0.6 ) }}
                         <span class="caret"></span>
                     </div>
                     <ul class="dropdown-menu dropdown-sub-menu">
@@ -89,7 +89,7 @@
                             {% endif %}
                             <li class="{{ indexItem.coreClass }} {{statusClass}}">
                                 <a href='{{ indexItem.url }}' data-limesurvey-submit='{{ indexItem.submit }}'>
-                                    {{ flatEllipsizeText(indexItem.text, true, 30, " &hellip; ", 0.6 ) | raw }}
+                                    {{ flatEllipsizeText(indexItem.text, true, 30, " &hellip; ", 0.6 ) }}
                                 </a>
                             </li>
                         {% endfor %}
diff --git a/templates/default/views/subviews/start_form.twig b/templates/default/views/subviews/start_form.twig
index 2cfe6f50bd3..7ba89b5fe87 100644
--- a/templates/default/views/subviews/start_form.twig
+++ b/templates/default/views/subviews/start_form.twig
@@ -36,7 +36,6 @@
         'post',
         (htmlOptions)
     )
-    | raw
 }}
 
 <input type='hidden' name='fieldnames' value='{{ aSurveyInfo.hiddenfieldnames }}' id='fieldnames' />