Commit Graph

25701 Commits

Author SHA1 Message Date
Jonathan Druart 1d44cd8225 Bug 17024: Fix XSS in tools/viewlog.pl
Test plan:
    Hit /tools/viewlog.pl?do_it=1&modules=CATALOGUING&action=MODIFY&object=<script>alert("XSS")</script>

=> Without this patch you will see the alert
=> With this patch, no more alert

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit f563ba795e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 24664b719f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 14:15:39 +02:00
Jonathan Druart 9b42a3f9b2 Bug 17026: Fix XSS in serials/checkexpiration.pl
Test plan:
Hit:
 /serials/checkexpiration.pl?title="><script>alert("XSS")</script>&date=12/02/2002
 /serials/checkexpiration.pl?issn="><script>alert("XSS")</script>&date=12/02/2002

=> Without this patch you will see the alert
=> With this patch, no more alert

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 9d00353a92)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit ec78a0d43f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 14:15:37 +02:00
Jonathan Druart 5e301bc138 Bug 17028: Fix XSS in reserve/request.pl
Test plan:
Hit
  /cgi-bin/koha/reserve/request.pl?biblionumber=1"><script type="text/javascript">alert("XSS")</script>

=> Without this patch you will see the alert
=> With this patch, no more alert

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit 66f81fc210)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 542c0dbbaa)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 14:14:48 +02:00
Kyle M Hall 45e9592eb5 Bug 15397 - Pay selected does not works as expected
When patron has more fees (account lines) and you wan't to pay just some
of them, you select wanted lines a click on "pay selected" button. But
the fine isn't paid, the "amountoutstandig" is not modified, but it is
added new line with "pay" code an with amountoutstanding below zero.
Paying one or all fine works as expected. Paying selected worked some
time ago, but I don't know when it stopped working, we realize it after
upgrade to 3.22.

Test Plan:
1) Apply this patch
2) Pay fines using "Pay selected"
3) Note the payment and the fees outstanding balances are reduced!

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 537adde2d2)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit c0e2610bda)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 14:10:38 +02:00
Frédéric Demians 0d1853382b Bug 16573: Update DB rev (3.22.09.002)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 14:06:31 +02:00
Jonathan Druart 8af23fbd36 Bug 16573: Define virtualshelves.created_on as datetime for existing installs
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 44785935bd)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit d2b20b2a82)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 14:04:54 +02:00
Bernardo Gonzalez Kriegel 537d43bcd2 Bug 16573: change created_on type - atomic update
This patch change 'created_on' virtualshelves column to
datetime type

To test:
1) Apply the patch
2) Run updatedatabase.pl
3) Verify type of 'created_on' column

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 162b9015d9)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit ce68d9b7fd)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 14:04:52 +02:00
Bernardo Gonzalez Kriegel 7fa5b2d979 Bug 16573: fix structure and sample data for MySQL 5.7
Web install on Ubuntu 16.04/Mysql 5.7 fails.

This patch makes small changes to make installation
possible to kohastructure.sql and some sample files.

Sample values for quotes table can't have '0000-00-00 ...' values
nor NULL values, now() is perhaps an option.

Depends on Bug 16572

To test:
1) System with MySQL 5.7, for example Ubuntu 16.05
2) Apply 16572
3) Try web install, it fails
4) Apply this and next patch
5) Try again, now it succeed

This is only for English install, i18n files needs revision
I can do that if this is accepted.

Perphaps a change is needed to updatedatabase.pl

Ammended patch, 'created_on' field on virtualshelves
can't be timestamp default null, mysql 5.5 complains
that only one timestamp column can be defined as
default not null. Changed to 'datetime' type.

Can provide followup with updatedabase change,
but need an opinion if this type change makes sense.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 36b2b288a7)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 8955b1b7c5)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 14:04:49 +02:00
Bernardo Gonzalez Kriegel f0cfa73b35 Bug 16573: fix linkid value on marc_subfield_structure
followup to previous patch.

