[koha-commits] main Koha release repository branch master updated. v17.11.00-274-g5e04894
Git repo owner
gitmaster at git.koha-community.org
Tue Jan 9 21:34:22 CET 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, master has been updated
via 5e04894b25d1bf9f2a3fdf8ffee00f965bdb07b5 (commit)
via b785d509b1be70b3dfa07b052b4b3357649b2546 (commit)
via 156bcdaac41e4e9ca75877a15210956c86b9c0ab (commit)
via e0ed339ad5596e98101087505b72fb35a07b160b (commit)
via b1e4acac3c7451044c28d02d05881040adee0592 (commit)
via 665fcd2777928c947ad3aff68b9f8a8bc97575ef (commit)
via 3e606fdd1b0e12a59c39585b1c7f4d418afe9e1a (commit)
via 1fd17efba8631f91fde33525b9de42f10c58a95a (commit)
via 09e330aa24e2015be72ad0f6412adcd64cf3499e (commit)
via 28dfd27a1ac54fdcf608fd971d6e84e1fe608ffd (commit)
via d9ac9596483a198af79ee3ad987e9d0247eb75ee (commit)
via 3647665f46fb89b3cb67cfde611f9e73c8037668 (commit)
via d8dc86bc4bde4b5744cd0bc954e1e5767250dde2 (commit)
via 67bf5baf1507fbb35080e15238c55dc8762edd9a (commit)
via e9e5f3d3806e4866baeda4a3e29bf751e5066389 (commit)
via 1cff43a3d5fb8587dcd69ffd15ff65870b241788 (commit)
via 61452ce1f2726ea651008863d693bfcd9feac193 (commit)
via 2ba4af723cf9b893934fcca8d7b94a384d6a1e1d (commit)
via ecc6b8b61532afdfaed7436a76d32369b48ba306 (commit)
via 950fc8e101886821879066b33e389a47fb0a9782 (commit)
via 26864e9f6f129c16959f680b7fa08468a8ad652d (commit)
via e0e063a85b654af623ea1da068d6fd23e8ec3833 (commit)
via feeab2b3a0f78a600560395326b4538104e25ff1 (commit)
from 99797acd83116f0f182a55cc847adddd42b4f558 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5e04894b25d1bf9f2a3fdf8ffee00f965bdb07b5
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jan 9 17:20:42 2018 -0300
Bug 16782: Use uri filter instead of html
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b785d509b1be70b3dfa07b052b4b3357649b2546
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Mon Jan 8 15:37:45 2018 +0000
Bug 16782: (QA follow-up) Use Koha.Preference for staffClientBaseURL and provide classes
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 156bcdaac41e4e9ca75877a15210956c86b9c0ab
Author: Liz Rea <liz at catalyst.net.nz>
Date: Thu Oct 19 16:23:43 2017 +1300
Bug 16782: Disclose JSON URL for reports on the saved report page
It has always annoyed me that you had to look at the help to divine the url for a report.
This patch works it out and displays it for you in a new column on the saved reports table.
Requirements:
- OPACBaseURL and staffClientBaseURL preferences must be set for the urls to be complete. It's ok if they are not, but it's better if they are.
- You must have a saved report that is public to your OPAC, and one that is not public.
To test:
- create a public saved report and a private staff report. They can be anything.
- view the saved reports page, note that under a new heading of JSON URL the link to the json feed for that report shows.
- copying and pasting that link into the address bar, or clicking it, should take you to the results of the selected report.
sponsored-by: Catalyst IT
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Bug 16782 - missing </td>, fixed now
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e0ed339ad5596e98101087505b72fb35a07b160b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Tue Jan 9 17:13:41 2018 -0300
Bug 11046: Improve the readability of the regex using named capture
The tests tell me I am good
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit b1e4acac3c7451044c28d02d05881040adee0592
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Mon Aug 28 13:14:08 2017 +0200
Bug 11046: Add the form YYY-? for uncertain years
This form occurred in Dutch ISBD rules.
The question mark should follow the hyphen(s).
Test plan:
Run t/db_dependent/Biblio/TransformMarcToKoha.t
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
TransformMarcToKoha tests passed. Also this patch passed QA test tool
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 665fcd2777928c947ad3aff68b9f8a8bc97575ef
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Aug 25 07:39:16 2017 +0200
Bug 11046: Better handling of uncertain years for publicationyear
This patch makes it possible that uncertain year like 18.. or 197x are
converted to 1800 or 1970 in Koha field copyrightdate (MARC21) or
publicationyear (UNIMARC). (The corresponding MARC record will not be
changed obviously.)
This change will allow for better results when sorting search results or
list contents on copyrightdate. Currently, things like 18.. will sort
together with zero.
Note: The regex now allows four possible uncertain year markers: x or X,
question mark or dot.
Test plan:
[1] Run t/db_dependent/Biblio/TransformMarcToKoha.t
[2] Edit a biblio record. Save 18.. into 260c. Check biblio.copyrightdate.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Followed test plan, patch worked as described, it also passed QA test
tool
Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3e606fdd1b0e12a59c39585b1c7f4d418afe9e1a
Author: Nick Clemens <nick at bywatersolutions.com>
Date: Tue Oct 24 19:11:28 2017 +0000
Bug 18417: (follow-up) Document new shortcuts in dropdown
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1fd17efba8631f91fde33525b9de42f10c58a95a
Author: Jesse Weaver <pianohacker at gmail.com>
Date: Tue Nov 10 12:02:06 2015 -0700
Bug 18417: Advanced Editor (Rancor) add shortcuts for copyright symbols (C) (P)
To test:
1 - Apply patch
2 - Open advanced cataloging editor
3 - Try using Alt+P and Alt+C and note symbols are added
4 - Save record and ensure symbols are saved
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 09e330aa24e2015be72ad0f6412adcd64cf3499e
Author: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
Date: Tue Feb 3 13:52:26 2015 +0200
Bug 13660: Exclude export phase and use existing exported MARCXML - rebuild_zebra_sliced.sh
When looking for a bad MARC Record using the rebuild_zebra_sliced.sh, it is
useful to skip the complete MARCXML exporting from Koha and reuse the exported
files for Zebra indexing.
This patch adds a new parameter:
-x | --exclude-export Do not export Biblios from Koha, but use the existing
export-dir
Which depends on the:
-d | --export-dir Where rebuild_zebra.pl will export data
Default: $EXPORTDIR
!---------!
! TEST PLAN !
!---------!
1. Run
"./rebuild_zebra_sliced.sh --length 1000"
to export 1000 MARC Records
and slice them to one big 1000-Record chunk.
2. Realize that you get an imaginary "stack smashing detected"-error crashing
your indexing at some Record you dont know of and can't make out from the
indexing logging.
3. Start looking for the bad Record by running:
"./rebuild_zebra_sliced.sh --exlude-export --chunk-size 10"
To skip Biblios export from Koha which takes ~2h and get straight into
splitting your exported biblios to chunks of 10, and indexing them. You
know which chunk fails so it is much easier to find the issue there.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 28dfd27a1ac54fdcf608fd971d6e84e1fe608ffd
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jan 5 14:02:45 2018 -0300
Bug 17833: Make sure this warning will not be ignored
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d9ac9596483a198af79ee3ad987e9d0247eb75ee
Author: Olli-Antti Kivilahti <olli-antti.kivilahti at jns.fi>
Date: Mon Jan 2 13:01:02 2017 +0200
Bug 17833: Add a warning if memcached init failed
If memcached or the connection to it is misconfigured, show simple warnings to help
identify the problem.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 3647665f46fb89b3cb67cfde611f9e73c8037668
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Jan 5 11:00:07 2018 -0300
Bug 19280: refresh unblessed patron too
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit d8dc86bc4bde4b5744cd0bc954e1e5767250dde2
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Sep 8 12:51:28 2017 -0300
Bug 19280: Pass a Koha::Patron to CanBookBeIssued
We need to make subroutine from C4 use more Koha::Object objects
Seeing bug 19276, starting here is a good start.
Test plan:
The tests should still pass.
Signed-off-by: Jon Knight <J.P.Knight at lboro.ac.uk>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 67bf5baf1507fbb35080e15238c55dc8762edd9a
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 2 16:13:32 2017 -0300
Bug 19568: Escape url params with url filter - opac-opensearch.tt
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e9e5f3d3806e4866baeda4a3e29bf751e5066389
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 2 16:14:12 2017 -0300
Bug 19569: Set X-Frame-Options=SAMEORIGIN - opac-showmarc.ok
Before and after:
wget 'http://catalogue.kohadev.org/cgi-bin/koha/opac-showmarc.pl?id=1&viewas=html'
must be the same
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 1cff43a3d5fb8587dcd69ffd15ff65870b241788
Author: Mark Tompsett <mtompset at hotmail.com>
Date: Mon Nov 6 15:10:45 2017 +0000
Bug 19570: Add autocomplete=off to opac-main as well
To confirm all the files were modified for opac, typed
this:
$ git grep -i password | grep opac | grep -v "[.]po:" | grep
"opac[^/]*[.]tt:" | cut -f1 -d: | sort -u
The follow output was handled as follows:
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-passwd.tt
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-registration-confirmation.tt
These were already done in the first patch.
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-password-recovery.tt
This already had the autocomplete modification.
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
This was a false-find. There was no modification necessary.
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
This is the modal login in. This patch amends it.
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 61452ce1f2726ea651008863d693bfcd9feac193
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Thu Nov 2 16:24:00 2017 -0300
Bug 19570: Add autocomplete='off' for login forms at the opac
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 2ba4af723cf9b893934fcca8d7b94a384d6a1e1d
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Fri Dec 8 14:57:15 2017 -0300
Bug 19319: Only fetch the record if it exists
We already know if the bibliographic record exists (404 redirect),
we can avoid unecessary fetches
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit ecc6b8b61532afdfaed7436a76d32369b48ba306
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date: Fri Dec 8 09:46:02 2017 +0100
Bug 19319: (QA follow-up) Biblionumber leftovers in opac-detail.tt
Correcting a few biblionumber template var leftovers in opac-detail
template. They were combined with url filter instead of html.
Test plan:
[1] Look for [^.;?]biblionumber in opac-detail.tt and verify that these
occurrences are fine.
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 950fc8e101886821879066b33e389a47fb0a9782
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Thu Sep 14 11:52:08 2017 -0400
Bug 19319: Reflected XSS Vulnerability in opac-MARCdetail.pl
Try going to this URL on your site: /cgi-bin/koha/opac-MARCdetail.pl?biblionumber=2"><TEST>
Test Plan:
1) Go to /cgi-bin/koha/opac-MARCdetail.pl?biblionumber=2"><TEST>
2) Note <TEST> is embedded all over the html
3) Apply this patch
4) Refresh the page, note the injection is gone!
5) run koha qa test tools
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit 26864e9f6f129c16959f680b7fa08468a8ad652d
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date: Sun Nov 12 21:14:41 2017 +0530
Bug 19611: Fix XSS Flaws in supplier.pl
Test
1. Hit the page /cgi-bin/koha/acqui/supplier.pl?op=enter
2. Add a text in the field Name that contains java script
3. Save the page.
4. Notice js is execute
5. Apply patch and reload the js is escaped
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit e0e063a85b654af623ea1da068d6fd23e8ec3833
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date: Mon Nov 13 09:05:14 2017 +0530
Bug 19612: Fix XSS in members/memberentry.pl
To Test
1. Hit the page /cgi-bin/koha/members/memberentry.pl
2. Add a text in the field address, address2, city, state, country,
zipcode, B_streetnumber, B_city, B_country, B_zipcode that contains js
3. Save the page.
4. Notice js is execute
5. Apply patch and reload, the js is escaped
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
commit feeab2b3a0f78a600560395326b4538104e25ff1
Author: Amit Gupta <amit.gupta at informaticsglobal.com>
Date: Mon Nov 13 09:27:44 2017 +0530
Bug 19614: Fix XSS in members/pay.pl
To Test
1. Hit the page /cgi-bin/koha/members/memberentry.pl
2. Add a text in the field firstname, surname that contains js
3. Save the page.
4. click on fine tab
5. Notice js is execute
6. Apply patch and reload, the js is escaped
Signed-off-by: Chris Cormack <chris at bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
-----------------------------------------------------------------------
Summary of changes:
C4/Biblio.pm | 14 +++--
C4/Circulation.pm | 54 ++++++++++----------
C4/ILSDI/Services.pm | 2 +-
Koha/Cache.pm | 6 ++-
circ/circulation.pl | 2 +-
.../lib/koha/cateditor/marc-editor.js | 8 +++
.../includes/member-display-address-style-us.inc | 8 +--
.../member-display-alt-address-style-us.inc | 8 +--
.../prog/en/modules/acqui/booksellers.tt | 2 +-
.../prog/en/modules/acqui/supplier.tt | 2 +-
.../prog/en/modules/cataloguing/editor.tt | 8 +++
.../prog/en/modules/members/moremember.tt | 20 ++++----
.../intranet-tmpl/prog/en/modules/members/pay.tt | 6 +--
.../en/modules/reports/guided_reports_start.tt | 16 ++++--
.../bootstrap/en/includes/opac-detail-sidebar.inc | 14 ++---
.../bootstrap/en/modules/opac-ISBDdetail.tt | 2 +-
.../bootstrap/en/modules/opac-MARCdetail.tt | 12 ++---
.../opac-tmpl/bootstrap/en/modules/opac-auth.tt | 4 +-
.../opac-tmpl/bootstrap/en/modules/opac-detail.tt | 48 ++++++++---------
.../opac-tmpl/bootstrap/en/modules/opac-main.tt | 2 +-
.../bootstrap/en/modules/opac-memberentry.tt | 2 +-
.../bootstrap/en/modules/opac-opensearch.tt | 8 +--
.../opac-tmpl/bootstrap/en/modules/opac-passwd.tt | 4 +-
.../en/modules/opac-registration-confirmation.tt | 2 +-
misc/migration_tools/rebuild_zebra_sliced.sh | 15 ++++--
opac/opac-ISBDdetail.pl | 7 ++-
opac/opac-MARCdetail.pl | 2 +-
opac/opac-detail.pl | 5 +-
opac/opac-showmarc.pl | 3 +-
opac/sco/sco-main.pl | 10 ++--
t/db_dependent/Biblio/TransformMarcToKoha.t | 17 +++++-
t/db_dependent/Circulation.t | 24 ++++-----
.../Circulation/NoIssuesChargeGuarantees.t | 8 +--
t/db_dependent/Circulation/SwitchOnSiteCheckouts.t | 15 +++---
t/db_dependent/Circulation/dateexpiry.t | 15 +++---
t/db_dependent/DecreaseLoanHighHolds.t | 7 +--
t/db_dependent/Patron/Borrower_PrevCheckout.t | 4 +-
t/db_dependent/rollingloans.t | 6 +--
38 files changed, 229 insertions(+), 163 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list