diff -aurN smeserver-manager-0.1.0.old/createlinks smeserver-manager-0.1.0/createlinks --- smeserver-manager-0.1.0.old/createlinks 2020-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/createlinks 2020-06-06 16:50:41.538609047 +0400 @@ -3,10 +3,9 @@ use esmith::Build::CreateLinks qw(:all); #-------------------------------------------------- -# functions for manager panel +# functions for manager #-------------------------------------------------- -my $panel = 'manager2'; -my $mngrdir = '/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr'; +my $mngrdir = '/usr/share/smanager'; # links to add @@ -20,6 +19,8 @@ templates2events("$mngrdir/conf/srvmngr.conf", qw( manager2-modify bootstrap-console-save console-save)); +templates2events("/etc/systemd/system/smanager.service", + qw( manager2-modify bootstrap-console-save console-save)); # services to launch on event diff -aurN smeserver-manager-0.1.0.old/manager2.c smeserver-manager-0.1.0/manager2.c --- smeserver-manager-0.1.0.old/manager2.c 2020-06-05 23:08:10.000000000 +0400 +++ smeserver-manager-0.1.0/manager2.c 1970-01-01 04:00:00.000000000 +0400 @@ -1,13 +0,0 @@ -#include -#include -#include -#include -#define CGI_PATH "/etc/e-smith/web/functions2/" - -main(int argc, char *argv[]) -{ - char cmd[50]; - sprintf(cmd, "%s%s", CGI_PATH, basename(argv[0])); - execv(cmd, argv); - return 0; -} diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/db/configuration/defaults/httpd-admin/manager2 smeserver-manager-0.1.0/root/etc/e-smith/db/configuration/defaults/httpd-admin/manager2 --- smeserver-manager-0.1.0.old/root/etc/e-smith/db/configuration/defaults/httpd-admin/manager2 2018-02-04 08:09:25.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/db/configuration/defaults/httpd-admin/manager2 1970-01-01 04:00:00.000000000 +0400 @@ -1 +0,0 @@ -login diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/db/configuration/defaults/manager2/status smeserver-manager-0.1.0/root/etc/e-smith/db/configuration/defaults/manager2/status --- smeserver-manager-0.1.0.old/root/etc/e-smith/db/configuration/defaults/manager2/status 2020-06-05 23:08:16.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/db/configuration/defaults/manager2/status 1970-01-01 04:00:00.000000000 +0400 @@ -1,2 +0,0 @@ -enabled - diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/db/configuration/defaults/manager2/type smeserver-manager-0.1.0/root/etc/e-smith/db/configuration/defaults/manager2/type --- smeserver-manager-0.1.0.old/root/etc/e-smith/db/configuration/defaults/manager2/type 2020-06-05 23:08:16.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/db/configuration/defaults/manager2/type 1970-01-01 04:00:00.000000000 +0400 @@ -1,2 +0,0 @@ -service - diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/db/configuration/defaults/smanager/status smeserver-manager-0.1.0/root/etc/e-smith/db/configuration/defaults/smanager/status --- smeserver-manager-0.1.0.old/root/etc/e-smith/db/configuration/defaults/smanager/status 1970-01-01 04:00:00.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/db/configuration/defaults/smanager/status 2020-05-31 16:09:40.000000000 +0400 @@ -0,0 +1,2 @@ +enabled + diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/db/configuration/defaults/smanager/type smeserver-manager-0.1.0/root/etc/e-smith/db/configuration/defaults/smanager/type --- smeserver-manager-0.1.0.old/root/etc/e-smith/db/configuration/defaults/smanager/type 1970-01-01 04:00:00.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/db/configuration/defaults/smanager/type 2020-05-31 16:09:40.000000000 +0400 @@ -0,0 +1,2 @@ +service + diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/db/configuration/migrate/manager2 smeserver-manager-0.1.0/root/etc/e-smith/db/configuration/migrate/manager2 --- smeserver-manager-0.1.0.old/root/etc/e-smith/db/configuration/migrate/manager2 2020-06-05 23:08:16.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/db/configuration/migrate/manager2 1970-01-01 04:00:00.000000000 +0400 @@ -1,38 +0,0 @@ -{ - sub gen_pwd { - use MIME::Base64 qw(encode_base64); - my $p = "not set due to error"; - if ( open( RANDOM, "/dev/urandom" ) ){ - my $buf; - # 57 bytes is a full line of Base64 coding, and contains - # 456 bits of randomness - given a perfectly random /dev/random - if ( read( RANDOM, $buf, 57 ) != 57 ){ - warn("Short read from /dev/random: $!"); - } - else{ - $p = encode_base64($buf); - chomp $p; - } - close RANDOM; - } - else{ - warn "Could not open /dev/urandom: $!"; - } - return $p; - } - - my $rec = $DB->get('manager2') - || $DB->new_record('manager2', {type => 'configuration'}); - - my $pwd = $rec->prop('Secrets'); - if (not $pwd or length($pwd) < 57){ - my $pwd = gen_pwd(); - $rec->set_prop('Secrets', $pwd); - } - - my $theme = $rec->prop('Theme'); - if (not $theme){ - $rec->set_prop('Theme', 'default'); - } - -} diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/db/configuration/migrate/smanager smeserver-manager-0.1.0/root/etc/e-smith/db/configuration/migrate/smanager --- smeserver-manager-0.1.0.old/root/etc/e-smith/db/configuration/migrate/smanager 1970-01-01 04:00:00.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/db/configuration/migrate/smanager 2020-06-04 21:55:38.000000000 +0400 @@ -0,0 +1,38 @@ +{ + sub gen_pwd { + use MIME::Base64 qw(encode_base64); + my $p = "not set due to error"; + if ( open( RANDOM, "/dev/urandom" ) ){ + my $buf; + # 57 bytes is a full line of Base64 coding, and contains + # 456 bits of randomness - given a perfectly random /dev/random + if ( read( RANDOM, $buf, 57 ) != 57 ){ + warn("Short read from /dev/random: $!"); + } + else{ + $p = encode_base64($buf); + chomp $p; + } + close RANDOM; + } + else{ + warn "Could not open /dev/urandom: $!"; + } + return $p; + } + + my $rec = $DB->get('smanager') + || $DB->new_record('smanager', {type => 'configuration'}); + + my $pwd = $rec->prop('Secrets'); + if (not $pwd or length($pwd) < 57){ + my $pwd = gen_pwd(); + $rec->set_prop('Secrets', $pwd); + } + + my $theme = $rec->prop('Theme'); + if (not $theme){ + $rec->set_prop('Theme', 'default'); + } + +} diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/events/actions/locales2-conf smeserver-manager-0.1.0/root/etc/e-smith/events/actions/locales2-conf --- smeserver-manager-0.1.0.old/root/etc/e-smith/events/actions/locales2-conf 2020-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/events/actions/locales2-conf 2020-06-04 21:57:27.000000000 +0400 @@ -21,7 +21,7 @@ package esmith; use strict; -use constant I18NMODULES => '/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/I18N/Modules'; +use constant I18NMODULES => '/usr/share/smanager/lib/SrvMngr/I18N/Modules'; #------------------------- # get locale modules list diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/events/actions/navigation2-conf smeserver-manager-0.1.0/root/etc/e-smith/events/actions/navigation2-conf --- smeserver-manager-0.1.0.old/root/etc/e-smith/events/actions/navigation2-conf 2020-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/events/actions/navigation2-conf 2020-05-31 22:39:11.000000000 +0400 @@ -25,7 +25,7 @@ use esmith::NavigationDB; use esmith::I18N; -use constant WEBFUNCTIONS => '/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller'; +use constant WEBFUNCTIONS => '/usr/share/smanager/lib/SrvMngr/Controller'; use constant NAVIGATIONDIR => '/home/e-smith/db/navigation2'; use constant NEW_NAVDIR => '/home/e-smith/db'; @@ -66,6 +66,9 @@ my $description = undef; my $heading_weight = undef; my $description_weight = undef; + my $menucat = undef; + my $routes = undef; + while ( 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 --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/datetime.html.ep 2020-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/datetime.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,112 +0,0 @@ -% layout 'default', title => "Sme server 2 - datetime"; - -% content_for 'end' => begin -
- content_end -
-% end - -% content_for 'module' => begin -
- - %if ($config->{debug} == 1) { -

- (DBG)route: <%= $c->current_route %>
- (DBG)ntp: <%= $dat_datas->{ntpstatus}%>
- (DBG)svr: <%= $dat_datas->{ntpserver}%>
-

- %} - - -

