Commit graph

17233 commits

Author SHA1 Message Date
Jared Camins-Esakov
b29e524656 Bug 8890: C4/HoldsQueue requires DB
This counter-patch moves all database handling code into subroutines
in C4::HoldsQueue. This fixes the test, and is required for persistent
environments like Plack.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2012-10-24 17:52:36 +02:00
Paul Poulain
2943530f25 Merge remote-tracking branch 'origin/new/bug_3652' 2012-10-24 15:44:33 +02:00
Chris Hall
d2de76d60d bug 3652 fixing XSS vulnerabilities in opac-search
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-24 15:44:07 +02:00
Jared Camins-Esakov
35b6a5ea11 Bug 3652: close XSS vulnerabilities in opac-export
The opac-export.pl script had a number of XSS vulnerabilities relating
to its error handling.

To test:
1) Go to /cgi-bin/koha/opac-export.pl?op=export&bib=2&format=<h2>evil</h2>
   (substituting a valid biblionumber for the '2')
2) Notice that "evil" is rendered as an h2 heading.
3) Apply patch.
4) Notice that you now see the h2 tags, and they are not rendered by
   the browser.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-24 15:40:18 +02:00
Paul Poulain
70f2b4bd0a Bug 3652 follow-up reverting call to param('bib')
could probably also be removed in opac-detail.pl, but it was still here before Jared patch.

So, in case something is still using bib I haven't removed this call
2012-10-24 15:30:24 +02:00
Jared Camins-Esakov
3739e6bd67 Bug 3652: close XSS vulnerabilities on biblionumber and authid
Previously we did not sanitize biblionumber and authids passed in by
the user.

To test:
1) Go to /cgi-bin/koha/opac-detail.pl?biblionumber=2hi (substituting a
   valid biblionumber for the 2).
2) Notice the presence of "2hi" on this page, and also on the ISBD and
   MARC views.
3) Go to /cgi-bin/koha/opac-authoritiesdetail.pl?authid=2bye
   (substituting a valid authid for the 2).
4) Notice the presence of "2bye" on this page.
3) Apply patch.
4) Notice that "2hi" and "2bye" strings are gone.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-24 15:23:50 +02:00
Julian Maurice
db79d85237 Bug 8903: Pass invoiceid to ModReceiveOrder
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-24 15:17:30 +02:00
Nicole C. Engard
e242a3a696 Bug 8945: Update comments help file
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:15:50 +02:00
Nicole C. Engard
152605e319 Bug 8945: Hold help file
This patch updates the holds help file.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:15:45 +02:00
Nicole C. Engard
f893e2a5fb Bug 8945: Reports Help Files
This patch updates the reports help files for 3.10.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:15:39 +02:00
Nicole C. Engard
44811b92bb Bug 8945: Update patron card creator help files
Links to the manual updated, no other changes needed at this time.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:15:32 +02:00
Nicole C. Engard
8f842c7cb7 Bug 8945: Update offline circ help files
This patch adds in a help file for the FF offline processer and
updates the other help file.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:15:25 +02:00
Nicole C. Engard
5bbff8be8f Bug 8945: Add patron routing list help file
This patch adds a missing help file to the members folder.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:15:17 +02:00
Nicole C. Engard
cc748481d1 Bug 8945: Update patron help files
This patch adds two missing help files and updates the
existing help files in the members folder.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:15:10 +02:00
Nicole C. Engard
47492c9c73 Bug 8945: Label help files
This patch just updates the manual links in the label
folder becaue no other functionality has changed.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:15:02 +02:00
Nicole C. Engard
f4d1f9106c Bug 8945: Circulation help files
Updates circulation help files.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:14:57 +02:00
Nicole C. Engard
4399526be8 Bug 8945: Add missing detail help file to catalog
This patch adds a missing help file to the catalogue
folder.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:14:49 +02:00
Nicole C. Engard
e76c36a85d Bug 8945: Cataloging Help Files
This patch adds one missing help file for analytics and updates
the others.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:14:43 +02:00
Nicole C. Engard
9cc050bae2 Bug 8945: Catalogue Help Files
This patch updates the catalogue help files.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:14:37 +02:00
Nicole C. Engard
5a774b4a35 Bug 8945: Authority Help Files
This patch updates authority help files.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:14:29 +02:00
Nicole C. Engard
cb54358aed Bug 8945: Administration Help Files
This patch adds the help file for the transport cost matrix
and updates all others. Still needed is a help file for
'did you mean'.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:14:19 +02:00
Nicole C. Engard
a1225ba9d1 Bug 8945: Acquisitions Help Files for 3.10
This patch adds a few missing help files and updates all
of the existing help files for 3.10.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:14:07 +02:00
Nicole C. Engard
1a92ab45d1 Bug 8945: Update help files for 3.10
This patch updates help files that are not in any
specific module folder.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 18:13:59 +02:00
Nicole C. Engard
17c097a71e Bug 8944: Fix invoices search wording
When the invoices page has no results it asks the user
to use the form on the left to search. This patch fixes the
wording to make it a bit clearer.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 17:59:00 +02:00
c76d6fe3f1 Bug 8912 - Remove unused hold-menu.inc
hold-menu.inc is not used on any page in Koha and
can be safely removed.

