.
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
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/lib/SrvMngr.pm 2021-10-20 22:30:47.000000000 +0400
+++ smeserver-manager-0.1.4/root/usr/share/smanager/lib/SrvMngr.pm 2021-11-14 22:36:45.633000000 +0400
@@ -23,7 +23,7 @@
use SrvMngr::Model::Main;
-our $VERSION = '1.401';
+our $VERSION = '1.403';
$VERSION = eval $VERSION;
use Exporter 'import';
@@ -181,7 +181,9 @@
$self->plugin('RenderFile');
# CSRF protection if production mode
- $self->plugin('Mojolicious::Plugin::CSRFDefender' => {
+# $self->plugin('Mojolicious::Plugin::CSRFDefender' => {
+# Adapted plugin for use with GET method
+ $self->plugin('SrvMngr::Plugin::CSRFDefender' => {
onetime => 1,
error_status => 400,
error_content => 'Error: CSRF token is invalid or outdated'
@@ -814,4 +816,3 @@
1;
-
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep 2021-06-21 13:25:10.000000000 +0400
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_dom_list.html.ep 2021-11-05 23:55:48.000000000 +0400
@@ -42,13 +42,13 @@
%= t td => (class => 'sme-border') => $domain->{'Content'}
%= t td => (class => 'sme-border') => l('dom_' . $domain->{'Nameservers'})
- % my $actionModify = "" . l('MODIFY') . "";
+ % my $actionModify = "" . l('MODIFY') . "";
% my $removable = ($domain->{Removable} || 'yes');
% my $actionRemove = ' ';
% if ($removable eq 'yes') {
- % $actionRemove = "" . l('REMOVE') . "";
+ % $actionRemove = "" . l('REMOVE') . "";
% }
<%= $c->render_to_string(inline => $actionModify) %> |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep 2021-06-21 13:25:10.000000000 +0400
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep 2021-11-05 23:56:07.000000000 +0400
@@ -36,8 +36,8 @@
%= t td => (class => 'sme-border') => $group->key
%= t td => (class => 'sme-border') => $group->prop('Description')
- <%=l 'MODIFY'%> |
- <%=l 'REMOVE'%> |
+ <%=l 'MODIFY'%> |
+ <%=l 'REMOVE'%> |
% }
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep 2021-06-21 13:25:10.000000000 +0400
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_header.html.ep 2021-11-14 22:21:06.985000000 +0400
@@ -3,7 +3,7 @@
-
@@ -14,13 +14,13 @@
<%= session 'SystemName' %>@<%= session 'DomainName' %>
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep 2021-06-21 13:25:10.000000000 +0400
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep 2021-11-05 23:56:23.000000000 +0400
@@ -46,8 +46,8 @@
%= t td => (class => 'sme-border') => $_->{'Comment'};
% my ($actionModify, $actionRemove) = ' ';
% if ($_->{'static'} ne 'yes') {
- % $actionModify = "" . l('MODIFY') . "";
- % $actionRemove = "" . l('REMOVE') . "";
+ % $actionModify = "" . l('MODIFY') . "";
+ % $actionRemove = "" . l('REMOVE') . "";
% }
<%= $c->render_to_string(inline => $actionModify) %> |
<%= $c->render_to_string(inline => $actionRemove) %> |
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
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep 2021-10-20 22:30:47.000000000 +0400
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_iba_list.html.ep 2021-10-09 23:01:31.000000000 +0400
@@ -47,18 +47,18 @@
%= t td => (class => 'sme-border') => $ibay->prop('Name')
% my ($actionModify, $actionResetPw, $actionRemove) = ' ';
% if ($modifiable eq 'yes') {
- % $actionModify = "" . l('MODIFY') . "";
+ % $actionModify = "" . l('MODIFY') . "";
% }
% if ($passwordable eq 'yes') {
% if ($ibay->prop('PasswordSet') ne 'yes' && $needPassword) {
- % $actionResetPw .= "" . l('PASSWORD_RESET') . "";
+ % $actionResetPw .= "" . l('PASSWORD_RESET') . "";
% } else {
- % $actionResetPw .= "" . l('PASSWORD_RESET') . "";
+ % $actionResetPw .= "" . l('PASSWORD_RESET') . "";
% }
% $actionResetPw .= ' ';
% }
% if ($removable eq 'yes') {
- % $actionRemove = "" . l('REMOVE') . "";
+ % $actionRemove = "" . l('REMOVE') . "";
% }
<%= $c->render_to_string(inline => $actionModify) %> |
<%= $c->render_to_string(inline => $actionResetPw) %> |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep 2020-11-19 11:53:26.000000000 +0400
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_ln_list.html.ep 2021-11-05 23:56:34.000000000 +0400
@@ -82,7 +82,7 @@
%= t td => (class => 'sme-border') => $localnetwork->prop('Router')
% if ($removable eq "yes") {
- <%=l 'REMOVE'%> |
+ <%=l 'REMOVE'%>
% } else {
|
%}
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep 2020-11-19 11:53:26.000000000 +0400
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_pf_list.html.ep 2021-11-05 23:56:46.000000000 +0400
@@ -98,7 +98,7 @@
%= t td => (class => 'sme-border') => $allow
%= t td => (class => 'sme-border') => $cmmnt
- <%=l 'REMOVE'%> |
+ <%=l 'REMOVE'%>
% }
% }
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
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep 2021-10-20 22:30:47.000000000 +0400
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep 2021-11-05 23:56:56.000000000 +0400
@@ -55,7 +55,7 @@
%= t td => (class => 'sme-border') => $printer->prop('Location')
%= t td => (class => 'sme-border') => $address
%= t td => (class => 'sme-border') => $remoteName
- <%=l 'REMOVE'%> |
+ <%=l 'REMOVE'%> |
% }
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep 2021-06-21 13:25:10.000000000 +0400
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep 2021-11-05 23:57:06.000000000 +0400
@@ -52,10 +52,10 @@
% my ($actionModify, $actionRemove) = ' ';
% if ($modifiable eq 'yes') {
- % $actionModify = "" . l('MODIFY') . "";
+ % $actionModify = "" . l('MODIFY') . "";
% }
% if ($removable eq 'yes') {
- % $actionRemove = "" . l('REMOVE') . "";
+ % $actionRemove = "" . l('REMOVE') . "";
% }
<%= $c->render_to_string(inline => $actionModify) %> |
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
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep 2021-10-20 22:30:47.000000000 +0400
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_quo_list.html.ep 2021-11-05 23:57:15.000000000 +0400
@@ -56,7 +56,7 @@
%= t td => (class => 'sme-border') => sprintf("%.2f", $bs / 1024 )
%= t td => (class => 'sme-border') => sprintf("%.2f", $bh / 1024 )
%= t td => (class => 'sme-border') => sprintf("%.2f", $bc / 1024 )
- <%=l 'MODIFY'%> |
+ <%=l 'MODIFY'%> |
% }
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
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep 2021-10-20 22:30:47.000000000 +0400
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/partials/_usr_list.html.ep 2021-10-10 23:46:45.000000000 +0400
@@ -60,19 +60,19 @@
%= t td => (class => 'sme-border') => $fwd
% my ($actionModify, $actionLock, $actionResetPw, $actionRemove) = ' ';
% if ($username eq 'admin') {
- % $actionModify = "" . l('MODIFY') . "";
- % $actionResetPw = "" . l('PASSWORD_RESET') . "";
+ % $actionModify = "" . l('MODIFY') . "";
+ % $actionResetPw = "" . l('PASSWORD_RESET') . "";
% } else {
- % $actionModify = "" . l('MODIFY') . "";
+ % $actionModify = "" . l('MODIFY') . "";
% if ($password_set ne 'yes') {
% $actionLock = l('ACCOUNT_LOCKED');
- % $actionResetPw = "" . l('PASSWORD_RESET') . "";
+ % $actionResetPw = "" . l('PASSWORD_RESET') . "";
% } else {
- % $actionLock = "" . l('usr_LOCK_ACCOUNT') . "";
- % $actionResetPw = "" . l('PASSWORD_RESET') . "";
+ % $actionLock = "" . l('usr_LOCK_ACCOUNT') . "";
+ % $actionResetPw = "" . l('PASSWORD_RESET') . "";
% }
% if ( $removable eq 'yes' ) {
- % $actionRemove = "" . l('REMOVE') . "";
+ % $actionRemove = "" . l('REMOVE') . "";
% }
% }
<%= $c->render_to_string(inline => $actionModify) %> |
diff -urN smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/review.html.ep smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/review.html.ep
--- smeserver-manager-0.1.4.old/root/usr/share/smanager/themes/default/templates/review.html.ep 2020-11-19 11:53:26.000000000 +0400
+++ smeserver-manager-0.1.4/root/usr/share/smanager/themes/default/templates/review.html.ep 2021-07-27 21:08:13.000000000 +0400
@@ -8,123 +8,123 @@
%= form_for 'review' => begin
%=l 'rvw_NETWORKING_PARAMS'
-
+
-
+
%=l 'rvw_SERVER_MODE'
-
+
%= $rvw_datas->{servermode}
-
+
-
+
%=l 'rvw_LOCAL_IP_ADDRESS_SUBNET_MASK'
-
+
%= $rvw_datas->{localip}
-
+
% if ( $rvw_datas->{publicip} ) {
-
+
%=l 'rvw_INTERNET_VISIBLE_ADDRESS'
-
+
%= $rvw_datas->{publicip}
-
+
% }
-
+
%=l 'rvw_GATEWAY'
-
+
%= $rvw_datas->{gateway}
%= $rvw_datas->{serveronly}
-
+
-
+
%=l 'rvw_ADDITIONAL_LOCAL_NETWORKS'
-
+ |
%= $c->render_to_string( inline => $rvw_datas->{addlocalnetworks} );
-
+ |
+
-
+
%=l 'rvw_DHCP_SERVER'
-
+
%= $rvw_datas->{dhcpserver}
-
-
-
+
+
+
%=l 'rvw_SERVER_NAMES'
-
+
-
+
%=l 'rvw_DNS_SERVER'
-
+
%= $rvw_datas->{dnsserver}
-
+
-
+
%=l 'rvw_WEB_SERVER'
-
+
%= $rvw_datas->{webserver}
-
+
-
+
%=l 'rvw_PROXY_SERVER'
-
+
%= $rvw_datas->{proxyserver}
-
+
-
+
%=l 'rvw_FTP_SERVER'
-
+
%= $rvw_datas->{ftpserver}
-
+
-
+
%=l 'rvw_SMTP_POP_AND_IMAP_MAIL_SERVERS'
-
+
%= $rvw_datas->{smtpserver}
-
+
-
-
+
%=l 'rvw_DOMAIN_INFORMATION'
-
+
-
+
%=l 'rvw_PRIMARY_DOMAIN'
-
+
%= $rvw_datas->{domainname}
-
+
-
+
%=l 'rvw_VIRTUAL_DOMAINS'
-
+
%= $rvw_datas->{virtualdomains}
-
+
-
+
%=l 'rvw_PRIMARY_WEB_SITE'
-
+
%= $rvw_datas->{primarywebsite}
-
+
-
+
%=l 'rvw_SERVER_MANAGER'
-
+
%= $rvw_datas->{servermanager}
-
+
-
+
%=l 'rvw_USER_PASSWORD_PANEL'
-
+
%= $rvw_datas->{usermanager}
-
+
-
+
%=l 'rvw_EMAIL_ADDRESSES'
-
+ |
%= $rvw_datas->{emailaddresses}
-
-
- % end
+ |
+
+ % end