<%= $title %>

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

- % param 'ntpstatus' => $dat_datas->{ntpstatus} unless param 'ntpstatus'; - % param 'old_ntpstatus' => $dat_datas->{ntpstatus} unless param 'ntpstatus'; - %= hidden_field 'old_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 => 'input' - -

- % } -

- %= 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' - - %= text_field 'month' => $dat_datas->{month}, class => 'input' - - %= text_field 'day' => $dat_datas->{day}, class => 'input' - - %= text_field 'year' => $dat_datas->{year}, class => 'input' - -
- - %=l 'dat_NEW_H/M/S' - - %= text_field 'hour' => $dat_datas->{hour}, class => 'input' - - %= text_field 'minute' => $dat_datas->{minute}, class => 'input' - - %= text_field 'second' => $dat_datas->{second}, class => 'input' - -
- - %=l 'dat_AM/PM_AND_TZ' - - %= select_field 'ampm' => [[AM => 'am'],[PM => 'pm']], class => 'input' - - %= text_field 'timezone' => $dat_datas->{timezone}, class => 'input' - -

- % } -

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

- % end -
-%end 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 --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/default.html.ep 2020-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/default.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,13 +0,0 @@ -% layout 'default', title => 'Sme server 2 - Support'; - -% content_for 'module' => begin - -
-

