X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=tools%2Fholidays.pl;h=90ef56a987628fcdd2d56c40d8578885d65201e2;hb=8f21144fb154b68747d004eecca53fe84a020f22;hp=a6afcaa20c32adee7486a3e12caf35fe89cbe5d4;hpb=8ad2c7d7acc3cb0033426bd78928214a22ad9dd1;p=koha_gimpoz

diff --git a/tools/holidays.pl b/tools/holidays.pl
index a6afcaa20c..90ef56a987 100755
--- a/tools/holidays.pl
+++ b/tools/holidays.pl
@@ -64,18 +64,21 @@ my $onlymine=(C4::Context->preference('IndependantBranches') &&
 if ( $onlymine ) { 
     $branch = C4::Context->userenv->{'branch'};
 }
-my $branches = GetBranches($onlymine);
+my $branchname = GetBranchName($branch);
+my $branches   = GetBranches($onlymine);
 my @branchloop;
-for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
-    my $selected = 1 if $thisbranch eq $branch;
-    my %row =(value => $thisbranch,
-                selected => $selected,
-                branchname => $branches->{$thisbranch}->{'branchname'},
-            );
-    push @branchloop, \%row;
+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);
+my $branchcodes = join '|', keys %{$branches};
 
 # Get all the holidays
 
@@ -136,15 +139,16 @@ 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
-	);
+        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
+  );
 
 # Shows the template with the real values replaced
 output_html_with_http_headers $input, $cookie, $template->output;