This patch fixes linkid value. It was set to '', but
declared as tinyint.
Mysql < 5.7 replaced this with nearest right value, i.e 0
Mysql 5.7 gives error here.

Also some normalization, all lines with data begins with two tabs

To test:
On top of Bug 16572 and previous patch

1) Run webinstaller
2) Add mandatory values
3) There must be no problems on MySQL 5.7

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit d00d46112d)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 58bd47a462)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 14:04:45 +02:00
Jonathan Druart 5ab0a8c23c Bug 16934: Add test for ModOrder
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 7adb8861aa)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 043c8f105b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 13:47:30 +02:00
Kyle M Hall ddab9d2556 Bug 16934 - Cannot add notes to canceled and deleted order line
Some librarians would like to be able to add notes to deleted order
lines to keep track of data such as what title the order line was for.
For some reason ModOrder dies if a biblionumber is passed in, even
though it does not use biblionumber and does not need it to exist in any
fashion! This limitation should be removed.

Test Plan:
1) Create a basket with an orderline
2) Cancel the order / delete the record
3) Click the "Add internal note" link for that order line
4) Fill in a note and click "Save"
5) Note the error
6) Apply this patch
7) Repeat steps 3-4
8) Note this time the note is saved!

Signed-off-by: Claire Gravely <c.gravely@arts.ac.uk>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 7cc6f6eb45)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 43f7f6b0bd)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 13:46:32 +02:00
Jonathan Druart 86df8681c5 Bug 16958: Fix XSS in opac-imageviewer.pl
Test plan:
Trigger
/opac-imageviewer.pl?biblionumber=14&imagenumber=7"><sCrIpT>alert(42)<%2fsCrIpT>

=> Without this patch you will see the JS alert
=> With this patch applied you won't see it

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 65918b146c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit a3e2ea765f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 13:45:50 +02:00
Srdjan 963cd07b93 Bug 16716: Replaced wrong GROUP BY with DISTINCT
Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 52ac9a1ca3)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 16b97e21d0)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 13:40:41 +02:00
Jesse Weaver bc6d38d258 Bug 15974: Rancor: Correctly select existing authorized value
Test plan:
  1) Open up a record in Rancor with an itemtype besides the first in
     the list ('BK' in the sample itemtypes).
  2) It will show "Book" instead of the correct itemtype.
  3) Apply patch, reload the page.
  4) The correct itemtype should now show.

NOTE: The scope is only 942$c. This corrects that.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b01aa596ab)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 90dbfef329)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 13:39:45 +02:00
Aleisha a992c6275d Bug 16531: Circ overdue report is showing an empty table if no overdues
EDIT: Comment 2
EDIT2: using noreport variable (Comment 5)

To test:
1) Ensure you have no items overdue
2) Go to Circ -> Circulation reports -> Overdues
3) Notice empty table, '0 items overdue' heading
4) Ensure syspref FilterBeforeOverdueReport is set to 'Don't require'
5) Apply patch and refresh page
6) Notice empty table is no longer showing and page says "There are no
   overdues"
7) Apply a filter to search
8) Page now says "There are no overdues matching your search" with a
   link to reset filter.
9) Click Reset filter -> confirm any filters you applied are cleared.
10) Set FilterBeforeOverdueReport to 'Require' and refresh overdue
    report
11) Page should say "Please choose one or more filters to proceed"
12) Check out an item to a member, ensure due date is a date that has
    passed (i.e. yesterday)
13) Refresh overdue report page
14) Page should still say "Please choose one or more filters to proceed"
15) Set FilterBeforeOverdueReport to 'Don't require'
16) Confirm table now shows correctly with '1 items overdue' heading
    etc.

Sponsored-by: Catalyst IT
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b7c61a5d12)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit de5621dd9b)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 13:16:08 +02:00
Hector Castro de69669cf0 Bug 16888: (follow-up)Add Font Awesome Icons to Members
Remove fa-ban according with QA comment 4

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit dba6cfe441)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 160c584100)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 13:13:28 +02:00
Hector Castro 1479737988 Bug 16888: Add Font Awesome Icons to Members
Add Font Awesome Icons to:
- "Select/Clear all" links to pay.tt (Pay fines tab)
- "Filter icon" in "filter paid transactions" to Accout tab (boraccount.tt)
- "Trash icon" to Remove option in "Manual restrictions"
(borrower_debarments.inc) also add "Ban and plus icon" to "Add manual restriction"