<%= $title %>

- <%= $modul %> -

- %= link_to Initial => '/' -

-
- -%end \ Pas de fin de ligne à la fin du fichier 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 --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/directory.html.ep 2020-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/directory.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,88 +0,0 @@ -% layout 'default', title => "Sme server 2 - directory"; - -% content_for 'module' => begin -
- - %if ($config->{debug} == 1) { -

- (DBG)route: <%= $c->current_route %>
- (DBG)dir. access: <%= $dir_datas->{access}%>
-

- %} - -

<%= $title %>

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

- - %= l('dir_LABEL_ROOT'), class => 'label' - - %= $dir_datas->{root}, class => 'data' - -

-

- %=l 'dir_DESC_DIRECTORY_ACCESS', class => 'desc' -
- - %=l 'dir_DIRECTORY_ACCESS', class => 'label' - - % param 'access' => $dir_datas->{access} unless param 'access'; - %= select_field 'access' => [[ (l 'NETWORKS_ALLOW_LOCAL') => 'private'], [ (l 'NETWORKS_ALLOW_PUBLIC') => 'public']], class => 'input', id => 'access' - -

-

- %=l 'dir_DESC_DEPARTMENT', class => 'desc' -

- - %=l 'dir_DEPARTMENT', class => 'label' - - %= text_field 'department' => $dir_datas->{department}, class => 'input' - -

- - %=l 'dir_COMPANY', class => 'label' - - %= text_field 'company', $dir_datas->{company}, class => 'input' - -

- - %=l 'dir_STREET', class => 'label' - - %= text_field 'street' => $dir_datas->{street}, class => 'input' - -

- - %=l 'dir_CITY', class => 'label' - - %= text_field 'city', $dir_datas->{city}, class => 'input' - -

- - %=l 'dir_PHONENUMBER', class => 'label' - - %= text_field 'phonenumber', $dir_datas->{phonenumber}, class => 'input' - -

-

- %=l 'dir_DESC_EXISTING', class => 'desc' -

- - %=l 'dir_EXISTING', class => 'label' - - %= select_field 'existing'=> [[ (l 'dir_LEAVE') => 'leave'], [ (l 'dir_UPDATE') => 'update' ]], class => 'input' - -

-

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

- % end - -
-%end 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 --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/domains.html.ep 2020-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/domains.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,32 +0,0 @@ -% layout 'default', title => "Sme server 2 - domains"; - -% content_for 'module' => begin -
- - % if ($config->{debug} == 1) { -

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

- % } - - % if ( stash 'error' ) { -
- %= $c->render_to_string(inline => stash 'error') -
- %} - -

<%= $title%>

- - % if ($dom_datas->{trt} eq 'ADD' or $dom_datas->{trt} eq 'UPD') { - %= include 'partials/_dom_upd' - %} elsif ($dom_datas->{trt} eq 'DEL') { - %= include 'partials/_dom_del' - %} elsif ($dom_datas->{trt} eq 'UP2') { - %= include 'partials/_dom_up2' - %} else { - %= include 'partials/_dom_list' - %} - -
-%end 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 --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailaccess.html.ep 2020-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailaccess.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,57 +0,0 @@ -% layout 'default', title => "Sme server 2 - emailaccess"; - -% content_for 'module' => begin -
- - % if ($config->{debug} == 1) { -

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

- % } - - % if ( stash 'error' ) { -
- %= $c->render_to_string(inline => stash 'error') -
- %} - -

<%= $title%>

- - %= form_for '/emailsettingd' => (method => 'POST') => begin - - %=l 'mai_DESC_POP_ACCESS_CONTROL' - -

- %=l 'mai_LABEL_POP_ACCESS_CONTROL' - - % param 'POPAccess' => $c->get_current_pop3_access() unless param 'POPAccess'; - %= select_field 'POPAccess' => $c->get_pop_opt(), class => 'input' -

- - %=l 'mai_DESC_IMAP_ACCESS_CONTROL' - -

- %=l 'mai_LABEL_IMAP_ACCESS_CONTROL' - - % param 'IMAPAccess' => $c->get_current_imap_access() unless param 'IMAPAccess'; - %= select_field 'IMAPAccess' => $c->get_imap_opt(), class => 'input' -

