diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep index 8c3d2d0..b0c5114 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep @@ -4,133 +4,205 @@
- % if (config->{debug} == 1) { -

- %= dumper $c->current_route - %= dumper $dat_datas -

+ % if (config->{debug} == 0) { + 
+            <%= dumper $c->current_route %>
+            <%= dumper $dat_datas %>
+
% } % if ( stash 'error' ) { -
-
- %= $c->render_to_string(inline => stash 'error') -
+
+
+ %= $c->render_to_string(inline => stash 'error') +
%} -

<%= $title %>


+

<%= $title %>

+
%= $modul <% my $btn = l('SAVE'); %> - %= form_for '/datetime' => (method => 'POST') => begin -

- %= hidden_field 'Old_ntpstatus' => $dat_datas->{ntpstatus}; +

- % param 'Ntpstatus' => $dat_datas->{ntpstatus} unless param 'Ntpstatus'; - %= radio_button Ntpstatus => 'enabled' - - %=l 'dat_NTP_CONFIGURE_TITLE' - -
- % if ($dat_datas->{ntpstatus} eq 'disabled') { -
- %=l 'dat_NTP_ENABLE_DESC'
-
- % } else { -
- %=l 'dat_NTP_CONFIGURE_DESC' -

-

- %=l 'dat_CURRENT_SETTING' - - %= $dat_datas->{now_string} - -

-

-
- - %=l 'dat_NTP_SERVER' - - - %= text_field 'Ntpserver' => $dat_datas->{ntpserver}, class => "" - -

-
- % } - %= radio_button Ntpstatus => 'disabled' - - %=l 'dat_NTP_DISABLE_TITLE' - - % if ($dat_datas->{ntpstatus} eq 'enabled') { + % param 'Ntpstatus' => $dat_datas->{ntpstatus} unless param 'Ntpstatus'; + % param 'Ntpserver' => 'smeserver.pool.ntp.org' unless param 'Ntpserver'; -

-
- %=l 'dat_NTP_DISABLE_DESC' -
- % } else { -

-

-

- %=l 'dat_CURRENT_SETTING' - - %= $dat_datas->{now_string} - -
- - %=l 'dat_NEW_M/D/Y' - - - % param 'Month' => $dat_datas->{month} unless param 'Month'; - %= select_field 'Month' => $c->getMonth_list(), class => "" - - - % param 'Day' => $dat_datas->{day} unless param 'Day'; - %= text_field 'Day', size => '2', class => "" - - - % param 'Year' => $dat_datas->{year} unless param 'Year'; - %= text_field 'Year', size => '4', class => "" - -
- - %=l 'dat_NEW_H/M/S' - - - % param 'Hour' => $dat_datas->{hour} unless param 'Hour'; - %= text_field 'Hour', size => '2', class => "" - - - % param 'Minute' => $dat_datas->{minute} unless param 'Minute'; - %= text_field 'Minute', size => '2', class => "" - - - % param 'Second' => $dat_datas->{second} unless param 'Second'; - %= text_field 'Second', size => '2', class => "" - -
- - %=l 'dat_AM/PM_AND_TZ' - - - % param 'Ampm' => $dat_datas->{ampm} unless param 'Ampm'; - %= select_field 'Ampm' => ['AM', 'PM'], class => "" - - - % param 'Timezone' => $c->getTimezone() unless param 'Timezone'; - %= select_field 'Timezone' => $c->getZone_list(), class => "" - -

-
- % } -

-
- %= submit_button "$btn", class => "" -

- % end + % if ($dat_datas->{ntpstatus} eq 'disabled') { + + +
+ You can manually set your server time here (static string for testing)

+
+ +
+ +
+
+ +
+
+ <%= l 'dat_CURRENT_SETTING' %> +
+
+ <%= $dat_datas->{now_string} %> +
+
+ +
+
+
+ <%= l 'dat_NEW_M/D/Y' %> +
+
+ % param 'Month' => $dat_datas->{month} unless param 'Month'; + %= select_field 'Month' => $c->getMonth_list(), class => "form-select" +
+ +
+ % param 'Day' => $dat_datas->{day} unless param 'Day'; + %= text_field 'Day', size => '2', class => "" +
+
+ % param 'Year' => $dat_datas->{year} unless param 'Year'; + %= text_field 'Year', size => '4', class => "" +
+ +
+ +
+ + +
+
+ <%= l 'dat_NEW_H/M/S' %> +
+
+ % param 'Hour' => $dat_datas->{hour} unless param 'Hour'; + %= text_field 'Hour', size => '2', class => "" +
+
+ % param 'Minute' => $dat_datas->{minute} unless param 'Minute'; + %= text_field 'Minute', size => '2', class => "" +
+
+ % param 'Second' => $dat_datas->{second} unless param 'Second'; + %= text_field 'Second', size => '2', class => "" +
+
+ +
+ +
+
+ <%= l 'dat_AM/PM_AND_TZ' %> +
+
+ % param 'Ampm' => $dat_datas->{ampm} unless param 'Ampm'; + %= select_field 'Ampm' => ['AM', 'PM'], class => "form-select" +
+ +
+ % param 'Timezone' => $c->getTimezone() unless param 'Timezone'; + %= select_field 'Timezone' => $c->getZone_list(), class => "form-select" +
+ +
+ +
+ +
+ + +
+
+ + <%#= hidden_field 'Old_ntpstatus' => $dat_datas->{ntpstatus}; %> + + <%= hidden_field 'Old_ntpstatus' => 'disabled' %> + + % } else { + + + +
+ <%= l 'dat_NTP_ENABLE_DESC' %> +
+ +
+ +
+
+ <%= l 'dat_CURRENT_SETTING' %> +
+
+ <%= $dat_datas->{now_string} %> +
+
+ +
+ +
+ + +
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+ +
+ <%= l 'dat_NTP_DISABLE_DESC' %> +
+ +
+ +
+ + +
+ + + <%= hidden_field 'Old_ntpstatus' => $dat_datas->{ntpstatus}; %> + <%#= hidden_field 'Old_ntpstatus' => 'disabled' %> + + % } + + + +
+ + + + +
+
+ +
+
+ + +
%end \ No newline at end of file diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep.old b/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep.old new file mode 100644 index 0000000..aef3bb4 --- /dev/null +++ b/root/usr/share/smanager/themes/AdminLTE/templates/datetime.html.ep.old @@ -0,0 +1,172 @@ +% layout 'AdminLTE', title => "Sme server 2 - datetime"; + +% content_for 'module' => begin + +
+ + % if (config->{debug} == 1) { + 
+            <%= dumper $c->current_route %>
+            <%= dumper $dat_datas %>
+
+ % } + + % if ( stash 'error' ) { +
+
+ %= $c->render_to_string(inline => stash 'error') +
+ %} + +

<%= $title %>

+
+ %= $modul + <% my $btn = l('SAVE'); %> + +
+ +
+ + % param 'Ntpstatus' => $dat_datas->{ntpstatus} unless param 'Ntpstatus'; + +
+ + +
+ +
+ + <%= radio_button Ntpstatus => 'enabled' %> + <%=l 'dat_NTP_CONFIGURE_TITLE' %> + +
+ + % if ($dat_datas->{ntpstatus} eq 'disabled') { + +
+ Status disabled + <%= l 'dat_NTP_ENABLE_DESC' %> +
+
+ + % } else { + +
+ +
+
+ <%= l 'dat_CURRENT_SETTING' %> +
+
+ <%= $dat_datas->{now_string} %> +
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+ % } + + + <%= radio_button Ntpstatus => 'disabled' %> + <%= l 'dat_NTP_DISABLE_TITLE' %> + +
+ + +
+ + + + + % if ($dat_datas->{ntpstatus} eq 'enabled') { + +

+
+ <%= l 'dat_NTP_DISABLE_DESC' %> +
+ + % } else { + +
+
+ + <%= l 'dat_CURRENT_SETTING' %> + + <%= $dat_datas->{now_string} %> + +
+ + <%= l 'dat_NEW_M/D/Y' %> + + + % param 'Month' => $dat_datas->{month} unless param 'Month'; + %= select_field 'Month' => $c->getMonth_list(), class => "" + + + % param 'Day' => $dat_datas->{day} unless param 'Day'; + %= text_field 'Day', size => '2', class => "" + + + % param 'Year' => $dat_datas->{year} unless param 'Year'; + %= text_field 'Year', size => '4', class => "" + +
+ + <%= l 'dat_NEW_H/M/S' %> + + + % param 'Hour' => $dat_datas->{hour} unless param 'Hour'; + %= text_field 'Hour', size => '2', class => "" + + + % param 'Minute' => $dat_datas->{minute} unless param 'Minute'; + %= text_field 'Minute', size => '2', class => "" + + + % param 'Second' => $dat_datas->{second} unless param 'Second'; + %= text_field 'Second', size => '2', class => "" + +
+ + <%= l 'dat_AM/PM_AND_TZ' %> + + + % param 'Ampm' => $dat_datas->{ampm} unless param 'Ampm'; + %= select_field 'Ampm' => ['AM', 'PM'], class => "" + + + % param 'Timezone' => $c->getTimezone() unless param 'Timezone'; + %= select_field 'Timezone' => $c->getZone_list(), class => "" + +

+
+ % } + +
+ <%= hidden_field 'Old_ntpstatus' => $dat_datas->{ntpstatus}; %> + +
+
+ +
+
+ + +
+ +
+%end \ No newline at end of file diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/emailsettings.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/emailsettings.html.ep index 395a19c..47f0d4b 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/emailsettings.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/emailsettings.html.ep @@ -5,190 +5,222 @@ % use constant FALSE => 0; % use constant TRUE => 1; + +
% if (config->{debug} == 1) { -

- %= dumper $c->current_route - %= dumper $mai_datas -

+ 
+            <%= dumper $c->current_route %>
+            <= dumper $mai_datas %>
+
% } % if ( stash 'error' ) { -
- %= $c->render_to_string(inline => stash 'error') +
+
+ <%= $c->render_to_string(inline => stash 'error') %>
%}

<%= $title%>

- - %= form_for 'emailsettings' => (method => 'POST') => begin -

- - %=l 'mai_LABEL_POP_ACCESS_CONTROL' - - - %= $c->get_current_pop3_access( TRUE ) - -

- -

- - %=l 'mai_LABEL_IMAP_ACCESS_CONTROL' - - - %= $c->get_current_imap_access( TRUE ) - -

- -

- - %=l 'mai_LABEL_WEBMAIL' - - - %= $c->get_current_webmail_status( TRUE ) - -

- - % my $btn = l('mai_DESC_STATE_ACCESS_BUTTON'); -
- %= submit_button "$btn", class => "" -
- - %= hidden_field 'trt' => 'ACC' - % end -
- - - - %= form_for 'emailsettings' => (method => 'POST') => begin -

- - %=l 'mai_LABEL_VIRUS_SCAN' - - - %= $c->get_virus_status(TRUE) - -

- -

- - %=l 'mai_LABEL_SPAM_SCAN' - - - %= $c->get_spam_status(TRUE) - -

- -

- - %=l 'mai_LABEL_BLOCK_EXECUTABLE_CONTENT' - - - %= $c->get_patterns_status(TRUE) - -

- - % my $btn = l('mai_DESC_STATE_FILTERING_BUTTON'); -
- %= submit_button "$btn", class => "" -
- - %= hidden_field 'trt' => 'FIL' - % end -
- - - - %= form_for 'emailsettings' => (method => 'POST') => begin -

- - %=l 'mai_LABEL_MODE' - - - %= $mai_datas->{fetchmailmethod} - -

- - % my $smtp_mesg; - - % $smtp_mesg=l('SMTP port %u allow client to authenticate:'); -

- - %= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); - - - %= $c->get_current_smtp_auth( TRUE ) - -

- - % $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:'); -

- - %= sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); - - - %= $c->get_current_smtp_ssl_auth( TRUE, 's', FALSE ) - -

