Bug 21094: Syndetics: always use https instead of http
This patch removes the 'using_https' check in OPAC templates in calls to Syndetics resources. Instead, https is always used. To test, apply the patch and enable Syndetics-related preferences. View the following pages in the OPAC: - Bibliographic detail page - Browse shelf section of the bibliographic detail page - Search results - List contents - Recent comments - Recent comments RSS - User summary page - Circulation history NOTE: I tested with made-up Syndetics credentials. This means my changes didn't make the template explode, but it doesn't confirm conclusively that the resources work. Signed-off-by: John Doe <you@example.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> (cherry picked from commit6e0548cc1a) Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> (cherry picked from commit40cf253a0d) Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Owen Leonard
Fridolin Somers
parent
34f6507185
commit
d38fbd4c87
|
|
@ -35,11 +35,7 @@
|
|||
[% IF ( SyndeticsEnabled ) %]
|
||||
[% IF ( SyndeticsCoverImages ) %]
|
||||
[% IF ( content_identifier_exists ) %]
|
||||
[% IF ( using_https ) %]
|
||||
<img src="https://secure.syndetics.com/index.aspx?isbn=[% item.browser_normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %][% IF ( item.browser_normalized_upc ) %]&upc=[% item.browser_normalized_upc %][% END %][% IF ( item.browser_normalized_oclc ) %]&oclc=[% item.browser_normalized_oclc %][% END %]&type=xw10" alt="" />
|
||||
[% ELSE %]
|
||||
<img src="http://www.syndetics.com/index.aspx?isbn=[% item.browser_normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %][% IF ( item.browser_normalized_upc ) %]&upc=[% item.browser_normalized_upc %][% END %][% IF ( item.browser_normalized_oclc ) %]&oclc=[% item.browser_normalized_oclc %][% END %]&type=xw10" alt="" />
|
||||
[% END %]
|
||||
<img src="https://secure.syndetics.com/index.aspx?isbn=[% item.browser_normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %][% IF ( item.browser_normalized_upc ) %]&upc=[% item.browser_normalized_upc %][% END %][% IF ( item.browser_normalized_oclc ) %]&oclc=[% item.browser_normalized_oclc %][% END %]&type=xw10" alt="" />
|
||||
[% ELSE %]
|
||||
<span class="no-image">No cover image available</span>
|
||||
[% END %]
|
||||
|
|
|
|||
|
|
@ -25,11 +25,6 @@
|
|||
[% END %]
|
||||
[% END %]
|
||||
|
||||
[% IF ( using_https ) %]
|
||||
[% SET protocol = "https://" %]
|
||||
[% ELSE %]
|
||||
[% SET protocol = "http://" %]
|
||||
[% END %]
|
||||
[% INCLUDE 'doc-head-open.inc' %]
|
||||
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Details for: [% title |html %][% FOREACH subtitl IN subtitle %][% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %] [% subtitl.subfield |html %][% END %]</title>
|
||||
[% INCLUDE 'doc-head-close.inc' %]
|
||||
|
|
@ -70,12 +65,7 @@
|
|||
|
||||
[% IF ( SyndeticsEnabled && SyndeticsCoverImages ) %]
|
||||
[% IF ( content_identifier_exists ) %]
|
||||
[% IF ( using_https ) %]
|
||||
<img src="https://secure.syndetics.com/index.aspx?isbn=[% normalized_isbn %]/[% SyndeticsCoverImageSize %].GIF&client=[% SyndeticsClientCode %]&type=xw10&upc=[% normalized_upc %]&oclc=[% normalized_oclc %]" alt="" class="thumbnail" />
|
||||
[% ELSE %]
|
||||
<img src="http://www.syndetics.com/index.aspx?isbn=[% normalized_isbn %]/[% SyndeticsCoverImageSize %].GIF&client=[% SyndeticsClientCode %]&type=xw10&upc=[% normalized_upc %]&oclc=[% normalized_oclc %]" alt="" class="thumbnail" />
|
||||
[% END %]
|
||||
|
||||
<img src="https://secure.syndetics.com/index.aspx?isbn=[% normalized_isbn %]/[% SyndeticsCoverImageSize %].GIF&client=[% SyndeticsClientCode %]&type=xw10&upc=[% normalized_upc %]&oclc=[% normalized_oclc %]" alt="" class="thumbnail" />
|
||||
[% ELSE %]
|
||||
<span class="no-image">No cover image available</span>
|
||||
[% END %]
|
||||
|
|
@ -437,43 +427,27 @@
|
|||
[% IF ( SyndeticsSeries && SyndeticsSERIES1Exists ) %]
|
||||
<span class="results_summary">
|
||||
<span class="label">Series information:</span>
|
||||
[% IF ( using_https ) %]
|
||||
<a target="_blank" rel="noreferrer" href="https://secure.syndetics.com/ffseries.aspx?isbn=[% normalized_isbn %]&type=series&num=1&client=[% SyndeticsClientCode %][% IF ( normalized_upc ) %]&upc=[% normalized_upc %][% END %][% IF ( normalized_oclc ) %]&oclc=[% normalized_oclc %][% END %]">Click to open in new window</a>
|
||||
[% ELSE %]
|
||||
<a target="_blank" rel="noreferrer" href="http://www.syndetics.com/ffseries.aspx?isbn=[% normalized_isbn %]&type=series&num=1&client=[% SyndeticsClientCode %][% IF ( normalized_upc ) %]&upc=[% normalized_upc %][% END %][% IF ( normalized_oclc ) %]&oclc=[% normalized_oclc %][% END %]">Click to open in new window</a>
|
||||
[% END %]
|
||||
<a target="_blank" rel="noreferrer" href="https://secure.syndetics.com/ffseries.aspx?isbn=[% normalized_isbn %]&type=series&num=1&client=[% SyndeticsClientCode %][% IF ( normalized_upc ) %]&upc=[% normalized_upc %][% END %][% IF ( normalized_oclc ) %]&oclc=[% normalized_oclc %][% END %]">Click to open in new window</a>
|
||||
</span>
|
||||
[% END # / IF SyndeticsSeries && SyndeticsSERIES1Exists%]
|
||||
[% IF ( SyndeticsAVPROFILEExists ) %]
|
||||
<span class="results_summary">
|
||||
<span class="label">Audiovisual profile:</span>
|
||||
[% IF ( using_https ) %]
|
||||
<a target="_blank" rel="noreferrer" href="https://secure.syndetics.com/index.aspx?isbn=[% normalized_isbn %]/avprofile.html&client=[% SyndeticsClientCode %][% IF ( normalized_upc ) %]&upc=[% normalized_upc %][% END %][% IF ( normalized_oclc ) %]&oclc=[% normalized_oclc %][% END %]&type=xw10">Click to open in new window</a>
|
||||
[% ELSE %]
|
||||
<a target="_blank" rel="noreferrer" href="http://www.syndetics.com/index.aspx?isbn=[% normalized_isbn %]/avprofile.html&client=[% SyndeticsClientCode %][% IF ( normalized_upc ) %]&upc=[% normalized_upc %][% END %][% IF ( normalized_oclc ) %]&oclc=[% normalized_oclc %][% END %]&type=xw10">Click to open in new window</a>
|
||||
[% END %]
|
||||
<a target="_blank" rel="noreferrer" href="https://secure.syndetics.com/index.aspx?isbn=[% normalized_isbn %]/avprofile.html&client=[% SyndeticsClientCode %][% IF ( normalized_upc ) %]&upc=[% normalized_upc %][% END %][% IF ( normalized_oclc ) %]&oclc=[% normalized_oclc %][% END %]&type=xw10">Click to open in new window</a>
|
||||
</span>
|
||||
[% END # / IF SyndeticsAVPROFILEExists %]
|
||||
|
||||
[% IF ( SyndeticsFICTIONExists ) %]
|
||||
<span class="results_summary">
|
||||
<span class="label">Fiction notes:</span>
|
||||
[% IF ( using_https ) %]
|
||||
<a target="_blank" rel="noreferrer" href="https://secure.syndetics.com/index.aspx?isbn=[% normalized_isbn %]/fiction.html&client=[% SyndeticsClientCode %][% IF ( normalized_upc ) %]&upc=[% normalized_upc %][% END %][% IF ( normalized_oclc ) %]&oclc=[% normalized_oclc %][% END %]&type=xw10">Click to open in new window</a>
|
||||
[% ELSE %]
|
||||
<a target="_blank" rel="noreferrer" href="http://www.syndetics.com/index.aspx?isbn=[% normalized_isbn %]/fiction.html&client=[% SyndeticsClientCode %][% IF ( normalized_upc ) %]&upc=[% normalized_upc %][% END %][% IF ( normalized_oclc ) %]&oclc=[% normalized_oclc %][% END %]&type=xw10">Click to open in new window</a>
|
||||
[% END %]
|
||||
<span class="label">Fiction notes:</span>
|
||||
<a target="_blank" rel="noreferrer" href="https://secure.syndetics.com/index.aspx?isbn=[% normalized_isbn %]/fiction.html&client=[% SyndeticsClientCode %][% IF ( normalized_upc ) %]&upc=[% normalized_upc %][% END %][% IF ( normalized_oclc ) %]&oclc=[% normalized_oclc %][% END %]&type=xw10">Click to open in new window</a>
|
||||
</span>
|
||||
[% END # / IF SyndeticsFICTIONExists %]
|
||||
|
||||
[% IF ( SyndeticsAwards && SyndeticsAWARDS1Exists ) %]
|
||||
<span class="results_summary">
|
||||
<span class="label">Awards:</span>
|
||||
[% IF ( using_https ) %]
|
||||
<a target="_blank" rel="noreferrer" href="https://secure.syndetics.com/ffawards.aspx?isbn=[% normalized_isbn %]&type=awards&client=[% SyndeticsClientCode %][% IF ( normalized_upc ) %]&upc=[% normalized_upc %][% END %][% IF ( normalized_oclc ) %]&oclc=[% normalized_oclc %][% END %]">Click to open in new window</a>
|
||||
[% ELSE %]
|
||||
<a target="_blank" rel="noreferrer" href="http://www.syndetics.com/ffawards.aspx?isbn=[% normalized_isbn %]&type=awards&client=[% SyndeticsClientCode %][% IF ( normalized_upc ) %]&upc=[% normalized_upc %][% END %][% IF ( normalized_oclc ) %]&oclc=[% normalized_oclc %][% END %]">Click to open in new window</a>
|
||||
[% END %]
|
||||
<a target="_blank" rel="noreferrer" href="https://secure.syndetics.com/ffawards.aspx?isbn=[% normalized_isbn %]&type=awards&client=[% SyndeticsClientCode %][% IF ( normalized_upc ) %]&upc=[% normalized_upc %][% END %][% IF ( normalized_oclc ) %]&oclc=[% normalized_oclc %][% END %]">Click to open in new window</a>
|
||||
</span>
|
||||
[% END # / IF SyndeticsAwards && SyndeticsAWARDS1Exists %]
|
||||
[% END # / IF SyndeticsEnabled%]
|
||||
|
|
@ -991,11 +965,7 @@
|
|||
|
||||
[% IF ( SyndeticsEnabled && SyndeticsCoverImages ) %]
|
||||
[% IF ( XISBN.content_identifier_exists ) %]
|
||||
[% IF ( using_https ) %]
|
||||
<img src="https://secure.syndetics.com/index.aspx?isbn=[% XISBN.browser_normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %][% IF ( XISBN.browser_normalized_upc ) %]&upc=[% XISBN.browser_normalized_upc %][% END %][% IF ( XISBN.browser_normalized_oclc ) %]&oclc=[% XISBN.browser_normalized_oclc %][% END %]&type=xw10" alt="" />
|
||||
[% ELSE %]
|
||||
<img src="http://www.syndetics.com/index.aspx?isbn=[% XISBN.browser_normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %][% IF ( XISBN.browser_normalized_upc ) %]&upc=[% XISBN.browser_normalized_upc %][% END %][% IF ( XISBN.browser_normalized_oclc ) %]&oclc=[% XISBN.browser_normalized_oclc %][% END %]&type=xw10" alt="" />
|
||||
[% END %]
|
||||
<img src="https://secure.syndetics.com/index.aspx?isbn=[% XISBN.browser_normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %][% IF ( XISBN.browser_normalized_upc ) %]&upc=[% XISBN.browser_normalized_upc %][% END %][% IF ( XISBN.browser_normalized_oclc ) %]&oclc=[% XISBN.browser_normalized_oclc %][% END %]&type=xw10" alt="" />
|
||||
[% ELSE %]
|
||||
<span class="no-image">No cover image available</span>
|
||||
[% END # / IF XISBN.content_identifier_exists %]
|
||||
|
|
|
|||
|
|
@ -119,11 +119,7 @@
|
|||
[% END %]
|
||||
|
||||
[% IF SyndeticsEnabled && SyndeticsCoverImages %]
|
||||
[% IF using_https %]
|
||||
<img src="https://secure.syndetics.com/index.aspx?isbn=[% issue.normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %]&type=xw10&upc=[% issue.normalized_upc %]&oclc=[% issue.normalized_oclc %]" alt="" class="item-thumbnail" />
|
||||
[% ELSE %]
|
||||
<img src="http://www.syndetics.com/index.aspx?isbn=[% issue.normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %]&type=xw10&upc=[% issue.normalized_upc %]&oclc=[% issue.normalized_oclc %]" alt="" class="item-thumbnail" />
|
||||
[% END %]
|
||||
<img src="https://secure.syndetics.com/index.aspx?isbn=[% issue.normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %]&type=xw10&upc=[% issue.normalized_upc %]&oclc=[% issue.normalized_oclc %]" alt="" class="item-thumbnail" />
|
||||
[% END %]
|
||||
</td>
|
||||
<td>
|
||||
|
|
|
|||
|
|
@ -237,11 +237,7 @@
|
|||
|
||||
[% IF ( SyndeticsEnabled && SyndeticsCoverImages ) %]
|
||||
[% IF ( SEARCH_RESULT.normalized_isbn || SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_oclc ) %]
|
||||
[% IF ( using_https ) %]
|
||||
<span title="[% SEARCH_RESULT.biblionumber %]" id="syndetics-thumbnail[% loop.count %]"><img src="https://secure.syndetics.com/index.aspx?isbn=[% SEARCH_RESULT.normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %]&type=xw10&upc=[% SEARCH_RESULT.normalized_upc %]&oclc=[% SEARCH_RESULT.normalized_oclc %]" alt="" class="item-thumbnail" /></span>
|
||||
[% ELSE %]
|
||||
<span title="[% SEARCH_RESULT.biblionumber %]" id="syndetics-thumbnail[% loop.count %]"><img src="http://www.syndetics.com/index.aspx?isbn=[% SEARCH_RESULT.normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %]&type=xw10&upc=[% SEARCH_RESULT.normalized_upc %]&oclc=[% SEARCH_RESULT.normalized_oclc %]" alt="" class="item-thumbnail" /></span>
|
||||
[% END %]
|
||||
<span title="[% SEARCH_RESULT.biblionumber %]" id="syndetics-thumbnail[% loop.count %]"><img src="https://secure.syndetics.com/index.aspx?isbn=[% SEARCH_RESULT.normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %]&type=xw10&upc=[% SEARCH_RESULT.normalized_upc %]&oclc=[% SEARCH_RESULT.normalized_oclc %]" alt="" class="item-thumbnail" /></span>
|
||||
[% ELSE %]
|
||||
<span class="no-image">No cover image available</span>
|
||||
[% END %]
|
||||
|
|
|
|||
|
|
@ -308,11 +308,7 @@
|
|||
[% END %]
|
||||
|
||||
[% IF ( SyndeticsEnabled && SyndeticsCoverImages ) %]
|
||||
[% IF ( using_https ) %]
|
||||
<span title="[% itemsloo.biblionumber %]" id="syndetics-thumbnail[% loop.count %]"><img src="https://secure.syndetics.com/index.aspx?isbn=[% itemsloo.normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %]&type=xw10&upc=[% itemsloo.normalized_upc %]&oclc=[% itemsloo.normalized_oclc %]" alt="" /></span>
|
||||
[% ELSE %]
|
||||
<span title="[% itemsloo.biblionumber %]" id="syndetics-thumbnail[% loop.count %]"><img src="http://www.syndetics.com/index.aspx?isbn=[% itemsloo.normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %]&type=xw10&upc=[% itemsloo.normalized_upc %]&oclc=[% itemsloo.normalized_oclc %]" alt="" /></span>
|
||||
[% END %]
|
||||
<span title="[% itemsloo.biblionumber %]" id="syndetics-thumbnail[% loop.count %]"><img src="https://secure.syndetics.com/index.aspx?isbn=[% itemsloo.normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %]&type=xw10&upc=[% itemsloo.normalized_upc %]&oclc=[% itemsloo.normalized_oclc %]" alt="" /></span>
|
||||
[% END %]
|
||||
|
||||
[% IF ( GoogleJackets ) %]
|
||||
|
|
|
|||
|
|
@ -13,10 +13,8 @@
|
|||
<description><![CDATA[
|
||||
[% IF ( OPACAmazonCoverImages ) %][% IF ( review.normalized_isbn ) %]<img src="https://images-na.ssl-images-amazon.com/images/P/[% review.normalized_isbn %].01.TZZZZZZZ.jpg" alt="" />[% END %][% END %]
|
||||
|
||||
[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( review.content_identifier_exists ) %][% IF ( using_https ) %]<img src="https://secure.syndetics.com/index.aspx?isbn=[% review.normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %]&type=xw10&upc=[% review.normalized_upc %]&oclc=[% review.normalized_oclc %]" alt="" />
|
||||
[% ELSE %]
|
||||
<img src="http://www.syndetics.com/index.aspx?isbn=[% review.normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %]&type=xw10&upc=[% review.normalized_upc %]&oclc=[% review.normalized_oclc %]" alt="" />
|
||||
[% END %][% END %][% END %][% END %]
|
||||
[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( review.content_identifier_exists ) %]<img src="https://secure.syndetics.com/index.aspx?isbn=[% review.normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %]&type=xw10&upc=[% review.normalized_upc %]&oclc=[% review.normalized_oclc %]" alt="" />
|
||||
[% END %][% END %][% END %]
|
||||
|
||||
[% bt_id = ( review.normalized_upc || review.normalized_isbn ) %]
|
||||
[% IF ( BakerTaylorEnabled && bt_id ) %]<a href="https://[% BakerTaylorBookstoreURL |html %][% bt_id %]"><img alt="See Baker & Taylor" src="[% BakerTaylorImageURL |html %][% bt_id %]" /></a>[% END %]
|
||||
|
|
|
|||
|
|
@ -122,11 +122,7 @@
|
|||
[% END %]
|
||||
|
||||
[% IF ( SyndeticsEnabled && SyndeticsCoverImages ) %]
|
||||
[% IF ( using_https ) %]
|
||||
<img src="https://secure.syndetics.com/index.aspx?isbn=[% review.normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %]&type=xw10&upc=[% review.normalized_upc %]&oclc=[% review.normalized_oclc %]" alt="" class="thumbnail" />
|
||||
[% ELSE %]
|
||||
<img src="http://www.syndetics.com/index.aspx?isbn=[% review.normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %]&type=xw10&upc=[% review.normalized_upc %]&oclc=[% review.normalized_oclc %]" alt="" class="thumbnail" />
|
||||
[% END %]
|
||||
<img src="https://secure.syndetics.com/index.aspx?isbn=[% review.normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %]&type=xw10&upc=[% review.normalized_upc %]&oclc=[% review.normalized_oclc %]" alt="" class="thumbnail" />
|
||||
[% END %]
|
||||
|
||||
[% IF ( GoogleJackets ) %]
|
||||
|
|
|
|||
|
|
@ -242,11 +242,7 @@ Using this account is not recommended because some parts of Koha will not functi
|
|||
[% END %]
|
||||
|
||||
[% IF ( SyndeticsEnabled && SyndeticsCoverImages ) %]
|
||||
[% IF ( using_https ) %]
|
||||
<img src="https://secure.syndetics.com/index.aspx?isbn=[% ISSUE.normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %]&type=xw10&upc=[% ISSUE.normalized_upc %]&oclc=[% ISSUE.normalized_oclc %]" alt="" class="item-thumbnail" />
|
||||
[% ELSE %]
|
||||
<img src="http://www.syndetics.com/index.aspx?isbn=[% ISSUE.normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %]&type=xw10&upc=[% ISSUE.normalized_upc %]&oclc=[% ISSUE.normalized_oclc %]" alt="" class="item-thumbnail" />
|
||||
[% END %]
|
||||
<img src="https://secure.syndetics.com/index.aspx?isbn=[% ISSUE.normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %]&type=xw10&upc=[% ISSUE.normalized_upc %]&oclc=[% ISSUE.normalized_oclc %]" alt="" class="item-thumbnail" />
|
||||
[% END %]
|
||||
|
||||
</td>[% END # / IF JacketImages %]
|
||||
|
|
@ -521,11 +517,7 @@ Using this account is not recommended because some parts of Koha will not functi
|
|||
[% END %]
|
||||
|
||||
[% IF ( SyndeticsCoverImages ) %]
|
||||
[% IF ( using_https ) %]
|
||||
<img src="https://secure.syndetics.com/index.aspx?isbn=[% OVERDUE.normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %]&upc=[% OVERDUE.normalized_upc %]&oclc=[% OVERDUE.normalized_oclc %]&type=xw10" alt="" class="item-thumbnail" />
|
||||
[% ELSE %]
|
||||
<img src="http://www.syndetics.com/index.aspx?isbn=[% OVERDUE.normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %]&upc=[% OVERDUE.normalized_upc %]&oclc=[% OVERDUE.normalized_oclc %]&type=xw10" alt="" class="item-thumbnail" />
|
||||
[% END %]
|
||||
<img src="https://secure.syndetics.com/index.aspx?isbn=[% OVERDUE.normalized_isbn %]/SC.GIF&client=[% SyndeticsClientCode %]&upc=[% OVERDUE.normalized_upc %]&oclc=[% OVERDUE.normalized_oclc %]&type=xw10" alt="" class="item-thumbnail" />
|
||||
[% END %]
|
||||
</td>
|
||||
[% END # /IF jacketcell %]
|
||||
|
|
|
|||
Loading…
Reference in New Issue