To test:
-Apply patch
-Select a patron who has fines
-Go to "Fines->Pay fines" tabs and see the icons in "Select/Clear all"
-Choose the "Account" tab and sse the icon in "Filter paid transactions"
-Select the "Check out" tab and go to "Restrictions"
-Add a manual restriction and notice about the two new icons fa-plus and fa-band
-See the new button btn-mini and the fa-trash icon
-Verify that all works as expected

Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit ae41952077)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 24e2de8973)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 13:13:26 +02:00
Marcel de Rooy e8ad81f206 Bug 16777: Correct intranet search alias
A long-standing typo in our apache config files:
[intranet]/search refers to search.pl (which does not exist)

This patch refers it to catalogue/search.pl

Test plan:
Run an install or copy the change from apache-shared-intranet.conf or
koha-httpd.conf to your apache config. Restart Apache and check
if http://[your staff client]/search works.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Tested by making manual changes according to the patch. Did not test a
new installation.

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 3fe6abc9d5)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 113aaae895)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 13:11:39 +02:00
Marc Véron 71008bac19 Bug 16701: Translatability: Fix problem with isolated ' in currency.tt
This patch moves markup <span class="ex"> into template variables to
avoid sentence splitting.

To test:
- Apply patch
- Verify that currency administration works as before
  (Home > Administration > Currencies & Exchange rates > Currencies)
- Examine code changes

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit a83d75b6f2)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 538535ba7d)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 13:10:36 +02:00
Marc Véron 551ae5cb17 Bug 16621: Translatability: Issues in opac-user.tt (sentence splitting)
This patch fixes issues due to sentence splitting in
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt

Note: This is a string patch. It does not add or change functionallity.

To test:
- Examine code and verify that the text changes remove sentence splitting
  and that the changes make sense.
- Log in to OPAC and verify that messages look correct
  - with blocked /debarred user (with and without comment and date)
  - with user who has to much fines (needs syspref OpacRenewalAllowed
    and syspref OPACFineNoRenewals)
  - with user who has his card marked as lost
  - with user with an account that is about to expire
  - with user with expired account
  - with user with uncertain address information (with and without
    syspref OPACPatronDetails set to Allow)

Note: Amended to make patch apply 2016-07-10 mv
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit dc1ff4efff)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 1c9e281e39)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 13:00:49 +02:00
Fridolin Somers 9d6ab31cda Bug 16897 - Re-focus on "Add item" in Lists
Bug 11325 add solved a focus on "Add item" missing in Lists page.
Since revamping of this page, the add item form exists both in page.
The one corrected by Bug 11325 is not visible because it checks a bad
var allowaddingitem instead of can_add_biblios.

This patch removes the first form and corrects the second form.
It moves the form at left part of page so that it is always shown
(usefull when there are a lot of items). It does not add the list name
after "Add item" besause it whould be huggly for long names and because
listname already exists in breadscrumbs and on top of the table.
It also adds autocomplete="off" on barcode input because there can be
problems with a scanning device.

Test instructions:
1. Create a list
2. Make sure you have an object with an assigned barcode
3. Go to the list
   => The barcode entry interface should be at left and has the focus
4. Enter the barcode and press enter (or use a scanner)
   => The item is added to the list

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

This is a nice improvement, thanks!

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit fcf2e1325e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 723711ba9d)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 12:51:23 +02:00
Katrin Fischer f5c2ce2c82 Bug 16893 - Missing closing tag disrupts patron checkouts page style
Same fix as for the details page: checkouts page is very italic
when there is a restriction with a comment on the patron
account.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 93aff1fe37)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 1151773c56)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 12:49:21 +02:00
Owen Leonard b55f326aea Bug 16893: Missing closing tag disrupts patron detail page style
A missing closing </i> causes the the patron detail page to be in all
italics if the patron has a restriction message. This patch corrects it.

