Commit graph

11614 commits

Author SHA1 Message Date
Chris Cormack
20997939b7 Fixing some small XSS vulnerabilities
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-14 19:03:03 -05:00
72fd935a2e bug 1542: remove now unneeded parameter
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-14 18:31:58 -05:00
df99b9b69c bug 1542 followup - tweak to keep handling the UI selected value out of C4
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-14 18:31:21 -05:00
Chris Cormack
8f902d3248 Bug 1542, followup patch to tidy up some messy dropdown behaviour
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-14 18:14:19 -05:00
9c7d9b0934 new test script to help debug template errors
From the POD:

NAME

show-template-structure.pl

DESCRIPTION

This script displays the structure of loops and conditional statements in
an HTML::Template::Pro template, and is an aid for debugging errors
reported by the xt/author/valid-templates.t test.  It also identifies the
following errors:

* TMPL_IF/TMPL_UNLESS/TMPL_LOOP with no closing tag
* TMPL_ELSE with no initial TMPL_IF or TMPL_UNLESS
* extra closing tags
* HTML comment of the form <!-- TMPL_FOO ..., where TMPL_FOO is not a valid HTML::Template::Pro tag

USAGE

xt/author/show-template-structure.pl path/to/template.tmpl

Output is sent to STDOUT.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-14 18:09:33 -05:00
e476adcb9c remove extra /TMPL_IF
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-14 18:09:26 -05:00
625021ada7 Changes to further work on Bug 3550, Use GetRecordValue to get the subtitle
- Adding subtitle display to OPAC Cart, lists, and reading record
- Minor tweaks to some displays

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-14 14:39:42 -05:00
ba80729eaa bug 4104: remove stray disused template (intranet tags.tmpl)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-14 14:34:41 -05:00
Nicole Engard
5298ada3ec bug 4174 add AWSPrivateKey sys pref to new interface
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-14 14:27:44 -05:00
Garry Collum
5fc0c4968d Bug 4180: Fixes unclose TMPL_IF in supplier.tmpl
Also fixes a minor XHTML error.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-14 14:27:41 -05:00
9b98fc778d bug 4169: fix item batch modification for MARC21
The MARC21 framework uses $0 for the item withdrawn status.  Because
of how the tool had marked the barcode and stocknumber as being
uneditable, this resulted in an off-by-one error, causing the wrong
item fields to be updated.

Fixed by simply not including the uneditable fields in list
of item fields that can be edited - if you can't change the barcode,
there's no point in displaying it in the list of fields.

Also fixed how the bib title/author/ISBN got displayed so that the
withdrawn column gets displayed after an item update.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Liz Rea <lrea@nekls.org>
2010-02-12 15:03:00 -05:00
33230acc29 Bug 4154 - Include preferences translation into install.pl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-12 07:17:32 -05:00
aece7ada1d Perltidy of C4/VirtualShelves/Page.pm
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-11 20:24:45 -05:00
Nicole Engard
9c286deb27 bug 4168 add keyword to marc mapping to menu
Also fixed misnamed budgets & funds links

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-11 19:39:50 -05:00
Nicole Engard
94769fc831 add koha to marc mapping help file
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-11 19:39:49 -05:00
Colin Campbell
fc2120c6df Bug 4163 Preserve budget value unless changed by user
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-11 19:39:48 -05:00
Colin Campbell
e244e094c6 bugfix suppress warnings coming from acquisitions homepage
Before formatting and doing arithmetic with them we should
ensure undefined numeric elements are numbers
(This should be enforced in the db)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-11 19:39:44 -05:00
2da4f30214 Bug 4154 - Follow-up
- Modify install-code.pl to install prefs with templates
- Update .po preferences file in order to get last 'en' preferences

For 3.4, I will do a script which will handle together the 3 .po file:
opac, intranet and preferences (and .tt files if necessary). Don't do it
now, since it will change files naming convention.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-11 18:00:20 -05:00
Matthias Meusburger
59f31b9836 BZ4116: results from cataloging search is different from advanced search results
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-11 06:31:57 -05:00
Chris Nighswonger
8d4d96f309 Bugfix: Make smart-rules.tmpl display zero values in fields.
Since TMPL_IFs evaluate false if the template variable is 0,
smart-rules.tmpl was not displaying zero values in fields where
the db field value was indeed zero which leads to some small confusion.

