1 |
diff -urN smeserver-manager-0.1.4.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27SManagerProxyPass smeserver-manager-0.1.4/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27SManagerProxyPass |
2 |
--- smeserver-manager-0.1.4.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27SManagerProxyPass 2021-06-21 13:25:10.000000000 +0400 |
3 |
+++ smeserver-manager-0.1.4/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/27SManagerProxyPass 2021-10-10 20:58:43.000000000 +0400 |
4 |
@@ -35,11 +35,11 @@ |
5 |
} |
6 |
elsif (($haveSSL eq 'yes') && ($port eq $sslPort) && ($adminAccess eq 'public')) |
7 |
{ |
8 |
- # $OUT .= " allow from $localAccess $externalSSLAccess\n"; |
9 |
- $OUT .= "# access public in conf db\n"; |
10 |
+ $OUT .= "# public access requested in conf db\n"; |
11 |
$OUT .= " allow from all\n"; |
12 |
} else { |
13 |
- $OUT .= " allow from $localAccess\n"; |
14 |
+ $OUT .= "# private access by default\n"; |
15 |
+ $OUT .= " allow from $localAccess $externalSSLAccess\n"; |
16 |
} |
17 |
$OUT .= " </Location>\n"; |
18 |
} |
19 |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr.pm smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr.pm |
20 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr.pm 2021-06-21 14:22:26.000000000 +0400 |
21 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr.pm 2021-10-10 21:31:38.501000000 +0400 |
22 |
@@ -184,7 +184,8 @@ |
23 |
$self->plugin('Mojolicious::Plugin::CSRFDefender' => { |
24 |
onetime => 1, |
25 |
error_status => 400, |
26 |
- error_template => 'csrf_400' |
27 |
+ error_content => 'Error: CSRF token is invalid or outdated' |
28 |
+ #error_template => 'csrf_400' |
29 |
}) if ( $self->mode eq 'production' ); |
30 |
|
31 |
$self->plugin('SrvMngr::Plugin::I18N' => {namespace => 'SrvMngr::I18N', default => 'en'}); |
32 |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep |
33 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep 2021-06-21 13:25:10.000000000 +0400 |
34 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep 2021-10-10 21:38:31.058000000 +0400 |
35 |
@@ -34,7 +34,7 @@ |
36 |
%=l 'ACTION' |
37 |
</th> |
38 |
</tr> |
39 |
- % foreach my $ibay (sort @$ibays) |
40 |
+ % foreach my $ibay (@$ibays) |
41 |
% { |
42 |
% my $modifiable = $ibay->prop('Modifiable') || 'yes'; |
43 |
% my $passwordable = $ibay->prop('Passwordable') || 'yes'; |
44 |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep |
45 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep 2021-06-21 13:25:10.000000000 +0400 |
46 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep 2021-10-10 21:40:31.076000000 +0400 |
47 |
@@ -42,7 +42,7 @@ |
48 |
%=l 'ACTION' |
49 |
</th> |
50 |
</tr> |
51 |
- % foreach my $printer (sort @$printerDrivers) |
52 |
+ % foreach my $printer (@$printerDrivers) |
53 |
% { |
54 |
% my $address = ($printer->prop('Location') eq 'remote') |
55 |
% ? $printer->prop('Address') : 'N/A'; |
56 |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep |
57 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep 2021-06-21 13:25:10.000000000 +0400 |
58 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep 2021-10-10 21:41:35.065000000 +0400 |
59 |
@@ -40,7 +40,7 @@ |
60 |
</th> |
61 |
</tr> |
62 |
|
63 |
- % foreach my $user (sort @$userAccounts) |
64 |
+ % foreach my $user (@$userAccounts) |
65 |
% { |
66 |
% my $uid = getpwnam($user->key); |
67 |
% unless ($uid) { |
68 |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep |
69 |
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep 2020-11-19 11:53:26.000000000 +0400 |
70 |
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep 2021-10-10 21:41:54.003000000 +0400 |
71 |
@@ -40,7 +40,7 @@ |
72 |
</th> |
73 |
</tr> |
74 |
|
75 |
- % foreach my $user (sort @$users) { |
76 |
+ % foreach my $user (@$users) { |
77 |
|
78 |
% my $username = $user->key(); |
79 |
% my $first = $user->prop('FirstName'); |