To test, apply the patch and locate a patron who has a restriction
message. The restriction message should be in italics but the rest of
the page should display normally.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Rest of the page displayed normally

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 27a7cdef1a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 6ba7acf4e0)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 12:49:19 +02:00
Jonathan Druart d9638ff7db Bug 16813: Allow empty string for OPACBaseURL
The pref is prefixed by 'http://', but it should not when the pref is
set to an empty string.
This will fix the bug raised on bug 14790 comment 14.

Test plan:
Empty OPACBaseURL and confirm that it's save as it in DB

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
OPACBaseURL is saved up empty. Prefix http:// is not saved anymore

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit e9b6a5e31e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 4fa7e90b0e)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 12:45:46 +02:00
Marc Véron d24657b87d Bug 14138: Patroncard: Warn user if PDF creation fails
Change patroncards/create-pdf.pl to redirect with an error message
instead of writing an invalid pdf that does not open in pdf viewer.

To test:
- Apply patch

- Test that pdf creator behaves as before (with valid batches and
  patron lists)

- While testing, copy pdf link address from window with title 'Click
  the following link(s) to download...'

- Open another staff client browser tab

- Paste link to browser address field, change batch id rsp. patron
  list id to an invalid value and submit

- The window should redirect to cgi-bin/koha/patroncards/create-pdf.pl
  and display an error message

- Bonus test 1: Create an empty patron list and test patron card
  creation. You should get an error message as appropriate.

- Bonus test 2: Use a link with params like the following:
  ...create-pdf.pl?borrower_number=61&template_id=2&layout_id=1&start_card=1
  Verify that you can create a pdf with a valid borrower_number and that
  you get the error message with an invalid borrower number

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b51f2baa7c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 5de1b336da)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 12:42:40 +02:00
Marc Véron d73225ce0c Bug 16682: (followup) Fix display if Batch patron modification tool does not get any patrons
Format message as proposed in comment #8

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 5a1f3acaab)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit c27ba3c7bd)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 12:24:15 +02:00
Marc Véron 0bb397492d Bug 16682: Fix display if Batch patron modification tool does not get any patrons
To reproduce:
- Go to Tools->Batch patron modification
- Submit without filling any of  "Use a file", "Or use a patron list",
  "Or list card numbers..." or use a patron lists with zero members
Result: Screen without any information

To test:
- Apply patch
- Repeat steps above
- Verify that you get a nice message
- Verify that the tool works as before
  - with invalid card numbers only
  - with valid and invalid card numbers
  - with valid card numbers only

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit c0d420f42a)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 36ffbb193f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 12:24:13 +02:00
Frédéric Demians a5e1af5eb6 Bug 15006: Update DB rev (3.22.09.001) 2016-08-17 12:18:47 +02:00
Marcel de Rooy 85caad0f38 Bug 15006: [QA Follow-up] Only handle login requests in raw_transport
Although mainly hypothetical, it would still be possible to get
response from the server for an acs resend request. (This exception
is allowed in MsgType::handle.)
I also noticed that the response may well be a message from an older
session still.
This patch just removes that exception by only passing login requests
to sub handle in the raw_transport loop.

Test plan:
[1] Verify normal login procedure for raw.
[2] Check a few acs resend requests in raw. They should terminate without
    a response.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit e465d1aa4b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit a0a0e057c0)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 12:03:43 +02:00
Marcel de Rooy f891d7b990 Bug 15006: [QA Follow-up] Satisfy qa tools with one tab less
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Srdjan <srdjan@catalyst.net.nz>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 64fe6e3500)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit aee5ba0694)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 12:03:40 +02:00
Colin Campbell b3786fb159 Bug 15006 Correct indentation of EXPORTs in Sip.pm
Removed tabs and used spaces consistently
Used 'use base' to remove unnecessary BEGIN sub and
explicit setting of ISA at application level

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 4ad4ab6396)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit ad235daaa7)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 12:03:33 +02:00
Marcel de Rooy c6f1fa2aad Bug 15006: Centralize timeout logic and allow zero client timeout
Moving timeout logic to one routine (with unit test).

