koha.git
8 years agoMerge remote-tracking branch 'origin/new/bug_3652'
Paul Poulain [Wed, 24 Oct 2012 13:44:33 +0000 (15:44 +0200)]
Merge remote-tracking branch 'origin/new/bug_3652'

8 years agobug 3652 fixing XSS vulnerabilities in opac-search
Chris Hall [Wed, 17 Oct 2012 01:32:19 +0000 (14:32 +1300)]
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>
8 years agoBug 3652: close XSS vulnerabilities in opac-export
Jared Camins-Esakov [Mon, 15 Oct 2012 15:58:30 +0000 (11:58 -0400)]
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>
8 years agoBug 3652 follow-up reverting call to param('bib')
Paul Poulain [Wed, 24 Oct 2012 13:30:24 +0000 (15:30 +0200)]
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

8 years agoBug 3652: close XSS vulnerabilities on biblionumber and authid
Jared Camins-Esakov [Mon, 15 Oct 2012 15:45:38 +0000 (11:45 -0400)]
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>
8 years agoBug 8903: Pass invoiceid to ModReceiveOrder
Julian Maurice [Thu, 11 Oct 2012 12:20:57 +0000 (14:20 +0200)]
Bug 8903: Pass invoiceid to ModReceiveOrder

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8945: Update comments help file
Nicole C. Engard [Fri, 19 Oct 2012 18:09:56 +0000 (14:09 -0400)]
Bug 8945: Update comments help file

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8945: Hold help file
Nicole C. Engard [Fri, 19 Oct 2012 18:07:10 +0000 (14:07 -0400)]
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>
8 years agoBug 8945: Reports Help Files
Nicole C. Engard [Fri, 19 Oct 2012 18:01:13 +0000 (14:01 -0400)]
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>
8 years agoBug 8945: Update patron card creator help files
Nicole C. Engard [Fri, 19 Oct 2012 16:13:49 +0000 (12:13 -0400)]
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>
8 years agoBug 8945: Update offline circ help files
Nicole C. Engard [Fri, 19 Oct 2012 16:03:46 +0000 (12:03 -0400)]
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>
8 years agoBug 8945: Add patron routing list help file
Nicole C. Engard [Fri, 19 Oct 2012 15:50:03 +0000 (11:50 -0400)]
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>
8 years agoBug 8945: Update patron help files
Nicole C. Engard [Fri, 19 Oct 2012 15:43:45 +0000 (11:43 -0400)]
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>
8 years agoBug 8945: Label help files
Nicole C. Engard [Fri, 19 Oct 2012 15:22:09 +0000 (11:22 -0400)]
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>
8 years agoBug 8945: Circulation help files
Nicole C. Engard [Fri, 19 Oct 2012 15:10:41 +0000 (11:10 -0400)]
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>
8 years agoBug 8945: Add missing detail help file to catalog
Nicole C. Engard [Fri, 19 Oct 2012 14:36:48 +0000 (10:36 -0400)]
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>
8 years agoBug 8945: Cataloging Help Files
Nicole C. Engard [Fri, 19 Oct 2012 14:33:17 +0000 (10:33 -0400)]
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>
8 years agoBug 8945: Catalogue Help Files
Nicole C. Engard [Fri, 19 Oct 2012 13:55:40 +0000 (09:55 -0400)]
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>
8 years agoBug 8945: Authority Help Files
Nicole C. Engard [Fri, 19 Oct 2012 13:52:42 +0000 (09:52 -0400)]
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>
8 years agoBug 8945: Administration Help Files
Nicole C. Engard [Fri, 19 Oct 2012 13:24:16 +0000 (09:24 -0400)]
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>
8 years agoBug 8945: Acquisitions Help Files for 3.10
Nicole C. Engard [Fri, 19 Oct 2012 12:05:22 +0000 (08:05 -0400)]
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>
8 years agoBug 8945: Update help files for 3.10
Nicole C. Engard [Fri, 19 Oct 2012 11:35:07 +0000 (07:35 -0400)]
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>
8 years agoBug 8944: Fix invoices search wording
Nicole C. Engard [Sun, 14 Oct 2012 14:19:15 +0000 (10:19 -0400)]
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>
8 years agoBug 8912 - Remove unused hold-menu.inc
Owen Leonard [Fri, 12 Oct 2012 14:27:46 +0000 (10:27 -0400)]
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>
8 years agoBug 8935 - transport cost matrix could be prettier
Owen Leonard [Wed, 17 Oct 2012 16:35:28 +0000 (12:35 -0400)]
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>
8 years agoBug 8870 UNIMARC authorities search doesn't display information properly
Frédéric Demians [Wed, 3 Oct 2012 15:55:50 +0000 (17:55 +0200)]
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>
8 years agoBug 8934: Fix transport cost matrix help language
Nicole C. Engard [Sat, 13 Oct 2012 11:33:31 +0000 (07:33 -0400)]
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>
8 years agoBug 8923 [Revised] Add ids to repeated pagination menus to allow for CSS customization
Owen Leonard [Mon, 15 Oct 2012 17:20:31 +0000 (13:20 -0400)]
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>
8 years agoBug 8933: Update transport cost matrix styles
Nicole C. Engard [Sat, 13 Oct 2012 11:11:10 +0000 (07:11 -0400)]
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>
8 years agoBug 8916 follow-up adding Mathieu Saby to contributors list
Paul Poulain [Mon, 22 Oct 2012 15:30:41 +0000 (17:30 +0200)]
Bug 8916 follow-up adding Mathieu Saby to contributors list