- - % $smtp_mesg=l 'Submission port %u status:'; -

- - %= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); - - - %= $c->get_current_smtp_ssl_auth( TRUE,'u', FALSE ) - -

-
- - % my $btn = l('mai_DESC_STATE_RECEPTION_BUTTON'); -
- %= submit_button "$btn", class => "" -
- - %= hidden_field 'trt' => 'REC' - % end
+ +
+ +
+
+ <%= l 'mai_LABEL_POP_ACCESS_CONTROL' %> +
+
+ <%= $c->get_current_pop3_access( TRUE ) %> +
+
+ +
+
+ <%= l 'mai_LABEL_IMAP_ACCESS_CONTROL' %> +
+
+ <%= $c->get_current_imap_access( TRUE ) %> +
+
+ +
+
+ <%= l 'mai_LABEL_WEBMAIL' %> +
+
+ <%= $c->get_current_webmail_status( TRUE ) %> +
+
+ +
+ + % my $btn = l('mai_DESC_STATE_ACCESS_BUTTON'); + <%= hidden_field 'trt' => 'ACC' %> + +
+
+ +
+
+ +
+ +

+ - %= form_for 'emailsettings' => (method => 'POST') => begin -

- - %=l 'mai_LABEL_UNKNOWN' - - - %= $c->get_emailunknownuser_status( TRUE ) - -