This further implements two suggestions from Kyle and Larry:

[1] You could use a client_timeout of 0 to specify no timeout at all.
[2] Have the client_timeout default to the timeout if not defined.

Test plan:
[1] Run t/db_dependent/SIP/SIPServer.t.
[2] Test login timeout for raw and telnet.
[3] Check ACS status message for timeout value. Should match policy
    timeout from institution.
[4] Test client timeout (zero and non-zero).
[5] Remove client timeout. Test fallback to service.
[6] Remove service timeout too. Test fallback to 30 at login.

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Amended to incorporate Srdjan's suggestion to move get_timeout to
SIPServer.pm; this requires some additional mocking in the unit test.
And even makes the test db dependent, as documented.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit eb8666357c)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit e8a03065af)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 11:56:47 +02:00
Colin Campbell ef3c9078f9 Bug 15006: Introduce client_timeout in SIPconfig.xml
Most selfchecks have persistent connections and send a
periodic status request at intervals (approx every 5mins appears
the norm) The timeout was dropping connections by default every 30secs
which for the client appears as a very flakey network.

This patch adds a separate parameter client_timeout that can be
used if you do want to force a disconnect if the client sends
no requests for a period. The sample config sets it to 600, but you
can also define a 0 value meaning no timeout. If the parameter is not
defined, it will fallback to service timeout.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Restored this patch from Colin in order to separate it from the
get_timeout patch. Adjusted the commit message slightly.
The original value of 600 from Colin's earlier patch may give less
discussion than setting to 0 (no timeout) in a later proposal.

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b27da7e0ce)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit d477ba8b06)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 11:56:46 +02:00
Colin Campbell 4cb5e38fc8 Bug 15006 Remove tabs from sip_protocol_loop
Remove the tabs causing inconsistent indentation
of sip_protocol_loop and replace with spaces

Reimplements the renaining parts of Marcel de Rooy's
original QA patch

No logic changes in this patch - layout only

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 2b725b6728)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit f5995e7ae9)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 11:56:45 +02:00
Colin Campbell 23689f4d24 Bug 15006 Drop raw connection if login fails
raw_connection was not behaving correctly if an invalid string was
passed or a login failed.
It was not checking that the login succeeded ( it checked that account
existed not that it contained data and it existed even if login failed)
and so failed logins instead of aborting immediately fell through into
the sip_protocol_loop, forcing that to timeout invalid connections.
It now checks that account has id set and returns if not.

The timeout alarm is now set on the while loop, in normal running this
should not be triggered as the socket is opened and the first data
should be a login message and the while loop should only iterate once,
but lets not go into an infinite loop due to unforeseen circumstances.

I have reindented the routine as the flow was not clear (the while was
not indented at all.

Also if using Net::Server::PreFork when a new connection comes in you
may be handed the the successful login parameters from a preceding call.
Because of this you could successfully transmit transactions and Koha
would carry them out without having received a valid login ( and
possibly with the wrong account details!) We now delete any existing
account for new connections.

NB: This patch requires that the patch for bug 13807 has been applied

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 4f0fd3db55)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 4c91e87770)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 11:56:43 +02:00
Jonathan Druart e028a28923 Bug 12178: Fix tests not to depend on dateformat syspref
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit e75d9befca)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 008f50fccb)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 11:50:22 +02:00
Florent Mara a672593999 Bug 12178: Tests for changes to claimed serial status
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Amended patch: Remove trailing spaces

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit c765d10509)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit a14999b7bd)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 11:47:30 +02:00
Jonathan Druart 158ce17353 Bug 12178: Update serial status to "claimed" when exporting to CSV
On the same way as late issues, the serial status should be updated to
'claimed' when the issues as exported as csv.

