X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=tools%2FnewHolidays.pl;h=34469d85f98e545fbd2ac23ab0b01d97e683d471;hb=5429c5f497fe426b6905b5ef9693f4e42afff5d7;hp=e8fefe43b2b67b7030f778e7ff36b4cc721be4e6;hpb=5b41a8e2622f5e921b9061646f3155ce5352bfdc;p=koha.git

diff --git a/tools/newHolidays.pl b/tools/newHolidays.pl
index e8fefe43b2..34469d85f9 100755
--- a/tools/newHolidays.pl
+++ b/tools/newHolidays.pl
@@ -1,41 +1,84 @@
 #!/usr/bin/perl
 
 use strict;
+use warnings;
+
 use CGI;
 
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Calendar::Calendar;
+
+
+use C4::Calendar;
 
 my $input = new CGI;
 my $dbh = C4::Context->dbh();
 
 my $branchcode = $input->param('newBranchName');
+my $originalbranchcode = $branchcode;
 my $weekday = $input->param('newWeekday');
 my $day = $input->param('newDay');
 my $month = $input->param('newMonth');
 my $year = $input->param('newYear');
 my $title = $input->param('newTitle');
 my $description = $input->param('newDescription');
+my $newoperation = $input->param('newOperation');
+my $allbranches = $input->param('allBranches');
+
+my $calendardate = sprintf("%04d-%02d-%02d", $year, $month, $day);
+my $isodate = C4::Dates->new($calendardate, 'iso');
+$calendardate = $isodate->output('syspref');
+
+$title || ($title = '');
+if ($description) {
+	$description =~ s/\r/\\r/g;
+	$description =~ s/\n/\\n/g;
+} else {
+	$description = '';
+}
+
+if($allbranches) {
+	my $branch;
+	my @branchcodes = split(/\|/, $input->param('branchCodes')); 
+	foreach $branch (@branchcodes) {
+		add_holiday($newoperation, $branch, $weekday, $day, $month, $year, $title, $description);
+	}
+} else {
+	add_holiday($newoperation, $branchcode, $weekday, $day, $month, $year, $title, $description);
+}
+
+print $input->redirect("/cgi-bin/koha/tools/holidays.pl?branch=$originalbranchcode&calendardate=$calendardate");
 
-my $calendar = C4::Calendar::Calendar->new(branchcode => $branchcode);
+sub add_holiday {
+	($newoperation, $branchcode, $weekday, $day, $month, $year, $title, $description) = @_;  
+	my $calendar = C4::Calendar->new(branchcode => $branchcode);
 
-if ($input->param('newOperation') eq 'weekday') {
-	$calendar->insert_week_day_holiday(weekday => $weekday,
+	if ($newoperation eq 'weekday') {
+		unless ( $weekday && ($weekday ne '') ) { 
+			# was dow calculated by javascript?  original code implies it was supposed to be.
+			# if not, we need it.
+			$weekday = &Date::Calc::Day_of_Week($year, $month, $day) % 7 unless($weekday);
+		}
+		unless($calendar->isHoliday($day, $month, $year)) {
+			$calendar->insert_week_day_holiday(weekday => $weekday,
 							           title => $title,
 							           description => $description);
-} elsif ($input->param('newOperation') eq 'repeatable') {
-	$calendar->insert_day_month_holiday(day => $day,
+		}
+	} elsif ($newoperation eq 'repeatable') {
+		unless($calendar->isHoliday($day, $month, $year)) {
+			$calendar->insert_day_month_holiday(day => $day,
 	                                    month => $month,
 							            title => $title,
 							            description => $description);
-} elsif ($input->param('newOperation') eq 'holiday') {
-	$calendar->insert_single_holiday(day => $day,
+		}
+	} elsif ($newoperation eq 'holiday') {
+		unless($calendar->isHoliday($day, $month, $year)) {
+			$calendar->insert_single_holiday(day => $day,
 	                                 month => $month,
 						             year => $year,
 						             title => $title,
 						             description => $description);
+		}
 
+	}
 }
-print $input->redirect("/cgi-bin/koha/tools/holidays.pl?branch=$branchcode");
\ No newline at end of file