smeserver-vacation/contribs10/smeserver-vacation-1.1.auto_enable_disable_vacation_userpanel.patch

diff -Nur smeserver-vacation-1.1.old/root/etc/e-smith/web/functions/userpanel-vacation smeserver-vacation-1.1.new/root/etc/e-smith/web/functions/userpanel-vacation
--- smeserver-vacation-1.1.old/root/etc/e-smith/web/functions/userpanel-vacation        2013-11-13 11:39:48.000000000 +0100
+++ smeserver-vacation-1.1.new/root/etc/e-smith/web/functions/userpanel-vacation        2016-06-21 10:25:07.621311057 +0200
@@ -48,6 +48,14 @@
             <label>USER_NAME</label>
         </field>
 
+       <field type="text" id="EmailVacationFrom" value="get_vacation_date_from()">
+               <label>VACATION_FROM</label>
+       </field>
+
+       <field type="text" id="EmailVacationTo" value="get_vacation_date_to()">
+               <label>VACATION_TO</label>
+       </field>
+
         <subroutine src="userpanel_get_vacation_text()" />
         
         <field
diff -Nur smeserver-vacation-1.1.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/uservacations.pm smeserver-vacation-1.1.new/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/uservacations.pm
--- smeserver-vacation-1.1.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/uservacations.pm        2016-06-21 09:58:59.710887388 +0200
+++ smeserver-vacation-1.1.new/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/uservacations.pm        2016-06-21 10:26:48.588273957 +0200
@@ -343,6 +343,8 @@
 
     my $EmailVacation  = $q->param('EmailVacation');
     my $new_message    = $q->param('new_message');
+    my $EmailVacationFrom = $q->param('EmailVacationFrom');
+    my $EmailVacationTo = $q->param('EmailVacationTo');
     my $vfile = "/home/e-smith/files/users/$user/.vacation.msg";
 
     my $fullname    = $adb->get_prop($user, "FirstName") . " " .
@@ -393,6 +395,8 @@
     "/home/e-smith/files/users/$user/.vacation.msg");
 
     $adb->set_prop($user, 'EmailVacation', $EmailVacation);
+    $adb->set_prop($user, 'EmailVacationFrom', $EmailVacationFrom);
+    $adb->set_prop($user, 'EmailVacationTo', $EmailVacationTo);
 
     #the first is more correct but is slower
     #system ("/sbin/e-smith/signal-event", "email-update", $user) == 0
1	brianr	1.1	diff -Nur smeserver-vacation-1.1.old/root/etc/e-smith/web/functions/userpanel-vacation smeserver-vacation-1.1.new/root/etc/e-smith/web/functions/userpanel-vacation
2			--- smeserver-vacation-1.1.old/root/etc/e-smith/web/functions/userpanel-vacation 2013-11-13 11:39:48.000000000 +0100
3			+++ smeserver-vacation-1.1.new/root/etc/e-smith/web/functions/userpanel-vacation 2016-06-21 10:25:07.621311057 +0200
4			@@ -48,6 +48,14 @@
5			<label>USER_NAME</label>
6			</field>
7
8			+ <field type="text" id="EmailVacationFrom" value="get_vacation_date_from()">
9			+ <label>VACATION_FROM</label>
10			+ </field>
11			+
12			+ <field type="text" id="EmailVacationTo" value="get_vacation_date_to()">
13			+ <label>VACATION_TO</label>
14			+ </field>
15			+
16			<subroutine src="userpanel_get_vacation_text()" />
17
18			<field
19			diff -Nur smeserver-vacation-1.1.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/uservacations.pm smeserver-vacation-1.1.new/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/uservacations.pm
20			--- smeserver-vacation-1.1.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/uservacations.pm 2016-06-21 09:58:59.710887388 +0200
21			+++ smeserver-vacation-1.1.new/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/uservacations.pm 2016-06-21 10:26:48.588273957 +0200
22			@@ -343,6 +343,8 @@
23
24			my $EmailVacation = $q->param('EmailVacation');
25			my $new_message = $q->param('new_message');
26			+ my $EmailVacationFrom = $q->param('EmailVacationFrom');
27			+ my $EmailVacationTo = $q->param('EmailVacationTo');
28			my $vfile = "/home/e-smith/files/users/$user/.vacation.msg";
29
30			my $fullname = $adb->get_prop($user, "FirstName") . " " .
31			@@ -393,6 +395,8 @@
32			"/home/e-smith/files/users/$user/.vacation.msg");
33
34			$adb->set_prop($user, 'EmailVacation', $EmailVacation);
35			+ $adb->set_prop($user, 'EmailVacationFrom', $EmailVacationFrom);
36			+ $adb->set_prop($user, 'EmailVacationTo', $EmailVacationTo);
37
38			#the first is more correct but is slower
39			#system ("/sbin/e-smith/signal-event", "email-update", $user) == 0