[Koha-cvs] koha/holidays exceptionHolidays.pl newHolidays.pl [dev_week]

[Ryan Higgins]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Ryan Higgins <rych>     07/01/25 02:32:01

Modified files:
        holidays       : exceptionHolidays.pl newHolidays.pl 

Log message:
        sync rel_3 - fix char escaping

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/holidays/exceptionHolidays.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/holidays/newHolidays.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.2

Patches:
Index: exceptionHolidays.pl
===================================================================
RCS file: /sources/koha/koha/holidays/Attic/exceptionHolidays.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- exceptionHolidays.pl        12 Jul 2006 11:20:39 -0000      1.1.2.1
+++ exceptionHolidays.pl        25 Jan 2007 02:32:01 -0000      1.1.2.2
@@ -6,8 +6,8 @@
 use C4::Auth;
 use C4::Output;
 use C4::Interface::CGI::Output;
-use C4::Database;
-use HTML::Template;
+#use C4::Database;
+#use HTML::Template;
 use C4::Calendar::Calendar;
 
 my $input = new CGI;
@@ -23,6 +23,14 @@
 
 my $calendar = C4::Calendar::Calendar->new(branchcode => $branchcode);
 
+$title || ($title = '');
+if ($description) {
+    $description =~ s/\r/\\r/g;
+    $description =~ s/\n/\\n/g;
+} else {
+    $description = '';
+}   
+
 if ($input->param('showOperation') eq 'exception') {
        $calendar->insert_exception_holiday(day => $day,
                                                                                
month => $month,

Index: newHolidays.pl
===================================================================
RCS file: /sources/koha/koha/holidays/Attic/newHolidays.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- newHolidays.pl      12 Jul 2006 11:20:39 -0000      1.1.2.1
+++ newHolidays.pl      25 Jan 2007 02:32:01 -0000      1.1.2.2
@@ -6,8 +6,8 @@
 use C4::Auth;
 use C4::Output;
 use C4::Interface::CGI::Output;
-use C4::Database;
-use HTML::Template;
+#use C4::Database;
+#use HTML::Template;
 use C4::Calendar::Calendar;
 
 my $input = new CGI;
@@ -23,6 +23,14 @@
 
 my $calendar = C4::Calendar::Calendar->new(branchcode => $branchcode);
 
+$title || ($title = '');
+if ($description) {
+    $description =~ s/\r/\\r/g;
+    $description =~ s/\n/\\n/g;
+} else {
+    $description = '';
+}   
+
 if ($input->param('newOperation') eq 'weekday') {
        $calendar->insert_week_day_holiday(weekday => $weekday,
                                                                   title => 
$title,