Also adding 3.8.6 release

8 years agoBug 8916: Hide Curriculum index in advanced search if marcflavor = unimarc
Mathieu Saby [Sat, 13 Oct 2012 08:36:37 +0000 (10:36 +0200)]
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>
8 years agoBug 8898 - Remove unused mainmenu include and related styles in the staff client
Owen Leonard [Wed, 10 Oct 2012 18:33:04 +0000 (14:33 -0400)]
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>
8 years agoBabeltheque: Remove the unused tab on the opac detail page
Jonathan Druart [Wed, 19 Sep 2012 13:05:03 +0000 (15:05 +0200)]
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>
8 years agoBug 7483 follow-up replacing tabs by 4 spaces in both templates
Paul Poulain [Mon, 22 Oct 2012 15:07:37 +0000 (17:07 +0200)]
Bug 7483 follow-up replacing tabs by 4 spaces in both templates

8 years agoBug 7483: fixes on breadcrumbs in Authority administration
Adrien Saurat [Tue, 18 Sep 2012 12:51:28 +0000 (14:51 +0200)]
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>
8 years agoBug 8724 follow-up DBRev number
Paul Poulain [Mon, 22 Oct 2012 13:00:25 +0000 (15:00 +0200)]
Bug 8724 follow-up DBRev number

8 years agoBug 8724 - Upgrade from NoZebra installs is broken
Tomas Cohen Arazi [Tue, 4 Sep 2012 18:02:51 +0000 (15:02 -0300)]
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>
8 years agoBug 3087 Fix Z39.50 server to return the correct record syntax
Frédéric Demians [Wed, 11 Apr 2012 15:36:40 +0000 (17:36 +0200)]
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>
8 years agoMerge remote-tracking branch 'origin/new/bug_8525'
Paul Poulain [Fri, 19 Oct 2012 16:03:36 +0000 (18:03 +0200)]
Merge remote-tracking branch 'origin/new/bug_8525'

8 years agoFollow up: Bug 8525: Update preference description
Nicole C. Engard [Thu, 27 Sep 2012 19:05:18 +0000 (15:05 -0400)]
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>
8 years agoMerge remote-tracking branch 'origin/new/bug_7986'
Paul Poulain [Fri, 19 Oct 2012 16:03:02 +0000 (18:03 +0200)]
Merge remote-tracking branch 'origin/new/bug_7986'

