Bug 5824: Creating a circ rule for a specific library causes anomalies

The variable name for the current branch being edited was the same as the variable used in
cat-search.inc, which passed along the circ-rule library to circulation.pl, and then overriding
the set library from there.

This patch renames the template variable 'current_branch', so that it does not populate the 'branch'
param in cat-search.inc

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Fix for Bug 5818, Date picker broken on label batches

Calendar picker JS can't come before main JS includes

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 4103 In Pro Adv Search, superlibrarian search always all libraries

Now, when 'independantbranches' syspref is activated, 'Individual Libraries'
combo list is set by default to the current user branch. It shouldn't be the
case for superlibrarian user who is supposed to manage all libraries.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Fixing license and copyright statement for updatedatabase.pl

Updating database version

Bug 5642: Item field serial enumeration (enumchron) should be longer

Field enumchron in items table is now varchar(80).
We have records that need a much longer field, even up to 400 or 500 chars.
I suggest to change its type to TEXT (variable length with max 64K; tinytext
goes up to 255 chars and is just too short).
Mediumtext or longtext are not needed; as a side note these types are used in
the items table for e.g. booksellerid and more_subfields_xml..

Revised original patch thanks to Ian Walls: update kohatructure.sql. Copied the change in deleteditems as well.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

BZ5432 follow-up, removing test string

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 5432 : (MT #4584b)Add duplicate support for borrowers

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 5815: Double clicking submits patron selection

Double clicking on an item in the list of matching names now automatically
submits the form when checking out to a patron by name rather than barcode.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

bug 5813: Remove unnecessary empty file

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 4852 - rewrite the query to include limits if using ccl=

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Merge remote branch 'kc/new/enh/bug_5792' into kcmaster

Bug 5792 - Add reference icon to Bridge icon set

Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 5799 make language on circ history consistent

Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Fixing the translatable tests to work in french locales

Bug 5811 - Bumping database version

Bug 5811: Add sysprefs to control overriding fines

This patch adds two sysprefs to allow libraries more fine-grained control over
when fines can and can't be overridden. The two sysprefs are:
* AllFinesNeedOverride - when this syspref is set to "Require" (default) any
    fine will require a staffmember to override the fine in order to check out a
    book.  When set to "Don't require," fines below noissuescharge will not need
    any override.
* AllowFineOverride - when this syspref is set to "Allow," staff will be able to
    override fines that are above noissuescharge. When set to "Don't allow"
    (default), staff will not be able to check out items to patrons with fines
    greater than noissuescharge.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Fix for Bug 5814 - Style error message on manage staged records page according to standard

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Merge remote branch 'kc/new/bug_5804' into kcmaster

Follow-up fix for Bug 5804, acqui duplicate warning

Typo fix. Thanks for spotting it Marcel.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Merge remote branch 'kc/new/bug_3319' into kcmaster

Conflicts:
members/members-home.pl

Bug 3319 Followup: Fix compatibility with fix for bug 4945

The fix for 3319 overwrote the @branchloop variable with output from GetBranchesLoop,
which forces a selected branch.  Removing the extra call, and just measuring the size of
@branchloop as it was build, plus some dereferencing, fixes the issue.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Merge remote branch 'kc/new/bug_1953' into kcmaster

Bug 1953 - Follow up fix on security patch

Fixing: Undefined subroutine prepare called on line 722.

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

Fix for Bug 5812 - Tag Cloud - capitalized words come before lower-case words

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Merge remote branch 'kc/new/bug_4885' into kcmaster

Conflicts:
opac/opac-detail.pl

Follow-up fix for Bug 4885 - Only 1 ISBN shows in non-XSL detail view

Fix for Bug 5551 overwrote the necessary changes to opac-detail.pl

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Merge remote branch 'kc/new/enh/bug_1883' into kcmaster

BZ1883 follow-up

solve comment 10 from nengard: This patch added these types only on upgrade.  We need them to be added to new
installs to.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Fix for Bug 5804 - duplicate warning when ordering needs design work

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 5723: Font for 780s on staff client shrinks

This patch fixes the bug that caused 780s in the staff client details XSLT to
display in progressively smaller fonts. This also corrects the semantics of the
780 ind1.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Merge remote branch 'kc/new/bug_2742' into kcmaster

2742 Encoding problem

Small correction of e umlaut. [Something happened with encoding of signed patch; my original patch did not show a wrong character.]

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Merge remote branch 'kc/new/bug_1953' into kcmaster

Use placeholders in sql

Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 5805: Having items in-transit can cause derangement of the hold list

If you have a list of holds on a biblio, and one or more are in-transit, then the
array that is fed to modrequest.pl is not fully-populated, lacking the branch on the
in-transit rows.  If you then attempt to edit one of the remaining holds' pickup
location, it doesn't modify the one you expect, but ones *above* that.  Also, holds
at the bottom of the list get the first pickup library in the list, since they are
getting undef passed in.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

bug 1953: Reduce risk of possible tainted supplierid call to C4::Serials::GetLateIssues

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 1962: Add fine notification during check-in

Original patch submitted by dswhite42@yahoo.com

Reformatted to apply cleanly.
Changed alert message during check-in to message used
on borrower account checkout page.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Security Bugfix: Bug 1953 Adding Placeholders to SQL To Avoid Potential Injection Attacks

This patch addresses both security issues mentioned in the summary of the report
submitted by Frère Sébastien Marie included below.

---------------------------
The problem is here: 'C4/AuthoritiesMarc.pm' in the function 'DelAuthority':
The argument $authid is included directly (not via statement) in the SQL.

For the exploit of this problem, you can use 'authorities/authorities-home.pl'
with authid on the URL and op=delete (something like
"authorities/authorities-home.pl?op=delete&authid=xxx").

This should successfully call DelAuthority, without authentification...
(DelAuthority is call BEFORE get_template_and_user, so before authentification
[This should be an issue also...]).

Please note that the problem isn't only that anyone can delete an authority of
this choose, it is more general: with "authid=1%20or%1=1" (after inclusion sql
will be like: "delete from auth_header where authid=1 or 1=1") you delete all
authorities ; with "authid=1;delete%20from%xxx" it is "delete from auth_header
where authid=1;delete from xxx" and so delete what you want...

SQL-INJECTION is very permissive: you can redirect the output in a file (with
some MySQL function), so write thea file of you choose in the server, in order
to create a backdoor, and compromise the server.

Signed-off-by: Frère Sébastien Marie <semarie-koha@latrappe.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Merge remote branch 'kc/new/enh/bug_3550' into kcmaster

Merge remote branch 'kc/new/bug_2742' into kcmaster

Bug 3550 : Display changes needed in opac-results-grouped too

Change to how subfield is derived had not been implemented in
opac-results-grouped causing ARRAY(hexnumber) to follow all titles
Replace template ref to scalar with an array

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

2742: Wrong language name in the preferences

Follow up patch. Improvement suggested by Belgian translators (Hans Supply).

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 5782: Add warning when ordering a duplicate record from external source

Enhancement for Acquisitions/ordering from external source.
Koha already checked for duplicates, but this patch warns the user. Offers the choice to use existing record, use new record or return without making an order.
The new template is added for this interaction with the user.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Fix for Bug 5776 - menu on funds wraps when only 1 fund

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 5741 - Extra comma causes JavaScript error in Internet Explorer

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

Bug 5777 Update and install syspref tab titles

This allow also Save button label translation

[3.2] It applies

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

Merge remote branch 'kc/new/bug_5769' into kcmaster

Merge remote branch 'kc/new/bug_5682' into kcmaster

NormalizeString POD Fixing and variable renaming

    POD was mistakenly telling that NFD was supposed to be the default
    encoding.  In fact, it is not, it is NFC.
    So the variable $nfc to change to the not default encoding was misleading.
    Renaming it into $nfd

(written by hdl)

Refactored by Chris Cormack

Signed-off-by: Davi <davi@gnu.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Fix for Bug 5769 - notice tab disappearing on edit patron

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Fix for Bug 5140 - In Chrome, drop-down menus disappear after using pop-up calendar

Disabling that part of the calendar JavaScript which hides
<select> form fields when the calendar is displayed. This is at
the expense of IE6.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bumping database version

Merge remote branch 'kc/new/bug_2742' into kcmaster

Bug 2742 Followup patch fixing Norwegian bokmål, adding nynorsk

- Replace Norwegian with Norwegian bokmål
- Add Norwegian nynorsk, which was missing

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

Merge remote branch 'kc/new/enh/bug_5462' into kcmaster

Follow-up fix for Bug 5462, Fix variable names so we dont break template::toolkit

A change was made to MARCdetail.tmpl without making a corresponding
change to MARCdetail.pl. I've reworked the original change so that
both can work together.

0XX --> tab0XX

Apparently TMPL variables can't start with a number now?

MR: Recreated patch file to recover failure to apply.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Merge remote branch 'kc/new/enh/bug_5462' into kcmaster

Follow up on Bug 5462: fixing variable names breaks messaging preference form

The messaging prefs form was hardcoded to use 'transport-$transport_type', rather than
'transport_$transport_type'.  The result was an uneditable messaging preferences form.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Follow-up fix for Bug 5760 - Add the jquery table sorter to reading record

- Removing option to show 50 items/show all from script and template
- Adding parser to exclude articles in title sort (en only, see Bug 5766)
- Setting default sort to 'date due descending' as it was previously

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 5760 : MT3137 : Adding jquery.tablesorter and jquery.tablesorter.pager support for readingrec.pl

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 5759 : displaying 2nd email if there is one on print template for borrowers

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

Merge remote branch 'kc/new/enh/bug_2170' into kcmaster

Follow-up fix for Bug 2170 - Adding 'edititems' user-permission

Save button and duplicate confirmation redirects must respect
the edititems permission: Users without permission to edit items
should not be redirected to the edit items screen.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 5756: Add MARC21 tag 751 (added geographical entry) to Zebra config

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Partial fix for Bug 5745, Overdues with fines report not showing titles

- Adding title, subtitle, and author to output
- Reworking display of shelving location selection

Patch does not address the contents of 'overdue status' and 'notified by'

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Merge remote branch 'kc/new/bug_5736' into kcmaster

Follow up on 5736: fix authorities record.abs

Follow up on 5736: Same problem with 100 and 100a in authorities/record.abs

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Merge remote branch 'kc/new/bug_2742' into kcmaster

Follow up on bug 2742: Correct language names in install

Rename the phonetic name in about, just like an earlier patch did elsewhere.
Make the distinction between the two Dutch translations more clear.

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

Bug 5751 : Follow up patch, removing unused variable and fixing copyright

Bug 5751 : MT2690 fix members-home

This fix the members-home script to work with new letter search management, and delete not anymore used code/template

(written by Nahuel Angelinetti)

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>

updating some references from koha.org to koha-community.org

Merge remote branch 'kc/new/bug_5734' into kcmaster

Bug 5734 (MT3625) Fix column order in issue history

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

Merge remote branch 'kc/new/bug_5649' into kcmaster

bug 5649: changes the white/blacklisting to approved/rejected consistent wording

Changes the wording to approved/rejected to be consistent with other wording

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Fix for Bug 5722, other reason for suggestions has code in text box

Input value attributes shouldn't have _() escaping.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Fix for Bug 5679 - funds planning showing strange borders

Table border style needed more specificity

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Fix for Bug 5715, Adding note about ReservesMaxPickUpDelay value

Also correcting display of itemtype based on item-level_itype preference

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

bug 4306: respect item-level_itypes when displaying item label batches

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Salvador Zaragoza Rubio <salvazm@masmedios.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 5736: Fixing some zebra configuration errors in marc21/biblios/record.abs

Lines like melm 999 should ALWAYS follow the lines for subfields 999a, 999b etc.
This is currently not the case for 410 411 490 611 710 785 and 800.
Found this since I could not find back the contents of 710$9 fields.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 5735: Expanding/collapsing cloned fields in editor takes original field

Adds corrected onclick response for expanding marc tags.
Removes some lines that did not work as promised.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 5727 Warning in log due to XSLT.pm

XSLT.pm add few syspref to MARCXML record send to be transformed by XSLT. If
one of those syspref doesn't exist, it generated a warning.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 5230: Call number ranges in export don't give expected results.

If you entered low number and high number, you got only items that *exactly* matched either entry (if any).
If you enter only a low number, you got everying *lower* than that.
If you enter only a high number, you get everything *higher* than that.

This was a greater-than-less-than problem.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Merge remote branch 'kc/new/enh/bug_5733' into kcmaster

Follow-up fix for Bug 5733 - Empty cart in intranet when session is closed

Modifying empty cart function to take a paramter: if true,
cart will be emptied without a prompt.

Removing unnecessary  "javascript:" pseudo-protocol.

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Fix for Bug 5743, 5743 - Make login errors a little nicer

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Make 'about' show D Ruth Bavousett's name change

Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Correcting the name of one of the developers. :)

Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Merge remote branch 'kc/new/bug_4263' into kcmaster

Bug 4263: Remove duplicated lines from C4::Items

Merge of bug 4263 duplicates the bulk of
ModItemFromMarc causing compile time errors

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

Bug 4263: Fix subfield ordering broken by earlier patch

Restores alpha sorting of item subfields in add/edit screen

Signed-off-by: Nicole Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 5746: Add space after 'enhanced content' on OPAC

Signed-off-by: D Ruth Bavousett <ruth@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Bug 5733 : MT3531: Intranet cart is emptied when session is closed

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

Bug 5731 When No ccode is defined for an item, then moredetail.pl throws a 500 error

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

Fix for Bug 5716 - Whitespace correction for browse shelf

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Merge remote branch 'kc/new/bug_3009' into kcmaster

Bug 3009 - Change items.content field so it prints due date by default

<items.content> in overdue notices prints issuedate instead of duedate by default.
This patch changes default to issues.date_due.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Adding id tags to some OPAC templates.

Many of the templates in OPAC, which deal with users data eg opac-account.tmpl, opac-passwd.tmpl etc do not have a id for the container div,
like opac-user.tmpl has an id userdetail. Having these id's makes it easier to customize with css.
This patch adds id's to most of the <div class="container"> tags.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>