Bugzilla – Attachment 34910 Details for
Bug 13485
Add a page to display links to restricted sites
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 13485 [QA Followup]
PASSED-QA-Bug-13485-QA-Followup.patch (text/plain), 2.03 KB, created by
Kyle M Hall (khall)
on 2015-01-02 16:29:43 UTC
(
hide
)
Description:
[PASSED QA] Bug 13485 [QA Followup]
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2015-01-02 16:29:43 UTC
Size:
2.03 KB
patch
obsolete
>From 21592386507976e2a985819059bc481dcb89f72b Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Thu, 1 Jan 2015 20:49:05 -0500 >Subject: [PATCH] [PASSED QA] Bug 13485 [QA Followup] > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > installer/data/mysql/updatedatabase.pl | 2 +- > opac/opac-proxypage.pl | 5 ++--- > 2 files changed, 3 insertions(+), 4 deletions(-) > >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index 93a3231..9297e23 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -9631,7 +9631,7 @@ if ( CheckVersion($DBversion) ) { > $DBversion = "XXX"; > if ( CheckVersion($DBversion) ) { > $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ProxyPageLocalIPs','',NULL,'Beginning of IP addresses considered as local (comma separated ex: \"127.0.0,127.0.2\")','Free'), ('ProxyPageContent','',NULL,'HTML content of the proxy page','TextArea'), ('ProxyPageTitle','',NULL,'Title of the proxy page (breadcrumb and header)','Free')"); >- print "Upgrade done (Proxy page)\n"; >+ print "Upgrade done (Bug 13485 - Add a proxy page)\n"; > SetVersion ($DBversion); > } > >diff --git a/opac/opac-proxypage.pl b/opac/opac-proxypage.pl >index f2f175b..badd8d0 100755 >--- a/opac/opac-proxypage.pl >+++ b/opac/opac-proxypage.pl >@@ -17,12 +17,11 @@ > # with Koha; if not, write to the Free Software Foundation, Inc., > # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > >+use Modern::Perl; > >-use strict; > use CGI; > use C4::Auth; > use C4::Output; >-use warnings; > > my $localNetwork = C4::Context->preference('ProxyPageLocalIPs'); > my $userIP = $ENV{'REMOTE_ADDR'}; >@@ -51,4 +50,4 @@ $template->param( > ProxyPageTitle => C4::Context->preference('ProxyPageTitle') > ); > >-output_html_with_http_headers $query, $cookie, $template->output; >\ No newline at end of file >+output_html_with_http_headers $query, $cookie, $template->output; >-- >1.7.2.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 13485
:
34597
|
34598
|
34604
|
34908
|
34909
|
34910
|
40820
|
40821
|
40822
|
41377
|
41378