Commit graph

8456 commits

Author SHA1 Message Date
Joshua Ferraro
738cdbad89 Adding wrapping container around OpacMainUserBlock syspref 2008-05-17 18:49:26 -05:00
a3d111ae97 Fix bug in /admin/z3950servers.pl
Third attempt to correct a bug affecting this page.
Combo lists wasn't reflecting DB content in modification.
To Joshua: You have to apply patch 2 first (patch 1 isn't required)
since I applied this quick fix without rolling back to original state!

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-17 18:45:38 -05:00
987c4e94b1 Fix bug in /admin/z3950servers.pl
Improve previous patch which was badly coded as pointed out by
Henri-Damien. <TMPL_IF> clauses were included in HTML tags:
it fails translator tool.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-17 18:45:37 -05:00
d2595211c8 Fix a bug in /admin/z3950servers.pl page
On /admin/z3950servers.pl page, modifying a z3950 host wasn't working
properly. Selected values in Syntax and Encoding combo boxes were hard
coded rather than selected based on record values.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-17 18:45:33 -05:00
Marc Chantreux
dd6344fa18 changing defaults for french system preferences.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-16 08:21:19 -05:00
Henri-Damien LAURENT
89fa713124 Bug Fixing : ModMember and memberentrygen.tmpl
Problem with ModMember : parameters were not passed safely
memberentrygen.tmpl deleted guarantorid for a children if step2 or step3 used fore edition.
Changeing TMPL_IF EXPR into TMPL_IF Name

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-16 08:21:09 -05:00
1740f374ee Altering CSS to make holding table on opac MARC view more compact. Adding "new" link to opac suggestions screen for display when there are no suggestions (Bug 2110 Can't place suggestion from my suggestions tab in OPAC)
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-16 08:18:27 -05:00
d1fdb97122 Fix for problem introduced by previous attempt to fix Internet Explorer issues. Previous fix caused drop-down menu to appear behind circ search form.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-16 08:18:27 -05:00
Galen Charlton
496b6c8ef4 bugfix - fix 'not' operator in NoZebra
Corrected bug that prevented the 'not' operator
from working consistently - i.e., a search of
'mice not men' would not always work.

Also added test cases for NoZebra, so far focusing on
NZanalyse and adding and deleting bibs.  A couple of
the test cases are currently known to fail and
therefore are marked TODO.  The tests in question
are to verify that rows in nozebra are removed if
no bib is linked to the relevant word.  However, it
looks like such rows are retained, just with
nozebra.biblionubmers set to ''.  Is there any
reason to keep these rows?

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-16 08:18:25 -05:00
Galen Charlton
c6d507f8a9 kohabug 2020 - fix infinite loop in NoZebra on Perl 5.10
When running Koha in NoZebra mode under Perl 5.10, a search
containing a operator (e.g., "mice and men") could cause
a bib search to enter into an infinite loop in NZanalyse.

This possibility arises from the fact that NZanalyse used
to use capture variables from regular expressions without
verifying whether the regular expressions actually matched.
It was compounded by the fact that NZanalyse is recursive;
however, because $1, $2, etc. are dynamically scoped,
*they are not automatically cleared when NZanalyse calls
itself*.

Consequently, if the search string contains a boolean
operator, it would be split into

left = mice
operator = and
right = men

Then NZanalyse would be called recursively on the search
string 'mice'.  However, because $1, $2, and $3 are not
automatically cleared when the function is called again,
and because they are not cleared if a match fails, the code
would fail to recognize that 'mice' is leaf, and would
call NZanalyse('mice') repeatedly, to the promotion of
warm server rooms.

The wrinkle in this is that because of a bug in Perl 5.8, a
failing matches can sometimes alter the capture variables, thus
avoiding the infinite recursion.  However,  this bug was fixed in
Perl 5.10, leading to the NZanalyse bug becoming evident.

The Perl bug is described at http://rt.perl.org/rt3/Public/Bug/Display.html?id=19049
and the fix http://public.activestate.com/cgi-bin/perlbrowse/p/29279.

The fix to the Koha code is to check whether each regexp
that uses capture variables matches or fails, then act
accordingly.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-16 08:18:24 -05:00
Galen Charlton
a086de137a kohabug 2100 - allow deletion of non-default MARC framework
An earlier attempt to prevent deletion of default framework
by passing a suitably constructured URL actually had
the opposite effect - the default framework could be deleted,
but ia hon-default one could not.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-16 08:18:23 -05:00
Joe Atzberger
0905b6b747 Add HTML::Scrubber dependency to Makefile.PL
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-16 08:10:58 -05:00
Joe Atzberger
b11c41249b Bugfix ShelfBrowser using unsanitized ISBNs. Owen reported the
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-16 08:10:56 -05:00
Galen Charlton
8a5672f58b unimarc_complet framework: put 801$a in tab 8
Put the 801$a in tab 8, not 0, so that a valid 801
does not get split by the bib editor.

Signoff from Paul or Henri-Damien requested before
committing this patch.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-16 08:10:46 -05:00
Andrew Moore
5d2fde5d58 Bug 1953: removing potential SQL injections from C4::Calendar::_init
This patch changes the 4 select statements in C4::Calendar::_init.
tests for this method were included in a previous patch.

There are more potential problems in C4::Calendar::delete_holiday, but that
method seems to have deeper bugs than just these. I'll open another bug for
them if I can figure out how it's supposed to work.

No documentation changes necessary.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-13 17:41:21 -05:00
Andrew Moore
c6d5b75d6d Bug 1953: adding tests and 2 corrections for C4::Calendar
In the course of writing tests for C4::Calendar, I found two bugs and am fixing them here.
One is a documentation bug.
The other prevented C4::Calendar::insert_exception_holiday from working. I was unable
to find anywhere else in the code that depended on the broken behaviour.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-13 17:41:20 -05:00
Galen Charlton
a7ba1bb941 kohabug 2105: prevent crash on IE7
Three scripts were incorrect setting the HTTP type
header to 'utf-8' instead of something appropriate
like 'text/html' - Firefox evidentally can ignore that
mistake, but IE7 does not.

Fixed by replacing an invalid print of the HTTP header
and template output with a call to
C4::Output::output_html_with_http_headers.

Also corrected POD in C4::Auth and InstallAuth to
reflect correct use of output_html_with_http_headers.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-13 17:40:36 -05:00
Galen Charlton
c1ae207d54 kohabug 1621 - add subtitle to main results and details pages
Including the subtitle in search results and OPAC and staff
details templates.  The subtitle is expected to be in the
MARC subfield that is mapped to the (now nonexistant) column
bibliosubtitle.subtitle.

This is a fairly hackish patch that is meant to be minimally
disruptive while allowing subtitles to be displayed for those
not using the experimental XSLT bib display feature.  It
does *not* cover all cases where you have a MARC
record and want to display its subtitle.

UNIMARC notes: at the moment, none of the fr-FR UNIMARC
frameworks appear to be map any subfields to bibliosubtitle.subtitle.
This could be changed, but caveat programmer: the UNIMARC 200$e
is repeatable (meaning that get_koha_field_from_marc will put in ' | '
between multiple subtitles) and one may want to also include the
200$d (parallel title).  A GetMarcSubtitle routine may be in order
if absolutely necessary.

This points to a long-term need to make display of MARC (and later, hopefully,
non-MARC) bib records more flexible - the XSLT feature is one approach;
there may be others.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-13 17:40:34 -05:00
Galen Charlton
472d77353e patron cleaning - do not delete staff borrowers
Adjusted C4::Members::GetBorrowersWhoHaveNotBorrowedSince so
that staff member records are not selected for deletion.

This functionality change is motivated by the consideration
that a staff member who is authorized to operate Koha is
not necessarily a prolific user of the library's services.
If a batch purge job for inactive staff records is really need,
it should be a separate tool.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-13 17:40:33 -05:00
Galen Charlton
b42b8da0d6 kohabug 1573 - properly count patrons to delete
When both the patron delete and patron anonymize checkboxes
were selected, the patron cleaning tool would not
properly register the number of patrons to delete.  Fixed
by correcting form input handling.

Also, count of patrons to delete or anonymous now correct
when running with IndependentBranches = ON.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-13 17:40:32 -05:00
0c50bb12b3 Recent changes to YUI path preference require local OPAC copies of YUI library files.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-13 17:40:31 -05:00
Paul POULAIN
ded734b1e8 bugfixing pending reserves
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-13 17:40:30 -05:00
45fab923ac Adding COinS markup to shelves and results.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-13 17:40:29 -05:00
756cdc15ac Swapping tablesorter version. GZipped version may have been responsible for errors in Internet Explorer. Change to usermenu.inc is whitespace only, for proper display in IE.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-13 17:40:28 -05:00
Paul POULAIN
f0deb12b78 (bugfix, CRI) Permission needed is acquisition, not acquisitionS
+ i've added 'intranet' to reach intranet error page, not OPAC one (which is the default when no type specified)

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-13 17:40:26 -05:00
Galen Charlton
71982314d3 kohabug 2017: ensure MARC21 $9 are in correct bib editor tab
Update MARC21 bib framework to ensure that subfield $9 in  110,
110, 111, 130, 240, 243, 440, 410, 411, and 440 remain
in same bib editing tab as rest of subfields in those fields.

This helps ensure that authority-controlled fields are not
mangled when editing a bib record.

Change also fixes editing tab for subfields in the 037, 584, and
760.

This is DB rev 085.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-13 17:36:27 -05:00
Henri-Damien LAURENT
275f3c2b1e Adding RenewalAddsSuggestion systempreference to sql files.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-13 17:32:01 -05:00
Galen Charlton
ad280e41de MARC21 frameworks: keep a tag's subfields in the same tab
Changed default mandatory and optional MARC21 frameworks
to ensure that all the subfields of 037, 100, 110, 111, 130,
240, 243, 400, 410, 411, 440, 584, and 760 are all either
ignored (tab = -1) or assigned to the same editing tab.

Most of these changes involve the subfield $9 in authority-controlled
fields, which for the affected 1xx, 2xx, and 4xx fields was assigned
to tab 6, not 1, 2, or 4.  Because of this, any such field with a
$9 was effectively split, leading to record corruption.

This is part of the fix for bug 2017.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-13 17:22:56 -05:00
Galen Charlton
f6af1bea59 fixed typo in MARC framework test: "Codek" => "Code"
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-13 17:22:35 -05:00
Galen Charlton
3864b9f085 MARC framework test - tests all frameworks
Changed some of the tests so that all frameworks
are tested, not just the first row.

This patch has turned up a reported error in the
unimarc_lecture_pub - items.homebranch
and items.holdinbranch for the WEB framework are
in tab -1 (i.e., ignored), but the check is expecting
them in tab 10.  Not sure if this is a real error or not:
perhaps no items should be created for bibs in that framework;
on the other hand, it is still possible to do so, in which
case the branches need to be set.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-13 17:22:19 -05:00
Joshua Ferraro
01ea076daf Incrementing to 084 -- adding GoogleJackets syspref 2008-05-13 16:56:23 -05:00
Henri-Damien LAURENT
2b707b3704 Adding RenewalAddsSuggestion systempreference to sql files.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-13 16:45:09 -05:00
Henri-Damien LAURENT
20b72f1253 Adding Optionnal suggestion creation when renewing subscription.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-13 16:45:07 -05:00
Joshua Ferraro
92be028f8d Increment DB update 083 2008-05-12 15:50:26 -05:00
Henri-Damien LAURENT
cc8fab2513 yuipath : sysprefs changes only 2a/2
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-12 15:46:58 -05:00
Henri-Damien LAURENT
f59c9706a4 change in yuipath management 1/2 Noupdatedatabase.pl
now yuipath is added in C4::Output and uses themelang
In my opinion, all the general variables that are used in output should get in C4::Output (since there is theme lang computed.)
rather than in C4::Auth

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-12 15:46:35 -05:00
Andrew Moore
56b9f5b882 bug 1953: fixing potential SQL injection problems in C4::Branch::GetBranches
I moved C4::Branch::GetBranches to use bind parameters and wrote some tests to demonstrate functionality.

No functional or documentation changes here.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-12 15:07:17 -05:00
Galen Charlton
e67b1d5f2f fixed potential SQL error in fr-FR sample itemtypes
There is nothing to prevent a user from loading the
sample itemtypes from both 3-LecturePub and 4-Conservation.

To avoid an SQL error (and to let the installer tests
pass), made two of the SQL inserts "INSERT IGNORE" for
sample item types that have the same key.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-12 15:07:16 -05:00
Galen Charlton
27ae37a112 fixed SQL error in sample labels scripts
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-12 15:07:15 -05:00
Galen Charlton
11f72be96b fix SQL error in unimarc_lecture_pub fr-FR MARC framework
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-12 15:07:14 -05:00
Galen Charlton
b9a265e1b3 fixed installer test
Now handles cases where two SQL scripts in different
directories have the same name, e.g., fr-FR sample_itemtypes.sql.
Bug was masked by existing failure when attempting to load
both sample_itemtypes.sql.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-12 15:07:12 -05:00
Henri-Damien LAURENT
5074d1199b bug Fixing 2081
Editing authorisedvalue now checks if OTHER value has the same authorised_value
before storing
id is now passed to the form so that it is used when editing authorised_value
when imageurl it is passed as '' not empty parameter

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-12 10:36:29 -05:00
Paul POULAIN
21d0f8f589 french translation updated
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-12 10:07:58 -05:00
Paul POULAIN
62ae9fa3ee bugfix : librarian name was libxxx, not lib.xxx
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-12 10:07:57 -05:00
Paul POULAIN
dfcdc73be6 bugfix : ship utf-8 encoding in mail header
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-12 10:07:55 -05:00
Paul POULAIN
4613c8f701 (bugfix) focusing on barcode for returns
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-12 10:07:54 -05:00
9717926644 Hiding empty results table when there are no results (prevents js error from tablesorter). Now links back to search form. Also includes minor CSS tweak for IE/Opera general layout problems.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-12 10:06:34 -05:00
d3b72dc919 Adding check all/none controls to opac suggestions, following opac shelves interface.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-12 10:06:33 -05:00
157b5a1eb6 Adding checks for dateformat preference so that tablesorter script can be passed an extra parameter for proper sorting of metric dates (Bug 2089, dates & table ordering with jquery)
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-12 10:06:32 -05:00
Henri-Damien LAURENT
12a828dd21 Bug Fixing : overduenotices wrote a file on disk before sending to browser
this script had quite serious issues :
- it would not use mindays and maxdays variables
- It would send latin1 where utf8 was expected
- It would send data without text delimiters (; was chosen if title contains ; it would have been a problem " used as delimiters now)
- It would write a file when it was not asked
Now stores the results in a string before printing it.
New option added to store result into a file : -o filename

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-12 10:06:31 -05:00