To confirm, search the Koha source for "hold-menu.inc." No
instances should be found.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 17:55:26 +02:00
af68717016 Bug 8935 - transport cost matrix could be prettier
Correcting the template so that it follows established
interface patterns and coding guidelines:

- Form contents in a fieldset
- Submit button in a fieldset with class "action" and
  with a "Cancel" link.
- Errors displayed in a <div class="dialog alert">
  (no custom error classes necessary).
- Valid markup.
- No JavaScript errors (to that end, the patch removes a
  call to a non-existent function, show_transport_cost_matrix)

http://bugs.koha-community.org/show_bug.cgi?id=8936
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
still works as expected and is much more visually appealing.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 17:51:11 +02:00
492dd7dc7f Bug 8870 UNIMARC authorities search doesn't display information properly
- Note field (3xx) are not displayed on search result page. We get
  'HASH()' text.
- Parallel/Other forms (7xx) are not displayed, with language name in front of
  heading, both on result and detail page.
- Note are not displayed.
- On result page, seealso form are displayed, but end with a superfluous '--'
- Style the result page, with condensed block, and space between them.
- Done both on OPAC/staff

To be applied on 3.8.x after bug 8523.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 17:50:06 +02:00
Nicole C. Engard
d50edb9a8f Bug 8934: Fix transport cost matrix help language
The transport cost matrix has a typo (arbitrarymax) and the help
text could be worded better. This patch makes those changes.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 17:48:18 +02:00
b9f4082f1b Bug 8923 [Revised] Add ids to repeated pagination menus to allow for CSS customization
This patch adds ids to each pagination menu on the OPAC search
results page so that they can be customized via CSS or JavaScript.

To test, modify OpacUserCSS to hide ids "top-pages" and "bottom-pages"
and confirm that they are hidden.

Also fixed is an unescaped ampersand introduced by Bug 8209.

Revision removes debugging changes to an unrelated file.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 17:44:42 +02:00
Nicole C. Engard
bbcef720a5 Bug 8933: Update transport cost matrix styles
The transport cost matrix is capitlized wrong (based on our
rules). This patch fixes capitalization errors and adds the
matrix to the admin menu where it was missing before.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 17:33:04 +02:00
Paul Poulain
3ebb36e67a Bug 8916 follow-up adding Mathieu Saby to contributors list
Also adding 3.8.6 release
2012-10-22 17:30:41 +02:00
Mathieu Saby
e0cd4f898f Bug 8916: Hide Curriculum index in advanced search if marcflavor = unimarc
This patch hides curriculum option value in koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc and koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt if marcflavor = UNIMARC

To test
- set marcflavour to UNIMARC, this option should be hidden in the index list in opac and staff interface advanced search
- set marcflavour to MARC21, this option should be visible, as before

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 17:23:29 +02:00
fc78d1c268 Bug 8898 - Remove unused mainmenu include and related styles in the staff client
This patch removes the mainmenu and additem-menu includes and #navigation
references in staff-global.css which were used by those includes.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 17:17:56 +02:00
Jonathan Druart
2b9ba0fd0a Babeltheque: Remove the unused tab on the opac detail page
http://bugs.koha-community.org/show_bug.cgi?id=8792
Signed-off-by: Marc Veron <veron@veron.ch>
Babeltheque tab is removed as expected

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 17:10:22 +02:00
Paul Poulain
fc49b7a3b5 Bug 7483 follow-up replacing tabs by 4 spaces in both templates 2012-10-22 17:07:37 +02:00
Adrien Saurat
d27c8210ae Bug 7483: fixes on breadcrumbs in Authority administration
Better breadcrumbs for the following pages:
- auth_tag_structure.pl
- auth_subfields_structure.pl

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 17:01:08 +02:00
Paul Poulain
471f05a0c7 Bug 8724 follow-up DBRev number 2012-10-22 15:00:25 +02:00
8626a5bebb Bug 8724 - Upgrade from NoZebra installs is broken
Properly set the relevant NoZebra and QueryRemoveStopwords sysprefs to 0 to fix issues on upgrades.
Also removes the sysprefs from preferences/searching.pref

