Commit graph

17229 commits

Author SHA1 Message Date
Katrin Fischer
9fe8b5c4cf Bug 8626: Fix encoding in cart emails for use of quoted-printable
When using quoted-printable data needs to be encoded accordingly.

Content-Transfer-Encoding: quoted-printable

Without the patch = in URLs or data will be interpreted as the beginning
of a special character resulting in broken URLs.

To test:
- Check diacritics in records display correctly
- Check various URLs with = to make sure they all work correctly

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
This is only a partial fix, as the subject line is not encoded,
but it is a huge improvement over what it was before.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-29 18:14:32 +02:00
88d5a2f2a4 Bug 8640 - GetHardDueDate functions incorrectly
GetHardDueDate works just like GetIssuingRule, but it not only tests for having
found an row of results before returning, but checks for the existence of a
hard due date as well. That means that even if it finds a matching rule, unless
that rule has a hardduedate set it will toss it and keep looking!

So, for example, even though there is a matching rule for say "STAFF / VIDEO / *",
but it has no hardduedate. So it gets tossed and the subroutine keeps looking.
If the next match, "STAFF / * / *" *has* a hardduedate, it is the one returned.

This means that if a more specific rule has no hard due date,
it is overridden by a less specific rule that does have a hard due date.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-29 18:07:53 +02:00
Jared Camins-Esakov
1adb0afa4c Bug 8648: searchResults uses SQL query rather than GetMarcFromKohaField
Around line 1470-something:

    my $sth =
    $dbh->prepare(
            "SELECT tagfield FROM marc_subfield_structure WHERE kohafield LIKE
            'items.itemnumber'"
            );
    $sth->execute;

This patch replaces that with a call to GetMarcFromKohaField.

To test:
1) Apply patch.
2) Do a search that returns both available and unavailable items.
   You'll know if the patch isn't working.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-29 18:05:36 +02:00
98d1f47384 Bug 8655 - Re-order items on administration page to better match configuration priority
Circulation and Fine Rules should have a higher priority than
cities and road types.

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

Tested on main admin page and the menu on the left of all of the
other admin pages. Looks a-ok to me.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-29 17:59:37 +02:00
Paul Poulain
d95384b9e4 Bug 8657 follow-up DBRev number 2012-08-29 17:57:53 +02:00
e50ba9f220 Bug 8657 - Default sort by call number does not work
If you choose to sort search results in the OPAC or staff
client by call number by default, the wrong value will
be saved by the system preferences editor. It should be
"call_number" instead of "callnumber." This patch
corrects the pref file and updates the database in cases
where defaultSortField or OPACdefaultSortField are
set to the incorrect value for call number sort.

To test: Set defaultSortField and/or OPACdefaultSortField
to "call number" and perform a search. Results will be
sorted by relevance. Apply the patch, update the database,
and search again. Results should now be sorted by call number.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
with the caveat that this will not fix the issue unless the sort order is first set to descending and back to ascending per bug 8012.

However, with the sort order set to a proper sort value, this patch does fix the issue.
2012-08-29 17:51:19 +02:00
Paul Poulain
94d170483f Bug 8670 follow-up DBRev number 2012-08-29 17:46:14 +02:00
ff7417fa91 Bug 8679 [REVISED] Remove usage of Amazon API
This patch removes the AmazonReviews and AmazonSimilarItems
features from the OPAC and staff client. With on Amazon
feature remaining, cover images, the *AmazonEnabled preference
is also removed in favor of checking the *AmazonCoverImages
preference. Two other system preferences, AWSAccessKeyID and
AWSPrivateKey are removed as they were required only by the
removed features.

Handling of book cover images from Amazon is unchanged.

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

Turned on amazon covers in opac and staff client and all
worked as expected. Then tested to make sure other cover image
services still worked and they do.

Signing off.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-29 16:05:29 +02:00
Jonathan Druart
c56bc65de8 Bug 8172: Followup: Removes useless empty params
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-29 15:38:59 +02:00
Mark Tompsett
46cae313b5 Bug 8172 - Missing dereference marker for buildQuery parameter in addbooks.pl Added a dereference to an array parameter of buildQuery.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2012-08-29 15:38:55 +02:00
Mark Tompsett
00437c6bf2 Bug 8329 - GetLostItems in C4::Items.pm has a SELECT * Provided a smaller list based on reports/itemlost.tt
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-29 15:34:01 +02:00
Jonathan Druart
28f5eb2663 Bug 8395: Fix sort order in parcel.tt (summary)
Signed-off-by: Marc Veron <veron@veron.ch>

