Fix authentication problem in previous commit; userenv->{} should not be used before...

[koha.git] / tools / holidays.pl

diff --git a/tools/holidays.pl b/tools/holidays.pl
index 7c79cf9..6cc26fa 100755 (executable)
--- a/tools/holidays.pl
+++ b/tools/holidays.pl
@@ -22,15 +22,11 @@ use CGI;
 use C4::Auth;
 use C4::Output;
 
-
+use C4::Branch; # GetBranches
 use C4::Calendar;
 
 my $input = new CGI;
 
-my $branch=C4::Context->preference('defaultbranch') || $input->param('branch');
-
-
-
 my $dbh = C4::Context->dbh();
 # Get the template to use
 my ($template, $loggedinuser, $cookie)
@@ -38,38 +34,32 @@ my ($template, $loggedinuser, $cookie)
                              type => "intranet",
                              query => $input,
                              authnotrequired => 0,
-                             flagsrequired => {tools => 1},
+                             flagsrequired => {tools => 'edit_calendar'},
                              debug => 1,
                            });
 
+my $branch= $input->param('branch') || C4::Context->userenv->{'branch'};
 # Set all the branches.
-my $branches = $dbh->prepare("select branchcode, branchname from branches");
-$branches->execute;
-# It creates a list of branches
-my %list;
-while (my ($branchcode, $branchname) = $branches->fetchrow) {
-    $list{$branchcode} = $branchname;
+my $onlymine=(C4::Context->preference('IndependantBranches') &&
+              C4::Context->userenv &&
+              C4::Context->userenv->{flags} !=1  &&
+              C4::Context->userenv->{branch}?1:0);
+if ( $onlymine ) { 
+    $branch = C4::Context->userenv->{'branch'};
 }
-my @listValues = keys(%list);
-if (!defined($branch)) {
-    $branch =$listValues[4];
+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;
 }
-my $branchesList = CGI::scrolling_list(-name => 'branch',
-                                       -values => \@listValues,
-                                       -labels => \%list,
-                                       -size => 1,
-                                       -default => [$branch],
-                                       -multiple => 0,
-                                       -id => "branch",
-                                       -onChange => "changeBranch()");
 
-$branches->finish;
 
-if ( C4::Context->preference("IndependantBranches") ) { 
-    $branch = C4::Context->userenv->{'branch'};
-}
 # Get all the holidays
- warn "BRANCH : $branch";
 
 my $calendar = C4::Calendar->new(branchcode => $branch);
 my $week_days_holidays = $calendar->get_week_days_holidays();
@@ -113,19 +103,13 @@ foreach my $yearMonthDay (keys %$single_holidays) {
     push @holidays, \%holiday;
 }
 
-# Replace the template values with the real ones
-# If we have independent branches on we need to only let the user set holidays for their branch
-if ( C4::Context->preference("IndependantBranches") ) { 
-       $template->param(BRANCHES => C4::Context->userenv->{'branchname'});             
-}
-else {
-       $template->param(BRANCHES => $branchesList);
-}
-$template->param(WEEK_DAYS_LOOP => \@week_days);
-$template->param(HOLIDAYS_LOOP => \@holidays);
-$template->param(EXCEPTION_HOLIDAYS_LOOP => \@exception_holidays);
-$template->param(DAY_MONTH_HOLIDAYS_LOOP => \@day_month_holidays);
-$template->param(branch => $branch);
+$template->param(WEEK_DAYS_LOOP => \@week_days,
+                               branchloop => \@branchloop, 
+                               HOLIDAYS_LOOP => \@holidays,
+                               EXCEPTION_HOLIDAYS_LOOP => \@exception_holidays,
+                               DAY_MONTH_HOLIDAYS_LOOP => \@day_month_holidays,
+                               branch => $branch
+       );
 
 # Shows the template with the real values replaced
 output_html_with_http_headers $input, $cookie, $template->output;