QA note: The updateClaim and UpdateClaimdateIssues subroutine did almost the
same thing, I kick the second on off to centralize the code.

Test plan:
1/ Export some late issues as CSV (serials/claims.pl).
2/ Refresh the page (the export does not do it) and confirm that the
status, the claim date and the claim count have been updated.
3/ Select some others issues, select a notice and send the notification.
Confirm that the behavior is the same.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b416ac16b5)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit d4b8efca30)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 11:33:26 +02:00
Jonathan Druart ccc236b306 Bug 2735: Update opac.css
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 11:31:00 +02:00
Jonathan Druart 3ad8cae190 Bug 2735: Fix authority search pagination at the OPAC
The authority search pagination displays only 15 pages, even when there
are more.
To fix that, this patch mimic the authorities-home.pl intranet script to
manage the pagination.

Test plan:
Without this patch, do some authority search and click on different
pages.
Apply this patch, redo the same search and make sure the same records
are displayed (i.e. confirm that the pagination still works as before).

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

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit de2df0dfe8)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 08efc656cf)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 11:29:06 +02:00
Colin Campbell 9df82f4a9d Bug 13807 Rework main input loop in SIPServer
Debugging various problems in SIPServer and control of it, found it
could loop on unread buffers (e.g. the LF of a CRLF if it was only
expecting CR) making it unresponsive to signals.
Reworked the input loop with an eye to removing unnecessary whiles
and replacing the while(1) by a while( connection valid)
Enhanced the timeout code by wapping in an eval.
Moved the logic from SIP_read_packet into the server itself
Hopefully this makes the already baroque code easier to navigate
and it did seem the server was the logical place for this
Removed no longer iused SIP_read_packet from Sip.pm

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 94441be435)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 0817cf906f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 10:48:24 +02:00
Mark Tompsett a8cb9ba99f Bug 16866: Catch warning t/db_dependent/Languages.t
TEST PLAN
---------
1) prove t/db_dependent/Languages.t
   -- noisy output
2) apply patch
3) prove t/db_dependent/Languages.t
   -- no noise
4) run koha qa test tools.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
No noisy output

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 042e8cf24b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit f9b989e3dd)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-17 10:43:16 +02:00
Mark Tompsett 6fa03f12ad Bug 16805: Log in with database admin user breaks OPAC
TEST PLAN
---------
1) Apply Jonathan's test patch
2) prove t/db_dependent/Letters.t
   -- dies before finishing tests
3) Apply second test patch
4) prove t/db_dependent/Letters.t
   -- dies before finishing tests
   -- 'addalert' is changed to 'getalert'
5) Log into OPAC with database admin user.
   -- see error given in comment #0
6) Apply this patch
7) prove t/db_dependent/Letters.t
   -- says 'getalert'
   -- all tests pass.
8) Log into OPAC with database admin user.
   -- logs in, but gives warning with a nice logout button.
9) run koha qa test tools.

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
No kaha qa errors
In debian display diferent error:
Can't use an undefined value as an ARRAY reference at /usr/lib/perl5/DBI.pm line 2054.
Works as advertised

NOTE: Revised test plan, as Jonathan added useful test case.
      Works as I've tested above.
      Hector tested older test plan which was steps
      5,6,8 and 9.

      Revised test plan again while tweaking to address comment #9.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit dee29d9f0b)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit e45ed6d2f4)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-16 17:44:50 +02:00
Mark Tompsett 106736d683 Bug 16805: Tweak new test message to say getalert
It said 'addalert', which is likely a cut-paste typo.
Plus, let's keep running the other tests if that one
goes bad.

TEST PLAN
---------
1) Apply Jonathan's test patch
2) prove t/db_dependent/Letters.t
   -- dies before finishing tests
3) Apply this test patch
4) prove t/db_dependent/Letters.t
   -- still dies before finished tests,
      'addalert' now is 'getalert' in message.
