1 |
michel |
1.1 |
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/conf/srvmngr.conf smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/conf/srvmngr.conf |
2 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/conf/srvmngr.conf 2020-01-22 15:34:30.000000000 +0400 |
3 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/conf/srvmngr.conf 2020-01-22 15:39:08.824000000 +0400 |
4 |
|
|
@@ -2,10 +2,6 @@ |
5 |
|
|
secrets => ['new sessionsLeYTmFPhw3q', 'for validation QrPTZhWJmqCjyGZmguK'], |
6 |
|
|
# theme => 'default', |
7 |
|
|
theme => 'AdminLTE', |
8 |
|
|
-# navigation_script_file => "js/navigation.js", |
9 |
|
|
-# navigation_div_file => "themes/default/templates/partials/_navig.html.ep", |
10 |
|
|
- navigation_script_file => "themes/default/public/js/navigation.js", |
11 |
|
|
- navigation_div_file => "themes/default/templates/partials/_navig.html.ep", |
12 |
|
|
navigation_has_changed => 1, |
13 |
|
|
modules_dir => "lib/SrvMngr/Controller", |
14 |
|
|
debug => 0, |
15 |
|
|
diff -urN 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 |
16 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Groups.pm 2020-01-22 15:34:30.000000000 +0400 |
17 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Groups.pm 2020-01-22 00:16:29.000000000 +0400 |
18 |
|
|
@@ -9,7 +9,8 @@ |
19 |
|
|
|
20 |
|
|
use Data::Dumper; |
21 |
|
|
|
22 |
|
|
-use esmith::FormMagick::Panel::groups; |
23 |
|
|
+#use esmith::FormMagick::Panel::groups; |
24 |
|
|
+use esmith::AccountsDB; |
25 |
|
|
|
26 |
|
|
our $cdb = esmith::ConfigDB->open || die "Couldn't open configuration db"; |
27 |
|
|
our $adb = esmith::AccountsDB->open || die "Couldn't open accounts db"; |
28 |
|
|
@@ -147,16 +148,16 @@ |
29 |
|
|
my $res = validate_group( $c, $groupName ); |
30 |
|
|
$result .= $res unless $res eq 'OK'; |
31 |
|
|
|
32 |
|
|
- my $res = validate_group_length( $c, $groupName ); |
33 |
|
|
+ $res = validate_group_length( $c, $groupName ); |
34 |
|
|
$result .= $res unless $res eq 'OK'; |
35 |
|
|
|
36 |
|
|
- my $res = validate_group_naming_conflict( $c, $groupName ); |
37 |
|
|
+ $res = validate_group_naming_conflict( $c, $groupName ); |
38 |
|
|
$result .= $res unless $res eq 'OK'; |
39 |
|
|
|
40 |
|
|
- my $res = validate_description( $c, $groupDesc ); |
41 |
|
|
+ $res = validate_description( $c, $groupDesc ); |
42 |
|
|
$result .= $res unless $res eq 'OK'; |
43 |
|
|
|
44 |
|
|
- my $res = validate_group_has_members( $c, @members ); |
45 |
|
|
+ $res = validate_group_has_members( $c, @members ); |
46 |
|
|
$result .= $res unless $res eq 'OK'; |
47 |
|
|
|
48 |
|
|
my %props = ( |
49 |
|
|
@@ -194,15 +195,15 @@ |
50 |
|
|
|
51 |
|
|
# controls |
52 |
|
|
my $res = ''; |
53 |
|
|
- my $res = validate_description( $c, $groupDesc ); |
54 |
|
|
+ $res = validate_description( $c, $groupDesc ); |
55 |
|
|
$result .= $res unless $res eq 'OK'; |
56 |
|
|
|
57 |
|
|
- my $res = validate_group_has_members( $c, @members ); |
58 |
|
|
+ $res = validate_group_has_members( $c, @members ); |
59 |
|
|
$result .= $res unless $res eq 'OK'; |
60 |
|
|
|
61 |
|
|
if ( ! $result ) { |
62 |
|
|
|
63 |
|
|
- $c->app->log->info("groupName: " . $c->dumper($groupName) . " , " . $c->dumper($members). " << " . $c->dumper(@members)); |
64 |
|
|
+ # $c->app->log->info("groupName: " . $c->dumper($groupName) . " , " . $c->dumper($members). " << " . $c->dumper(@members)); |
65 |
|
|
|
66 |
|
|
$adb->get($groupName)->set_prop( 'Members', $members ); |
67 |
|
|
$adb->get($groupName)->set_prop( 'Description', $groupDesc ); |
68 |
|
|
@@ -323,7 +324,7 @@ |
69 |
|
|
$names{$user->key} = $user->prop('FirstName') . " " |
70 |
|
|
. $user->prop('LastName'); |
71 |
|
|
} |
72 |
|
|
- my @users = %names; |
73 |
|
|
+ @users = %names; |
74 |
|
|
|
75 |
|
|
return \@users; |
76 |
|
|
} |
77 |
|
|
@@ -368,6 +369,7 @@ |
78 |
|
|
ok (undef, 'need testing for validate_naming_Conflicts'); |
79 |
|
|
=cut |
80 |
|
|
|
81 |
|
|
+ |
82 |
|
|
sub validate_group_naming_conflict |
83 |
|
|
{ |
84 |
|
|
my $c = shift; |
85 |
|
|
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Initial.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Initial.pm |
86 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Initial.pm 2020-01-22 15:34:30.000000000 +0400 |
87 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Initial.pm 2020-01-22 00:02:53.000000000 +0400 |
88 |
|
|
@@ -23,6 +23,8 @@ |
89 |
|
|
$c->session->{releaseVersion} = $datas{'releaseVersion'}; |
90 |
|
|
$c->session->{PwdSet} = $datas{'PwdSet'}; |
91 |
|
|
$c->session->{Unsafe} = $datas{'Unsafe'}; |
92 |
|
|
+ $c->session->{SystemName} = $datas{'SystemName'}; |
93 |
|
|
+ $c->session->{DomainName} = $datas{'DomainName'}; |
94 |
|
|
$c->languages($datas{'lang'}); |
95 |
|
|
|
96 |
|
|
} |
97 |
|
|
@@ -30,10 +32,7 @@ |
98 |
|
|
my $title = $c->l('initial_FORM_TITLE'); |
99 |
|
|
my $modul = $c->render_to_string(inline => $c->l('initial_FRAMES_BODY')); |
100 |
|
|
|
101 |
|
|
- $c->stash( releaseVersion => $c->session->{releaseVersion}, copyRight => $c->session->{copyRight}, |
102 |
|
|
- PwdSet => $c->session->{PwdSet}, Unsafe => $c->session->{Unsafe}, |
103 |
|
|
- title => $title, modul => $modul); |
104 |
|
|
- |
105 |
|
|
+ $c->stash( title => $title, modul => $modul ); |
106 |
|
|
|
107 |
|
|
$c->render(template => 'initial'); |
108 |
|
|
|
109 |
|
|
diff -urN 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 |
110 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Printers.pm 2020-01-22 15:34:30.000000000 +0400 |
111 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Printers.pm 2020-01-13 10:05:58.000000000 +0400 |
112 |
|
|
@@ -53,22 +53,8 @@ |
113 |
|
|
|
114 |
|
|
if ( $trt eq 'ADD' ) { |
115 |
|
|
|
116 |
|
|
- # 'locations list' => |
117 |
|
|
- my $localist = "[[ " . |
118 |
|
|
- $c->l('prt_LOCAL_PRINTER_0'). |
119 |
|
|
- " => 'lp0'], [ ". |
120 |
|
|
- $c->l('prt_LOCAL_PRINTER_1'). |
121 |
|
|
- " => 'lp1']]"; |
122 |
|
|
- # [ $c->l('prt_LOCAL_PRINTER_2') => 'lp2'], [ $c->l('prt_NET_PRINTER') => 'remote' ], [ $c->l('prt_FIRST_USB_PRINTER') => 'usb/lp0'], [ $c->l('prt_SECOND_USB_PRINTER') => 'usb/lp1']]"; |
123 |
|
|
- my %loclist = ( |
124 |
|
|
- $c->l('prt_LOCAL_PRINTER_0') => 'lp0', |
125 |
|
|
- $c->l('prt_LOCAL_PRINTER_1') => 'lp1', |
126 |
|
|
- $c->l('prt_LOCAL_PRINTER_2') => 'lp2', |
127 |
|
|
- $c->l('prt_NET_PRINTER') => 'remote', |
128 |
|
|
- $c->l('prt_FIRST_USB_PRINTER') => 'usb/lp0', |
129 |
|
|
- $c->l('prt_SECOND_USB_PRINTER') => 'usb/lp1', |
130 |
|
|
- ); |
131 |
|
|
- $c->stash( loclist => \%loclist, localist => $localist); |
132 |
|
|
+ # 'locations list' (call printerLocation_list() within template) |
133 |
|
|
+ |
134 |
|
|
} |
135 |
|
|
|
136 |
|
|
if ( $trt eq 'DEL' ) { |
137 |
|
|
@@ -351,4 +337,23 @@ |
138 |
|
|
} |
139 |
|
|
|
140 |
|
|
|
141 |
|
|
+=head2 publicAccess_list |
142 |
|
|
+ |
143 |
|
|
+Returns the hash of public access settings for showing in the public |
144 |
|
|
+access drop down list. |
145 |
|
|
+ |
146 |
|
|
+=cut |
147 |
|
|
+ |
148 |
|
|
+sub printerLocation_list { |
149 |
|
|
+ |
150 |
|
|
+ my $c = shift; |
151 |
|
|
+ return [[ $c->l('prt_LOCAL_PRINTER_0') => 'lp0'], |
152 |
|
|
+ [ $c->l('prt_LOCAL_PRINTER_1') => 'lp1'], |
153 |
|
|
+ [ $c->l('prt_LOCAL_PRINTER_2') => 'lp2'], |
154 |
|
|
+ [ $c->l('prt_NET_PRINTER') => 'remote' ], |
155 |
|
|
+ [ $c->l('prt_FIRST_USB_PRINTER') => 'usb/lp0'], |
156 |
|
|
+ [ $c->l('prt_SECOND_USB_PRINTER') => 'usb/lp1']]; |
157 |
|
|
+} |
158 |
|
|
+ |
159 |
|
|
+ |
160 |
|
|
1 |
161 |
|
|
\ Pas de fin de ligne à la fin du fichier |
162 |
|
|
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Qmailanalog.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Qmailanalog.pm |
163 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Qmailanalog.pm 2020-01-22 15:34:30.000000000 +0400 |
164 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Qmailanalog.pm 2020-01-19 16:51:40.000000000 +0400 |
165 |
|
|
@@ -117,4 +117,23 @@ |
166 |
|
|
} |
167 |
|
|
|
168 |
|
|
|
169 |
|
|
+sub reportType_list { |
170 |
|
|
+ |
171 |
|
|
+ my $c = shift; |
172 |
|
|
+ return [[ $c->l('qma_LIST_OUTGOING') => 'qmail-qread' ], |
173 |
|
|
+ [ $c->l('qma_SUMMARIZE_QUEUE') => 'qmail-qstat' ], |
174 |
|
|
+ [ $c->l('qma_SUCCESSFUL_DELIVERY_DELAY') => 'zddist' ], |
175 |
|
|
+ [ $c->l('qma_REASONS_DEFERRAL') => 'zdeferrals' ], |
176 |
|
|
+ [ $c->l('qma_REASONS_FAILURE') => 'zfailures' ], |
177 |
|
|
+ [ $c->l('qma_BASIC_STATS') => 'zoverall' ], |
178 |
|
|
+ [ $c->l('qma_RECIP_STATS') => 'zrecipients' ], |
179 |
|
|
+ [ $c->l('qma_RECIP_HOSTS') => 'zrhosts' ], |
180 |
|
|
+ [ $c->l('qma_RECIP_ORDERED') => 'zrxdelay' ], |
181 |
|
|
+ [ $c->l('qma_SENDER_STATS') => 'zsenders' ], |
182 |
|
|
+ [ $c->l('qma_SENDMAIL_STYLE') => 'zsendmail' ], |
183 |
|
|
+ [ $c->l('qma_REASONS_SUCCESS') => 'zsuccesses' ], |
184 |
|
|
+ [ $c->l('qma_SENDER_UIDS') => 'zsuids' ]] |
185 |
|
|
+} |
186 |
|
|
+ |
187 |
|
|
+ |
188 |
|
|
1; |
189 |
|
|
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Reboot.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Reboot.pm |
190 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Reboot.pm 2020-01-22 15:34:30.000000000 +0400 |
191 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Reboot.pm 2020-01-19 17:03:42.000000000 +0400 |
192 |
|
|
@@ -64,10 +64,19 @@ |
193 |
|
|
} |
194 |
|
|
} |
195 |
|
|
|
196 |
|
|
- $c->stash( title => $title, modul => $result ); |
197 |
|
|
- $c->render(template => 'module'); |
198 |
|
|
+ #$c->stash( title => $title, modul => $result ); |
199 |
|
|
+ #$c->render(template => 'module'); |
200 |
|
|
|
201 |
|
|
}; |
202 |
|
|
|
203 |
|
|
|
204 |
|
|
+sub rebootFunction_list { |
205 |
|
|
+ |
206 |
|
|
+ my $c = shift; |
207 |
|
|
+ return [[ $c->l('SHUTDOWN') => 'shutdown' ], |
208 |
|
|
+ [ $c->l('rbo_REBOOT') => 'reboot' ], |
209 |
|
|
+ [ $c->l('RECONFIGURE') => 'reconfigure' ]]; |
210 |
|
|
+} |
211 |
|
|
+ |
212 |
|
|
+ |
213 |
|
|
1; |
214 |
|
|
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Request.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Request.pm |
215 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Request.pm 2020-01-22 15:34:30.000000000 +0400 |
216 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Request.pm 2020-01-21 00:09:27.000000000 +0400 |
217 |
|
|
@@ -16,14 +16,18 @@ |
218 |
|
|
my $c = shift; |
219 |
|
|
# $c -> res -> headers -> header('Access-Control-Allow-Origin' => '*'); |
220 |
|
|
|
221 |
|
|
- my $db = esmith::ConfigDB -> open_ro; |
222 |
|
|
+ my $dbc = esmith::ConfigDB -> open_ro; |
223 |
|
|
my $key = $c -> param('key'); |
224 |
|
|
- my $r = $db -> get($key); |
225 |
|
|
- $c -> render(json => { |
226 |
|
|
- $key => { |
227 |
|
|
- $r -> props |
228 |
|
|
- } |
229 |
|
|
- }); |
230 |
|
|
+ if ($key) { |
231 |
|
|
+ my $r = $dbc -> get($key); |
232 |
|
|
+ $c -> render(json => { |
233 |
|
|
+ $key => { |
234 |
|
|
+ $r -> props |
235 |
|
|
+ } |
236 |
|
|
+ }) |
237 |
|
|
+ } else { |
238 |
|
|
+ $c -> render( text => 'error'); |
239 |
|
|
+ } |
240 |
|
|
}; |
241 |
|
|
|
242 |
|
|
|
243 |
|
|
@@ -33,15 +37,19 @@ |
244 |
|
|
my $c = shift; |
245 |
|
|
# $c -> res -> headers -> header('Access-Control-Allow-Origin' => '*'); |
246 |
|
|
|
247 |
|
|
- my $a = esmith::AccountsDB -> open_ro; |
248 |
|
|
+ my $dba = esmith::AccountsDB -> open_ro; |
249 |
|
|
my $key = $c -> param('key'); |
250 |
|
|
- my $r = $a -> get($key); |
251 |
|
|
- $c -> render(json => { |
252 |
|
|
- name => $key, props => { |
253 |
|
|
- $r -> props |
254 |
|
|
- } |
255 |
|
|
- }); |
256 |
|
|
-}; |
257 |
|
|
+ if ($key) { |
258 |
|
|
+ my $r = $dba -> get($key); |
259 |
|
|
+ $c -> render(json => { |
260 |
|
|
+ $key => { |
261 |
|
|
+ $r -> props |
262 |
|
|
+ } |
263 |
|
|
+ }) |
264 |
|
|
+ } else { |
265 |
|
|
+ $c -> render( text => 'error'); |
266 |
|
|
+ } |
267 |
|
|
+} |
268 |
|
|
|
269 |
|
|
|
270 |
|
|
1; |
271 |
|
|
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Model/Main.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Model/Main.pm |
272 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Model/Main.pm 2020-01-22 15:34:30.000000000 +0400 |
273 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Model/Main.pm 2020-01-21 20:56:44.000000000 +0400 |
274 |
|
|
@@ -15,6 +15,8 @@ |
275 |
|
|
'modul' => 'Modul 89 +/- 11', |
276 |
|
|
'PwdSet' => '0', |
277 |
|
|
'Unsafe' => '0', |
278 |
|
|
+ 'SystemName' => '', |
279 |
|
|
+ 'DomainName' => '', |
280 |
|
|
); |
281 |
|
|
|
282 |
|
|
|
283 |
|
|
@@ -32,5 +34,7 @@ |
284 |
|
|
$datas{'PwdSet'} = ($DB->get('PasswordSet')->value eq "yes") || '0' ; |
285 |
|
|
$datas{'Unsafe'} = ($DB->get('bootstrap-console') and $DB->get('bootstrap-console')->prop('Run') eq 'yes') || |
286 |
|
|
($DB->get('UnsavedChanges') and $DB->get('UnsavedChanges')->value eq 'yes'); |
287 |
|
|
+ $datas{'SystemName'} = $DB->get("SystemName")->value || '??'; |
288 |
|
|
+ $datas{'DomainName'} = $DB->get("DomainName")->value || '??'; |
289 |
|
|
return( %datas ); |
290 |
|
|
} |
291 |
|
|
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Navigation.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Navigation.pm |
292 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Navigation.pm 2020-01-22 15:34:30.000000000 +0400 |
293 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Navigation.pm 2020-01-22 00:33:11.000000000 +0400 |
294 |
|
|
@@ -11,14 +11,6 @@ |
295 |
|
|
use esmith::util; |
296 |
|
|
use esmith::I18N; |
297 |
|
|
|
298 |
|
|
- # Clear PATH and related environment variables so that calls to |
299 |
|
|
- # external programs do not cause results to be tainted. See |
300 |
|
|
- # "perlsec" manual page for details. |
301 |
|
|
- |
302 |
|
|
-# $ENV {'PATH'} = ''; |
303 |
|
|
-# $ENV {'SHELL'} = '/bin/bash'; |
304 |
|
|
-# delete $ENV {'ENV'}; |
305 |
|
|
- |
306 |
|
|
esmith::util::setRealToEffective (); |
307 |
|
|
|
308 |
|
|
# Use the one script for navigation and noframes |
309 |
|
|
@@ -61,6 +53,11 @@ |
310 |
|
|
my $q = shift; |
311 |
|
|
#my $c = shift; |
312 |
|
|
my $config = shift; |
313 |
|
|
+ my $mode = shift; |
314 |
|
|
+ |
315 |
|
|
+ my $navig_script = "themes/".$config->{theme}."/public/js/navigation.js"; |
316 |
|
|
+ my $navig_div = "themes/".$config->{theme}."/templates/partials/_navig.html.ep"; |
317 |
|
|
+ |
318 |
|
|
my $navigation = ""; |
319 |
|
|
|
320 |
|
|
# Use this variable throughout to keep track of files |
321 |
|
|
@@ -216,6 +213,8 @@ |
322 |
|
|
}; |
323 |
|
|
} |
324 |
|
|
|
325 |
|
|
+ if ( $mode eq 9 ) { return \%nav; } |
326 |
|
|
+ |
327 |
|
|
#-------------------------------------------------- |
328 |
|
|
# generate list of headings sorted by average weight |
329 |
|
|
#-------------------------------------------------- |
330 |
|
|
@@ -223,8 +222,8 @@ |
331 |
|
|
# |
332 |
|
|
# generate script .js |
333 |
|
|
# |
334 |
|
|
- open(SCR, "> $config->{navigation_script_file}") |
335 |
|
|
- or die "access file error: \'$config->{navigation_script_file}\'\n$!"; |
336 |
|
|
+ open(SCR, "> $navig_script") |
337 |
|
|
+ or die "access file error: \'$navig_script\'\n$!"; |
338 |
|
|
|
339 |
|
|
printf SCR ' |
340 |
|
|
// |
341 |
|
|
@@ -263,8 +262,8 @@ |
342 |
|
|
# generate navigation div part |
343 |
|
|
# |
344 |
|
|
|
345 |
|
|
- open(DIV, "> $config->{navigation_div_file}") |
346 |
|
|
- or die "access file error: \'$config->{navigation_div_file}\'\n$!"; |
347 |
|
|
+ open(DIV, "> $navig_div") |
348 |
|
|
+ or die "access file error: \'$navig_div\'\n$!"; |
349 |
|
|
|
350 |
|
|
# enable utf8 binmode so new translations work |
351 |
|
|
binmode DIV, ":utf8"; |
352 |
|
|
@@ -282,9 +281,9 @@ |
353 |
|
|
else |
354 |
|
|
{ |
355 |
|
|
#### esmith::cgi::genNavigationHeader ($q, undef); |
356 |
|
|
- printf DIV "\n <div id=\"navigat\">\n"; |
357 |
|
|
-## printf DIV "\n <script type='text/javascript' src='$config->{navigation_script_file}'></script>"; |
358 |
|
|
-## printf DIV "\n <script type='text/javascript' src='<%= $share_dir %>$config->{navigation_script_file}'></script>"; |
359 |
|
|
+ printf DIV "\n <div id='navigat'>\n"; |
360 |
|
|
+## printf DIV "\n <script type='text/javascript' src='$navig_script'></script>"; |
361 |
|
|
+## printf DIV "\n <script type='text/javascript' src='<%= $share_dir %>$navig_script'></script>"; |
362 |
|
|
|
363 |
|
|
} |
364 |
|
|
|
365 |
|
|
diff -urN 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 |
366 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/script/srvmngr.pl 2020-01-22 15:34:30.000000000 +0400 |
367 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/script/srvmngr.pl 2020-01-22 15:11:19.000000000 +0400 |
368 |
|
|
@@ -1,5 +1,4 @@ |
369 |
|
|
#! /usr/bin/perl |
370 |
|
|
-#-wT |
371 |
|
|
|
372 |
|
|
# mojo server-manager2 (sandbox) mab974 2019 |
373 |
|
|
|
374 |
|
|
@@ -49,12 +48,15 @@ |
375 |
|
|
} |
376 |
|
|
app->log->info("Current theme : ${app->renderer->paths}[0] & ${app->static->paths}[0]"); |
377 |
|
|
|
378 |
|
|
+ |
379 |
|
|
my %datas = ( |
380 |
|
|
'lang' => 'en', |
381 |
|
|
'releaseVersion' => 'rv', |
382 |
|
|
'copyRight' => 'cp', |
383 |
|
|
'PwdSet' => '1', |
384 |
|
|
'Unsafe' => '0', |
385 |
|
|
+ 'SystemName' => 'sn', |
386 |
|
|
+ 'DomainName' => 'dn', |
387 |
|
|
); |
388 |
|
|
|
389 |
|
|
SrvMngr::Navigation->showNavigation($config) if ($config->{navigation_has_changed} == 1); |
390 |
|
|
@@ -62,12 +64,7 @@ |
391 |
|
|
%datas = SrvMngr::Model::Main->init_data( %datas ); |
392 |
|
|
|
393 |
|
|
my $right = app->l("$datas{copyRight}"); |
394 |
|
|
-app->log->info("Session started: $datas{lang} $right"); |
395 |
|
|
- |
396 |
|
|
-#my $lang = $datas{'lang'}; |
397 |
|
|
-#my $releaseVersion = $datas{releaseVersion}; |
398 |
|
|
-#my $PwdSet = $datas{'PwdSet'}; |
399 |
|
|
-#my $Unsafe = $datas{'Unsafe'}; |
400 |
|
|
+app->log->info("Session started: $datas{lang} $right $datas{SystemName}t $datas{DomainName}"); |
401 |
|
|
|
402 |
|
|
|
403 |
|
|
my $r = app->routes; |
404 |
|
|
@@ -105,10 +102,9 @@ |
405 |
|
|
$r->post('/printers')->to('printers#do_display')->name('printeradd'); |
406 |
|
|
$r->get('/printers2')->to('printers#do_update')->name('printernet'); |
407 |
|
|
$r->post('/printers2')->to('printers#do_update')->name('printerupd'); |
408 |
|
|
-# $r->post('/printers3')->to('printers#do_update')->name('printernet'); |
409 |
|
|
-# $r->get('/printers/:printer' => {printer => qr/^([a-z][a-z0-9]*)$/})->to('printers#do_display')->name('printerdel'); |
410 |
|
|
$r->get('/printdel')->to('printers#do_display')->name('printerdel'); |
411 |
|
|
$r->post('/printdel')->to('printers#do_update')->name('printerdel2'); |
412 |
|
|
+ |
413 |
|
|
$r->get('/proxy')->to('proxy#main')->name('proxy'); |
414 |
|
|
$r->post('/proxy')->to('proxy#do_update')->name('proxy2'); |
415 |
|
|
$r->get('/qmailanalog')->to('qmailanalog#main')->name('qmailanalog'); |
416 |
|
|
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/t/srvmngr.t smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/t/srvmngr.t |
417 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/t/srvmngr.t 2020-01-22 15:34:30.000000000 +0400 |
418 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/t/srvmngr.t 2020-01-22 15:50:00.424000000 +0400 |
419 |
|
|
@@ -1,19 +1,30 @@ |
420 |
|
|
-use Test::More tests => 3; |
421 |
|
|
+use Mojo::Base -strict; |
422 |
|
|
+use Test::More; |
423 |
|
|
use Test::Mojo; |
424 |
|
|
|
425 |
|
|
-# TO BE DONE !!!! |
426 |
|
|
+# !!! TO BE DONE !!!! |
427 |
|
|
|
428 |
|
|
-# FindBin permet de trouver le script de l'appli |
429 |
|
|
use FindBin; |
430 |
|
|
|
431 |
|
|
$ENV{MOJO_HOME} = "$FindBin::Bin/../"; |
432 |
|
|
require "$ENV{MOJO_HOME}/srvmngr.pl"; |
433 |
|
|
|
434 |
|
|
-# tests declaration |
435 |
|
|
- |
436 |
|
|
my $t = Test::Mojo->new; |
437 |
|
|
+ |
438 |
|
|
$t->ua->max_redirects(1); |
439 |
|
|
|
440 |
|
|
-$t->get_ok('/profile') |
441 |
|
|
+$t->get_ok('/') |
442 |
|
|
+ ->status_is(200); |
443 |
|
|
+ |
444 |
|
|
+$t->get_ok('/manual') |
445 |
|
|
+ ->status_is(200); |
446 |
|
|
+ |
447 |
|
|
+$t->get_ok('/getconfig/ConsoleMode') |
448 |
|
|
->status_is(200) |
449 |
|
|
- ->text_like('html body' => qr/Welcome/); |
450 |
|
|
+ ->json_is({ConsoleMode => {type => 'login'}}); |
451 |
|
|
+ |
452 |
|
|
+$t->get_ok('/getaccount/Primary') |
453 |
|
|
+ ->status_is(200) |
454 |
|
|
+ ->json_is('/name', 'Primary') |
455 |
|
|
+ ->json_is('//type', 'ibay'); |
456 |
|
|
+ |
457 |
|
|
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/public/server-manager2.css smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/public/server-manager2.css |
458 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/public/server-manager2.css 2020-01-22 15:34:36.000000000 +0400 |
459 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/AdminLTE/public/server-manager2.css 2020-01-22 15:55:05.736000000 +0400 |
460 |
|
|
@@ -22,3 +22,19 @@ |
461 |
|
|
.action { |
462 |
|
|
background-color:#bee6a2; |
463 |
|
|
} |
464 |
|
|
+ |
465 |
|
|
+.label { |
466 |
|
|
+ display:inline-block; |
467 |
|
|
+ width:25%; |
468 |
|
|
+ background-color:#e8f3e1; |
469 |
|
|
+ text-color:black; |
470 |
|
|
+} |
471 |
|
|
+ |
472 |
|
|
+.data { |
473 |
|
|
+ display:inline-block; |
474 |
|
|
+ margin-left:2px; |
475 |
|
|
+} |
476 |
|
|
+ |
477 |
|
|
+.sidebar a.accent { |
478 |
|
|
+ color: brown; |
479 |
|
|
+} |
480 |
|
|
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/css/styles.css smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/css/styles.css |
481 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/css/styles.css 2020-01-22 15:34:30.000000000 +0400 |
482 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/public/css/styles.css 2020-01-20 21:09:46.000000000 +0400 |
483 |
|
|
@@ -15,7 +15,7 @@ |
484 |
|
|
margin-left: 0px; |
485 |
|
|
padding: 5px; |
486 |
|
|
background-color: #E8F3E1; |
487 |
|
|
- height: 600px; |
488 |
|
|
+/* height: 600px; */ |
489 |
|
|
overflow: auto; |
490 |
|
|
} |
491 |
|
|
|
492 |
|
|
@@ -102,7 +102,9 @@ |
493 |
|
|
padding: 3px; |
494 |
|
|
background-color: grey; |
495 |
|
|
} |
496 |
|
|
+ |
497 |
|
|
/* #modul form .input */ |
498 |
|
|
+ |
499 |
|
|
[type = 'text'] { |
500 |
|
|
margin-left: 0px; |
501 |
|
|
background-color: lightblue; |
502 |
|
|
@@ -121,10 +123,11 @@ |
503 |
|
|
} |
504 |
|
|
|
505 |
|
|
#module { |
506 |
|
|
- height: 600px; |
507 |
|
|
+/* height: 600px; */ |
508 |
|
|
overflow: auto; |
509 |
|
|
} |
510 |
|
|
|
511 |
|
|
+ |
512 |
|
|
#h2l1 { |
513 |
|
|
height: 40px; |
514 |
|
|
width: 100%; |
515 |
|
|
@@ -159,6 +162,8 @@ |
516 |
|
|
text-align: center; |
517 |
|
|
} |
518 |
|
|
|
519 |
|
|
+ |
520 |
|
|
+ |
521 |
|
|
/*#h2e23 { |
522 |
|
|
float: right; |
523 |
|
|
width: 15%; |
524 |
|
|
diff -urN 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 |
525 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/initial.html.ep 2020-01-22 15:34:30.000000000 +0400 |
526 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/initial.html.ep 2020-01-22 15:58:39.946000000 +0400 |
527 |
|
|
@@ -2,10 +2,12 @@ |
528 |
|
|
|
529 |
|
|
% content_for 'module' => begin |
530 |
|
|
<div id="central"> |
531 |
|
|
- <h3><!-- % $c->l('initial_FORM_TITLE') %--> |
532 |
|
|
- <%= $title %></h3> |
533 |
|
|
+ <h3> |
534 |
|
|
+ %= $title |
535 |
|
|
+ </h3> |
536 |
|
|
+ <br><br> |
537 |
|
|
+ %= $modul |
538 |
|
|
<br> |
539 |
|
|
- <br> <%= $modul %><br> |
540 |
|
|
</div> |
541 |
|
|
|
542 |
|
|
% end |
543 |
|
|
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_footer.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_footer.html.ep |
544 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_footer.html.ep 2020-01-22 15:34:30.000000000 +0400 |
545 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_footer.html.ep 2020-01-13 10:17:08.000000000 +0400 |
546 |
|
|
@@ -6,4 +6,7 @@ |
547 |
|
|
<%= session 'copyRight' %> |
548 |
|
|
<BR>Copyright (c) 2013-2016 Koozali Foundation Inc.<BR> |
549 |
|
|
</FONT> |
550 |
|
|
+<div id="footinf"> |
551 |
|
|
+<a target="_blank" href="/server-manager2/tmp/todo"> <b> todo </b></a> <br> |
552 |
|
|
+<a target="_blank" href="/server-manager2/tmp/changelog"> <b> changelog </b></a> <br></div> |
553 |
|
|
</div> |
554 |
|
|
diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_header.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_header.html.ep |
555 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_header.html.ep 2020-01-22 15:34:30.000000000 +0400 |
556 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_header.html.ep 2020-01-21 23:25:56.000000000 +0400 |
557 |
|
|
@@ -9,13 +9,9 @@ |
558 |
|
|
|
559 |
|
|
<div id="h2l2" class="infobar"> |
560 |
|
|
<div id="h2e21"> |
561 |
|
|
- <b>admin@diore.koukoun.com</b> |
562 |
|
|
+ <b> |
563 |
|
|
+ <%= session 'SystemName' %>@<%= session 'DomainName' %></b> |
564 |
|
|
</div> |
565 |
|
|
- <!-- |
566 |
|
|
- <a target="main" href= |
567 |
|
|
- "< %= link_to ? => '/manual' % >" |
568 |
|
|
- > <b> ? </b> </a> </div> |
569 |
|
|
- --> |
570 |
|
|
<div id="h2e22"> |
571 |
|
|
<a target="_parent" href="/server-manager2/manual"> <b> ? </b> </a> |
572 |
|
|
</div> |
573 |
|
|
diff -urN 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 |
574 |
|
|
--- 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-01-22 15:34:30.000000000 +0400 |
575 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_add.html.ep 2020-01-13 10:03:55.000000000 +0400 |
576 |
|
|
@@ -31,11 +31,7 @@ |
577 |
|
|
<span class=label> |
578 |
|
|
%=l 'LOCATION', class => 'label' |
579 |
|
|
</span><span class=data> |
580 |
|
|
- %= select_field 'Location' => [[ (l 'prt_LOCAL_PRINTER_0') => 'lp0'], [ l('prt_LOCAL_PRINTER_1') => 'lp1'], [l('prt_LOCAL_PRINTER_2') => 'lp2'], [ l('prt_NET_PRINTER') => 'remote' ], [l('prt_FIRST_USB_PRINTER') => 'usb/lp0'], [l('prt_SECOND_USB_PRINTER') => 'usb/lp1']], class => 'input' |
581 |
|
|
- <!-- param 'location' => $prt_datas->{location} unless param 'location'; |
582 |
|
|
- --> |
583 |
|
|
- </span><span class=data> |
584 |
|
|
- <!-- % = select_field 'location2' => %$loclist, class => 'input'--> |
585 |
|
|
+ %= select_field 'Location' => $c->printerLocation_list(), class => 'input' |
586 |
|
|
</span> |
587 |
|
|
</p> |
588 |
|
|
|
589 |
|
|
diff -urN 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 |
590 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/qmailanalog.html.ep 2020-01-22 15:34:30.000000000 +0400 |
591 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/qmailanalog.html.ep 2020-01-19 16:50:20.000000000 +0400 |
592 |
|
|
@@ -17,8 +17,8 @@ |
593 |
|
|
<span class=label> |
594 |
|
|
%=l 'qma_REPORT_TYPE' |
595 |
|
|
</span><span class=data> |
596 |
|
|
- <!-- (to be sorted) param 'report_type' => =l 'qma_BASIC_STATS' --> |
597 |
|
|
- %= select_field 'report_type' => [[ (l 'qma_LIST_OUTGOING') => 'qmail-qread' ],[ (l 'qma_SUMMARIZE_QUEUE') => 'qmail-qstat' ],[ (l 'qma_SUCCESSFUL_DELIVERY_DELAY') => 'zddist' ],[ (l 'qma_REASONS_DEFERRAL') => 'zdeferrals' ],[ (l 'qma_REASONS_FAILURE') => 'zfailures' ],[ (l 'qma_BASIC_STATS') => 'zoverall' ],[ (l 'qma_RECIP_STATS') => 'zrecipients' ],[ (l 'qma_RECIP_HOSTS') => 'zrhosts' ],[ (l 'qma_RECIP_ORDERED') => 'zrxdelay' ],[ (l 'qma_SENDER_STATS') => 'zsenders' ],[ (l 'qma_SENDMAIL_STYLE') => 'zsendmail' ],[ (l 'qma_REASONS_SUCCESS') => 'zsuccesses' ],[ (l 'qma_SENDER_UIDS') => 'zsuids' ]] |
598 |
|
|
+ <!-- (to be sorted) --> |
599 |
|
|
+ %= select_field 'report_type' => $c->reportType_list() |
600 |
|
|
</span> |
601 |
|
|
</p> |
602 |
|
|
%= submit_button "$btn", class => 'action' |
603 |
|
|
diff -urN 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 |
604 |
|
|
--- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/reboot.html.ep 2020-01-22 15:34:30.000000000 +0400 |
605 |
|
|
+++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/reboot.html.ep 2020-01-19 17:04:10.000000000 +0400 |
606 |
|
|
@@ -26,7 +26,7 @@ |
607 |
|
|
<span class=label> |
608 |
|
|
%=l 'rbo_LABEL_REBOOT' |
609 |
|
|
</span><span class=data> |
610 |
|
|
- %= select_field 'function' => [[ (l 'SHUTDOWN') => 'shutdown' ],[ (l 'rbo_REBOOT') => 'reboot' ],[ (l 'RECONFIGURE') => 'reconfigure' ]] |
611 |
|
|
+ %= select_field 'function' => $c->rebootFunction_list() |
612 |
|
|
</span> |
613 |
|
|
</p> |
614 |
|
|
|