Patch behaves as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-29 15:31:43 +02:00
Fridolyn SOMERS
2359a7ed61 Bug 8513: OPAC detail page broken with XSLT
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-29 15:19:46 +02:00
Robin Sheat
ee51b56625 Bug 8547 - JS error in star ratings breaks IE
Writing code with best practices in mind breaks IE. Thanks Internet
Explorer. Now go DiaF.

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

Tested with with IE 7.0.5730.13 on Windows XP, no JS errors, stars display and behave as expected

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
(Aslo tested it does not break FF)
2012-08-29 15:16:13 +02:00
Jared Camins-Esakov
2b28b9caae Bug 8572: invalid auth shouldn't cause error
Prior to this patch, attempting to view an invalid authority in the
OPAC gave a system error instead of a 404. With this patch, the user
will just get a 404, as is the case with invalid bibs.

To test:
1) Try to view an invalid authority by going to:
   /cgi-bin/koha/opac-authoritiesdetail.pl?authid=999999999999
   (presuming that you don't have an authority with authid 999999999999
   in your database) before and after applying this patch

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-29 15:06:50 +02:00
Jared Camins-Esakov
b64fd7b83a Bug 8636: Add missing dependencies
Cache::Memcached::Fast is used for caching
Test::YAML::Valid is used for tests
Signed-off-by: Marc Veron <veron@veron.ch>

Dependencies appear as expected...
...and I see that they are not instaled yet on my server  :-)

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-29 13:49:01 +02:00
Robin Sheat
aba36d26d9 Bug 8162: allow packages to work on Ubuntu Precise
The newer version of MySQL in Ubuntu 12.04 installs a default
'localhost' user with no username. Due to the way that MySQL looks up
user details when you connect, if you connect from localhost and the
user was only created with a wildcard host (%), the anonymous localhost
user will be found instead. This means that your username is lost for
the connection, and you have no privileges.

This patch creates a second user with a hostname of 'localhost'. This
will not work if your database is on a remote server, but you probably
know what you are doing if that's the case. Patches to determine this
server's name relative to the MySQL server are welcome (or even ideas on
how to do it.)

It also fixes up a couple of other small things:
* make koha-remove stop zebra properly
* stop the warning that the password file is missing on create

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Works as promised.
2012-08-29 13:46:04 +02:00
Paul Poulain
913aba1a66 Merge remote-tracking branch 'origin/new/bug_8268' 2012-08-28 18:03:34 +02:00
Jared Camins-Esakov
20ad69646f Bug 8268: improve error checking
Valid download attempts were being denied thanks to an incorrect
regular expression. This patch fixes that, and makes it easier to
understand what's going on in the code.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-28 18:02:46 +02:00
Jared Camins-Esakov
d944df2272 Bug 8268 follow-up: rewrite config correctly
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Problem fixed.
2012-08-28 18:02:42 +02:00
Fridolyn SOMERS
88e66b674e Bug 8576: Software error on authority edition when using merge
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-28 17:55:33 +02:00
Julian Maurice
1428a52341 Bug 8495: Fix JS error when creating a new order
bug introduced by bug 7178
(http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7178)

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-28 17:51:24 +02:00
Jonathan Druart
ee0a778eaa Bug 8607: FIX overdues_notices script: $date is not replaced
The script is unusable.
The variable $date is not replaced with its content.

Signed-off-by: wajasu <matted-34813@mypacks.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-28 17:48:50 +02:00
Julian Maurice
322a9c7fbb Bug 5600: very tiny follow-up to pass perlcritic
open was called with 2 arguments instead of 3

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-03 17:02:35 +02:00
Julian Maurice
c5e6fb7227 Bug 5600 follow-up: Fix commandline check in order to work under Plack
With plackup, @ARGV can contains elements so we can't check the size of
@ARGV to tell whether we are in command line mode or not.
Instead we check environment variable GATEWAY_INTERFACE.