8 years agoBug 7986 Follow Up: Fix ExportRemoveFields
Nicole C. Engard [Sat, 13 Oct 2012 06:48:01 +0000 (02:48 -0400)]
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>
8 years agoBug 7986 Follow Up: Update ExportWithCsvProfile
Nicole C. Engard [Fri, 12 Oct 2012 20:55:54 +0000 (16:55 -0400)]
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>
8 years agoBug 4177 opaccloud missing from the system preferences interface
Mirko Tietgen [Thu, 4 Oct 2012 11:26:26 +0000 (13:26 +0200)]
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>
8 years agoBug 8861 - Undefined variables in batchMod.pl trigger error logs
Mark Tompsett [Tue, 2 Oct 2012 13:07:18 +0000 (21:07 +0800)]
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>
8 years agoBug 1963 Problem with deleted biblio in a virtual shelf
Frédéric Demians [Fri, 5 Oct 2012 08:45:18 +0000 (10:45 +0200)]
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>
8 years agoMerge remote-tracking branch 'origin/new/bug_4118'
Paul Poulain [Wed, 17 Oct 2012 16:04:30 +0000 (18:04 +0200)]
Merge remote-tracking branch 'origin/new/bug_4118'

8 years agoBug 4118: Follow up: Add ccode to kohastructure for stats
Nicole C. Engard [Fri, 12 Oct 2012 00:45:31 +0000 (20:45 -0400)]
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>
8 years agoMerge remote-tracking branch 'origin/new/bug_5356'
Paul Poulain [Wed, 17 Oct 2012 16:01:06 +0000 (18:01 +0200)]
Merge remote-tracking branch 'origin/new/bug_5356'

8 years agoBug 5356: Followup Change font in the layout3pages pdf
Jonathan Druart [Tue, 16 Oct 2012 07:31:08 +0000 (09:31 +0200)]
Bug 5356: Followup Change font in the layout3pages pdf

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 3652: [SIGNED-OFF] XSS fixes - follow up
Katrin Fischer [Mon, 15 Oct 2012 07:07:50 +0000 (09:07 +0200)]
Bug 3652: [SIGNED-OFF] XSS fixes - follow up

Fixes a typo in the html filter that causes a problem when using the
paging in the OPAC result lists.

(forgot to commit my change when testing the original XSS patches)

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
I triggered the error with this query string:
/cgi-bin/koha/opac-search.pl?idx=kw&q=o'reilly&offset=40&sort_by=author_az
After applying the patch the error is gone.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoMerge remote-tracking branch 'origin/new/bug_8585'
Paul Poulain [Wed, 17 Oct 2012 15:31:09 +0000 (17:31 +0200)]
Merge remote-tracking branch 'origin/new/bug_8585'

8 years agoFollow up to Bug 8585: add missing word to preference
Nicole C. Engard [Fri, 12 Oct 2012 01:23:48 +0000 (21:23 -0400)]
Follow up to Bug 8585: add missing word to preference

The preference added in this bug is missing the word
'day(s)'. This patch adds it in.

http://bugs.koha-community.org/show_bug.cgi?id=4118
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7143 follow-up replace tabs by 4 spaces
Paul Poulain [Tue, 16 Oct 2012 16:18:13 +0000 (18:18 +0200)]
Bug 7143 follow-up replace tabs by 4 spaces

8 years agoBug 7143 : New committer to history
Chris Cormack [Sun, 14 Oct 2012 19:52:27 +0000 (08:52 +1300)]
Bug 7143 : New committer to history

8 years agoBug 7143: Adding new developers to the history file
Chris Cormack [Tue, 9 Oct 2012 21:13:48 +0000 (10:13 +1300)]
Bug 7143: Adding new developers to the history file