This patch removes the TMPL_IFs since those fields will always be
populated with some value even if it is zero.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-11 06:27:36 -05:00
Nicole Engard
02fd7edf85 bug 4150 require title in new list on staff client
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-11 06:15:30 -05:00
01c619fc17 Bug 4154 - Add a .po based mechanism to translate preferences
Add to previous patch (and replace it):
  - update function
  - translation of tab subsection labels
  - GPL2
  - fix last minute bug catched by Galen

Cut-and-past of pref-trans script perldoc:

NAME
       pref-trans - Handle preferences translation

SYNOPSYS
         pref-trans init fr-FR
         pref-trans update fr-FR
         pref-trans install fr-FR

USAGE
       pref-trans init lang
           Create a .po file in po directory, named lang-pref.po. This
           file contains text to translate extracted from .pref files.

       pref-trans update lang
           Update a .po file in po directory, named lang-pref.po. This
           file contains new text to translate extracted from .pref files.
           Previous translated text are kept. There is a minor bug, which can’t
           be fixed due to preferences data struture: preferences tab
           subsection labels are lost when updating .po file.

       pref-trans install lang
           Use lang-pref.po file to translate the english version of
           preferences files and copy those files in the appropriate
           directory.

DESCRIPTION
       Koha preferences are stored in a data structure found in
       koha-tmpl/intranet-tmpl/en/module/admin/preferences/ files.
       Depending of user language, other files are used. This script extract text
       from ’en’ preference files, and put them in one .po file.  This .po
       file can be updated. When completed, a .po file can be applied to create
       localized versions of preferences templates.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-11 05:52:50 -05:00
d3df9899fb French .po file for preferences
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-11 05:52:35 -05:00
c5da83f020 remove unconditional warn
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 22:51:51 -05:00
7fc63299db Reformat Keyword to MARC mapping interface according to existing patterns
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 22:50:12 -05:00
Nicole Engard
4016173b2c bug 4153 move messages on inventory tool to top
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 22:46:58 -05:00
5a61015c84 bug 3920 follow-up: tweak wording of staff XSLT* sysprefs
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 22:40:11 -05:00
79b8fca2b1 Additional changes to fix Bug 3920, XSLTdetailDisplay syspref controls both OPAC and Intranet
This patch adds XSLTDetailsDisplay and XSLTResultsDisplay variables
for the staff client, OPACXSLTDetailsDisplay and OPACXSLTResultsDisplay
variables to the OPAC. Note that the XSLTResultsDisplay doesn't actually
do anything because no one has added an XSLT version of search results
to the staff client.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 22:36:25 -05:00
Chris Nighswonger
cf174a2749 Bugfix: Removing useless lines from patroncards/manage.pl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 22:34:57 -05:00
Nicole Engard
508df9946c add patron card help files
there are still more to add, but these are what I have written so far

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 22:13:22 -05:00
Nicole Engard
0f56aca4ef updated help files
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 22:13:21 -05:00
Chris Cormack
1858064501 Bug 2505 adding use warnings to edithelp.pl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 22:10:46 -05:00
Chris Cormack
bc91aec887 Bug 2505 adding use warnings, also added missing copyright statement
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 22:10:45 -05:00
Garry Collum
92702aa010 Bug 2505: Enables warnings in matching-rules.pl.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 22:10:43 -05:00
Chris Cormack
87ff46ba67 Bug 3797, second part of the patch, extending output_html_with_http_headers to take a status parameter (optional)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 14:11:53 -05:00
Chris Cormack
434ab8162f Bug 3797 output 404 error page with a 404 header
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 14:11:44 -05:00
88681d9862 bug 4152: fixed template so that barcode file uploads work
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 13:33:51 -05:00
6672df6de8 bug 4152: fixed call to GetItemsForInventory()
Restores ability to run a report of items for inventory.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 12:45:08 -05:00
Chris Cormack
461b61ad8a Fix for Bug 3730 - Wrong ISO 639-2 Language Code for Portuguese in database
[Patch originally by Ricardo Dias Marques]

