e('js') to escape('js')

Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
author: Kamil Tekiela <tekiela246@gmail.com> 2022-10-15 22:07:42 +0300
committer: Kamil Tekiela <tekiela246@gmail.com> 2022-10-17 23:31:08 +0300
commit: 3cc128b47cd12a90903b465b2939fc9c6ee922c7 (patch)
tree: 4e8d08f38fe1eb54c36cd8875d6581c787bda618 /templates
parent: 93d19942245f287648f73d0c45599350c87db677 (diff)
5 files changed, 21 insertions, 21 deletions
diff --git a/templates/header_location.twig b/templates/header_location.twig
index dc3c333ede..96f486c168 100644
--- a/templates/header_location.twig
+++ b/templates/header_location.twig
@@ -8,14 +8,14 @@
     <meta http-equiv="Refresh" content="0;url={{ uri }}">
     <script type="text/javascript">
         //<![CDATA[
-        setTimeout(function() { window.location = decodeURI('{{ uri|e('js') }}'); }, 2000);
+        setTimeout(function() { window.location = decodeURI('{{ uri|escape('js') }}'); }, 2000);
         //]]>
     </script>
 </head>
 <body>
 <script type="text/javascript">
     //<![CDATA[
-    document.write('<p><a href="{{ uri|e('js') }}">{% trans 'Go' %}</a></p>');
+    document.write('<p><a href="{{ uri|escape('js') }}">{% trans 'Go' %}</a></p>');
     //]]>
 </script>
 </body>