- - %=l 'mai_DESC_WEBMAIL' - -

- %=l 'mai_LABEL_WEBMAIL' - - % param 'WebMail' => $c->get_current_webmail_status() unless param 'WebMail'; - %= select_field 'WebMail' => $c->get_webmail_opt(), class => 'input' -

- - % my $btn = l('SAVE'); - %= submit_button "$btn", class => 'action' - - %= hidden_field 'trt' => 'ACC' - % end - -
-%end 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 --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emaildeliver.html.ep 2020-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emaildeliver.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,92 +0,0 @@ -% layout 'default', title => "Sme server 2 - emaildeliver"; - -% content_for 'module' => begin -
- - % if ($config->{debug} == 1) { -

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

- % } - - % if ( stash 'error' ) { -
- %= $c->render_to_string(inline => stash 'error') -
- %} - -

<%= $title%>

- - %= form_for '/emailsettingd' => (method => 'POST') => begin - -

- %=l 'mai_TITLE_UNKNOWN' -

- - %=l 'mai_DESC_UNKNOWN' - -

- %=l 'mai_LABEL_UNKNOWN' - - % param 'EmailUnknownUser' => $mai_datas->{emailunknownuser} unless param 'EmailUnknownUser'; - %= select_field 'EmailUnknownUser' => $c->get_emailunknownuser_opt(), class => 'input' -

- - -

- %=l 'mai_TITLE_DELEGATE' -

- - %=l 'mai_DESC_DELEGATE' - -

- %=l 'mai_LABEL_DELEGATE' - - % param 'DelegateMailServer' => $mai_datas->{delegatemailserver} unless param 'DelegateMailServer'; - %= text_field 'DelegateMailServer', class => 'input' -

- -
-

- %=l 'mai_TITLE_SMARTHOST' -

- - %=l 'mai_DESC_SMARTHOST' - -

- %=l 'mai_LABEL_SMARTHOST' - - % param 'SMTPSmartHost' => $mai_datas->{smtpsmarthost} unless param 'SMTPSmartHost'; - %= text_field 'SMTPSmartHost', class => 'input' -

- -

- %=l 'mai_LABEL_SMARTHOST_SMTPAUTH_STATUS' - - % param 'SMTPAUTHPROXY_status' => $mai_datas->{smtpauthproxystatus} unless param 'SMTPAUTHPROXY_status'; - %= select_field 'SMTPAUTHPROXY_status' => [[(l 'DISABLED') => 'disabled'], [(l 'ENABLED') => 'enabled']], class => 'input' -

- -

- %=l 'mai_LABEL_SMARTHOST_SMTPAUTH_USERID' - - % param 'SMTPAUTHPROXY_Userid' => $mai_datas->{smtpauthproxyuserid} unless param 'SMTPAUTHPROXY_Userid'; - %= text_field 'SMTPAUTHPROXY_Userid', class => 'input' -

- -

- %=l 'mai_LABEL_SMARTHOST_SMTPAUTH_PASSWD' - - % param 'SMTPAUTHPROXY_Passwd' => $mai_datas->{smtpauthproxypassword} unless param 'SMTPAUTHPROXY_Passwd'; - %= password_field 'SMTPAUTHPROXY_Passwd', class => 'input' -

- - % my $btn = l('SAVE'); - %= submit_button "$btn", class => 'action' - - %= hidden_field 'trt' => 'DEL' - % end - -
-%end 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 --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailfilter.html.ep 2020-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailfilter.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,101 +0,0 @@ -% layout 'default', title => "Sme server 2 - emailfilter"; - -% content_for 'module' => begin -
- - % if ($config->{debug} == 1) { -

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

- % } - - % if ( stash 'error' ) { -
- %= $c->render_to_string(inline => stash 'error') -
- %} - -

<%= $title%>

- - %= form_for '/emailsettingd' => (method => 'POST') => begin - - %=l 'mai_DESC_VIRUS_SCAN' - -

- %=l 'mai_LABEL_VIRUS_SCAN' - - % param 'VirusStatus' => $mai_datas->{virusstatus} unless param 'VirusStatus'; - %= select_field 'VirusStatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => 'input' -

- - %=l 'mai_DESC_SPAM_SCAN' - -

- %=l 'mai_LABEL_SPAM_SCAN' - - % param 'SpamStatus' => $mai_datas->{spamstatus} unless param 'SpamStatus'; - %= select_field 'SpamStatus' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => 'input' -

- -

- %=l 'mai_LABEL_SPAM_SENSITIVITY' - - % param 'SpamSensitivity' => $mai_datas->{spamsensitivity} unless param 'SpamSensitivity'; - %= select_field 'SpamSensitivity' => $c->get_spam_sensitivity_opt(), class => 'input' -

