Commit graph

13292 commits

Author SHA1 Message Date
Jared Camins-Esakov
02d15007df 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>
2011-02-28 09:12:55 +13:00
Chris Cormack
622f804ffd Merge remote branch 'kc/new/bug_2742' into kcmaster 2011-02-28 09:09:33 +13:00
575a690b4e 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>
2011-02-28 09:07:02 +13:00
Chris Cormack
bf704ce989 Merge remote branch 'kc/new/bug_1953' into kcmaster 2011-02-28 08:45:05 +13:00
Frère Sébastien Marie
55af15be84 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>
2011-02-28 08:41:38 +13:00
ruth@bywatersolutions.com
0b961c0ae0 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>
2011-02-26 20:44:01 +13:00
MJ Ray
74cdd57ecb 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>
2011-02-26 20:02:25 +13:00
Katrin Fischer
38b59b7b53 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>
2011-02-26 19:52:56 +13:00
Chris Nighswonger
b0f60221f4 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>
2011-02-25 07:08:39 +13:00
Chris Cormack
2a3f7c1417 Merge remote branch 'kc/new/enh/bug_3550' into kcmaster 2011-02-22 08:37:34 +13:00
Chris Cormack
f75f964ba4 Merge remote branch 'kc/new/bug_2742' into kcmaster 2011-02-22 08:37:25 +13:00
Colin Campbell
bf1939798f 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>
2011-02-22 08:36:13 +13:00
marcel@libdevelop.rijksmuseum.nl
fc1b7201c5 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>
2011-02-22 08:33:11 +13:00
febba50ba8 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>
2011-02-22 08:24:01 +13:00
a0367aa973 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>
2011-02-21 16:24:46 +13:00
Reed Wade
1f0e0c5de1 Bug 5741 - Extra comma causes JavaScript error in Internet Explorer
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-20 20:29:07 +13:00
eaf4cfe6b8 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>
2011-02-20 20:26:50 +13:00
Chris Cormack
c43aac22a2 Merge remote branch 'kc/new/bug_5769' into kcmaster 2011-02-18 10:43:42 +13:00
Chris Cormack
92f52dc850 Merge remote branch 'kc/new/bug_5682' into kcmaster 2011-02-18 10:42:28 +13:00
Paul Poulain
4117b293f6 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>
2011-02-18 10:39:56 +13:00
ed2b583eb1 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>
2011-02-18 10:10:10 +13:00
fb5ede8b59 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>
2011-02-18 09:47:41 +13:00
Chris Cormack
bdf7e79e4d Bumping database version 2011-02-17 15:51:35 +13:00
Chris Cormack
3b1b6b8315 Merge remote branch 'kc/new/bug_2742' into kcmaster 2011-02-17 11:41:36 +13:00
Magnus Enger
5d82c493f7 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>
2011-02-17 11:40:20 +13:00
Chris Cormack
36d64bd18c Merge remote branch 'kc/new/enh/bug_5462' into kcmaster 2011-02-17 09:47:14 +13:00
4797959964 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>
2011-02-17 09:42:56 +13:00
Chris Cormack
6a37aaf010 Merge remote branch 'kc/new/enh/bug_5462' into kcmaster 2011-02-17 08:56:43 +13:00
Ian Walls
b2c56dfe62 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>
2011-02-17 08:50:26 +13:00
3e26abc9cd 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>
2011-02-17 08:28:29 +13:00
Paul Poulain
761fa37297 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>
2011-02-16 14:45:41 +13:00
Paul Poulain
2f9bebf802 Bug 5759 : displaying 2nd email if there is one on print template for borrowers
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-16 08:57:48 +13:00
Chris Cormack
3f35705ddc Merge remote branch 'kc/new/enh/bug_2170' into kcmaster 2011-02-15 15:55:54 +13:00
173d3cbb2d 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>
2011-02-15 10:31:22 +13:00
84a2c15913 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>
2011-02-15 10:25:28 +13:00
50c0ae09a1 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>
2011-02-15 10:12:36 +13:00
Chris Cormack
2a8b113177 Merge remote branch 'kc/new/bug_5736' into kcmaster 2011-02-15 10:09:05 +13:00
a33109f523 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>
2011-02-15 10:05:16 +13:00
Chris Cormack
a10566b53c Merge remote branch 'kc/new/bug_2742' into kcmaster 2011-02-15 10:04:43 +13:00
d2cf30820f 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>
2011-02-15 09:55:20 +13:00
Chris Cormack
f6be5ef20f Bug 5751 : Follow up patch, removing unused variable and fixing copyright 2011-02-14 12:17:29 +13:00
Paul Poulain
3be7a6d458 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>
2011-02-14 12:13:50 +13:00
Paul Poulain
e34f93a69a updating some references from koha.org to koha-community.org 2011-02-14 10:56:03 +13:00
Chris Cormack
b18ae6dee6 Merge remote branch 'kc/new/bug_5734' into kcmaster 2011-02-14 10:53:17 +13:00
Paul Poulain
adb1aefaf3 Bug 5734 (MT3625) Fix column order in issue history
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-14 10:52:29 +13:00
Chris Cormack
a52d4e8a70 Merge remote branch 'kc/new/bug_5649' into kcmaster 2011-02-14 10:33:41 +13:00
Schuster
ace3f0b70a 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>
2011-02-14 10:33:07 +13:00
53566f09fb 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>
2011-02-14 10:27:49 +13:00
9c0752edf2 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>
2011-02-14 10:24:44 +13:00
9319ab3254 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>
2011-02-14 10:19:29 +13:00