diff --git a/templates/import/javascript.twig b/templates/import/javascript.twig
index 028ecfe3ed..165e0c8a4f 100644
--- a/templates/import/javascript.twig
+++ b/templates/import/javascript.twig
@@ -26,7 +26,7 @@ $( function() {
                             </div>
                         </div>
                         <div>
-                            <img src="{{ image('ajax_clock_small.gif') }}" width="16" height="16" alt="ajax clock"> {{ 'Uploading your import file…'|trans|e('js') -}}
+                            <img src="{{ image('ajax_clock_small.gif') }}" width="16" height="16" alt="ajax clock"> {{ 'Uploading your import file…'|trans|escape('js') -}}
                         </div>
                         <div id="statustext"></div>
                     </div>
@@ -51,7 +51,7 @@ $( function() {
                     complete = response.complete;
 
                     if (total==0 && complete==0 && percent==0) {
-                        $("#upload_form_status_info").html('<img src="{{ image('ajax_clock_small.gif') }}" width="16" height="16" alt="ajax clock"> {{ promot_str|e('js') }}');
+                        $("#upload_form_status_info").html('<img src="{{ image('ajax_clock_small.gif') }}" width="16" height="16" alt="ajax clock"> {{ promot_str|escape('js') }}');
                         $("#upload_form_status").css("display", "none");
                     } else {
                         var now = new Date();
@@ -64,7 +64,7 @@ $( function() {
                             now.getSeconds())
                             + now.getMilliseconds() - 1000;
                         var statustext = Functions.sprintf(
-                            "{{ statustext_str|e('js') }}",
+                            "{{ statustext_str|escape('js') }}",
                             Functions.formatBytes(
                                 complete, 1, window.Messages.strDecimalSeparator
                             ),
@@ -86,7 +86,7 @@ $( function() {
                             var used_time = now - import_start;
                             var seconds = parseInt(((total - complete) / complete) * used_time / 1000);
                             var speed = Functions.sprintf(
-                                "{{ second_str|e('js') }}",
+                                "{{ second_str|escape('js') }}",
                                 Functions.formatBytes(complete / used_time * 1000, 1, window.Messages.strDecimalSeparator)
                             );
 
@@ -94,12 +94,12 @@ $( function() {
                             seconds %= 60;
                             var estimated_time;
                             if (minutes > 0) {
-                                estimated_time = "{{ remaining_min|e('js') }}"
+                                estimated_time = "{{ remaining_min|escape('js') }}"
                                     .replace("%MIN", minutes)
                                     .replace("%SEC", seconds);
                             }
                             else {
-                                estimated_time = "{{ remaining_second|e('js') }}"
+                                estimated_time = "{{ remaining_second|escape('js') }}"
                                 .replace("%SEC", seconds);
                             }
 
@@ -149,7 +149,7 @@ $( function() {
             {# No plugin available #}
             {% set image_tag -%}
                 <img src="{{ image('ajax_clock_small.gif') }}" width="16" height="16" alt="ajax clock">
-                {{- 'Please be patient, the file is being uploaded. Details about the upload are not available.'|trans|e('js') -}}
+                {{- 'Please be patient, the file is being uploaded. Details about the upload are not available.'|trans|escape('js') -}}
                 {{- show_docu('faq', 'faq2-9') -}}
             {%- endset %}
             $('#upload_form_status_info').html('{{ image_tag|raw }}');
diff --git a/templates/javascript/redirect.twig b/templates/javascript/redirect.twig
index 4691ed0965..a868124aac 100644
--- a/templates/javascript/redirect.twig
+++ b/templates/javascript/redirect.twig
@@ -1,5 +1,5 @@
 <script type='text/javascript'>
     window.onload = function () {
-        window.location = '{{ url|e('js') }}';
+        window.location = '{{ url|escape('js') }}';
     };
 </script>
diff --git a/templates/scripts.twig b/templates/scripts.twig
index 58b3ae49fb..65ce619995 100644
--- a/templates/scripts.twig
+++ b/templates/scripts.twig
@@ -10,13 +10,13 @@
 {% if files is not empty %}
 window.AJAX.scriptHandler
 {% for file in files %}
-  .add('{{ file.filename|e('js') }}', {{ file.has_onload ? 1 : 0 }})
+  .add('{{ file.filename|escape('js') }}', {{ file.has_onload ? 1 : 0 }})
 {% endfor %}
 ;
 $(function() {
 {% for file in files %}
   {% if file.has_onload %}
-  window.AJAX.fireOnload('{{ file.filename|e('js') }}');
+  window.AJAX.fireOnload('{{ file.filename|escape('js') }}');
   {% endif %}
 {% endfor %}
 });
diff --git a/templates/table/insert/column_row.twig b/templates/table/insert/column_row.twig
index b1cd0992ce..c36da59e9f 100644
--- a/templates/table/insert/column_row.twig
+++ b/templates/table/insert/column_row.twig
@@ -17,7 +17,7 @@
       <td class="text-center">--</td>
     {% else %}
       <td>
-        <select name="funcs[multi_edit][{{ row_id }}][{{ column.Field_md5 }}]" onchange="return verificationsAfterFieldChange('{{ column.Field_md5|e('js') }}', '{{ row_id|e('js') }}', '{{ column.pma_type }}')" id="field_{{ id_index }}_1">
+        <select name="funcs[multi_edit][{{ row_id }}][{{ column.Field_md5 }}]" onchange="return verificationsAfterFieldChange('{{ column.Field_md5|escape('js') }}', '{{ row_id|escape('js') }}', '{{ column.pma_type }}')" id="field_{{ id_index }}_1">
           {{ function_options|raw }}
         </select>
       </td>
@@ -44,18 +44,18 @@
       {% if is_value_foreign_link %}
         {{ backup_field|raw }}
         <input type="hidden" name="fields_type[multi_edit][{{ row_id }}][{{ column.Field_md5 }}]" value="foreign">
-        <input type="text" name="fields[multi_edit][{{ row_id }}][{{ column.Field_md5 }}]" class="textfield" onchange="return verificationsAfterFieldChange('{{ column.Field_md5|e('js') }}', '{{ row_id|e('js') }}', '{{ column.pma_type }}')" id="field_{{ id_index }}_3" value="{{ data }}">
+        <input type="text" name="fields[multi_edit][{{ row_id }}][{{ column.Field_md5 }}]" class="textfield" onchange="return verificationsAfterFieldChange('{{ column.Field_md5|escape('js') }}', '{{ row_id|escape('js') }}', '{{ column.pma_type }}')" id="field_{{ id_index }}_3" value="{{ data }}">
         <a class="ajax browse_foreign" href="{{ url('/browse-foreigners') }}" data-post="{{ get_common({'db': db, 'table': table, 'field': column.Field, 'rownumber': row_id, 'data': data}) }}">{{ get_icon('b_browse', 'Browse foreign values'|trans) }}</a>
       {% elseif foreign_dropdown is not empty %}
         {{ backup_field|raw }}
         <input type="hidden" name="fields_type[multi_edit][{{ row_id }}][{{ column.Field_md5 }}]" value="{{ column.is_binary ? 'hex' : 'foreign' }}">
-        <select name="fields[multi_edit][{{ row_id }}][{{ column.Field_md5 }}]" class="textfield" id="field_{{ id_index }}_3" onchange="return verificationsAfterFieldChange('{{ column.Field_md5|e('js') }}', '{{ row_id|e('js') }}', '{{ column.pma_type }}')">
+        <select name="fields[multi_edit][{{ row_id }}][{{ column.Field_md5 }}]" class="textfield" id="field_{{ id_index }}_3" onchange="return verificationsAfterFieldChange('{{ column.Field_md5|escape('js') }}', '{{ row_id|escape('js') }}', '{{ column.pma_type }}')">
           {{ foreign_dropdown|raw }}
         </select>
       {% elseif (longtext_double_textarea and 'longtext' in column.pma_type) or 'json' in column.pma_type or 'text' in column.pma_type %}
         {{ backup_field|raw }}
         <textarea name="fields[multi_edit][{{ row_id }}][{{ column.Field_md5 }}]" id="field_{{ id_index }}_3" data-type="{{ data_type }}" dir="{{ text_dir }}" rows="{{ textarea_rows }}" cols="{{ textarea_cols }}"
-          {{- max_length ? ' data-maxlength="' ~  max_length ~ '"' }}{{ column.is_char ? ' class="char charField"' }} onchange="return verificationsAfterFieldChange('{{ column.Field_md5|e('js') }}', '{{ row_id|e('js') }}', '{{ column.pma_type }}')">
+          {{- max_length ? ' data-maxlength="' ~  max_length ~ '"' }}{{ column.is_char ? ' class="char charField"' }} onchange="return verificationsAfterFieldChange('{{ column.Field_md5|escape('js') }}', '{{ row_id|escape('js') }}', '{{ column.pma_type }}')">
           {#- We need to duplicate the first \n or otherwise we will lose the first newline entered in a VARCHAR or TEXT column -#}
           {{- special_chars starts with "\r\n" ? "\n" }}{{ special_chars|raw -}}
         </textarea>
@@ -68,7 +68,7 @@
         {{ backup_field|raw }}
         <input type="hidden" name="fields_type[multi_edit][{{ row_id }}][{{ column.Field_md5 }}]" value="enum">
         {% if column.Type|length > 20 %}
-          <select name="fields[multi_edit][{{ row_id }}][{{ column.Field_md5 }}]" class="textfield" id="field_{{ id_index }}_3" onchange="return verificationsAfterFieldChange('{{ column.Field_md5|e('js') }}', '{{ row_id|e('js') }}', '{{ column.pma_type }}')">
+          <select name="fields[multi_edit][{{ row_id }}][{{ column.Field_md5 }}]" class="textfield" id="field_{{ id_index }}_3" onchange="return verificationsAfterFieldChange('{{ column.Field_md5|escape('js') }}', '{{ row_id|escape('js') }}', '{{ column.pma_type }}')">
             <option value=""></option>
             {% for enum_value in column.values %}
               <option value="{{ enum_value.plain }}"{{ enum_value.plain == enum_selected_value ? ' selected' }}>{{ enum_value.plain }}</option>
@@ -76,14 +76,14 @@
           </select>
         {% else %}
           {% for enum_value in column.values %}
-            <input type="radio" name="fields[multi_edit][{{ row_id }}][{{ column.Field_md5 }}]" value="{{ enum_value.plain }}" class="textfield" id="field_{{ id_index }}_3_{{ loop.index0 }}" onchange="return verificationsAfterFieldChange('{{ column.Field_md5|e('js') }}', '{{ row_id|e('js') }}', '{{ column.pma_type }}')"{{ enum_value.plain == enum_selected_value ? ' checked' }}>
+            <input type="radio" name="fields[multi_edit][{{ row_id }}][{{ column.Field_md5 }}]" value="{{ enum_value.plain }}" class="textfield" id="field_{{ id_index }}_3_{{ loop.index0 }}" onchange="return verificationsAfterFieldChange('{{ column.Field_md5|escape('js') }}', '{{ row_id|escape('js') }}', '{{ column.pma_type }}')"{{ enum_value.plain == enum_selected_value ? ' checked' }}>
             <label for="field_{{ id_index }}_3_{{ loop.index0 }}">{{ enum_value.plain }}</label>
           {% endfor %}
         {% endif %}
       {% elseif column.pma_type == 'set' %}
         {{ backup_field|raw }}
         <input type="hidden" name="fields_type[multi_edit][{{ row_id }}][{{ column.Field_md5 }}]" value="set">
-        <select name="fields[multi_edit][{{ row_id }}][{{ column.Field_md5 }}][]" class="textfield" size="{{ set_select_size }}" id="field_{{ id_index }}_3" onchange="return verificationsAfterFieldChange('{{ column.Field_md5|e('js') }}', '{{ row_id|e('js') }}', '{{ column.pma_type }}')" multiple>
+        <select name="fields[multi_edit][{{ row_id }}][{{ column.Field_md5 }}][]" class="textfield" size="{{ set_select_size }}" id="field_{{ id_index }}_3" onchange="return verificationsAfterFieldChange('{{ column.Field_md5|escape('js') }}', '{{ row_id|escape('js') }}', '{{ column.pma_type }}')" multiple>
           {% for set_value in set_values %}
             <option value="{{ set_value.plain }}"{{ set_value.plain in data|split(',') ? ' selected' }}>{{ set_value.plain }}</option>
           {% endfor %}
@@ -98,7 +98,7 @@
           {{ backup_field|raw }}
           <input type="hidden" name="fields_type[multi_edit][{{ row_id }}][{{ column.Field_md5 }}]" value="hex">
           <textarea name="fields[multi_edit][{{ row_id }}][{{ column.Field_md5 }}]" id="field_{{ id_index }}_3" data-type="HEX" dir="{{ text_dir }}" rows="{{ textarea_rows }}" cols="{{ textarea_cols }}"
-            {{- max_length ? ' data-maxlength="' ~  max_length ~ '"' }}{{ column.is_char ? ' class="char charField"' }} onchange="return verificationsAfterFieldChange('{{ column.Field_md5|e('js') }}', '{{ row_id|e('js') }}', '{{ column.pma_type }}')">
+            {{- max_length ? ' data-maxlength="' ~  max_length ~ '"' }}{{ column.is_char ? ' class="char charField"' }} onchange="return verificationsAfterFieldChange('{{ column.Field_md5|escape('js') }}', '{{ row_id|escape('js') }}', '{{ column.pma_type }}')">
             {#- We need to duplicate the first \n or otherwise we will lose the first newline entered in a VARCHAR or TEXT column -#}
             {{- special_chars starts with "\r\n" ? "\n" }}{{ special_chars|raw -}}
           </textarea>
@@ -110,7 +110,7 @@
         {% if is_upload and column.is_blob %}
           <br>
           {# We don't want to prevent users from using browser's default drag-drop feature on some page(s), so we add noDragDrop class to the input #}
-          <input type="file" name="fields_upload[multi_edit][{{ row_id }}][{{ column.Field_md5 }}]" class="textfield noDragDrop" id="field_{{ id_index }}_3" size="10" onchange="return verificationsAfterFieldChange('{{ column.Field_md5|e('js') }}', '{{ row_id|e('js') }}', '{{ column.pma_type }}')">
+          <input type="file" name="fields_upload[multi_edit][{{ row_id }}][{{ column.Field_md5 }}]" class="textfield noDragDrop" id="field_{{ id_index }}_3" size="10" onchange="return verificationsAfterFieldChange('{{ column.Field_md5|escape('js') }}', '{{ row_id|escape('js') }}', '{{ column.pma_type }}')">
           {{ max_upload_size }}
         {% endif %}
         {{ select_option_for_upload|raw }}
author	Kamil Tekiela <tekiela246@gmail.com>	2022-10-15 22:07:42 +0300
committer	Kamil Tekiela <tekiela246@gmail.com>	2022-10-17 23:31:08 +0300
commit	3cc128b47cd12a90903b465b2939fc9c6ee922c7 (patch)
tree	4e8d08f38fe1eb54c36cd8875d6581c787bda618 /templates
parent	93d19942245f287648f73d0c45599350c87db677 (diff)