- -

- %=l 'mai_LABEL_SPAM_TAGLEVEL' - - % param 'SpamTagLevel' => $mai_datas->{spamtaglevel} unless param 'SpamTagLevel'; - %= select_field 'SpamTagLevel' => $c->get_spam_level_options(), class => 'input' -

- -

- %=l 'mai_LABEL_SPAM_REJECTLEVEL' - - % param 'SpamRejectLevel' => $mai_datas->{spamrejectlevel} unless param 'SpamRejectLevel'; - %= select_field 'SpamRejectLevel' => $c->get_spam_level_options(), class => 'input' -

- -

- %=l 'mai_LABEL_SORTSPAM' - - % param 'SpamSortSpam' => $mai_datas->{spamsortspam} unless param 'SpamSortSpam'; - %= select_field 'SpamSortSpam' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => 'input' -

- - %=l 'mai_DESC_SPAM_SUBJECT' - -

- %=l 'mai_LABEL_SPAM_SUBJECTTAG' - - % param 'SpamSubjectTag' => $mai_datas->{spamsubjecttag} unless param 'SpamSubjectTag'; - %= select_field 'SpamSubjectTag' => [[(l 'DISABLED') => 'disabled'], [ (l 'ENABLED') => 'enabled']], class => 'input' -

- -

- %=l 'mai_LABEL_SPAM_SUBJECT' - - % param 'SpamSubject' => $mai_datas->{spamsubject} unless param 'SpamSubject'; - %= text_field 'SpamSubject' => class => 'input' -

- - %=l 'mai_DESC_BLOCK_EXECUTABLE_CONTENT' - -

- %=l 'mai_LABEL_CONTENT_TO_BLOCK' - - % param 'BlockExecutableContent' => $c->get_patterns_current_opt() unless param 'BlockExecutableContent'; - %= select_field 'BlockExecutableContent' => $c->get_patterns_opt(), class => 'input', multiple => "1" -

- - % my $btn = l('SAVE'); - %= submit_button "$btn", class => 'action' - - %= hidden_field 'trt' => 'FIL' - % end - -
-%end 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 --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailreceive.html.ep 2020-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailreceive.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,113 +0,0 @@ -% layout 'default', title => "Sme server 2 - emailreceive"; - -% content_for 'module' => begin -
- - % if ($config->{debug} == 1) { -

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

- % } - - % if ( stash 'error' ) { -
- %= $c->render_to_string(inline => stash 'error') -
- %} - -

<%= $title%>

- - %= form_for '/emailsettingd' => (method => 'POST') => begin - - %=l 'mai_DESC_MODE' - -

- %=l 'mai_LABEL_MODE' - - % param 'FetchmailMethod' => $mai_datas->{fetchmailmethod} unless param 'FetchmailMethod'; - %= select_field 'FetchmailMethod' => $c->get_retrieval_opt(), class => 'input' -

- - %=l 'mai_DESC_SMTP_AUTH_CONTROL' - -

- %=l 'mai_LABEL_SMTP_AUTH_CONTROL' - - % param 'SMTPAuth' => $c->get_current_smtp_auth() unless param 'SMTPAuth'; - %= select_field 'SMTPAuth' => $c->get_smtp_auth_opt(), class => 'input' -

- -
-

- %=l 'mai_TITLE_SECONDARY' -

- - %=l 'mai_DESC_SECONDARY' - -

- %=l 'mai_LABEL_SECONDARY' - - % param 'SecondaryMailServer' => $mai_datas->{secondarymailserver} unless param 'SecondaryMailServer'; - %= text_field 'SecondaryMailServer', class => 'input' -

- - %=l 'mai_DESC_FETCH_PERIOD' - -

- %=l 'mai_LABEL_FETCH_PERIOD' - - % param 'FreqOffice' => $mai_datas->{freqoffice} unless param 'FreqOffice'; - %= select_field 'FreqOffice' => $c->fetchmail_freq(), class => 'input' -

- -

- %=l 'mai_LABEL_FETCH_PERIOD_NIGHTS' - - % param 'FreqOutside' => $mai_datas->{freqoutside} unless param 'FreqOutside'; - %= select_field 'FreqOutside' => $c->fetchmail_freq(), class => 'input' -

- -

- %=l 'mai_LABEL_FETCH_PERIOD_WEEKENDS' - - % param 'FreqWeekend' => $mai_datas->{freqweekend} unless param 'FreqWeekend'; - %= select_field 'FreqWeekend' => $c->fetchmail_freq(), class => 'input' -

- -