Signed-off-by: Melia Meggs <melia@test.bywatersolutions.com>
8 years agoMerge remote-tracking branch 'origin/new/bug_7751'
Paul Poulain [Tue, 16 Oct 2012 16:13:51 +0000 (18:13 +0200)]
Merge remote-tracking branch 'origin/new/bug_7751'

8 years ago:x
Nicole C. Engard [Thu, 11 Oct 2012 23:52:21 +0000 (19:52 -0400)]
:x

The preference used to read 'loan period by' but it's
actually reducing the checkout period 'to' the number
of days entered in the preference.  This patch changes
'by' to 'to'.

Signed-off-by: Marc Veron <veron@veron.ch>
Tiny patch, text change only, text apears as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8791: OPAC UNIMARC XSLT details: subject with subfield 3
Fridolyn SOMERS [Wed, 19 Sep 2012 09:45:19 +0000 (11:45 +0200)]
Bug 8791: OPAC UNIMARC XSLT details: subject with subfield 3

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
I can reproduce the bug, and confirm that this patch fix it. The issue arises
when $9 come first, and then $3, which is not that usual.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8873 - JavaScript error in Opac displaying tag cloud
Marc Veron [Thu, 4 Oct 2012 09:34:42 +0000 (11:34 +0200)]
Bug 8873 - JavaScript error in Opac displaying tag cloud

On master (3.09.00.060), I get a JavaScript error on line 126 in opac-tags.pl while displaying tags cloud.

Reason: There are two lines with closing });

Patch removes one line.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8793 - Fix materialTypeCode/typeOf008 icons for NORMARC XSLT
Magnus Enger [Sun, 23 Sep 2012 10:28:49 +0000 (12:28 +0200)]
Bug 8793 - Fix materialTypeCode/typeOf008 icons for NORMARC XSLT

This patch fixes some issues with icons related to materialtypes in NORMARC:

Remove references to opac-tmpl in the *intranet* NORMARC XSLT files.

Add two new icons to koha-tmpl/intranet-tmpl/prog/img/famfamfam/ and
koha-tmpl/opac-tmpl/lib/famfamfam/
GR.png - Graphical materials
TD.png - Three dimentional objects

Copy PR.png from koha-tmpl/intranet-tmpl/prog/img/famfamfam/ to
koha-tmpl/opac-tmpl/lib/famfamfam/

Rename the XSLT variable materialTypeCode to typeOf008 for increased consistency
between stylesheets.

Make sure the XSLT uses icons that are actually available.

To test:
- No use testing all the different permutations of leader pos. 06 and 019b, I think.
- Set marcflavour = NORMARC and turn on default XSLT for OPAC and Intranet, details
  and results.
- Make sure you have a record with something relevant in leader position 6, like
  g for movies or c for music
- Check that the icon turns up in results and details, in the OPAC and Intranet
- Toggle DisplayOPACiconsXSLT and check that the results in the OPAC are as expected

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8862 follow-up s/\t/4spaces/g
Paul Poulain [Fri, 12 Oct 2012 20:19:25 +0000 (22:19 +0200)]
Bug 8862 follow-up s/\t/4spaces/g

8 years agoBug 8862 - merge.pl contains untranslatable strings
Kyle M Hall [Tue, 2 Oct 2012 12:58:40 +0000 (08:58 -0400)]
Bug 8862 - merge.pl contains untranslatable strings

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
It works: (1) merging's still effective, and (2) two new error messages appear
in staff .po file after update it.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8869 - Duplicate member check doesn't disable submit button on bottom.
Kyle M Hall [Wed, 3 Oct 2012 14:49:13 +0000 (10:49 -0400)]
Bug 8869 - Duplicate member check doesn't disable submit button on bottom.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
I confirm that after applying this patch, the submit button is removed from
patron edit page, avoiding accidentaly clicking on it, without responding to
the question about possible duplicate patron?

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8863: When clearing a patron attribute, they are all cleared
Fridolyn SOMERS [Tue, 2 Oct 2012 14:30:48 +0000 (16:30 +0200)]
Bug 8863: When clearing a patron attribute, they are all cleared

