/[smeserver]/rpms/smeserver-manager/sme10/smeserver-manager-0.1.4-Re-organise-menus.patch
ViewVC logotype

Annotation of /rpms/smeserver-manager/sme10/smeserver-manager-0.1.4-Re-organise-menus.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (hide annotations) (download)
Sun Feb 18 11:13:12 2024 UTC (8 months, 3 weeks ago) by brianr
Branch: MAIN 
* Sun Feb 18 2024 Brian Read <brianr@koozali.org> 0.1.4-27.sme
- Re-arrange Menu [SME: 12476]
1 brianr 1.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
2     --- 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-18 11:02:00.000000000 +0000
4     @@ -1,7 +1,7 @@
5     package SrvMngr::Controller::Backup;
6    
7     #----------------------------------------------------------------------
8     -# heading : Administration
9     +# heading : System
10     # description : Backup or restore
11     # navigation : 4000 4200
12     # Copyright (C) 2002 Mitel Networks Corporation
13     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
14     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm 2021-06-21 10:25:10.000000000 +0100
15     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Bugreport.pm 2024-02-18 11:02:00.000000000 +0000
16     @@ -1,7 +1,7 @@
17     package SrvMngr::Controller::Bugreport;
18    
19     #----------------------------------------------------------------------
20     -# heading : Miscellaneous
21     +# heading : Investigation
22     # description : Report a bug
23     # navigation : 7000 7300
24    
25     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
26     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Clamav.pm 2020-11-19 07:53:26.000000000 +0000
27     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Clamav.pm 2024-02-18 11:02:00.000000000 +0000
28     @@ -1,7 +1,7 @@
29     package SrvMngr::Controller::Clamav;
30    
31     #----------------------------------------------------------------------
32     -# heading : Configuration
33     +# heading : System
34     # description : Antivirus (ClamAV)
35     # navigation : 6000 6720
36     #
37     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
38     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm 2024-02-18 11:04:27.057708453 +0000
39     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Datetime.pm 2024-02-18 11:02:00.000000000 +0000
40     @@ -1,7 +1,7 @@
41     package SrvMngr::Controller::Datetime;
42    
43     #----------------------------------------------------------------------
44     -# heading : Configuration
45     +# heading : System
46     # description : Date and time
47     # navigation : 6000 6100
48    
49     diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Directory.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Directory.pm
50     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Directory.pm 2020-11-19 07:53:26.000000000 +0000
51     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Directory.pm 2024-02-18 10:42:00.000000000 +0000
52     @@ -1,7 +1,7 @@
53     package SrvMngr::Controller::Directory;
54    
55     #----------------------------------------------------------------------
56     -# heading : Configuration
57     +# heading : User management
58     # description : Directory
59     # navigation : 6000 6300
60     #
61     diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Domains.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Domains.pm
62     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Domains.pm 2020-11-19 07:53:26.000000000 +0000
63     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Domains.pm 2024-02-18 10:50:00.000000000 +0000
64     @@ -1,9 +1,9 @@
65     package SrvMngr::Controller::Domains;
66    
67     #----------------------------------------------------------------------
68     -# heading : Configuration
69     +# heading : Network
70     # description : DOMAINS
71     -# navigation : 6000 6600
72     +# navigation : 5000 5300
73     #
74     # routes : end
75     #----------------------------------------------------------------------
76     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
77     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm 2021-06-21 10:25:10.000000000 +0100
78     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Emailsettings.pm 2024-02-18 11:02:00.000000000 +0000
79     @@ -1,7 +1,7 @@
80     package SrvMngr::Controller::Emailsettings;
81    
82     #----------------------------------------------------------------------
83     -# heading : Configuration
84     +# heading : System
85     # description : E-mail
86     # navigation : 6000 6700
87     #
88     diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm
89     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm 2020-11-19 07:53:26.000000000 +0000
90     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Groups.pm 2024-02-18 10:42:00.000000000 +0000
91     @@ -1,7 +1,7 @@
92     package SrvMngr::Controller::Groups;
93    
94     #----------------------------------------------------------------------
95     -# heading : Collaboration
96     +# heading : User management
97     # description : GROUPS
98     # navigation : 2000 2200
99     #----------------------------------------------------------------------
100     diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Hostentries.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Hostentries.pm
101     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Hostentries.pm 2020-11-19 07:53:26.000000000 +0000
102     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Hostentries.pm 2024-02-18 10:49:00.000000000 +0000
103     @@ -1,9 +1,9 @@
104     package SrvMngr::Controller::Hostentries;
105    
106     #----------------------------------------------------------------------
107     -# heading : Configuration
108     +# heading : Network
109     # description : Hostnames and addresses
110     -# navigation : 6000 6500
111     +# navigation : 5000 5200
112     #----------------------------------------------------------------------
113     #
114     # routes : end
115     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
116     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm 2020-11-19 07:53:26.000000000 +0000
117     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Ibays.pm 2024-02-18 10:45:00.000000000 +0000
118     @@ -1,8 +1,8 @@
119     package SrvMngr::Controller::Ibays;
120    
121     #----------------------------------------------------------------------
122     -# heading : Collaboration
123     -# description : Information bays
124     +# heading : Network
125     +# description : Shared areas (was ibays)
126     # navigation : 2000 2500
127     #
128     #
129     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
130     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Initial.pm 2020-11-19 07:53:26.000000000 +0000
131     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Initial.pm 2024-02-18 11:02:00.000000000 +0000
132     @@ -1,7 +1,7 @@
133     package SrvMngr::Controller::Initial;
134    
135     #----------------------------------------------------------------------
136     -# heading : None
137     +# heading : Current User
138     # description : Home
139     # navigation : 1000 1000
140     # menu : N
141     diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Localnetworks.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Localnetworks.pm
142     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Localnetworks.pm 2020-11-19 07:53:26.000000000 +0000
143     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Localnetworks.pm 2024-02-18 10:55:00.000000000 +0000
144     @@ -1,9 +1,9 @@
145     package SrvMngr::Controller::Localnetworks;
146    
147     #----------------------------------------------------------------------
148     -# heading : Security
149     +# heading : Network
150     # description : Local networks
151     -# navigation : 5000 5300
152     +# navigation : 5000 5600
153     #
154     # routes : end
155     #----------------------------------------------------------------------
156     diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Logout.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Logout.pm
157     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Logout.pm 2020-11-19 07:53:26.000000000 +0000
158     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Logout.pm 2024-02-18 11:02:00.000000000 +0000
159     @@ -1,7 +1,7 @@
160     package SrvMngr::Controller::Logout;
161    
162     #----------------------------------------------------------------------
163     -# heading : None
164     +# heading : Current User
165     # description : Logout
166     # navigation : 1000 1900
167     # menu : U
168     diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Manual.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Manual.pm
169     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Manual.pm 2021-06-21 10:25:10.000000000 +0100
170     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Manual.pm 2024-02-18 10:37:00.000000000 +0000
171     @@ -1,7 +1,7 @@
172     package SrvMngr::Controller::Manual;
173    
174     #----------------------------------------------------------------------
175     -# heading : None
176     +# heading : Support
177     # description : Online manual
178     # navigation : 1000 1100
179     # menu : N
180     diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Portforwarding.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Portforwarding.pm
181     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Portforwarding.pm 2020-11-19 07:53:26.000000000 +0000
182     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Portforwarding.pm 2024-02-18 10:57:00.000000000 +0000
183     @@ -1,9 +1,9 @@
184     package SrvMngr::Controller::Portforwarding;
185    
186     #----------------------------------------------------------------------
187     -# heading : Security
188     +# heading : Network
189     # description : Port forwarding
190     -# navigation : 5000 5400
191     +# navigation : 6000 6200
192     #
193     # routes : end
194     #----------------------------------------------------------------------
195     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
196     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm 2024-02-18 11:04:27.081709170 +0000
197     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Printers.pm 2024-02-18 11:02:00.000000000 +0000
198     @@ -1,7 +1,7 @@
199     package SrvMngr::Controller::Printers;
200    
201     #----------------------------------------------------------------------
202     -# heading : Configuration
203     +# heading : System
204     # description : Printers
205     # navigation : 6000 6400
206     #
207     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
208     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm 2020-11-19 07:53:26.000000000 +0000
209     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Proxy.pm 2024-02-18 11:02:00.000000000 +0000
210     @@ -1,7 +1,7 @@
211     package SrvMngr::Controller::Proxy;
212    
213     #----------------------------------------------------------------------
214     -# heading : Security
215     +# heading : System
216     # description : Proxy settings
217     # navigation : 5000 5500
218     #----------------------------------------------------------------------
219     diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Pseudonyms.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Pseudonyms.pm
220     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Pseudonyms.pm 2020-11-19 07:53:26.000000000 +0000
221     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Pseudonyms.pm 2024-02-18 10:42:00.000000000 +0000
222     @@ -1,7 +1,7 @@
223     package SrvMngr::Controller::Pseudonyms;
224    
225     #----------------------------------------------------------------------
226     -# heading : Collaboration
227     +# heading : User management
228     # description : Pseudonyms
229     # navigation : 2000 2400
230     #----------------------------------------------------------------------
231     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
232     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Qmailanalog.pm 2020-11-19 07:53:26.000000000 +0000
233     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Qmailanalog.pm 2024-02-18 11:02:00.000000000 +0000
234     @@ -1,7 +1,7 @@
235     package SrvMngr::Controller::Qmailanalog;
236    
237     #----------------------------------------------------------------------
238     -# heading : Administration
239     +# heading : Investigation
240     # description : Mail log file analysis
241     # navigation : 4000 4500
242     #
243     diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm
244     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm 2020-11-19 07:53:26.000000000 +0000
245     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Quota.pm 2024-02-18 10:42:00.000000000 +0000
246     @@ -1,7 +1,7 @@
247     package SrvMngr::Controller::Quota;
248    
249     #----------------------------------------------------------------------
250     -# heading : Collaboration
251     +# heading : User management
252     # description : Quotas
253     # navigation : 2000 2300
254     #----------------------------------------------------------------------
255     @@ -190,4 +190,4 @@
256     }
257    
258    
259     -1
260     \ No newline at end of file
261     +1
262     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
263     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm 2021-06-21 10:25:10.000000000 +0100
264     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Reboot.pm 2024-02-18 11:02:00.000000000 +0000
265     @@ -1,7 +1,7 @@
266     package SrvMngr::Controller::Reboot;
267    
268     #----------------------------------------------------------------------
269     -# heading : Administration
270     +# heading : System
271     # description : Reboot or shutdown
272     # navigation : 4000 4700
273     #
274     diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteaccess.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteaccess.pm
275     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteaccess.pm 2021-06-21 10:25:10.000000000 +0100
276     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Remoteaccess.pm 2024-02-18 10:53:00.000000000 +0000
277     @@ -1,9 +1,9 @@
278     package SrvMngr::Controller::Remoteaccess;
279    
280     #----------------------------------------------------------------------
281     -# heading : Security
282     +# heading : Network
283     # description : Remote access
284     -# navigation : 5000 5200
285     +# navigation : 5000 5400
286     #----------------------------------------------------------------------
287     #
288     # routes : end
289     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
290     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm 2024-02-18 11:04:27.007706960 +0000
291     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Review.pm 2024-02-18 11:02:00.000000000 +0000
292     @@ -1,7 +1,7 @@
293     package SrvMngr::Controller::Review;
294    
295     #----------------------------------------------------------------------
296     -# heading : None
297     +# heading : Investigation
298     # description : Review configuration
299     # navigation : 1000 1200
300     #
301     diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Support.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Support.pm
302     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Support.pm 2020-11-19 07:53:26.000000000 +0000
303     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Support.pm 2024-02-18 11:02:00.000000000 +0000
304     @@ -1,7 +1,7 @@
305     package SrvMngr::Controller::Support;
306    
307     #----------------------------------------------------------------------
308     -# heading : None
309     +# heading : Support
310     # description : Support and licensing
311     # navigation : 1000 1200
312     # menu : N
313     @@ -41,4 +41,4 @@
314     };
315    
316    
317     -1;
318     \ No newline at end of file
319     +1;
320     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
321     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm 2020-11-19 07:53:26.000000000 +0000
322     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm 2024-02-18 10:39:00.000000000 +0000
323     @@ -1,7 +1,7 @@
324     package SrvMngr::Controller::Useraccounts;
325    
326     #----------------------------------------------------------------------
327     -# heading : Collaboration
328     +# heading : User management
329     # description : Users
330     # navigation : 2000 2100
331     #----------------------------------------------------------------------
332     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
333     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm 2024-02-18 11:04:27.048708184 +0000
334     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Userpassword.pm 2024-02-18 11:02:00.000000000 +0000
335     @@ -1,7 +1,7 @@
336     package SrvMngr::Controller::Userpassword;
337    
338     #----------------------------------------------------------------------
339     -# heading : None
340     +# heading : User management
341     # description : User password
342     # navigation : 1000 1250
343     # menu : U
344     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
345     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm 1970-01-01 01:00:00.000000000 +0100
346     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Uservacations.pm 2024-02-18 10:43:00.000000000 +0000
347     @@ -0,0 +1,384 @@
348     +package SrvMngr::Controller::Uservacations;
349     +#----------------------------------------------------------------------
350     +# heading : User management
351     +# description : User vacations
352     +# navigation : 3000 3150
353     +#
354     +# name : Uservacationsget, method : get, url : /uservacations, ctlact : Uservacations#main
355     +# name : Uservacationspost,method : post, url : /Uservacations, ctlact : Uservacations#do_display
356     +# name : Uservacations1, method : get, url : /Uservacations1, ctlact : Uservacations#do_display
357     +# name : Uservacations2, method : post, url : /Uservacations2, ctlact : Uservacations#do_display
358     +# routes : end
359     +#----------------------------------------------------------------------
360     +
361     +use strict;
362     +use warnings;
363     +use Mojo::Base 'Mojolicious::Controller';
364     +
365     +#use DateTime; #Not part of SME10 mix
366     +use POSIX;
367     +
368     +use Locale::gettext;
369     +use SrvMngr::I18N;
370     +use SrvMngr qw(theme_list init_session);
371     +
372     +use Data::Dumper;
373     +use esmith::util;
374     +use esmith::HostsDB;
375     +use esmith::AccountsDB;
376     +
377     +our $db = esmith::ConfigDB->open();
378     +our $adb = esmith::AccountsDB->open();
379     +
380     +our $PanelUser = $ENV{'REMOTE_USER'} ||'';
381     +$PanelUser = $1 if ($PanelUser =~ /^([a-z][\.\-a-z0-9]*)$/);
382     +
383     +our %delegatedVacations;
384     +
385     +use constant FALSE => 0;
386     +use constant TRUE => 1;
387     +
388     +sub main {
389     +
390     + my $c = shift;
391     + $c->app->log->info( $c->log_req );
392     +
393     + my %vac_datas = ();
394     + my $title = $c->l('vac_FORM_TITLE');
395     + my $modul = '';
396     +
397     + $vac_datas{trt} = 'LIST';
398     +
399     + my @vacations = get_vacation_table($c);
400     + my $empty = (scalar @vacations == 0);
401     +
402     + $vac_datas{"first"} = 'vac_MODIFY_DESCRIPTION';
403     +
404     + $c->stash(
405     + title => $title,
406     + modul => $modul,
407     + vac_datas => \%vac_datas,
408     + vacations =>\@vacations,
409     + empty => $empty
410     + );
411     + $c->render( template => 'uservacations' );
412     +}
413     +
414     +sub do_display {
415     +
416     + my $c = shift;
417     + $c->app->log->info( $c->log_req );
418     +
419     + my $rt = $c->current_route;
420     + my $trt = ( $c->param('trt') || 'LIST' );
421     +
422     + $trt = 'ADD' if ( $rt eq 'Uservacations1' );
423     + $trt = 'ADD1' if ( $rt eq 'Uservacations2' );
424     +
425     + my %vac_datas = ();
426     + my $title = $c->l('vac_FORM_TITLE');
427     + my $modul = '';
428     +
429     +
430     + if ( $trt eq 'ADD' ) {
431     + # Add or change a vacation message - called from the list panel
432     + # Get the data and pass it across.
433     + my $account = $c->param("account");
434     + my $user = $adb->get($account);
435     + my $username = $user->prop("FirstName")." ".$user->prop("LastName");
436     + my $EmailVacation = $user->prop('EmailVacation') || '';
437     + my $EmailVacationFrom = $user->prop('EmailVacationFrom') || '';
438     + my $EmailVacationTo = $user->prop('EmailVacationTo') || '';
439     + my $VacText = get_vacation_text($c);
440     + $c->stash(account=>$account,
441     + username=>$username,
442     + EmailVacation=>$EmailVacation,
443     + EmailVacationFrom=>$EmailVacationFrom,
444     + EmailVacationTo=>$EmailVacationTo,
445     + VacText=>$VacText
446     + );
447     + }
448     +
449     + if ( $trt eq 'ADD1' ) {
450     + #Add or edit vacation message.
451     + my $ret = add_vac_message($c);
452     + #Return to list page if success
453     + if ($ret eq "OK") {
454     + $trt = "LIST";
455     + $vac_datas{success} = "vac_SUCCESS";
456     +
457     + } else {
458     + my $account = $c->param("account");
459     + my $user = $adb->get($account);
460     + my $username = $user->prop("FirstName")." ".$user->prop("LastName");
461     + my $EmailVacationFrom = $c->param('EmailVacationFrom') || '';
462     + my $EmailVacationTo = $c->param('EmailVacationTo') || '';
463     + my $EmailVacation = $c->param('EmailVacation') || '';
464     + my $VacText = $c->param("VacText");
465     + $c->stash(account=>$account,
466     + username=>$username,
467     + EmailVacation=>$EmailVacation,
468     + EmailVacationFrom=>$EmailVacationFrom,
469     + EmailVacationTo=>$EmailVacationTo,
470     + VacText=>$VacText
471     + );
472     + #Error - return to Add page
473     + $trt = "ADD";
474     + $vac_datas{error} = $ret;
475     + }
476     + }
477     +
478     + if ( $trt eq 'LIST' ) {
479     +
480     + #List all the users and vacation message details.
481     + my @vacations = get_vacation_table($c);
482     + my $empty = (scalar @vacations == 0);
483     + $c->stash(
484     + empty => $empty,
485     + vacations =>\@vacations
486     + );
487     + }
488     +
489     +
490     + $vac_datas{'trt'} = $trt;
491     + $c->stash( title => $title, modul => $modul, vac_datas => \%vac_datas );
492     + $c->render( template => 'uservacations' );
493     +}
494     +
495     +sub user_accounts_exist
496     +{
497     + my $q = shift;
498     + #return scalar $adb->users;
499     + if (scalar $adb->users)
500     + { return $q->l('vac_DESCRIPTION'); }
501     +}
502     +
503     +sub get_vacation_table
504     +{
505     + my $self = shift;
506     +
507     +#We want to retrieve granted group from DB, and retrieve users of groups
508     + my $record = $adb->get($PanelUser);
509     + my $dg;
510     + if ($record) {$dg=$record->prop('delegatedVacations')||'';}
511     + else {$dg = '';}
512     + $dg =~ s/ //g;
513     + my @g = split(/,/, $dg);
514     + my @visiblemembers = ();
515     +
516     + foreach my $g (@g) {
517     + my $members = $adb->get_prop("$g",'Members');
518     + next unless defined $members;
519     + $members =~ s/ //g;
520     + my @members = split(/,/, $members);
521     + push @visiblemembers , @members ;
522     + }
523     +
524     + foreach my $k ( @visiblemembers )
525     + {
526     + $delegatedVacations{$k}=1;
527     + }
528     +
529     +
530     + my @users = $adb->users;
531     + return () if (@users == 0); ##$self->l("ACCOUNT_USER_NONE")
532     + return () if (@visiblemembers == 0 && $dg ne '');#; #$self->l("NO_USERS_IN_GRANTED_GROUPS")
533     +
534     + my @data = ();
535     +
536     + for my $user (@users)
537     + {
538     + next if %delegatedVacations and not $delegatedVacations{$user->key};
539     + # make it clearer which uses have vacation
540     + my $EmailVacation = $user->prop('EmailVacation') || '';
541     + my $EmailVacationFrom = $user->prop('EmailVacationFrom') || '';
542     + my $EmailVacationTo = $user->prop('EmailVacationTo') || '';
543     + my $status = $user->prop('EmailVacation') || '';
544     + if ($status eq 'yes') { $status = 'YES'; } else { $status = ''; }
545     +
546     + push @data,
547     + { User => $user->key,
548     + FullName => $user->prop('FirstName') . " " .$user->prop('LastName'),
549     + status => $self->l($status),
550     + EmailVacation => $EmailVacation,
551     + EmailVacationFrom => showDate($EmailVacationFrom),
552     + EmailVacationTo => showDate($EmailVacationTo),
553     + Modify => $self->l('vac_MODIFY'),
554     + }
555     + }
556     + return @data;
557     +}
558     +
559     +sub showDate
560     +{
561     + my $strDate = shift;
562     + my ($Year,$Month,$Day) = ($strDate =~ /(\d{4})(\d{2})(\d{2})/);
563     + #my $Unix = mktime(0,0,0,$Day,$Month,$Year);
564     + return "$Year-$Month-$Day";
565     +}
566     +
567     +
568     +sub modify_link
569     +{
570     + my ($data_item, $row, $field) = @_;
571     +
572     + return "uservacations?" .
573     + join("&",
574     + "page=0",
575     + "page_stack=",
576     + "Next=Next",
577     + "User=" . $row->{User},
578     + "FullName=" . $row->{FullName},
579     + "EmailVacation=" . $row->{EmailVacation},
580     + "EmailVacationFrom=" . $row->{EmailVacationFrom},
581     + "EmailVacationTo=" . $row->{EmailVacationTo},
582     + "wherenext=VACATION_PAGE_MODIFY");
583     +}
584     +
585     +# this formats the text to display on screen
586     +sub get_vacation_text
587     +{
588     + my $q = shift;
589     + my $domain = $db->get_value('DomainName');
590     + my $user = $q->param('account');
591     +
592     + my $fullname = $adb->get_prop($user, "FirstName") . " " .
593     + $adb->get_prop($user, "LastName");
594     +
595     + my $vfile = "/home/e-smith/files/users/$user/.vacation.msg";
596     +
597     + my $from = $q->l('vac_FROM');
598     + my $Subject = $q->l('vac_SUBJECT');
599     + my $away = $q->l('vac_AWAY_FROM_MAIL');
600     + my $return = $q->l('vac_ANSWER_TO_OBJECT_SENDER');
601     +
602     + #my $ExistingMessage = "$from $fullname &lt\;$user\@$domain&gt\;\n"."$Subject $return\n".
603     + # "\n$away\n"."\n--\n$fullname";
604     +
605     + my $ExistingMessage = "$from $fullname \<$user\@$domain\>\n"."$Subject $return\n".
606     + "\n$away\n"."\n--\n$fullname";
607     +
608     +
609     + # if exists and is not empty
610     + if (( -e $vfile ) && (! -z $vfile ))
611     + {
612     + open (VACATION, "<$vfile")
613     + or die "Error: Could not open file: $vfile\n";
614     + my @vacationTemp;
615     +
616     + #reformat so email address isn't hidden inside < >
617     + while (<VACATION>)
618     + {
619     + $_ =~ s/</&lt\;/;
620     + $_ =~ s/>/&gt\;/;
621     + push (@vacationTemp, $_);
622     + }
623     +
624     + $ExistingMessage = join ("", @vacationTemp);
625     +
626     + close VACATION;
627     + }
628     + return $ExistingMessage;
629     +}
630     +
631     +# saves the text to .vacation.msg
632     +sub add_vac_message
633     +{
634     + my $q = shift;
635     +
636     + my $domain = $db->get_value('DomainName');
637     + my $user = $q->param('account');
638     +
639     + my $EmailVacation = $q->param('EmailVacation')||"no";
640     + #die($EmailVacation);
641     + #if ($EmailVacation eq "yes") {$EmailVacation = "yes";} else {$EmailVacation = "no";}
642     +
643     + #Decode To and FROM to standard format - comes over in html5 iso format yyyy-mm-dd
644     + my $EmailVacationFrom = trim($q->param('EmailVacationFrom'));
645     + my ($fromYear,$fromMonth,$fromDay) = ($EmailVacationFrom =~ /(\d{4})-(\d{2})-(\d{2})/);
646     + $EmailVacationFrom = $fromYear.$fromMonth.$fromDay;
647     + if ($EmailVacationFrom !~ m/^2[0-9]{3}[0|1][0-9][0-3][0-9]$/ and $EmailVacationFrom ne "") {return "vac_FROM_DATE_INCORRECT";}
648     + my $EmailVacationTo = trim($q->param('EmailVacationTo'));
649     + my ($toYear,$toMonth,$toDay) = ($EmailVacationTo =~ /(\d{4})-(\d{2})-(\d{2})/);
650     + $EmailVacationTo = $toYear.$toMonth.$toDay;
651     +# $EmailVacationTo =~ s/-//g; #Just take out "-".
652     + if ($EmailVacationTo !~ m/^2[0-9]{3}[0|1][0-9][0-3][0-9]$/ and $EmailVacationFrom ne "") {return "vac_TO_DATE_INCORRECT";}
653     + #Check not the same or From follows To.
654     + if ($EmailVacationTo ne "" and $EmailVacationTo eq $EmailVacationFrom) {return "vac_DATES_THE_SAME";}
655     + my $UnixFrom = mktime(0,0,0,$fromDay,$fromMonth,$fromYear);
656     + my $UnixTo = mktime(0,0,0,$toDay,$toMonth,$toYear);
657     + if ($UnixTo < $UnixFrom) {return "vac_TO_DATE_MUST_BE_LATER";}
658     +
659     +
660     + my $new_message = $q->param('VacText');
661     + my $vfile = "/home/e-smith/files/users/$user/.vacation.msg";
662     +
663     + my $fullname = $adb->get_prop($user, "FirstName") . " " .
664     + $adb->get_prop($user, "LastName");
665     +
666     + my $from = 'From:';
667     + my $away = $q->l('vac_AWAY_FROM_MAIL');
668     + my $return = $q->l('vac_ANSWER_TO_OBJECT_SENDER');
669     +
670     + my $vacation_text = "$from $fullname \<$user\@$domain\>\n"."Subject: $return\n".
671     + "\n$away \n"."\n--\n$fullname";
672     +
673     + my $reset = $vacation_text;
674     +
675     + # if exists and is not empty
676     + if (( -e $vfile ) && (! -z $vfile ))
677     + {
678     + open (VACATION, "<$vfile")
679     + or die "Error: Could not open file: $vfile\n";
680     + my @vacationTemp = <VACATION>;
681     + $vacation_text = join ("", @vacationTemp);
682     +
683     + close VACATION;
684     + }
685     +
686     + chomp $new_message;
687     +
688     + # reset msg to default,
689     + if ($new_message =~ /reset/)
690     + { $vacation_text = $reset; }
691     + else
692     + {
693     + #or save new_message
694     + unless ($new_message eq "")
695     + { $vacation_text = $new_message; }
696     + }
697     +
698     + # Strip out DOS Carriage Returns (CR)
699     + $vacation_text =~ s/\r//g;
700     +
701     + unlink $vfile;
702     + open (VACATION, ">$vfile")
703     + or die ("Error opening vacation message.\n");
704     +
705     + print VACATION "$vacation_text";
706     + close VACATION;
707     +
708     + esmith::util::chownFile($user, $user,
709     + "/home/e-smith/files/users/$user/.vacation.msg");
710     +
711     + $adb->set_prop($user, 'EmailVacation', $EmailVacation);
712     + $adb->set_prop($user, 'EmailVacationFrom', $EmailVacationFrom);
713     + $adb->set_prop($user, 'EmailVacationTo', $EmailVacationTo);
714     +
715     + #the first is more correct but is slower
716     + #system ("/sbin/e-smith/signal-event", "email-update", $user) == 0
717     + system ("/etc/e-smith/events/actions/qmail-update-user event $user") == 0
718     + or die ("Error occurred updating .qmail\n");
719     +
720     + if (($EmailVacation eq 'no') && ( -e "/home/e-smith/files/users/$user/.vacation"))
721     + {
722     + system ("/bin/rm /home/e-smith/files/users/$user/.vacation") == 0
723     + or die ("Error resetting vacation db.\n");
724     + }
725     +
726     + return "OK";
727     +}
728     +
729     +sub trim { my $s = shift; $s =~ s/^\s+|\s+$//g; return $s };
730     +
731     +1;
732     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
733     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm 2021-06-21 10:25:10.000000000 +0100
734     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Viewlogfiles.pm 2024-02-18 11:02:00.000000000 +0000
735     @@ -1,7 +1,7 @@
736     package SrvMngr::Controller::Viewlogfiles;
737    
738     #----------------------------------------------------------------------
739     -# heading : Administration
740     +# heading : Investigation
741     # description : View log files
742     # navigation : 4000 4400
743     #
744     diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Workgroup.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Workgroup.pm
745     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Workgroup.pm 2020-11-19 07:53:26.000000000 +0000
746     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Workgroup.pm 2024-02-18 10:47:00.000000000 +0000
747     @@ -1,8 +1,8 @@
748     package SrvMngr::Controller::Workgroup;
749    
750     #----------------------------------------------------------------------
751     -# heading : Configuration
752     -# description : Workgroup
753     +# heading : Network
754     +# description : Samba workgroup
755     # navigation : 6000 6200
756     #
757     # routes : end
758     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
759     --- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm 2024-02-18 11:04:27.067708751 +0000
760     +++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr/Controller/Yum.pm 2024-02-18 11:02:00.000000000 +0000
761     @@ -1,7 +1,7 @@
762     package SrvMngr::Controller::Yum;
763    
764     #----------------------------------------------------------------------
765     -# heading : Configuration
766     +# heading : System
767     # description : Software installer
768     # navigation : 4000 4200
769     #
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed