ffzg/recall_notices.pl: added --interval and --dedup

[koha.git] / tools / holidays.pl

diff --git a/tools/holidays.pl b/tools/holidays.pl
index 109aa7c..207439b 100755 (executable)
--- a/tools/holidays.pl
+++ b/tools/holidays.pl
@@ -16,15 +16,13 @@
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 #####Sets holiday periods for each branch. Datedues will be extended if branch is closed -TG
-use strict;
-use warnings;
+use Modern::Perl;
 
 use CGI qw ( -utf8 );
 
 use C4::Auth;
 use C4::Output;
 
-use C4::Branch; # GetBranches
 use C4::Calendar;
 use Koha::DateUtils;
 
@@ -43,7 +41,7 @@ my ($template, $loggedinuser, $cookie)
 
 # calendardate - date passed in url for human readability (syspref)
 # if the url has an invalid date default to 'now.'
-my $calendarinput_dt = eval { dt_from_string( $input->param('calendardate') ); } || dt_from_string;
+my $calendarinput_dt = eval { dt_from_string( scalar $input->param('calendardate') ); } || dt_from_string;
 my $calendardate = output_pref( { dt => $calendarinput_dt, dateonly => 1 } );
 
 # keydate - date passed to calendar.js.  calendar.js does not process dashes within a date.
@@ -51,30 +49,6 @@ my $keydate = output_pref( { dt => $calendarinput_dt, dateonly => 1, dateformat
 $keydate =~ s/-/\//g;
 
 my $branch= $input->param('branch') || C4::Context->userenv->{'branch'};
-# Set all the branches.
-my $onlymine =
-  (      C4::Context->preference('IndependentBranches')
-      && C4::Context->userenv
-      && !C4::Context->IsSuperLibrarian()
-      && C4::Context->userenv->{branch} ? 1 : 0 );
-if ( $onlymine ) { 
-    $branch = C4::Context->userenv->{'branch'};
-}
-my $branchname = GetBranchName($branch);
-my $branches   = GetBranches($onlymine);
-my @branchloop;
-for my $thisbranch (
-    sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} }
-    keys %{$branches} ) {
-    push @branchloop,
-      { value      => $thisbranch,
-        selected   => $thisbranch eq $branch,
-        branchname => $branches->{$thisbranch}->{'branchname'},
-      };
-}
-
-# branches calculated - put branch codes in a single string so they can be passed in a form
-my $branchcodes = join '|', keys %{$branches};
 
 # Get all the holidays
 
@@ -146,15 +120,11 @@ foreach my $yearMonthDay (keys %$single_holidays) {
 
 $template->param(
     WEEK_DAYS_LOOP           => \@week_days,
-    branchloop               => \@branchloop,
     HOLIDAYS_LOOP            => \@holidays,
     EXCEPTION_HOLIDAYS_LOOP  => \@exception_holidays,
     DAY_MONTH_HOLIDAYS_LOOP  => \@day_month_holidays,
     calendardate             => $calendardate,
     keydate                  => $keydate,
-    branchcodes              => $branchcodes,
-    branch                   => $branch,
-    branchname               => $branchname,
     branch                   => $branch,
 );