1 |
michel |
1.1 |
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Backup.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Backup.pm |
2 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Backup.pm 2020-04-14 16:50:36.000000000 +0400 |
3 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Backup.pm 2020-04-26 23:19:13.000000000 +0400 |
4 |
|
|
@@ -154,12 +154,11 @@ |
5 |
|
|
my $res = desktopBackup(); |
6 |
|
|
$result .= $res unless $res eq 'OK'; |
7 |
|
|
if ( ! $result ) { |
8 |
|
|
- $bac_datas{function} = 'SUC'; |
9 |
|
|
$result = $c->l('bac_SUCCESS'); |
10 |
|
|
$c->app->log->info('desktop backup LAUNCHED'); |
11 |
|
|
$c->flash(success => $result); |
12 |
|
|
} else { |
13 |
|
|
- $c->flash(error => $result); |
14 |
|
|
+ $c->stash(error => $result); |
15 |
|
|
} |
16 |
|
|
$c->redirect_to("backup"); |
17 |
|
|
} |
18 |
|
|
@@ -238,10 +237,9 @@ |
19 |
|
|
|
20 |
|
|
# should not happen !! no desktop_backup template !! |
21 |
|
|
|
22 |
|
|
- my $res = desktopBackup(); |
23 |
|
|
+ $res = desktopBackup(); |
24 |
|
|
$result .= $res unless $res eq 'OK'; |
25 |
|
|
if ( ! $result ) { |
26 |
|
|
- $bac_datas{function} = 'SUC'; |
27 |
|
|
$result = $c->l('bac_SUCCESS'); |
28 |
|
|
$c->stash( notif => $result ); |
29 |
|
|
$c->redirect_to("/backup"); |
30 |
|
|
@@ -310,13 +308,13 @@ |
31 |
|
|
|
32 |
|
|
##$result .= ' ** Blocked for testing ** !'; |
33 |
|
|
|
34 |
|
|
+ $res = ''; |
35 |
|
|
if ( ! $result ) { |
36 |
|
|
$res = $c->updateTapeBackupConfig($status, $backupHour, |
37 |
|
|
$backupMin, $bampm, $reminderHour, $reminderMin, $rampm); |
38 |
|
|
|
39 |
|
|
$result .= $res unless $res eq 'OK'; |
40 |
|
|
if ( ! $result ) { |
41 |
|
|
- $bac_datas{function} = 'SUC'; |
42 |
|
|
if (defined $status && $status eq "on") { |
43 |
|
|
$result .= ($c->l('bac_SUCCESSFULLY_ENABLED_TAPE').' '. |
44 |
|
|
$c->l('bac_WITH_BACKUP_TIME')."$backupHour:$backupMin".' '. |
45 |
|
|
@@ -341,11 +339,11 @@ |
46 |
|
|
|
47 |
|
|
$result .= ' ** Blocked for testing ** ! (HARD TO TEST!)'; |
48 |
|
|
|
49 |
|
|
+ $res = ''; |
50 |
|
|
if ( ! $result ) { |
51 |
|
|
- my $res = $c->tapeRestore( $lock_file, $file_handle ); |
52 |
|
|
+ $res = $c->tapeRestore( $lock_file, $file_handle ); |
53 |
|
|
$result .= $res unless $res eq 'OK'; |
54 |
|
|
if ( ! $result ) { |
55 |
|
|
- $bac_datas{function} = 'SUC'; |
56 |
|
|
$result = $c->l('bac_SUCCESS'); |
57 |
|
|
} |
58 |
|
|
} |
59 |
|
|
@@ -362,11 +360,11 @@ |
60 |
|
|
|
61 |
|
|
$result .= ' ** Blocked for testing ** !'; |
62 |
|
|
|
63 |
|
|
+ $res = ''; |
64 |
|
|
if ( ! $result ) { |
65 |
|
|
$res = $c->workstnConfigure(); |
66 |
|
|
$result .= $res unless $res eq 'OK'; |
67 |
|
|
if ( ! $result ) { |
68 |
|
|
- $bac_datas{function} = 'SUC'; |
69 |
|
|
$result = $c->l('bac_SUCCESS'); |
70 |
|
|
} |
71 |
|
|
} |
72 |
|
|
@@ -383,11 +381,11 @@ |
73 |
|
|
|
74 |
|
|
$result .= ' ** Blocked for testing ** !'; |
75 |
|
|
|
76 |
|
|
+ $res = ''; |
77 |
|
|
if ( ! $result ) { |
78 |
|
|
$res = $c->workstnVerify(); |
79 |
|
|
$result .= $res unless $res eq 'OK'; |
80 |
|
|
if ( ! $result ) { |
81 |
|
|
- $bac_datas{function} = 'SUC'; |
82 |
|
|
$result = $c->l('bac_SUCCESS'); |
83 |
|
|
} |
84 |
|
|
} |
85 |
|
|
@@ -408,7 +406,6 @@ |
86 |
|
|
$res = $c->workstnRestore(); |
87 |
|
|
$result .= $res unless $res eq 'OK'; |
88 |
|
|
if ( ! $result ) { |
89 |
|
|
- $bac_datas{function} = 'SUC'; |
90 |
|
|
$result = $c->l('bac_SUCCESS'); |
91 |
|
|
} |
92 |
|
|
} |
93 |
|
|
@@ -425,32 +422,29 @@ |
94 |
|
|
|
95 |
|
|
$result .= ' ** Blocked for testing ** !'; |
96 |
|
|
|
97 |
|
|
+ $res = ''; |
98 |
|
|
if ( ! $result ) { |
99 |
|
|
$res = $c->workstnSelRestore(); |
100 |
|
|
$result .= $res unless $res eq 'OK'; |
101 |
|
|
if ( ! $result ) { |
102 |
|
|
- $bac_datas{function} = 'SUC'; |
103 |
|
|
$result = $c->l('bac_SUCCESS'); |
104 |
|
|
} |
105 |
|
|
} |
106 |
|
|
} |
107 |
|
|
|
108 |
|
|
- |
109 |
|
|
# common part for all functions |
110 |
|
|
|
111 |
|
|
- $c->stash( title => $title, bac_datas => \%bac_datas ); |
112 |
|
|
- if ($bac_datas{function} ne 'SUC') { |
113 |
|
|
- $c->flash(error => $result); |
114 |
|
|
- $bac_datas{'function'} = $function; |
115 |
|
|
- $dest = "back_$function"; |
116 |
|
|
- return $c->render(template => $dest); |
117 |
|
|
+ if ($res ne 'OK') { |
118 |
|
|
+ $c->stash( error => $result ); |
119 |
|
|
+ $c->stash( title => $title, bac_datas => \%bac_datas ); |
120 |
|
|
+ my $dest = "back_$function"; |
121 |
|
|
+ return $c->render($dest); |
122 |
|
|
} |
123 |
|
|
|
124 |
|
|
- my $message = $function . ' updates DONE'; |
125 |
|
|
+ my $message = "'Backup' $function updates DONE"; |
126 |
|
|
$c->app->log->info($message); |
127 |
|
|
$c->flash(success => $result); |
128 |
|
|
|
129 |
|
|
- #return to 'backup' route !!! |
130 |
|
|
$c->redirect_to('backup'); |
131 |
|
|
|
132 |
|
|
}; |
133 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Clamav.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Clamav.pm |
134 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Clamav.pm 2020-04-14 16:50:36.000000000 +0400 |
135 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Clamav.pm 2020-04-25 20:14:49.000000000 +0400 |
136 |
|
|
@@ -28,16 +28,10 @@ |
137 |
|
|
my $title = $c->l('clm_FORM_TITLE'); |
138 |
|
|
my $modul = $c->render_to_string(inline => $c->l('clm_DESC_FILESYSTEM_SCAN_PERIOD')); |
139 |
|
|
|
140 |
|
|
-# $clm_datas{'FilesystemScan'} = get_prop('clamav','FilesystemScan') || 'disabled'; |
141 |
|
|
-# $clm_datas{'Quarantine'} = get_prop('clamav','Quarantine') || 'disabled'; |
142 |
|
|
$clm_datas{'FilesystemScan'} = ($db->get_prop('clamav','FilesystemScan')) || 'disabled'; |
143 |
|
|
$clm_datas{'Quarantine'} = ($db->get_prop('clamav','Quarantine')) || 'disabled'; |
144 |
|
|
|
145 |
|
|
$clm_datas{'clam_versions'} = get_clam_versions(); |
146 |
|
|
-# value="get_prop('clamav','HTTPProxyServer')"> |
147 |
|
|
-# value="get_prop('clamav','HTTPProxyPort')"> |
148 |
|
|
-# value="get_prop('clamav','HTTPProxyUsername')"> |
149 |
|
|
-# value="get_prop('clamav','HTTPProxyPassword')"> |
150 |
|
|
|
151 |
|
|
$c->stash( title => $title, modul => $modul, clm_datas => \%clm_datas ); |
152 |
|
|
$c->render(template => 'clamav'); |
153 |
|
|
@@ -53,22 +47,20 @@ |
154 |
|
|
|
155 |
|
|
my $result = ""; |
156 |
|
|
|
157 |
|
|
-# $squid->set_prop('status', $http_clamav_status); |
158 |
|
|
-# $smtpd->set_prop('Clamav', $smtp_clamav_status); |
159 |
|
|
- change_settings($c); |
160 |
|
|
+ $c->change_settings(); |
161 |
|
|
|
162 |
|
|
- # |
163 |
|
|
# Update the system |
164 |
|
|
- # |
165 |
|
|
system("/sbin/e-smith/signal-event clamav-update") == 0 |
166 |
|
|
or $result = $c->l('clm_ERROR_UPDATING_CONFIGURATION'); |
167 |
|
|
|
168 |
|
|
- my $title = $c->l('clm_FORM_TITLE'); |
169 |
|
|
- |
170 |
|
|
- if ( $result eq '' ) { $result = $c->l('clm_SUCCESS') ; } |
171 |
|
|
+ if ( ! $result ) { |
172 |
|
|
+ $result = $c->l('clm_SUCCESS') ; |
173 |
|
|
+ $c->flash( success => $result ); |
174 |
|
|
+ } else { |
175 |
|
|
+ $c->flash( error => $result ); |
176 |
|
|
+ } |
177 |
|
|
|
178 |
|
|
- $c->stash( title => $title, modul => $result ); |
179 |
|
|
- $c->render(template => 'module'); |
180 |
|
|
+ $c->redirect_to('/clamav'); |
181 |
|
|
}; |
182 |
|
|
|
183 |
|
|
|
184 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Domains.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Domains.pm |
185 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Domains.pm 2020-04-14 16:50:36.000000000 +0400 |
186 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Domains.pm 2020-04-26 01:03:20.000000000 +0400 |
187 |
|
|
@@ -39,9 +39,8 @@ |
188 |
|
|
|
189 |
|
|
my %dom_datas = (); |
190 |
|
|
my $title = $c->l('dom_FORM_TITLE'); |
191 |
|
|
- my $notif = ''; |
192 |
|
|
|
193 |
|
|
- $dom_datas{trt} = 'LIST'; |
194 |
|
|
+ $dom_datas{trt} = 'LST'; |
195 |
|
|
|
196 |
|
|
my @domains; |
197 |
|
|
for ($ddb->domains()) |
198 |
|
|
@@ -56,7 +55,7 @@ |
199 |
|
|
$dom_datas{forwarder} = $cdb->get_prop('dnscache', 'Forwarder'); |
200 |
|
|
$dom_datas{forwarder2} = $cdb->get_prop('dnscache', 'Forwarder2') || ''; |
201 |
|
|
|
202 |
|
|
- $c->stash( title => $title, notif => $notif, dom_datas => \%dom_datas, domains => \@domains ); |
203 |
|
|
+ $c->stash( title => $title, dom_datas => \%dom_datas, domains => \@domains ); |
204 |
|
|
$c->render(template => 'domains'); |
205 |
|
|
|
206 |
|
|
}; |
207 |
|
|
@@ -71,19 +70,22 @@ |
208 |
|
|
my $trt = $c->param('trt'); |
209 |
|
|
my $domain = $c->param('Domain') || ''; |
210 |
|
|
|
211 |
|
|
- $trt = 'DEL' if ( $rt eq 'domaindel1' ); |
212 |
|
|
- $trt = 'UPD' if ( $rt eq 'domainupd1' ); |
213 |
|
|
- $trt = 'UP2' if ( $rt eq 'domainup21' ); |
214 |
|
|
- $trt = 'ADD' if ( $rt eq 'domainadd1' ); |
215 |
|
|
+ #$trt = 'DEL' if ( $rt eq 'domaindel1' ); |
216 |
|
|
+ #$trt = 'UPD' if ( $rt eq 'domainupd1' ); |
217 |
|
|
+ #$trt = 'UP2' if ( $rt eq 'domainup21' ); |
218 |
|
|
+ #$trt = 'ADD' if ( $rt eq 'domainadd1' ); |
219 |
|
|
|
220 |
|
|
my %dom_datas = (); |
221 |
|
|
my $title = $c->l('dom_FORM_TITLE'); |
222 |
|
|
- my $notif = ''; |
223 |
|
|
+ my $result = ''; |
224 |
|
|
|
225 |
|
|
$dom_datas{'trt'} = $trt; |
226 |
|
|
+ if ( $trt ne 'ADD' and $trt ne 'UPD' and $trt ne 'UP2' and $trt ne 'DEL' ) { |
227 |
|
|
+ $result = "Trt unknown ( $trt ) !" |
228 |
|
|
+ } |
229 |
|
|
|
230 |
|
|
if ( $trt eq 'ADD' ) { |
231 |
|
|
- |
232 |
|
|
+ #nothing |
233 |
|
|
} |
234 |
|
|
|
235 |
|
|
if ( $trt eq 'UPD' ) { |
236 |
|
|
@@ -95,7 +97,7 @@ |
237 |
|
|
$dom_datas{content} = $rec->prop('Content') || ''; |
238 |
|
|
$dom_datas{nameservers} = $rec->prop('Nameservers') || 'internet'; |
239 |
|
|
} else { |
240 |
|
|
- $notif = "Domain $domain not found !" |
241 |
|
|
+ $result = "Domain $domain not found !" |
242 |
|
|
} |
243 |
|
|
} |
244 |
|
|
|
245 |
|
|
@@ -115,7 +117,7 @@ |
246 |
|
|
} |
247 |
|
|
} |
248 |
|
|
|
249 |
|
|
- if ( $trt eq 'LIST' ) { |
250 |
|
|
+ if ( $trt eq 'LST' ) { |
251 |
|
|
my @domains; |
252 |
|
|
if ($adb) { |
253 |
|
|
@domains = $ddb->domains(); |
254 |
|
|
@@ -124,7 +126,10 @@ |
255 |
|
|
|
256 |
|
|
} |
257 |
|
|
|
258 |
|
|
- $c->stash( title => $title, notif => $notif, dom_datas => \%dom_datas ); |
259 |
|
|
+ if ( ! $result ) { |
260 |
|
|
+ $c->stash( error => $result ); |
261 |
|
|
+ } |
262 |
|
|
+ $c->stash( title => $title, dom_datas => \%dom_datas ); |
263 |
|
|
$c->render( template => 'domains' ); |
264 |
|
|
|
265 |
|
|
}; |
266 |
|
|
@@ -136,10 +141,10 @@ |
267 |
|
|
$c->app->log->info($c->log_req); |
268 |
|
|
|
269 |
|
|
my $rt = $c->current_route; |
270 |
|
|
- my $trt = ($c->param('trt') || 'LIST'); |
271 |
|
|
+ my $trt = $c->param('trt'); |
272 |
|
|
|
273 |
|
|
my %dom_datas = (); |
274 |
|
|
- my $result = ''; |
275 |
|
|
+ my ($res, $result) = ''; |
276 |
|
|
|
277 |
|
|
#my $domain = uri_unescape($c->param('domain')); |
278 |
|
|
my $domain = $c->param('Domain'); |
279 |
|
|
@@ -149,20 +154,19 @@ |
280 |
|
|
my $account = $c->param('Account'); |
281 |
|
|
|
282 |
|
|
# controls (validate ?????) |
283 |
|
|
- my $res = ''; |
284 |
|
|
- # validate_new_domain_name( $c, $domain, $account ); |
285 |
|
|
- $result .= $res unless $res eq 'OK'; |
286 |
|
|
+ #? validate_new_domain_name( $c, $domain, $account ); |
287 |
|
|
+ #$result .= $res unless $res eq 'OK'; |
288 |
|
|
|
289 |
|
|
#$result .= ' blocked'; |
290 |
|
|
|
291 |
|
|
+ $res = ''; |
292 |
|
|
if ( ! $result ) { |
293 |
|
|
- $res = create_modify_domain( $c, 'create', $domain ); |
294 |
|
|
+ $res = $c->create_modify_domain( 'create', $domain ); |
295 |
|
|
$result .= $res unless $res eq 'OK'; |
296 |
|
|
} |
297 |
|
|
|
298 |
|
|
if ( ! $result ) { |
299 |
|
|
- $result = $c->l('dom_CREATE_SUCCEEDED') . ' ' . $domain; |
300 |
|
|
- $trt = 'SUC'; |
301 |
|
|
+ $result = $c->l('dom_CREATE_SUCCEEDED') . " $domain"; |
302 |
|
|
} |
303 |
|
|
} |
304 |
|
|
|
305 |
|
|
@@ -172,23 +176,20 @@ |
306 |
|
|
my $content = $c->param('Content'); |
307 |
|
|
my $nameservers = $c->param('Nameservers'); |
308 |
|
|
|
309 |
|
|
- #my %props = ('Account' => $account); |
310 |
|
|
- |
311 |
|
|
# controls |
312 |
|
|
- my $res = ''; |
313 |
|
|
#$res = validate_description( $c, $account ); |
314 |
|
|
- $result .= $res unless $res eq 'OK'; |
315 |
|
|
+ #$result .= $res unless $res eq 'OK'; |
316 |
|
|
|
317 |
|
|
#$result .= 'blocked'; |
318 |
|
|
|
319 |
|
|
+ $res = ''; |
320 |
|
|
if ( ! $result ) { |
321 |
|
|
- $res = create_modify_domain( $c, 'update', $domain ); |
322 |
|
|
+ $res = $c->create_modify_domain( 'modify', $domain ); |
323 |
|
|
$result .= $res unless $res eq 'OK'; |
324 |
|
|
} |
325 |
|
|
|
326 |
|
|
if ( ! $result ) { |
327 |
|
|
- $result = $c->l('dom_MODIFY_SUCCEEDED') . ' ' . $domain; |
328 |
|
|
- $trt = 'SUC'; |
329 |
|
|
+ $result = $c->l('dom_MODIFY_SUCCEEDED') . " $domain"; |
330 |
|
|
} |
331 |
|
|
} |
332 |
|
|
|
333 |
|
|
@@ -199,23 +200,22 @@ |
334 |
|
|
my $forwarder2 = $c->param('Forwarder2'); |
335 |
|
|
|
336 |
|
|
# controls |
337 |
|
|
- my $res = ''; |
338 |
|
|
|
339 |
|
|
- $res = ip_number_or_blank( $c, $forwarder); |
340 |
|
|
+ $res = $c->ip_number_or_blank( $forwarder ); |
341 |
|
|
$result .= $res unless $res eq 'OK'; |
342 |
|
|
|
343 |
|
|
- $res = ip_number_or_blank( $c, $forwarder2); |
344 |
|
|
+ $res = $c->ip_number_or_blank( $forwarder2 ); |
345 |
|
|
$result .= $res unless $res eq 'OK'; |
346 |
|
|
|
347 |
|
|
#$result .= 'blocked'; |
348 |
|
|
|
349 |
|
|
+ $res = ''; |
350 |
|
|
if ( ! $result ) { |
351 |
|
|
- my $res = modify_dns( $c, $forwarder, $forwarder2 ); |
352 |
|
|
+ $res = $c->modify_dns( $forwarder, $forwarder2 ); |
353 |
|
|
$result .= $res unless $res eq 'OK'; |
354 |
|
|
} |
355 |
|
|
if ( ! $result ) { |
356 |
|
|
- $result = $c->l('SUCCESS') . ' ' . $domain; |
357 |
|
|
- $trt = 'SUC'; |
358 |
|
|
+ $result = $c->l('SUCCESS') . " $forwarder $forwarder2"; |
359 |
|
|
} |
360 |
|
|
} |
361 |
|
|
|
362 |
|
|
@@ -223,34 +223,38 @@ |
363 |
|
|
if ( $trt eq 'DEL' ) { |
364 |
|
|
|
365 |
|
|
# controls |
366 |
|
|
- my $res = ''; |
367 |
|
|
#$res = validate_is_domain($c, $domain); |
368 |
|
|
- $result .= $res unless $res eq 'OK'; |
369 |
|
|
+ #$result .= $res unless $res eq 'OK'; |
370 |
|
|
|
371 |
|
|
#$result .= 'blocked'; |
372 |
|
|
|
373 |
|
|
+ $res = ''; |
374 |
|
|
if ( ! $result ) { |
375 |
|
|
- my $res = delete_domain( $c, $domain ); |
376 |
|
|
+ $res = $c->delete_domain( $domain ); |
377 |
|
|
$result .= $res unless $res eq 'OK'; |
378 |
|
|
} |
379 |
|
|
if ( ! $result ) { |
380 |
|
|
- $result = $c->l('dom_REMOVE_SUCCEEDED') . ' ' . $domain; |
381 |
|
|
- $trt = 'SUC'; |
382 |
|
|
+ $result = $c->l('dom_REMOVE_SUCCEEDED') . " $domain"; |
383 |
|
|
} |
384 |
|
|
} |
385 |
|
|
|
386 |
|
|
- my $title = $c->l('dom_FORM_TITLE'); |
387 |
|
|
- $dom_datas{'domain'} = $domain; |
388 |
|
|
- $dom_datas{'trt'} = $trt; |
389 |
|
|
+ # common parts |
390 |
|
|
+ |
391 |
|
|
+ if ($res ne 'OK') { |
392 |
|
|
+ my $title = $c->l('dom_FORM_TITLE'); |
393 |
|
|
+ $dom_datas{'domain'} = $domain; |
394 |
|
|
+ $dom_datas{'trt'} = $trt; |
395 |
|
|
|
396 |
|
|
-# $c->stash( title => $title, notif => $result ); |
397 |
|
|
-# $c->render(template => 'module'); |
398 |
|
|
- $c->stash( title => $title, notif => $result, dom_datas => \%dom_datas ); |
399 |
|
|
- if ($dom_datas{trt} ne 'SUC') { |
400 |
|
|
- return $c->render(template => 'domains'); |
401 |
|
|
+ $c->stash( error => $result . "($res)" ); |
402 |
|
|
+ $c->stash( title => $title, dom_datas => \%dom_datas ); |
403 |
|
|
+ return $c->render( 'domains' ); |
404 |
|
|
} |
405 |
|
|
- $c->redirect_to('/domains'); |
406 |
|
|
|
407 |
|
|
+ my $message = "'Domains' updates ($trt) DONE"; |
408 |
|
|
+ $c->app->log->info($message); |
409 |
|
|
+ |
410 |
|
|
+ $c->flash( success => $result ); |
411 |
|
|
+ $c->redirect_to('/domains'); |
412 |
|
|
|
413 |
|
|
}; |
414 |
|
|
|
415 |
|
|
@@ -261,8 +265,8 @@ |
416 |
|
|
|
417 |
|
|
$domain = $1 if ($domain =~ /^($REGEXP_DOMAIN)$/); |
418 |
|
|
unless ($domain) { |
419 |
|
|
- return $c->l($action eq 'create' ? 'dom_ERROR_CREATING_DOMAIN' |
420 |
|
|
- : 'dom_ERROR_MODIFYING_DOMAIN'); |
421 |
|
|
+ return ($c->l($action eq 'create' ? 'dom_ERROR_CREATING_DOMAIN' |
422 |
|
|
+ : 'dom_ERROR_MODIFYING_DOMAIN') . ' Ctl'); |
423 |
|
|
} |
424 |
|
|
|
425 |
|
|
my $rec = $ddb->get($domain); |
426 |
|
|
@@ -278,12 +282,10 @@ |
427 |
|
|
$props{$_} = $c->param($_) for ( qw(Content Description Nameservers) ); |
428 |
|
|
$rec->merge_props(%props); |
429 |
|
|
|
430 |
|
|
- my $status = system( "/sbin/e-smith/signal-event", |
431 |
|
|
- "domain-$action", "$domain" ); |
432 |
|
|
- |
433 |
|
|
- if ($status) { |
434 |
|
|
- return ($action eq 'create' ? 'dom_ERROR_CREATING_DOMAIN' |
435 |
|
|
- : 'dom_ERROR_MODIFYING_DOMAIN'); |
436 |
|
|
+ if ( system( "/sbin/e-smith/signal-event", |
437 |
|
|
+ "domain-$action", "$domain" ) != 0 ) { |
438 |
|
|
+ return ($c->l($action eq 'create' ? 'dom_ERROR_CREATING_DOMAIN' |
439 |
|
|
+ : 'dom_ERROR_MODIFYING_DOMAIN') . " Exe $action"); |
440 |
|
|
} |
441 |
|
|
|
442 |
|
|
return 'OK'; |
443 |
|
|
@@ -295,18 +297,49 @@ |
444 |
|
|
my ($c, $domain) = @_; |
445 |
|
|
|
446 |
|
|
$domain = $1 if ($domain =~ /^($REGEXP_DOMAIN)$/); |
447 |
|
|
- return ($c->l('dom_ERROR_WHILE_REMOVING_DOMAIN')) unless ($domain); |
448 |
|
|
+ return ($c->l('dom_ERROR_WHILE_REMOVING_DOMAIN') . ' Ctl') unless ($domain); |
449 |
|
|
|
450 |
|
|
my $rec = $ddb->get($domain); |
451 |
|
|
return ($c->l('dom_NONEXISTENT_DOMAIN_ERROR')) if (not $rec); |
452 |
|
|
|
453 |
|
|
$rec->set_prop('type', 'domain-deleted'); |
454 |
|
|
|
455 |
|
|
- if (system("/sbin/e-smith/signal-event", "domain-delete", "$domain") == 0) { |
456 |
|
|
- $rec->delete; |
457 |
|
|
- return 'OK'; |
458 |
|
|
+ if (system("/sbin/e-smith/signal-event", "domain-delete", "$domain") != 0) { |
459 |
|
|
+ return ($c->l('dom_ERROR_WHILE_REMOVING_DOMAIN') . 'Exe'); |
460 |
|
|
+ } |
461 |
|
|
+ |
462 |
|
|
+ $rec->delete; |
463 |
|
|
+ return 'OK'; |
464 |
|
|
+} |
465 |
|
|
+ |
466 |
|
|
+ |
467 |
|
|
+sub modify_dns { |
468 |
|
|
+ |
469 |
|
|
+ my ($c, $forwarder, $forwarder2) = @_; |
470 |
|
|
+ |
471 |
|
|
+ my $dnscache = $cdb->get('dnscache'); |
472 |
|
|
+ |
473 |
|
|
+ ($forwarder, $forwarder2) = ($forwarder2, '') |
474 |
|
|
+ if ($forwarder2 and not $forwarder); |
475 |
|
|
+ |
476 |
|
|
+ if ($forwarder) { |
477 |
|
|
+ $dnscache->set_prop('Forwarder', $forwarder); |
478 |
|
|
+ } else { |
479 |
|
|
+ $dnscache->delete_prop('Forwarder'); |
480 |
|
|
+ } |
481 |
|
|
+ |
482 |
|
|
+ if ($forwarder2) { |
483 |
|
|
+ $dnscache->set_prop('Forwarder2', $forwarder2); |
484 |
|
|
+ } else { |
485 |
|
|
+ $dnscache->delete_prop('Forwarder2'); |
486 |
|
|
+ } |
487 |
|
|
+ |
488 |
|
|
+ unless ( system( "/sbin/e-smith/signal-event", "dns-update" ) == 0 ) |
489 |
|
|
+ { |
490 |
|
|
+ return $c->l('dom_ERROR_UPDATING'); |
491 |
|
|
} |
492 |
|
|
- return ($c->l('dom_ERROR_WHILE_REMOVING_DOMAIN')); |
493 |
|
|
+ |
494 |
|
|
+ return 'OK'; |
495 |
|
|
} |
496 |
|
|
|
497 |
|
|
|
498 |
|
|
@@ -466,34 +499,4 @@ |
499 |
|
|
|
500 |
|
|
|
501 |
|
|
|
502 |
|
|
-sub modify_dns { |
503 |
|
|
- |
504 |
|
|
- my ($c, $forwarder, $forwarder2) = @_; |
505 |
|
|
- |
506 |
|
|
- my $dnscache = $cdb->get('dnscache'); |
507 |
|
|
- |
508 |
|
|
- ($forwarder, $forwarder2) = ($forwarder2, '') |
509 |
|
|
- if ($forwarder2 and not $forwarder); |
510 |
|
|
- |
511 |
|
|
- if ($forwarder) { |
512 |
|
|
- $dnscache->set_prop('Forwarder', $forwarder); |
513 |
|
|
- } else { |
514 |
|
|
- $dnscache->delete_prop('Forwarder'); |
515 |
|
|
- } |
516 |
|
|
- |
517 |
|
|
- if ($forwarder2) { |
518 |
|
|
- $dnscache->set_prop('Forwarder2', $forwarder2); |
519 |
|
|
- } else { |
520 |
|
|
- $dnscache->delete_prop('Forwarder2'); |
521 |
|
|
- } |
522 |
|
|
- |
523 |
|
|
- unless ( system( "/sbin/e-smith/signal-event", "dns-update" ) == 0 ) |
524 |
|
|
- { |
525 |
|
|
- return $c->l('dom_ERROR_UPDATING'); |
526 |
|
|
- } |
527 |
|
|
- |
528 |
|
|
- return 'OK'; |
529 |
|
|
-} |
530 |
|
|
- |
531 |
|
|
- |
532 |
|
|
1; |
533 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Emailsettings.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Emailsettings.pm |
534 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Emailsettings.pm 2020-04-14 16:50:36.000000000 +0400 |
535 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Emailsettings.pm 2020-04-25 20:58:08.000000000 +0400 |
536 |
|
|
@@ -133,7 +133,6 @@ |
537 |
|
|
$res = $c->change_settings_access(); |
538 |
|
|
$result .= $res unless $res eq 'OK'; |
539 |
|
|
if ( ! $result ) { |
540 |
|
|
- $mai_datas{trt} = 'SUC'; |
541 |
|
|
$result = $c->l('mai_SUCCESS'); |
542 |
|
|
} |
543 |
|
|
} |
544 |
|
|
@@ -152,7 +151,6 @@ |
545 |
|
|
$res = $c->change_settings_filtering(); |
546 |
|
|
$result .= $res unless $res eq 'OK'; |
547 |
|
|
if ( ! $result ) { |
548 |
|
|
- $mai_datas{trt} = 'SUC'; |
549 |
|
|
$result = $c->l('mai_SUCCESS'); |
550 |
|
|
} |
551 |
|
|
} |
552 |
|
|
@@ -171,7 +169,6 @@ |
553 |
|
|
$res = $c->change_settings_reception(); |
554 |
|
|
$result .= $res unless $res eq 'OK'; |
555 |
|
|
if ( ! $result ) { |
556 |
|
|
- $mai_datas{trt} = 'SUC'; |
557 |
|
|
$result = $c->l('mai_SUCCESS'); |
558 |
|
|
} |
559 |
|
|
} |
560 |
|
|
@@ -184,35 +181,42 @@ |
561 |
|
|
|
562 |
|
|
# controls |
563 |
|
|
$res = $c->ip_number_or_blank( $c->param('DelegateMailServer') ); |
564 |
|
|
- $result .= $res . ' DMS ' unless $res eq 'OK'; |
565 |
|
|
+ $result .= $res . ' DMS <br>' unless $res eq 'OK'; |
566 |
|
|
|
567 |
|
|
$res = $c->validate_smarthost( $c->param('SMTPSmartHost') ); |
568 |
|
|
- $result .= $res . ' SH ' unless $res eq 'OK'; |
569 |
|
|
+ $result .= $res . ' SH <br>' unless $res eq 'OK'; |
570 |
|
|
|
571 |
|
|
$res = $c->nonblank_if_smtpauth( $c->param('SMTPSmartHost') ); |
572 |
|
|
- $result .= $res . ' SH ' unless $res eq 'OK'; |
573 |
|
|
+ $result .= $res . ' SH <br>' unless $res eq 'OK'; |
574 |
|
|
|
575 |
|
|
$res = $c->nonblank_if_smtpauth( $c->param('SMTPAUTHPROXY_Userid') ); |
576 |
|
|
- $result .= $res . ' USR ' unless $res eq 'OK'; |
577 |
|
|
+ $result .= $res . ' USR <br>' unless $res eq 'OK'; |
578 |
|
|
|
579 |
|
|
$res = $c->nonblank_if_smtpauth( $c->param('SMTPAUTHPROXY_Passwd') ); |
580 |
|
|
- $result .= $res . ' PWD ' unless $res eq 'OK'; |
581 |
|
|
+ $result .= $res . ' PWD <br>' unless $res eq 'OK'; |
582 |
|
|
|
583 |
|
|
if ( ! $result ) { |
584 |
|
|
$res = $c->change_settings_delivery(); |
585 |
|
|
$result .= $res unless $res eq 'OK'; |
586 |
|
|
if ( ! $result ) { |
587 |
|
|
- $mai_datas{trt} = 'SUC'; |
588 |
|
|
$result = $c->l('mai_SUCCESS'); |
589 |
|
|
} |
590 |
|
|
} |
591 |
|
|
} |
592 |
|
|
|
593 |
|
|
|
594 |
|
|
- $c->stash( title => $title, notif => $result, mai_datas => \%mai_datas ); |
595 |
|
|
- if ($mai_datas{trt} ne 'SUC') { |
596 |
|
|
- return $c->render(template => $dest); |
597 |
|
|
+ # common part |
598 |
|
|
+ |
599 |
|
|
+ if ($res ne 'OK') { |
600 |
|
|
+ $c->stash( error => $result ); |
601 |
|
|
+ $c->stash( title => $title, mai_datas => \%mai_datas ); |
602 |
|
|
+ return $c->render( $dest ); |
603 |
|
|
} |
604 |
|
|
+ |
605 |
|
|
+ my $message = "emailsettings updates $trt DONE"; |
606 |
|
|
+ $c->app->log->info($message); |
607 |
|
|
+ $c->flash( success => $result ); |
608 |
|
|
+ |
609 |
|
|
$c->redirect_to("/emailsettings"); |
610 |
|
|
|
611 |
|
|
}; |
612 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Groups.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Groups.pm |
613 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Groups.pm 2020-04-14 16:50:36.000000000 +0400 |
614 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Groups.pm 2020-04-26 21:22:53.000000000 +0400 |
615 |
|
|
@@ -31,17 +31,15 @@ |
616 |
|
|
|
617 |
|
|
my %grp_datas = (); |
618 |
|
|
my $title = $c->l('grp_FORM_TITLE'); |
619 |
|
|
- my $notif = ''; |
620 |
|
|
|
621 |
|
|
- $grp_datas{trt} = 'LIST'; |
622 |
|
|
+ $grp_datas{trt} = 'LST'; |
623 |
|
|
|
624 |
|
|
my @groups; |
625 |
|
|
- if ($adb) |
626 |
|
|
- { |
627 |
|
|
+ if ($adb) { |
628 |
|
|
@groups = $adb->groups(); |
629 |
|
|
} |
630 |
|
|
|
631 |
|
|
- $c->stash( title => $title, notif => $notif, grp_datas => \%grp_datas, groups => \@groups ); |
632 |
|
|
+ $c->stash( title => $title, grp_datas => \%grp_datas, groups => \@groups ); |
633 |
|
|
$c->render(template => 'groups'); |
634 |
|
|
|
635 |
|
|
}; |
636 |
|
|
@@ -53,21 +51,16 @@ |
637 |
|
|
$c->app->log->info($c->log_req); |
638 |
|
|
|
639 |
|
|
my $rt = $c->current_route; |
640 |
|
|
- my $trt = ($c->param('trt') || 'LIST'); |
641 |
|
|
- my $group = $c->param('group') || ''; |
642 |
|
|
- |
643 |
|
|
- $trt = 'DEL' if ( $rt eq 'groupdel1' ); |
644 |
|
|
- $trt = 'UPD' if ( $rt eq 'groupupd1' ); |
645 |
|
|
- $trt = 'ADD' if ( $rt eq 'groupadd1' ); |
646 |
|
|
+ my $trt = ($c->param('trt') || 'LST'); |
647 |
|
|
+ my $group = $c->param('group'); |
648 |
|
|
|
649 |
|
|
my %grp_datas = (); |
650 |
|
|
my $title = $c->l('grp_FORM_TITLE'); |
651 |
|
|
- my $notif = ''; |
652 |
|
|
|
653 |
|
|
$grp_datas{'trt'} = $trt; |
654 |
|
|
|
655 |
|
|
if ( $trt eq 'ADD' ) { |
656 |
|
|
- |
657 |
|
|
+ #nothing |
658 |
|
|
} |
659 |
|
|
|
660 |
|
|
|
661 |
|
|
@@ -75,14 +68,14 @@ |
662 |
|
|
|
663 |
|
|
my %members = (); |
664 |
|
|
my %users = (); |
665 |
|
|
- |
666 |
|
|
+ |
667 |
|
|
my $rec = $adb->get($group); |
668 |
|
|
if ($rec and $rec->prop('type') eq 'group') { |
669 |
|
|
|
670 |
|
|
$grp_datas{group} = $group; |
671 |
|
|
$grp_datas{description} = $rec->prop('Description') || ''; |
672 |
|
|
|
673 |
|
|
- %members = @{gen_members_list( $c, $group )}; |
674 |
|
|
+ %members = @{$c->gen_members_list( $group )}; |
675 |
|
|
} |
676 |
|
|
|
677 |
|
|
$c->stash( members => \%members, users => \%users ); |
678 |
|
|
@@ -101,18 +94,18 @@ |
679 |
|
|
$grp_datas{group} = $group; |
680 |
|
|
$grp_datas{description} = $rec->prop('Description') || ''; |
681 |
|
|
|
682 |
|
|
- %members = @{gen_members_list($c, $group)}; |
683 |
|
|
+ %members = @{$c->gen_members_list($group)}; |
684 |
|
|
|
685 |
|
|
- %ibays = @{gen_ibays_list($c, $group)}; |
686 |
|
|
+ %ibays = @{$c->gen_ibays_list($group)}; |
687 |
|
|
|
688 |
|
|
} |
689 |
|
|
|
690 |
|
|
- $c->stash( grp_datas => \%grp_datas, members => \%members, ibays => \%ibays ); |
691 |
|
|
+ $c->stash( members => \%members, ibays => \%ibays ); |
692 |
|
|
|
693 |
|
|
} |
694 |
|
|
|
695 |
|
|
|
696 |
|
|
- if ( $trt eq 'LIST' ) { |
697 |
|
|
+ if ( $trt eq 'LST' ) { |
698 |
|
|
my @groups; |
699 |
|
|
if ($adb) { |
700 |
|
|
@groups = $adb->groups(); |
701 |
|
|
@@ -122,7 +115,7 @@ |
702 |
|
|
|
703 |
|
|
} |
704 |
|
|
|
705 |
|
|
- $c->stash( title => $title, notif => $notif, grp_datas => \%grp_datas ); |
706 |
|
|
+ $c->stash( title => $title, grp_datas => \%grp_datas ); |
707 |
|
|
$c->render( template => 'groups' ); |
708 |
|
|
|
709 |
|
|
}; |
710 |
|
|
@@ -134,42 +127,46 @@ |
711 |
|
|
$c->app->log->info($c->log_req); |
712 |
|
|
|
713 |
|
|
my $rt = $c->current_route; |
714 |
|
|
- my $trt = ($c->param('trt') || 'LIST'); |
715 |
|
|
+ my $trt = ($c->param('trt') || 'LST'); |
716 |
|
|
+ my $groupName = $c->param('groupName') || ''; |
717 |
|
|
|
718 |
|
|
- my %grp_datas = (); |
719 |
|
|
my $title = $c->l('grp_FORM_TITLE'); |
720 |
|
|
my ($res, $result) = ''; |
721 |
|
|
- my $groupName = $c->param('groupName'); |
722 |
|
|
+ |
723 |
|
|
+ my %grp_datas = (); |
724 |
|
|
+ $grp_datas{'trt'} = $trt; |
725 |
|
|
+ $grp_datas{'group'} = $groupName; |
726 |
|
|
+ my @members = (); |
727 |
|
|
|
728 |
|
|
if ( $trt eq 'ADD' ) { |
729 |
|
|
|
730 |
|
|
my $groupDesc = $c->param('groupDesc'); |
731 |
|
|
- my @members = @{$c->every_param('groupMembers')}; |
732 |
|
|
- |
733 |
|
|
+ @members = @{$c->every_param('groupMembers')}; |
734 |
|
|
|
735 |
|
|
my $members = join ( ",", @members ); |
736 |
|
|
|
737 |
|
|
- # controls (validate ?????) |
738 |
|
|
- $res = validate_group( $c, $groupName ); |
739 |
|
|
- $result .= $res unless $res eq 'OK'; |
740 |
|
|
+ # controls |
741 |
|
|
+ $res = $c->validate_group( $groupName ); |
742 |
|
|
+ $result .= $res . '<br>' unless $res eq 'OK'; |
743 |
|
|
|
744 |
|
|
- $res = validate_group_length( $c, $groupName ); |
745 |
|
|
- $result .= $res unless $res eq 'OK'; |
746 |
|
|
+ $res = $c->validate_group_length( $groupName ); |
747 |
|
|
+ $result .= $res . '<br>' unless $res eq 'OK'; |
748 |
|
|
|
749 |
|
|
- $res = validate_group_naming_conflict( $c, $groupName ); |
750 |
|
|
- $result .= $res unless $res eq 'OK'; |
751 |
|
|
+ $res = $c->validate_group_naming_conflict( $groupName ); |
752 |
|
|
+ $result .= $res . '<br>' unless $res eq 'OK'; |
753 |
|
|
|
754 |
|
|
- $res = validate_description( $c, $groupDesc ); |
755 |
|
|
- $result .= $res unless $res eq 'OK'; |
756 |
|
|
+ $res = $c->validate_description( $groupDesc ); |
757 |
|
|
+ $result .= $res . '<br>' unless $res eq 'OK'; |
758 |
|
|
|
759 |
|
|
- $res = validate_group_has_members( $c, @members ); |
760 |
|
|
- $result .= $res unless $res eq 'OK'; |
761 |
|
|
+ $res = $c->validate_group_has_members( @members ); |
762 |
|
|
+ $result .= $res . '<br>' unless $res eq 'OK'; |
763 |
|
|
|
764 |
|
|
my %props = ( |
765 |
|
|
'type', 'group', 'Description', |
766 |
|
|
$groupDesc, 'Members', $members |
767 |
|
|
); |
768 |
|
|
|
769 |
|
|
+ $res = ''; |
770 |
|
|
if ( ! $result ) { |
771 |
|
|
|
772 |
|
|
$adb->new_record( $groupName, \%props ); |
773 |
|
|
@@ -177,31 +174,31 @@ |
774 |
|
|
# Untaint groupName before use in system() |
775 |
|
|
($groupName) = ($groupName =~ /^([a-z][\-\_\.a-z0-9]*)$/); |
776 |
|
|
|
777 |
|
|
- system("/sbin/e-smith/signal-event", "group-create", "$groupName") ==0 |
778 |
|
|
+ system("/sbin/e-smith/signal-event", "group-create", "$groupName") == 0 |
779 |
|
|
or $result .= $c->l('qgp_CREATE_ERROR')."\n"; |
780 |
|
|
- |
781 |
|
|
} |
782 |
|
|
- |
783 |
|
|
if ( ! $result ) { |
784 |
|
|
$result = $c->l('grp_CREATED_GROUP') . ' ' . $groupName; |
785 |
|
|
- $trt = 'SUC'; |
786 |
|
|
+ $res = 'OK'; |
787 |
|
|
} |
788 |
|
|
} |
789 |
|
|
|
790 |
|
|
+ |
791 |
|
|
if ( $trt eq 'UPD' ) { |
792 |
|
|
|
793 |
|
|
my $groupDesc = $c->param('groupDesc'); |
794 |
|
|
- my @members = @{$c->every_param('groupMembers')}; |
795 |
|
|
+ @members = @{$c->every_param('groupMembers')}; |
796 |
|
|
my $members = join ( ",", @members ); |
797 |
|
|
|
798 |
|
|
# controls |
799 |
|
|
- my $res = ''; |
800 |
|
|
+ $res = ''; |
801 |
|
|
$res = validate_description( $c, $groupDesc ); |
802 |
|
|
- $result .= $res unless $res eq 'OK'; |
803 |
|
|
+ $result .= $res . '<br>' unless $res eq 'OK'; |
804 |
|
|
|
805 |
|
|
$res = validate_group_has_members( $c, @members ); |
806 |
|
|
- $result .= $res unless $res eq 'OK'; |
807 |
|
|
+ $result .= $res . '<br>' unless $res eq 'OK'; |
808 |
|
|
|
809 |
|
|
+ $res = ''; |
810 |
|
|
if ( ! $result ) { |
811 |
|
|
|
812 |
|
|
$adb->get($groupName)->set_prop( 'Members', $members ); |
813 |
|
|
@@ -212,15 +209,15 @@ |
814 |
|
|
|
815 |
|
|
system("/sbin/e-smith/signal-event", "group-modify", "$groupName") ==0 |
816 |
|
|
or $result .= $c->l('qgp_MODIFY_ERROR')."\n"; |
817 |
|
|
- |
818 |
|
|
} |
819 |
|
|
|
820 |
|
|
if ( ! $result ) { |
821 |
|
|
- $result = $c->l('grp_MODIFIED_GROUP') . ' ' . $groupName; |
822 |
|
|
- $trt = 'SUC'; |
823 |
|
|
+ $result = $c->l('grp_MODIFIED_GROUP') . ' ' . $groupName; |
824 |
|
|
+ $res = 'OK'; |
825 |
|
|
} |
826 |
|
|
} |
827 |
|
|
|
828 |
|
|
+ |
829 |
|
|
if ( $trt eq 'DEL' ) { |
830 |
|
|
|
831 |
|
|
if ($groupName =~ /^([a-z][\-\_\.a-z0-9]*)$/) { |
832 |
|
|
@@ -232,28 +229,35 @@ |
833 |
|
|
my $rec = $adb->get($groupName); |
834 |
|
|
$result .= $c->l('grp_ERR_INTERNAL_FAILURE') . ':' . $groupName unless ($rec); |
835 |
|
|
|
836 |
|
|
+ $res = ''; |
837 |
|
|
if ( ! $result ) { |
838 |
|
|
- my $res = delete_group( $c, $groupName ); |
839 |
|
|
+ $res = delete_group( $c, $groupName ); |
840 |
|
|
$result .= $res unless $res eq 'OK'; |
841 |
|
|
if ( ! $result ) { |
842 |
|
|
$result = $c->l('grp_DELETED_GROUP') . ' ' . $groupName; |
843 |
|
|
- $trt = 'SUC'; |
844 |
|
|
+ $res = 'OK'; |
845 |
|
|
} |
846 |
|
|
} |
847 |
|
|
} |
848 |
|
|
|
849 |
|
|
- $grp_datas{'group'} = $groupName; |
850 |
|
|
- $grp_datas{'trt'} = $trt; |
851 |
|
|
+ # common parts |
852 |
|
|
|
853 |
|
|
- $c->stash( title => $title, notif => $result, grp_datas => \%grp_datas ); |
854 |
|
|
- if ($grp_datas{trt} ne 'SUC') { |
855 |
|
|
- return $c->render(template => 'groups'); |
856 |
|
|
+ if ($res ne 'OK') { |
857 |
|
|
+ $c->stash( error => $result ); |
858 |
|
|
+ my %members = @{$c->gen_members_list($groupName)}; |
859 |
|
|
+ $c->stash( title => $title, members => \%members, grp_datas => \%grp_datas ); |
860 |
|
|
+ return $c->render('groups'); |
861 |
|
|
} |
862 |
|
|
- $c->redirect_to('/groups'); |
863 |
|
|
|
864 |
|
|
+ my $message = "'Groups' updates ($trt) DONE"; |
865 |
|
|
+ $c->app->log->info($message); |
866 |
|
|
+ $c->flash( success => $result ); |
867 |
|
|
+ |
868 |
|
|
+ $c->redirect_to('/groups'); |
869 |
|
|
}; |
870 |
|
|
|
871 |
|
|
|
872 |
|
|
+ |
873 |
|
|
sub delete_group { |
874 |
|
|
|
875 |
|
|
my ( $c, $groupName ) = @_; |
876 |
|
|
@@ -265,7 +269,7 @@ |
877 |
|
|
($groupName) = ($groupName =~ /^([a-z][\-\_\.a-z0-9]*)$/); |
878 |
|
|
|
879 |
|
|
return (system ("/sbin/e-smith/signal-event", "group-delete", "$groupName") || |
880 |
|
|
- !$adb->get($groupName)->delete()) ? |
881 |
|
|
+ ! $adb->get($groupName)->delete()) ? |
882 |
|
|
$c->l('DELETE_ERROR') : 'OK'; |
883 |
|
|
|
884 |
|
|
} |
885 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Printers.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Printers.pm |
886 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Printers.pm 2020-04-14 16:50:36.000000000 +0400 |
887 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Printers.pm 2020-04-26 12:55:00.000000000 +0400 |
888 |
|
|
@@ -28,7 +28,6 @@ |
889 |
|
|
|
890 |
|
|
my %prt_datas = (); |
891 |
|
|
my $title = $c->l('prt_FORM_TITLE'); |
892 |
|
|
- my $modul = ''; |
893 |
|
|
|
894 |
|
|
$prt_datas{'trt'} = 'LIST'; |
895 |
|
|
|
896 |
|
|
@@ -38,7 +37,7 @@ |
897 |
|
|
@printerDrivers = $adb->printers(); |
898 |
|
|
} |
899 |
|
|
|
900 |
|
|
- $c->stash( title => $title, modul => $modul, prt_datas => \%prt_datas, printerDrivers => \@printerDrivers ); |
901 |
|
|
+ $c->stash( title => $title, prt_datas => \%prt_datas, printerDrivers => \@printerDrivers ); |
902 |
|
|
$c->render(template => 'printers'); |
903 |
|
|
|
904 |
|
|
}; |
905 |
|
|
@@ -52,18 +51,17 @@ |
906 |
|
|
my $trt = ($c->param('trt') || 'LIST'); |
907 |
|
|
my $printer = $c->param('printer') || ''; |
908 |
|
|
|
909 |
|
|
- $trt = 'DEL' if ( $printer ); |
910 |
|
|
- $trt = 'ADD' if ( $rt eq 'printeradd' ); |
911 |
|
|
+ #$trt = 'DEL' if ( $printer ); |
912 |
|
|
+ #$trt = 'ADD' if ( $rt eq 'printeradd' ); |
913 |
|
|
|
914 |
|
|
my %prt_datas = (); |
915 |
|
|
my $title = $c->l('prt_FORM_TITLE'); |
916 |
|
|
- my $modul = ''; |
917 |
|
|
|
918 |
|
|
$prt_datas{'trt'} = $trt; |
919 |
|
|
|
920 |
|
|
if ( $trt eq 'ADD' ) { |
921 |
|
|
|
922 |
|
|
- # 'locations list' (call printerLocation_list() within template) |
923 |
|
|
+ # nothing |
924 |
|
|
|
925 |
|
|
} |
926 |
|
|
|
927 |
|
|
@@ -87,7 +85,7 @@ |
928 |
|
|
|
929 |
|
|
} |
930 |
|
|
|
931 |
|
|
- $c->stash( title => $title, modul => $modul, prt_datas => \%prt_datas ); |
932 |
|
|
+ $c->stash( title => $title, prt_datas => \%prt_datas ); |
933 |
|
|
$c->render( template => 'printers' ); |
934 |
|
|
|
935 |
|
|
}; |
936 |
|
|
@@ -101,13 +99,11 @@ |
937 |
|
|
my $rt = $c->current_route; |
938 |
|
|
my $trt = ($c->param('trt') || 'LIST'); |
939 |
|
|
|
940 |
|
|
-# if ( $trt =~ /^([A-Z]3)$/ ) { |
941 |
|
|
-# $trt = $1; |
942 |
|
|
-# } else { |
943 |
|
|
-# return $c->l('prt_ERR_INPUT_CODE') . ': ' . $trt; |
944 |
|
|
-# } |
945 |
|
|
+ my %prt_datas = (); |
946 |
|
|
+ my $title = $c->l('prt_FORM_TITLE'); |
947 |
|
|
+ $prt_datas{'trt'} = $trt; |
948 |
|
|
|
949 |
|
|
- my $result = ''; |
950 |
|
|
+ my ($res, $result) = ''; |
951 |
|
|
|
952 |
|
|
if ( $trt eq 'ADD' ) { |
953 |
|
|
|
954 |
|
|
@@ -116,23 +112,21 @@ |
955 |
|
|
my $location = ($c->param('Location') || ''); |
956 |
|
|
|
957 |
|
|
# controls |
958 |
|
|
- my $res = validate_printer( $c, $name, $description, $location ); |
959 |
|
|
+ $res = $c->validate_printer( $name, $description, $location ); |
960 |
|
|
$result .= $res unless $res eq 'OK'; |
961 |
|
|
|
962 |
|
|
if ( $location eq 'remote' and ! $result) { |
963 |
|
|
- my %prt_datas = (); |
964 |
|
|
- my $title = $c->l('prt_FORM_TITLE'); |
965 |
|
|
- my $modul = ''; |
966 |
|
|
$prt_datas{'trt'} = 'NET'; |
967 |
|
|
$prt_datas{'name'} = $name; |
968 |
|
|
$prt_datas{'description'} = $description; |
969 |
|
|
$prt_datas{'location'} = $location; |
970 |
|
|
- $c->stash( title => $title, modul => $modul, prt_datas => \%prt_datas ); |
971 |
|
|
+ $c->stash( title => $title, prt_datas => \%prt_datas ); |
972 |
|
|
return $c->render( template => 'printers' ); |
973 |
|
|
} |
974 |
|
|
|
975 |
|
|
+ $res = ''; |
976 |
|
|
if ( ! $result ) { |
977 |
|
|
- $res = new_printer( $c, $name, $description, $location ); |
978 |
|
|
+ $res = $c->new_printer( $name, $description, $location ); |
979 |
|
|
#$remoteName, $address ); |
980 |
|
|
$result .= $res unless $res eq 'OK'; |
981 |
|
|
if ( ! $result ) { |
982 |
|
|
@@ -149,12 +143,17 @@ |
983 |
|
|
my $remoteName = ($c->param ('RemoteName') || ''); |
984 |
|
|
my $address = ($c->param ('Address') || ''); |
985 |
|
|
|
986 |
|
|
+ $prt_datas{'name'} = $name; |
987 |
|
|
+ $prt_datas{'description'} = $description; |
988 |
|
|
+ $prt_datas{'location'} = $location; |
989 |
|
|
+ |
990 |
|
|
# controls |
991 |
|
|
- my $res = validate_network( $c, $location, $remoteName, $address); |
992 |
|
|
+ $res = $c->validate_network( $location, $remoteName, $address); |
993 |
|
|
$result .= $res unless $res eq 'OK'; |
994 |
|
|
|
995 |
|
|
+ $res = ''; |
996 |
|
|
if ( ! $result ) { |
997 |
|
|
- $res = new_printer( $c, $name, $description, $location, $remoteName, $address ); |
998 |
|
|
+ $res = $c->new_printer( $name, $description, $location, $remoteName, $address ); |
999 |
|
|
$result .= $res unless $res eq 'OK'; |
1000 |
|
|
if ( ! $result ) { |
1001 |
|
|
$result = $c->l('prt_CREATED_SUCCESSFULLY') . ' ' . $name; |
1002 |
|
|
@@ -175,8 +174,9 @@ |
1003 |
|
|
my $rec = $adb->get($printer); |
1004 |
|
|
$result .= $c->l('prt_ERR_INTERNAL_FAILURE') . ':' . $printer unless ($rec); |
1005 |
|
|
|
1006 |
|
|
+ $res = ''; |
1007 |
|
|
if ( ! $result ) { |
1008 |
|
|
- my $res = del_printer( $c, $printer ); |
1009 |
|
|
+ $res = $c->del_printer( $printer ); |
1010 |
|
|
$result .= $res unless $res eq 'OK'; |
1011 |
|
|
if ( ! $result ) { |
1012 |
|
|
$result = $c->l('prt_DELETED_SUCCESSFULLY') . ' ' . $printer; |
1013 |
|
|
@@ -184,10 +184,20 @@ |
1014 |
|
|
} |
1015 |
|
|
} |
1016 |
|
|
|
1017 |
|
|
- my $title = $c->l('prt_FORM_TITLE'); |
1018 |
|
|
+ # common parts |
1019 |
|
|
+ |
1020 |
|
|
+ if ($res ne 'OK') { |
1021 |
|
|
+ $c->stash( error => $result ); |
1022 |
|
|
+ $c->stash( title => $title, prt_datas => \%prt_datas ); |
1023 |
|
|
+ return $c->render('printers'); |
1024 |
|
|
+ } |
1025 |
|
|
+ |
1026 |
|
|
+ my $message = "'Printers' updates ($trt) DONE"; |
1027 |
|
|
+ $c->app->log->info($message); |
1028 |
|
|
+ $c->flash( success => $result ); |
1029 |
|
|
+ #$c->flash( error => 'No changes applied !!' ); # for testing purpose |
1030 |
|
|
|
1031 |
|
|
- $c->stash( title => $title, modul => $result ); |
1032 |
|
|
- $c->render(template => 'module'); |
1033 |
|
|
+ $c->redirect_to('/printers'); |
1034 |
|
|
|
1035 |
|
|
}; |
1036 |
|
|
|
1037 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Pseudonyms.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Pseudonyms.pm |
1038 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Pseudonyms.pm 2020-04-14 16:50:36.000000000 +0400 |
1039 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Pseudonyms.pm 2020-04-26 16:37:25.000000000 +0400 |
1040 |
|
|
@@ -36,7 +36,7 @@ |
1041 |
|
|
my $title = $c->l('pse_FORM_TITLE'); |
1042 |
|
|
my $notif = ''; |
1043 |
|
|
|
1044 |
|
|
- $pse_datas{trt} = 'LIST'; |
1045 |
|
|
+ $pse_datas{trt} = 'LST'; |
1046 |
|
|
|
1047 |
|
|
my @pseudonyms; |
1048 |
|
|
if ($adb) |
1049 |
|
|
@@ -44,24 +44,6 @@ |
1050 |
|
|
@pseudonyms = $adb->pseudonyms(); |
1051 |
|
|
} |
1052 |
|
|
|
1053 |
|
|
-# foreach my $i (0 .. $#pseudonyms) { |
1054 |
|
|
-# if ( $pseudonyms[$i]->prop('type') eq 'pseudonym' ) { |
1055 |
|
|
-# my $account = $pseudonyms[$i]->prop('Account'); |
1056 |
|
|
-# my $accountO = $account; |
1057 |
|
|
-# $account = "Administrator" if ($account eq "admin"); |
1058 |
|
|
-# $account = $c->l("pse_EVERYONE") if ($account eq "shared"); |
1059 |
|
|
-# my $visible = $pseudonyms[$i]->prop('Visible'); |
1060 |
|
|
-# $account .= $c->l("pse_LOCAL_ONLY") |
1061 |
|
|
-# if (defined $visible && $visible eq "internal"); |
1062 |
|
|
-# if ( $account ne $accountO ) { |
1063 |
|
|
-# $c->app->log->info( "pseudo $i: $accountO -> $account " ); |
1064 |
|
|
-# $pseudonyms[$i] =~ s/$accountO/$account/; |
1065 |
|
|
-# # . $c->dumper( $pseudonyms[$i] ) ) |
1066 |
|
|
-# } |
1067 |
|
|
-# } |
1068 |
|
|
-# } |
1069 |
|
|
-# $c->app->log->info("pseudos: " . $c->dumper(@pseudonyms)); |
1070 |
|
|
- |
1071 |
|
|
$c->stash( title => $title, notif => $notif, pse_datas => \%pse_datas, pseudonyms => \@pseudonyms ); |
1072 |
|
|
$c->render(template => 'pseudonyms'); |
1073 |
|
|
|
1074 |
|
|
@@ -74,21 +56,15 @@ |
1075 |
|
|
$c->app->log->info($c->log_req); |
1076 |
|
|
|
1077 |
|
|
my $rt = $c->current_route; |
1078 |
|
|
- my $trt = ($c->param('trt') || 'LIST'); |
1079 |
|
|
+ my $trt = ($c->param('trt') || 'LST'); |
1080 |
|
|
my $pseudonym = $c->param('pseudonym') || ''; |
1081 |
|
|
|
1082 |
|
|
- $trt = 'DEL' if ( $rt eq 'pseudodel1' ); |
1083 |
|
|
- $trt = 'UPD' if ( $rt eq 'pseudoupd1' ); |
1084 |
|
|
- $trt = 'ADD' if ( $rt eq 'pseudoadd1' ); |
1085 |
|
|
- |
1086 |
|
|
- my %pse_datas = (); |
1087 |
|
|
my $title = $c->l('pse_FORM_TITLE'); |
1088 |
|
|
- my $notif = ''; |
1089 |
|
|
- |
1090 |
|
|
+ my %pse_datas = (); |
1091 |
|
|
$pse_datas{'trt'} = $trt; |
1092 |
|
|
|
1093 |
|
|
if ( $trt eq 'ADD' ) { |
1094 |
|
|
- |
1095 |
|
|
+ #nothing |
1096 |
|
|
} |
1097 |
|
|
|
1098 |
|
|
if ( $trt eq 'UPD' ) { |
1099 |
|
|
@@ -114,7 +90,7 @@ |
1100 |
|
|
} |
1101 |
|
|
} |
1102 |
|
|
|
1103 |
|
|
- if ( $trt eq 'LIST' ) { |
1104 |
|
|
+ if ( $trt eq 'LST' ) { |
1105 |
|
|
my @pseudonyms; |
1106 |
|
|
if ($adb) { |
1107 |
|
|
@pseudonyms = $adb->pseudonyms(); |
1108 |
|
|
@@ -123,7 +99,7 @@ |
1109 |
|
|
|
1110 |
|
|
} |
1111 |
|
|
|
1112 |
|
|
- $c->stash( title => $title, notif => $notif, pse_datas => \%pse_datas ); |
1113 |
|
|
+ $c->stash( title => $title, pse_datas => \%pse_datas ); |
1114 |
|
|
$c->render( template => 'pseudonyms' ); |
1115 |
|
|
|
1116 |
|
|
}; |
1117 |
|
|
@@ -135,40 +111,41 @@ |
1118 |
|
|
$c->app->log->info($c->log_req); |
1119 |
|
|
|
1120 |
|
|
my $rt = $c->current_route; |
1121 |
|
|
- my $trt = ($c->param('trt') || 'LIST'); |
1122 |
|
|
+ my $trt = ($c->param('trt') || 'LST'); |
1123 |
|
|
|
1124 |
|
|
+ my $title = $c->l('pse_FORM_TITLE'); |
1125 |
|
|
my %pse_datas = (); |
1126 |
|
|
- my $result = ''; |
1127 |
|
|
+ $pse_datas{'trt'} = $trt; |
1128 |
|
|
+ |
1129 |
|
|
+ my ($res, $result) = ''; |
1130 |
|
|
|
1131 |
|
|
#my $pseudonym = uri_unescape($c->param('Pseudonym')); |
1132 |
|
|
my $pseudonym = $c->param('Pseudonym'); |
1133 |
|
|
+ $pse_datas{'pseudonym'} = $pseudonym; |
1134 |
|
|
|
1135 |
|
|
if ( $trt eq 'ADD' ) { |
1136 |
|
|
|
1137 |
|
|
my $account = $c->param('Account'); |
1138 |
|
|
|
1139 |
|
|
- # controls (validate ?????) |
1140 |
|
|
- my $res = validate_new_pseudonym_name( $c, $pseudonym, $account ); |
1141 |
|
|
+ # controls |
1142 |
|
|
+ $res = $c->validate_new_pseudonym_name( $pseudonym, $account ); |
1143 |
|
|
$result .= $res unless $res eq 'OK'; |
1144 |
|
|
|
1145 |
|
|
#$result .= ' blocked'; |
1146 |
|
|
|
1147 |
|
|
+ $res = ''; |
1148 |
|
|
if ( ! $result ) { |
1149 |
|
|
- |
1150 |
|
|
$adb->new_record( $pseudonym, { type => 'pseudonym', |
1151 |
|
|
Account => $account} ) |
1152 |
|
|
or $result .= "Error occurred while creating pseudonym in database."; |
1153 |
|
|
- |
1154 |
|
|
# Untaint $pseudonym before use in system() |
1155 |
|
|
($pseudonym) = ($pseudonym =~ /(.+)/); |
1156 |
|
|
system( "/sbin/e-smith/signal-event", "pseudonym-create", "$pseudonym",) |
1157 |
|
|
== 0 or $result .= 'pse_CREATE_ERROR.'; |
1158 |
|
|
- |
1159 |
|
|
} |
1160 |
|
|
- |
1161 |
|
|
if ( ! $result ) { |
1162 |
|
|
+ $res = 'OK'; |
1163 |
|
|
$result = $c->l('pse_CREATE_SUCCEEDED') . ' ' . $pseudonym; |
1164 |
|
|
- $trt = 'SUC'; |
1165 |
|
|
} |
1166 |
|
|
} |
1167 |
|
|
|
1168 |
|
|
@@ -186,62 +163,60 @@ |
1169 |
|
|
} |
1170 |
|
|
|
1171 |
|
|
# controls |
1172 |
|
|
- #my $res = ''; |
1173 |
|
|
+ #$res = ''; |
1174 |
|
|
#$res = validate_description( $c, $account ); |
1175 |
|
|
#$result .= $res unless $res eq 'OK'; |
1176 |
|
|
|
1177 |
|
|
#$result .= 'blocked'; |
1178 |
|
|
|
1179 |
|
|
+ $res = ''; |
1180 |
|
|
if ( ! $result ) { |
1181 |
|
|
- |
1182 |
|
|
$adb->get($pseudonym)->merge_props(%props) |
1183 |
|
|
or $result .= "Error occurred while modifying pseudonym in database."; |
1184 |
|
|
- |
1185 |
|
|
# Untaint $pseudonym before use in system() |
1186 |
|
|
($pseudonym) = ($pseudonym =~ /(.+)/); |
1187 |
|
|
system( "/sbin/e-smith/signal-event", "pseudonym-modify", "$pseudonym",) |
1188 |
|
|
== 0 or $result .= "Error occurred while modifying pseudonym."; |
1189 |
|
|
- |
1190 |
|
|
} |
1191 |
|
|
- |
1192 |
|
|
if ( ! $result ) { |
1193 |
|
|
- $result = $c->l('pse_MODIFY_SUCCEEDED') . ' ' . $pseudonym; |
1194 |
|
|
- $trt = 'SUC'; |
1195 |
|
|
+ $res = 'OK'; |
1196 |
|
|
+ $result = $c->l('pse_MODIFY_SUCCEEDED') . ' ' . $pseudonym; |
1197 |
|
|
} |
1198 |
|
|
} |
1199 |
|
|
|
1200 |
|
|
- |
1201 |
|
|
if ( $trt eq 'DEL' ) { |
1202 |
|
|
|
1203 |
|
|
# controls |
1204 |
|
|
- my $res = ''; |
1205 |
|
|
+ $res = ''; |
1206 |
|
|
$res = validate_is_pseudonym($c, $pseudonym); |
1207 |
|
|
$result .= $res unless $res eq 'OK'; |
1208 |
|
|
|
1209 |
|
|
#$result .= 'blocked'; |
1210 |
|
|
|
1211 |
|
|
+ $res = ''; |
1212 |
|
|
if ( ! $result ) { |
1213 |
|
|
- my $res = delete_pseudonym( $c, $pseudonym ); |
1214 |
|
|
+ $res = $c->delete_pseudonym( $pseudonym ); |
1215 |
|
|
$result .= $res unless $res eq 'OK'; |
1216 |
|
|
if ( ! $result ) { |
1217 |
|
|
+ $res = 'OK'; |
1218 |
|
|
$result = $c->l('pse_REMOVE_SUCCEEDED') . ' ' . $pseudonym; |
1219 |
|
|
- $trt = 'SUC'; |
1220 |
|
|
} |
1221 |
|
|
} |
1222 |
|
|
} |
1223 |
|
|
|
1224 |
|
|
- my $title = $c->l('pse_FORM_TITLE'); |
1225 |
|
|
- $pse_datas{'pseudonym'} = $pseudonym; |
1226 |
|
|
- $pse_datas{'trt'} = $trt; |
1227 |
|
|
+ # common parts |
1228 |
|
|
|
1229 |
|
|
-# $c->stash( title => $title, notif => $result ); |
1230 |
|
|
-# $c->render(template => 'module'); |
1231 |
|
|
- $c->stash( title => $title, notif => $result, pse_datas => \%pse_datas ); |
1232 |
|
|
- if ($pse_datas{trt} ne 'SUC') { |
1233 |
|
|
- return $c->render(template => 'pseudonyms'); |
1234 |
|
|
+ if ( $res ne 'OK' ) { |
1235 |
|
|
+ $c->stash( error => $result); |
1236 |
|
|
+ $c->stash( title => $title, pse_datas => \%pse_datas ); |
1237 |
|
|
+ return $c->render('pseudonyms'); |
1238 |
|
|
} |
1239 |
|
|
- $c->redirect_to('/pseudonyms'); |
1240 |
|
|
|
1241 |
|
|
+ my $message = "'Pseudonyms' updates $trt DONE"; |
1242 |
|
|
+ $c->app->log->info($message); |
1243 |
|
|
+ $c->flash( success => $result ); |
1244 |
|
|
+ |
1245 |
|
|
+ $c->redirect_to('/pseudonyms'); |
1246 |
|
|
|
1247 |
|
|
}; |
1248 |
|
|
|
1249 |
|
|
@@ -384,30 +359,22 @@ |
1250 |
|
|
my ($c, $pseudonym, $account) = @_; |
1251 |
|
|
|
1252 |
|
|
my $acct = $adb->get($pseudonym); |
1253 |
|
|
+ |
1254 |
|
|
if (defined $acct) { |
1255 |
|
|
return($c->l('pse_NAME_IN_USE')); |
1256 |
|
|
- } |
1257 |
|
|
- elsif ($pseudonym =~ /@/) |
1258 |
|
|
- { |
1259 |
|
|
- use esmith::DomainsDB; |
1260 |
|
|
|
1261 |
|
|
+ } elsif ($pseudonym =~ /@/) { |
1262 |
|
|
+ use esmith::DomainsDB; |
1263 |
|
|
my $ddb = esmith::DomainsDB->open_ro |
1264 |
|
|
or die "Couldn't open DomainsDB\n"; |
1265 |
|
|
- |
1266 |
|
|
my ($lhs, $rhs) = split /@/, $pseudonym; |
1267 |
|
|
- |
1268 |
|
|
return ($c->l('pse_PSEUDONYM_INVALID_DOMAIN')) unless ($ddb->get($rhs)); |
1269 |
|
|
+ return ($c->l('pse_PSEUDONYM_INVALID_SAMEACCT')) if ($lhs eq $account); |
1270 |
|
|
+ return ('OK'); # p:' . $pseudonym . ' a:' . $account); |
1271 |
|
|
|
1272 |
|
|
- return ($c->l('pse_PSEUDONYM_INVALID_SAMEACCT')) |
1273 |
|
|
- if ($lhs eq $account); |
1274 |
|
|
- |
1275 |
|
|
- return ('OK p:' . $pseudonym . ' a:' . $account); |
1276 |
|
|
- } |
1277 |
|
|
- elsif ( $pseudonym !~ /^([a-z0-9][a-z0-9\.\-_!#\?~\$\^\+&`%\/\*]*)$/ ) |
1278 |
|
|
- { |
1279 |
|
|
+ } elsif ( $pseudonym !~ /^([a-z0-9][a-z0-9\.\-_!#\?~\$\^\+&`%\/\*]*)$/ ) { |
1280 |
|
|
return($c->l('pse_VALID_PSEUDONYM_NAMES')); |
1281 |
|
|
- } |
1282 |
|
|
- else { |
1283 |
|
|
+ } else { |
1284 |
|
|
return('OK'); |
1285 |
|
|
} |
1286 |
|
|
} |
1287 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Starterwebsite.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Starterwebsite.pm |
1288 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Starterwebsite.pm 2020-04-14 13:05:12.000000000 +0400 |
1289 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Starterwebsite.pm 2020-04-25 19:49:29.000000000 +0400 |
1290 |
|
|
@@ -52,15 +52,15 @@ |
1291 |
|
|
if (change2_settings( $c, $companyname, $header1, $desc1, $header2, $desc2 ) != 0) { |
1292 |
|
|
$result .= 'Htm file creation error !!'; |
1293 |
|
|
} |
1294 |
|
|
- |
1295 |
|
|
+ |
1296 |
|
|
if ( $result eq '' ) { |
1297 |
|
|
my $url = "http://www.".$db->get('DomainName')->value(); |
1298 |
|
|
my $href = "<a href=\"$url\">$url</a>"; |
1299 |
|
|
- $result = $c->render_to_string(inline => $c->l('sws_SUCCESS').'<br><br>'.$href); |
1300 |
|
|
+ $result = $c->render_to_string(inline => $c->l('sws_SUCCESS').'<br>'.$href); |
1301 |
|
|
} |
1302 |
|
|
|
1303 |
|
|
- $c->stash( title => $title, modul => $result ); |
1304 |
|
|
- $c->render(template => 'module'); |
1305 |
|
|
+ $c->flash( success => $result ); |
1306 |
|
|
+ $c->redirect_to("/"); |
1307 |
|
|
}; |
1308 |
|
|
|
1309 |
|
|
|
1310 |
|
|
@@ -81,6 +81,7 @@ |
1311 |
|
|
return 0; |
1312 |
|
|
} |
1313 |
|
|
|
1314 |
|
|
+ |
1315 |
|
|
sub format_page { |
1316 |
|
|
my ($c, $companyname, $header1, $desc1, $header2, $desc2) = @_; |
1317 |
|
|
|
1318 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr.pm |
1319 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr.pm 2020-04-16 15:27:03.000000000 +0400 |
1320 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr.pm 2020-04-25 13:19:29.000000000 +0400 |
1321 |
|
|
@@ -5,8 +5,12 @@ |
1322 |
|
|
|
1323 |
|
|
use Mojolicious::Lite; |
1324 |
|
|
|
1325 |
|
|
+#has description => 'server manager 2 : mojolicious app'; |
1326 |
|
|
+#has usage => 'called via apache server cgi mode'; |
1327 |
|
|
+ |
1328 |
|
|
use utf8; |
1329 |
|
|
|
1330 |
|
|
+#use SrvMngr::Navigation; |
1331 |
|
|
use SrvMngr::I18N; |
1332 |
|
|
use SrvMngr::Model::Main; |
1333 |
|
|
|
1334 |
|
|
@@ -141,8 +145,7 @@ |
1335 |
|
|
#----------------------------------------------------- |
1336 |
|
|
|
1337 |
|
|
my $navigation_ctlr_ignore = |
1338 |
|
|
- "(\.\.?|Initial\.pm|Manual\.pm|Swttheme\.pm|Request\.pm|Modules\.pm|" . |
1339 |
|
|
- "Main\.pm|Welcome\.pm|Modsearch\.pm(-.*)?)"; |
1340 |
|
|
+ "(\.\.?|Initial\.pm|Manual\.pm|Swttheme\.pm|Request\.pm|Modules\.pm|Modsearch\.pm(-.*)?)"; |
1341 |
|
|
my $navigation_cgi_ignore = |
1342 |
|
|
"(\.\.?|navigation|noframes|online-manual|(internal|pleasewait)(-.*)?)"; |
1343 |
|
|
|
1344 |
|
|
@@ -277,6 +280,13 @@ |
1345 |
|
|
my $c = shift; |
1346 |
|
|
my $lang = shift || ''; |
1347 |
|
|
|
1348 |
|
|
+ #sub lg_sp { |
1349 |
|
|
+ #app->log->info("hook_b_r->panel route. lang: $lang namespace: $moduleLong ldir; $I18Ndir"); |
1350 |
|
|
+ #$c->languages( $lang ) if ( defined $lang ); |
1351 |
|
|
+ #$c->i18ns( $moduleLong ); |
1352 |
|
|
+ #return 0; |
1353 |
|
|
+ #} |
1354 |
|
|
+ |
1355 |
|
|
my $panel = $c->tx->req->url; |
1356 |
|
|
$panel = '/initial' if ($panel eq ''); |
1357 |
|
|
|
1358 |
|
|
@@ -289,11 +299,20 @@ |
1359 |
|
|
|
1360 |
|
|
app->log->info("$module $moduleLong $I18Ndir"); |
1361 |
|
|
if ( -d $I18Ndir ) { |
1362 |
|
|
- app->log->info("hook_b_r->panel route : lang: $lang namespace: $moduleLong"); |
1363 |
|
|
- #if ( $module eq 'Manual' or $module eq 'Clamav') { |
1364 |
|
|
+ app->log->info("hook_b_r->panel route. lang: $lang namespace: $moduleLong ldir; $I18Ndir"); |
1365 |
|
|
+ $c->languages( $lang ) if ( defined $lang ); |
1366 |
|
|
+ $c->i18ns( $moduleLong ); |
1367 |
|
|
+ #lg_sp(); |
1368 |
|
|
+ } else { |
1369 |
|
|
+ ( $moduleLong = $moduleLong) =~ s/.$//; |
1370 |
|
|
+ ( $I18Ndir = $I18Ndir) =~ s/.$//; |
1371 |
|
|
+ if ( -d $I18Ndir ) { |
1372 |
|
|
+ app->log->info("hook_b_r->panel route. lang: $lang namespace: $moduleLong ldir; $I18Ndir"); |
1373 |
|
|
$c->languages( $lang ) if ( defined $lang ); |
1374 |
|
|
$c->i18ns( $moduleLong ); |
1375 |
|
|
- #} |
1376 |
|
|
+ } else { |
1377 |
|
|
+ warn "Locale lexicon missing for $module \n"; |
1378 |
|
|
+ } |
1379 |
|
|
} |
1380 |
|
|
}; |
1381 |
|
|
|
1382 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/script/srvmngr.pl smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/script/srvmngr.pl |
1383 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/script/srvmngr.pl 2020-04-16 14:41:47.000000000 +0400 |
1384 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/script/srvmngr.pl 2020-04-27 10:47:14.468000000 +0400 |
1385 |
|
|
@@ -15,7 +15,7 @@ |
1386 |
|
|
use FindBin; |
1387 |
|
|
use lib "$FindBin::Bin/lib"; |
1388 |
|
|
use lib "$FindBin::Bin/../lib"; |
1389 |
|
|
-use lib "$FindBin::Bin/../cgi-bin/srvmngr/lib"; |
1390 |
|
|
+#use lib "$FindBin::Bin/../cgi-bin/srvmngr/lib"; |
1391 |
|
|
|
1392 |
|
|
my $config = plugin 'Config'; |
1393 |
|
|
|
1394 |
|
|
@@ -78,28 +78,18 @@ |
1395 |
|
|
$r->get('/directory')->to('directory#main')->name('directory'); |
1396 |
|
|
$r->post('/directory')->to('directory#do_update')->name('directory2'); |
1397 |
|
|
|
1398 |
|
|
-$r->get('/domains')->to('domains#main')->name('domains'); |
1399 |
|
|
-$r->post('/domains')->to('domains#do_display')->name('domainadd1'); |
1400 |
|
|
-$r->post('/domainadd')->to('domains#do_update')->name('domainadd2'); |
1401 |
|
|
-$r->get('/domainupd')->to('domains#do_display')->name('domainupd1'); |
1402 |
|
|
-$r->post('/domainupd')->to('domains#do_update')->name('domainupd2'); |
1403 |
|
|
-$r->get('/domaindel')->to('domains#do_display')->name('domaindel1'); |
1404 |
|
|
-$r->post('/domaindel')->to('domains#do_update')->name('domaindel2'); |
1405 |
|
|
-$r->get('/domainup2')->to('domains#do_display')->name('domainup21'); |
1406 |
|
|
-$r->post('/domainup2')->to('domains#do_update')->name('domainup22'); |
1407 |
|
|
+$r->get('/domains')->to('domains#main')->name('domainsg'); |
1408 |
|
|
+$r->post('/domains')->to('domains#do_display')->name('domainsp'); |
1409 |
|
|
+$r->get('/domains2')->to('domains#do_display')->name('domains2g'); |
1410 |
|
|
+$r->post('/domains2')->to('domains#do_update')->name('domains2p'); |
1411 |
|
|
|
1412 |
|
|
$r->get('/emailsettings')->to('emailsettings#main')->name('emailsettings'); |
1413 |
|
|
$r->post('/emailsettings')->to('emailsettings#do_display')->name('emailsetting'); |
1414 |
|
|
-$r->get('/emailsettingd')->to('emailsettings#do_display')->name('emailsettingd'); |
1415 |
|
|
$r->post('/emailsettingd')->to('emailsettings#do_update')->name('emailsettingu'); |
1416 |
|
|
|
1417 |
|
|
-$r->get('/groups')->to('groups#main')->name('groups'); |
1418 |
|
|
-$r->post('/groups')->to('groups#do_display')->name('groupadd1'); |
1419 |
|
|
-$r->post('/groupadd')->to('groups#do_update')->name('groupadd2'); |
1420 |
|
|
-$r->get('/groupupd')->to('groups#do_display')->name('groupupd1'); |
1421 |
|
|
-$r->post('/groupupd')->to('groups#do_update')->name('groupupd2'); |
1422 |
|
|
-$r->get('/groupdel')->to('groups#do_display')->name('groupdel1'); |
1423 |
|
|
-$r->post('/groupdel')->to('groups#do_update')->name('groupdel2'); |
1424 |
|
|
+$r->get('/groups')->to('groups#main')->name('groupsg'); |
1425 |
|
|
+$r->get('/groups2')->to('groups#do_display')->name('groups2g'); |
1426 |
|
|
+$r->post('/groups2')->to('groups#do_update')->name('groups2p'); |
1427 |
|
|
|
1428 |
|
|
$r->get('/hostentries')->to('hostentries#main')->name('hostentries'); |
1429 |
|
|
$r->post('/hostentries')->to('hostentries#do_display')->name('hostentryadd'); |
1430 |
|
|
@@ -131,23 +121,16 @@ |
1431 |
|
|
$r->get('/portforwardingdel')->to('portforwarding#do_display')->name('portforwardingdel'); |
1432 |
|
|
$r->post('/portforwardingdel1')->to('portforwarding#do_display')->name('portforwardingdel1'); |
1433 |
|
|
|
1434 |
|
|
-$r->get('/printers')->to('printers#main')->name('printers'); |
1435 |
|
|
-$r->post('/printers')->to('printers#do_display')->name('printeradd'); |
1436 |
|
|
-$r->get('/printers2')->to('printers#do_update')->name('printernet'); |
1437 |
|
|
-$r->post('/printers2')->to('printers#do_update')->name('printerupd'); |
1438 |
|
|
-$r->get('/printdel')->to('printers#do_display')->name('printerdel'); |
1439 |
|
|
-$r->post('/printdel')->to('printers#do_update')->name('printerdel2'); |
1440 |
|
|
+$r->get('/printers')->to('printers#main')->name('printersg'); |
1441 |
|
|
+$r->get('/printers2')->to('printers#do_display')->name('printers2g'); |
1442 |
|
|
+$r->post('/printers2')->to('printers#do_update')->name('printers2p'); |
1443 |
|
|
|
1444 |
|
|
$r->get('/proxy')->to('proxy#main')->name('proxy'); |
1445 |
|
|
$r->post('/proxy')->to('proxy#do_update')->name('proxy2'); |
1446 |
|
|
|
1447 |
|
|
-$r->get('/pseudonyms')->to('pseudonyms#main')->name('pseudonyms'); |
1448 |
|
|
-$r->post('/pseudonyms')->to('pseudonyms#do_display')->name('pseudoadd1'); |
1449 |
|
|
-$r->post('/pseudoadd')->to('pseudonyms#do_update')->name('pseudoadd2'); |
1450 |
|
|
-$r->get('/pseudoupd')->to('pseudonyms#do_display')->name('pseudoupd1'); |
1451 |
|
|
-$r->post('/pseudoupd')->to('pseudonyms#do_update')->name('pseudoupd2'); |
1452 |
|
|
-$r->get('/pseudodel')->to('pseudonyms#do_display')->name('pseudodel1'); |
1453 |
|
|
-$r->post('/pseudodel')->to('pseudonyms#do_update')->name('pseudodel2'); |
1454 |
|
|
+$r->get('/pseudonyms')->to('pseudonyms#main')->name('pseudonymsg'); |
1455 |
|
|
+$r->get('/pseudonyms2')->to('pseudonyms#do_display')->name('pseudonyms2g'); |
1456 |
|
|
+$r->post('/pseudonyms2')->to('pseudonyms#do_update')->name('pseudonyms2p'); |
1457 |
|
|
|
1458 |
|
|
$r->get('/qmailanalog')->to('qmailanalog#main')->name('qmailanalog'); |
1459 |
|
|
$r->post('/qmailanalog')->to('qmailanalog#do_update')->name('qmailanalog2'); |
1460 |
|
|
@@ -170,8 +153,6 @@ |
1461 |
|
|
|
1462 |
|
|
$r->get('/support')->to('support#main')->name('support'); |
1463 |
|
|
|
1464 |
|
|
-$r->post('/swttheme')->to('swttheme#main')->name('swttheme'); |
1465 |
|
|
- |
1466 |
|
|
$r->get('/useraccounts')->to('useraccounts#main')->name('useraccounts'); |
1467 |
|
|
$r->post('/useraccounts')->to('useraccounts#do_display')->name('useraccountadd'); |
1468 |
|
|
$r->get('/useraccountd')->to('useraccounts#do_display')->name('useraccountdis'); |
1469 |
|
|
@@ -224,6 +205,9 @@ |
1470 |
|
|
|
1471 |
|
|
app->hook(before_routes => sub { |
1472 |
|
|
my $c = shift; |
1473 |
|
|
+ if ( not defined $c->session->{lang} ) { |
1474 |
|
|
+ SrvMngr::init_session_cgi ( $c ); |
1475 |
|
|
+ } |
1476 |
|
|
lang_space( $c, $c->session->{lang} ); |
1477 |
|
|
}); |
1478 |
|
|
|
1479 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_desktop_backup.html.ep.inac smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_desktop_backup.html.ep.inac |
1480 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_desktop_backup.html.ep.inac 1970-01-01 04:00:00.000000000 +0400 |
1481 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_desktop_backup.html.ep.inac 2020-04-26 23:23:08.000000000 +0400 |
1482 |
|
|
@@ -0,0 +1,28 @@ |
1483 |
|
|
+% layout 'default', title => "Sme server 2 - desktop-backup"; |
1484 |
|
|
+ |
1485 |
|
|
+% content_for 'module' => begin |
1486 |
|
|
+ |
1487 |
|
|
+<div id="module"> |
1488 |
|
|
+ % if ($config->{debug} == 1) { |
1489 |
|
|
+ <p> |
1490 |
|
|
+ %= dumper $c->current_route |
1491 |
|
|
+ %= dumper $bac_datas |
1492 |
|
|
+ </p> |
1493 |
|
|
+ % } |
1494 |
|
|
+ |
1495 |
|
|
+ % if ( stash 'error' ) { |
1496 |
|
|
+ <br><div class=sme-error> |
1497 |
|
|
+ %= $c->render_to_string(inline => stash 'error') |
1498 |
|
|
+ </div> |
1499 |
|
|
+ %} |
1500 |
|
|
+ |
1501 |
|
|
+ <h1><%= $title%></h1> |
1502 |
|
|
+ |
1503 |
|
|
+ <h2> |
1504 |
|
|
+ %=l 'bac_DESKTOP_BACKUP' |
1505 |
|
|
+ </h2><br> |
1506 |
|
|
+ %= hidden_field 'Function' => $bac_datas->{'function'} |
1507 |
|
|
+ |
1508 |
|
|
+</div> |
1509 |
|
|
+ |
1510 |
|
|
+% end |
1511 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_tape_configure.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_tape_configure.html.ep |
1512 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_tape_configure.html.ep 2020-04-14 16:50:36.000000000 +0400 |
1513 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_tape_configure.html.ep 2020-04-26 23:22:56.000000000 +0400 |
1514 |
|
|
@@ -1,4 +1,4 @@ |
1515 |
|
|
-% layout 'default', title => "Sme server 2 - backup", share_dir => './'; |
1516 |
|
|
+% layout 'default', title => "Sme server 2 - backup"; |
1517 |
|
|
|
1518 |
|
|
% content_for 'module' => begin |
1519 |
|
|
|
1520 |
|
|
@@ -10,6 +10,12 @@ |
1521 |
|
|
</p> |
1522 |
|
|
% } |
1523 |
|
|
|
1524 |
|
|
+ % if ( stash 'error' ) { |
1525 |
|
|
+ <br><div class=sme-error> |
1526 |
|
|
+ %= $c->render_to_string(inline => stash 'error') |
1527 |
|
|
+ </div> |
1528 |
|
|
+ %} |
1529 |
|
|
+ |
1530 |
|
|
<h1><%= $title%></h1> |
1531 |
|
|
|
1532 |
|
|
<h2> |
1533 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_tape_restore.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_tape_restore.html.ep |
1534 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_tape_restore.html.ep 2020-04-14 16:50:36.000000000 +0400 |
1535 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_tape_restore.html.ep 2020-04-26 23:22:43.000000000 +0400 |
1536 |
|
|
@@ -1,4 +1,4 @@ |
1537 |
|
|
-% layout 'default', title => "Sme server 2 - backup", share_dir => './'; |
1538 |
|
|
+% layout 'default', title => "Sme server 2 - backup"; |
1539 |
|
|
|
1540 |
|
|
% content_for 'module' => begin |
1541 |
|
|
|
1542 |
|
|
@@ -10,6 +10,12 @@ |
1543 |
|
|
</p> |
1544 |
|
|
% } |
1545 |
|
|
|
1546 |
|
|
+ % if ( stash 'error' ) { |
1547 |
|
|
+ <br><div class=sme-error> |
1548 |
|
|
+ %= $c->render_to_string(inline => stash 'error') |
1549 |
|
|
+ </div> |
1550 |
|
|
+ %} |
1551 |
|
|
+ |
1552 |
|
|
<h1><%= $title%></h1> |
1553 |
|
|
|
1554 |
|
|
%= form_for '/backupd' => (method => 'POST') => begin |
1555 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/backup.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/backup.html.ep |
1556 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/backup.html.ep 2020-04-14 16:50:36.000000000 +0400 |
1557 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/backup.html.ep 2020-04-26 23:21:14.000000000 +0400 |
1558 |
|
|
@@ -10,6 +10,12 @@ |
1559 |
|
|
</p> |
1560 |
|
|
% } |
1561 |
|
|
|
1562 |
|
|
+ % if ( stash 'error' ) { |
1563 |
|
|
+ <br><div class=sme-error> |
1564 |
|
|
+ %= $c->render_to_string(inline => stash 'error') |
1565 |
|
|
+ </div> |
1566 |
|
|
+ %} |
1567 |
|
|
+ |
1568 |
|
|
<h1><%= $title%></h1> |
1569 |
|
|
|
1570 |
|
|
<br>Still incomplete click here for previous version --> |
1571 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_configure.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_configure.html.ep |
1572 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_configure.html.ep 2020-04-14 16:50:36.000000000 +0400 |
1573 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_configure.html.ep 2020-04-26 23:22:31.000000000 +0400 |
1574 |
|
|
@@ -1,4 +1,4 @@ |
1575 |
|
|
-% layout 'default', title => "Sme server 2 - backup", share_dir => './'; |
1576 |
|
|
+% layout 'default', title => "Sme server 2 - backup"; |
1577 |
|
|
|
1578 |
|
|
% content_for 'module' => begin |
1579 |
|
|
|
1580 |
|
|
@@ -10,6 +10,12 @@ |
1581 |
|
|
</p> |
1582 |
|
|
% } |
1583 |
|
|
|
1584 |
|
|
+ % if ( stash 'error' ) { |
1585 |
|
|
+ <br><div class=sme-error> |
1586 |
|
|
+ %= $c->render_to_string(inline => stash 'error') |
1587 |
|
|
+ </div> |
1588 |
|
|
+ %} |
1589 |
|
|
+ |
1590 |
|
|
<h1><%= $title%></h1> |
1591 |
|
|
|
1592 |
|
|
%= form_for '/backupd' => (method => 'POST') => begin |
1593 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_restore.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_restore.html.ep |
1594 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_restore.html.ep 2020-04-14 16:50:36.000000000 +0400 |
1595 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_restore.html.ep 2020-04-26 23:22:16.000000000 +0400 |
1596 |
|
|
@@ -1,4 +1,4 @@ |
1597 |
|
|
-% layout 'default', title => "Sme server 2 - backup", share_dir => './'; |
1598 |
|
|
+% layout 'default', title => "Sme server 2 - backup"; |
1599 |
|
|
|
1600 |
|
|
% content_for 'module' => begin |
1601 |
|
|
|
1602 |
|
|
@@ -10,6 +10,12 @@ |
1603 |
|
|
</p> |
1604 |
|
|
% } |
1605 |
|
|
|
1606 |
|
|
+ % if ( stash 'error' ) { |
1607 |
|
|
+ <br><div class=sme-error> |
1608 |
|
|
+ %= $c->render_to_string(inline => stash 'error') |
1609 |
|
|
+ </div> |
1610 |
|
|
+ %} |
1611 |
|
|
+ |
1612 |
|
|
<h1><%= $title%></h1> |
1613 |
|
|
|
1614 |
|
|
%= form_for '/backupd' => (method => 'POST') => begin |
1615 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_sel_restore.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_sel_restore.html.ep |
1616 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_sel_restore.html.ep 2020-04-14 16:50:36.000000000 +0400 |
1617 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_sel_restore.html.ep 2020-04-26 23:22:00.000000000 +0400 |
1618 |
|
|
@@ -1,4 +1,4 @@ |
1619 |
|
|
-% layout 'default', title => "Sme server 2 - backup", share_dir => './'; |
1620 |
|
|
+% layout 'default', title => "Sme server 2 - backup"; |
1621 |
|
|
|
1622 |
|
|
% content_for 'module' => begin |
1623 |
|
|
|
1624 |
|
|
@@ -10,6 +10,12 @@ |
1625 |
|
|
</p> |
1626 |
|
|
% } |
1627 |
|
|
|
1628 |
|
|
+ % if ( stash 'error' ) { |
1629 |
|
|
+ <br><div class=sme-error> |
1630 |
|
|
+ %= $c->render_to_string(inline => stash 'error') |
1631 |
|
|
+ </div> |
1632 |
|
|
+ %} |
1633 |
|
|
+ |
1634 |
|
|
<h1><%= $title%></h1> |
1635 |
|
|
|
1636 |
|
|
%= form_for '/backupd' => (method => 'POST') => begin |
1637 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_verify.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_verify.html.ep |
1638 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_verify.html.ep 2020-04-14 16:50:36.000000000 +0400 |
1639 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_verify.html.ep 2020-04-26 23:21:36.000000000 +0400 |
1640 |
|
|
@@ -1,4 +1,4 @@ |
1641 |
|
|
-% layout 'default', title => "Sme server 2 - backup", share_dir => './'; |
1642 |
|
|
+% layout 'default', title => "Sme server 2 - backup"; |
1643 |
|
|
|
1644 |
|
|
% content_for 'module' => begin |
1645 |
|
|
|
1646 |
|
|
@@ -10,6 +10,12 @@ |
1647 |
|
|
</p> |
1648 |
|
|
% } |
1649 |
|
|
|
1650 |
|
|
+ % if ( stash 'error' ) { |
1651 |
|
|
+ <br><div class=sme-error> |
1652 |
|
|
+ %= $c->render_to_string(inline => stash 'error') |
1653 |
|
|
+ </div> |
1654 |
|
|
+ %} |
1655 |
|
|
+ |
1656 |
|
|
<h1><%= $title%></h1> |
1657 |
|
|
|
1658 |
|
|
%= form_for '/backupd' => (method => 'POST') => begin |
1659 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/clamav.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/clamav.html.ep |
1660 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/clamav.html.ep 2020-04-14 16:50:31.000000000 +0400 |
1661 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/clamav.html.ep 2020-04-26 12:59:44.000000000 +0400 |
1662 |
|
|
@@ -1,4 +1,4 @@ |
1663 |
|
|
-% layout 'default', title => "Sme server 2 - clamav", share_dir => './'; |
1664 |
|
|
+% layout 'default', title => "Sme server 2 - clamav"; |
1665 |
|
|
|
1666 |
|
|
% content_for 'module' => begin |
1667 |
|
|
<div id="module"> |
1668 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/datetime.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/datetime.html.ep |
1669 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/datetime.html.ep 2020-04-14 16:50:31.000000000 +0400 |
1670 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/datetime.html.ep 2020-04-26 12:59:58.000000000 +0400 |
1671 |
|
|
@@ -1,4 +1,4 @@ |
1672 |
|
|
-% layout 'default', title => "Sme server 2 - datetime", share_dir => './'; |
1673 |
|
|
+% layout 'default', title => "Sme server 2 - datetime"; |
1674 |
|
|
|
1675 |
|
|
% content_for 'end' => begin |
1676 |
|
|
<div id="end" class="sme-copyrightbar"> |
1677 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/default.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/default.html.ep |
1678 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/default.html.ep 2020-04-14 16:50:31.000000000 +0400 |
1679 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/default.html.ep 2020-04-26 21:26:08.000000000 +0400 |
1680 |
|
|
@@ -1,4 +1,4 @@ |
1681 |
|
|
-% layout 'default', title => 'Sme server 2 - Support', share_dir => './'; |
1682 |
|
|
+% layout 'default', title => 'Sme server 2 - Support'; |
1683 |
|
|
|
1684 |
|
|
% content_for 'module' => begin |
1685 |
|
|
|
1686 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/directory.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/directory.html.ep |
1687 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/directory.html.ep 2020-04-14 16:50:23.000000000 +0400 |
1688 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/directory.html.ep 2020-04-26 12:59:18.000000000 +0400 |
1689 |
|
|
@@ -1,4 +1,4 @@ |
1690 |
|
|
-% layout 'default', title => "Sme server 2 - directory", share_dir => './'; |
1691 |
|
|
+% layout 'default', title => "Sme server 2 - directory"; |
1692 |
|
|
|
1693 |
|
|
% content_for 'module' => begin |
1694 |
|
|
<div id="module"> |
1695 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/domains.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/domains.html.ep |
1696 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/domains.html.ep 2020-04-14 16:50:31.000000000 +0400 |
1697 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/domains.html.ep 2020-04-26 00:33:18.000000000 +0400 |
1698 |
|
|
@@ -1,4 +1,4 @@ |
1699 |
|
|
-% layout 'default', title => "Sme server 2 - domains", share_dir => './'; |
1700 |
|
|
+% layout 'default', title => "Sme server 2 - domains"; |
1701 |
|
|
|
1702 |
|
|
% content_for 'module' => begin |
1703 |
|
|
<div id="module"> |
1704 |
|
|
@@ -10,27 +10,23 @@ |
1705 |
|
|
</p> |
1706 |
|
|
% } |
1707 |
|
|
|
1708 |
|
|
- <h1><%= $title%></h1> |
1709 |
|
|
- |
1710 |
|
|
- % if ( $notif ) { |
1711 |
|
|
- <br> |
1712 |
|
|
- <span class=sme-error> |
1713 |
|
|
- %= $notif |
1714 |
|
|
- </span> |
1715 |
|
|
+ % if ( stash 'error' ) { |
1716 |
|
|
+ <br><div class=sme-error> |
1717 |
|
|
+ %= $c->render_to_string(inline => stash 'error') |
1718 |
|
|
+ </div> |
1719 |
|
|
%} |
1720 |
|
|
|
1721 |
|
|
+ <h1><%= $title%></h1> |
1722 |
|
|
|
1723 |
|
|
- % if ($dom_datas->{trt} eq 'ADD') { |
1724 |
|
|
+ % if ($dom_datas->{trt} eq 'ADD' or $dom_datas->{trt} eq 'UPD') { |
1725 |
|
|
%= include 'partials/_dom_upd' |
1726 |
|
|
%} elsif ($dom_datas->{trt} eq 'DEL') { |
1727 |
|
|
%= include 'partials/_dom_del' |
1728 |
|
|
- %} elsif ($dom_datas->{trt} eq 'UPD') { |
1729 |
|
|
- %= include 'partials/_dom_upd' |
1730 |
|
|
- %} elsif ($dom_datas->{trt} eq 'UP2') { |
1731 |
|
|
- %= include 'partials/_dom_up2' |
1732 |
|
|
- %} else { |
1733 |
|
|
- %= include 'partials/_dom_list' |
1734 |
|
|
- %} |
1735 |
|
|
+ %} elsif ($dom_datas->{trt} eq 'UP2') { |
1736 |
|
|
+ %= include 'partials/_dom_up2' |
1737 |
|
|
+ %} else { |
1738 |
|
|
+ %= include 'partials/_dom_list' |
1739 |
|
|
+ %} |
1740 |
|
|
|
1741 |
|
|
</div> |
1742 |
|
|
%end |
1743 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailaccess.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailaccess.html.ep |
1744 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailaccess.html.ep 2020-04-14 16:50:36.000000000 +0400 |
1745 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailaccess.html.ep 2020-04-26 21:27:39.000000000 +0400 |
1746 |
|
|
@@ -1,4 +1,4 @@ |
1747 |
|
|
-% layout 'default', title => "Sme server 2 - emailaccess", share_dir => './'; |
1748 |
|
|
+% layout 'default', title => "Sme server 2 - emailaccess"; |
1749 |
|
|
|
1750 |
|
|
% content_for 'module' => begin |
1751 |
|
|
<div id="module"> |
1752 |
|
|
@@ -10,15 +10,15 @@ |
1753 |
|
|
</p> |
1754 |
|
|
% } |
1755 |
|
|
|
1756 |
|
|
- <h1><%= $title%></h1> |
1757 |
|
|
- |
1758 |
|
|
- % if ( $notif ) { |
1759 |
|
|
- <br><div class=sme-error> |
1760 |
|
|
- %= $notif |
1761 |
|
|
+ % if ( stash 'error' ) { |
1762 |
|
|
+ <br><div class=sme-error> |
1763 |
|
|
+ %= $c->render_to_string(inline => stash 'error') |
1764 |
|
|
</div> |
1765 |
|
|
%} |
1766 |
|
|
|
1767 |
|
|
- %= form_for 'emailsettingd' => (method => 'POST') => begin |
1768 |
|
|
+ <h1><%= $title%></h1> |
1769 |
|
|
+ |
1770 |
|
|
+ %= form_for '/emailsettingd' => (method => 'POST') => begin |
1771 |
|
|
|
1772 |
|
|
%=l 'mai_DESC_POP_ACCESS_CONTROL' |
1773 |
|
|
|
1774 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emaildeliver.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emaildeliver.html.ep |
1775 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emaildeliver.html.ep 2020-04-14 16:50:36.000000000 +0400 |
1776 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emaildeliver.html.ep 2020-04-26 21:27:52.000000000 +0400 |
1777 |
|
|
@@ -1,4 +1,4 @@ |
1778 |
|
|
-% layout 'default', title => "Sme server 2 - emaildeliver", share_dir => './'; |
1779 |
|
|
+% layout 'default', title => "Sme server 2 - emaildeliver"; |
1780 |
|
|
|
1781 |
|
|
% content_for 'module' => begin |
1782 |
|
|
<div id="module"> |
1783 |
|
|
@@ -10,15 +10,15 @@ |
1784 |
|
|
</p> |
1785 |
|
|
% } |
1786 |
|
|
|
1787 |
|
|
- <h1><%= $title%></h1> |
1788 |
|
|
- |
1789 |
|
|
- % if ( $notif ) { |
1790 |
|
|
- <br><div class=sme-error> |
1791 |
|
|
- %= $notif |
1792 |
|
|
+ % if ( stash 'error' ) { |
1793 |
|
|
+ <br><div class=sme-error> |
1794 |
|
|
+ %= $c->render_to_string(inline => stash 'error') |
1795 |
|
|
</div> |
1796 |
|
|
%} |
1797 |
|
|
|
1798 |
|
|
- %= form_for 'emailsettingd' => (method => 'POST') => begin |
1799 |
|
|
+ <h1><%= $title%></h1> |
1800 |
|
|
+ |
1801 |
|
|
+ %= form_for '/emailsettingd' => (method => 'POST') => begin |
1802 |
|
|
|
1803 |
|
|
<h2> |
1804 |
|
|
%=l 'mai_TITLE_UNKNOWN' |
1805 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailfilter.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailfilter.html.ep |
1806 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailfilter.html.ep 2020-04-14 16:50:36.000000000 +0400 |
1807 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailfilter.html.ep 2020-04-26 21:27:46.000000000 +0400 |
1808 |
|
|
@@ -1,4 +1,4 @@ |
1809 |
|
|
-% layout 'default', title => "Sme server 2 - emailfilter", share_dir => './'; |
1810 |
|
|
+% layout 'default', title => "Sme server 2 - emailfilter"; |
1811 |
|
|
|
1812 |
|
|
% content_for 'module' => begin |
1813 |
|
|
<div id="module"> |
1814 |
|
|
@@ -9,16 +9,16 @@ |
1815 |
|
|
%= dumper $mai_datas |
1816 |
|
|
</p> |
1817 |
|
|
% } |
1818 |
|
|
- |
1819 |
|
|
- <h1><%= $title%></h1> |
1820 |
|
|
|
1821 |
|
|
- % if ( $notif ) { |
1822 |
|
|
- <br><div class=sme-error> |
1823 |
|
|
- %= $notif |
1824 |
|
|
+ % if ( stash 'error' ) { |
1825 |
|
|
+ <br><div class=sme-error> |
1826 |
|
|
+ %= $c->render_to_string(inline => stash 'error') |
1827 |
|
|
</div> |
1828 |
|
|
%} |
1829 |
|
|
|
1830 |
|
|
- %= form_for 'emailsettingd' => (method => 'POST') => begin |
1831 |
|
|
+ <h1><%= $title%></h1> |
1832 |
|
|
+ |
1833 |
|
|
+ %= form_for '/emailsettingd' => (method => 'POST') => begin |
1834 |
|
|
|
1835 |
|
|
%=l 'mai_DESC_VIRUS_SCAN' |
1836 |
|
|
|
1837 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailreceive.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailreceive.html.ep |
1838 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailreceive.html.ep 2020-04-14 16:50:36.000000000 +0400 |
1839 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailreceive.html.ep 2020-04-26 21:27:59.000000000 +0400 |
1840 |
|
|
@@ -1,4 +1,4 @@ |
1841 |
|
|
-% layout 'default', title => "Sme server 2 - emailreceive", share_dir => './'; |
1842 |
|
|
+% layout 'default', title => "Sme server 2 - emailreceive"; |
1843 |
|
|
|
1844 |
|
|
% content_for 'module' => begin |
1845 |
|
|
<div id="module"> |
1846 |
|
|
@@ -9,16 +9,16 @@ |
1847 |
|
|
%= dumper $mai_datas |
1848 |
|
|
</p> |
1849 |
|
|
% } |
1850 |
|
|
- |
1851 |
|
|
- <h1><%= $title%></h1> |
1852 |
|
|
|
1853 |
|
|
- % if ( $notif ) { |
1854 |
|
|
- <br><div class=sme-error> |
1855 |
|
|
- %= $notif |
1856 |
|
|
+ % if ( stash 'error' ) { |
1857 |
|
|
+ <br><div class=sme-error> |
1858 |
|
|
+ %= $c->render_to_string(inline => stash 'error') |
1859 |
|
|
</div> |
1860 |
|
|
%} |
1861 |
|
|
+ |
1862 |
|
|
+ <h1><%= $title%></h1> |
1863 |
|
|
|
1864 |
|
|
- %= form_for 'emailsettingd' => (method => 'POST') => begin |
1865 |
|
|
+ %= form_for '/emailsettingd' => (method => 'POST') => begin |
1866 |
|
|
|
1867 |
|
|
%=l 'mai_DESC_MODE' |
1868 |
|
|
|
1869 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailsettings.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailsettings.html.ep |
1870 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailsettings.html.ep 2020-04-14 16:50:36.000000000 +0400 |
1871 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailsettings.html.ep 2020-04-25 20:45:57.000000000 +0400 |
1872 |
|
|
@@ -1,4 +1,4 @@ |
1873 |
|
|
-% layout 'default', title => "Sme server 2 - emailsettings", share_dir => './'; |
1874 |
|
|
+% layout 'default', title => "Sme server 2 - emailsettings"; |
1875 |
|
|
|
1876 |
|
|
% content_for 'module' => begin |
1877 |
|
|
<div id="module"> |
1878 |
|
|
@@ -9,16 +9,16 @@ |
1879 |
|
|
%= dumper $mai_datas |
1880 |
|
|
</p> |
1881 |
|
|
% } |
1882 |
|
|
- |
1883 |
|
|
- <h1><%= $title%></h1> |
1884 |
|
|
|
1885 |
|
|
- % if ( $notif ) { |
1886 |
|
|
- <br><div class=sme-error> |
1887 |
|
|
- %= $notif |
1888 |
|
|
+ % if ( stash 'error' ) { |
1889 |
|
|
+ <br><div class=sme-error> |
1890 |
|
|
+ %= $c->render_to_string(inline => stash 'error') |
1891 |
|
|
</div> |
1892 |
|
|
%} |
1893 |
|
|
|
1894 |
|
|
- %= form_for 'emailsettingd' => (method => 'GET') => begin |
1895 |
|
|
+ <h1><%= $title%></h1> |
1896 |
|
|
+ |
1897 |
|
|
+ %= form_for 'emailsettings' => (method => 'POST') => begin |
1898 |
|
|
<p><span class=label> |
1899 |
|
|
%=l 'mai_LABEL_POP_ACCESS_CONTROL' |
1900 |
|
|
</span><span class=data2> |
1901 |
|
|
@@ -45,7 +45,7 @@ |
1902 |
|
|
|
1903 |
|
|
<hr class="sectionbar" /> |
1904 |
|
|
|
1905 |
|
|
- %= form_for 'emailsettingd' => (method => 'GET') => begin |
1906 |
|
|
+ %= form_for 'emailsettings' => (method => 'POST') => begin |
1907 |
|
|
<p><span class=label> |
1908 |
|
|
%=l 'mai_LABEL_VIRUS_SCAN' |
1909 |
|
|
</span><span class=data2> |
1910 |
|
|
@@ -72,7 +72,7 @@ |
1911 |
|
|
|
1912 |
|
|
<hr class="sectionbar" /> |
1913 |
|
|
|
1914 |
|
|
- %= form_for 'emailsettingd' => (method => 'GET') => begin |
1915 |
|
|
+ %= form_for 'emailsettings' => (method => 'POST') => begin |
1916 |
|
|
<p><span class=label> |
1917 |
|
|
%=l 'mai_LABEL_MODE' |
1918 |
|
|
</span><span class=data2> |
1919 |
|
|
@@ -93,7 +93,7 @@ |
1920 |
|
|
|
1921 |
|
|
<hr class="sectionbar" /> |
1922 |
|
|
|
1923 |
|
|
- %= form_for 'emailsettingd' => (method => 'GET') => begin |
1924 |
|
|
+ %= form_for 'emailsettings' => (method => 'POST') => begin |
1925 |
|
|
<p><span class=label> |
1926 |
|
|
%=l 'mai_LABEL_UNKNOWN' |
1927 |
|
|
</span><span class=data2> |
1928 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/exception_development.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/exception_development.html.ep |
1929 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/exception_development.html.ep 2020-04-14 16:50:31.000000000 +0400 |
1930 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/exception_development.html.ep 2020-04-26 21:26:16.000000000 +0400 |
1931 |
|
|
@@ -1,4 +1,4 @@ |
1932 |
|
|
-% layout 'default', title => 'Sme server 2 - Error D', share_dir => ''; |
1933 |
|
|
+% layout 'default', title => 'Sme server 2 - Error D'; |
1934 |
|
|
|
1935 |
|
|
% content_for 'module' => begin |
1936 |
|
|
|
1937 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/groups.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/groups.html.ep |
1938 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/groups.html.ep 2020-04-14 16:50:36.000000000 +0400 |
1939 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/groups.html.ep 2020-04-26 16:47:28.000000000 +0400 |
1940 |
|
|
@@ -1,4 +1,4 @@ |
1941 |
|
|
-% layout 'default', title => "Sme server 2 - groups", share_dir => './'; |
1942 |
|
|
+% layout 'default', title => "Sme server 2 - groups"; |
1943 |
|
|
|
1944 |
|
|
% content_for 'module' => begin |
1945 |
|
|
<div id="module"> |
1946 |
|
|
@@ -9,17 +9,14 @@ |
1947 |
|
|
%= dumper $grp_datas |
1948 |
|
|
</p> |
1949 |
|
|
% } |
1950 |
|
|
- |
1951 |
|
|
- <h1><%= $title%></h1> |
1952 |
|
|
|
1953 |
|
|
- % if ( $notif ) { |
1954 |
|
|
- <br> |
1955 |
|
|
- <div class=sme-error> |
1956 |
|
|
- %= $notif |
1957 |
|
|
+ % if ( stash 'error' ) { |
1958 |
|
|
+ <br><div class=sme-error> |
1959 |
|
|
+ %= $c->render_to_string(inline => stash 'error') |
1960 |
|
|
</div> |
1961 |
|
|
%} |
1962 |
|
|
- |
1963 |
|
|
- |
1964 |
|
|
+ |
1965 |
|
|
+ <h1><%= $title%></h1> |
1966 |
|
|
|
1967 |
|
|
% if ($grp_datas->{trt} eq 'ADD') { |
1968 |
|
|
%= include 'partials/_grp_add' |
1969 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/hostentries.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/hostentries.html.ep |
1970 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/hostentries.html.ep 2020-04-14 16:50:31.000000000 +0400 |
1971 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/hostentries.html.ep 2020-04-26 21:27:02.000000000 +0400 |
1972 |
|
|
@@ -1,4 +1,4 @@ |
1973 |
|
|
-% layout 'default', title => "Sme server 2 - hostentries", share_dir => './'; |
1974 |
|
|
+% layout 'default', title => "Sme server 2 - hostentries"; |
1975 |
|
|
|
1976 |
|
|
% content_for 'module' => begin |
1977 |
|
|
<div id="module"> |
1978 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/ibays.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/ibays.html.ep |
1979 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/ibays.html.ep 2020-04-14 16:50:23.000000000 +0400 |
1980 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/ibays.html.ep 2020-04-26 21:26:44.000000000 +0400 |
1981 |
|
|
@@ -1,4 +1,4 @@ |
1982 |
|
|
-% layout 'default', title => "Sme server 2 - ibays", share_dir => './'; |
1983 |
|
|
+% layout 'default', title => "Sme server 2 - ibays"; |
1984 |
|
|
|
1985 |
|
|
% content_for 'module' => begin |
1986 |
|
|
<div id="module"> |
1987 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/initial.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/initial.html.ep |
1988 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/initial.html.ep 2020-04-14 16:50:31.000000000 +0400 |
1989 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/initial.html.ep 2020-04-26 12:58:38.000000000 +0400 |
1990 |
|
|
@@ -1,4 +1,4 @@ |
1991 |
|
|
-% layout 'default', title => 'Sme server 2 - Initial', share_dir => ''; |
1992 |
|
|
+% layout 'default', title => 'Sme server 2 - Initial'; |
1993 |
|
|
|
1994 |
|
|
% content_for 'module' => begin |
1995 |
|
|
|
1996 |
|
|
@@ -9,6 +9,13 @@ |
1997 |
|
|
% } |
1998 |
|
|
|
1999 |
|
|
<div id="central"> |
2000 |
|
|
+ |
2001 |
|
|
+ % if ( stash 'error' ) { |
2002 |
|
|
+ <br><div class=sme-error> |
2003 |
|
|
+ %= $c->render_to_string(inline => stash 'error') |
2004 |
|
|
+ </div> |
2005 |
|
|
+ %} |
2006 |
|
|
+ |
2007 |
|
|
<h3> |
2008 |
|
|
%= $title |
2009 |
|
|
</h3> |
2010 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/localnetworks.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/localnetworks.html.ep |
2011 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/localnetworks.html.ep 2020-04-14 16:50:35.000000000 +0400 |
2012 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/localnetworks.html.ep 2020-04-26 21:29:30.000000000 +0400 |
2013 |
|
|
@@ -1,4 +1,4 @@ |
2014 |
|
|
-% layout 'default', title => "Sme server 2 - localnetworks", share_dir => './'; |
2015 |
|
|
+% layout 'default', title => "Sme server 2 - localnetworks"; |
2016 |
|
|
|
2017 |
|
|
% content_for 'module' => begin |
2018 |
|
|
<div id="module"> |
2019 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/manual.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/manual.html.ep |
2020 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/manual.html.ep 2020-04-14 16:50:31.000000000 +0400 |
2021 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/manual.html.ep 2020-04-26 21:25:20.000000000 +0400 |
2022 |
|
|
@@ -1,4 +1,4 @@ |
2023 |
|
|
-% layout 'default', title => 'Sme server 2 - Manual', share_dir => ''; |
2024 |
|
|
+% layout 'default', title => 'Sme server 2 - Manual'; |
2025 |
|
|
|
2026 |
|
|
% content_for 'module' => begin |
2027 |
|
|
<div id="central"> |
2028 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/module.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/module.html.ep |
2029 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/module.html.ep 2020-04-14 16:50:31.000000000 +0400 |
2030 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/module.html.ep 2020-04-26 21:25:58.000000000 +0400 |
2031 |
|
|
@@ -1,4 +1,4 @@ |
2032 |
|
|
-% layout 'default', title => "Sme server 2 - module", share_dir => './'; |
2033 |
|
|
+% layout 'default', title => "Sme server 2 - module"; |
2034 |
|
|
|
2035 |
|
|
% content_for 'module' => begin |
2036 |
|
|
|
2037 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/not_found.development.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/not_found.development.html.ep |
2038 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/not_found.development.html.ep 2020-04-14 16:50:31.000000000 +0400 |
2039 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/not_found.development.html.ep 2020-04-26 21:24:52.000000000 +0400 |
2040 |
|
|
@@ -1,4 +1,4 @@ |
2041 |
|
|
-% layout 'defaultlight', title => 'Sme server 2 - Error D', share_dir => ''; |
2042 |
|
|
+% layout 'defaultlight', title => 'Sme server 2 - Error D'; |
2043 |
|
|
|
2044 |
|
|
% content_for 'module' => begin |
2045 |
|
|
|
2046 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/not_found.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/not_found.html.ep |
2047 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/not_found.html.ep 2020-04-14 16:50:31.000000000 +0400 |
2048 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/not_found.html.ep 2020-04-26 12:57:35.000000000 +0400 |
2049 |
|
|
@@ -1,4 +1,4 @@ |
2050 |
|
|
-% layout 'defaultlight', title => 'Sme server 2 - Error P', share_dir => ''; |
2051 |
|
|
+% layout 'defaultlight', title => 'Sme server 2 - Error P'; |
2052 |
|
|
<div id="central"> |
2053 |
|
|
<p><br><br> |
2054 |
|
|
The page you were requesting |
2055 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_dom_del.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_dom_del.html.ep |
2056 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_dom_del.html.ep 2020-04-14 16:50:31.000000000 +0400 |
2057 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_dom_del.html.ep 2020-04-25 23:46:40.000000000 +0400 |
2058 |
|
|
@@ -1,7 +1,7 @@ |
2059 |
|
|
<div id='dom_del'> |
2060 |
|
|
|
2061 |
|
|
% my $btn = l('REMOVE'); |
2062 |
|
|
- %= form_for '/domaindel' => (method => 'POST') => begin |
2063 |
|
|
+ %= form_for '/domains2' => (method => 'POST') => begin |
2064 |
|
|
<p> |
2065 |
|
|
<h2> |
2066 |
|
|
%=l 'dom_REMOVE_TITLE' |
2067 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_dom_list.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_dom_list.html.ep |
2068 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_dom_list.html.ep 2020-04-14 16:50:31.000000000 +0400 |
2069 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_dom_list.html.ep 2020-04-26 00:37:05.000000000 +0400 |
2070 |
|
|
@@ -42,13 +42,13 @@ |
2071 |
|
|
%= t td => (class => 'sme-border') => $domain->{'Content'} |
2072 |
|
|
%= t td => (class => 'sme-border') => l('dom_' . $domain->{'Nameservers'}) |
2073 |
|
|
|
2074 |
|
|
- % my $actionModify = "<a href='domainupd?trt=UPD&Domain=" . $domain->{Domain} . "'>" . l('MODIFY') . "</a>"; |
2075 |
|
|
+ % my $actionModify = "<a href='domains2?trt=UPD&Domain=" . $domain->{Domain} . "'>" . l('MODIFY') . "</a>"; |
2076 |
|
|
|
2077 |
|
|
% my $removable = ($domain->{Removable} || 'yes'); |
2078 |
|
|
% my $actionRemove = ' '; |
2079 |
|
|
|
2080 |
|
|
% if ($removable eq 'yes') { |
2081 |
|
|
- % $actionRemove = "<a href='domaindel?trt=DEL&Domain=" . $domain->{Domain} . "'>" . l('REMOVE') . "</a>"; |
2082 |
|
|
+ % $actionRemove = "<a href='domains2?trt=DEL&Domain=" . $domain->{Domain} . "'>" . l('REMOVE') . "</a>"; |
2083 |
|
|
% } |
2084 |
|
|
|
2085 |
|
|
<td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td> |
2086 |
|
|
@@ -60,9 +60,11 @@ |
2087 |
|
|
</table> |
2088 |
|
|
</p> |
2089 |
|
|
|
2090 |
|
|
+ %= hidden_field 'trt' => 'ADD' |
2091 |
|
|
+ |
2092 |
|
|
% end |
2093 |
|
|
|
2094 |
|
|
- %= form_for '/domainup2' => (method => 'GET') => begin |
2095 |
|
|
+ %= form_for '/domains' => (method => 'POST') => begin |
2096 |
|
|
|
2097 |
|
|
<HR class="sectionbar"> |
2098 |
|
|
|
2099 |
|
|
@@ -98,7 +100,7 @@ |
2100 |
|
|
%= l 'dom_BUTTON_CORPORATE_DNS' |
2101 |
|
|
</p> |
2102 |
|
|
|
2103 |
|
|
- %= hidden_field 'trt' => $dom_datas->{trt} |
2104 |
|
|
+ %= hidden_field 'trt' => 'UP2' |
2105 |
|
|
|
2106 |
|
|
% end |
2107 |
|
|
|
2108 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_dom_up2.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_dom_up2.html.ep |
2109 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_dom_up2.html.ep 2020-04-14 16:50:31.000000000 +0400 |
2110 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_dom_up2.html.ep 2020-04-25 23:46:11.000000000 +0400 |
2111 |
|
|
@@ -2,7 +2,7 @@ |
2112 |
|
|
|
2113 |
|
|
% my $btn = l('SAVE'); |
2114 |
|
|
|
2115 |
|
|
- %= form_for '/domainup2' => (method => 'POST') => begin |
2116 |
|
|
+ %= form_for '/domains2' => (method => 'POST') => begin |
2117 |
|
|
|
2118 |
|
|
<p><br> |
2119 |
|
|
%=l 'dom_DESC_CORPORATE_DNS' |
2120 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_dom_upd.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_dom_upd.html.ep |
2121 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_dom_upd.html.ep 2020-04-14 16:50:31.000000000 +0400 |
2122 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_dom_upd.html.ep 2020-04-25 23:46:25.000000000 +0400 |
2123 |
|
|
@@ -2,7 +2,7 @@ |
2124 |
|
|
|
2125 |
|
|
% my $btn = l('ADD'); |
2126 |
|
|
|
2127 |
|
|
- %= form_for '/domainupd' => (method => 'POST') => begin |
2128 |
|
|
+ %= form_for '/domains2' => (method => 'POST') => begin |
2129 |
|
|
<p> |
2130 |
|
|
<h2> |
2131 |
|
|
% if ( $dom_datas->{trt} eq "ADD" ) { |
2132 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_add.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_add.html.ep |
2133 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_add.html.ep 2020-04-14 16:50:36.000000000 +0400 |
2134 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_add.html.ep 2020-04-26 16:50:59.000000000 +0400 |
2135 |
|
|
@@ -2,12 +2,10 @@ |
2136 |
|
|
|
2137 |
|
|
% my $btn = l('ADD'); |
2138 |
|
|
|
2139 |
|
|
- %= form_for '/groupadd' => (method => 'POST') => begin |
2140 |
|
|
- <p> |
2141 |
|
|
- <h2> |
2142 |
|
|
+ %= form_for '/groups2' => (method => 'POST') => begin |
2143 |
|
|
+ <p><h2> |
2144 |
|
|
%=l 'CREATE_GROUP' |
2145 |
|
|
- </h2> |
2146 |
|
|
- <br><br> |
2147 |
|
|
+ </h2><br><br> |
2148 |
|
|
%=l 'grp_GROUP_NAMING' |
2149 |
|
|
</p> |
2150 |
|
|
|
2151 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_del.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_del.html.ep |
2152 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_del.html.ep 2020-04-14 16:50:36.000000000 +0400 |
2153 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_del.html.ep 2020-04-26 16:50:39.000000000 +0400 |
2154 |
|
|
@@ -1,9 +1,8 @@ |
2155 |
|
|
<div id='grp_del'> |
2156 |
|
|
|
2157 |
|
|
% my $btn = l('REMOVE'); |
2158 |
|
|
- %= form_for '/groupdel' => (method => 'POST') => begin |
2159 |
|
|
- <p> |
2160 |
|
|
- <h2> |
2161 |
|
|
+ %= form_for '/groups2' => (method => 'POST') => begin |
2162 |
|
|
+ <p><h2> |
2163 |
|
|
%=l 'REMOVE_USER_GROUP' |
2164 |
|
|
</h2> |
2165 |
|
|
|
2166 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_list.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_list.html.ep |
2167 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_list.html.ep 2020-04-14 16:50:31.000000000 +0400 |
2168 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_list.html.ep 2020-04-26 16:49:25.000000000 +0400 |
2169 |
|
|
@@ -1,20 +1,18 @@ |
2170 |
|
|
<div id='grp_list'> |
2171 |
|
|
|
2172 |
|
|
- |
2173 |
|
|
% my $btn = l('GROUP_ADD'); |
2174 |
|
|
|
2175 |
|
|
- %= form_for '/groups' => (method => 'POST') => begin |
2176 |
|
|
+ %= form_for '/groups2' => (method => 'GET') => begin |
2177 |
|
|
+ |
2178 |
|
|
+ %= hidden_field 'trt' => 'ADD' |
2179 |
|
|
|
2180 |
|
|
- <p> |
2181 |
|
|
- <br> |
2182 |
|
|
+ <p> <br> |
2183 |
|
|
%= submit_button "$btn", class => 'action' |
2184 |
|
|
</p> |
2185 |
|
|
|
2186 |
|
|
- <p> |
2187 |
|
|
- <h2> |
2188 |
|
|
+ <p> <h2> |
2189 |
|
|
%=l 'grp_CURRENT_LIST' |
2190 |
|
|
- </h2> |
2191 |
|
|
- <br><br> |
2192 |
|
|
+ </h2><br><br> |
2193 |
|
|
% my $numGroups = @$groups; |
2194 |
|
|
% if ($numGroups == 0){ |
2195 |
|
|
%=l 'ACCOUNT_GROUP_NONE' |
2196 |
|
|
@@ -38,11 +36,8 @@ |
2197 |
|
|
<tr> |
2198 |
|
|
%= t td => (class => 'sme-border') => $group->key |
2199 |
|
|
%= t td => (class => 'sme-border') => $group->prop('Description') |
2200 |
|
|
- <!-- = t td => link_to l 'REMOVE' => url_for("/groups/delete/$group->key") |
2201 |
|
|
- <td><a href="/server-manager2/printdel/<%= $group->key%>"><%=l 'REMOVE'%></a></td> |
2202 |
|
|
- --> |
2203 |
|
|
- <td class='sme-border'><a href="groupupd?trt=UPD&group=<%= $group->key%>"><%=l 'MODIFY'%></a></td> |
2204 |
|
|
- <td class='sme-border'><a href="groupdel?trt=DEL&group=<%= $group->key%>"><%=l 'REMOVE'%></a></td> |
2205 |
|
|
+ <td class='sme-border'><a href="groups2?trt=UPD&group=<%= $group->key%>"><%=l 'MODIFY'%></a></td> |
2206 |
|
|
+ <td class='sme-border'><a href="groups2?trt=DEL&group=<%= $group->key%>"><%=l 'REMOVE'%></a></td> |
2207 |
|
|
</tr> |
2208 |
|
|
% } |
2209 |
|
|
</tbody> |
2210 |
|
|
@@ -50,7 +45,6 @@ |
2211 |
|
|
<%} %> |
2212 |
|
|
</p> |
2213 |
|
|
|
2214 |
|
|
- %= hidden_field 'trt' => $grp_datas->{trt} |
2215 |
|
|
|
2216 |
|
|
% end |
2217 |
|
|
|
2218 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_upd.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_upd.html.ep |
2219 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_upd.html.ep 2020-04-14 16:50:36.000000000 +0400 |
2220 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_upd.html.ep 2020-04-26 21:20:38.000000000 +0400 |
2221 |
|
|
@@ -2,13 +2,11 @@ |
2222 |
|
|
|
2223 |
|
|
% my $btn = l('SAVE'); |
2224 |
|
|
|
2225 |
|
|
- %= form_for '/groupupd' => (method => 'POST') => begin |
2226 |
|
|
- <p> |
2227 |
|
|
- <h2> |
2228 |
|
|
+ %= form_for '/groups2' => (method => 'POST') => begin |
2229 |
|
|
+ |
2230 |
|
|
+ <p><h2> |
2231 |
|
|
%=l 'MODIFY_GROUP' |
2232 |
|
|
- </h2> |
2233 |
|
|
- <br> |
2234 |
|
|
- </p> |
2235 |
|
|
+ </h2><br></p> |
2236 |
|
|
|
2237 |
|
|
<p> |
2238 |
|
|
<span class=label> |
2239 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_module.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_module.html.ep |
2240 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_module.html.ep 2020-04-14 16:50:23.000000000 +0400 |
2241 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_module.html.ep 2020-04-26 13:08:54.000000000 +0400 |
2242 |
|
|
@@ -1,4 +1,4 @@ |
2243 |
|
|
-% layout 'default', title => 'Sme server 2 - Support', share_dir => '../'; |
2244 |
|
|
+% layout 'default', title => 'Sme server 2 - Support'; |
2245 |
|
|
|
2246 |
|
|
% content_for 'head' => begin |
2247 |
|
|
%= include 'partials/_head' |
2248 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_add.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_add.html.ep |
2249 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_add.html.ep 2020-04-14 16:50:31.000000000 +0400 |
2250 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_add.html.ep 2020-04-26 12:51:27.000000000 +0400 |
2251 |
|
|
@@ -6,10 +6,9 @@ |
2252 |
|
|
<p> |
2253 |
|
|
<h2> |
2254 |
|
|
%=l 'prt_CREATE_NEW_PRINTER' |
2255 |
|
|
- </h2> |
2256 |
|
|
- <br><br> |
2257 |
|
|
+ </h2><br> |
2258 |
|
|
%=l 'prt_CREATE_NEW_DESC' |
2259 |
|
|
- </p> |
2260 |
|
|
+ </p><br> |
2261 |
|
|
|
2262 |
|
|
<p> |
2263 |
|
|
<span class=label> |
2264 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_list.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_list.html.ep |
2265 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_list.html.ep 2020-04-14 16:50:23.000000000 +0400 |
2266 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_list.html.ep 2020-04-26 12:34:02.000000000 +0400 |
2267 |
|
|
@@ -3,7 +3,9 @@ |
2268 |
|
|
|
2269 |
|
|
% my $btn = l('prt_INITIAL_BTN'); |
2270 |
|
|
|
2271 |
|
|
- %= form_for '/printers' => (method => 'POST') => begin |
2272 |
|
|
+ %= form_for '/printers2' => (method => 'GET') => begin |
2273 |
|
|
+ |
2274 |
|
|
+ %= hidden_field 'trt' => 'ADD' |
2275 |
|
|
|
2276 |
|
|
<p> |
2277 |
|
|
<br> |
2278 |
|
|
@@ -53,10 +55,7 @@ |
2279 |
|
|
%= t td => (class => 'sme-border') => $printer->prop('Location') |
2280 |
|
|
%= t td => (class => 'sme-border') => $address |
2281 |
|
|
%= t td => (class => 'sme-border') => $remoteName |
2282 |
|
|
- <!-- = t td => link_to l 'REMOVE' => url_for("/printers/delete/$printer->key") |
2283 |
|
|
- <td><a href="/server-manager2/printdel/<%= $printer->key%>"><%=l 'REMOVE'%></a></td> |
2284 |
|
|
- --> |
2285 |
|
|
- <td class='sme-border'><a href="printdel?trt=DEL&printer=<%= $printer->key%>"><%=l 'REMOVE'%></a></td> |
2286 |
|
|
+ <td class='sme-border'><a href="printers2?trt=DEL&printer=<%= $printer->key%>"><%=l 'REMOVE'%></a></td> |
2287 |
|
|
</tr> |
2288 |
|
|
% } |
2289 |
|
|
</tbody> |
2290 |
|
|
@@ -64,8 +63,6 @@ |
2291 |
|
|
<%} %> |
2292 |
|
|
</p> |
2293 |
|
|
|
2294 |
|
|
- %= hidden_field 'trt' => $prt_datas->{trt} |
2295 |
|
|
- |
2296 |
|
|
% end |
2297 |
|
|
|
2298 |
|
|
</div> |
2299 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_net.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_net.html.ep |
2300 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_net.html.ep 2020-04-14 16:50:23.000000000 +0400 |
2301 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_net.html.ep 2020-04-26 12:52:35.000000000 +0400 |
2302 |
|
|
@@ -28,9 +28,6 @@ |
2303 |
|
|
</span> |
2304 |
|
|
</p> |
2305 |
|
|
|
2306 |
|
|
- < field id="address" type="text" validation="hostname_or_ip" > |
2307 |
|
|
- < field id="remoteName" type="text" value="raw" validation="nonblank" > |
2308 |
|
|
- |
2309 |
|
|
<p> |
2310 |
|
|
<br><br> |
2311 |
|
|
%= submit_button "$btn", class => 'action' |
2312 |
|
|
@@ -41,6 +38,6 @@ |
2313 |
|
|
%= hidden_field 'Description' => $prt_datas->{description} |
2314 |
|
|
%= hidden_field 'Location' => $prt_datas->{location} |
2315 |
|
|
|
2316 |
|
|
- % end |
2317 |
|
|
+ % end |
2318 |
|
|
|
2319 |
|
|
</div> |
2320 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_add.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_add.html.ep |
2321 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_add.html.ep 2020-04-14 16:50:31.000000000 +0400 |
2322 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_add.html.ep 2020-04-26 13:08:24.000000000 +0400 |
2323 |
|
|
@@ -2,7 +2,7 @@ |
2324 |
|
|
|
2325 |
|
|
% my $btn = l('ADD'); |
2326 |
|
|
|
2327 |
|
|
- %= form_for '/pseudoadd' => (method => 'POST') => begin |
2328 |
|
|
+ %= form_for '/pseudonyms2' => (method => 'POST') => begin |
2329 |
|
|
<p> |
2330 |
|
|
<h2> |
2331 |
|
|
%=l 'pse_TITLE_CREATE' |
2332 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_del.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_del.html.ep |
2333 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_del.html.ep 2020-04-14 16:50:31.000000000 +0400 |
2334 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_del.html.ep 2020-04-26 13:08:09.000000000 +0400 |
2335 |
|
|
@@ -1,7 +1,7 @@ |
2336 |
|
|
<div id='pse_del'> |
2337 |
|
|
|
2338 |
|
|
% my $btn = l('REMOVE'); |
2339 |
|
|
- %= form_for '/pseudodel' => (method => 'POST') => begin |
2340 |
|
|
+ %= form_for '/pseudonyms2' => (method => 'POST') => begin |
2341 |
|
|
<p> |
2342 |
|
|
<h2> |
2343 |
|
|
%=l 'pse_REMOVE_PSEUDONYM' |
2344 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_list.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_list.html.ep |
2345 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_list.html.ep 2020-04-14 16:50:31.000000000 +0400 |
2346 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_list.html.ep 2020-04-26 16:28:41.000000000 +0400 |
2347 |
|
|
@@ -1,22 +1,20 @@ |
2348 |
|
|
<div id='pse_list'> |
2349 |
|
|
|
2350 |
|
|
- |
2351 |
|
|
% my $btn = l('pse_CLICK_TO_CREATE'); |
2352 |
|
|
|
2353 |
|
|
%= $c->render_to_string(inline => l('pse_DESCRIPTION')); |
2354 |
|
|
|
2355 |
|
|
- %= form_for '/pseudonyms' => (method => 'POST') => begin |
2356 |
|
|
+ %= form_for '/pseudonyms2' => (method => 'GET') => begin |
2357 |
|
|
+ |
2358 |
|
|
+ %= hidden_field 'trt' => 'ADD' |
2359 |
|
|
|
2360 |
|
|
- <p> |
2361 |
|
|
- <br> |
2362 |
|
|
+ <p><br> |
2363 |
|
|
%= submit_button "$btn", class => 'action' |
2364 |
|
|
</p> |
2365 |
|
|
|
2366 |
|
|
- <p> |
2367 |
|
|
- <h2> |
2368 |
|
|
+ <p><h2> |
2369 |
|
|
%=l 'pse_CURRENT_PSEUDONYMS' |
2370 |
|
|
- </h2> |
2371 |
|
|
- <br> |
2372 |
|
|
+ </h2><br> |
2373 |
|
|
% my $numPseudonyms = @$pseudonyms; |
2374 |
|
|
% if ($numPseudonyms == 0){ |
2375 |
|
|
%=l 'pse_ACCOUNT_PSEUDONYM_NONE' |
2376 |
|
|
@@ -54,10 +52,10 @@ |
2377 |
|
|
|
2378 |
|
|
% my ($actionModify, $actionRemove) = ' '; |
2379 |
|
|
% if ($modifiable eq 'yes') { |
2380 |
|
|
- % $actionModify = "<a href='pseudoupd?trt=UPD&pseudonym=" . $pseudonym->key . "'>" . l('MODIFY') . "</a>"; |
2381 |
|
|
+ % $actionModify = "<a href='pseudonyms2?trt=UPD&pseudonym=" . $pseudonym->key . "'>" . l('MODIFY') . "</a>"; |
2382 |
|
|
% } |
2383 |
|
|
% if ($removable eq 'yes') { |
2384 |
|
|
- % $actionRemove = "<a href='pseudodel?trt=DEL&pseudonym=" . $pseudonym->key . "'>" . l('REMOVE') . "</a>"; |
2385 |
|
|
+ % $actionRemove = "<a href='pseudonyms2?trt=DEL&pseudonym=" . $pseudonym->key . "'>" . l('REMOVE') . "</a>"; |
2386 |
|
|
% } |
2387 |
|
|
|
2388 |
|
|
<td class='sme-border'><%= $c->render_to_string(inline => $actionModify) %></td> |
2389 |
|
|
@@ -70,7 +68,6 @@ |
2390 |
|
|
<%} %> |
2391 |
|
|
</p> |
2392 |
|
|
|
2393 |
|
|
- %= hidden_field 'trt' => $pse_datas->{trt} |
2394 |
|
|
|
2395 |
|
|
% end |
2396 |
|
|
|
2397 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_upd.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_upd.html.ep |
2398 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_upd.html.ep 2020-04-14 16:50:31.000000000 +0400 |
2399 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_upd.html.ep 2020-04-26 13:07:54.000000000 +0400 |
2400 |
|
|
@@ -2,7 +2,7 @@ |
2401 |
|
|
|
2402 |
|
|
% my $btn = l('SAVE'); |
2403 |
|
|
|
2404 |
|
|
- %= form_for '/pseudoupd' => (method => 'POST') => begin |
2405 |
|
|
+ %= form_for '/pseudonyms2' => (method => 'POST') => begin |
2406 |
|
|
<p> |
2407 |
|
|
<h2> |
2408 |
|
|
%=l 'pse_MODIFY_PSEUDONYM' |
2409 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/portforwarding.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/portforwarding.html.ep |
2410 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/portforwarding.html.ep 2020-04-14 16:50:36.000000000 +0400 |
2411 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/portforwarding.html.ep 2020-04-26 21:29:50.000000000 +0400 |
2412 |
|
|
@@ -1,4 +1,4 @@ |
2413 |
|
|
-% layout 'default', title => "Sme server 2 - Port Forwards", share_dir => './'; |
2414 |
|
|
+% layout 'default', title => "Sme server 2 - Port Forwards"; |
2415 |
|
|
|
2416 |
|
|
% content_for 'module' => begin |
2417 |
|
|
<div id="module"> |
2418 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/printers.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/printers.html.ep |
2419 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/printers.html.ep 2020-04-14 16:50:23.000000000 +0400 |
2420 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/printers.html.ep 2020-04-26 12:38:25.000000000 +0400 |
2421 |
|
|
@@ -1,18 +1,22 @@ |
2422 |
|
|
-% layout 'default', title => "Sme server 2 - printers", share_dir => './'; |
2423 |
|
|
+% layout 'default', title => "Sme server 2 - printers"; |
2424 |
|
|
|
2425 |
|
|
% content_for 'module' => begin |
2426 |
|
|
<div id="module"> |
2427 |
|
|
|
2428 |
|
|
- % if ($config->{debug} == 1) { |
2429 |
|
|
+ %if ($config->{debug} == 1) { |
2430 |
|
|
<p> |
2431 |
|
|
- (DBG)route: <%= $c->current_route %><br> |
2432 |
|
|
- (DBG)trt: <%= $prt_datas->{trt} %><br> |
2433 |
|
|
+ %= dumper $c->current_route |
2434 |
|
|
+ %= dumper $prt_datas |
2435 |
|
|
</p> |
2436 |
|
|
- % } |
2437 |
|
|
- |
2438 |
|
|
- <h1><%= $title%></h1> |
2439 |
|
|
+ %} |
2440 |
|
|
+ |
2441 |
|
|
+ % if ( stash 'error' ) { |
2442 |
|
|
+ <br><div class=sme-error> |
2443 |
|
|
+ %= $c->render_to_string(inline => stash 'error') |
2444 |
|
|
+ </div> |
2445 |
|
|
+ %} |
2446 |
|
|
|
2447 |
|
|
- %= $modul |
2448 |
|
|
+ <h1><%= $title%></h1> |
2449 |
|
|
|
2450 |
|
|
% if ($prt_datas->{trt} eq 'ADD') { |
2451 |
|
|
%= include 'partials/_prt_add' |
2452 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/proxy.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/proxy.html.ep |
2453 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/proxy.html.ep 2020-04-14 16:50:23.000000000 +0400 |
2454 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/proxy.html.ep 2020-04-26 12:59:28.000000000 +0400 |
2455 |
|
|
@@ -1,4 +1,4 @@ |
2456 |
|
|
-% layout 'default', title => "Sme server 2 - proxy", share_dir => './'; |
2457 |
|
|
+% layout 'default', title => "Sme server 2 - proxy"; |
2458 |
|
|
|
2459 |
|
|
% content_for 'module' => begin |
2460 |
|
|
<div id="module"> |
2461 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/pseudonyms.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/pseudonyms.html.ep |
2462 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/pseudonyms.html.ep 2020-04-14 16:50:36.000000000 +0400 |
2463 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/pseudonyms.html.ep 2020-04-26 13:05:58.000000000 +0400 |
2464 |
|
|
@@ -1,4 +1,4 @@ |
2465 |
|
|
-% layout 'default', title => "Sme server 2 - pseudonyms", share_dir => './'; |
2466 |
|
|
+% layout 'default', title => "Sme server 2 - pseudonyms"; |
2467 |
|
|
|
2468 |
|
|
% content_for 'module' => begin |
2469 |
|
|
<div id="module"> |
2470 |
|
|
@@ -10,15 +10,13 @@ |
2471 |
|
|
</p> |
2472 |
|
|
% } |
2473 |
|
|
|
2474 |
|
|
- <h1><%= $title%></h1> |
2475 |
|
|
- |
2476 |
|
|
- % if ( $notif ) { |
2477 |
|
|
- <br> |
2478 |
|
|
- <div class=sme-error> |
2479 |
|
|
- %= $notif |
2480 |
|
|
+ % if ( stash 'error' ) { |
2481 |
|
|
+ <br><div class=sme-error> |
2482 |
|
|
+ %= $c->render_to_string(inline => stash 'error') |
2483 |
|
|
</div> |
2484 |
|
|
%} |
2485 |
|
|
|
2486 |
|
|
+ <h1><%= $title%></h1> |
2487 |
|
|
|
2488 |
|
|
% if ($pse_datas->{trt} eq 'ADD') { |
2489 |
|
|
%= include 'partials/_pse_add' |
2490 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/qmailanalog.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/qmailanalog.html.ep |
2491 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/qmailanalog.html.ep 2020-04-14 16:50:31.000000000 +0400 |
2492 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/qmailanalog.html.ep 2020-04-26 12:59:36.000000000 +0400 |
2493 |
|
|
@@ -1,4 +1,4 @@ |
2494 |
|
|
-% layout 'default', title => "Sme server 2 - qmailanalog", share_dir => './'; |
2495 |
|
|
+% layout 'default', title => "Sme server 2 - qmailanalog"; |
2496 |
|
|
|
2497 |
|
|
% content_for 'module' => begin |
2498 |
|
|
<div id="module"> |
2499 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/quota.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/quota.html.ep |
2500 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/quota.html.ep 2020-04-14 16:50:31.000000000 +0400 |
2501 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/quota.html.ep 2020-04-26 13:00:06.000000000 +0400 |
2502 |
|
|
@@ -1,4 +1,4 @@ |
2503 |
|
|
-% layout 'default', title => "Sme server 2 - quota", share_dir => './'; |
2504 |
|
|
+% layout 'default', title => "Sme server 2 - quota"; |
2505 |
|
|
|
2506 |
|
|
% content_for 'module' => begin |
2507 |
|
|
<div id="module"> |
2508 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/reboot.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/reboot.html.ep |
2509 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/reboot.html.ep 2020-04-14 16:50:31.000000000 +0400 |
2510 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/reboot.html.ep 2020-04-26 21:26:30.000000000 +0400 |
2511 |
|
|
@@ -1,4 +1,4 @@ |
2512 |
|
|
-% layout 'default', title => "Sme server 2 - reboot", share_dir => './'; |
2513 |
|
|
+% layout 'default', title => "Sme server 2 - reboot"; |
2514 |
|
|
|
2515 |
|
|
% content_for 'module' => begin |
2516 |
|
|
|
2517 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/remoteaccess.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/remoteaccess.html.ep |
2518 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/remoteaccess.html.ep 2020-04-14 16:50:31.000000000 +0400 |
2519 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/remoteaccess.html.ep 2020-04-26 21:27:24.000000000 +0400 |
2520 |
|
|
@@ -1,4 +1,4 @@ |
2521 |
|
|
-% layout 'default', title => "Sme server 2 - remoteaccess", share_dir => './'; |
2522 |
|
|
+% layout 'default', title => "Sme server 2 - remoteaccess"; |
2523 |
|
|
|
2524 |
|
|
% content_for 'module' => begin |
2525 |
|
|
<div id="module"> |
2526 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/review.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/review.html.ep |
2527 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/review.html.ep 2020-04-14 16:50:36.000000000 +0400 |
2528 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/review.html.ep 2020-04-26 12:59:10.000000000 +0400 |
2529 |
|
|
@@ -1,4 +1,4 @@ |
2530 |
|
|
-% layout 'default', title => 'Sme server 2 - Review', share_dir => ''; |
2531 |
|
|
+% layout 'default', title => 'Sme server 2 - Review'; |
2532 |
|
|
|
2533 |
|
|
% content_for 'module' => begin |
2534 |
|
|
<div id="central"> |
2535 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/starterwebsite.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/starterwebsite.html.ep |
2536 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/starterwebsite.html.ep 2020-04-14 16:50:23.000000000 +0400 |
2537 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/starterwebsite.html.ep 2020-04-26 12:58:49.000000000 +0400 |
2538 |
|
|
@@ -1,4 +1,4 @@ |
2539 |
|
|
-% layout 'default', title => 'Sme server 2 - Starter website', share_dir => './'; |
2540 |
|
|
+% layout 'default', title => 'Sme server 2 - Starter website'; |
2541 |
|
|
|
2542 |
|
|
% content_for 'module' => begin |
2543 |
|
|
<div id="module"> |
2544 |
|
|
@@ -32,8 +32,8 @@ |
2545 |
|
|
<br> |
2546 |
|
|
%= text_area 'l_desc2', cols => 40, class => 'input' |
2547 |
|
|
<br> |
2548 |
|
|
- %=l 'sws_DESC_SUBMIT' |
2549 |
|
|
- <br><br> |
2550 |
|
|
+ %= $c->render_to_string(inline => (l 'sws_DESC_SUBMIT')) |
2551 |
|
|
+ <br> |
2552 |
|
|
%= submit_button "$btn", class => 'action' |
2553 |
|
|
% end |
2554 |
|
|
|
2555 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/support.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/support.html.ep |
2556 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/support.html.ep 2020-04-14 16:50:23.000000000 +0400 |
2557 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/support.html.ep 2020-04-26 12:58:56.000000000 +0400 |
2558 |
|
|
@@ -1,4 +1,4 @@ |
2559 |
|
|
-% layout 'default', title => 'Sme server 2 - Support', share_dir => './'; |
2560 |
|
|
+% layout 'default', title => 'Sme server 2 - Support'; |
2561 |
|
|
|
2562 |
|
|
% content_for 'module' => begin |
2563 |
|
|
<div id="module"> |
2564 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/useraccounts.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/useraccounts.html.ep |
2565 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/useraccounts.html.ep 2020-04-14 16:50:31.000000000 +0400 |
2566 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/useraccounts.html.ep 2020-04-26 21:27:32.000000000 +0400 |
2567 |
|
|
@@ -1,4 +1,4 @@ |
2568 |
|
|
-% layout 'default', title => "Sme server 2 - useraccounts", share_dir => './'; |
2569 |
|
|
+% layout 'default', title => "Sme server 2 - useraccounts"; |
2570 |
|
|
|
2571 |
|
|
% content_for 'module' => begin |
2572 |
|
|
<div id="module"> |
2573 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/viewlogfiles.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/viewlogfiles.html.ep |
2574 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/viewlogfiles.html.ep 2020-04-14 16:50:31.000000000 +0400 |
2575 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/viewlogfiles.html.ep 2020-04-26 21:27:09.000000000 +0400 |
2576 |
|
|
@@ -1,4 +1,4 @@ |
2577 |
|
|
-% layout 'default', title => "Sme server 2 - viewlogfiles", share_dir => './'; |
2578 |
|
|
+% layout 'default', title => "Sme server 2 - viewlogfiles"; |
2579 |
|
|
|
2580 |
|
|
% content_for 'module' => begin |
2581 |
|
|
<div id="module"> |
2582 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/welcome.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/welcome.html.ep |
2583 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/welcome.html.ep 2020-04-14 16:50:31.000000000 +0400 |
2584 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/welcome.html.ep 2020-04-26 21:25:28.000000000 +0400 |
2585 |
|
|
@@ -1,4 +1,4 @@ |
2586 |
|
|
-% layout 'default', title => 'Sme server 2 - IndexT', share_dir => ''; |
2587 |
|
|
+% layout 'default', title => 'Sme server 2 - IndexT'; |
2588 |
|
|
|
2589 |
|
|
% content_for 'module' => begin |
2590 |
|
|
<div id="central"> |
2591 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/whatever.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/whatever.html.ep |
2592 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/whatever.html.ep 2020-04-14 16:50:31.000000000 +0400 |
2593 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/whatever.html.ep 2020-04-26 21:25:47.000000000 +0400 |
2594 |
|
|
@@ -1,4 +1,4 @@ |
2595 |
|
|
-% layout 'default', title => 'Sme server 2 - Whatever D', share_dir => './'; |
2596 |
|
|
+% layout 'default', title => 'Sme server 2 - Whatever D'; |
2597 |
|
|
|
2598 |
|
|
% content_for 'module' => begin |
2599 |
|
|
|
2600 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/workgroup.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/workgroup.html.ep |
2601 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/workgroup.html.ep 2020-04-14 16:50:23.000000000 +0400 |
2602 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/workgroup.html.ep 2020-04-26 12:59:51.000000000 +0400 |
2603 |
|
|
@@ -1,4 +1,4 @@ |
2604 |
|
|
-% layout 'default', title => "Sme server 2 - workgroup", share_dir => './'; |
2605 |
|
|
+% layout 'default', title => "Sme server 2 - workgroup"; |
2606 |
|
|
|
2607 |
|
|
% content_for 'module' => begin |
2608 |
|
|
<div id="module"> |
2609 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumconfig.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumconfig.html.ep |
2610 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumconfig.html.ep 2020-04-14 16:50:36.000000000 +0400 |
2611 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumconfig.html.ep 2020-04-26 21:28:25.000000000 +0400 |
2612 |
|
|
@@ -1,4 +1,4 @@ |
2613 |
|
|
-% layout 'default', title => "Sme server 2 - yum_config", share_dir => './'; |
2614 |
|
|
+% layout 'default', title => "Sme server 2 - yum_config"; |
2615 |
|
|
|
2616 |
|
|
% content_for 'module' => begin |
2617 |
|
|
|
2618 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yum.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yum.html.ep |
2619 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yum.html.ep 2020-04-14 16:50:36.000000000 +0400 |
2620 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yum.html.ep 2020-04-26 21:27:17.000000000 +0400 |
2621 |
|
|
@@ -1,4 +1,4 @@ |
2622 |
|
|
-% layout 'default', title => "Sme server 2 - yum", share_dir => './'; |
2623 |
|
|
+% layout 'default', title => "Sme server 2 - yum"; |
2624 |
|
|
|
2625 |
|
|
% content_for 'module' => begin |
2626 |
|
|
|
2627 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yuminstall.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yuminstall.html.ep |
2628 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yuminstall.html.ep 2020-04-14 16:50:36.000000000 +0400 |
2629 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yuminstall.html.ep 2020-04-26 21:28:12.000000000 +0400 |
2630 |
|
|
@@ -1,4 +1,4 @@ |
2631 |
|
|
-% layout 'default', title => "Sme server 2 - yum_install", share_dir => './'; |
2632 |
|
|
+% layout 'default', title => "Sme server 2 - yum_install"; |
2633 |
|
|
|
2634 |
|
|
% content_for 'module' => begin |
2635 |
|
|
|
2636 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumlogfile.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumlogfile.html.ep |
2637 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumlogfile.html.ep 2020-04-14 16:50:36.000000000 +0400 |
2638 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumlogfile.html.ep 2020-04-26 21:28:40.000000000 +0400 |
2639 |
|
|
@@ -1,4 +1,4 @@ |
2640 |
|
|
-% layout 'default', title => "Sme server 2 - yum_logfile", share_dir => './'; |
2641 |
|
|
+% layout 'default', title => "Sme server 2 - yum_logfile"; |
2642 |
|
|
|
2643 |
|
|
% content_for 'module' => begin |
2644 |
|
|
|
2645 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumpostupg.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumpostupg.html.ep |
2646 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumpostupg.html.ep 2020-04-14 16:50:36.000000000 +0400 |
2647 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumpostupg.html.ep 2020-04-26 21:28:32.000000000 +0400 |
2648 |
|
|
@@ -1,4 +1,4 @@ |
2649 |
|
|
-% layout 'default', title => "Sme server 2 - yum_update", share_dir => './'; |
2650 |
|
|
+% layout 'default', title => "Sme server 2 - yum_update"; |
2651 |
|
|
|
2652 |
|
|
% content_for 'module' => begin |
2653 |
|
|
|
2654 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumremove.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumremove.html.ep |
2655 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumremove.html.ep 2020-04-14 16:50:36.000000000 +0400 |
2656 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumremove.html.ep 2020-04-26 21:28:19.000000000 +0400 |
2657 |
|
|
@@ -1,4 +1,4 @@ |
2658 |
|
|
-% layout 'default', title => "Sme server 2 - yum_update", share_dir => './'; |
2659 |
|
|
+% layout 'default', title => "Sme server 2 - yum_update"; |
2660 |
|
|
|
2661 |
|
|
% content_for 'module' => begin |
2662 |
|
|
|
2663 |
|
|
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumupdate.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumupdate.html.ep |
2664 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumupdate.html.ep 2020-04-14 16:50:36.000000000 +0400 |
2665 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumupdate.html.ep 2020-04-26 21:28:05.000000000 +0400 |
2666 |
|
|
@@ -1,4 +1,4 @@ |
2667 |
|
|
-% layout 'default', title => "Sme server 2 - yum_update", share_dir => './'; |
2668 |
|
|
+% layout 'default', title => "Sme server 2 - yum_update"; |
2669 |
|
|
|
2670 |
|
|
% content_for 'module' => begin |
2671 |
|
|
|