Bug 3730 - Wrong ISO 639-2 Language Code for Portuguese in database
http://bugs.koha.org/cgi-bin/bugzilla3/show_bug.cgi?id=3730

For 3.0.x head of the Git branch, the ISO 639-2 Language Code for
Portuguese in Koha database is wrong.

Specifically, in the table "language_rfc4646_to_iso639", when the
field "rfc4646_subtag" has the value "pt", the field "iso639_2_code"
should have the value of "por" and NOT the current one of "pol"
("pol" refers to "Polish" as correctly also appears for the code "pl",
in the row above the "pt" one).

In my test setups, this showed some serious sequences for people
that choose the Portuguese language in the Web Installer, namely:
- very weird look of Staff client with missing Header and Footer,
that renders the Staff client unusable
- Portuguese translation apparently not getting updated for the OPAC
(for people that do an Upgrade from a previous version)

This patch is for the 3.0.x branch (I tested it with that branch).

For the master branch, I don't have a database setup to create and
test a similar patch but Chris Cormack nicely volunteered to do that.
Thanks Chris!

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 12:03:58 -05:00
Henri-Damien LAURENT
007b10446f bug Fixing : 3640
This patch filters all non itemrelated fields in the marcrecord before making update

AddItemhad the same problem as ModItem
They would try and take fields which would not be item fields

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 08:57:00 -05:00
Magnus Enger
8c62c84ac2 Fixes a typo in marc21_field_008.pl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 08:55:31 -05:00
13ab69ae08 bug 4122: make WebBasedSelfCheck functional
The WebBasedSelfCheck preference is now functional - if a user
tries to use /cgi-bin/koha/sco/sco-main.pl if the preference
is not on, they get redirected to the OPAC home page.

Also, the patron image web service now returns HTTP 403 (forbidden) unless
both WebBasedSelfCheck and ShowPatronImageInWebBasedSelfCheck are on.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 08:41:50 -05:00
Henri-Damien LAURENT
209637695d bug 3893 : No way to see late orders
When no lateorders were found, there was no way to change the limit in order to check for older orders

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 08:41:48 -05:00
3d19eb7fef bugs 3912, 4144: can now add contracts if dataformat is not metric
Fixed bug in date validation that prevented adding new contracts
if the dateformat syspref was set to something other than 'metric'.

In process, also removed three hand-written date validation routines
in favor of using JavaScript Date objects and the Date_from_syspref
function provided in calendar.inc.

This fixes bug 3912, and partially addresses bug 4144.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 08:41:47 -05:00
89fab00e99 removing test.pl
Following up on patch submitted by Colin Campbell, convinced
myself that this was a throwaway test script comitted in error.
Since it isn't of use otherwise, I've elected to remove it
instead of moving it to misc/split_test.pl as Colin proposes.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 06:27:30 -05:00
Zeno Tajoli
1d0bd7fc59 Bug 3162 Fix only for [forward port of tempoary fix 3.0.x]
Note that this patch causes the authority subfield visibility
to match 3.0.x, but at a cost - only two options are available now,
hide all and show all, and much flexibility is lost.  This will
need to be improved.

(cherry picked from commit 56831089ed)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 06:23:08 -05:00
Garry Collum
f02e460671 Bug 3860: Can't expand authorities.
Adds a link to the Authority tag to expand the fields if advancedMARCeditor is in "Don't display" mode.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 05:59:50 -05:00
Colin Campbell
e66929f052 Bug 4147 Correct name of external javascript file
An earlier patch inadvertantly reverted a name change in the template

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 05:53:33 -05:00
Colin Campbell
7ea29365df bugfix Dates.t test plan has wrong value
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-10 05:53:28 -05:00
570e6fc7c0 bug 4145 - fix typo in sysprefs.sql
Fixed following error during new en installation:

ERROR 1064 (42000) at line 217: You have an error in your SQL syntax;
check the manual that corresponds to your MySQL server version for the right
syntax to use near ''XSLTDetailsDisplay','0','','Enable XSL stylesheet control
over details page dis' at line 1

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-09 13:54:29 -05:00