Regards
To+

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 14:55:17 +02:00
084367f6cb Bug 3087 Fix Z39.50 server to return the correct record syntax
Modify Makefile.PL and Zebra configuration files in order to parametrized
biblio record type returned by Zebra Z39.50 server.

How to test:

- Test with a MARC21 and a UNIMARC DB
- Do a new installation
- Search from OPAC
- Search from a Z39.50 client like yaz-client: syntax = MARC21/UNIMARC must be
  choosed
- It was working for MARC21: it continues to work
- It wasn't working for UNIMARC: it works now, both in OPAC and from a Z39.50
  client

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Works fine for MARC21. Frederic looked at UNIMARC. Magnus looked at NORMARC.
GRS1 works okay for me. I still have issues with DOM, but they are not directly related to changes in this patch.
A followup is still needed for packaging (debian/templates).

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-22 14:12:22 +02:00
Paul Poulain
ee3eee451d Merge remote-tracking branch 'origin/new/bug_8525' 2012-10-19 18:03:36 +02:00
Nicole C. Engard
1571139839 Follow up: Bug 8525: Update preference description
The feature in bug 8525 added highlighting to the detail
pages in the opac. This patch updates the preference to
note this change.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-19 18:03:21 +02:00
Paul Poulain
8a53d28490 Merge remote-tracking branch 'origin/new/bug_7986' 2012-10-19 18:03:02 +02:00
Nicole C. Engard
f03712d37b Bug 7986 Follow Up: Fix ExportRemoveFields
This preference was in the code as a choice but should be a list
of fields to exclude. This patch makes that change and updates
the description to fit more with the standard set by other
preferences.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-19 17:54:25 +02:00
Nicole C. Engard
3a4129e6a3 Bug 7986 Follow Up: Update ExportWithCsvProfile
The ExportWithCsvProfile preference was on its own file
(tools.pref) when in reality it belonged on the circulation
tab. This patch removes the tools.pref file and moves the
ExportWithCsvProfile preference and updates the text
around it to make it clearer.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
2012-10-19 17:54:23 +02:00
Mirko Tietgen
4ccf4181bb Bug 4177 opaccloud missing from the system preferences interface
There is no option to toggle the (existing) syspref OpacCloud. This patch adds one.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Inserted tags manually, enabled system preference, tag subject cloud displays nicely.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-19 17:52:37 +02:00
Mark Tompsett
2317b233e1 Bug 8861 - Undefined variables in batchMod.pl trigger error logs
Initialized $op, and changed lines like "$op => 1" and
"$error => 1" into separate, conditional template param calls.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-19 17:48:32 +02:00
32fab74b98 Bug 1963 Problem with deleted biblio in a virtual shelf
This bug reappear in HEAD/3.8. When trying to display a virtual shelf
(list) containing a deleted biblio, this error message is displayed:

Software error:

Can't call method "field" on an undefined value at ....C4/Koha.pm line
1231.

This fix modify SQL query retrieving biblios, just skipping records from
virtual shelf table with no linked record in biblio table: LEFT JOIN
replace with JOIN.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-17 18:06:21 +02:00
Paul Poulain
1fd99527bd Merge remote-tracking branch 'origin/new/bug_4118' 2012-10-17 18:04:30 +02:00
Nicole C. Engard
b0b927f4f2 Bug 4118: Follow up: Add ccode to kohastructure for stats
CCode was added to the statistics table in this bug, but
was not added to kohastructure.sql. This patch adds it
with comment to the kohastructure.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-17 18:04:14 +02:00
Paul Poulain
dc1680f8a9 Merge remote-tracking branch 'origin/new/bug_5356' 2012-10-17 18:01:06 +02:00