Attachment #81644 for bug #21719

View | Details | Raw Unified | Return to bug 21719
Collapse All | Expand All

Lines 408-414 sub draw_label_text { Link Here

(-)a/C4/Labels/Label.pm (-1 / +1 lines)
408	else {	408	else {
409	$field->{'data'} = _get_barcode_data($field->{'code'},$item,$record);	409	$field->{'data'} = _get_barcode_data($field->{'code'},$item,$record);
410	}	410	}
411	# Find apropriate font it oblique title selected, except main font is oblique	411	# Find appropriate font it oblique title selected, except main font is oblique
412	if ( ( $field->{'code'} eq 'title' ) and ( $self->{'oblique_title'} == 1 ) ) {	412	if ( ( $field->{'code'} eq 'title' ) and ( $self->{'oblique_title'} == 1 ) ) {
413	if ( $font =~ /^TB$/ ) {	413	if ( $font =~ /^TB$/ ) {
414	$font .= 'I';	414	$font .= 'I';

Lines 79-85 sub hash_password { Link Here

(-)a/Koha/AuthUtils.pm (-1 / +1 lines)
79	For general password salting a C<$strength> of C<weak> is recommend,	79	For general password salting a C<$strength> of C<weak> is recommend,
80	For generating a server-salt a C<$strength> of C<strong> is recommended	80	For generating a server-salt a C<$strength> of C<strong> is recommended
81		81
82	'strong' uses /dev/random which may block until sufficient entropy is acheived.	82	'strong' uses /dev/random which may block until sufficient entropy is achieved.
83	'weak' uses /dev/urandom and is non-blocking.	83	'weak' uses /dev/urandom and is non-blocking.
84		84
85	=item length	85	=item length

Lines 1181-1187 PazPar2 port?); Link Here

(-)a/Makefile.PL (-2 / +2 lines)
1181		1181
1182	$msg = q(	1182	$msg = q(
1183	Use memcached to cache the results of some function calls?	1183	Use memcached to cache the results of some function calls?
1184	This provides a signficant performance improvement.	1184	This provides a significant performance improvement.
1185	You will need a Memcached server running.);	1185	You will need a Memcached server running.);
1186	$msg .= _add_valid_values_disp('USE_MEMCACHED', $valid_values);	1186	$msg .= _add_valid_values_disp('USE_MEMCACHED', $valid_values);
1187	$config{'USE_MEMCACHED'} = _get_value('USE_MEMCACHED', $msg, $defaults->{'USE_MEMCACHED'}, $valid_values, $install_log_values);	1187	$config{'USE_MEMCACHED'} = _get_value('USE_MEMCACHED', $msg, $defaults->{'USE_MEMCACHED'}, $valid_values, $install_log_values);
Lines 1219-1225 Would you like to run the database-dependent test suite?); Link Here
1219		1219
1220	THE DATA IN THIS DATABASE WILL BE DESTROYED during the process of	1220	THE DATA IN THIS DATABASE WILL BE DESTROYED during the process of
1221	testing. Please don't do this on your production database. It is not	1221	testing. Please don't do this on your production database. It is not
1222	reversable.	1222	reversible.
1223		1223
1224	YOU WILL SUFFER DATA LOSS if you run this test suite on your test	1224	YOU WILL SUFFER DATA LOSS if you run this test suite on your test
1225	database. You are better off not running this optional test suite than	1225	database. You are better off not running this optional test suite than

Lines 163-169 END_OF_BODY Link Here

(-)a/basket/sendbasket.pl (-1 / +1 lines)
163	$template->param( SENT => "1" );	163	$template->param( SENT => "1" );
164	}	164	}
165	else {	165	else {
166	# do something if it doesnt work....	166	# do something if it doesn't work....
167	carp "Error sending mail: $Mail::Sendmail::error \n";	167	carp "Error sending mail: $Mail::Sendmail::error \n";
168	$template->param( error => 1 );	168	$template->param( error => 1 );
169	}	169	}




I'll try to flesh out this section to better explain.

This query incorporates query profiles that aren't compatible with most non-Zebra 
Z39.50 targets to accomplish the field weighting and relevance ranking.

=item 2 $simple_query - a simple query that doesn't contain the field weighting,
stemming, etc., suitable to pass off to other search targets

    # shouldn't appear on the first one, scan indexes should, adding a new
    # box should only appear on the last, etc.
    my @search_boxes_array;
    my $search_boxes_count = 3; # begin with 3 boxes
    # FIXME: all this junk can be done in TMPL using __first__ and __last__
    for (my $i=1;$i<=$search_boxes_count;$i++) {
        # if it's the first one, don't display boolean option, but show scan indexes

# if a simple index (only one)  display the index used in the top search box
if ($indexes[0] && (!$indexes[1] || $params->{'scan'})) {
    my $idx = "ms_".$indexes[0];
    $idx =~ s/\,/comma/g;  # template toolkit doesn't like variables with a , in it
    $template->param($idx => 1);
}





    } # FIXME else?
}

# collect the stack of books already transferred so they can printed...
my @trsfitemloop;
my $transferred;
my $barcode = $query->param('barcode');
# remove leading/trailing whitespace
defined $barcode and $barcode =~ s/^\s*|\s*$//g;  # FIXME: barcodeInputFilter
# warn "barcode : $barcode";
if ($barcode) {

    ( $transferred, $messages ) =
      transferbook( $tobranchcd, $barcode, $ignoreRs );
    my $item = Koha::Items->find({ barcode => $barcode });
    $found = $messages->{'ResFound'};
    if ($transferred) {
        my %item;
        my $biblio = $item->biblio;
        my $frbranchcd =  C4::Context->userenv->{'branch'};

Lines 360-366 my $waiting = 0; Link Here

(-)a/circ/returns.pl (-2 / +2 lines)
360	my $reserved = 0;	360	my $reserved = 0;
361		361
362	# new op dev : we check if the document must be returned to his homebranch directly,	362	# new op dev : we check if the document must be returned to his homebranch directly,
363	# if the document is transfered, we have warning message .	363	# if the document is transferred, we have warning message .
364		364
365	if ( $messages->{'WasTransfered'} ) {	365	if ( $messages->{'WasTransfered'} ) {
366	$template->param(	366	$template->param(
Lines 385-391 if ( $messages->{'Wrongbranch'} ){ Link Here
385	);	385	);
386	}	386	}
387		387
388	# case of wrong transfert, if the document wasn't transfered to the right library (according to branchtransfer (tobranch) BDD)	388	# case of wrong transfert, if the document wasn't transferred to the right library (according to branchtransfer (tobranch) BDD)
389		389
390	if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) {	390	if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) {
391	$template->param(	391	$template->param(

Lines 102-108 foreach my $file (@template_files) { Link Here

(-)a/installer/html-template-to-template-toolkit.pl (-1 / +1 lines)
102		102
103	# Process..	103	# Process..
104	# NB: if you think you're seeing double, you probably are, some (read:most) patterns appear twice: once with quotations marks, once without.	104	# NB: if you think you're seeing double, you probably are, some (read:most) patterns appear twice: once with quotations marks, once without.
105	# trying to combine them into a single pattern proved troublesome as a regex like ['"]?(.*?)['"]? was causing problems and fixing the problem caused (alot) more complex regex	105	# trying to combine them into a single pattern proved troublesome as a regex like ['"]?(.*?)['"]? was causing problems and fixing the problem caused (a lot) more complex regex
106		106
107	# variables	107	# variables
108	$input_tmpl =~ s/<[!-]\sTMPL_VAR\s+NAME\s?=\s?['"]?\s(\w?)\s['"]?\s+ESCAPE=['"](\w?)['"]\s+DEFAULT=['"]?(.?)['"]?\s-*>/[% DEFAULT $cur_scope[-1]$1="$3" \|$2 %]/ig;	108	$input_tmpl =~ s/<[!-]\sTMPL_VAR\s+NAME\s?=\s?['"]?\s(\w?)\s['"]?\s+ESCAPE=['"](\w?)['"]\s+DEFAULT=['"]?(.?)['"]?\s-*>/[% DEFAULT $cur_scope[-1]$1="$3" \|$2 %]/ig;

Lines 292-298 elsif ( $step && $step == 3 ) { Link Here

(-)a/installer/install.pl (-1 / +1 lines)
292	# Where <level> is a category of requirement : required, recommended optional	292	# Where <level> is a category of requirement : required, recommended optional
293	# level should contain :	293	# level should contain :
294	# SQL File for import With a readable name.	294	# SQL File for import With a readable name.
295	# txt File taht explains what this SQL File is meant for.	295	# txt File that explains what this SQL File is meant for.
296	# Could be VERY useful to have A Big file for a kind of library.	296	# Could be VERY useful to have A Big file for a kind of library.
297	# But could also be useful to have some Authorised values data set prepared here.	297	# But could also be useful to have some Authorised values data set prepared here.
298	# Marcflavour Selection is achieved through radiobuttons.	298	# Marcflavour Selection is achieved through radiobuttons.




      <Value code="r"><description>Directories</description></Value>
      <Value code="s"><description>Statistics</description></Value>
      <Value code="t"><description>Technical reports</description></Value>
      <Value code="u"><description>Standards/specifications</description></Value>
      <Value code="v"><description>Legal cases and case notes</description></Value>
      <Value code="w"><description>Law reports and digests</description></Value>
      <Value code="y"><description>Yearbooks</description></Value>

      <Value code="r"><description>Directories</description></Value>
      <Value code="s"><description>Statistics</description></Value>
      <Value code="t"><description>Technical reports</description></Value>
      <Value code="u"><description>Standards/specifications</description></Value>
      <Value code="v"><description>Legal cases and case notes</description></Value>
      <Value code="w"><description>Law reports and digests</description></Value>
      <Value code="y"><description>Yearbooks</description></Value>

      <Value code="r"><description>Directories</description></Value>
      <Value code="s"><description>Statistics</description></Value>
      <Value code="t"><description>Technical reports</description></Value>
      <Value code="u"><description>Standards/specifications</description></Value>
      <Value code="v"><description>Legal cases and case notes</description></Value>
      <Value code="w"><description>Law reports and digests</description></Value>
      <Value code="y"><description>Yearbooks</description></Value>

Lines 314-320 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-1 / +1 lines)
314	<legend>Accounting details</legend>	314	<legend>Accounting details</legend>
315	<ol>	315	<ol>
316	<li>	316	<li>
317	<!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, usefull when receiveing an order -->	317	<!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, useful when receiveing an order -->
318	<input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="1" />	318	<input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="1" />
319	</li>	319	</li>
320	<li>	320	<li>

Lines 318-324 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt (-1 / +1 lines)
318	[% END %]	318	[% END %]
319	<span class="required">Required</span>	319	<span class="required">Required</span>
320	[% END %]	320	[% END %]
321	<!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, usefull when receiveing an order -->	321	<!-- origquantityrec only here for javascript compatibility (additem.js needs it, useless here, useful when receiveing an order -->
322	<input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="1" />	322	<input id="origquantityrec" readonly="readonly" type="hidden" name="origquantityrec" value="1" />
323	</li>	323	</li>
324	<li>	324	<li>

Lines 201-207 Patrons: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref (-1 / +1 lines)
201	yes: Do	201	yes: Do
202	no: "Don't"	202	no: "Don't"
203	- track last patron activity.	203	- track last patron activity.
204	- Everytime a patron will connect, the borrowers.lastseen will be updated with the current time.	204	- Every time a patron will connect, the borrowers.lastseen will be updated with the current time.
205	-	205	-
206	- Block a patron's account if it reaches	206	- Block a patron's account if it reaches
207	- pref: FailedLoginAttempts	207	- pref: FailedLoginAttempts

Lines 428-434 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2MODS.xsl (-1 / +1 lines)
428	<genre authority="marc">poetry</genre>	428	<genre authority="marc">poetry</genre>
429	</xsl:if>	429	</xsl:if>
430	<xsl:if test="contains($controlField008-30-31,'r')">	430	<xsl:if test="contains($controlField008-30-31,'r')">
431	<genre authority="marc">rehersal</genre>	431	<genre authority="marc">rehearsal</genre>
432	</xsl:if>	432	</xsl:if>
433	<xsl:if test="contains($controlField008-30-31,'g')">	433	<xsl:if test="contains($controlField008-30-31,'g')">
434	<genre authority="marc">reporting</genre>	434	<genre authority="marc">reporting</genre>

Lines 148-154 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl (-1 / +1 lines)
148	<xsl:with-param name="codes">abc</xsl:with-param>	148	<xsl:with-param name="codes">abc</xsl:with-param>
149	<xsl:with-param name="index">au</xsl:with-param>	149	<xsl:with-param name="index">au</xsl:with-param>
150	<xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/>	150	<xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/>
151	<!-- do not use label 'by ' here, it would be repeated for every occurence of 100,110,111,700,710,711 -->	151	<!-- do not use label 'by ' here, it would be repeated for every occurrence of 100,110,111,700,710,711 -->
152	</xsl:call-template>	152	</xsl:call-template>
153	</h5>	153	</h5>
154	</xsl:if>	154	</xsl:if>




                    <!--CONTENT-->
                    [% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
                        [% IF ( nopermission ) %]
                            <!-- This is what is displayed if user doesn't have permission -->
                            <div class="alert">
                                <h3>Access denied</h3>
                                <p>Sorry, the system doesn't think you have permission to access this page. </p>

                            [% END %]

                            [% IF ( different_ip ) %]
                                <!-- This is what is displayed if user doesn't have permission -->
                                <div class="alert alert-info">
                                    <p>You are logging from a different IP address. Please log in again.</p>
                                </div>



                            [% IF invalid_username_or_password || too_many_login_attempts %]
                                <!-- This is what is displayed if user doesn't have permission or account is locked. (Do not expose more information than needed.) -->
                                <div class="alert alert-info">
                                    <p>You entered an incorrect username or password. Please try again! But note that passwords are case sensitive[% IF Koha.Preference('FailedLoginAttempts') %] and that your account will be locked out after a fixed number of failed login attempts[% END %]. Please contact a library staff member if you continue to have problems.</p>
                                </div>




                    [% END # / IF confirm %]

                    [% IF ( nopermission ) %]
                        <!-- This is what is displayed if user doesn't have permission -->
                        <div class="alert">
                            <h3>Access denied</h3>
                            <p>Sorry, this self-checkout station has lost authentication.  Please contact the administrator to resolve this problem.</p>

                    [% END %]

                    [% IF ( different_ip ) %]
                        <!-- This is what is displayed if user doesn't have permission -->
                        <div class="alert">
                            <h3>Session lost</h3>
                            <p>You are accessing self-checkout from a different IP address! please log in again.</p>

                    [% END %]

                    [% IF ( invalid_username_or_password ) %]
                        <!-- This is what is displayed if user doesn't have permission -->
                        <div class="alert">
                            <h3>Record not found</h3>
                            <p>Your userid was not found in the database.  Please try again.</p>

Lines 61-67 my $display_columns = { layout => [ # db column => {col label Link Here

(-)a/labels/label-manage.pl (-2 / +2 lines)
61	{profile_id => {label => 'Profile ID', link_field => 0}},	61	{profile_id => {label => 'Profile ID', link_field => 0}},
62	{printer_name => {label => 'Printer Name', link_field => 0}},	62	{printer_name => {label => 'Printer Name', link_field => 0}},
63	{paper_bin => {label => 'Paper Bin', link_field => 0}},	63	{paper_bin => {label => 'Paper Bin', link_field => 0}},
64	{_template_code => {label => 'Template Name', link_field => 0}}, # this display column does not have a corrisponding db column in the profile table, hence the underscore	64	{_template_code => {label => 'Template Name', link_field => 0}}, # this display column does not have a corresponding db column in the profile table, hence the underscore
65	{select => {label => 'Actions', value => 'profile_id'}},	65	{select => {label => 'Actions', value => 'profile_id'}},
66	],	66	],
67	batch => [	67	batch => [
Lines 73-79 my $display_columns = { layout => [ # db column => {col label Link Here
73	],	73	],
74	};	74	};
75		75
76	my $label_element = $cgi->param('label_element') \|\| 'template'; # default to template managment	76	my $label_element = $cgi->param('label_element') \|\| 'template'; # default to template management
77	my $op = $cgi->param('op') \|\| 'none';	77	my $op = $cgi->param('op') \|\| 'none';
78	my $element_id = $cgi->param('element_id') \|\| undef;	78	my $element_id = $cgi->param('element_id') \|\| undef;
79	my $error = $cgi->param('error') \|\| 0;	79	my $error = $cgi->param('error') \|\| 0;

Lines 30-36 if ($version \|\| (!$confirm)) { Link Here

(-)a/misc/batchDeleteUnusedSubfields.pl (-1 / +1 lines)
30	This script cleans unused subfields in the MARC DB.	30	This script cleans unused subfields in the MARC DB.
31	If you alter the MARC parameters and remove a subfield (ie : move it to ignore (10) tab), existing subfields are NOT removed.	31	If you alter the MARC parameters and remove a subfield (ie : move it to ignore (10) tab), existing subfields are NOT removed.
32	It's not a bug, it prevents deleting useful values in case of erroneous move.	32	It's not a bug, it prevents deleting useful values in case of erroneous move.
33	This script definetly remove unused subfields in the MARC DB.	33	This script definitely remove unused subfields in the MARC DB.
34	syntax :	34	syntax :
35	\t./cleanmarcdb.pl -h (or without arguments => shows this screen)	35	\t./cleanmarcdb.pl -h (or without arguments => shows this screen)
36	\t./cleanmarcdb.pl -c (c like confirm => cleans the marc DB (may be long)	36	\t./cleanmarcdb.pl -c (c like confirm => cleans the marc DB (may be long)

Lines 21-27 sub check_sys_pref { Link Here

(-)a/misc/check_sysprefs.pl (-1 / +1 lines)
21	if ( !-d _ ) {	21	if ( !-d _ ) {
22	my $name = $File::Find::name;	22	my $name = $File::Find::name;
23	if ( $name =~ /(\.pl\|\.pm)$/ ) {	23	if ( $name =~ /(\.pl\|\.pm)$/ ) {
24	open( FILE, "$_" ) \|\| die "cant open $name";	24	open( FILE, "$_" ) \|\| die "can't open $name";
25	while ( my $inp = <FILE> ) {	25	while ( my $inp = <FILE> ) {
26	if ( $inp =~ /C4::Context->preference$(.*?)$/ ) {	26	if ( $inp =~ /C4::Context->preference$(.*?)$/ ) {
27	my $variable = $1;	27	my $variable = $1;

Lines 32-38 use CGI qw ( -utf8 ); Link Here

(-)a/opac/ilsdi.pl (-1 / +1 lines)
32		32
33	This script is a basic implementation of ILS-DI protocol for Koha.	33	This script is a basic implementation of ILS-DI protocol for Koha.
34	It acts like a dispatcher, that get the CGI request, check required and	34	It acts like a dispatcher, that get the CGI request, check required and
35	optionals arguments, call a function from C4::ILS-DI, and finaly	35	optionals arguments, call a function from C4::ILS-DI, and finally
36	outputs the returned hashref as XML.	36	outputs the returned hashref as XML.
37		37
38	=cut	38	=cut

Lines 92-98 if ( C4::Context->preference("OpacPasswordChange") ) { Link Here

(-)a/opac/opac-passwd.pl (-1 / +1 lines)
92	# Called Empty, Ask for data.	92	# Called Empty, Ask for data.
93	$template->param( 'Ask_data' => '1' );	93	$template->param( 'Ask_data' => '1' );
94	if (!$query->param('Oldkey') && ($query->param('Newkey') \|\| $query->param('Confirm'))){	94	if (!$query->param('Oldkey') && ($query->param('Newkey') \|\| $query->param('Confirm'))){
95	# Old password is empty but one of the others isnt	95	# Old password is empty but one of the others isn't
96	$template->param( 'Error_messages' => '1' );	96	$template->param( 'Error_messages' => '1' );
97	$template->param( 'WrongPass' => '1' );	97	$template->param( 'WrongPass' => '1' );
98	}	98	}

Lines 496-502 foreach my $biblioNum (@biblionumbers) { Link Here

(-)a/opac/opac-reserve.pl (-1 / +1 lines)
496	$itemInfo->{backgroundcolor} = 'other';	496	$itemInfo->{backgroundcolor} = 'other';
497	}	497	}
498		498
499	# Check of the transfered documents	499	# Check of the transferred documents
500	my ( $transfertwhen, $transfertfrom, $transfertto ) =	500	my ( $transfertwhen, $transfertfrom, $transfertto ) =
501	GetTransfers($itemNum);	501	GetTransfers($itemNum);
502	if ( $transfertwhen && ($transfertwhen ne '') ) {	502	if ( $transfertwhen && ($transfertwhen ne '') ) {

Lines 326-332 if ( $template_type && $template_type eq 'advsearch' ) { Link Here

(-)a/opac/opac-search.pl (-1 / +1 lines)
326	# shouldn't appear on the first one, scan indexes should, adding a new	326	# shouldn't appear on the first one, scan indexes should, adding a new
327	# box should only appear on the last, etc.	327	# box should only appear on the last, etc.
328	my @search_boxes_array;	328	my @search_boxes_array;
329	my $search_boxes_count = 3; # begin whith 3 boxes	329	my $search_boxes_count = 3; # begin with 3 boxes
330	$template->param( search_boxes_count => $search_boxes_count );	330	$template->param( search_boxes_count => $search_boxes_count );
331		331
332	if ($cgi->cookie("num_paragraph")){	332	if ($cgi->cookie("num_paragraph")){

Lines 183-189 END_OF_BODY Link Here

(-)a/opac/opac-sendbasket.pl (-1 / +1 lines)
183	$template->param( SENT => "1" );	183	$template->param( SENT => "1" );
184	}	184	}
185	else {	185	else {
186	# do something if it doesnt work....	186	# do something if it doesn't work....
187	carp "Error sending mail: empty basket" if !defined($iso2709);	187	carp "Error sending mail: empty basket" if !defined($iso2709);
188	carp "Error sending mail: $Mail::Sendmail::error" if $Mail::Sendmail::error;	188	carp "Error sending mail: $Mail::Sendmail::error" if $Mail::Sendmail::error;
189	$template->param( error => 1 );	189	$template->param( error => 1 );

Lines 183-189 END_OF_BODY Link Here

(-)a/opac/opac-sendshelf.pl (-1 / +1 lines)
183	$template->param( SENT => "1" );	183	$template->param( SENT => "1" );
184	}	184	}
185	else {	185	else {
186	# do something if it doesnt work....	186	# do something if it doesn't work....
187	carp "Error sending mail: $Mail::Sendmail::error \n";	187	carp "Error sending mail: $Mail::Sendmail::error \n";
188	$template->param( error => 1 );	188	$template->param( error => 1 );
189	}	189	}

Lines 44-50 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here

(-)a/patroncards/manage.pl (-2 / +2 lines)
44	);	44	);
45		45
46	my $op = $cgi->param('op') \|\| 'none';	46	my $op = $cgi->param('op') \|\| 'none';
47	my $card_element = $cgi->param('card_element') \|\| 'template'; # default to template managment	47	my $card_element = $cgi->param('card_element') \|\| 'template'; # default to template management
48	my $element_id = $cgi->param('element_id') \|\| 0; # there should never be an element with a id of 0 so this is a safe default	48	my $element_id = $cgi->param('element_id') \|\| 0; # there should never be an element with a id of 0 so this is a safe default
49		49
50	my $db_rows = {};	50	my $db_rows = {};
Lines 64-70 my $display_columns = { layout => [ # db column => {col label Link Here
64	profile => [ {profile_id => {label => 'Profile ID', link_field => 0}},	64	profile => [ {profile_id => {label => 'Profile ID', link_field => 0}},
65	{printer_name => {label => 'Printer Name', link_field => 0}},	65	{printer_name => {label => 'Printer Name', link_field => 0}},
66	{paper_bin => {label => 'Paper Bin', link_field => 0}},	66	{paper_bin => {label => 'Paper Bin', link_field => 0}},
67	{_template_code => {label => 'Template Name', link_field => 0}}, # this display column does not have a corrisponding db column in the profile table, hence the underscore	67	{_template_code => {label => 'Template Name', link_field => 0}}, # this display column does not have a corresponding db column in the profile table, hence the underscore
68	{_action => {label => 'Action', link_field => 0}},	68	{_action => {label => 'Action', link_field => 0}},
69	{select => {label => 'Select', value => 'profile_id'}},	69	{select => {label => 'Select', value => 'profile_id'}},
70	],	70	],

Lines 126-132 if ($do_it) { Link Here

(-)a/reports/borrowers_stats.pl (-1 / +1 lines)
126	$req->execute;	126	$req->execute;
127	$template->param( SORT1_LOOP => $req->fetchall_arrayref({}));	127	$template->param( SORT1_LOOP => $req->fetchall_arrayref({}));
128	$req = $dbh->prepare("SELECT DISTINCTROW sort2 AS value FROM borrowers WHERE sort2 IS NOT NULL AND sort2 <> '' ORDER BY sort2 LIMIT 200");	128	$req = $dbh->prepare("SELECT DISTINCTROW sort2 AS value FROM borrowers WHERE sort2 IS NOT NULL AND sort2 <> '' ORDER BY sort2 LIMIT 200");
129	# More than 200 items in a dropdown is not going to be useful anyway, and w/ 50,000 patrons we can destory DB performance.	129	# More than 200 items in a dropdown is not going to be useful anyway, and w/ 50,000 patrons we can destroy DB performance.
130	$req->execute;	130	$req->execute;
131	$template->param( SORT2_LOOP => $req->fetchall_arrayref({}));	131	$template->param( SORT2_LOOP => $req->fetchall_arrayref({}));
132		132




        $cache_expiry *= 86400; # 60 * 60 * 24
      }
    }
    # check $cache_expiry isn't too large, Memcached::set requires it to be less than 30 days or it will be treated as if it were an absolute time stamp
    if( $cache_expiry >= 2592000 ){
      push @errors, {cache_expiry => $cache_expiry};
    }

    } elsif( $cache_expiry_units eq "days" ){
      $cache_expiry *= 86400; # 60 * 60 * 24
    }
    # check $cache_expiry isn't too large, Memcached::set requires it to be less than 30 days or it will be treated as if it were an absolute time stamp
    if( $cache_expiry >= 2592000 ){ # oops, over the limit of 30 days
      # report error to user
      $template->param(

        'public' => scalar $input->param('public'),
      );
    } else {
      # they have chosen a new report and the area to report on
      $template->param(
          'build2' => 1,
          'area'   => scalar $input->param('area'),

        $cache_expiry *= 86400; # 60 * 60 * 24
      }
    }
    # check $cache_expiry isn't too large, Memcached::set requires it to be less than 30 days or it will be treated as if it were an absolute time stamp
    if( $cache_expiry && $cache_expiry >= 2592000 ){
      push @errors, {cache_expiry => $cache_expiry};
    }

Lines 452-458 foreach my $biblionumber (@biblionumbers) { Link Here

(-)a/reserve/request.pl (-1 / +1 lines)
452	# for branches they arent logged in to	452	# for branches they arent logged in to
453	if ( C4::Context->preference("IndependentBranches") ) {	453	if ( C4::Context->preference("IndependentBranches") ) {
454	if (! C4::Context->preference("canreservefromotherbranches")){	454	if (! C4::Context->preference("canreservefromotherbranches")){
455	# cant reserve items so need to check if item homebranch and userenv branch match if not we cant reserve	455	# can't reserve items so need to check if item homebranch and userenv branch match if not we can't reserve
456	my $userenv = C4::Context->userenv;	456	my $userenv = C4::Context->userenv;
457	unless ( C4::Context->IsSuperLibrarian ) {	457	unless ( C4::Context->IsSuperLibrarian ) {
458	$item->{cantreserve} = 1 if ( $item->{homebranch} ne $userenv->{branch} );	458	$item->{cantreserve} = 1 if ( $item->{homebranch} ne $userenv->{branch} );

Lines 16-22 Link Here

(-)a/serials/routing-preview.pl (-1 / +1 lines)
16	# along with Koha; if not, see <http://www.gnu.org/licenses>.	16	# along with Koha; if not, see <http://www.gnu.org/licenses>.
17		17
18	# Routing Preview.pl script used to view a routing list after creation	18	# Routing Preview.pl script used to view a routing list after creation
19	# lets one print out routing slip and create (in this instance) the heirarchy	19	# lets one print out routing slip and create (in this instance) the hierarchy
20	# of reserves for the serial	20	# of reserves for the serial
21	use Modern::Perl;	21	use Modern::Perl;
22	use CGI qw ( -utf8 );	22	use CGI qw ( -utf8 );

Lines 45-51 if ( $op and $op eq "close" ) { Link Here

(-)a/serials/subscription-detail.pl (-2 / +1 lines)
45	C4::Serials::ReopenSubscription( $subscriptionid );	45	C4::Serials::ReopenSubscription( $subscriptionid );
46	}	46	}
47		47
48	# the subscription must be deletable if there is NO issues for a reason or another (should not happend, but...)	48	# the subscription must be deletable if there is NO issues for a reason or another (should not happened, but...)
49		49
50	# Permission needed if it is a deletion (del) : delete_subscription	50	# Permission needed if it is a deletion (del) : delete_subscription
51	# Permission needed otherwise : *	51	# Permission needed otherwise : *
52	-

Return to bug 21719

Lines 94-100 weighting, koha-specific relevance ranking, and stemming. When I have a chance Link Here

(-)a/catalogue/search.pl (-3 / +3 lines)
94	I'll try to flesh out this section to better explain.	94	I'll try to flesh out this section to better explain.
95		95
96	This query incorporates query profiles that aren't compatible with most non-Zebra	96	This query incorporates query profiles that aren't compatible with most non-Zebra
97	Z39.50 targets to acomplish the field weighting and relevance ranking.	97	Z39.50 targets to accomplish the field weighting and relevance ranking.
98		98
99	=item 2 $simple_query - a simple query that doesn't contain the field weighting,	99	=item 2 $simple_query - a simple query that doesn't contain the field weighting,
100	stemming, etc., suitable to pass off to other search targets	100	stemming, etc., suitable to pass off to other search targets
Lines 293-299 if ( $template_type eq 'advsearch' ) { Link Here
293	# shouldn't appear on the first one, scan indexes should, adding a new	293	# shouldn't appear on the first one, scan indexes should, adding a new
294	# box should only appear on the last, etc.	294	# box should only appear on the last, etc.
295	my @search_boxes_array;	295	my @search_boxes_array;
296	my $search_boxes_count = 3; # begin whith 3 boxes	296	my $search_boxes_count = 3; # begin with 3 boxes
297	# FIXME: all this junk can be done in TMPL using __first__ and __last__	297	# FIXME: all this junk can be done in TMPL using __first__ and __last__
298	for (my $i=1;$i<=$search_boxes_count;$i++) {	298	for (my $i=1;$i<=$search_boxes_count;$i++) {
299	# if it's the first one, don't display boolean option, but show scan indexes	299	# if it's the first one, don't display boolean option, but show scan indexes
Lines 383-389 my @indexes = map uri_unescape($_), $cgi->multi_param('idx'); Link Here
383	# if a simple index (only one) display the index used in the top search box	383	# if a simple index (only one) display the index used in the top search box
384	if ($indexes[0] && (!$indexes[1] \|\| $params->{'scan'})) {	384	if ($indexes[0] && (!$indexes[1] \|\| $params->{'scan'})) {
385	my $idx = "ms_".$indexes[0];	385	my $idx = "ms_".$indexes[0];
386	$idx =~ s/\,/comma/g; # template toolkit doesnt like variables with a , in it	386	$idx =~ s/\,/comma/g; # template toolkit doesn't like variables with a , in it
387	$template->param($idx => 1);	387	$template->param($idx => 1);
388	}	388	}
389		389

Lines 111-130 elsif ( $request eq 'KillReserved' ) { Link Here

(-)a/circ/branchtransfers.pl (-4 / +4 lines)
111	} # FIXME else?	111	} # FIXME else?
112	}	112	}
113		113
114	# collect the stack of books already transfered so they can printed...	114	# collect the stack of books already transferred so they can printed...
115	my @trsfitemloop;	115	my @trsfitemloop;
116	my $transfered;	116	my $transferred;
117	my $barcode = $query->param('barcode');	117	my $barcode = $query->param('barcode');
118	# remove leading/trailing whitespace	118	# remove leading/trailing whitespace
119	defined $barcode and $barcode =~ s/^\s\|\s$//g; # FIXME: barcodeInputFilter	119	defined $barcode and $barcode =~ s/^\s\|\s$//g; # FIXME: barcodeInputFilter
120	# warn "barcode : $barcode";	120	# warn "barcode : $barcode";
121	if ($barcode) {	121	if ($barcode) {
122		122
123	( $transfered, $messages ) =	123	( $transferred, $messages ) =
124	transferbook( $tobranchcd, $barcode, $ignoreRs );	124	transferbook( $tobranchcd, $barcode, $ignoreRs );
125	my $item = Koha::Items->find({ barcode => $barcode });	125	my $item = Koha::Items->find({ barcode => $barcode });
126	$found = $messages->{'ResFound'};	126	$found = $messages->{'ResFound'};
127	if ($transfered) {	127	if ($transferred) {
128	my %item;	128	my %item;
129	my $biblio = $item->biblio;	129	my $biblio = $item->biblio;
130	my $frbranchcd = C4::Context->userenv->{'branch'};	130	my $frbranchcd = C4::Context->userenv->{'branch'};

Lines 181-187 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/data/marc21_field_008.xml (-3 / +3 lines)
181	<Value code="r"><description>Directories</description></Value>	181	<Value code="r"><description>Directories</description></Value>
182	<Value code="s"><description>Statistics</description></Value>	182	<Value code="s"><description>Statistics</description></Value>
183	<Value code="t"><description>Technical reports</description></Value>	183	<Value code="t"><description>Technical reports</description></Value>
184	<Value code="u"><description>Standars/specifications</description></Value>	184	<Value code="u"><description>Standards/specifications</description></Value>
185	<Value code="v"><description>Legal cases and case notes</description></Value>	185	<Value code="v"><description>Legal cases and case notes</description></Value>
186	<Value code="w"><description>Law reports and digests</description></Value>	186	<Value code="w"><description>Law reports and digests</description></Value>
187	<Value code="y"><description>Yearbooks</description></Value>	187	<Value code="y"><description>Yearbooks</description></Value>
Lines 212-218 Link Here
212	<Value code="r"><description>Directories</description></Value>	212	<Value code="r"><description>Directories</description></Value>
213	<Value code="s"><description>Statistics</description></Value>	213	<Value code="s"><description>Statistics</description></Value>
214	<Value code="t"><description>Technical reports</description></Value>	214	<Value code="t"><description>Technical reports</description></Value>
215	<Value code="u"><description>Standars/specifications</description></Value>	215	<Value code="u"><description>Standards/specifications</description></Value>
216	<Value code="v"><description>Legal cases and case notes</description></Value>	216	<Value code="v"><description>Legal cases and case notes</description></Value>
217	<Value code="w"><description>Law reports and digests</description></Value>	217	<Value code="w"><description>Law reports and digests</description></Value>
218	<Value code="y"><description>Yearbooks</description></Value>	218	<Value code="y"><description>Yearbooks</description></Value>
Lines 243-249 Link Here
243	<Value code="r"><description>Directories</description></Value>	243	<Value code="r"><description>Directories</description></Value>
244	<Value code="s"><description>Statistics</description></Value>	244	<Value code="s"><description>Statistics</description></Value>
245	<Value code="t"><description>Technical reports</description></Value>	245	<Value code="t"><description>Technical reports</description></Value>
246	<Value code="u"><description>Standars/specifications</description></Value>	246	<Value code="u"><description>Standards/specifications</description></Value>
247	<Value code="v"><description>Legal cases and case notes</description></Value>	247	<Value code="v"><description>Legal cases and case notes</description></Value>
248	<Value code="w"><description>Law reports and digests</description></Value>	248	<Value code="w"><description>Law reports and digests</description></Value>
249	<Value code="y"><description>Yearbooks</description></Value>	249	<Value code="y"><description>Yearbooks</description></Value>

Lines 26-32 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt (-3 / +3 lines)
26	<!--CONTENT-->	26	<!--CONTENT-->
27	[% IF Koha.Preference( 'opacuserlogin' ) == 1 %]	27	[% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
28	[% IF ( nopermission ) %]	28	[% IF ( nopermission ) %]
29	<!-- This is what is displayed if user doesnt have permission -->	29	<!-- This is what is displayed if user doesn't have permission -->
30	<div class="alert">	30	<div class="alert">
31	<h3>Access denied</h3>	31	<h3>Access denied</h3>
32	<p>Sorry, the system doesn't think you have permission to access this page. </p>	32	<p>Sorry, the system doesn't think you have permission to access this page. </p>
Lines 50-56 Link Here
50	[% END %]	50	[% END %]
51		51
52	[% IF ( different_ip ) %]	52	[% IF ( different_ip ) %]
53	<!-- This is what is displayed if user doesnt have permission -->	53	<!-- This is what is displayed if user doesn't have permission -->
54	<div class="alert alert-info">	54	<div class="alert alert-info">
55	<p>You are logging from a different IP address. Please log in again.</p>	55	<p>You are logging from a different IP address. Please log in again.</p>
56	</div>	56	</div>
Lines 58-64 Link Here
58		58
59		59
60	[% IF invalid_username_or_password \|\| too_many_login_attempts %]	60	[% IF invalid_username_or_password \|\| too_many_login_attempts %]
61	<!-- This is what is displayed if user doesnt have permission or account is locked. (Do not expose more information than needed.) -->	61	<!-- This is what is displayed if user doesn't have permission or account is locked. (Do not expose more information than needed.) -->
62	<div class="alert alert-info">	62	<div class="alert alert-info">
63	<p>You entered an incorrect username or password. Please try again! But note that passwords are case sensitive[% IF Koha.Preference('FailedLoginAttempts') %] and that your account will be locked out after a fixed number of failed login attempts[% END %]. Please contact a library staff member if you continue to have problems.</p>	63	<p>You entered an incorrect username or password. Please try again! But note that passwords are case sensitive[% IF Koha.Preference('FailedLoginAttempts') %] and that your account will be locked out after a fixed number of failed login attempts[% END %]. Please contact a library staff member if you continue to have problems.</p>
64	</div>	64	</div>

Lines 140-146 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (-3 / +3 lines)
140	[% END # / IF confirm %]	140	[% END # / IF confirm %]
141		141
142	[% IF ( nopermission ) %]	142	[% IF ( nopermission ) %]
143	<!-- This is what is displayed if user doesnt have permission -->	143	<!-- This is what is displayed if user doesn't have permission -->
144	<div class="alert">	144	<div class="alert">
145	<h3>Access denied</h3>	145	<h3>Access denied</h3>
146	<p>Sorry, this self-checkout station has lost authentication. Please contact the administrator to resolve this problem.</p>	146	<p>Sorry, this self-checkout station has lost authentication. Please contact the administrator to resolve this problem.</p>
Lines 148-154 Link Here
148	[% END %]	148	[% END %]
149		149
150	[% IF ( different_ip ) %]	150	[% IF ( different_ip ) %]
151	<!-- This is what is displayed if user doesnt have permission -->	151	<!-- This is what is displayed if user doesn't have permission -->
152	<div class="alert">	152	<div class="alert">
153	<h3>Session lost</h3>	153	<h3>Session lost</h3>
154	<p>You are accessing self-checkout from a different IP address! please log in again.</p>	154	<p>You are accessing self-checkout from a different IP address! please log in again.</p>
Lines 156-162 Link Here
156	[% END %]	156	[% END %]
157		157
158	[% IF ( invalid_username_or_password ) %]	158	[% IF ( invalid_username_or_password ) %]
159	<!-- This is what is displayed if user doesnt have permission -->	159	<!-- This is what is displayed if user doesn't have permission -->
160	<div class="alert">	160	<div class="alert">
161	<h3>Record not found</h3>	161	<h3>Record not found</h3>
162	<p>Your userid was not found in the database. Please try again.</p>	162	<p>Your userid was not found in the database. Please try again.</p>

Lines 225-231 elsif ( $phase eq 'Update SQL'){ Link Here

(-)a/reports/guided_reports.pl (-4 / +4 lines)
225	$cache_expiry = 86400; # 60 60 * 24	225	$cache_expiry = 86400; # 60 60 * 24
226	}	226	}
227	}	227	}
228	# check $cache_expiry isnt too large, Memcached::set requires it to be less than 30 days or it will be treated as if it were an absolute time stamp	228	# check $cache_expiry isn't too large, Memcached::set requires it to be less than 30 days or it will be treated as if it were an absolute time stamp
229	if( $cache_expiry >= 2592000 ){	229	if( $cache_expiry >= 2592000 ){
230	push @errors, {cache_expiry => $cache_expiry};	230	push @errors, {cache_expiry => $cache_expiry};
231	}	231	}
Lines 322-328 elsif ( $phase eq 'Report on this Area' ) { Link Here
322	} elsif( $cache_expiry_units eq "days" ){	322	} elsif( $cache_expiry_units eq "days" ){
323	$cache_expiry = 86400; # 60 60 * 24	323	$cache_expiry = 86400; # 60 60 * 24
324	}	324	}
325	# check $cache_expiry isnt too large, Memcached::set requires it to be less than 30 days or it will be treated as if it were an absolute time stamp	325	# check $cache_expiry isn't too large, Memcached::set requires it to be less than 30 days or it will be treated as if it were an absolute time stamp
326	if( $cache_expiry >= 2592000 ){ # oops, over the limit of 30 days	326	if( $cache_expiry >= 2592000 ){ # oops, over the limit of 30 days
327	# report error to user	327	# report error to user
328	$template->param(	328	$template->param(
Lines 334-340 elsif ( $phase eq 'Report on this Area' ) { Link Here
334	'public' => scalar $input->param('public'),	334	'public' => scalar $input->param('public'),
335	);	335	);
336	} else {	336	} else {
337	# they have choosen a new report and the area to report on	337	# they have chosen a new report and the area to report on
338	$template->param(	338	$template->param(
339	'build2' => 1,	339	'build2' => 1,
340	'area' => scalar $input->param('area'),	340	'area' => scalar $input->param('area'),
Lines 586-592 elsif ( $phase eq 'Save Report' ) { Link Here
586	$cache_expiry = 86400; # 60 60 * 24	586	$cache_expiry = 86400; # 60 60 * 24
587	}	587	}
588	}	588	}
589	# check $cache_expiry isnt too large, Memcached::set requires it to be less than 30 days or it will be treated as if it were an absolute time stamp	589	# check $cache_expiry isn't too large, Memcached::set requires it to be less than 30 days or it will be treated as if it were an absolute time stamp
590	if( $cache_expiry && $cache_expiry >= 2592000 ){	590	if( $cache_expiry && $cache_expiry >= 2592000 ){
591	push @errors, {cache_expiry => $cache_expiry};	591	push @errors, {cache_expiry => $cache_expiry};
592	}	592	}