Also fix the use of a global variable in a subroutine

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-03 16:57:14 +02:00
Julian Maurice
4dea59847a Bug 5600: Command line interface for tools/export.pl
export.pl [--format=format] [--date=date] [--dont_export_items]
  [--deleted_barcodes] [--clean] --filename=outputfile

    * format is either 'xml' or 'marc' (default)
    * date should be entered as the 'dateformat' syspref is set
      (dd/mm/yyyy for metric, yyyy-mm-dd for iso, mm/dd/yyyy for us)
    * records exported are the ones that have been modified since 'date'
    * if --deleted_barcodes is used, a list of barcodes of items deleted
      since 'date' is produced (or from all deleted items if no date is
      specified)
    * --clean removes NSE/NSB

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-03 16:57:08 +02:00
7561d9f433 Bug 3383 - Followup - Switch from GetMemberDetails to GetMember
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-03 15:58:26 +02:00
fd23761d4d Bug 3383 - Item due reminder digests - cannot display title information
Adds the ability to use branches.* fields in digest notices and
have them be parsed correctly. Also adds a warning to the notices
editor for digests.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I like the idea to show a warning, but I would perhaps move
it under the message body label to be more obvious.

Patch works nicely, branch data of my user's home library
is displayed in the notice.
2012-08-03 15:58:24 +02:00
Jonathan Druart
56c9fca729 Bug 7628: Escape '+' characters for categorycode
uri escape the following characters:
    &, @, /, ;, :, =, +, ? and $

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

Test and sign off second patch (independently from first patch).

Added categories like '+zwoelf' or '? Test' before applying the patch.
Deletion was not possible.

After applying patch deletion is possible, patch works as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-03 15:01:03 +02:00
Marc Veron
e3e5b1892f Bug 7628 - Required format is not enforced for Patron Categories
Enforces category code with allowed characters only.

Test plan:

- Before applying patch, create a category code like Test+

- Try to delete category with this code -> does not work

- Apply patch

- Try to create category with code containg other characters than letters, numbers, - and _

- Result: You are not allowed to do so, appropriate message pops up

Signed-off-by: David Cook <dcook@prosentient.com.au>
2012-08-03 15:01:01 +02:00
Paul Poulain
7199d94a96 Bug 8263 follow-up DBRev number 2012-08-03 12:30:04 +02:00
daeb964996 8263 Consistent stylesheet prefs
This patch makes the use of opaccolorstylesheet and opaclayoutstylesheet more consistent. They may be: 1) just a file name, 2) a complete local path or 3) a full URL starting with http: for a remote css file.
This makes the syspref opacstylesheet that was only used for a remote css file obsolete.

June 20, 2012 Rebased.
July 18, 2012: Regex allows https too (thanks to Owen Leonard).

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-03 12:03:30 +02:00
688e81f7fe 8263 Make OPAC stylesheet preferences more consistent (dbrev)
This patch handles the dbrev for this report. It optionally saves the value of the former opacstylesheet pref into opaclayoutstylesheet.

June 21, 2012 & July 4, 2012: Rebased.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
2012-08-03 12:03:25 +02:00
Robin Sheat
8352e7c0fd Bug 8544 - make the RSS icon CSS-changeable
This gives the RSS bits on the search results some CSS classes so it can
be modified with CSS or javascript.

Updated: added also to the RSS icon shown when no results are found.
Signed-off-by: Marc Veron <veron@veron.ch>

Patch behaves as expected.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-03 11:50:49 +02:00
Jonathan Druart
a281ac8df5 Bug 8385: Dirty patch to make tt_valid.t happy
A problem in routine text_replace_tag (tmpl_process3.pl) have to be
fixed to prevent this kind of patch :)

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-03 11:44:59 +02:00
Paul Poulain
6271f9b6c4 Bug 6448 follow-up, DBrev number 2012-08-02 18:49:59 +02:00
Dobrica Pavlinusic
28e5427c60 Bug 6448 [2/3] Barcodes::EAN13 autoBarcode
Implement auto-incrementing EAN-13 barcodes

To make this work, C4::Barcodes::next was modified to call process_tail with
new incremented value so that process_tail can generate correct checksum.
Since process_tail is currenlty not used by any barcodes, this change is safe.

C4::Barcodes is used by addbiblio.pl when adding multiple records, while value_builder
is used in all other cases.

Test scenario:

1. prove t/Barcodes_EAN13.t

2. KOHA_CONF=/etc/koha/sites/fer/koha-conf.xml prove t/db_dependent/Barcodes.t
   this will check C4::Barcode implementataion

3. in systempreference change autoBarcode to incremental EAN-13 barcode

4. edit two items of any biblio assigning barcodes and verify that numbers
   are increasing. Have in mind that last digit is check digit, and it
   doesn't increment, but is calculated from barcode itself. Example with
   checksum in brackets: 000000086275[2], 000000086276[9], 000000086277[6]

5. Add Item and verify that it gets assigned next barcode

6. Add & Duplicate item and verify barcode increase