Signed-off-by: Marc Veron <veron@veron.ch>
Tested with a set of 2 additional patron attributes. Cleard both before applying the patch.
Cleared as expected after applying the patch.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8851 - strange blue bar above serials results
Owen Leonard [Tue, 2 Oct 2012 18:25:26 +0000 (14:25 -0400)]
Bug 8851 - strange blue bar above serials results

Bug 5357 (Subscription search and displays) added an advanced
search form which adds a new interface featured: a collapsible
fieldset with the search form inside. Bug 8851 was filed
because it is not immediately obvious that the search form
is hidden and can be shown by clicking the fieldset's legend.

I contend that this new behavior is unnecessary: In many other
places we put a similar search form in the left-hand sidebar.

This patch amends the template to show the search form in the
main body of the page if no search has been performed. After
searching the form is moved to the sidebar. This keeps the page
consistent with other interfaces and eliminates the confusion
about the collapsed form.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8175 - check logs error or displays incorrectly in details.pl
Mark Tompsett [Sun, 2 Sep 2012 12:46:03 +0000 (20:46 +0800)]
Bug 8175 - check logs error or displays incorrectly in details.pl

Changed "$item->{'materials'} ne ''" to
"defined($item->{'materials'}) && $item->{'materials'} =~ /\S/"
in if condition to prevent error when it is NULL, and to
properly capture the intent of printing if there is something
visible.

Cases tested include NULL, '0', '', ' ', and 'blah' by using
 UPDATE items SET materials=NULL where biblionumber=19158;
where the biblionumber was chosen randomly, because only NULL
was in the items.materials field. The NULL case triggers an
error, but it does display correctly.

The ' ' case displays an apparently empty column, which does not
seem to be the intent of the flag that is being set. This is why
a simple $var check is not sufficient.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8843 - Cannot export bibliographic records by call number
Owen Leonard [Fri, 28 Sep 2012 14:48:16 +0000 (10:48 -0400)]
Bug 8843 - Cannot export bibliographic records by call number

When building the query for exports by call number the script
has the logic reversed. It tries to select records with call
numbers less than the starting call number and greater than
the ending call number. This should be reversed.

To test, test an export in an unpatched system. An export by
call number will return an empty file. After applying the patch
an export by call number should give valid results.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Works as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8718 - Normal catalogue detail view in staff client doesn't show missing serials...
David Cook [Tue, 4 Sep 2012 02:43:28 +0000 (12:43 +1000)]
Bug 8718 - Normal catalogue detail view in staff client doesn't show missing serials or subscription history note

Adds librariannote (staff subscription history note) and missing list to the normal catalogue detail view in staff client.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8766 - OPACBaseURL still called as OPACBaseurl in many files
Owen Leonard [Mon, 24 Sep 2012 19:56:05 +0000 (15:56 -0400)]
Bug 8766 - OPACBaseURL still called as OPACBaseurl in many files

This patch fixes incorrect capitalization of the OPACBaseURL
variable in three templates. The fix can be confirmed in
opac-results.tt by inspecting the link attached to the RSS
icon on the OPAC's search results screen. The same fix is included
in opac-opensearch.tt and search/results.tt but I'm not sure
how you confirm that this change fixes anything, if it does.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7643 - Can't upload and import zipped file of patron images
Ivan Brown [Tue, 25 Sep 2012 14:57:43 +0000 (15:57 +0100)]
Bug 7643 - Can't upload and import zipped file of patron images

Fixed problem with re-declaration of $filesuffix

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
patch pushed onto master directly, doesn't merge properly from
new/bug_7643 branch

