From f68f47952c5fe79d83ca048eb83f7b8f15c10585 Mon Sep 17 00:00:00 2001 From: Charles Farmer Date: Thu, 26 Nov 2015 12:25:38 -0500 Subject: [PATCH] Bug: 11358 - Use HTTPS Amazon images everywhere Tried to solve the conflicts. Additionnaly, edited files that were still using "http://images.amazon.com". Please test thoroughly. Using HTTPS on an HTTP page shouldn't trigger security issues. I pruned some templates to use HTTPS whenever we're fetching an image from Amazon instead of switching on the using_https variable. --- .../intranet-tmpl/prog/en/css/staff-global.css | 11 +++++++++ .../prog/en/includes/doc-head-close.inc | 9 ++++++++ koha-tmpl/intranet-tmpl/prog/en/js/amazonimages.js | 15 +++++++++++++ .../prog/en/modules/catalogue/detail.tt | 26 +++++++++++----------- .../bootstrap/en/includes/shelfbrowser.inc | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 6 +---- .../bootstrap/en/modules/opac-opensearch.tt | 7 +++++- .../bootstrap/en/modules/opac-results-grouped.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 4 ---- .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 2 +- .../bootstrap/en/modules/opac-showreviews-rss.tt | 2 +- .../bootstrap/en/modules/opac-showreviews.tt | 2 +- koha-tmpl/opac-tmpl/bootstrap/js/amazonimages.js | 13 ++++++----- 13 files changed, 67 insertions(+), 34 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/js/amazonimages.js diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index 0188019..8dd2470 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -2292,6 +2292,17 @@ div.authorizedheading { display: inline; } +span.no-image { + background-color : #FFF; + border: 1px solid #979797; + color : #AAA; + display:block; + font-size : 86%; + font-weight : bold; + text-align : center; + width : 75px; +} + #hierarchies a { font-weight: normal; text-decoration: underline; 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 73514c2..d5efe92 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 @@ -86,5 +86,14 @@ [% END %] +[% IF ( AmazonCoverImages ) %] + + +[% END %] + [% INCLUDE 'searchbox-keep-text.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/amazonimages.js b/koha-tmpl/intranet-tmpl/prog/en/js/amazonimages.js new file mode 100644 index 0000000..2184b24 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/js/amazonimages.js @@ -0,0 +1,15 @@ +// http://www.oreillynet.com/pub/a/javascript/2003/10/21/amazonhacks.html +function verify_images() { + $("img").each(function(i){ + if ((this.src.indexOf('images.amazon.com') >= 0) || (this.src.indexOf('g-images.amazon.com') >=0) + || (this.src.indexOf('syndetics.com') >=0) || (this.src.indexOf('images-na.ssl-images-amazon.com') >= 0)) { + w = this.width; + h = this.height; + if ((w == 1) || (h == 1)) { + $(this).parent().html(""+NO_AMAZON_IMAGE+""); + } else if ((this.complete != null) && (!this.complete)) { + $(this).parent().html(""+NO_AMAZON_IMAGE+""); + } + } + }); +} 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 f9a1d35..2cc7785 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -46,13 +46,14 @@ function verify_images() { if( $(this).find('img').length < 1 ) $(this).remove(); }); $("#editions img").each(function(i){ - 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'))) { + 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') >= 0)) { w = this.width; h = this.height; if ((w == 1) || (h == 1)) { - this.src = 'https://images-na.ssl-images-amazon.com/images/G/01/x-site/icons/no-img-sm.gif'; + $(this).parent().html(""+NO_AMAZON_IMAGE+""); } else if ((this.complete != null) && (!this.complete)) { - this.src = 'https://images-na.ssl-images-amazon.com/images/G/01/x-site/icons/no-img-sm.gif'; + $(this).parent().html(""+NO_AMAZON_IMAGE+""); } } }); @@ -388,11 +389,7 @@ function verify_images() { [% IF ( AmazonCoverImages ) %]
- [% IF ( using_https ) %] - - [% ELSE %] - - [% END %] +
[% END %] [% END %] @@ -466,11 +463,7 @@ function verify_images() { [% IF ( AmazonCoverImages ) %]
- [% IF ( using_https ) %] - [% ELSE %] - - [% END %]
[% END %] @@ -991,7 +984,14 @@ function verify_images() { [% IF ( FRBRizeEditions ) %][% IF ( XISBNS ) %]

Editions

-[% FOREACH XISBN IN XISBNS %][% IF ( AmazonCoverImages ) %][% END %] +[% FOREACH XISBN IN XISBNS %] + + [% IF ( AmazonCoverImages ) %] + + [% END %] [% UNLESS ( item_level_itypes ) %][% END %]
+ + + [% IF ( noItemTypeImages ) %][% XISBN.description %][% ELSE %][% XISBN.description %][% END %][% XISBN.title |html %] by [% XISBN.author %] ©[% XISBN.copyrightdate %] [% IF ( XISBN.publishercode ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc index 8c3fcd9..f806b4f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/shelfbrowser.inc @@ -26,7 +26,7 @@ [% END %] [% IF ( OPACAmazonCoverImages ) %] [% IF ( item.browser_normalized_isbn ) %] - + [% ELSE %] No cover image available [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt index 951029a..fd4ea9f 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -58,11 +58,7 @@ [% ELSE %] [% END %] - [% IF ( using_https ) %] Cover image - [% ELSE %] - Cover image - [% END %] [% END %] [% IF ( SyndeticsEnabled && SyndeticsCoverImages ) %] @@ -964,7 +960,7 @@
[% IF ( OPACAmazonCoverImages ) %] - + [% END %] [% IF ( SyndeticsEnabled && SyndeticsCoverImages ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt index e1a9efe..748f0f3 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt @@ -37,7 +37,12 @@ ISBN [% SEARCH_RESULT.isbn |html %] [% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %][% OPACBaseURL %]/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber %][% ELSE %][% IF ( SEARCH_RESULT.BiblioDefaultViewisbd ) %][% OPACBaseURL %]/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber %][% ELSE %][% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber %][% END %][% END %] [% END %][% END %] +[% IF ( OPACAmazonCoverImages ) %] + [% IF ( SEARCH_RESULT.normalized_isbn ) %] + + [% END %] +[% END %] + [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( SEARCH_RESULT.content_identifier_exists ) %] [% ELSE %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt index 68c543c..b36dacb 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results-grouped.tt @@ -157,7 +157,7 @@ href="/cgi-bin/koha/opac-rss.pl?[% query_cgi %][% limit_cgi |html %]" /> [% END %] [% IF ( OPACAmazonCoverImages ) %] - [% IF ( GROUP_RESULT.isbn ) %][% ELSE %][% END %] + [% IF ( GROUP_RESULT.isbn ) %][% ELSE %][% END %] [% ELSE %] [% UNLESS ( noItemTypeImages ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt index 8a0ec89..f2c3d7d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -240,11 +240,7 @@ [% END %] [% IF ( OPACAmazonCoverImages ) %] [% IF ( SEARCH_RESULT.normalized_isbn ) %] - [% IF ( using_https ) %] - [% ELSE %] - - [% END %] [% ELSE %] No cover image available [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt index 3c96dde..d8866c6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt @@ -305,7 +305,7 @@ [% IF ( OPACAmazonCoverImages ) %] [% IF ( itemsloo.normalized_isbn ) %] - + [% ELSE %] No cover image available [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt index c6d858d..fddf531 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews-rss.tt @@ -11,7 +11,7 @@ New comment on [% review.title |html %] [% FOREACH subtitl IN review.subtitle %], [% subtitl.subfield |html %][% END %] [% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% review.biblionumber %]#comments [% END %][% END %] +[% IF ( OPACAmazonCoverImages ) %][% IF ( review.normalized_isbn ) %][% END %][% END %] [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( review.content_identifier_exists ) %][% IF ( using_https ) %] [% ELSE %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt index 687a671..464aa21 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-showreviews.tt @@ -115,7 +115,7 @@ [% IF ( OPACAmazonCoverImages ) %] [% IF ( review.normalized_isbn ) %] - + [% ELSE %] No cover image available [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/amazonimages.js b/koha-tmpl/opac-tmpl/bootstrap/js/amazonimages.js index f7b4887..2184b24 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/js/amazonimages.js +++ b/koha-tmpl/opac-tmpl/bootstrap/js/amazonimages.js @@ -1,14 +1,15 @@ // http://www.oreillynet.com/pub/a/javascript/2003/10/21/amazonhacks.html function verify_images() { - $("img").each(function(i){ - if ((this.src.indexOf('images.amazon.com') >= 0) || (this.src.indexOf('g-images.amazon.com') >=0) || (this.src.indexOf('syndetics.com') >=0) ) { + $("img").each(function(i){ + if ((this.src.indexOf('images.amazon.com') >= 0) || (this.src.indexOf('g-images.amazon.com') >=0) + || (this.src.indexOf('syndetics.com') >=0) || (this.src.indexOf('images-na.ssl-images-amazon.com') >= 0)) { w = this.width; h = this.height; if ((w == 1) || (h == 1)) { - $(this).parent().html(""+NO_AMAZON_IMAGE+""); + $(this).parent().html(""+NO_AMAZON_IMAGE+""); } else if ((this.complete != null) && (!this.complete)) { - $(this).parent().html(""+NO_AMAZON_IMAGE+""); + $(this).parent().html(""+NO_AMAZON_IMAGE+""); } } - }); - } + }); +} -- 1.9.1