From 4a47224136df62b528f73d0e38c4febde903808a Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 22 Feb 2016 09:24:29 +0000
Subject: [PATCH] Bug 15111: Do not include the antiClickjack legacy browser
 trick for greybox
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Most of the scripts called via greybox (which uses iframe) don't include
doc-head-close. But some do.
This patch adds a popup parameter for these templates, not to include
the legacy browser trick and avoid the replacement of the location.

Test plan:
1/ Export patroncard and label
2/ translate itemtypes
3/ click on a idref link at the OPAC

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit fc640d2a86f395ad392f84314bce22e8b4dab1fe)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
(cherry picked from commit 45e39882432dd9fdae0fc1b1ef7b7b8b09a9480a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
---
 .../prog/en/includes/doc-head-close.inc       |  20 +-
 .../prog/en/modules/admin/localization.tt     | 237 ++++++++++++++++++
 .../prog/en/modules/labels/label-print.tt     |   4 +-
 .../prog/en/modules/patroncards/print.tt      |   2 +-
 .../bootstrap/en/includes/doc-head-close.inc  |  20 +-
 .../bootstrap/en/modules/opac-idref.tt        |   2 +-
 6 files changed, 263 insertions(+), 22 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
index 2a6f199931..88f1de12e9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@@ -1,15 +1,17 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
 [%# Prevent XFS attacks -%]
-<style id="antiClickjack">body{display:none !important;}</style>
-<script type="text/javascript">
-   if (self === top) {
-       var antiClickjack = document.getElementById("antiClickjack");
-       antiClickjack.parentNode.removeChild(antiClickjack);
-   } else {
-       top.location = self.location;
-   }
-</script>
+[% UNLESS popup %]
+    <style id="antiClickjack">body{display:none !important;}</style>
+    <script type="text/javascript">
+       if (self === top) {
+           var antiClickjack = document.getElementById("antiClickjack");
+           antiClickjack.parentNode.removeChild(antiClickjack);
+       } else {
+           top.location = self.location;
+       }
+    </script>
+[% END %]
 
 <link rel="shortcut icon" href="[% IF ( IntranetFavicon ) %][% IntranetFavicon %][% ELSE %][% interface %]/[% theme %]/img/favicon.ico[% END %]" type="image/x-icon" />
 <link rel="stylesheet" type="text/css" href="[% interface %]/lib/jquery/jquery-ui.css" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt
new file mode 100644
index 0000000000..7d86d61a0e
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/localization.tt
@@ -0,0 +1,237 @@
+[% INCLUDE 'doc-head-open.inc' %]
+<title>Koha &rsaquo; Localization</title>
+[% INCLUDE 'doc-head-close.inc' popup => 1 %]
+<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
+[% INCLUDE 'greybox.inc' %]
+[% INCLUDE 'datatables.inc' %]
+<script type="text/javascript">
+//<![CDATA[
+
+    function show_message( params ) {
+        var type = params.type;
+        var data = params.data;
+        var messages = $("#messages");
+        var message;
+        if ( type == 'success_on_update' ) {
+            message = $('<div class="dialog message"></div>');
+            message.text("Entity %s (code %s) for lang %s has correctly been updated with '%s'".format(data.entity, data.code, data.lang, data.translation));
+        } else if ( type == 'error_on_update' ) {
+            message = $('<div class="dialog alert"></div>');
+            if ( data.error_code == 'already_exists' ) {
+                message.text("A translation already exists for this language.");
+            } else {
+                message.text("An error occurred when updating this translation.");
+            }
+        } else if ( type == 'success_on_delete' ) {
+            message = $('<div class="dialog message"></div>');
+            message.text("The translation (id %s) has been removed successfully".format(data.id));
+        } else if ( type == 'error_on_delete' ) {
+            message = $('<div class="dialog alert"></div>');
+            message.text("An error occurred when deleting this translation");
+        } else if ( type == 'success_on_insert' ) {
+            message = $('<div class="dialog message"></div>');
+            message.text("Translation (id %s) has been added successfully".format(data.id));
+        } else if ( type == 'error_on_insert' ) {
+            message = $('<div class="dialog alert"></div>');
+            if ( data.error_code == 'already_exists' ) {
+                message.text("A translation already exists for this language.");
+            } else {
+                message.text("An error occurred when adding this translation");
+            }
+        }
+
+        $(messages).append(message);
+
+        setTimeout(function(){
+            message.hide()
+        }, 3000);
+    }
+
+    function send_update_request( data, cell ) {
+        $.ajax({
+            data: data,
+            type: 'PUT',
+            url: '/cgi-bin/koha/svc/localization',
+            success: function (data) {
+                if ( data.error ) {
+                    $(cell).css('background-color', '#FF0000');
+                    show_message({ type: 'error_on_update', data: data });
+                } else if ( data.is_changed == 1 ) {
+                    $(cell).css('background-color', '#00FF00');
+                    show_message({ type: 'success_on_update', data: data });
+                }
+
+                if ( $(cell).hasClass('lang') ) {
+                    $(cell).text(data.lang)
+                } else if ( $(cell).hasClass('translation') ) {
+                    $(cell).text(data.translation)
+                }
+            },
+            error: function (data) {
+                $(cell).css('background-color', '#FF0000');
+                if ( $(cell).hasClass('lang') ) {
+                    $(cell).text(data.lang)
+                } else if ( $(cell).hasClass('translation') ) {
+                    $(cell).text(data.translation)
+                }
+                show_message({ type: 'error_on_update', data: data });
+            },
+        });
+    }
+
+    function send_delete_request( id, cell ) {
+        $.ajax({
+            type: 'DELETE',
+            url: '/cgi-bin/koha/svc/localization/?id='+id,
+            success: function (data) {
+                $("#localization").DataTable().row( '#row_id_' + id ).remove().draw();
+                show_message({ type: 'success_on_delete', data: data });
+            },
+            error: function (data) {
+                $(cell).css('background-color', '#FF0000');
+                show_message({ type: 'error_on_delete', data: data });
+            },
+        });
+    }
+
+    $(document).ready(function() {
+        $(".dialog").hide();
+
+        var table = $("#localization").DataTable($.extend(true, {}, dataTablesDefaults, {
+            'bPaginate': false,
+        }));
+
+        var languages_select = $('<select name="lang"></select>');
+        [% FOR language IN languages %]
+            [% FOR sublanguage IN language.sublanguages_loop %]
+                var option;
+                [% IF language.plural %]
+                    option = $('<option value="[% sublanguage.rfc4646_subtag %]">[% sublanguage.native_description %] [% sublanguage.region_description %] ([% sublanguage.rfc4646_subtag %])</option>');
+                    $(languages_select).append(option);
+                [% ELSE %]
+                    option = $('<option value="[% sublanguage.rfc4646_subtag %]">[% sublanguage.native_description %] ([% sublanguage.rfc4646_subtag %])</option>');
+                [% END %]
+                $(languages_select).append(option);
+            [% END %]
+        [% END %]
+
+        $("td.translation").on('focus', function(){
+            $(this).css('background-color', '');
+        });
+        $("td.lang").on('click', function(){
+            var td = this;
+            var lang = $(td).text();
+            $(td).css('background-color', '');
+            var my_select = $(languages_select).clone();
+            $(my_select).find('option[value="' + lang + '"]').attr('selected', 'selected');
+            $(my_select).on('click', function(e){
+                e.stopPropagation();
+            });
+            $(my_select).on('change', function(){
+                var tr = $(this).parent().parent();
+                var id = $(tr).data('id');
+                var lang = $(this).find('option:selected').val();
+                var data = "id=" + encodeURIComponent(id) + "&lang=" + encodeURIComponent(lang);
+                send_update_request( data, td );
+            });
+            $(my_select).on('blur', function(){
+                $(td).html(lang);
+            });
+            $(this).html(my_select);
+        });
+
+        $("td.translation").on('blur', function(){
+            var tr = $(this).parent();
+            var id = $(tr).data('id');
+            var translation = $(this).text();
+            var data = "id=" + encodeURIComponent(id) + "&translation=" + encodeURIComponent(translation);
+            send_update_request( data, this );
+        });
+
+        $("a.delete").on('click', function(e){
+            e.preventDefault();
+            if ( confirm(_("Are you sure you want to delete this translation?")) ) {
+                var td = $(this).parent();
+                var tr = $(td).parent();
+                var id = $(tr).data('id');
+                send_delete_request( id, td );
+            }
+        });
+
+        $("#add_translation").on('submit', function(e){
+            e.preventDefault();
+            var entity = $(this).find('input[name="entity"]').val();
+            var code = $(this).find('input[name="code"]').val();
+            var lang = $(this).find('select[name="lang"] option:selected').val();
+            var translation = $(this).find('input[name="translation"]').val();
+            var data = "entity=" + encodeURIComponent(entity) + "&code=" + encodeURIComponent(code) + "&lang=" + encodeURIComponent(lang) + "&translation=" + encodeURIComponent(translation);
+            $.ajax({
+                data: data,
+                type: 'POST',
+                url: '/cgi-bin/koha/svc/localization',
+                success: function (data) {
+                    if ( data.error ) {
+                        show_message({ type: 'error_on_insert', data: data });
+                    } else {
+                        // FIXME Should append the delete link
+                        table.row.add( [ data.id, data.entity, data.code, data.lang, data.translation, "" ] ).draw();
+                        show_message({ type: 'success_on_insert', data: data });
+                    }
+                },
+                error: function (data) {
+                    show_message({ type: 'error_on_insert', data: data });
+                },
+            });
+        });
+
+     });
+//]]>
+</script>
+</head>
+<body id="admin_localization" class="admin">
+<div id="main">
+<form id="add_translation" method="post">
+    <input type="hidden" name="entity" value="[% entity %]" />
+    <input type="hidden" name="code" value="[% code %]" />
+    Lang: <select name="lang">
+        [% FOR language IN languages %]
+            [% FOR sublanguage IN language.sublanguages_loop %]
+                [% IF language.plural %]
+                    <option value="[% sublanguage.rfc4646_subtag %]">[% sublanguage.native_description %] [% sublanguage.region_description %] ([% sublanguage.rfc4646_subtag %])</option>
+                [% ELSE %]
+                    <option value="[% sublanguage.rfc4646_subtag %]">[% sublanguage.native_description %] ([% sublanguage.rfc4646_subtag %])</option>
+                [% END %]
+            [% END %]
+        [% END %]
+    </select>
+    Translation: <input type="text" name="translation" />
+    <input type="submit" value="Add" />
+</form>
+<div id="messages"></div>
+<table id="localization">
+    <thead>
+        <tr>
+            <th>Id</th>
+            <th>Entity</th>
+            <th>Code</th>
+            <th>Lang</th>
+            <th>Translation</th>
+            <th></th>
+        </tr>
+    </thead>
+    <tbody>
+        [% FOR t IN translations %]
+        <tr id="row_id_[% t.id %]" data-id="[% t.id %]">
+            <td>[% t.id %]</td>
+            <td>[% t.entity %]</td>
+            <td>[% t.code %]</td>
+            <td class="lang">[% t.lang %]</td>
+            <td class="translation" contenteditable="true">[% t.translation %]</td>
+            <td class="actions"><a href="#" class="delete"><i class="fa fa-trash"></i> Delete</a></td>
+        </tr>
+        [% END %]
+    </tbody>
+</table>
+</div>
+</body>
+</html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
index f05e63fca1..0f517d980b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-print.tt
@@ -1,6 +1,6 @@
     [% INCLUDE 'doc-head-open.inc' %]
-    <title>Koha &rsaquo; Tools &rsaquo; Labels &rsaquo; Label printing/exporting</title>
-    [% INCLUDE 'doc-head-close.inc' %]
+    <title>Koha &rsaquo; Tools &rsaquo; Label creator &rsaquo; Label printing/exporting</title>
+    [% INCLUDE 'doc-head-close.inc' popup => 1 %]
     <script type="text/javascript">
         //<![CDATA[
             function Done() {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
index fd33c3f0ca..a29f74a548 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patroncards/print.tt
@@ -1,6 +1,6 @@
     [% INCLUDE 'doc-head-open.inc' %]
     <title>Koha &rsaquo; Tools &rsaquo; Patron cards &rsaquo; Patron card printing/exporting</title>
-    [% INCLUDE 'doc-head-close.inc' %]
+    [% INCLUDE 'doc-head-close.inc' popup => 1%]
     <script type="text/javascript">
         //<![CDATA[
             function Done() {
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
index f9038f555e..72e6ab8779 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/doc-head-close.inc
@@ -3,15 +3,17 @@
 <meta name="viewport" content="width=device-width, initial-scale=1" />
 
 [%# Prevent XFS attacks -%]
-<style id="antiClickjack">body{display:none !important;}</style>
-<script type="text/javascript">
-   if (self === top) {
-       var antiClickjack = document.getElementById("antiClickjack");
-       antiClickjack.parentNode.removeChild(antiClickjack);
-   } else {
-       top.location = self.location;
-   }
-</script>
+[% UNLESS popup %]
+    <style id="antiClickjack">body{display:none !important;}</style>
+    <script type="text/javascript">
+       if (self === top) {
+           var antiClickjack = document.getElementById("antiClickjack");
+           antiClickjack.parentNode.removeChild(antiClickjack);
+       } else {
+           top.location = self.location;
+       }
+    </script>
+[% END %]
 
 <link rel="shortcut icon" href="[% IF ( OpacFavicon ) %][% OpacFavicon %][% ELSE %][% interface %]/[% theme %]/images/favicon.ico[% END %]" type="image/x-icon" />
 [% IF ( bidi ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt
index 4db0d1a2e2..fdb1d7290b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-idref.tt
@@ -1,7 +1,7 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your search IDREF for ppn [% unimarc3 %]</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-[% INCLUDE 'doc-head-close.inc' %]
+[% INCLUDE 'doc-head-close.inc' popup => 1 %]
 [% BLOCK cssinclude %]
   <style type="text/css">
     ul.ui-tabs-nav li a, ul.ui-tabs-nav li span.a  { padding:0.6em 1em; }
-- 
2.39.5