8 years agoMerge remote-tracking branch 'origin/new/bug_7412'
Paul Poulain [Fri, 12 Oct 2012 10:28:54 +0000 (12:28 +0200)]
Merge remote-tracking branch 'origin/new/bug_7412'

8 years agoBug 7412: Follow up: Update preference to sentence
Nicole C. Engard [Tue, 25 Sep 2012 15:50:52 +0000 (11:50 -0400)]
Bug 7412: Follow up: Update preference to sentence

This patch updates the preference question to a sentence
to follow the standard set with previous preferences.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoMerge remote-tracking branch 'origin/new/bug_7751'
Paul Poulain [Fri, 12 Oct 2012 10:23:08 +0000 (12:23 +0200)]
Merge remote-tracking branch 'origin/new/bug_7751'

8 years agoBug 7751: Decrease loan length with many holds
Nicole C. Engard [Wed, 26 Sep 2012 01:30:29 +0000 (21:30 -0400)]
Bug 7751: Decrease loan length with many holds

This patch merges the three preferences in to one sentence
to make it clear that they are all linked together and to
eliminate confusion that can come by having them as
individual preferences.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
8 years agoBug 3652 XSS vulnerability in facets
Chris Cormack [Tue, 9 Oct 2012 01:19:18 +0000 (14:19 +1300)]
Bug 3652 XSS vulnerability in facets

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed bug with test plan on the bug and checked that
problem is fixed after applying the patch and that facets
still work.

8 years agoBug 3652: XSS vulnerability in page numbering
Chris Cormack [Tue, 9 Oct 2012 01:11:10 +0000 (14:11 +1300)]
Bug 3652: XSS vulnerability in page numbering

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Confirmed the problem with test plan on the bug and checked that
paging works correctly after the patch.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 3652 : [SIGNED-OFF] [SECURITY] XSS vulnerability
Chris Cormack [Mon, 8 Oct 2012 08:30:49 +0000 (21:30 +1300)]
Bug 3652 : [SIGNED-OFF] [SECURITY] XSS vulnerability

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Works as advertised. After applying the patch, <blink>fish</blink>
is displayed on the page, but no blinking occurs.

Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoMerge remote-tracking branch 'origin/new/bug_8636'
Paul Poulain [Fri, 12 Oct 2012 09:55:14 +0000 (11:55 +0200)]
Merge remote-tracking branch 'origin/new/bug_8636'

8 years agoBug 8636: Add dependency on Test::Deep
Jared Camins-Esakov [Thu, 11 Oct 2012 00:48:54 +0000 (20:48 -0400)]
Bug 8636: Add dependency on Test::Deep

The test t/db_dependent/Koha.t uses Test::Deep to compare data
structures, but that dependency was not listed for the installer.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8812 - Staff Client: Patron search should display branch name instead of branch...
Marc Veron [Mon, 24 Sep 2012 16:14:37 +0000 (18:14 +0200)]
Bug 8812 - Staff Client: Patron search should display branch name instead of branch code in results table

Patch to display branchname instead of branch code.

Signed-off-by: Delaye Stephane <stephane.delaye@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8633 Manage OPAC alternate templates
Frédéric Demians [Wed, 19 Sep 2012 13:28:40 +0000 (15:28 +0200)]
Bug 8633 Manage OPAC alternate templates

Modify /misc/translator/translate script in order to manage properly alternate
OPAC templates.

To test it with new 'ccsr' template:

- Create the .po file:

  ./translate create fr-FR

  Result: existing .po files are not modified. A new fr-FR-opac-ccsr.po file is
  available.

- Install all templates :

  ./translate install fr-FR

  Result: A new koha-tmpl/opac-tmpl/ccsr/fr-FR directory contains translated
  templates.

- Update .po files:

  ./translate update fr-FR

  Result: fr-FR .po files are update, include fr-FR-opac-ccsr.po

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8831: relabel gstrate with Tax rate
Nicole C. Engard [Wed, 26 Sep 2012 16:44:46 +0000 (12:44 -0400)]
Bug 8831: relabel gstrate with Tax rate

