Attachment 39509 Details for Bug 14266 – [COUNTER-PATCH] Bug 14266: Trim the email address in the pl script

[patch] [COUNTER-PATCH] Bug 14266: Trim the email address in the pl script

Bug-14266-Trim-the-email-address-in-the-pl-script.patch (text/plain), 2.58 KB, created by Jonathan Druart on 2015-05-26 11:09:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2015-05-26 11:09:50 UTC

Size: 2.58 KB

patch

obsolete

>From 61df8f688807fd078feb638940fcb6921d239a68 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@koha-community.org>
>Date: Tue, 26 May 2015 13:05:51 +0200
>Subject: [PATCH] Bug 14266: Trim the email address in the pl script
>
>The original concern of bug 14266 was to provide a compatibility for
><IE9.
>But actually we don't need to trim the email address template side.
>It will even better to trim it in the perl script, so that the email
>will be trimed even if JS is disabled.
>
>Test plan:
>1/ Share a list and does not provide any email address
>2/ Submit
>=> The form is not submited, no alert/message is displayed (same as
>before this patch).
>3/ Share a list and provide an email address with spaces before and
>after
>4/ Submit
>=> You should receive the email
>---
> .../opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt   | 17 +++++++++++++++--
> opac/opac-shareshelf.pl                                 |  6 ++++++
> 2 files changed, 21 insertions(+), 2 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
>index f40024f..19ee4b5 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
>@@ -44,7 +44,7 @@
> 
>     [% ELSIF op=='invite' %]
>         <div id="invite">
>-        <form method="post" onsubmit="return $.trim($('#invite_address').val())!='';">
>+        <form id="share_list">
>         <fieldset class="rows">
>             <ol>
>             <input type="hidden" name="op" value="conf_invite"/>
>@@ -89,4 +89,17 @@
>     </div> 
> </div> 
> [% INCLUDE 'opac-bottom.inc' %]
>-[% BLOCK jsinclude %][% END %]
>+[% BLOCK jsinclude %]
>+<script type="text/javascript">
>+//<![CDATA[
>+    $(document).ready(function(){
>+        $("#share_list").on('submit', function(e) {
>+            var address = $("#invite_address").val();
>+            if ( address.length == 0) {
>+                e.preventDefault();
>+            }
>+        });
>+    });
>+//]]>
>+</script>
>+[% END %]
>diff --git a/opac/opac-shareshelf.pl b/opac/opac-shareshelf.pl
>index f29e170..3504ba1 100755
>--- a/opac/opac-shareshelf.pl
>+++ b/opac/opac-shareshelf.pl
>@@ -60,6 +60,12 @@ sub _init {
>     $param->{fail_addr}   = [];
>     $param->{errcode}     = check_common_errors($param);
> 
>+    # trim email address
>+    if ( $param->{addrlist} ) {
>+        $param->{addrlist} =~ s|^\s+||;
>+        $param->{addrlist} =~ s|\s+$||;
>+    }
>+
>     #get some list details
>     my @temp;
>     @temp = GetShelf( $param->{shelfnumber} ) if !$param->{errcode};
>-- 
>2.1.0

Actions: View | Diff | Splinter Review

Attachments on bug 14266: 39470 | 39497 | 39509 | 39647 | 39701