1 |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm |
2 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm 2024-02-18 11:04:27.013707139 +0000 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm 2024-02-18 11:04:27.013707139 +0000 |
3 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm 2024-02-20 08:47:00.000000000 +0000 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm 2024-02-20 20:20:00.000000000 +0000 |
4 |
@@ -1,9 +1,9 @@ |
@@ -1,9 +1,9 @@ |
5 |
package SrvMngr::Controller::Backup; |
package SrvMngr::Controller::Backup; |
6 |
|
|
9 |
+# heading : System |
+# heading : System |
10 |
# description : Backup or restore |
# description : Backup or restore |
11 |
-# navigation : 4000 4200 |
-# navigation : 4000 4200 |
12 |
+# navigation : 5000 200 |
+# navigation : 4000 200 |
13 |
# Copyright (C) 2002 Mitel Networks Corporation |
# Copyright (C) 2002 Mitel Networks Corporation |
14 |
#---------------------------------------------------------------------- |
#---------------------------------------------------------------------- |
15 |
# routes : end |
# routes : end |
16 |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm |
17 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm 2021-06-21 10:25:10.000000000 +0100 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm 2021-06-21 10:25:10.000000000 +0100 |
18 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm 2024-02-20 10:02:00.000000000 +0000 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm 2024-02-20 20:21:00.000000000 +0000 |
19 |
@@ -1,9 +1,9 @@ |
@@ -1,9 +1,9 @@ |
20 |
package SrvMngr::Controller::Bugreport; |
package SrvMngr::Controller::Bugreport; |
21 |
|
|
24 |
+# heading : Investigation |
+# heading : Investigation |
25 |
# description : Report a bug |
# description : Report a bug |
26 |
-# navigation : 7000 7300 |
-# navigation : 7000 7300 |
27 |
+# navigation : 6000 500 |
+# navigation : 7000 500 |
28 |
|
|
29 |
# routes : end |
# routes : end |
30 |
#------------------------------ |
#------------------------------ |
31 |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Clamav.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Clamav.pm |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Clamav.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Clamav.pm |
32 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Clamav.pm 2020-11-19 07:53:26.000000000 +0000 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Clamav.pm 2020-11-19 07:53:26.000000000 +0000 |
33 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Clamav.pm 2024-02-20 08:47:00.000000000 +0000 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Clamav.pm 2024-02-20 20:20:00.000000000 +0000 |
34 |
@@ -1,9 +1,9 @@ |
@@ -1,9 +1,9 @@ |
35 |
package SrvMngr::Controller::Clamav; |
package SrvMngr::Controller::Clamav; |
36 |
|
|
39 |
+# heading : System |
+# heading : System |
40 |
# description : Antivirus (ClamAV) |
# description : Antivirus (ClamAV) |
41 |
-# navigation : 6000 6720 |
-# navigation : 6000 6720 |
42 |
+# navigation : 5000 600 |
+# navigation : 4000 600 |
43 |
# |
# |
44 |
# routes : end |
# routes : end |
45 |
#------------------------------ |
#------------------------------ |
46 |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm |
47 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm 2024-02-18 11:04:27.057708453 +0000 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm 2024-02-18 11:04:27.057708453 +0000 |
48 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm 2024-02-20 08:47:00.000000000 +0000 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm 2024-02-20 20:20:00.000000000 +0000 |
49 |
@@ -1,9 +1,9 @@ |
@@ -1,9 +1,9 @@ |
50 |
package SrvMngr::Controller::Datetime; |
package SrvMngr::Controller::Datetime; |
51 |
|
|
54 |
+# heading : System |
+# heading : System |
55 |
# description : Date and time |
# description : Date and time |
56 |
-# navigation : 6000 6100 |
-# navigation : 6000 6100 |
57 |
+# navigation : 5000 400 |
+# navigation : 4000 400 |
58 |
|
|
59 |
# routes : end |
# routes : end |
60 |
#------------------------------ |
#------------------------------ |
91 |
#---------------------------------------------------------------------- |
#---------------------------------------------------------------------- |
92 |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm |
93 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm 2021-06-21 10:25:10.000000000 +0100 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm 2021-06-21 10:25:10.000000000 +0100 |
94 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm 2024-02-20 08:47:00.000000000 +0000 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm 2024-02-20 20:20:00.000000000 +0000 |
95 |
@@ -1,9 +1,9 @@ |
@@ -1,9 +1,9 @@ |
96 |
package SrvMngr::Controller::Emailsettings; |
package SrvMngr::Controller::Emailsettings; |
97 |
|
|
100 |
+# heading : System |
+# heading : System |
101 |
# description : E-mail |
# description : E-mail |
102 |
-# navigation : 6000 6700 |
-# navigation : 6000 6700 |
103 |
+# navigation : 5000 500 |
+# navigation : 4000 500 |
104 |
# |
# |
105 |
# |
# |
106 |
# routes : end |
# routes : end |
136 |
# routes : end |
# routes : end |
137 |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm |
138 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm 2020-11-19 07:53:26.000000000 +0000 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm 2020-11-19 07:53:26.000000000 +0000 |
139 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm 2024-02-20 10:07:00.000000000 +0000 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm 2024-02-20 16:49:00.000000000 +0000 |
140 |
@@ -1,9 +1,9 @@ |
@@ -1,9 +1,9 @@ |
141 |
package SrvMngr::Controller::Ibays; |
package SrvMngr::Controller::Ibays; |
142 |
|
|
150 |
# |
# |
151 |
# |
# |
152 |
# routes : end |
# routes : end |
153 |
|
@@ -52,7 +52,7 @@ |
154 |
|
my $c = shift; |
155 |
|
|
156 |
|
my $rt = $c->current_route; |
157 |
|
- my $trt = ($c->param('trt') || 'ADD'); |
158 |
|
+ my $trt = ($c->param('trt') || 'LIST'); |
159 |
|
my $ibay = $c->param('ibay') || ''; |
160 |
|
|
161 |
|
#$trt = 'DEL' if ( $ibay ); |
162 |
|
@@ -78,42 +78,42 @@ |
163 |
|
|
164 |
|
if ( $trt eq 'UPD' ) { |
165 |
|
|
166 |
|
- my $rec = $adb->get($ibay); |
167 |
|
- if ($rec and $rec->prop('type') eq 'ibay') { |
168 |
|
- $iba_datas{ibay} = $ibay; |
169 |
|
- $iba_datas{description} = $rec->prop('Name') || ''; |
170 |
|
- $iba_datas{group} = $rec->prop('Group') || ''; |
171 |
|
- $iba_datas{userAccess} = $rec->prop('UserAccess') || ''; |
172 |
|
- $iba_datas{publicAccess} = $rec->prop('PublicAccess') || ''; |
173 |
|
- $iba_datas{CgiBin} = $rec->prop('CgiBin') || 'disabled'; |
174 |
|
- $iba_datas{SSL} = $rec->prop('SSL') || 'disabled'; |
175 |
|
- |
176 |
|
- } |
177 |
|
+ my $rec = $adb->get($ibay); |
178 |
|
+ if ($rec and $rec->prop('type') eq 'ibay') { |
179 |
|
+ $iba_datas{ibay} = $ibay; |
180 |
|
+ $iba_datas{description} = $rec->prop('Name') || ''; |
181 |
|
+ $iba_datas{group} = $rec->prop('Group') || ''; |
182 |
|
+ $iba_datas{userAccess} = $rec->prop('UserAccess') || ''; |
183 |
|
+ $iba_datas{publicAccess} = $rec->prop('PublicAccess') || ''; |
184 |
|
+ $iba_datas{CgiBin} = $rec->prop('CgiBin') || 'disabled'; |
185 |
|
+ $iba_datas{SSL} = $rec->prop('SSL') || 'disabled'; |
186 |
|
+ } |
187 |
|
} |
188 |
|
|
189 |
|
if ( $trt eq 'DEL' ) { |
190 |
|
|
191 |
|
- my $rec = $adb->get($ibay); |
192 |
|
- if ($rec and $rec->prop('type') eq 'ibay') { |
193 |
|
- $iba_datas{ibay} = $ibay; |
194 |
|
- $iba_datas{description} = $rec->prop('Name') || ''; |
195 |
|
- $modul .= print_vhost_message( $c, $ibay ); |
196 |
|
- } |
197 |
|
+ my $rec = $adb->get($ibay); |
198 |
|
+ if ($rec and $rec->prop('type') eq 'ibay') { |
199 |
|
+ $iba_datas{ibay} = $ibay; |
200 |
|
+ $iba_datas{description} = $rec->prop('Name') || ''; |
201 |
|
+ $modul .= print_vhost_message( $c, $ibay ); |
202 |
|
+ } |
203 |
|
|
204 |
|
} |
205 |
|
|
206 |
|
if ( $trt eq 'PWD' ) { |
207 |
|
|
208 |
|
- my $rec = $adb->get($ibay); |
209 |
|
- if ($rec and $rec->prop('type') eq 'ibay') { |
210 |
|
- $iba_datas{ibay} = $ibay; |
211 |
|
- $iba_datas{description} = $rec->prop('Name') || ''; |
212 |
|
- } |
213 |
|
+ my $rec = $adb->get($ibay); |
214 |
|
+ if ($rec and $rec->prop('type') eq 'ibay') { |
215 |
|
+ $iba_datas{ibay} = $ibay; |
216 |
|
+ $iba_datas{description} = $rec->prop('Name') || ''; |
217 |
|
+ } |
218 |
|
|
219 |
|
} |
220 |
|
|
221 |
|
if ( $trt eq 'LIST' ) { |
222 |
|
my @ibays; |
223 |
|
+ $adb = esmith::AccountsDB->open || die "Couldn't open accounts db"; |
224 |
|
if ($adb) |
225 |
|
{ |
226 |
|
@ibays = $adb->ibays(); |
227 |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Initial.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Initial.pm |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Initial.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Initial.pm |
228 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Initial.pm 2020-11-19 07:53:26.000000000 +0000 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Initial.pm 2020-11-19 07:53:26.000000000 +0000 |
229 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Initial.pm 2024-02-20 12:05:00.000000000 +0000 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Initial.pm 2024-02-20 12:05:00.000000000 +0000 |
322 |
#---------------------------------------------------------------------- |
#---------------------------------------------------------------------- |
323 |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm |
324 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm 2024-02-18 11:04:27.081709170 +0000 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm 2024-02-18 11:04:27.081709170 +0000 |
325 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm 2024-02-20 08:47:00.000000000 +0000 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm 2024-02-20 20:20:00.000000000 +0000 |
326 |
@@ -1,9 +1,9 @@ |
@@ -1,9 +1,9 @@ |
327 |
package SrvMngr::Controller::Printers; |
package SrvMngr::Controller::Printers; |
328 |
|
|
331 |
+# heading : System |
+# heading : System |
332 |
# description : Printers |
# description : Printers |
333 |
-# navigation : 6000 6400 |
-# navigation : 6000 6400 |
334 |
+# navigation : 5000 800 |
+# navigation : 4000 800 |
335 |
# |
# |
336 |
# |
# |
337 |
# routes : end |
# routes : end |
338 |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm |
339 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm 2020-11-19 07:53:26.000000000 +0000 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm 2020-11-19 07:53:26.000000000 +0000 |
340 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm 2024-02-20 08:47:00.000000000 +0000 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm 2024-02-20 20:20:00.000000000 +0000 |
341 |
@@ -1,9 +1,9 @@ |
@@ -1,9 +1,9 @@ |
342 |
package SrvMngr::Controller::Proxy; |
package SrvMngr::Controller::Proxy; |
343 |
|
|
346 |
+# heading : System |
+# heading : System |
347 |
# description : Proxy settings |
# description : Proxy settings |
348 |
-# navigation : 5000 5500 |
-# navigation : 5000 5500 |
349 |
+# navigation : 5000 700 |
+# navigation : 4000 700 |
350 |
#---------------------------------------------------------------------- |
#---------------------------------------------------------------------- |
351 |
# |
# |
352 |
# routes : end |
# routes : end |
367 |
# routes : end |
# routes : end |
368 |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Qmailanalog.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Qmailanalog.pm |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Qmailanalog.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Qmailanalog.pm |
369 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Qmailanalog.pm 2020-11-19 07:53:26.000000000 +0000 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Qmailanalog.pm 2020-11-19 07:53:26.000000000 +0000 |
370 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Qmailanalog.pm 2024-02-20 10:02:00.000000000 +0000 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Qmailanalog.pm 2024-02-20 20:21:00.000000000 +0000 |
371 |
@@ -1,9 +1,9 @@ |
@@ -1,9 +1,9 @@ |
372 |
package SrvMngr::Controller::Qmailanalog; |
package SrvMngr::Controller::Qmailanalog; |
373 |
|
|
376 |
+# heading : Investigation |
+# heading : Investigation |
377 |
# description : Mail log file analysis |
# description : Mail log file analysis |
378 |
-# navigation : 4000 4500 |
-# navigation : 4000 4500 |
379 |
+# navigation : 6000 200 |
+# navigation : 7000 200 |
380 |
# |
# |
381 |
# routes : end |
# routes : end |
382 |
#---------------------------------------------------------------------- |
#---------------------------------------------------------------------- |
404 |
+1 |
+1 |
405 |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm |
406 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm 2021-06-21 10:25:10.000000000 +0100 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm 2021-06-21 10:25:10.000000000 +0100 |
407 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm 2024-02-20 10:07:00.000000000 +0000 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm 2024-02-20 20:29:43.962492004 +0000 |
408 |
@@ -1,9 +1,9 @@ |
@@ -1,9 +1,9 @@ |
409 |
package SrvMngr::Controller::Reboot; |
package SrvMngr::Controller::Reboot; |
410 |
|
|
413 |
+# heading : System |
+# heading : System |
414 |
# description : Reboot or shutdown |
# description : Reboot or shutdown |
415 |
-# navigation : 4000 4700 |
-# navigation : 4000 4700 |
416 |
+# navigation : 6000 700 |
+# navigation : 4000 700 |
417 |
# |
# |
418 |
# routes : end |
# routes : end |
419 |
#---------------------------------------------------------------------- |
#---------------------------------------------------------------------- |
434 |
# routes : end |
# routes : end |
435 |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm |
436 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm 2024-02-18 11:04:27.007706960 +0000 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm 2024-02-18 11:04:27.007706960 +0000 |
437 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm 2024-02-20 10:02:00.000000000 +0000 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm 2024-02-20 20:21:00.000000000 +0000 |
438 |
@@ -1,11 +1,10 @@ |
@@ -1,11 +1,10 @@ |
439 |
package SrvMngr::Controller::Review; |
package SrvMngr::Controller::Review; |
440 |
|
|
443 |
+# heading : Investigation |
+# heading : Investigation |
444 |
# description : Review configuration |
# description : Review configuration |
445 |
-# navigation : 1000 1200 |
-# navigation : 1000 1200 |
446 |
+# navigation : 6000 400 |
+# navigation : 7000 400 |
447 |
# |
# |
448 |
-# menu : U |
-# menu : U |
449 |
# |
# |
475 |
+1; |
+1; |
476 |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm |
477 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm 2020-11-19 07:53:26.000000000 +0000 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm 2020-11-19 07:53:26.000000000 +0000 |
478 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm 2024-02-18 10:39:00.000000000 +0000 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm 2024-02-20 08:47:00.000000000 +0000 |
479 |
@@ -1,7 +1,7 @@ |
@@ -1,9 +1,9 @@ |
480 |
package SrvMngr::Controller::Useraccounts; |
package SrvMngr::Controller::Useraccounts; |
481 |
|
|
482 |
#---------------------------------------------------------------------- |
#---------------------------------------------------------------------- |
483 |
-# heading : Collaboration |
-# heading : Collaboration |
484 |
+# heading : User management |
+# heading : User management |
485 |
# description : Users |
# description : Users |
486 |
# navigation : 2000 2100 |
-# navigation : 2000 2100 |
487 |
|
+# navigation : 2000 100 |
488 |
#---------------------------------------------------------------------- |
#---------------------------------------------------------------------- |
489 |
|
# |
490 |
|
# routes : end |
491 |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm |
492 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm 2024-02-18 11:04:27.048708184 +0000 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm 2024-02-18 11:04:27.048708184 +0000 |
493 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm 2024-02-19 16:14:00.000000000 +0000 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm 2024-02-20 08:47:00.000000000 +0000 |
494 |
@@ -1,11 +1,10 @@ |
@@ -1,11 +1,10 @@ |
495 |
package SrvMngr::Controller::Userpassword; |
package SrvMngr::Controller::Userpassword; |
496 |
|
|
497 |
#---------------------------------------------------------------------- |
#---------------------------------------------------------------------- |
498 |
-# heading : None |
-# heading : None |
499 |
-# description : User password |
-# description : User password |
500 |
+# heading : Current User |
-# navigation : 1000 1250 |
|
+# description : Change password |
|
|
# navigation : 1000 1250 |
|
501 |
-# menu : U |
-# menu : U |
502 |
- |
- |
503 |
|
+# heading : Current User |
504 |
|
+# description : Change password |
505 |
|
+# navigation : 1000 250 |
506 |
+# |
+# |
507 |
# routes : end |
# routes : end |
508 |
#---------------------------------------------------------------------- |
#---------------------------------------------------------------------- |
509 |
|
|
|
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm |
|
|
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm 1970-01-01 01:00:00.000000000 +0100 |
|
|
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm 2024-02-20 10:02:00.000000000 +0000 |
|
|
@@ -0,0 +1,384 @@ |
|
|
+package SrvMngr::Controller::Uservacations; |
|
|
+#---------------------------------------------------------------------- |
|
|
+# heading : User management |
|
|
+# description : User vacations |
|
|
+# navigation : 6000 150 |
|
|
+# |
|
|
+# name : Uservacationsget, method : get, url : /uservacations, ctlact : Uservacations#main |
|
|
+# name : Uservacationspost,method : post, url : /Uservacations, ctlact : Uservacations#do_display |
|
|
+# name : Uservacations1, method : get, url : /Uservacations1, ctlact : Uservacations#do_display |
|
|
+# name : Uservacations2, method : post, url : /Uservacations2, ctlact : Uservacations#do_display |
|
|
+# routes : end |
|
|
+#---------------------------------------------------------------------- |
|
|
+ |
|
|
+use strict; |
|
|
+use warnings; |
|
|
+use Mojo::Base 'Mojolicious::Controller'; |
|
|
+ |
|
|
+#use DateTime; #Not part of SME10 mix |
|
|
+use POSIX; |
|
|
+ |
|
|
+use Locale::gettext; |
|
|
+use SrvMngr::I18N; |
|
|
+use SrvMngr qw(theme_list init_session); |
|
|
+ |
|
|
+use Data::Dumper; |
|
|
+use esmith::util; |
|
|
+use esmith::HostsDB; |
|
|
+use esmith::AccountsDB; |
|
|
+ |
|
|
+our $db = esmith::ConfigDB->open(); |
|
|
+our $adb = esmith::AccountsDB->open(); |
|
|
+ |
|
|
+our $PanelUser = $ENV{'REMOTE_USER'} ||''; |
|
|
+$PanelUser = $1 if ($PanelUser =~ /^([a-z][\.\-a-z0-9]*)$/); |
|
|
+ |
|
|
+our %delegatedVacations; |
|
|
+ |
|
|
+use constant FALSE => 0; |
|
|
+use constant TRUE => 1; |
|
|
+ |
|
|
+sub main { |
|
|
+ |
|
|
+ my $c = shift; |
|
|
+ $c->app->log->info( $c->log_req ); |
|
|
+ |
|
|
+ my %vac_datas = (); |
|
|
+ my $title = $c->l('vac_FORM_TITLE'); |
|
|
+ my $modul = ''; |
|
|
+ |
|
|
+ $vac_datas{trt} = 'LIST'; |
|
|
+ |
|
|
+ my @vacations = get_vacation_table($c); |
|
|
+ my $empty = (scalar @vacations == 0); |
|
|
+ |
|
|
+ $vac_datas{"first"} = 'vac_MODIFY_DESCRIPTION'; |
|
|
+ |
|
|
+ $c->stash( |
|
|
+ title => $title, |
|
|
+ modul => $modul, |
|
|
+ vac_datas => \%vac_datas, |
|
|
+ vacations =>\@vacations, |
|
|
+ empty => $empty |
|
|
+ ); |
|
|
+ $c->render( template => 'uservacations' ); |
|
|
+} |
|
|
+ |
|
|
+sub do_display { |
|
|
+ |
|
|
+ my $c = shift; |
|
|
+ $c->app->log->info( $c->log_req ); |
|
|
+ |
|
|
+ my $rt = $c->current_route; |
|
|
+ my $trt = ( $c->param('trt') || 'LIST' ); |
|
|
+ |
|
|
+ $trt = 'ADD' if ( $rt eq 'Uservacations1' ); |
|
|
+ $trt = 'ADD1' if ( $rt eq 'Uservacations2' ); |
|
|
+ |
|
|
+ my %vac_datas = (); |
|
|
+ my $title = $c->l('vac_FORM_TITLE'); |
|
|
+ my $modul = ''; |
|
|
+ |
|
|
+ |
|
|
+ if ( $trt eq 'ADD' ) { |
|
|
+ # Add or change a vacation message - called from the list panel |
|
|
+ # Get the data and pass it across. |
|
|
+ my $account = $c->param("account"); |
|
|
+ my $user = $adb->get($account); |
|
|
+ my $username = $user->prop("FirstName")." ".$user->prop("LastName"); |
|
|
+ my $EmailVacation = $user->prop('EmailVacation') || ''; |
|
|
+ my $EmailVacationFrom = $user->prop('EmailVacationFrom') || ''; |
|
|
+ my $EmailVacationTo = $user->prop('EmailVacationTo') || ''; |
|
|
+ my $VacText = get_vacation_text($c); |
|
|
+ $c->stash(account=>$account, |
|
|
+ username=>$username, |
|
|
+ EmailVacation=>$EmailVacation, |
|
|
+ EmailVacationFrom=>$EmailVacationFrom, |
|
|
+ EmailVacationTo=>$EmailVacationTo, |
|
|
+ VacText=>$VacText |
|
|
+ ); |
|
|
+ } |
|
|
+ |
|
|
+ if ( $trt eq 'ADD1' ) { |
|
|
+ #Add or edit vacation message. |
|
|
+ my $ret = add_vac_message($c); |
|
|
+ #Return to list page if success |
|
|
+ if ($ret eq "OK") { |
|
|
+ $trt = "LIST"; |
|
|
+ $vac_datas{success} = "vac_SUCCESS"; |
|
|
+ |
|
|
+ } else { |
|
|
+ my $account = $c->param("account"); |
|
|
+ my $user = $adb->get($account); |
|
|
+ my $username = $user->prop("FirstName")." ".$user->prop("LastName"); |
|
|
+ my $EmailVacationFrom = $c->param('EmailVacationFrom') || ''; |
|
|
+ my $EmailVacationTo = $c->param('EmailVacationTo') || ''; |
|
|
+ my $EmailVacation = $c->param('EmailVacation') || ''; |
|
|
+ my $VacText = $c->param("VacText"); |
|
|
+ $c->stash(account=>$account, |
|
|
+ username=>$username, |
|
|
+ EmailVacation=>$EmailVacation, |
|
|
+ EmailVacationFrom=>$EmailVacationFrom, |
|
|
+ EmailVacationTo=>$EmailVacationTo, |
|
|
+ VacText=>$VacText |
|
|
+ ); |
|
|
+ #Error - return to Add page |
|
|
+ $trt = "ADD"; |
|
|
+ $vac_datas{error} = $ret; |
|
|
+ } |
|
|
+ } |
|
|
+ |
|
|
+ if ( $trt eq 'LIST' ) { |
|
|
+ |
|
|
+ #List all the users and vacation message details. |
|
|
+ my @vacations = get_vacation_table($c); |
|
|
+ my $empty = (scalar @vacations == 0); |
|
|
+ $c->stash( |
|
|
+ empty => $empty, |
|
|
+ vacations =>\@vacations |
|
|
+ ); |
|
|
+ } |
|
|
+ |
|
|
+ |
|
|
+ $vac_datas{'trt'} = $trt; |
|
|
+ $c->stash( title => $title, modul => $modul, vac_datas => \%vac_datas ); |
|
|
+ $c->render( template => 'uservacations' ); |
|
|
+} |
|
|
+ |
|
|
+sub user_accounts_exist |
|
|
+{ |
|
|
+ my $q = shift; |
|
|
+ #return scalar $adb->users; |
|
|
+ if (scalar $adb->users) |
|
|
+ { return $q->l('vac_DESCRIPTION'); } |
|
|
+} |
|
|
+ |
|
|
+sub get_vacation_table |
|
|
+{ |
|
|
+ my $self = shift; |
|
|
+ |
|
|
+#We want to retrieve granted group from DB, and retrieve users of groups |
|
|
+ my $record = $adb->get($PanelUser); |
|
|
+ my $dg; |
|
|
+ if ($record) {$dg=$record->prop('delegatedVacations')||'';} |
|
|
+ else {$dg = '';} |
|
|
+ $dg =~ s/ //g; |
|
|
+ my @g = split(/,/, $dg); |
|
|
+ my @visiblemembers = (); |
|
|
+ |
|
|
+ foreach my $g (@g) { |
|
|
+ my $members = $adb->get_prop("$g",'Members'); |
|
|
+ next unless defined $members; |
|
|
+ $members =~ s/ //g; |
|
|
+ my @members = split(/,/, $members); |
|
|
+ push @visiblemembers , @members ; |
|
|
+ } |
|
|
+ |
|
|
+ foreach my $k ( @visiblemembers ) |
|
|
+ { |
|
|
+ $delegatedVacations{$k}=1; |
|
|
+ } |
|
|
+ |
|
|
+ |
|
|
+ my @users = $adb->users; |
|
|
+ return () if (@users == 0); ##$self->l("ACCOUNT_USER_NONE") |
|
|
+ return () if (@visiblemembers == 0 && $dg ne '');#; #$self->l("NO_USERS_IN_GRANTED_GROUPS") |
|
|
+ |
|
|
+ my @data = (); |
|
|
+ |
|
|
+ for my $user (@users) |
|
|
+ { |
|
|
+ next if %delegatedVacations and not $delegatedVacations{$user->key}; |
|
|
+ # make it clearer which uses have vacation |
|
|
+ my $EmailVacation = $user->prop('EmailVacation') || ''; |
|
|
+ my $EmailVacationFrom = $user->prop('EmailVacationFrom') || ''; |
|
|
+ my $EmailVacationTo = $user->prop('EmailVacationTo') || ''; |
|
|
+ my $status = $user->prop('EmailVacation') || ''; |
|
|
+ if ($status eq 'yes') { $status = 'YES'; } else { $status = ''; } |
|
|
+ |
|
|
+ push @data, |
|
|
+ { User => $user->key, |
|
|
+ FullName => $user->prop('FirstName') . " " .$user->prop('LastName'), |
|
|
+ status => $self->l($status), |
|
|
+ EmailVacation => $EmailVacation, |
|
|
+ EmailVacationFrom => showDate($EmailVacationFrom), |
|
|
+ EmailVacationTo => showDate($EmailVacationTo), |
|
|
+ Modify => $self->l('vac_MODIFY'), |
|
|
+ } |
|
|
+ } |
|
|
+ return @data; |
|
|
+} |
|
|
+ |
|
|
+sub showDate |
|
|
+{ |
|
|
+ my $strDate = shift; |
|
|
+ my ($Year,$Month,$Day) = ($strDate =~ /(\d{4})(\d{2})(\d{2})/); |
|
|
+ #my $Unix = mktime(0,0,0,$Day,$Month,$Year); |
|
|
+ return "$Year-$Month-$Day"; |
|
|
+} |
|
|
+ |
|
|
+ |
|
|
+sub modify_link |
|
|
+{ |
|
|
+ my ($data_item, $row, $field) = @_; |
|
|
+ |
|
|
+ return "uservacations?" . |
|
|
+ join("&", |
|
|
+ "page=0", |
|
|
+ "page_stack=", |
|
|
+ "Next=Next", |
|
|
+ "User=" . $row->{User}, |
|
|
+ "FullName=" . $row->{FullName}, |
|
|
+ "EmailVacation=" . $row->{EmailVacation}, |
|
|
+ "EmailVacationFrom=" . $row->{EmailVacationFrom}, |
|
|
+ "EmailVacationTo=" . $row->{EmailVacationTo}, |
|
|
+ "wherenext=VACATION_PAGE_MODIFY"); |
|
|
+} |
|
|
+ |
|
|
+# this formats the text to display on screen |
|
|
+sub get_vacation_text |
|
|
+{ |
|
|
+ my $q = shift; |
|
|
+ my $domain = $db->get_value('DomainName'); |
|
|
+ my $user = $q->param('account'); |
|
|
+ |
|
|
+ my $fullname = $adb->get_prop($user, "FirstName") . " " . |
|
|
+ $adb->get_prop($user, "LastName"); |
|
|
+ |
|
|
+ my $vfile = "/home/e-smith/files/users/$user/.vacation.msg"; |
|
|
+ |
|
|
+ my $from = $q->l('vac_FROM'); |
|
|
+ my $Subject = $q->l('vac_SUBJECT'); |
|
|
+ my $away = $q->l('vac_AWAY_FROM_MAIL'); |
|
|
+ my $return = $q->l('vac_ANSWER_TO_OBJECT_SENDER'); |
|
|
+ |
|
|
+ #my $ExistingMessage = "$from $fullname <\;$user\@$domain>\;\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 )) |
|
|
+ { |
|
|
+ open (VACATION, "<$vfile") |
|
|
+ or die "Error: Could not open file: $vfile\n"; |
|
|
+ my @vacationTemp; |
|
|
+ |
|
|
+ #reformat so email address isn't hidden inside < > |
|
|
+ while (<VACATION>) |
|
|
+ { |
|
|
+ $_ =~ s/</<\;/; |
|
|
+ $_ =~ s/>/>\;/; |
|
|
+ push (@vacationTemp, $_); |
|
|
+ } |
|
|
+ |
|
|
+ $ExistingMessage = join ("", @vacationTemp); |
|
|
+ |
|
|
+ close VACATION; |
|
|
+ } |
|
|
+ return $ExistingMessage; |
|
|
+} |
|
|
+ |
|
|
+# saves the text to .vacation.msg |
|
|
+sub add_vac_message |
|
|
+{ |
|
|
+ my $q = shift; |
|
|
+ |
|
|
+ my $domain = $db->get_value('DomainName'); |
|
|
+ my $user = $q->param('account'); |
|
|
+ |
|
|
+ my $EmailVacation = $q->param('EmailVacation')||"no"; |
|
|
+ #die($EmailVacation); |
|
|
+ #if ($EmailVacation eq "yes") {$EmailVacation = "yes";} else {$EmailVacation = "no";} |
|
|
+ |
|
|
+ #Decode To and FROM to standard format - comes over in html5 iso format yyyy-mm-dd |
|
|
+ my $EmailVacationFrom = trim($q->param('EmailVacationFrom')); |
|
|
+ my ($fromYear,$fromMonth,$fromDay) = ($EmailVacationFrom =~ /(\d{4})-(\d{2})-(\d{2})/); |
|
|
+ $EmailVacationFrom = $fromYear.$fromMonth.$fromDay; |
|
|
+ if ($EmailVacationFrom !~ m/^2[0-9]{3}[0|1][0-9][0-3][0-9]$/ and $EmailVacationFrom ne "") {return "vac_FROM_DATE_INCORRECT";} |
|
|
+ my $EmailVacationTo = trim($q->param('EmailVacationTo')); |
|
|
+ my ($toYear,$toMonth,$toDay) = ($EmailVacationTo =~ /(\d{4})-(\d{2})-(\d{2})/); |
|
|
+ $EmailVacationTo = $toYear.$toMonth.$toDay; |
|
|
+# $EmailVacationTo =~ s/-//g; #Just take out "-". |
|
|
+ if ($EmailVacationTo !~ m/^2[0-9]{3}[0|1][0-9][0-3][0-9]$/ and $EmailVacationFrom ne "") {return "vac_TO_DATE_INCORRECT";} |
|
|
+ #Check not the same or From follows To. |
|
|
+ if ($EmailVacationTo ne "" and $EmailVacationTo eq $EmailVacationFrom) {return "vac_DATES_THE_SAME";} |
|
|
+ my $UnixFrom = mktime(0,0,0,$fromDay,$fromMonth,$fromYear); |
|
|
+ my $UnixTo = mktime(0,0,0,$toDay,$toMonth,$toYear); |
|
|
+ if ($UnixTo < $UnixFrom) {return "vac_TO_DATE_MUST_BE_LATER";} |
|
|
+ |
|
|
+ |
|
|
+ my $new_message = $q->param('VacText'); |
|
|
+ my $vfile = "/home/e-smith/files/users/$user/.vacation.msg"; |
|
|
+ |
|
|
+ my $fullname = $adb->get_prop($user, "FirstName") . " " . |
|
|
+ $adb->get_prop($user, "LastName"); |
|
|
+ |
|
|
+ my $from = 'From:'; |
|
|
+ my $away = $q->l('vac_AWAY_FROM_MAIL'); |
|
|
+ my $return = $q->l('vac_ANSWER_TO_OBJECT_SENDER'); |
|
|
+ |
|
|
+ my $vacation_text = "$from $fullname \<$user\@$domain\>\n"."Subject: $return\n". |
|
|
+ "\n$away \n"."\n--\n$fullname"; |
|
|
+ |
|
|
+ my $reset = $vacation_text; |
|
|
+ |
|
|
+ # if exists and is not empty |
|
|
+ if (( -e $vfile ) && (! -z $vfile )) |
|
|
+ { |
|
|
+ open (VACATION, "<$vfile") |
|
|
+ or die "Error: Could not open file: $vfile\n"; |
|
|
+ my @vacationTemp = <VACATION>; |
|
|
+ $vacation_text = join ("", @vacationTemp); |
|
|
+ |
|
|
+ close VACATION; |
|
|
+ } |
|
|
+ |
|
|
+ chomp $new_message; |
|
|
+ |
|
|
+ # reset msg to default, |
|
|
+ if ($new_message =~ /reset/) |
|
|
+ { $vacation_text = $reset; } |
|
|
+ else |
|
|
+ { |
|
|
+ #or save new_message |
|
|
+ unless ($new_message eq "") |
|
|
+ { $vacation_text = $new_message; } |
|
|
+ } |
|
|
+ |
|
|
+ # Strip out DOS Carriage Returns (CR) |
|
|
+ $vacation_text =~ s/\r//g; |
|
|
+ |
|
|
+ unlink $vfile; |
|
|
+ open (VACATION, ">$vfile") |
|
|
+ or die ("Error opening vacation message.\n"); |
|
|
+ |
|
|
+ print VACATION "$vacation_text"; |
|
|
+ close VACATION; |
|
|
+ |
|
|
+ esmith::util::chownFile($user, $user, |
|
|
+ "/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 |
|
|
+ system ("/etc/e-smith/events/actions/qmail-update-user event $user") == 0 |
|
|
+ or die ("Error occurred updating .qmail\n"); |
|
|
+ |
|
|
+ if (($EmailVacation eq 'no') && ( -e "/home/e-smith/files/users/$user/.vacation")) |
|
|
+ { |
|
|
+ system ("/bin/rm /home/e-smith/files/users/$user/.vacation") == 0 |
|
|
+ or die ("Error resetting vacation db.\n"); |
|
|
+ } |
|
|
+ |
|
|
+ return "OK"; |
|
|
+} |
|
|
+ |
|
|
+sub trim { my $s = shift; $s =~ s/^\s+|\s+$//g; return $s }; |
|
|
+ |
|
|
+1; |
|
510 |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm |
511 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm 2021-06-21 10:25:10.000000000 +0100 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm 2021-06-21 10:25:10.000000000 +0100 |
512 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm 2024-02-20 10:02:00.000000000 +0000 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm 2024-02-20 20:21:00.000000000 +0000 |
513 |
@@ -1,9 +1,9 @@ |
@@ -1,9 +1,9 @@ |
514 |
package SrvMngr::Controller::Viewlogfiles; |
package SrvMngr::Controller::Viewlogfiles; |
515 |
|
|
518 |
+# heading : Investigation |
+# heading : Investigation |
519 |
# description : View log files |
# description : View log files |
520 |
-# navigation : 4000 4400 |
-# navigation : 4000 4400 |
521 |
+# navigation : 6000 100 |
+# navigation : 7000 100 |
522 |
# |
# |
523 |
# |
# |
524 |
# routes : end |
# routes : end |
540 |
#---------------------------------------------------------------------- |
#---------------------------------------------------------------------- |
541 |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm |
542 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm 2024-02-18 11:04:27.067708751 +0000 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm 2024-02-18 11:04:27.067708751 +0000 |
543 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm 2024-02-19 16:34:00.000000000 +0000 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm 2024-02-20 20:20:00.000000000 +0000 |
544 |
@@ -1,9 +1,9 @@ |
@@ -1,9 +1,9 @@ |
545 |
package SrvMngr::Controller::Yum; |
package SrvMngr::Controller::Yum; |
546 |
|
|
549 |
+# heading : System |
+# heading : System |
550 |
# description : Software installer |
# description : Software installer |
551 |
-# navigation : 4000 4200 |
-# navigation : 4000 4200 |
552 |
+# navigation : 5000 5300 |
+# navigation : 4000 5300 |
553 |
# |
# |
554 |
# routes : end |
# routes : end |
555 |
#---------------------------------------------------------------------- |
#---------------------------------------------------------------------- |