+
-

- - %=l 'mai_LABEL_DELEGATE' - - - %= $c->get_value('DelegateMailServer') - -

+
+
+ <%= l 'mai_LABEL_VIRUS_SCAN' %> +
+
+ <%= $c->get_virus_status(TRUE) %> +
+
-

- - %=l 'mai_LABEL_SMARTHOST' - - - %= $c->get_value('SMTPSmartHost') - -

+
+
+ <%= l 'mai_LABEL_SPAM_SCAN' %> +
+
+ <%= $c->get_spam_status(TRUE) %> +
+
- % my $btn = l('mai_DESC_STATE_DELIVERY_BUTTON'); -
- %= submit_button "$btn", class => "" -
+
+
+ <%= l 'mai_LABEL_BLOCK_EXECUTABLE_CONTENT' %> +
+
+ <%= $c->get_patterns_status(TRUE) %> +
+
- %= hidden_field 'trt' => 'DEL' - % end +
+ % my $btn = l('mai_DESC_STATE_FILTERING_BUTTON'); + <%= hidden_field 'trt' => 'FIL' %> + +
+
+ +
+
+ +
+ +

+ + + +
+
+
+ <%= l 'mai_LABEL_MODE' %> +
+
+ <%= $mai_datas->{fetchmailmethod} %> +
+
+ + % my $smtp_mesg; + + % $smtp_mesg=l('SMTP port %u allow client to authenticate:'); + +
+
+ <%= sprintf($smtp_mesg,$c->get_db_prop('qpsmtpd','TCPPort',25)); %> +
+
+ <%= $c->get_current_smtp_auth( TRUE ) %> +
+
+ + % $smtp_mesg=l('SMTPS SSL/TLS auth: port %u status:'); + +
+
+ <%= sprintf($smtp_mesg,$c->get_db_prop('sqpsmtpd','TCPPort',465)); %> +
+
+ <%= $c->get_current_smtp_ssl_auth( TRUE, 's', FALSE ) %> +
+
+ + % $smtp_mesg=l 'Submission port %u status:'; + +
+
+ <%= sprintf($smtp_mesg,$c->get_db_prop('uqpsmtpd','TCPPort',587)); %> +
+
+ <%= $c->get_current_smtp_ssl_auth( TRUE,'u', FALSE ) %> +
+
+ +
+ + % my $btn = l('mai_DESC_STATE_RECEPTION_BUTTON'); + <%= hidden_field 'trt' => 'REC' %> + +
+
+ +
+
+
+ +