5) run koha qa test tools.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit c57655d4ad)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 946764c470)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-16 17:44:48 +02:00
Jonathan Druart 441dee5b05 Bug 16805: Add test to getalert (no param passed)
TEST PLAN
---------
1) apply patch
2) prove t/db_dependent/Letters.t
   -- fails
3) run koha qa test tools

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 5821ff3867)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit a7dd3dcc3f)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-16 17:44:42 +02:00
Hector Castro 14fa3aa126 Bug 16801 - Include Font Awesome Icons to check/unchek all in Administration > Library transfer limits
For purpose to uniformity and leave just one entry in .po files,
this patch change: Check all/Uncheck all -> to -> Select all/Clear all.
Also added Font Awesome icons.

To test:
-Go to Administration > Library transfer limits
-Notice about Check all/Uncheck all for "For all items types" and
 "Policy for:"
-Apply patch and refresh the screen
-Notice about the new Select all/Clear all links with their icons
-Confirm that all links work as expected

Signed-off-by: Marc Véron <veron@veron.ch>

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit c9bb9dc140)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit e766a5eae9)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-16 17:40:10 +02:00
Marc Véron 4ca0fda432 Bug 16730 - Use member-display-address-style*-includes in moremember-brief.tt
To test:
- Apply patch
- Create a new patron with the same first and last name as an existing
  patron. This should trigger a duplicate warning message. Click the
  "View existing record" link to trigger a pop-up window with a patron
  detail brief view.
- Verify that the address information displays the same way as on the
  patron details screen (moremember.pl).
- Change syspref 'AddressFormat' and verify that the address displays
  as appropriate.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
  Works as described: AddressFormat is taken into account on 'view exiting
  record' dialog box.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit f542ce5a82)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit a7e0bc9711)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-16 17:38:30 +02:00
Fridolin Somers 920e22e613 Bug 16677 - Use abbr for authorities linked headings
In authorities search results, UNIMARC flavour, linked headings are displayed
with a link type : BT, NT, UF, RT.

This patch adds a abbr tag around those acronyms to know there meaning :
BT = Broader Term
NT = Narrower Term
UF = Used For
RT = Related Term

Acronyms are used because there can be a lot of linked headings, using abbr
will display the complete text on mouse over.

Test plan :

- Use UNIMARC database
- Create an authority with :
250 $a Heading250a
450 $a Heading450a
550 $5 a $a Heading550a
550 $5 g $a Heading550g
550 $5 h $a Heading550h
- Save an index zebraqueue
- Go to intranet authorities search
- Search for "Heading250a"
- You see :
Heading250a
Heading250a
UF: Heading450a
RT: Heading550a ; BT: Heading550g ; NT: Heading550h
- Move your mouse over the acronyms, you see a tip with the complete text
- Same with opac authorities search

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

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b9e47f135e)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 3471304666)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-16 17:37:34 +02:00
Jonathan Druart 9eb594e548 Bug 16860: Remove the comment about the warning
It is no longer necessary.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit c19f342bb1)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit ee7af309a6)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-16 17:30:44 +02:00
Mark Tompsett 648b48d507 Bug 16860: Catch warning t/db_dependent/ClassSource.t
$ prove t/db_dependent/ClassSource.t
t/db_dependent/ClassSource.t .. 3/24 attempting to use non-existent class sorting routine routine1
t/db_dependent/ClassSource.t .. ok
All tests successful.
Files=1, Tests=24,  1 wallclock secs ( 0.02 usr  0.00 sys +  0.66 cusr  0.02 csys =  0.70 CPU)
Result: PASS

The above warning might be scary to those unfamiliar with the test.
Add a test to catch the warning.

TEST PLAN
---------
1) prove t/db_dependent/ClassSource.t
   -- as above
2) apply patch
3) prove t/db_dependent/ClassSource.t
   -- no message
4) prove -v t/db_dependent/ClassSource.t
   -- test 13 is the new test
5) run koha qa test tools

Signed-off-by: Hector Castro <hector.hecaxmmx@gmail.com>
Workas as advertised

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit b80318f1b7)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 756f75a044)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
2016-08-16 17:30:43 +02:00