This patch changes gstrate to Tax rate to match the standard set
on all other acq pages.

Signed-off-by: Marc Veron <veron@veron.ch>
Small text change. Label displays as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8700 - RESERVESLIP fields not being replaced correctly
Kyle M Hall [Wed, 29 Aug 2012 12:44:26 +0000 (08:44 -0400)]
Bug 8700 - RESERVESLIP fields not being replaced correctly

The slip RESERVESLIP is not replacing fields correctly.
C4::Reserves::ReserveSlip calls C4::Letters::GetPreparedLetter,
and passes the $reserve hashref to it for each table except branches
( which is passed the branchcode ). The problem is, if you pass a
hashref for a table, it uses that hashref for the replacing, rather
than looking up the data from the database.

Fixed by passing the correct keys for each of the tables requested.

Signed-off-by: Marc Veron <veron@veron.ch>
Tested following the test plan.
Could reproduce the bug.
After applying the patch slip printed as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8820 - Don't show orders table if there are no orders
Owen Leonard [Tue, 25 Sep 2012 18:28:42 +0000 (14:28 -0400)]
Bug 8820 - Don't show orders table if there are no orders

This page removes the "basket empty" message in favor of
hiding the orders table altogether when a basket has no
orders. This patch also moves the "Show all details"
checkbox under the "Orders" heading to associate it more
closely with the area it affects.

Other textual changes:

- Correcting capitalization according to coding guidelines
- Correcting terminology (basket group instead of basketgroup)
- Replacing the "Order Details" heading with the more
  succinct "Orders"

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8801: Add menu entry to delete items in batch
Julian Maurice [Fri, 21 Sep 2012 10:05:19 +0000 (12:05 +0200)]
Bug 8801: Add menu entry to delete items in batch

In catalogue/detail.pl you can now select "Delete items in batch" in
"Edit" menu. You are redirected to batchMod.pl for chosing which items
have to be deleted.
You need to have 'tools.items_batchdel' permission to see this menu
entry.

Signed-off-by: Marc Veron <veron@veron.ch>
Works as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8742 - Example uses perl 5.8 in Makefile.PL
Mark Tompsett [Tue, 11 Sep 2012 17:25:59 +0000 (01:25 +0800)]
Bug 8742 - Example uses perl 5.8 in Makefile.PL

Changed hardcoded path for a programmatic one. Basing it on:
  grep /\/usr\/share\/perl\//, @INC;
And doing a:
  push @version, ('/usr/share/perl/5.10') if !$version[0];
For a reasonable default otherwise. No more references to
  /usr/share/perl/5.8
hardcoded into the output.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8441: hides MODS export by default in French install
Adrien Saurat [Thu, 20 Sep 2012 09:46:13 +0000 (11:46 +0200)]
Bug 8441: hides MODS export by default in French install

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 7873 follow-up s/tab/4spaces/
Paul Poulain [Tue, 9 Oct 2012 16:03:05 +0000 (18:03 +0200)]
Bug 7873 follow-up s/tab/4spaces/

8 years agoBug 7873: fixes sort on Title in OPAC basket
Adrien Saurat [Fri, 21 Sep 2012 08:53:03 +0000 (10:53 +0200)]
Bug 7873: fixes sort on Title in OPAC basket

Signed-off-by: Marc Veron <veron@veron.ch>
Reproduced wrong title sort without patch.
Sort works as expected with patch.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoMerge remote-tracking branch 'origin/new/bug_8741'
Paul Poulain [Tue, 9 Oct 2012 15:55:33 +0000 (17:55 +0200)]
Merge remote-tracking branch 'origin/new/bug_8741'