+ + + +
+
+
+ <%= l 'mai_LABEL_UNKNOWN' %> +
+
+ <%= $c->get_emailunknownuser_status( TRUE ) %> +
+
+ +
+
+ <%= l 'mai_LABEL_DELEGATE' %> +
+
+ <%= $c->get_value('DelegateMailServer') %> +
+
+ +
+
+ <%= l 'mai_LABEL_SMARTHOST' %> +
+
+ <%= $c->get_value('SMTPSmartHost') %> +
+
+ +
+ + + % my $btn = l('mai_DESC_STATE_DELIVERY_BUTTON'); + <%= hidden_field 'trt' => 'DEL' %> + +
+
+ +
+
+ +
+ %end \ No newline at end of file diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/ibays.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/ibays.html.ep index f754251..5c9849b 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/ibays.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/ibays.html.ep @@ -5,15 +5,15 @@
% if (config->{debug} == 1) { -
- <%= dumper $c->current_route %> - <%= dumper $iba_datas %> -
+ 
+           <%= dumper $c->current_route %>
+           <%= dumper $iba_datas %>
+
% } % if ( stash 'error' ) {
-
+
<%= $c->render_to_string(inline => stash 'error') %>
% } diff --git a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_list.html.ep b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_list.html.ep index 77c3b7a..069fa84 100644 --- a/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_list.html.ep +++ b/root/usr/share/smanager/themes/AdminLTE/templates/partials/_grp_list.html.ep @@ -33,9 +33,10 @@ <%= $group->key %> <%= $group->prop('Description') %> - % my $modify_text = l('MODIFY'); # Localized text % my $csrf_token = "TOKEN"; # CSRF token for security % my $group_name = $group->key; # group name extracted from the data structure + + % my $modify_text = l('MODIFY'); # Localized text % my $actionModify = qq{ % % % %}; + % my $remove_text = l('REMOVE'); # Localized text - % my $csrf_token = "TOKEN"; # CSRF token for security - % my $group_name = $group->key; # group name extracted from the data structure % my $actionRemove = qq{ % % +

