diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Viewlogfiles/viewlogfiles_en.lex smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Viewlogfiles/viewlogfiles_en.lex --- smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Viewlogfiles/viewlogfiles_en.lex 2021-06-14 12:13:15.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Viewlogfiles/viewlogfiles_en.lex 2021-06-14 22:52:28.801000000 +0400 @@ -17,7 +17,7 @@ 'log_MATCH_PATTERN_LABEL' => 'Highlight Pattern (optional)', 'log_END_DESC' => 'Please note that it may take quite some time to generate these reports.', -'VIEW' => 'View log file', +'log_VIEW' => 'View log file', 'log_LOG_FILE_EMPTY' => 'Log file "[_1]" is empty!', 'log_VIEWING_TIME' => 'Viewed at [_1].', 'log_MATCH_HEADER' => 'Displaying lines matching: "[_1]".', diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Viewlogfiles/viewlogfiles_fr.lex smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Viewlogfiles/viewlogfiles_fr.lex --- smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Viewlogfiles/viewlogfiles_fr.lex 2021-06-14 12:13:15.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Viewlogfiles/viewlogfiles_fr.lex 2021-06-14 18:07:09.000000000 +0400 @@ -1,4 +1,5 @@ 'View log files' => 'Visualisation des fichiers journaux', +'log_FORM_TITLE' => 'Visualisation des fichiers journaux', 'log_FIRSTPAGE_DESC' => ' Cette page vous permet de visualiser ou de télécharger les fichiers journaux générés par les services en cours de fonctionnement sur votre serveur. ', 'log_LOG_FILE_SELECT_DESC' => 'Choisissez le fichier journal à afficher', 'log_FILTER_PATTERN_DESC' => '

Vous avez la possibilité de spécifier un modèle de filtre afin de n\'afficher que les lignes du fichier journal qui correspondent à ce modèle. Si vous laissez ce champ vide, le fichier journal sera affiché dans son intégralité. Veuillez noter que cette option est ignorée en cas de téléchargement du fichier.

', diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr.pm smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr.pm --- smeserver-manager-0.1.2.old/root/usr/share/smanager/lib/SrvMngr.pm 2021-06-14 12:13:15.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/lib/SrvMngr.pm 2021-06-14 21:08:30.880000000 +0400 @@ -23,7 +23,7 @@ use SrvMngr::Model::Main; -our $VERSION = '1.211'; +our $VERSION = '1.212'; $VERSION = eval $VERSION; use Exporter 'import'; @@ -261,21 +261,21 @@ $if_admin->post('/emailsettings')->to('emailsettings#do_display')->name('emailsetting'); $if_admin->post('/emailsettingd')->to('emailsettings#do_update')->name('emailsettingu'); - $if_admin->get('/groups')->to('groups#main')->name('groupsg'); - $if_admin->get('/groups2')->to('groups#do_display')->name('groups2g'); - $if_admin->post('/groups2')->to('groups#do_update')->name('groups2p'); + $if_admin->get('/groups')->to('groups#main')->name('groupsl'); + $if_admin->post('/groups')->to('groups#do_display')->name('groupa'); + $if_admin->get('/groups2')->to('groups#do_display')->name('groupd'); + $if_admin->post('/groups2')->to('groups#do_update')->name('groupu'); $if_admin->get('/hostentries')->to('hostentries#main')->name('hostentries'); $if_admin->post('/hostentries')->to('hostentries#do_display')->name('hostentryadd'); - $if_admin->get('/hostentryd')->to('hostentries#do_display')->name('hostentrydis'); - $if_admin->post('/hostentryd')->to('hostentries#do_update')->name('hostentryupd'); + $if_admin->get('/hostentriesd')->to('hostentries#do_display')->name('hostentrydis'); + $if_admin->post('/hostentriesd')->to('hostentries#do_update')->name('hostentryupd'); $if_admin->get('/ibays')->to('ibays#main')->name('ibays'); $if_admin->post('/ibays')->to('ibays#do_display')->name('ibayadd'); $if_admin->get('/ibaysd')->to('ibays#do_display')->name('ibaydis'); $if_admin->post('/ibaysd')->to('ibays#do_update')->name('ibayupd'); - $if_admin->get('/localnetworks')->to('localnetworks#main')->name('localnetworks'); $if_admin->post('/localnetworks')->to('localnetworks#do_display')->name('localnetworks'); $if_admin->post('/localnetworksa')->to('localnetworks#do_display')->name('localnetworksadd'); @@ -291,15 +291,17 @@ $if_admin->post('/portforwardinge')->to('portforwarding#do_display')->name('portforwardingdel1'); $if_admin->get('/printers')->to('printers#main')->name('printersg'); - $if_admin->get('/printers2')->to('printers#do_display')->name('printers2g'); + $if_admin->post('/printers')->to('printers#do_display')->name('printera'); + $if_admin->get('/printers2')->to('printers#do_display')->name('printer2g'); $if_admin->post('/printers2')->to('printers#do_update')->name('printers2p'); $if_admin->get('/proxy')->to('proxy#main')->name('proxy'); $if_admin->post('/proxy')->to('proxy#do_update')->name('proxy2'); - $if_admin->get('/pseudonyms')->to('pseudonyms#main')->name('pseudonymsg'); - $if_admin->get('/pseudonyms2')->to('pseudonyms#do_display')->name('pseudonyms2g'); - $if_admin->post('/pseudonyms2')->to('pseudonyms#do_update')->name('pseudonyms2p'); + $if_admin->get('/pseudonyms')->to('pseudonyms#main')->name('pseudonymsl'); + $if_admin->post('/pseudonyms')->to('pseudonyms#do_display')->name('pseudonyma'); + $if_admin->get('/pseudonyms2')->to('pseudonyms#do_display')->name('pseudonymd'); + $if_admin->post('/pseudonyms2')->to('pseudonyms#do_update')->name('pseudonymu'); $if_admin->get('/qmailanalog')->to('qmailanalog#main')->name('qmailanalog'); $if_admin->post('/qmailanalog')->to('qmailanalog#do_update')->name('qmailanalog2'); @@ -321,14 +323,14 @@ $if_admin->post('/useraccounts')->to('useraccounts#do_display')->name('useraccountadd'); $if_admin->get('/useraccountsd')->to('useraccounts#do_display')->name('useraccountdis'); $if_admin->post('/useraccountsd')->to('useraccounts#do_update')->name('useraccountupd'); + $if_admin->post('/useraccountso')->to('useraccounts#do_display')->name('useraccountvpn'); $if_admin->get('/viewlogfiles')->to('viewlogfiles#main')->name('viewlogfiles'); $if_admin->post('/viewlogfiles')->to('viewlogfiles#do_action')->name('viewlogfiles2'); - $if_admin->get('/viewlogfilesr')->to('viewlogfiles#do_action')->name('viewlogfilesr'); + $if_admin->post('/viewlogfilesr')->to('viewlogfiles#do_action')->name('viewlogfilesr'); $if_admin->get('/yum')->to('yum#main')->name('yum'); $if_admin->post('/yum')->to('yum#do_display')->name('yumd1'); - $if_admin->get('/yumd')->to('yum#do_display')->name('yumd'); $if_admin->post('/yumd')->to('yum#do_update')->name('yumu'); $if_admin->get('/welcome')->to('welcome#main')->name('welcome'); diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/script/daily.sh smeserver-manager-0.1.2/root/usr/share/smanager/script/daily.sh --- smeserver-manager-0.1.2.old/root/usr/share/smanager/script/daily.sh 2021-06-14 12:13:15.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/script/daily.sh 2021-06-13 20:57:18.000000000 +0400 @@ -2,18 +2,24 @@ #> unshift secrets values #> refresh Routes base +#> refresh Navigation menu bases +### refresh Rest password base #> expand smanager.conf et reload service +### smanager activity test -SCRIPT_DIR='/usr/share/smanager/script' +SMANAGER_DIR='/usr/share/smanager' # unshift secrets value -$SCRIPT_DIR/secrets.pl +$SMANAGER_DIR/script/secrets.pl # refresh routes database -$SCRIPT_DIR/routes.pl +$SMANAGER_DIR/script/routes.pl + +# refresh Navigation menu database +#$SMANAGER_DIR/script/navigation.pl # smanager config files and databases -/sbin/e-smith/expand-template $SCRIPT_DIR/../conf/srvmngr.conf +/sbin/e-smith/expand-template $SMANAGER_DIR/conf/srvmngr.conf /sbin/e-smith/signal-event smanager-refresh exit 0 diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/script/secrets.pl smeserver-manager-0.1.2/root/usr/share/smanager/script/secrets.pl --- smeserver-manager-0.1.2.old/root/usr/share/smanager/script/secrets.pl 2021-06-14 12:13:15.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/script/secrets.pl 2021-06-14 12:14:49.778000000 +0400 @@ -42,7 +42,7 @@ $secrets[0] = $newpwd; my $secret = join ',', @secrets; $cdb->get('smanager')->set_prop('Secrets', $secret); - print("Secret values unshifted\n"); + #print("Secret values unshifted\n"); } else { print("Secret generation error\n"); } diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep 2020-11-19 11:53:26.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_grp_list.html.ep 2021-06-14 19:49:24.000000000 +0400 @@ -2,7 +2,7 @@ % my $btn = l('GROUP_ADD'); - %= form_for '/groups2' => (method => 'GET') => begin + %= form_for '/groups' => (method => 'POST') => begin %= hidden_field 'trt' => 'ADD' diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_hos_del.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_hos_del.html.ep --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_hos_del.html.ep 2020-11-19 11:53:26.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_hos_del.html.ep 2021-06-14 19:22:38.000000000 +0400 @@ -1,7 +1,7 @@
% my $btn = l('REMOVE'); - %= form_for '/hostentryd' => (method => 'POST') => begin + %= form_for '/hostentriesd' => (method => 'POST') => begin

