[Patches] [PATCH] [SIGNED-OFF] Bug 7307: use of the OPACBaseURL syspref for

koha-patchbot at kohaaloha.com koha-patchbot at kohaaloha.com
Mon Dec 5 07:35:03 NZDT 2011


From: Adrien Saurat <adrien.saurat at biblibre.com>
Date: Fri, 2 Dec 2011 14:09:37 +0100
Subject: [PATCH] [SIGNED-OFF] Bug 7307: use of the OPACBaseURL syspref for
 RSS feed

The template opac-opensearch.tt is ready to use
OPACBaseURL, but it doesn't get the value.
This patch corrects this in opac-search.pl.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83 at web.de>
To reproduce the bug :

1) Admin : type a value in the OPACBaseURL system preference.

2) Opac : do a search on anything, then click on the RSS button. The url will
stay the same, when it should be modified by the system preference.

Thx for the test plan!
---
 opac/opac-search.pl |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 42eb0ec..cd7d6d5 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -714,11 +714,19 @@ my $session = get_session($cgi->cookie("CGISESSID"));
 my @addpubshelves;
 my $pubshelves = $session->param('pubshelves');
 my $barshelves = $session->param('barshelves');
+my $OPACRssURL;
 foreach my $shelf (@$pubshelves) {
 	next if ( ($shelf->{'owner'} != ($borrowernumber ? $borrowernumber : -1)) && ($shelf->{'category'} < 3) );
 	push (@addpubshelves, $shelf);
 }
 
+if ( C4::Context->preference('OPACBaseURL') ne '' ) {
+	$OPACRssURL = C4::Context->preference('OPACBaseURL');
+	$OPACRssURL=~s/https:/http:/;
+    if ( $OPACRssURL !~ m/^http:\/\// ) { $OPACRssURL = "http://" . $OPACRssURL }
+	$template->param( OPACBaseURL     => $OPACRssURL );
+}
+
 if (@addpubshelves) {
 	$template->param( addpubshelves     => scalar (@addpubshelves));
 	$template->param( addpubshelvesloop => \@addpubshelves);
-- 
1.7.5.4


More information about the Patches mailing list