Attachment 115899 Details for Bug 20212 – Bug 20212: Use functions to escape variables

[patch] Bug 20212: Use functions to escape variables

Bug-20212-Use-functions-to-escape-variables.patch (text/plain), 3.72 KB, created by Andrew Fuerste-Henry on 2021-01-27 15:52:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Fuerste-Henry

Created: 2021-01-27 15:52:02 UTC

Size: 3.72 KB

patch

obsolete

>From 73503edac5caa2dca3ac9d69b47295abd8c492cc Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Fri, 8 Jan 2021 14:15:07 +0100
>Subject: [PATCH] Bug 20212: Use functions to escape variables
>
>Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
>---
> .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  | 32 ++++++++--------------
> 1 file changed, 12 insertions(+), 20 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>index ec074c2cc4..4958e117c7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>@@ -468,6 +468,13 @@
>             return query_params;
>         }
> 
>+        function _escape_str(s){
>+            return s != null ? s.escapeHtml() : "";
>+        }
>+        function _escape_price(p){
>+            return p != null ? p.escapeHtml().format_price() : "";
>+        }
>+
>         $(document).ready(function(){
> 
>             if ( $("#receivedt").length ) {
>@@ -536,30 +543,20 @@
>                 "columnDefs": [ {
>                     "targets": [3,4,5,9],
>                     "render": function (data, type, row, meta) {
>-                        if ( data != null ) {
>-                            return data.escapeHtml();
>-                        }
>-                        else {
>-                            return "";
>-                        }
>+                        return _escape_str(data);
>                     }
>                 },
>                 {
>                     "targets": [8,10],
>                     "render": function (data, type, row, meta) {
>-                        if ( data != null ) {
>-                            return data.escapeHtml().format_price();
>-                        }
>-                        else {
>-                            return "";
>-                        }
>+                        return _escape_price(data);
>                     }
>                 } ],
>                 "columns": [
>                     { "data": "basket.name",
>                       "orderable": true,
>                       "render": function(data, type, row, meta) {
>-                        if (type != 'display') return data;
>+                        if (type != 'display') return _escape_str(data);
>                         return "<a href=\"/cgi-bin/koha/acqui/basket.pl?basketno=" + encodeURIComponent(row.basket.basket_id) + "\">" + data.escapeHtml() + " (" + row.basket.basket_id.escapeHtml() + ")</a>";
>                       }
>                     },
>@@ -567,12 +564,7 @@
>                       "orderable": true,
>                       "render": function(data, type, row, meta) {
>                         if ( type != 'display' ) {
>-                            if ( data == null ) {
>-                                return "";
>-                            }
>-                            else {
>-                                return data;
>-                            }
>+                            return _escape_str(data);
>                         }
>                         if ( row.basket.basket_group_id == null ) {
>                             return _("No basket group");
>@@ -588,7 +580,7 @@
>                     {
>                         "data": "order_id",
>                         "render": function(data, type, row, meta) {
>-                            if (type != 'display') return data;
>+                            if (type != 'display') return _escape_str(data);
>                             return "<a href=\"neworderempty.pl?ordernumber="+encodeURIComponent(data)+"&amp;booksellerid="+encodeURIComponent(row.basket.vendor_id)+"\">"+data.escapeHtml()+"</a>";
>                         }
>                     },
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 20212: 97545 | 97546 | 97547 | 97629 | 97630 | 97633 | 97634 | 97635 | 97745 | 98226 | 98230 | 98241 | 99724 | 99725 | 99727 | 100142 | 100475 | 100476 | 100477 | 100478 | 100552 | 100553 | 100554 | 100555 | 100600 | 100601 | 100602 | 100603 | 100605 | 100606 | 100643 | 101320 | 103684 | 103685 | 103686 | 103687 | 103688 | 109861 | 109862 | 109863 | 109864 | 109866 | 109867 | 109868 | 109869 | 109870 | 109936 | 110229 | 110234 | 110478 | 110482 | 111568 | 111569 | 112310 | 112521 | 112522 | 112523 | 112524 | 112686 | 112695 | 112698 | 112699 | 112700 | 112702 | 112703 | 112704 | 112705 | 112706 | 112868 | 112882 | 112987 | 113278 | 113279 | 114607 | 114608 | 114609 | 114610 | 114611 | 114612 | 114613 | 114614 | 114615 | 114616 | 114617 | 114942 | 114953 | 114954 | 114956 | 114959 | 114963 | 115050 | 115056 | 115057 | 115060 | 115062 | 115107 | 115108 | 115109 | 115817 | 115818 | 115819 | 115820 | 115821 | 115822 | 115886 | 115887 | 115888 | 115889 | 115890 | 115891 | 115892 | 115893 | 115894 | 115895 | 115896 | 115897 | 115898 | 115899 | 115900 | 115901 | 115902 | 115903 | 115904 | 115905 | 115906 | 115920 | 115921 | 115940 | 115941 | 115943 | 115944 | 115945 | 115946 | 115947 | 115948 | 115949 | 115950 | 115951 | 115952 | 115953 | 115954 | 115955 | 115956 | 115957 | 115958 | 115959 | 115960 | 115961 | 115962 | 115963 | 115964 | 115965 | 116139