diff --git a/C4/Auth.pm b/C4/Auth.pm index 06525c135b..25452892d8 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -157,6 +157,9 @@ sub get_template_and_user { C4::Context->interface( $in->{type} ); + my $safe_chars = 'a-zA-Z_\-\/'; + die "bad template path" unless $in->{'template_name'} =~ m/^[$safe_chars]+.tt?$/ig; #sanitize input + $in->{'authnotrequired'} ||= 0; my $template = C4::Templates::gettemplate( $in->{'template_name'}, diff --git a/C4/Koha.pm b/C4/Koha.pm index 23fbfeef97..b2708db80f 100644 --- a/C4/Koha.pm +++ b/C4/Koha.pm @@ -35,7 +35,7 @@ use DBI qw(:sql_types); use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $DEBUG); BEGIN { - $VERSION = 3.07.00.049; + $VERSION = 3.18.08.000; require Exporter; @ISA = qw(Exporter); @EXPORT = qw( diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index d25c67b9af..9111c56e6c 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -9799,7 +9799,12 @@ if ( CheckVersion($DBversion) ) { print "Upgrade to $DBversion done\n"; SetVersion ($DBversion); } - +$DBversion = "3.18.00.000"; +if ( CheckVersion($DBversion) ) { + print "Upgrade to version 3.18.08\n"; + SetVersion ($DBversion); + print "Upgrade to $DBversion done \n"; +} diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc index cbdc939355..433c92703d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc @@ -58,7 +58,7 @@ [% END %] - + - + - + - + [% IF ( letters ) %]

days ago +

  • days ago
  • [% INCLUDE 'date-format.inc' %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt index f7b1d52e0f..faaa5fb222 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tt @@ -27,11 +27,11 @@ function displayMoreConstraint(numlayer){ [% INCLUDE 'cat-search.inc' %]