8 years agoBug 8741 - crontab.example missing username, fails in some systems
Tomas Cohen Arazi [Fri, 7 Sep 2012 18:22:18 +0000 (15:22 -0300)]
Bug 8741 - crontab.example missing username, fails in some systems

Simple addition of the koha user to the sample cron file. Might help non-tech
users to get things like incremental indexing to work.

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>
8 years agoBug 8570 follow-up removing tabs & improving indentation
Paul Poulain [Tue, 9 Oct 2012 15:34:58 +0000 (17:34 +0200)]
Bug 8570 follow-up removing tabs & improving indentation

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8570 follow-up removing tabs & improving indentation
Paul Poulain [Tue, 9 Oct 2012 15:34:58 +0000 (17:34 +0200)]
Bug 8570 follow-up removing tabs & improving indentation

8 years agoBug 8570 - Add pagination to the Z39.50 results page
Frédérick [Fri, 3 Aug 2012 17:50:29 +0000 (13:50 -0400)]
Bug 8570 - Add pagination to the Z39.50 results page

Add paginations to the Z39.50 search results.

http://bugs.koha-community.org/show_bug.cgi?id=8570
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 2930 [REVISED] Put other name on checkout screen
Owen Leonard [Thu, 6 Sep 2012 16:31:23 +0000 (12:31 -0400)]
Bug 2930 [REVISED] Put other name on checkout screen

This patch adds other name to the include which is used
to display patron names and adds this include in several
places where it can be used in place of direct output.

The patron-title include has been modified to handle the
two possible variable scopes throughout patron-related
templates. This is a hack similar to having both
circ-menu.tt and circ-menu.inc, but keeping both in the
same file.

Changes to some scripts were necessary to make the
othernames variable available to the include.

This patch also corrects some <title> tags and fixes
some incorrect capitalization (see Bug 2780).

To test, view each of the pages affected by these
template changes and confirm that the patron's name
displays correctly, including their "other name."

Signed-off-by: Marc Veron <veron@veron.ch>
Followed instructions above, works as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8772 - Uninitialized variable triggers error log entry in smart_rules.pl
Mark Tompsett [Tue, 18 Sep 2012 16:05:24 +0000 (00:05 +0800)]
Bug 8772 - Uninitialized variable triggers error log entry in smart_rules.pl

Changed declartion from:
  my $op = $input->param('op');
to
  my $op = $input->param('op') || q{};
in order to give an empty string default preventing error
logs from filling needlessly.

Signed-off-by: Marc Veron <veron@veron.ch>
The patch removes warnings like:
Use of uninitialized value $op in string eq at...

However there is one more warning, but it is not related to $op (addressed by this patch):
smart-rules.pl: Use of uninitialized value in string ne at .../admin/smart-rules.pl line 388.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBug 8652 follow-up adding more tests
Paul Poulain [Tue, 9 Oct 2012 09:47:37 +0000 (11:47 +0200)]
Bug 8652 follow-up adding more tests

Adding 3 tests to check for the new parameter of output_pref sub
the 3rd parameter, if 1, result in only returning the date (not the time)

8 years agoBug 8652: Followup: add a default value for date_from
Jonathan Druart [Wed, 12 Sep 2012 07:50:16 +0000 (09:50 +0200)]
Bug 8652: Followup: add a default value for date_from

This patchis add a third parameter to the output_pref routine. It allows
to specify the output string with or without the hours and minutes
(%H:%M)

Signed-off-by: MathildeF <mathilde.formery@ville-nimes.fr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
8 years agoBUG 8652: Add a default value for the lateorders
Jonathan Druart [Tue, 14 Aug 2012 15:26:46 +0000 (17:26 +0200)]
BUG 8652: Add a default value for the lateorders

- By default, the date from value is the today's date
- Replace C4::Dates with Koha::DateUtils

To test:
Check the page displays the late orders by default.
Add values for 'date from' and/or 'date to' and/or delay.
The date interval is based on the estimated delivery date and the delay
param is based on the closed date.