Commit Graph

25827 Commits

Author SHA1 Message Date
Jonathan Druart fd6594246e Bug 16800: Fix XSS in catalogue/*detail.tt - author
Test plan:
catalogue a bibliographic record with a author=
  </title><script>alert('XSS')</script>

Go on the detail pages.
=> Without this patch you will see the alert
=> With this patch, no more alert

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 3169434cfa)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 4ab091d3bf)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-10-14 12:12:30 +02:00
Jonathan Druart c55f33030f Bug 16800: Fix XSS in catalogue/*detail.tt - title
Test plan:
catalogue a bibliographic record with a title=
  </title><script>alert('XSS')</script>

Go on the detail pages.
=> Without this patch you will see the alert
=> With this patch, no more alert

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

This of course means that any html in the title will no longer be
evaluated. :

Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 515208d5ec)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit c27216cce8)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-10-14 12:12:13 +02:00
Julian Maurice cd11a12093 Increment version for 3.22.11 release
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-23 12:42:16 +02:00
Julian Maurice 0cc67cc444 Update release notes for 3.22.11 release
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-23 12:42:16 +02:00
Julian Maurice 19f2e80026 Translation updates for Koha 3.22.11
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-23 12:42:06 +02:00
Mirko Tietgen 00bb0f6208 Bug 17121 - debian/control.in update: change maintainer for 3.22.x
Changing the package maintainer and removing a whitespace in
debian/control.in.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-23 09:15:51 +02:00
Tomas Cohen Arazi ab27ec60d3 Bug 17262: Inject MEMCACHED_* variables into Plack's env
This patch adds two functions to koha-functions.sh to read the
MEMCACHED_* variables from configured instances' apache files (the only
source for that info for now).

It then tweaks koha-plack's start_plack() function so it exports the
variables to env before launching starman.

The patch seems trivial, but it highlights a bigger problem with our
Plack integration as the starman server seems to hang if those
environment variables are defined!

Sponsored-by: ByWater Solutions
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 29df6161ef)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-23 08:41:14 +02:00
Julian Maurice f30e123976 Bug 17010: Fix syntax error (RMaint followup) 2016-09-16 14:07:28 +02:00
Mirko Tietgen 310de6cee0 3.22.10 debian control fixes for debian package
This is what went into the 3.22.10 package, should go in 3.22.11

https://bugs.koha-community.org/show_bug.cgi?id=16788
2016-09-16 12:14:29 +02:00
Magnus Enger 74f9a95801 Bug 17266 - Update man page for koha-remove with -p
Bug 9754 added the -p|--purge-all option to koha-remove, but this
was not documented in the man page. This patch fixes that.

To test:
Run these commands and look at the formatted man page:
$ xsltproc /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl \
  debian/docs/koha-remove.xml
$ man -l koha-remove.8

Make sure this test passes:
$ prove -v xt/verify-debian-docbook.t

Signed-off-by: Liz Rea <liz@catalyst.net.nz>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a5806c21d0)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 78ab4814f0)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 12:05:23 +02:00
Kyle M Hall acd7f9150f Bug 12629 - Software error when trying to merge records from different frameworks
Test Plan:
1) Choose a bib record that has the default framework.
2) Add a second record using that fast add framework.
3) Merge the records; switch to "Using framework: Default", and choose the original record (i.e. the one that had the default framework) as the merge reference. Clicking 'Next' will trigger the error.
4) Apply this patch
5) Repeat steps 1 - 3, no error should occur

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit e8fcc651a3)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 0b4d68f060)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 12:04:48 +02:00
Olli-Antti Kivilahti 1096c177a7 Bug 16556 - KohaToMarcMapped columns sharing same field with biblio(item)number are removed.
REPLICATE ISSUE:

1. Map biblio.frameworkcode to 999$b
2. Map biblio.biblionumber to 999$c
3. Add a record with something in 999$b
4. 999$b is removed by C4::Biblio::AddBiblio()

After this patch, the field used by biblio.biblionumber or biblioitems.biblioitemnumber
is not removed and created anew, thus dropping all existing additions.

There is no point in dropping the field in any case, since we can just replace
the existing subfields in-place with no need to recreate the whole field.

UNIT TESTS INCLUDED

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a9eb400581)
(cherry picked from commit 26ccb6a480)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 12:01:31 +02:00
Owen Leonard b098500c71 Bug 17010 [Follow-up] Canceling a hold awaiting pickup no longer alerts librarian about next hold
This patch makes a minor change to the markup to make the button in the
confirmation dialog conform to the appearance of similar buttons.

To test, follow the original test plan for this bug and verify that the
"OK" button in the dialog looks correct.

Signed-off-by: Liz Rea <liz@catalyst.net.nz>

Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 2e79c211db)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit d9006fd602)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 12:00:58 +02:00
Kyle M Hall ffe13850d5 Bug 17010 - Canceling a hold awaiting pickup no longer alerts librarian about next hold
In previous versions of Koha, if a hold canceled from the "Holds over" tab had other holds on it,
the librarian would be alerted with the message "This item is on hold for pick-up at your library"
and directed to check it in to fill the next hold. This no longer happens.

Test Plan:
1) Apply this patch
2) Find a hold that has been waiting too long
3) Cancel that hold via waitingreserves.pl
4) Note you get the message "This item is on hold for pick-up at your library"
5) Confirm the ok button redirects you to the correct tab

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b80a18ee2f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 40e667cd21)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 12:00:51 +02:00
Jonathan Druart e48dac0bf5 Bug 17114: Fix XSS in picture-upload.pl
To reproduce:
1/ cp your_image.jpg 'test<svg onload=alert(1)>.jpg'
2/ Use the upload picture tool to upload this file
=> Without this patch, the alert is show
=> With this patch, the filename is correctly displayed and no alert

Note that the cardnumber var was not escaped neither, it's now.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit da03dbd458)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 0fba9c17c9)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:55:59 +02:00
Bernardo Gonzalez Kriegel fe5b80d563 Bug 16554: rewrite mandatory and sample data - de-DE
More changes to de-DE files

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 9261fb4f5b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit f37cbb96f2)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:53:32 +02:00
Bernardo Gonzalez Kriegel 9e9bbcff27 Bug 16554: rewrite mandatory and sample data - it-IT
More changes to it-IT files

Checked marc21 and unimarc files
unimarc_relatorterms.sql had bad encoding, others minor
errors

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit be4cd79aea)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 6e4dbd3f9b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:53:32 +02:00
Bernardo Gonzalez Kriegel e97a0da05a Bug 16554: More i18n changes - en, es, nb and pl files
Mostly fixes bad values in auth files ( '' -> 0 )

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 6dc2f1ae7c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 25e314bee5)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:53:32 +02:00
Bernardo Gonzalez Kriegel 28afac565d Bug 16554: rewrite mandatory and sample data - pl-PL
More changes to pl-PL files

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 28191a538b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 9d11edefea)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:53:32 +02:00
Bernardo Gonzalez Kriegel a487a192c0 Bug 16554: rewrite mandatory and sample data - nb-NO
More changes to nb-NO files

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 4742f1035b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit a05c4d11de)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:53:32 +02:00
Bernardo Gonzalez Kriegel d678eb5938 Bug 16554: rewrite mandatory and sample data - es-ES
More changes to es-ES files

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 8cfa6f633a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit fd02ef7fc2)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:53:31 +02:00
Bernardo Gonzalez Kriegel 891b6590de Bug 16554: Fix I18N sample files
Needs Bug 13669

This patch fix web installer for
de-DE, es-ES, fr-CA, nb-NO and pl-PL

To test:
1) Apply patch
2) Try web installer for any/all listed languages.
a) de-DE, es-ES, fr-CA and pl-PL
There must be no problems for marc21 + all sample files
b) nb-NO
There must be no problems for normarc + all sample files

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit e38cad45e8)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 884e877be3)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:25:59 +02:00
Bernardo Gonzalez Kriegel fd70020ada Bug 16554: Fix fr-FR sample files
Needs Bug 13669

Rewrite autorites_norme_unimarc.sql to
use only one INSERT IGNORE.

New load method complains about duplicate keys,
and both auth files are mandatory!

Also removed blank space from sample_labels.sql

Tested with unimarc_complet and all sample files.

To test
1) Apply the patch
2) Try fr-FR web installer, unimarc_complet + all sample files
There must be no errors

Don't know if fr-FR marc21 and unimarc_lecture_pub are used,
need a look from french users.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b5ae31e7fd)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit ad9d0a3beb)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:24:58 +02:00
Frédéric Demians 15e22f1214 Bug 17281 Warning when saving subfield structure
TO TEST:

1. Home > MARC Framework > Default > Actions > MARC structure
2. On 073 field (for example), click Edit
3. Click on Edit subfield button
4. Click on Save changes
5. Take a look in intranet logs. You find:
   Use of uninitialized value in string eq at
   ../admin/marc_subfields_structure.pl
6. Apply the patch, and repeat steps 3-5
   => no more warning in log

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 259679e9de)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit cdf0c5dc16)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:23:47 +02:00
Frédéric Demians f811cb9943 Bug 16311: Update DB rev (3.22.10.001)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:22:27 +02:00
Andreas Roussos ae8d5b3ca5 Bug 16311 - Advanced search language limit typo
In the OPAC -> Advanced Search, the Language drop down menu incorrectly
lists Romanian as "Român (Romanian)" while the correct value (as reported
by Barry Cannon) is "Română (Romanian)".

This patch fixes that:
a) for _new_ installations by modifying
   installer/data/mysql/mandatory/subtag_registry.sql (loaded by the web
   installer when koha is installed), and also
b) for _existing_ installations by adding an atomicupdate file in
   installer/data/mysql/atomicupdate/

Test plan:
1) In the OPAC, go to Advanced search (cgi-bin/koha/opac-search.pl).
2) In the 'Language' drop down menu, observe that the value for Romanian
   is "Român (Romanian)".
3) Apply the patch, and run installer/data/mysql/updatedatabase.pl.
4) Refresh the Advanced search page in the OPAC. Confirm that the patch
   worked, i.e. the Language drop down menu lists Romanian as
   "Română (Romanian)" (notice the added 'ă').

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit fc9279774f)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit eceb09a8a3)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:20:48 +02:00
Kyle M Hall 03bfe62869 Bug 6852 [QA Followup] - Tidy AddItem
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 989904c7ab)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 8f165d2357)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:09:22 +02:00
Marcel de Rooy 82795f8b91 Bug 6852: Staged import reports wrong success for items
If we import items that have a wrong branch code, the items will not
be imported but manage-marc-import reports them as imported. (A wrong
branch code probably occurs most, but other causes are possible too.)

The underlying cause is that AddItem does not look at the error
returned from _koha_new_item in Items.pm.

This patch deals with that omission in the most economical way. It adjusts
AddItem so that it returns undef if no item was added.
In ImportBatch.pm I check if an item was added and adjust the totals
accordingly instead of just always counting them.

Note: Several scripts like additem.pl use AddItemFromMarc to call
AddItem. They do not report an error, but fail silently. With this patch,
these scripts get undef and will still fail silently. (No change.)
Adding error checks around calls of AddItemFromMarc is outside the scope of
this report. Here we are taking care of correct imported item numbers.

Test plan:
[1] Verify that additem.pl still works by adding a new item.
[2] Run t/db_dependent/Items.t
[3] Add a new branchcode, say XXX.
[4] Pick a biblio record with a few items (n) and set one item to branch XXX.
[5] Export this biblio with items to a MARC file.
[6] Change the XXX item to the original branch and remove branch XXX.
[7] Import the MARC file. Verify that one item was not imported and that
    the number of imported items reflects that (equals n-1).

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 48aba1533c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 9aee97978e)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 11:09:21 +02:00
Aleisha e259b3d3e0 Bug 16950: Serials subscriptions advanced search shows '0 found' pre-search
To test:
1) Go to Serials
2) Click Advanced Search in the toolbar at the top
3) Notice heading says Serials subscriptions (0 found) before a search has even happened
4) Apply patch and click Advanced Search again
5) Heading should now say Serials subscriptions search
6) Submit search
7) Heading should say how many subscriptions your search found (like before)

Sponsored-by: Catalyst IT

Signed-off-by: Marc <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 031219935c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 65b9766a0a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 10:47:13 +02:00
Lee Jamison 588c84c25d Bug 17220: Change hold confirmation string from 'Place hold' to 'Confirm hold'
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 8098194125)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit b3dd22c09b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 10:41:40 +02:00
Tomas Cohen Arazi 284d5a16d7 Bug 16822: Make koha-common call koha-plack without --quiet
This patch removes the --quiet option switch in koha-common.init so
problem information is not hidden for sysadmin users.

To test:

- Have plack enabled for a koha instance:
  $ sudo koha-plack --enable kohadev
  $ sudo koha-plack --start  kohadev
- Run:
  $ cd kohaclone
  $ debian/koha-common.init {start|stop|restart}
=> SUCCESS: No behaviour change
- Disable the 'cgi' apache module:
  $ sudo a2dismod cgi
- Run:
  $ debian/koha-common.init {start|stop|restart}
=> FAIL: No warning is shown
- Apply the patch
- Run:
  $ debian/koha-common.init {start|stop|restart}
=> SUCCESS: Warnings show up
- Sign off :-D

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Perfect thanks :)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit eaa11da562)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 14cec5d6b9)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 10:39:16 +02:00
Magnus Enger ba9c98da97 Bug 17267 - Document koha-create --adminuser
A description of --adminuser was missing from debian/docs/koha-create.xml
This patch adds a description in the Options section, as well as under
DEFAULTSQL in the list of configuration variables.

To test:
Run these commands and look at the formatted man page:
$ xsltproc /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl \
  debian/docs/koha-create.xml
$ man -l koha-create.8

Make sure this test passes:
$ prove -v xt/verify-debian-docbook.t

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Edited commit message to fix typo - koha-mysql -> koha-create as that's what we're testing. :)

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit f31d3175b3)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit df2e2ff223)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 10:38:32 +02:00
Hector Castro ffe7aeaeda Bug 17152: Do not copy value when duplicating a subfield
When cataloguing, if you want to duplicate a subfield that is not
empty, the new subfield is created with a copy of data in it.
This is not the case when you duplicate an whole field. The new one is
created with subfields but without data in it.

Test plan:
Add or edit a bibliographic record
Fill a subfield
Duplicate the subfield
=> Without this patch the value of the input will be copied
=> With this patch the new input will be emptied

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 451fd67dd1)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 71b81ae6d6)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 10:32:59 +02:00
Jacek Ablewicz 2a4dfb1ed7 Bug 17072: 006 not filling in with existing values
When you use the 006 builder to view the existing values in the 006
tag, Koha is not pulling these existing values into the builder
window. Instead, Koha appears to be using defaults.

To reproduce:

1. Open a record in the editor
2. Switch from BKS to another material type.
3. Change as many settings as possible.
4. Close plugin.
5. Reopen plugin - notice your selections are not shown.

Trivial patch, heavilly inspired by Bug 9093.

To test:

1. Apply patch
2. Ensure that issue described above is no longer reproductible

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a1fd726157)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit b473e0791f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 10:31:45 +02:00
Aleisha Amohia 99498faeee Bug 17175: Typo in patron card images error message
To test:
1) Go to Tools -> Patron Card Creator -> New Image
2) Click Upload without attaching anything
3) Notice typo
4) Apply patch and refresh page (resend information if prompted)
5) Notice typo fixed

Sponsored-by: Catalyst IT
Signed-off-by: Claire Gravely <claire_gravely@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit ea13ea0083)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 2279c2b64e)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 10:02:22 +02:00
Andreas Roussos c34a8bb11f Bug 17185: Staff client shows "Lists that include this title:" even if item is not in a list
In the staff client, the text "Lists that include this title:"
is always shown, regardless of whether the item is in a list
or not. This patch fixes that.

Test plan:
1) Log in to staff client.
2) Go to biblio details view:
   /cgi-bin/koha/catalogue/detail.pl?biblionumber=X
   Confirm that "Lists that include this title:" is
   shown even if the item is not in a list.
3) Apply the patch.
4) Repeat step 2. Confirm that the patch works, i.e.
   "Lists that include this title:" is only shown
   for biblios that are actually in a list.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Only applies to non-XSLT view.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit add90157eb)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 551067f89c)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 10:00:43 +02:00
Marcel de Rooy 07706a2564 Bug 16809: Follow-up for scalarizing biblionumber
Still resolves another multi_param warning.

Test plan:
Look at your logs before and after this patch when saving a biblio
record (you may have to start plack again).
If your biblionumber is mapped to 999c, you should no longer have a warn
about line 2563 (disclaimer: line numbers are subject to change).

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 377feb9cdf)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit b7b48eda3f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 09:59:57 +02:00
Mark Tompsett 6acc900531 Bug 16809: Silence authority warnings C4::Biblio::TransformHtmlToMarc
Most of the floodiness is caused by accessing the cgi parameters
in a context which is hard to determine. By purposefully saving
the value to a scalar variable and using the variable, the issue
disappears, and it will likely be a tiny tad faster as variable
access is faster than multiple function calls.

TEST PLAN
---------
 1) Back up your intranet error log
    -- for example:
       cp ~/koha-dev/var/log/koha-error-log ~/koha-error-log.backup
 2) Blank your intranet error log
    -- for example:
       echo > ~/koha-dev/var/log/koha-error-log
 3) Log into your staff client
 4) Click 'Authorities'
 5) Click 'New from Z39.50'
 5) Type 'Seuss' into 'Name (any):' and press enter
 6) Click 'Import' beside the first link
 7) Click 'Save'
 8) Check your koha-error-log
    -- floody!
 9) Apply patch
10) repeat steps 2-8
    -- blank!
11) restore your intranet error log
   -- for example:
      mv ~/koha-error-log.backup ~/koha-dev/var/log/koha-error-log
12) run koha qa test tools

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested with addbiblio.pl. I would have preferred the scalar option in terms
of simpler code, but this works too.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 28ad0ab513)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 4cabeda007)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>

Conflicts:
	C4/Biblio.pm
2016-09-16 09:59:55 +02:00
Owen Leonard 4c8ca85c45 Bug 14612 - Overdue notice triggers should show branchname instead of branchcode
This patch adds the Branches template plugin to the overdue notice
triggers template so that the library name can be shown instead of the
branchcode.

Also changed: Updated page title to match the name used in tools menus.

To test, apply the patch and go to Tools -> Overdue notice/status
triggers.

- Select a library.
- When the page reloads, the 'Defining overdue actions for...' and
  'Rules for overdue actions: ' headings should show the library name
  instead of the branchcode.

Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit ead7b938d8)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit b711695552)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>

Conflicts:
	koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt
2016-09-16 09:50:05 +02:00
Jonathan Druart a718feffc5 Bug 16464: Add FIXME
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 931ed0ec9b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 41f7626fe5)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 09:28:32 +02:00
Owen Leonard 568e7c2fe8 Bug 16464 - If a patron has been discharged, show a message in the OPAC
This patch adds a message to the patron home page in the OPAC to be
shown if the user is restricted because of a discharge.

To test, apply the patch and log into the OPAC as a patron who has been
discharged.
 - You should see a message which says so, including a link to
   the discharge notice.
 - Log in to the OPAC as a patron with a manual restriction and confirm
   that the correct notice is displayed.

Signed-off-by: Claire Gravely <c.gravely@arts.ac.uk>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit e67fc1806c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit fa4171ce58)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>

Conflicts:
	opac/opac-user.pl
2016-09-16 09:27:22 +02:00
Magnus Enger c423202275 Bug 17228 - Make two versions of SIPconfig.xml identical
Several bugs have made changes to etc/SIPconfig.xml but not
updated debian/templates/SIPconfig.xml. This means that an admin
using the Debian packages who enables SIP2 for a site and looks at
/etc/koha/sites/<instance>/SIPconfig.xml will not see an up-to-date
version of that file, with the risk of missing possible config
opportunities.

Since debian/templates/SIPconfig.xml contains no placeholders or
other magic stuff related to the Debian packaging, this patch simply
copies etc/SIPconfig.xml to debian/templates/SIPconfig.xml

To test: diff etc/SIPconfig.xml debian/templates/SIPconfig.xml
There should be no difference between the files

Signed-off-by: Claire Gravely <claire_gravely@hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit d0d8bd1822)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 35133dabed)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 09:05:22 +02:00
Magnus Enger 83fbc5a02a Bug 17228 - Fix whitespace in etc/SIPconfig.xml
Remove trailing whitespace and replace tabs with 4 spaces.

Signed-off-by: Claire Gravely <claire_gravely@hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit cb72420b46)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit d5ac9eb197)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 09:05:20 +02:00
Holger Meißner ffc1375663 Bug 14434: Display "Not renewable (on hold)" in OPAC
This patch makes the OPAC display "Not renewable (on hold)" when
a hold is placed.

Test plan:
1) Do not apply patch.
2) Issue an item with automatic renewal.
3) Issue an item with manual renewal.
4) Place a hold on both items.
5) Log in as patron and note that the column "Renew" says "Automatic
   renewal (x of y renewals remaining)" for the auto renewed item
   and "(On hold) for the other item.
6) Apply patch.
7) Refresh OPAC and note that now "Not renewable (on hold)" is displayed
   for both items.
8) Cancel the holds, then log in as patron again and confirm that the
   correct renewal conditions are displayed.

Sponsored-by: Hochschule für Gesundheit (hsg), Germany
Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Works as advertised

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 77b03f1e8b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 930b32bc47)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 09:03:08 +02:00
Jonathan Druart a4071233cb Bug 16990: Display branch names instead of code in patron mod requests
To test:
- change your homebranch in the OPAC, submit
- change patron modification request in the staff client
- Verify that it shows the old and new branch name instead of the
  code

Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com>

Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 3f585d44e8)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 1147fe4c0f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 09:02:06 +02:00
Jonathan Druart cdc9132492 Bug 17128: Make summary-print.pl plack safe
$borrowernumber is used in build_issue_data but not correctly defined
(Variable "$borrowernumber" is not available)

That may cause wrong charge displayed in the summary slip.

Test plan:
- Set rental charge for an item type
- Define a rental discount for that item type in the circ rules
- check in an item matching this rule
Without this patch the charge displayed in the summary slip won't be
calculated with the discount
With this patch applied, the warning in the logs will no longer appear
and the values will be correctly calculated.

Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 2cf1e97e5c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit ade3ffb5ac)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 08:56:44 +02:00
Jonathan Druart 8af766cc52 Bug 16886: Make the 'Upload patron images' tool plack safe
Some vars are accessed from subroutine, but defined with my.
It causes at least the 2 followings errors:
Variable "$filetype" is not available at
/home/koha/src/tools/picture-upload.pl line 240.
Variable "$uploadfilename" is not available at
/home/koha/src/tools/picture-upload.pl line 241.

To avoid that, they are now declared with our.

Test plan:
Upload image for a patron and confirm that you get a "Result" table and
the errors do not longer appear in the logs.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 762415a2ff)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 4cf4751c08)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 08:55:44 +02:00
Owen Leonard ade420fb05 Bug 17200 - Badly formatted "hold for" patron name on catalog detail page
This patch adds a space between first name and surname on the
bibliographic detail page when there is "hold for" information in the
status column of the holdings table.

To test, apply the patch locate a title in the staff client catalog
which has one or more confirmed holds on it. Verify that the patron's
name in the "status" column of the holdings table looks correct, with a
space between first and last name.

Signed-off-by: Claire Gravely <claire_gravely@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit f17b491f35)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit c364afd2aa)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 08:51:48 +02:00
Owen Leonard 01e6632c0e Bug 11019 - Require some fields when adding authorized value category
This patch modifies the form for adding an authorized value so that
the category is a required fields.
Previously a new authorized value category could be saved with no data.

To test, apply the patch and go to Administration -> Authorized values.

- Click the "New category" button.
- Click the save button without filling in the category.
  You should be prevented from submitting the form.
- Verify that filling in the required field allows the form to be
  submitted.
- Perform the same test when editing an existing authorized value.

Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Follow-up for QA: Allow a blank authorised value to be created.

Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>
Amended test plan.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a5b0aa20e5)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 5b1b874557)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 08:48:25 +02:00
Owen Leonard b277edf1a9 Bug 13921 - XSLT Literary Formats Not Showing
This patch adds some missing literary formats to the staff client and
OPAC's search results XSLT display.

To test you must have DisplayOPACiconsXSLT and DisplayIconsXSLT system
preferences enabled.  XSLTResultsDisplay and OPACXSLTResultsDisplay
should be set to 'default.'

Perform searches in the staff client and the OPAC and confirm that the
following literary forms (defined in 008 position 33) display correctly:
Not fiction; Fiction; Dramas; Essays; Novels; Humor, satires, etc.;
Letters; Short stories; Mixed forms; Poetry; Speeches.

Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com>

Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 8850540dea)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit bb166e9b1a)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-09-16 08:46:23 +02:00