Attachment 23282 Details for Bug 10944 – [PASSED QA] Bug 10944 - Mixed content warnings in opac results and detail with Amazon images on https

[patch] [PASSED QA] Bug 10944 - Mixed content warnings in opac results and detail with Amazon images on https

PASSED-QA-Bug-10944---Mixed-content-warnings-in-op.patch (text/plain), 6.17 KB, created by Martin Renvoize (ashimema) on 2013-12-04 09:44:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2013-12-04 09:44:19 UTC

Size: 6.17 KB

patch

obsolete

>From 9e662fd62e40edeb55cdbf01ee1bb46cd00751fe Mon Sep 17 00:00:00 2001
>From: Liz Rea <liz@catalyst.net.nz>
>Date: Wed, 25 Sep 2013 14:50:24 +1200
>Subject: [PATCH] [PASSED QA] Bug 10944 - Mixed content warnings in opac
> results and detail with Amazon images on https
>
>It's probably going to become more popular to run Koha in SSL environments.
>Currently on ssl, with Amazon images enabled, a SSL enabled site will either not show Amazon images (IE, some versions of Firefox?), or show a warning to users about mixed secure and insecure content (Firefox, Chrome).
>
>Since we now have the using_https template variable, it makes sense to use it.
>
>To test:
>
>In each browser you have access to, and preferably with SSL set up
>(you can set up a self signed cert for your dev install by following, more or less, the instructions here: https://wiki.debian.org/Self-Signed_Certificate)
>
>For the apache config, just copy the one for the OPAC, but set it to use 443 instead of 80 for the port, and point it to your keys per the instructions above.
>
>** note that using a self signed cert on your dev install will prompt you when you connect the first time
>that OMG I CAN'T VERIFY THIS IS COOL. You did it yourself, if you can't trust yourself... then who can you trust?
>
>* Enable Amazon images in the system preferences
>* Do a search that you know will have images for, verify that without SSL
>1. the images show
>2. the image source is from an Amazon url that uses http://
>3. the images are the right size, and look ok
>* Do the same using https, verify that with SSL
>1. the images show
>2. the image source is from an Amazon url that uses https://
>3. the images are the right size, and look ok
>
>Clicking on the image should link to the item on Amazon. This patch also corrects a problem with the Amazon url used on the images -
>it was pointing to a feature that is currently unavailable. That's fixed here.
>All you need to check is that it goes to a valid Amazon endpoint that doesn't show an error.
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt  |   13 ++++++++++++-
> koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt |    2 +-
> 2 files changed, 13 insertions(+), 2 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
>index 05c4010..14c435e 100644
>--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
>+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt
>@@ -532,7 +532,18 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
> 
>     <div id="bookcover">
>     [% IF ( OPACLocalCoverImages ) %]<div style="block" title="[% biblionumber |url %]" class="[% biblionumber %]" id="local-thumbnail-preview"></div>[% END %]
>-    [% IF ( OPACAmazonCoverImages ) %][% IF ( OPACurlOpenInNewWindow ) %]<a href="http://www.amazon[% AmazonTld %]/gp/reader/[% normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link" target="_blank"><img border="0" src="http://images.amazon.com/images/P/[% normalized_isbn %].01.MZZZZZZZ.jpg" alt="Cover image" /></a>[% ELSE %]<a href="http://www.amazon[% AmazonTld %]/gp/reader/[% normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/[% normalized_isbn %].01.MZZZZZZZ.jpg" alt="Cover image" /></a>[% END %][% END %]
>+    [% IF ( OPACAmazonCoverImages ) %]
>+        [% IF ( OPACurlOpenInNewWindow ) %]
>+            <a href="http://www.amazon[% AmazonTld %]/dp/[% normalized_isbn %]" target="_blank">
>+        [% ELSE %]
>+            <a href="http://www.amazon[% AmazonTld %]/dp/[% normalized_isbn %]">
>+        [% END %]
>+        [% IF ( using_https ) %]
>+            <img border="0" src="https://images-na.ssl-images-amazon.com/images/P/[% normalized_isbn %].01.MZZZZZZZ.jpg" alt="Cover image" /></a>
>+        [% ELSE %]
>+            <img border="0" src="http://images.amazon.com/images/P/[% normalized_isbn %].01.MZZZZZZZ.jpg" alt="Cover image" /></a>
>+        [% END %]
>+    [% END %]
> 
>     [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( content_identifier_exists ) %][% IF ( using_https ) %]
>     <img src="https://secure.syndetics.com/index.aspx?isbn=[% normalized_isbn %]/[% SyndeticsCoverImageSize %].GIF&amp;client=[% SyndeticsClientCode %]&amp;type=xw10&amp;upc=[% normalized_upc %]&amp;oclc=[% normalized_oclc %]" alt="" class="thumbnail" />
>diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
>index 9235b2b..985a760 100644
>--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
>+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt
>@@ -707,7 +707,7 @@ $(document).ready(function(){
>                 </td><td>
>                     <a class="p1" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber %]">
>             [% IF ( OPACLocalCoverImages ) %]<span title="[% SEARCH_RESULT.biblionumber |url %]" class="[% SEARCH_RESULT.biblionumber %]" id="local-thumbnail[% loop.count %]"></span>[% END %]
>-                    [% IF ( OPACAmazonCoverImages ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %]<span title="[% SEARCH_RESULT.biblionumber %]" id="amazon-thumbnail[% loop.count %]"><img src="http://images.amazon.com/images/P/[% SEARCH_RESULT.normalized_isbn %].01.TZZZZZZZ.jpg" alt="" class="thumbnail" /></span>[% ELSE %]<span class="no-image">No cover image available</span>[% END %][% END %]
>+                    [% IF ( OPACAmazonCoverImages ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %][% IF ( using_https ) %]<span title="[% SEARCH_RESULT.biblionumber %]" id="amazon-thumbnail[% loop.count %]"><img src="https://images-na.ssl-images-amazon.com/images/P/[% SEARCH_RESULT.normalized_isbn %].01.TZZZZZZZ.jpg" alt="" class="thumbnail" /></span>[% ELSE %]<span title="[% SEARCH_RESULT.biblionumber %]" id="amazon-thumbnail[% loop.count %]"><img src="http://images.amazon.com/images/P/[% SEARCH_RESULT.normalized_isbn %].01.TZZZZZZZ.jpg" alt="" class="thumbnail" /></span>[% END %][% ELSE %]<span class="no-image">No cover image available</span>[% END %][% END %]
> 
>                 [% IF ( SyndeticsEnabled ) %]
>                     [% IF ( SyndeticsCoverImages ) %]
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 10944: 21431 | 21839 | 21886 | 22407 | 22409 | 23280 | 23282 | 23283 | 23284 | 23285 | 24633