- %=l 'mai_LABEL_POP_ACCOUNT' - - % param 'SecondaryMailAccount' => $mai_datas->{secondarymailaccount} unless param 'SecondaryMailAccount'; - %= text_field 'SecondaryMailAccount', class => 'input' -

- -

- %=l 'mai_LABEL_POP_PASS' - - % param 'SecondaryMailPassword' => $mai_datas->{secondarymailpassword} unless param 'SecondaryMailPassword'; - %= password_field 'SecondaryMailPassword', class => 'input' -

- -

- %=l 'mai_LABEL_SORT_METHOD' - - % param 'SpecifyHeader' => $mai_datas->{specifyheader} unless param 'SpecifyHeader'; - %= select_field 'SpecifyHeader' => [[(l 'mai_DEFAULT') => 'off'], [(l 'mai_SPECIFY_BELOW') => 'on']], class => 'input' -

- -

- %=l 'mai_LABEL_SORT_HEADER' - - % param 'SecondaryMailEnvelope' => $mai_datas->{secondarymailenvelope} unless param 'SecondaryMailEnvelope'; - %= text_field 'SecondaryMailEnvelope', class => 'input' -

- - % my $btn = l('SAVE'); - %= submit_button "$btn", class => 'action' - - %= hidden_field 'trt' => 'REC' - % end - -
-%end 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 --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailsettings.html.ep 2020-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailsettings.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,122 +0,0 @@ -% layout 'default', title => "Sme server 2 - emailsettings"; - -% content_for 'module' => begin -
- - % if ($config->{debug} == 1) { -

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

- % } - - % if ( 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( 1 ) -

- -

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

- -

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

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

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

- -

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

- -

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

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

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

- -

- %=l 'mai_LABEL_SMTP_AUTH_CONTROL' - - %= $c->get_current_smtp_auth( 1 ) -

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

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

- -

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

- -

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

- - % my $btn = l('mai_DESC_STATE_DELIVERY_BUTTON'); - %= submit_button "$btn", class => 'action' - - %= hidden_field 'trt' => 'DEL' - % end - -
-%end 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 --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/exception_development.html.ep 2020-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/exception_development.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,17 +0,0 @@ -% layout 'default', title => 'Sme server 2 - Error D'; - -% content_for 'module' => begin - -
-


dev
Oups !!! - The page you were requesting - "<%= $self->req->url->path || '/' %>" - caused en exception !! -
dev
-

-

- %= link_to Back => '/' -

-
- -% end 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 --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/groups.html.ep 2020-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/groups.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,33 +0,0 @@ -% layout 'default', title => "Sme server 2 - groups"; - -% content_for 'module' => begin -
- - % if ($config->{debug} == 1) { -

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

- % } - - % if ( stash 'error' ) { -
- %= $c->render_to_string(inline => stash 'error') -
- %} - -

<%= $title%>

- - % if ($grp_datas->{trt} eq 'ADD') { - %= include 'partials/_grp_add' - %} elsif ($grp_datas->{trt} eq 'DEL') { - %= include 'partials/_grp_del' - %} elsif ($grp_datas->{trt} eq 'UPD') { - %= include 'partials/_grp_upd' - %} else { - %= include 'partials/_grp_list' - %} - -
-%end - 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 --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/hostentries.html.ep 2020-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/hostentries.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,35 +0,0 @@ -% layout 'default', title => "Sme server 2 - hostentries"; - -% content_for 'module' => begin -
- - % if ($config->{debug} == 1) { -

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

- % } - -

<%= $title%>

- - % if ( $notif ) { -
- - <%= $c->render_to_string(inline => $notif) %> - - %} - - % if ($hos_datas->{trt} eq 'ADD' or $hos_datas->{trt} eq 'UPD') { - %= include 'partials/_hos_upd' - %} elsif ($hos_datas->{trt} eq 'DEL') { - %= include 'partials/_hos_del' - %} elsif ( $hos_datas->{trt} eq 'ALC' or $hos_datas->{trt} eq 'ULC') { - %= include 'partials/_hos_ulc' - %} elsif ( $hos_datas->{trt} eq 'ARM' or $hos_datas->{trt} eq 'URM') { - %= include 'partials/_hos_urm' - %} else { - %= include 'partials/_hos_list' - %} - -
-%end 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 --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/ibays.html.ep 2020-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/ibays.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,31 +0,0 @@ -% layout 'default', title => "Sme server 2 - ibays"; - -% content_for 'module' => begin -
- - % if ($config->{debug} == 1) { -

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

- % } - -

<%= $title%>

- - %= $c->render_to_string(inline => $modul ); - - % if ($iba_datas->{trt} eq 'ADD') { - %= include 'partials/_iba_upd' - %} elsif ($iba_datas->{trt} eq 'DEL') { - %= include 'partials/_iba_del' - %} elsif ($iba_datas->{trt} eq 'UPD') { - %= include 'partials/_iba_upd' - %} elsif ($iba_datas->{trt} eq 'PWD') { - %= include 'partials/_iba_pwd' - %} else { - %= include 'partials/_iba_list' - %} - -
-%end - 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 --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/initial.html.ep 2020-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/initial.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,28 +0,0 @@ -% layout 'default', title => 'Sme server 2 - Initial'; - -% content_for 'module' => begin - - % if ($config->{debug} == 1) { -

- %= dumper $c->current_route -

- % } - -
- - % if ( stash 'error' ) { -
- %= $c->render_to_string(inline => stash 'error') -
- %} - -

- %= $title -

-
-

- %= $modul -

-
- -% end diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/layouts/default.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/layouts/default.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/layouts/default.html.ep 2020-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/layouts/default.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,56 +0,0 @@ - - - - -<%= $title %> - - - %= stylesheet 'css/sme_core.css' - %= stylesheet 'css/sme_main.css' - %= stylesheet 'css/sme_menu.css' - %= stylesheet 'css/styles.css' - %= include 'partials/_js_imports' - - - -% if ( not defined $c->session->{lang} ) { -% SrvMngr::init_session_cgi ( $c ); -% } - - - %= include 'partials/_info' - -
- -
- - % if (flash 'success') { -
- %= $c->render_to_string(inline => flash 'success') -
- % } - - % if ( flash 'error' ) { -
- %= $c->render_to_string(inline => flash 'error') -
- %} - %= content 'module' - %= include 'partials/_footer' -
-
- - %= include 'common_js' - %= content 'js_swapClass' - - - 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 --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/localnetworks.html.ep 2020-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/localnetworks.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,32 +0,0 @@ -% layout 'default', title => "Sme server 2 - localnetworks"; - -% content_for 'module' => begin -
- - % if ($config->{debug} == 1) { -

- %= dumper $c->current_route - %= dumper $c->stash("ret") - %= dumper $c->param("localnetwork"); - %= dumper $c->stash("ln_datas"); - %= dumper $c->param("deletehost"); -

- % } - -

<%= $title%>

- %= $modul - - % if ($ln_datas->{trt} eq 'ADD') { - %= include 'partials/_ln_add' - %} elsif ($ln_datas->{trt} eq 'ADD1') { - %= include 'partials/_ln_add' - %} elsif ($ln_datas->{trt} eq 'DEL') { - %= include 'partials/_ln_del' - %} elsif ($ln_datas->{trt} eq 'DEL1'){ - %= include 'partials/_ln_list' - %} else { - %= include 'partials/_ln_list' - %} - -
-%end 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 --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/manual.html.ep 2020-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/manual.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,9 +0,0 @@ -% layout 'default', title => 'Sme server 2 - Manual'; - -% content_for 'module' => begin -
-

<%= $title %>

- <%= $modul %>
-
- -% end 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 --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/module.html.ep 2020-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/module.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,12 +0,0 @@ -% layout 'default', title => "Sme server 2 - module"; - -% content_for 'module' => begin - -
-

- %= $title -

- %= $modul -
- -%end \ Pas de fin de ligne à la fin du fichier 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 --- 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-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/not_found.development.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,15 +0,0 @@ -% layout 'defaultlight', title => 'Sme server 2 - Error D'; - -% content_for 'module' => begin - -
-


dev
Oups !!! - The page you were requesting - "<%= $self->req->url->path || '/' %>" - could not be found. -
dev
- %= link_to Initial => '/Initial' -

-
- -% end 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 --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/not_found.html.ep 2020-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/not_found.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,10 +0,0 @@ -% layout 'defaultlight', title => 'Sme server 2 - Error P'; -
-



- The page you were requesting - "<%= $self->req->url->path || '/' %>" - could not be found. -

- %= link_to Welcome => '/' -

-
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 --- 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-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_dom_del.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,29 +0,0 @@ -
- - % my $btn = l('REMOVE'); - %= form_for '/domains2' => (method => 'POST') => begin -

-

- %=l 'dom_REMOVE_TITLE' -

-

- -

- %= $c->l('dom_REMOVE_DESCRIPTION', $dom_datas->{domain}, $dom_datas->{description}); -

- -

- %= l('dom_ABOUT_TO_REMOVE') -

- -

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

- - %= hidden_field 'trt' => $dom_datas->{trt} - %= hidden_field 'Domain' => $dom_datas->{domain} - - % end - -
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 --- 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-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_dom_list.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,107 +0,0 @@ -
- - % my $btn = l('dom_ADD_DOMAIN'); - - - %= form_for '/domains' => (method => 'POST') => begin - - %= l('dom_FORM_DESCRIPTION'); - -

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

- -

-

- %=l 'dom_CURRENT_DOMAINS' -

- - - - - - - - - - % foreach my $domain ( @$domains ) { - - %= t td => (class => 'sme-border') => $domain->{Domain} - %= t td => (class => 'sme-border') => $domain->{'Description'} - %= t td => (class => 'sme-border') => $domain->{'Content'} - %= t td => (class => 'sme-border') => l('dom_' . $domain->{'Nameservers'}) - - % my $actionModify = "" . l('MODIFY') . ""; - - % my $removable = ($domain->{Removable} || 'yes'); - % my $actionRemove = ' '; - - % if ($removable eq 'yes') { - % $actionRemove = "" . l('REMOVE') . ""; - % } - - - - - % } - - -
- %=l 'DOMAIN_NAME' - - %=l 'DESCRIPTION_BRIEF' - - %=l 'dom_CONTENT' - - %=l 'dom_LABEL_NAMESERVERS' - - %=l 'ACTION' -
<%= $c->render_to_string(inline => $actionModify) %><%= $c->render_to_string(inline => $actionRemove) %>
-

- - %= hidden_field 'trt' => 'ADD' - - % end - - %= form_for '/domains' => (method => 'POST') => begin - -
- - % my $btn2 = l('dom_DOMAINS_PAGE_CORPORATE_DNS'); - -

- %= l 'dom_DESC_CORPORATE_DNS_CURRENT' -

- -

- - %=l 'dom_LABEL_CORPORATE_DNS_PRIMARY' - - %= $dom_datas->{forwarder} - -

- - % if ($dom_datas->{forwarder2}) { -

- - %=l 'dom_LABEL_CORPORATE_DNS_SECONDARY' - - %= $dom_datas->{forwarder2} - -

- % } - -

- %= submit_button "$btn2", class => 'action' -

- -

- %= l 'dom_BUTTON_CORPORATE_DNS' -

- - %= hidden_field 'trt' => 'UP2' - - % end - -
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 --- 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-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_dom_up2.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,37 +0,0 @@ -
- - % my $btn = l('SAVE'); - - %= form_for '/domains2' => (method => 'POST') => begin - -


- %=l 'dom_DESC_CORPORATE_DNS' -

- -

- - %=l 'dom_LABEL_CORPORATE_DNS_PRIMARY' - - % param 'Forwarder' => $dom_datas->{forwarder} unless param 'Forwarder'; - %= text_field 'Forwarder', class => 'input' - -

- -

- - %=l 'dom_LABEL_CORPORATE_DNS_SECONDARY', class => 'label' - - % param 'Forwarder2' => $dom_datas->{forwarder2} unless param 'Forwarder2'; - %= text_field 'Forwarder2', class => 'input' - -

- -

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

- - %= hidden_field 'trt' => $dom_datas->{trt} - - %end - -
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 --- 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-06-05 23:08:21.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_dom_upd.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,70 +0,0 @@ -
- - % my $btn = l('ADD'); - - %= form_for '/domains2' => (method => 'POST') => begin -

-

- % if ( $dom_datas->{trt} eq "ADD" ) { - %=l 'dom_CREATE_TITLE' - % } else { - %=l 'dom_MODIFY_TITLE' - % $btn = l('MODIFY'); - % } -

-

- -


- - %=l 'DOMAIN_NAME', class => 'label' - - % if ( $dom_datas->{trt} eq "ADD" ) { - % param 'Domain' => $dom_datas->{domain} unless param 'Domain'; - %= text_field 'Domain', class => 'input' - % } else { - %= hidden_field 'Domain' => $dom_datas->{domain} - %= $dom_datas->{domain}, class => 'data' - % } - -

- -


- - %=l 'DESCRIPTION_BRIEF', class => 'label' - - % param 'Description' => $dom_datas->{description} unless param 'Description'; - %= text_field 'Description', class => 'input' - -

- -


- %=l 'dom_CONTENT_FIELD_DESCRIPTION' -
- - %= $c->l('dom_CONTENT', ''); - - % param 'Content' => $dom_datas->{content} unless param 'Content'; - %= select_field 'Content', $c->content_options_list(), class => 'input' - -

- -


- %=l 'dom_DESC_NAMESERVERS' -
- - %=l 'dom_LABEL_NAMESERVERS', class => 'label' - - % param 'Nameservers' => $dom_datas->{nameservers} unless param 'Nameservers'; - %= select_field 'Nameservers', $c->nameserver_options_list(), class => 'input' - -

- -


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

- - %= hidden_field 'trt' => $dom_datas->{trt} - - %end - -
diff -aurN 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 --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_footer.html.ep 2020-06-05 23:08:16.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_footer.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,8 +0,0 @@ -