+ +
+ <%=l 'prx_HTTP_PROXY_STATUS_LABEL' %> +
+ +
+ % param 'http_proxy_status' => $prx_datas->{http_proxy_status} unless param 'http_proxy_status'; + <%= select_field 'http_proxy_status' => [[ (l 'ENABLED') => 'enabled'], [ (l 'DISABLED') => 'disabled']] %> +
+
+ + % if ( $prx_datas->{smtp_proxy_status} ) { +
+ <%=l 'prx_SMTP_PROXY_STATUS_DESCRIPTION' %> +

+
+ <%=l 'prx_SMTP_PROXY_STATUS_LABEL' %> +
+
+ % param 'smtp_proxy_status' => $prx_datas->{smtp_proxy_status} unless param 'smtp_proxy_status'; + <%= select_field 'smtp_proxy_status' => [[ (l 'ENABLED') => 'transparent'], [ (l 'DISABLED') => 'disabled'], [ (l 'prx_BLOCKED') => 'blocked']], default => $prx_datas->{smtp_proxy_status} %> +

+
+ % } + +
+
+ +
-
- %# end +
diff --git a/smeserver-manager-AdminLTE.spec b/smeserver-manager-AdminLTE.spec index 0f4b163..217f9db 100644 --- a/smeserver-manager-AdminLTE.spec +++ b/smeserver-manager-AdminLTE.spec @@ -1,6 +1,6 @@ %define name smeserver-manager-AdminLTE %define version 11.0.0 -%define release 25 +%define release 26 Summary: AdminLTE is an html framework for admin consoles - this rpm adds it to smeserver manager2 Name: %{name} Version: %{version} @@ -26,6 +26,11 @@ AdminLTE is an html framework for admin consoles wget https://github.com/ColorlibHQ/AdminLTE/archive/master.zip %changelog +* Wed May 28 2025 John Crisp 11.0.0-26.sme +- DateTime started but needs other fixes. +- Start Email but it really needs partials +- Some general tidying + * Tue May 20 2025 John Crisp 11.0.0-25.sme - Log files - Bug reports - Config reports