7. Add Multiple Copies and verify that barcode increase for each copy

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-02 18:41:44 +02:00
Dobrica Pavlinusic
089b1151f5 Bug 6448 [1/3] EAN-13/UPC-A itemBarcodeInputFilter
This filter which check validity of EAN-13 barcode and padd it with zeros
up to full 13 digit number. This will also expand 12 digit UPC-A barcodes
to EAN-13 automatically which is useful for older barcode readers which tend
to ignore first zero in EAN-13 if they have just UPC-A support.

It should be noted that EAN-13 or UPC-A product codes printed on books are not
good choice for barcodes in Koha since each item has to have unique barcode.

Test scenario:

1. prove t/Circulation_barcodedecode.t
   this checks expansion of 12 digit UPC-A to 13 digit EAN-13 and zero padding

2. in systempreferences search for itemBarcodeInputFilter and select EAN-13

3. edit one item and assign it valid EAN-13 barcode, eg. 0000000695152, check it out

4. test checkin with just 695152 to test leading zero expansion

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2012-08-02 18:41:40 +02:00
Dobrica Pavlinusic
18d4772323 Bug 6448 [3/3] EAN-13 barcode labels
Current implementation doesn't scale barcodes because low-price
CCD barcode readers are very sensitive about size

Test scenario:

1. in Tools > Labels create or edit Layout and select EAN13 as barcode
   type

2. export one of existing batches using EAN13 layout and verify that
   generated pdf file contains barcodes

3. print pdf file and test it with barcode reader

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2012-08-02 18:41:36 +02:00
Paul Poulain
09fa6e12e0 bug 8477 follow-up for [HTML4] coding guideline 2012-08-02 17:40:07 +02:00
Adrien Saurat
2fea7f0137 Bug 8477: Displays home/holding branches on return page
Signed-off-by: Mirko Tietgen <5p4m@gmx.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-02 17:38:47 +02:00
e22d877976 Bug 8455 - Followup - perltidy renewscript.pl
Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-02 16:44:55 +02:00
3790243193 Bug 8455 - Check ins processed through "Check Out" tab of the Patron Record ignore Circulation System Preferences
If you check-in an item through the "Check Out" tab of the Patron Record, the return/check-in ignores the "InProcessingToShelvingCart" and "ReturnToShelvingCart" circulation system preferences. Or rather, there just isn't any logic to handle them in the renewscript.pl file.

I'm pretty much just bringing the code straight across from returns.pl, although some minor changes need to be made due to context.

Both system preferences are important to include, since you can check-out an in processing item to a patron. While a regular check-in will clear the in processing status, a check-in through the Patron module will cause the item to have its status returned to "In Processing" rather than going to "Shelving Cart", if the preference is set, of course.

To test the scenario, turn on one of (or both of) these settings and try checking books in through the Circulation module and the Patron module.

Before the patch, you will see that only the Circulation module will change the shelving location.

After the patch, you should see identical behaviour.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

http://bugs.koha-community.org/show_bug.cgi?id=7189
2012-08-02 16:44:52 +02:00
9226ae4641 Bug 8463 - Koha/SearchEngine/Solr/Search.pm fails perlcritic test
modified:   Koha/SearchEngine/Solr/Search.pm

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-02 16:12:59 +02:00
90db8c0e22 Bug 4198 - Followup - PerlTidy authorities-home.pl
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-02 15:43:11 +02:00
1000599eaa Bug 4198 - deleting an authority refreshes the page
Makes clicking a Delete link refresh the search that
was performed so that the results are still on the screen.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

Works as advertised. Very usefull. Still the issue that indexing being
not in real time, the search result displays the just deleted authority.
But there is no way to do better.
2012-08-02 15:43:08 +02:00
Paul Poulain
98a207ef95 Merge remote-tracking branch 'origin/new/bug_6720' 2012-08-02 15:40:31 +02:00
Jared Camins-Esakov
983012d5b8 Bug 6720 follow-up: fix error when auth has been deleted
Thanks to Paul Poulain for finding the problem and proposing a solution.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-02 15:40:06 +02:00
Jared Camins-Esakov
42e20381fb Bug 8520: fix authority display in staff client
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-02 15:38:31 +02:00
Elliott Davis
76f5ad2acf Added a URI filter to encode a cardnumber for borrowers as to not break patronimage.pl
To Test:

Add a + (or any char that would need to be encoded) to a card number of a patron with an image attached.
Go to member/moremember.pl.
If the patrons image is there, you are golden.

http://bugs.koha-community.org/show_bug.cgi?id=8421
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-08-02 14:17:10 +02:00