Bugzilla – Attachment 21886 Details for
Bug 10944
Mixed content warnings in results and detail with Amazon images on https
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10944 - Mixed content warnings for covers on staff client
Bug-10944---Mixed-content-warnings-for-covers-on-s.patch (text/plain), 7.27 KB, created by
Liz Rea
on 2013-10-09 02:03:59 UTC
(
hide
)
Description:
Bug 10944 - Mixed content warnings for covers on staff client
Filename:
MIME Type:
Creator:
Liz Rea
Created:
2013-10-09 02:03:59 UTC
Size:
7.27 KB
patch
obsolete
>From c64a16955dbf8493ea5c0866e10e0d645a824e4c Mon Sep 17 00:00:00 2001 >From: Robin Sheat <robin@catalyst.net.nz> >Date: Fri, 4 Oct 2013 16:13:20 +1300 >Subject: [PATCH] Bug 10944 - Mixed content warnings for covers on staff > client > >This switches the URLs used to access Amazon's cover images to the SSL image >server, preventing warnings when using this on a secure site. > >To test: >* Enable Amazon images in the sysprefs, all other cover images off. >* Do a search in the staff client. Using firebug or similar, inspect the > images that indicate both "no image found" and the covers. >* Are they all https, and showing correctly? >--- > .../prog/en/modules/catalogue/detail.tt | 14 +++++++------- > .../prog/en/modules/catalogue/results.tt | 6 +++--- > 2 files changed, 10 insertions(+), 10 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index d5a006b..1d9d6f6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -27,7 +27,7 @@ > // http://www.oreillynet.com/pub/a/javascript/2003/10/21/amazonhacks.html > function verify_images() { > $("#bookcoverimg img").each(function(i){ >- if ((this.src.indexOf('images.amazon.com') >= 0) || (this.src.indexOf('g-images.amazon.com') >=0)) { >+ if ((this.src.indexOf('images.amazon.com') >= 0) || (this.src.indexOf('g-images.amazon.com') >=0) || (this.src.indexOf('images-na.ssl-images-amazon.com'))) { > w = this.width; > h = this.height; > if ((w == 1) || (h == 1)) { >@@ -40,13 +40,13 @@ function verify_images() { > } > }); > $("#editions img").each(function(i){ >- if ((this.src.indexOf('images.amazon.com') >= 0) || (this.src.indexOf('g-images.amazon.com') >=0)) { >+ if ((this.src.indexOf('images.amazon.com') >= 0) || (this.src.indexOf('g-images.amazon.com') >=0) || (this.src.indexOf('images-na.ssl-images-amazon.com'))) { > w = this.width; > h = this.height; > if ((w == 1) || (h == 1)) { >- this.src = 'http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif'; >+ this.src = 'https://images-na.ssl-images-amazon.com/images/G/01/x-site/icons/no-img-sm.gif'; > } else if ((this.complete != null) && (!this.complete)) { >- this.src = 'http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif'; >+ this.src = 'https://images-na.ssl-images-amazon.com/images/G/01/x-site/icons/no-img-sm.gif'; > } > } > }); >@@ -246,7 +246,7 @@ function verify_images() { > [% IF ( holdcount ) %]<span class="results_summary"><span class="label">Holds:</span> <span class="holdcount"><a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% biblionumber %]">[% holdcount %]</a></span></span>[% ELSE %][% END %] > > [% IF ( AmazonCoverImages ) %]</div><div class="yui-u" id="bookcoverimg"> >- <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="" /></a>[% END %] >+ <a href="http://www.amazon[% AmazonTld %]/gp/reader/[% normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="https://images-na.ssl-images-amazon.com/images/P/[% normalized_isbn %].01.MZZZZZZZ.jpg" alt="" /></a>[% END %] > [% ELSE %] > > <h3>[% title |html %]</h3> >@@ -310,7 +310,7 @@ function verify_images() { > </div> > > [% IF ( AmazonCoverImages ) %]<div class="yui-u" id="bookcoverimg"> >-<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="" /></a></div>[% END %] >+<a href="http://www.amazon[% AmazonTld %]/gp/reader/[% normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="https://images-na.ssl-images-amazon.com/images/P/[% normalized_isbn %].01.MZZZZZZZ.jpg" alt="" /></a></div>[% END %] > > <div class="yui-u" style="margin-top: 1em;"> > <ul> >@@ -706,7 +706,7 @@ function verify_images() { > [% IF ( FRBRizeEditions ) %][% IF ( XISBNS ) %] > <div id="editions"><h4>Editions</h4> > <table> >-[% FOREACH XISBN IN XISBNS %]<tr>[% IF ( AmazonCoverImages ) %]<td><a href="http://www.amazon.com/gp/reader/[% XISBN.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img src="http://images.amazon.com/images/P/[% XISBN.normalized_isbn %].01._AA75_PU_PU-5_.jpg" /></a></td>[% END %] >+[% FOREACH XISBN IN XISBNS %]<tr>[% IF ( AmazonCoverImages ) %]<td><a href="http://www.amazon.com/gp/reader/[% XISBN.normalized_isbn %]/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img src="https://images-na.ssl-images-amazon.com/images/P/[% XISBN.normalized_isbn %].01._AA75_PU_PU-5_.jpg" /></a></td>[% END %] > [% UNLESS ( item_level_itypes ) %]<td>[% IF ( noItemTypeImages ) %][% XISBN.description %][% ELSE %]<img src="[% XISBN.imageurl %]" alt="[% XISBN.description %]" title="[% XISBN.description %]">[% END %]</td>[% END %] > <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% XISBN.biblionumber %]">[% XISBN.title |html %]</a> by [% XISBN.author %] ©[% XISBN.copyrightdate %] > [% IF ( XISBN.publishercode ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >index 520e6d2..70e053e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -19,9 +19,9 @@ function verify_images() { > w = this.width; > h = this.height; > if ((w == 1) || (h == 1)) { >- this.src = 'http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif'; >+ this.src = 'https://images-na.ssl-images-amazon.com/images/G/01/x-site/icons/no-img-sm.gif'; > } else if ((this.complete != null) && (!this.complete)) { >- this.src = 'http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif'; >+ this.src = 'https://images-na.ssl-images-amazon.com/images/G/01/x-site/icons/no-img-sm.gif'; > } > } > }); >@@ -441,7 +441,7 @@ var holdForPatron = function () { > <td> > <a class="p1" href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber |url %]"> > >- <img src="[% IF ( SEARCH_RESULT.normalized_isbn ) %]http://images.amazon.com/images/P/[% SEARCH_RESULT.normalized_isbn %].01.TZZZZZZZ.jpg[% ELSE %]http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif[% END %]" alt="" class="thumbnail" /> >+ <img src="[% IF ( SEARCH_RESULT.normalized_isbn ) %]https://images-na.ssl-images-amazon.com/images/P/[% SEARCH_RESULT.normalized_isbn %].01.TZZZZZZZ.jpg[% ELSE %]https://images-na.ssl-images-amazon.com/images/G/01/x-site/icons/no-img-sm.gif[% END %]" alt="" class="thumbnail" /> > </a></td> > [% END %] > <td> >-- >1.7.9.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 10944
:
21431
|
21839
|
21886
|
22407
|
22409
|
23280
|
23282
|
23283
|
23284
|
23285
|
24633