%=l 'hos_REMOVE_TITLE' @@ -14,7 +14,7 @@

%=l 'hos_ABOUT_TO_REMOVE' -

+


diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep 2020-11-19 11:53:26.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_hos_list.html.ep 2021-06-14 19:02:48.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.2.old/root/usr/share/smanager/themes/default/templates/partials/_hos_ulc.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_hos_ulc.html.ep --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_hos_ulc.html.ep 2020-11-19 11:53:26.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_hos_ulc.html.ep 2021-06-14 19:03:23.000000000 +0400 @@ -3,7 +3,7 @@ % my $btn = l('NEXT'); - %= form_for '/hostentryd' => (method => 'POST') => begin + %= form_for '/hostentriesd' => (method => 'POST') => begin

% if ( $hos_datas->{trt} eq "ALC" ) { %=l 'hos_CREATE_TYPE' diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_hos_upd.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_hos_upd.html.ep --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_hos_upd.html.ep 2020-11-19 11:53:26.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_hos_upd.html.ep 2021-06-14 19:03:04.000000000 +0400 @@ -2,7 +2,7 @@ % my $btn = l('NEXT'); - %= form_for '/hostentryd' => (method => 'POST') => begin + %= form_for '/hostentriesd' => (method => 'POST') => begin

% if ( $hos_datas->{trt} eq "ADD" ) { %=l 'hos_CREATE_TITLE' diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_hos_urm.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_hos_urm.html.ep --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_hos_urm.html.ep 2020-11-19 11:53:26.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_hos_urm.html.ep 2021-06-14 19:03:13.000000000 +0400 @@ -3,7 +3,7 @@ % my $btn = l('MODIFY'); - %= form_for '/hostentryd' => (method => 'POST') => begin + %= form_for '/hostentriesd' => (method => 'POST') => begin

%=l 'hos_REMOTE_PAGE_DESCRIPTION' diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep 2020-11-19 11:53:26.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_prt_list.html.ep 2021-06-14 18:52:38.000000000 +0400 @@ -3,7 +3,7 @@ % my $btn = l('prt_INITIAL_BTN'); - %= form_for '/printers2' => (method => 'GET') => begin + %= form_for '/printers' => (method => 'POST') => begin %= hidden_field 'trt' => 'ADD' diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep 2020-11-19 11:53:26.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_pse_list.html.ep 2021-06-14 19:27:09.000000000 +0400 @@ -4,7 +4,7 @@ %= $c->render_to_string(inline => l('pse_DESCRIPTION')); - %= form_for '/pseudonyms2' => (method => 'GET') => begin + %= form_for '/pseudonyms' => (method => 'POST') => begin %= hidden_field 'trt' => 'ADD' diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep 2020-11-19 11:53:26.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep 2021-06-14 20:16:16.000000000 +0400 @@ -110,9 +110,8 @@

% if ( $usr_datas->{trt} eq 'UPD' and $c->ipsec_for_acct eq 'OK' ) { - % my $url = '/useraccountsd?TRT=CRT&user=' . $usr_datas->{user}; % my $btn2 = $c->l('DOWNLOAD'); - %= form_for $url => (method => 'GET') => begin + %= form_for '/useraccountso' => (method => 'POST') => begin

%=l 'usr_LABEL_IPSECRW_DOWNLOAD' @@ -120,6 +119,8 @@ %= submit_button $btn2, class => 'action'

+ %= hidden_field 'trt' => 'CRT' + %= hidden_field 'user' => $usr_datas->{user} %end % } diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_usr_upds.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_usr_upds.html.ep --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/partials/_usr_upds.html.ep 2021-06-14 12:13:15.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/partials/_usr_upds.html.ep 2021-06-14 20:20:18.000000000 +0400 @@ -62,9 +62,8 @@

% if ( $c->ipsec_for_acct eq 'OK' ) { - % my $url = '/useraccountsd?TRT=CRT&user=' . $usr_datas->{user}; % my $btn2 = $c->l('DOWNLOAD'); - %= form_for $url => (method => 'GET') => begin + %= form_for '/useraccountso' => (method => 'POST') => begin

%=l 'usr_LABEL_IPSECRW_DOWNLOAD' @@ -72,6 +71,8 @@ %= submit_button $btn2, class => 'action'

+ %= hidden_field 'trt' => 'CRT' + %= hidden_field 'user' => $usr_datas->{user} %end % } diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/viewlogfiles2.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/viewlogfiles2.html.ep --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/viewlogfiles2.html.ep 2021-06-14 12:13:14.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/viewlogfiles2.html.ep 2021-06-14 17:57:32.000000000 +0400 @@ -18,7 +18,7 @@

<% my $btn = l('log_REFRESH'); %> - %= form_for 'viewlogfilesr' => (method => 'GET') => begin + %= form_for 'viewlogfilesr' => (method => 'POST') => begin %= submit_button "$btn", class => 'action' %= hidden_field 'trt' => $log_datas->{trt} %= hidden_field 'Filename' => $log_datas->{filename} diff -urN smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/yum.html.ep smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/yum.html.ep --- smeserver-manager-0.1.2.old/root/usr/share/smanager/themes/default/templates/yum.html.ep 2020-11-19 11:53:26.000000000 +0400 +++ smeserver-manager-0.1.2/root/usr/share/smanager/themes/default/templates/yum.html.ep 2021-06-15 12:26:09.204000000 +0400 @@ -18,11 +18,6 @@ %} - - - % if ( $c->is_empty('updates') ) {

%=l 'yum_TITLE_UPTODATE' @@ -38,25 +33,25 @@ %=l 'yum_DESC_UPDATES_AVAILABLE'


- %= form_for 'yumu' => (method => 'GET') => begin + %= form_for 'yum' => (method => 'POST') => begin %= hidden_field 'trt' => 'UPDT' - %= submit_button $c->l('yum_BUTTON_INSTALL_UPDATES'), class => 'action2' + %= submit_button $c->l('yum_BUTTON_INSTALL_UPDATES'), class => 'action' % end %} % if ( $c->non_empty('available') ) { - %= form_for 'yumu' => (method => 'GET') => begin + %= form_for 'yum' => (method => 'POST') => begin
%= hidden_field 'trt' => 'INST' - %= submit_button $c->l('yum_BUTTON_INSTALL_AVAILABLE'), class => 'action2' + %= submit_button $c->l('yum_BUTTON_INSTALL_AVAILABLE'), class => 'action' % end %} % if ( $c->non_empty('installed') ) { - %= form_for 'yumu' => (method => 'GET') => begin + %= form_for 'yum' => (method => 'POST') => begin
%= hidden_field 'trt' => 'REMO' - %= submit_button $c->l('yum_BUTTON_REMOVE'), class => 'action2' + %= submit_button $c->l('yum_BUTTON_REMOVE'), class => 'action' % end %} @@ -96,7 +91,7 @@ %= hidden_field 'trt' => 'CONF'
- %= submit_button $c->l('yum_BUTTON_CONFIGURATION'), class => 'action2' + %= submit_button $c->l('yum_BUTTON_CONFIGURATION'), class => 'action' % end