Attachment #2165 for bug #4460

View | Details | Raw Unified | Return to bug 4460
Collapse All | Expand All

Lines 174-179 sub SignRequest{ Link Here

(-)a/C4/External/Amazon.pm (+6 lines)
174	return hmac_sha256_base64($string,C4::Context->preference('AWSPrivateKey')) . '=';	174	return hmac_sha256_base64($string,C4::Context->preference('AWSPrivateKey')) . '=';
175	}	175	}
176		176
		177	##
		178	## check_search_inside() doesn't appear to be called anywhere and is using a reader url that I think is
		179	## a bit out of date; it probably makes sense to drop this method unless it's going to be needed.
		180	## I kind of doubt it would even work given the js-ish nature of the Amazon reader page.
		181	## -- 26 May 2010, Reed Wade <reed@catalyst.net.nz>
		182	##
177	sub check_search_inside {	183	sub check_search_inside {
178	my $isbn = shift;	184	my $isbn = shift;
179	my $ua = LWP::UserAgent->new(	185	my $ua = LWP::UserAgent->new(

Lines 116-122 function verify_images() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl (-2 / +2 lines)
116	</div>	116	</div>
117		117
118	<!-- TMPL_IF NAME="AmazonEnabled" --><!-- TMPL_IF NAME="AmazonCoverImages" --><div class="yui-u" id="bookcoverimg">	118	<!-- TMPL_IF NAME="AmazonEnabled" --><!-- TMPL_IF NAME="AmazonCoverImages" --><div class="yui-u" id="bookcoverimg">
119	<a href="http://www.amazon<!-- TMPL_VAR NAME="AmazonTld" -->/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="normalized_isbn" -->.01.MZZZZZZZ.jpg" alt="" /></a></div><!-- /TMPL_IF --><!-- /TMPL_IF -->	119	<a href="http://www.amazon<!-- TMPL_VAR NAME="AmazonTld" -->/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" --><!-- TMPL_IF NAME="AmazonAssocTag" -->?tag=<!-- TMPL_VAR NAME="AmazonAssocTag" --><!-- /TMPL_IF -->"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="normalized_isbn" -->.01.MZZZZZZZ.jpg" alt="" /></a></div><!-- /TMPL_IF --><!-- /TMPL_IF -->
120		120
121	<div class="yui-u" style="margin-top: 1em;">	121	<div class="yui-u" style="margin-top: 1em;">
122	<ul>	122	<ul>
Lines 413-419 function verify_images() { Link Here
413	<!-- TMPL_IF NAME="FRBRizeEditions" --><!-- TMPL_IF NAME="XISBNS" -->	413	<!-- TMPL_IF NAME="FRBRizeEditions" --><!-- TMPL_IF NAME="XISBNS" -->
414	<div id="editions"><h2>Editions</h2>	414	<div id="editions"><h2>Editions</h2>
415	<table>	415	<table>
416	<!-- TMPL_LOOP NAME="XISBNS" --><tr><!-- TMPL_IF NAME="AmazonEnabled" --><td><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="normalized_isbn" -->.01._AA75_PU_PU-5_.jpg" /></a></td><!-- /TMPL_IF --><td><!-- TMPL_IF NAME="noItemTypeImages" --><!-- TMPL_VAR NAME="description" --><!-- TMPL_ELSE --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->"><!-- /TMPL_IF --></td><td>	416	<!-- TMPL_LOOP NAME="XISBNS" --><tr><!-- TMPL_IF NAME="AmazonEnabled" --><td><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" --><!-- TMPL_IF NAME="AmazonAssocTag" -->?tag=<!-- TMPL_VAR NAME="AmazonAssocTag" --><!-- /TMPL_IF -->"><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="normalized_isbn" -->.01._AA75_PU_PU-5_.jpg" /></a></td><!-- /TMPL_IF --><td><!-- TMPL_IF NAME="noItemTypeImages" --><!-- TMPL_VAR NAME="description" --><!-- TMPL_ELSE --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->"><!-- /TMPL_IF --></td><td>
417	<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a> by <!-- TMPL_VAR NAME="author" --> ©<!-- TMPL_VAR NAME="copyrightdate" -->	417	<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a> by <!-- TMPL_VAR NAME="author" --> ©<!-- TMPL_VAR NAME="copyrightdate" -->
418	<!-- TMPL_IF name="publishercode" -->	418	<!-- TMPL_IF name="publishercode" -->
419	<!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_IF name="place" -->(<!-- TMPL_VAR NAME="place"-->)<!--/TMPL_IF--> <!-- TMPL_IF NAME="publicationyear" -->, <!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="editionstatement" --><!-- TMPL_VAR NAME="editionstatement" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="editionresponsability" --><!-- TMPL_VAR NAME="editionresponsability" --><!-- /TMPL_IF -->	419	<!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_IF name="place" -->(<!-- TMPL_VAR NAME="place"-->)<!--/TMPL_IF--> <!-- TMPL_IF NAME="publicationyear" -->, <!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="editionstatement" --><!-- TMPL_VAR NAME="editionstatement" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="editionresponsability" --><!-- TMPL_VAR NAME="editionresponsability" --><!-- /TMPL_IF -->

Lines 70-76 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl (-1 / +1 lines)
70	<div id="catalogue_detail_biblio">	70	<div id="catalogue_detail_biblio">
71		71
72	<div id="bookcover">	72	<div id="bookcover">
73	<!-- TMPL_IF NAME="OPACAmazonEnabled" --><!-- TMPL_IF NAME="OPACAmazonCoverImages" --><!-- TMPL_IF NAME="OPACURLOpenInNewWindow" --><a href="http://www.amazon<!-- TMPL_VAR NAME="AmazonTld" -->/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link" target="_blank"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="normalized_isbn" -->.01.MZZZZZZZ.jpg" alt="Cover Image" /></a><!-- TMPL_ELSE --><a href="http://www.amazon<!-- TMPL_VAR NAME="AmazonTld" -->/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="normalized_isbn" -->.01.MZZZZZZZ.jpg" alt="Cover Image" /></a><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->	73	<!-- TMPL_IF NAME="OPACAmazonEnabled" --><!-- TMPL_IF NAME="OPACAmazonCoverImages" --><!-- TMPL_IF NAME="OPACURLOpenInNewWindow" --><a href="http://www.amazon<!-- TMPL_VAR NAME="AmazonTld" -->/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" --><!-- TMPL_IF NAME="AmazonAssocTag" -->?tag=<!-- TMPL_VAR NAME="AmazonAssocTag" --><!-- /TMPL_IF -->" target="_blank"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="normalized_isbn" -->.01.MZZZZZZZ.jpg" alt="Cover Image" /></a><!-- TMPL_ELSE --><a href="http://www.amazon<!-- TMPL_VAR NAME="AmazonTld" -->/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" --><!-- TMPL_IF NAME="AmazonAssocTag" -->?tag=<!-- TMPL_VAR NAME="AmazonAssocTag" --><!-- /TMPL_IF -->"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="normalized_isbn" -->.01.MZZZZZZZ.jpg" alt="Cover Image" /></a><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
74		74
75	<!-- TMPL_IF NAME="SyndeticsEnabled" --><!-- TMPL_IF NAME="SyndeticsCoverImages" --><!-- TMPL_IF NAME="content_identifier_exists" --><!-- TMPL_IF NAME="using_https" -->	75	<!-- TMPL_IF NAME="SyndeticsEnabled" --><!-- TMPL_IF NAME="SyndeticsCoverImages" --><!-- TMPL_IF NAME="content_identifier_exists" --><!-- TMPL_IF NAME="using_https" -->
76	<img src="https://secure.syndetics.com/index.aspx?isbn=<!-- TMPL_VAR NAME="normalized_isbn" -->/<!-- TMPL_VAR NAME="SyndeticsCoverImageSize" -->.GIF&client=<!-- TMPL_VAR NAME="SyndeticsClientCode" -->&type=xw10&upc=<!-- TMPL_VAR NAME="normalized_upc" -->&oclc=<!-- TMPL_VAR NAME="normalized_oclc" -->" alt="" class="thumbnail" />	76	<img src="https://secure.syndetics.com/index.aspx?isbn=<!-- TMPL_VAR NAME="normalized_isbn" -->/<!-- TMPL_VAR NAME="SyndeticsCoverImageSize" -->.GIF&client=<!-- TMPL_VAR NAME="SyndeticsClientCode" -->&type=xw10&upc=<!-- TMPL_VAR NAME="normalized_upc" -->&oclc=<!-- TMPL_VAR NAME="normalized_oclc" -->" alt="" class="thumbnail" />

Lines 49-55 TMPL_ELSE -->Title<!-- /TMPL_UNLESS --></th> Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl (-1 / +1 lines)
49		49
50	<!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS -->	50	<!-- TMPL_UNLESS NAME="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS -->
51	<td>	51	<td>
52	<!-- TMPL_IF NAME="OPACAmazonEnabled" --><!-- TMPL_IF NAME="OPACAmazonCoverImages" --><!-- TMPL_IF NAME="normalized_isbn" --><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="normalized_isbn" -->.01.THUMBZZZ.jpg" alt="Cover Image" /></a><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->	52	<!-- TMPL_IF NAME="OPACAmazonEnabled" --><!-- TMPL_IF NAME="OPACAmazonCoverImages" --><!-- TMPL_IF NAME="normalized_isbn" --><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" --><!-- TMPL_IF NAME="AmazonAssocTag" -->?tag=<!-- TMPL_VAR NAME="AmazonAssocTag" --><!-- /TMPL_IF -->"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="normalized_isbn" -->.01.THUMBZZZ.jpg" alt="Cover Image" /></a><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
53		53
54	<!-- TMPL_IF NAME="GoogleJackets" --><!-- TMPL_IF NAME="normalized_isbn" --><div style="block" title="<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" class="<!-- TMPL_VAR name="normalized_isbn" -->" id="gbs-thumbnail<!--TMPL_VAR NAME="__counter__"-->"></div><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF -->	54	<!-- TMPL_IF NAME="GoogleJackets" --><!-- TMPL_IF NAME="normalized_isbn" --><div style="block" title="<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" class="<!-- TMPL_VAR name="normalized_isbn" -->" id="gbs-thumbnail<!--TMPL_VAR NAME="__counter__"-->"></div><!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF -->
55		55

Lines 220-226 $.tablesorter.addParser({ Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl (-3 / +2 lines)
220		220
221	<!-- TMPL_IF NAME="JacketImages" --><td class="jacketcell">	221	<!-- TMPL_IF NAME="JacketImages" --><td class="jacketcell">
222		222
223	<!-- TMPL_IF NAME="OPACAmazonCoverImages" --><!-- TMPL_IF NAME="normalized_isbn" --><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link" title="View at Amazon.com"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="normalized_isbn" -->.01.THUMBZZZ.jpg" alt="Cover Image" /></a><!-- TMPL_ELSE --><a href="#"><span class="no-image">No cover image available</span></a><!-- /TMPL_IF --><!-- /TMPL_IF -->	223	<!-- TMPL_IF NAME="OPACAmazonCoverImages" --><!-- TMPL_IF NAME="normalized_isbn" --><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" --><!-- TMPL_IF NAME="AmazonAssocTag" -->?tag=<!-- TMPL_VAR NAME="AmazonAssocTag" --><!-- /TMPL_IF -->" title="View at Amazon.com"><img border="0" src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="normalized_isbn" -->.01.THUMBZZZ.jpg" alt="Cover Image" /></a><!-- TMPL_ELSE --><a href="#"><span class="no-image">No cover image available</span></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
224		224
225	<!-- TMPL_IF NAME="GoogleJackets" --><!-- TMPL_IF NAME="normalized_isbn" --><div style="display:block;" title="Click to view in Google Books" class="<!-- TMPL_VAR NAME="normalized_isbn" -->" id="gbs-thumbnail<!--TMPL_VAR NAME="__counter__"-->"></div><!-- TMPL_ELSE --><a href="http://books.google.com/books?q=<!-- TMPL_VAR NAME="title" escape="url" -->"><span class="no-image">No cover image available</span></a><!-- /TMPL_IF --><!-- /TMPL_IF -->	225	<!-- TMPL_IF NAME="GoogleJackets" --><!-- TMPL_IF NAME="normalized_isbn" --><div style="display:block;" title="Click to view in Google Books" class="<!-- TMPL_VAR NAME="normalized_isbn" -->" id="gbs-thumbnail<!--TMPL_VAR NAME="__counter__"-->"></div><!-- TMPL_ELSE --><a href="http://books.google.com/books?q=<!-- TMPL_VAR NAME="title" escape="url" -->"><span class="no-image">No cover image available</span></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
226		226
Lines 295-301 $.tablesorter.addParser({ Link Here
295	<tr>	295	<tr>
296	<!-- TMPL_IF NAME="JacketImages" --><td class="jacketcell">	296	<!-- TMPL_IF NAME="JacketImages" --><td class="jacketcell">
297		297
298	<!-- TMPL_IF NAME="OPACAmazonCoverImages" --><!-- TMPL_IF NAME="normalized_isbn" --><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link" title="View at Amazon.com"><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="normalized_isbn" -->.01.THUMBZZZ.jpg" alt="" class="thumbnail" /></a><!-- TMPL_ELSE --><a href="#"><span class="no-image">No cover image available</span></a><!-- /TMPL_IF --><!-- /TMPL_IF -->	298	<!-- TMPL_IF NAME="OPACAmazonCoverImages" --><!-- TMPL_IF NAME="normalized_isbn" --><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" --><!-- TMPL_IF NAME="AmazonAssocTag" -->?tag=<!-- TMPL_VAR NAME="AmazonAssocTag" --><!-- /TMPL_IF -->" title="View at Amazon.com"><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="normalized_isbn" -->.01.THUMBZZZ.jpg" alt="" class="thumbnail" /></a><!-- TMPL_ELSE --><a href="#"><span class="no-image">No cover image available</span></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
299		299
300	<!-- TMPL_IF NAME="GoogleJackets" --><!-- TMPL_IF NAME="normalized_isbn" --><div style="display:block;" title="Click to view in Google Books" class="<!-- TMPL_VAR NAME="normalized_isbn" -->" id="gbs-thumbnail<!--TMPL_VAR NAME="__counter__"-->"></div><!-- TMPL_ELSE --><a href="http://books.google.com/books?q=<!-- TMPL_VAR NAME="title" escape="url" -->"><span class="no-image">No cover image available</span></a><!-- /TMPL_IF --><!-- /TMPL_IF -->	300	<!-- TMPL_IF NAME="GoogleJackets" --><!-- TMPL_IF NAME="normalized_isbn" --><div style="display:block;" title="Click to view in Google Books" class="<!-- TMPL_VAR NAME="normalized_isbn" -->" id="gbs-thumbnail<!--TMPL_VAR NAME="__counter__"-->"></div><!-- TMPL_ELSE --><a href="http://books.google.com/books?q=<!-- TMPL_VAR NAME="title" escape="url" -->"><span class="no-image">No cover image available</span></a><!-- /TMPL_IF --><!-- /TMPL_IF -->
301		301
302	-

Return to bug 4460

Lines 354-359 sub get_template_and_user { Link Here

(-)a/C4/Auth.pm (+2 lines)
354	if ( $in->{'type'} eq "intranet" ) {	354	if ( $in->{'type'} eq "intranet" ) {
355	$template->param(	355	$template->param(
356	AmazonContent => C4::Context->preference("AmazonContent"),	356	AmazonContent => C4::Context->preference("AmazonContent"),
		357	AmazonAssocTag => C4::Context->preference("AmazonAssocTag"),
357	AmazonCoverImages => C4::Context->preference("AmazonCoverImages"),	358	AmazonCoverImages => C4::Context->preference("AmazonCoverImages"),
358	AmazonEnabled => C4::Context->preference("AmazonEnabled"),	359	AmazonEnabled => C4::Context->preference("AmazonEnabled"),
359	AmazonSimilarItems => C4::Context->preference("AmazonSimilarItems"),	360	AmazonSimilarItems => C4::Context->preference("AmazonSimilarItems"),
Lines 399-404 sub get_template_and_user { Link Here
399	}	400	}
400	$template->param(	401	$template->param(
401	AmazonContent => "" . C4::Context->preference("AmazonContent"),	402	AmazonContent => "" . C4::Context->preference("AmazonContent"),
		403	AmazonAssocTag => C4::Context->preference("AmazonAssocTag"),
402	AnonSuggestions => "" . C4::Context->preference("AnonSuggestions"),	404	AnonSuggestions => "" . C4::Context->preference("AnonSuggestions"),
403	AuthorisedValueImages => C4::Context->preference("AuthorisedValueImages"),	405	AuthorisedValueImages => C4::Context->preference("AuthorisedValueImages"),
404	LibraryName => "" . C4::Context->preference("LibraryName"),	406	LibraryName => "" . C4::Context->preference("LibraryName"),