smeserver-vacation/contribs10/smeserver-vacation-1.1-Sort-out-html-chars-in-email-template.patch

diff -urN smeserver-vacation-1.1.old/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm smeserver-vacation-1.1/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm
--- smeserver-vacation-1.1.old/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm  2024-02-16 13:40:32.243267567 +0000
+++ smeserver-vacation-1.1/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm      2024-02-16 12:16:00.000000000 +0000
@@ -252,9 +252,13 @@
     my $away = $q->l('vac_AWAY_FROM_MAIL');
     my $return = $q->l('vac_ANSWER_TO_OBJECT_SENDER');
 
-    my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n"."$Subject $return\n".
+    #my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n"."$Subject $return\n".
+    #                      "\n$away\n"."\n--\n$fullname";
+
+    my $ExistingMessage = "$from $fullname \<$user\@$domain\>\n"."$Subject $return\n".
                           "\n$away\n"."\n--\n$fullname";
 
+
     # if exists and is not empty
     if (( -e $vfile ) && (! -z $vfile ))
     {
diff -urN smeserver-vacation-1.1.old/root/usr/share/smanager/themes/default/templates/partials/_vac_add.html.ep smeserver-vacation-1.1/root/usr/share/smanager/themes/default/templates/partials/_vac_add.html.ep
--- smeserver-vacation-1.1.old/root/usr/share/smanager/themes/default/templates/partials/_vac_add.html.ep       2024-02-16 13:40:32.268268257 +0000
+++ smeserver-vacation-1.1/root/usr/share/smanager/themes/default/templates/partials/_vac_add.html.ep   2024-02-16 15:49:00.000000000 +0000
@@ -36,7 +36,8 @@
                        <span class=label>
                                %=l 'vac_MESSAGE'
                        </span>
-                       <span class=data>
+                       <span class=data>               
+                               % $VacText = b("$VacText");     
                                %=text_area 'VacText' => $VacText, cols=>40, rows=>15
                        </span><br>
                        <span class=label>
diff -urN smeserver-vacation-1.1.old/root/usr/share/smanager/themes/default/templates/partials/_vac_list.html.ep smeserver-vacation-1.1/root/usr/share/smanager/themes/default/templates/partials/_vac_list.html.ep
--- smeserver-vacation-1.1.old/root/usr/share/smanager/themes/default/templates/partials/_vac_list.html.ep      2024-02-16 13:40:32.245267623 +0000
+++ smeserver-vacation-1.1/root/usr/share/smanager/themes/default/templates/partials/_vac_list.html.ep  2024-02-16 13:38:00.000000000 +0000
@@ -9,7 +9,7 @@
             <br>
                        %=l 'vac_NO_FORWARDS'
     %  } else {
-               <table class="sme-border"><tbody>
+               <table class="sme-border TableSort"><thead>
                <tr>
                        <th class='sme-border'>
                                %=l 'ACCOUNT'
@@ -31,6 +31,7 @@
                                %=l 'ACTION'
                        </th>
                </tr>
+               </thead><tbody>
         % foreach my $vacation (@$vacations) {
         <tr>
                        %= t td => (class => 'sme-border') => $vacation->{"User"}
1	brianr	1.1	diff -urN smeserver-vacation-1.1.old/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm smeserver-vacation-1.1/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm
2			--- smeserver-vacation-1.1.old/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm 2024-02-16 13:40:32.243267567 +0000
3			+++ smeserver-vacation-1.1/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm 2024-02-16 12:16:00.000000000 +0000
4			@@ -252,9 +252,13 @@
5			my $away = $q->l('vac_AWAY_FROM_MAIL');
6			my $return = $q->l('vac_ANSWER_TO_OBJECT_SENDER');
7
8			- my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n"."$Subject $return\n".
9			+ #my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n"."$Subject $return\n".
10			+ # "\n$away\n"."\n--\n$fullname";
11			+
12			+ my $ExistingMessage = "$from $fullname \<$user\@$domain\>\n"."$Subject $return\n".
13			"\n$away\n"."\n--\n$fullname";
14
15			+
16			# if exists and is not empty
17			if (( -e $vfile ) && (! -z $vfile ))
18			{
19			diff -urN smeserver-vacation-1.1.old/root/usr/share/smanager/themes/default/templates/partials/_vac_add.html.ep smeserver-vacation-1.1/root/usr/share/smanager/themes/default/templates/partials/_vac_add.html.ep
20			--- smeserver-vacation-1.1.old/root/usr/share/smanager/themes/default/templates/partials/_vac_add.html.ep 2024-02-16 13:40:32.268268257 +0000
21			+++ smeserver-vacation-1.1/root/usr/share/smanager/themes/default/templates/partials/_vac_add.html.ep 2024-02-16 15:49:00.000000000 +0000
22			@@ -36,7 +36,8 @@
23			<span class=label>
24			%=l 'vac_MESSAGE'
25			</span>
26			- <span class=data>
27			+ <span class=data>
28			+ % $VacText = b("$VacText");
29			%=text_area 'VacText' => $VacText, cols=>40, rows=>15
30			</span><br>
31			<span class=label>
32			diff -urN smeserver-vacation-1.1.old/root/usr/share/smanager/themes/default/templates/partials/_vac_list.html.ep smeserver-vacation-1.1/root/usr/share/smanager/themes/default/templates/partials/_vac_list.html.ep
33			--- smeserver-vacation-1.1.old/root/usr/share/smanager/themes/default/templates/partials/_vac_list.html.ep 2024-02-16 13:40:32.245267623 +0000
34			+++ smeserver-vacation-1.1/root/usr/share/smanager/themes/default/templates/partials/_vac_list.html.ep 2024-02-16 13:38:00.000000000 +0000
35			@@ -9,7 +9,7 @@
36			<br>
37			%=l 'vac_NO_FORWARDS'
38			% } else {
39			- <table class="sme-border"><tbody>
40			+ <table class="sme-border TableSort"><thead>
41			<tr>
42			<th class='sme-border'>
43			%=l 'ACCOUNT'
44			@@ -31,6 +31,7 @@
45			%=l 'ACTION'
46			</th>
47			</tr>
48			+ </thead><tbody>
49			% foreach my $vacation (@$vacations) {
50			<tr>
51			%= t td => (class => 'sme-border') => $vacation->{"User"}