diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Backup.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Backup.pm --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Backup.pm 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Backup.pm 2020-04-26 23:19:13.000000000 +0400 @@ -154,12 +154,11 @@ my $res = desktopBackup(); $result .= $res unless $res eq 'OK'; if ( ! $result ) { - $bac_datas{function} = 'SUC'; $result = $c->l('bac_SUCCESS'); $c->app->log->info('desktop backup LAUNCHED'); $c->flash(success => $result); } else { - $c->flash(error => $result); + $c->stash(error => $result); } $c->redirect_to("backup"); } @@ -238,10 +237,9 @@ # should not happen !! no desktop_backup template !! - my $res = desktopBackup(); + $res = desktopBackup(); $result .= $res unless $res eq 'OK'; if ( ! $result ) { - $bac_datas{function} = 'SUC'; $result = $c->l('bac_SUCCESS'); $c->stash( notif => $result ); $c->redirect_to("/backup"); @@ -310,13 +308,13 @@ ##$result .= ' ** Blocked for testing ** !'; + $res = ''; if ( ! $result ) { $res = $c->updateTapeBackupConfig($status, $backupHour, $backupMin, $bampm, $reminderHour, $reminderMin, $rampm); $result .= $res unless $res eq 'OK'; if ( ! $result ) { - $bac_datas{function} = 'SUC'; if (defined $status && $status eq "on") { $result .= ($c->l('bac_SUCCESSFULLY_ENABLED_TAPE').' '. $c->l('bac_WITH_BACKUP_TIME')."$backupHour:$backupMin".' '. @@ -341,11 +339,11 @@ $result .= ' ** Blocked for testing ** ! (HARD TO TEST!)'; + $res = ''; if ( ! $result ) { - my $res = $c->tapeRestore( $lock_file, $file_handle ); + $res = $c->tapeRestore( $lock_file, $file_handle ); $result .= $res unless $res eq 'OK'; if ( ! $result ) { - $bac_datas{function} = 'SUC'; $result = $c->l('bac_SUCCESS'); } } @@ -362,11 +360,11 @@ $result .= ' ** Blocked for testing ** !'; + $res = ''; if ( ! $result ) { $res = $c->workstnConfigure(); $result .= $res unless $res eq 'OK'; if ( ! $result ) { - $bac_datas{function} = 'SUC'; $result = $c->l('bac_SUCCESS'); } } @@ -383,11 +381,11 @@ $result .= ' ** Blocked for testing ** !'; + $res = ''; if ( ! $result ) { $res = $c->workstnVerify(); $result .= $res unless $res eq 'OK'; if ( ! $result ) { - $bac_datas{function} = 'SUC'; $result = $c->l('bac_SUCCESS'); } } @@ -408,7 +406,6 @@ $res = $c->workstnRestore(); $result .= $res unless $res eq 'OK'; if ( ! $result ) { - $bac_datas{function} = 'SUC'; $result = $c->l('bac_SUCCESS'); } } @@ -425,32 +422,29 @@ $result .= ' ** Blocked for testing ** !'; + $res = ''; if ( ! $result ) { $res = $c->workstnSelRestore(); $result .= $res unless $res eq 'OK'; if ( ! $result ) { - $bac_datas{function} = 'SUC'; $result = $c->l('bac_SUCCESS'); } } } - # common part for all functions - $c->stash( title => $title, bac_datas => \%bac_datas ); - if ($bac_datas{function} ne 'SUC') { - $c->flash(error => $result); - $bac_datas{'function'} = $function; - $dest = "back_$function"; - return $c->render(template => $dest); + if ($res ne 'OK') { + $c->stash( error => $result ); + $c->stash( title => $title, bac_datas => \%bac_datas ); + my $dest = "back_$function"; + return $c->render($dest); } - my $message = $function . ' updates DONE'; + my $message = "'Backup' $function updates DONE"; $c->app->log->info($message); $c->flash(success => $result); - #return to 'backup' route !!! $c->redirect_to('backup'); }; diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Clamav.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Clamav.pm --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Clamav.pm 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Clamav.pm 2020-04-25 20:14:49.000000000 +0400 @@ -28,16 +28,10 @@ my $title = $c->l('clm_FORM_TITLE'); my $modul = $c->render_to_string(inline => $c->l('clm_DESC_FILESYSTEM_SCAN_PERIOD')); -# $clm_datas{'FilesystemScan'} = get_prop('clamav','FilesystemScan') || 'disabled'; -# $clm_datas{'Quarantine'} = get_prop('clamav','Quarantine') || 'disabled'; $clm_datas{'FilesystemScan'} = ($db->get_prop('clamav','FilesystemScan')) || 'disabled'; $clm_datas{'Quarantine'} = ($db->get_prop('clamav','Quarantine')) || 'disabled'; $clm_datas{'clam_versions'} = get_clam_versions(); -# value="get_prop('clamav','HTTPProxyServer')"> -# value="get_prop('clamav','HTTPProxyPort')"> -# value="get_prop('clamav','HTTPProxyUsername')"> -# value="get_prop('clamav','HTTPProxyPassword')"> $c->stash( title => $title, modul => $modul, clm_datas => \%clm_datas ); $c->render(template => 'clamav'); @@ -53,22 +47,20 @@ my $result = ""; -# $squid->set_prop('status', $http_clamav_status); -# $smtpd->set_prop('Clamav', $smtp_clamav_status); - change_settings($c); + $c->change_settings(); - # # Update the system - # system("/sbin/e-smith/signal-event clamav-update") == 0 or $result = $c->l('clm_ERROR_UPDATING_CONFIGURATION'); - my $title = $c->l('clm_FORM_TITLE'); - - if ( $result eq '' ) { $result = $c->l('clm_SUCCESS') ; } + if ( ! $result ) { + $result = $c->l('clm_SUCCESS') ; + $c->flash( success => $result ); + } else { + $c->flash( error => $result ); + } - $c->stash( title => $title, modul => $result ); - $c->render(template => 'module'); + $c->redirect_to('/clamav'); }; diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Domains.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Domains.pm --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Domains.pm 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Domains.pm 2020-04-26 01:03:20.000000000 +0400 @@ -39,9 +39,8 @@ my %dom_datas = (); my $title = $c->l('dom_FORM_TITLE'); - my $notif = ''; - $dom_datas{trt} = 'LIST'; + $dom_datas{trt} = 'LST'; my @domains; for ($ddb->domains()) @@ -56,7 +55,7 @@ $dom_datas{forwarder} = $cdb->get_prop('dnscache', 'Forwarder'); $dom_datas{forwarder2} = $cdb->get_prop('dnscache', 'Forwarder2') || ''; - $c->stash( title => $title, notif => $notif, dom_datas => \%dom_datas, domains => \@domains ); + $c->stash( title => $title, dom_datas => \%dom_datas, domains => \@domains ); $c->render(template => 'domains'); }; @@ -71,19 +70,22 @@ my $trt = $c->param('trt'); my $domain = $c->param('Domain') || ''; - $trt = 'DEL' if ( $rt eq 'domaindel1' ); - $trt = 'UPD' if ( $rt eq 'domainupd1' ); - $trt = 'UP2' if ( $rt eq 'domainup21' ); - $trt = 'ADD' if ( $rt eq 'domainadd1' ); + #$trt = 'DEL' if ( $rt eq 'domaindel1' ); + #$trt = 'UPD' if ( $rt eq 'domainupd1' ); + #$trt = 'UP2' if ( $rt eq 'domainup21' ); + #$trt = 'ADD' if ( $rt eq 'domainadd1' ); my %dom_datas = (); my $title = $c->l('dom_FORM_TITLE'); - my $notif = ''; + my $result = ''; $dom_datas{'trt'} = $trt; + if ( $trt ne 'ADD' and $trt ne 'UPD' and $trt ne 'UP2' and $trt ne 'DEL' ) { + $result = "Trt unknown ( $trt ) !" + } if ( $trt eq 'ADD' ) { - + #nothing } if ( $trt eq 'UPD' ) { @@ -95,7 +97,7 @@ $dom_datas{content} = $rec->prop('Content') || ''; $dom_datas{nameservers} = $rec->prop('Nameservers') || 'internet'; } else { - $notif = "Domain $domain not found !" + $result = "Domain $domain not found !" } } @@ -115,7 +117,7 @@ } } - if ( $trt eq 'LIST' ) { + if ( $trt eq 'LST' ) { my @domains; if ($adb) { @domains = $ddb->domains(); @@ -124,7 +126,10 @@ } - $c->stash( title => $title, notif => $notif, dom_datas => \%dom_datas ); + if ( ! $result ) { + $c->stash( error => $result ); + } + $c->stash( title => $title, dom_datas => \%dom_datas ); $c->render( template => 'domains' ); }; @@ -136,10 +141,10 @@ $c->app->log->info($c->log_req); my $rt = $c->current_route; - my $trt = ($c->param('trt') || 'LIST'); + my $trt = $c->param('trt'); my %dom_datas = (); - my $result = ''; + my ($res, $result) = ''; #my $domain = uri_unescape($c->param('domain')); my $domain = $c->param('Domain'); @@ -149,20 +154,19 @@ my $account = $c->param('Account'); # controls (validate ?????) - my $res = ''; - # validate_new_domain_name( $c, $domain, $account ); - $result .= $res unless $res eq 'OK'; + #? validate_new_domain_name( $c, $domain, $account ); + #$result .= $res unless $res eq 'OK'; #$result .= ' blocked'; + $res = ''; if ( ! $result ) { - $res = create_modify_domain( $c, 'create', $domain ); + $res = $c->create_modify_domain( 'create', $domain ); $result .= $res unless $res eq 'OK'; } if ( ! $result ) { - $result = $c->l('dom_CREATE_SUCCEEDED') . ' ' . $domain; - $trt = 'SUC'; + $result = $c->l('dom_CREATE_SUCCEEDED') . " $domain"; } } @@ -172,23 +176,20 @@ my $content = $c->param('Content'); my $nameservers = $c->param('Nameservers'); - #my %props = ('Account' => $account); - # controls - my $res = ''; #$res = validate_description( $c, $account ); - $result .= $res unless $res eq 'OK'; + #$result .= $res unless $res eq 'OK'; #$result .= 'blocked'; + $res = ''; if ( ! $result ) { - $res = create_modify_domain( $c, 'update', $domain ); + $res = $c->create_modify_domain( 'modify', $domain ); $result .= $res unless $res eq 'OK'; } if ( ! $result ) { - $result = $c->l('dom_MODIFY_SUCCEEDED') . ' ' . $domain; - $trt = 'SUC'; + $result = $c->l('dom_MODIFY_SUCCEEDED') . " $domain"; } } @@ -199,23 +200,22 @@ my $forwarder2 = $c->param('Forwarder2'); # controls - my $res = ''; - $res = ip_number_or_blank( $c, $forwarder); + $res = $c->ip_number_or_blank( $forwarder ); $result .= $res unless $res eq 'OK'; - $res = ip_number_or_blank( $c, $forwarder2); + $res = $c->ip_number_or_blank( $forwarder2 ); $result .= $res unless $res eq 'OK'; #$result .= 'blocked'; + $res = ''; if ( ! $result ) { - my $res = modify_dns( $c, $forwarder, $forwarder2 ); + $res = $c->modify_dns( $forwarder, $forwarder2 ); $result .= $res unless $res eq 'OK'; } if ( ! $result ) { - $result = $c->l('SUCCESS') . ' ' . $domain; - $trt = 'SUC'; + $result = $c->l('SUCCESS') . " $forwarder $forwarder2"; } } @@ -223,34 +223,38 @@ if ( $trt eq 'DEL' ) { # controls - my $res = ''; #$res = validate_is_domain($c, $domain); - $result .= $res unless $res eq 'OK'; + #$result .= $res unless $res eq 'OK'; #$result .= 'blocked'; + $res = ''; if ( ! $result ) { - my $res = delete_domain( $c, $domain ); + $res = $c->delete_domain( $domain ); $result .= $res unless $res eq 'OK'; } if ( ! $result ) { - $result = $c->l('dom_REMOVE_SUCCEEDED') . ' ' . $domain; - $trt = 'SUC'; + $result = $c->l('dom_REMOVE_SUCCEEDED') . " $domain"; } } - my $title = $c->l('dom_FORM_TITLE'); - $dom_datas{'domain'} = $domain; - $dom_datas{'trt'} = $trt; + # common parts + + if ($res ne 'OK') { + my $title = $c->l('dom_FORM_TITLE'); + $dom_datas{'domain'} = $domain; + $dom_datas{'trt'} = $trt; -# $c->stash( title => $title, notif => $result ); -# $c->render(template => 'module'); - $c->stash( title => $title, notif => $result, dom_datas => \%dom_datas ); - if ($dom_datas{trt} ne 'SUC') { - return $c->render(template => 'domains'); + $c->stash( error => $result . "($res)" ); + $c->stash( title => $title, dom_datas => \%dom_datas ); + return $c->render( 'domains' ); } - $c->redirect_to('/domains'); + my $message = "'Domains' updates ($trt) DONE"; + $c->app->log->info($message); + + $c->flash( success => $result ); + $c->redirect_to('/domains'); }; @@ -261,8 +265,8 @@ $domain = $1 if ($domain =~ /^($REGEXP_DOMAIN)$/); unless ($domain) { - return $c->l($action eq 'create' ? 'dom_ERROR_CREATING_DOMAIN' - : 'dom_ERROR_MODIFYING_DOMAIN'); + return ($c->l($action eq 'create' ? 'dom_ERROR_CREATING_DOMAIN' + : 'dom_ERROR_MODIFYING_DOMAIN') . ' Ctl'); } my $rec = $ddb->get($domain); @@ -278,12 +282,10 @@ $props{$_} = $c->param($_) for ( qw(Content Description Nameservers) ); $rec->merge_props(%props); - my $status = system( "/sbin/e-smith/signal-event", - "domain-$action", "$domain" ); - - if ($status) { - return ($action eq 'create' ? 'dom_ERROR_CREATING_DOMAIN' - : 'dom_ERROR_MODIFYING_DOMAIN'); + if ( system( "/sbin/e-smith/signal-event", + "domain-$action", "$domain" ) != 0 ) { + return ($c->l($action eq 'create' ? 'dom_ERROR_CREATING_DOMAIN' + : 'dom_ERROR_MODIFYING_DOMAIN') . " Exe $action"); } return 'OK'; @@ -295,18 +297,49 @@ my ($c, $domain) = @_; $domain = $1 if ($domain =~ /^($REGEXP_DOMAIN)$/); - return ($c->l('dom_ERROR_WHILE_REMOVING_DOMAIN')) unless ($domain); + return ($c->l('dom_ERROR_WHILE_REMOVING_DOMAIN') . ' Ctl') unless ($domain); my $rec = $ddb->get($domain); return ($c->l('dom_NONEXISTENT_DOMAIN_ERROR')) if (not $rec); $rec->set_prop('type', 'domain-deleted'); - if (system("/sbin/e-smith/signal-event", "domain-delete", "$domain") == 0) { - $rec->delete; - return 'OK'; + if (system("/sbin/e-smith/signal-event", "domain-delete", "$domain") != 0) { + return ($c->l('dom_ERROR_WHILE_REMOVING_DOMAIN') . 'Exe'); + } + + $rec->delete; + return 'OK'; +} + + +sub modify_dns { + + my ($c, $forwarder, $forwarder2) = @_; + + my $dnscache = $cdb->get('dnscache'); + + ($forwarder, $forwarder2) = ($forwarder2, '') + if ($forwarder2 and not $forwarder); + + if ($forwarder) { + $dnscache->set_prop('Forwarder', $forwarder); + } else { + $dnscache->delete_prop('Forwarder'); + } + + if ($forwarder2) { + $dnscache->set_prop('Forwarder2', $forwarder2); + } else { + $dnscache->delete_prop('Forwarder2'); + } + + unless ( system( "/sbin/e-smith/signal-event", "dns-update" ) == 0 ) + { + return $c->l('dom_ERROR_UPDATING'); } - return ($c->l('dom_ERROR_WHILE_REMOVING_DOMAIN')); + + return 'OK'; } @@ -466,34 +499,4 @@ -sub modify_dns { - - my ($c, $forwarder, $forwarder2) = @_; - - my $dnscache = $cdb->get('dnscache'); - - ($forwarder, $forwarder2) = ($forwarder2, '') - if ($forwarder2 and not $forwarder); - - if ($forwarder) { - $dnscache->set_prop('Forwarder', $forwarder); - } else { - $dnscache->delete_prop('Forwarder'); - } - - if ($forwarder2) { - $dnscache->set_prop('Forwarder2', $forwarder2); - } else { - $dnscache->delete_prop('Forwarder2'); - } - - unless ( system( "/sbin/e-smith/signal-event", "dns-update" ) == 0 ) - { - return $c->l('dom_ERROR_UPDATING'); - } - - return 'OK'; -} - - 1; diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Emailsettings.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Emailsettings.pm --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Emailsettings.pm 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Emailsettings.pm 2020-04-25 20:58:08.000000000 +0400 @@ -133,7 +133,6 @@ $res = $c->change_settings_access(); $result .= $res unless $res eq 'OK'; if ( ! $result ) { - $mai_datas{trt} = 'SUC'; $result = $c->l('mai_SUCCESS'); } } @@ -152,7 +151,6 @@ $res = $c->change_settings_filtering(); $result .= $res unless $res eq 'OK'; if ( ! $result ) { - $mai_datas{trt} = 'SUC'; $result = $c->l('mai_SUCCESS'); } } @@ -171,7 +169,6 @@ $res = $c->change_settings_reception(); $result .= $res unless $res eq 'OK'; if ( ! $result ) { - $mai_datas{trt} = 'SUC'; $result = $c->l('mai_SUCCESS'); } } @@ -184,35 +181,42 @@ # controls $res = $c->ip_number_or_blank( $c->param('DelegateMailServer') ); - $result .= $res . ' DMS ' unless $res eq 'OK'; + $result .= $res . ' DMS
' unless $res eq 'OK'; $res = $c->validate_smarthost( $c->param('SMTPSmartHost') ); - $result .= $res . ' SH ' unless $res eq 'OK'; + $result .= $res . ' SH
' unless $res eq 'OK'; $res = $c->nonblank_if_smtpauth( $c->param('SMTPSmartHost') ); - $result .= $res . ' SH ' unless $res eq 'OK'; + $result .= $res . ' SH
' unless $res eq 'OK'; $res = $c->nonblank_if_smtpauth( $c->param('SMTPAUTHPROXY_Userid') ); - $result .= $res . ' USR ' unless $res eq 'OK'; + $result .= $res . ' USR
' unless $res eq 'OK'; $res = $c->nonblank_if_smtpauth( $c->param('SMTPAUTHPROXY_Passwd') ); - $result .= $res . ' PWD ' unless $res eq 'OK'; + $result .= $res . ' PWD
' unless $res eq 'OK'; if ( ! $result ) { $res = $c->change_settings_delivery(); $result .= $res unless $res eq 'OK'; if ( ! $result ) { - $mai_datas{trt} = 'SUC'; $result = $c->l('mai_SUCCESS'); } } } - $c->stash( title => $title, notif => $result, mai_datas => \%mai_datas ); - if ($mai_datas{trt} ne 'SUC') { - return $c->render(template => $dest); + # common part + + if ($res ne 'OK') { + $c->stash( error => $result ); + $c->stash( title => $title, mai_datas => \%mai_datas ); + return $c->render( $dest ); } + + my $message = "emailsettings updates $trt DONE"; + $c->app->log->info($message); + $c->flash( success => $result ); + $c->redirect_to("/emailsettings"); }; diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Groups.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Groups.pm --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Groups.pm 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Groups.pm 2020-04-26 21:22:53.000000000 +0400 @@ -31,17 +31,15 @@ my %grp_datas = (); my $title = $c->l('grp_FORM_TITLE'); - my $notif = ''; - $grp_datas{trt} = 'LIST'; + $grp_datas{trt} = 'LST'; my @groups; - if ($adb) - { + if ($adb) { @groups = $adb->groups(); } - $c->stash( title => $title, notif => $notif, grp_datas => \%grp_datas, groups => \@groups ); + $c->stash( title => $title, grp_datas => \%grp_datas, groups => \@groups ); $c->render(template => 'groups'); }; @@ -53,21 +51,16 @@ $c->app->log->info($c->log_req); my $rt = $c->current_route; - my $trt = ($c->param('trt') || 'LIST'); - my $group = $c->param('group') || ''; - - $trt = 'DEL' if ( $rt eq 'groupdel1' ); - $trt = 'UPD' if ( $rt eq 'groupupd1' ); - $trt = 'ADD' if ( $rt eq 'groupadd1' ); + my $trt = ($c->param('trt') || 'LST'); + my $group = $c->param('group'); my %grp_datas = (); my $title = $c->l('grp_FORM_TITLE'); - my $notif = ''; $grp_datas{'trt'} = $trt; if ( $trt eq 'ADD' ) { - + #nothing } @@ -75,14 +68,14 @@ my %members = (); my %users = (); - + my $rec = $adb->get($group); if ($rec and $rec->prop('type') eq 'group') { $grp_datas{group} = $group; $grp_datas{description} = $rec->prop('Description') || ''; - %members = @{gen_members_list( $c, $group )}; + %members = @{$c->gen_members_list( $group )}; } $c->stash( members => \%members, users => \%users ); @@ -101,18 +94,18 @@ $grp_datas{group} = $group; $grp_datas{description} = $rec->prop('Description') || ''; - %members = @{gen_members_list($c, $group)}; + %members = @{$c->gen_members_list($group)}; - %ibays = @{gen_ibays_list($c, $group)}; + %ibays = @{$c->gen_ibays_list($group)}; } - $c->stash( grp_datas => \%grp_datas, members => \%members, ibays => \%ibays ); + $c->stash( members => \%members, ibays => \%ibays ); } - if ( $trt eq 'LIST' ) { + if ( $trt eq 'LST' ) { my @groups; if ($adb) { @groups = $adb->groups(); @@ -122,7 +115,7 @@ } - $c->stash( title => $title, notif => $notif, grp_datas => \%grp_datas ); + $c->stash( title => $title, grp_datas => \%grp_datas ); $c->render( template => 'groups' ); }; @@ -134,42 +127,46 @@ $c->app->log->info($c->log_req); my $rt = $c->current_route; - my $trt = ($c->param('trt') || 'LIST'); + my $trt = ($c->param('trt') || 'LST'); + my $groupName = $c->param('groupName') || ''; - my %grp_datas = (); my $title = $c->l('grp_FORM_TITLE'); my ($res, $result) = ''; - my $groupName = $c->param('groupName'); + + my %grp_datas = (); + $grp_datas{'trt'} = $trt; + $grp_datas{'group'} = $groupName; + my @members = (); if ( $trt eq 'ADD' ) { my $groupDesc = $c->param('groupDesc'); - my @members = @{$c->every_param('groupMembers')}; - + @members = @{$c->every_param('groupMembers')}; my $members = join ( ",", @members ); - # controls (validate ?????) - $res = validate_group( $c, $groupName ); - $result .= $res unless $res eq 'OK'; + # controls + $res = $c->validate_group( $groupName ); + $result .= $res . '
' unless $res eq 'OK'; - $res = validate_group_length( $c, $groupName ); - $result .= $res unless $res eq 'OK'; + $res = $c->validate_group_length( $groupName ); + $result .= $res . '
' unless $res eq 'OK'; - $res = validate_group_naming_conflict( $c, $groupName ); - $result .= $res unless $res eq 'OK'; + $res = $c->validate_group_naming_conflict( $groupName ); + $result .= $res . '
' unless $res eq 'OK'; - $res = validate_description( $c, $groupDesc ); - $result .= $res unless $res eq 'OK'; + $res = $c->validate_description( $groupDesc ); + $result .= $res . '
' unless $res eq 'OK'; - $res = validate_group_has_members( $c, @members ); - $result .= $res unless $res eq 'OK'; + $res = $c->validate_group_has_members( @members ); + $result .= $res . '
' unless $res eq 'OK'; my %props = ( 'type', 'group', 'Description', $groupDesc, 'Members', $members ); + $res = ''; if ( ! $result ) { $adb->new_record( $groupName, \%props ); @@ -177,31 +174,31 @@ # Untaint groupName before use in system() ($groupName) = ($groupName =~ /^([a-z][\-\_\.a-z0-9]*)$/); - system("/sbin/e-smith/signal-event", "group-create", "$groupName") ==0 + system("/sbin/e-smith/signal-event", "group-create", "$groupName") == 0 or $result .= $c->l('qgp_CREATE_ERROR')."\n"; - } - if ( ! $result ) { $result = $c->l('grp_CREATED_GROUP') . ' ' . $groupName; - $trt = 'SUC'; + $res = 'OK'; } } + if ( $trt eq 'UPD' ) { my $groupDesc = $c->param('groupDesc'); - my @members = @{$c->every_param('groupMembers')}; + @members = @{$c->every_param('groupMembers')}; my $members = join ( ",", @members ); # controls - my $res = ''; + $res = ''; $res = validate_description( $c, $groupDesc ); - $result .= $res unless $res eq 'OK'; + $result .= $res . '
' unless $res eq 'OK'; $res = validate_group_has_members( $c, @members ); - $result .= $res unless $res eq 'OK'; + $result .= $res . '
' unless $res eq 'OK'; + $res = ''; if ( ! $result ) { $adb->get($groupName)->set_prop( 'Members', $members ); @@ -212,15 +209,15 @@ system("/sbin/e-smith/signal-event", "group-modify", "$groupName") ==0 or $result .= $c->l('qgp_MODIFY_ERROR')."\n"; - } if ( ! $result ) { - $result = $c->l('grp_MODIFIED_GROUP') . ' ' . $groupName; - $trt = 'SUC'; + $result = $c->l('grp_MODIFIED_GROUP') . ' ' . $groupName; + $res = 'OK'; } } + if ( $trt eq 'DEL' ) { if ($groupName =~ /^([a-z][\-\_\.a-z0-9]*)$/) { @@ -232,28 +229,35 @@ my $rec = $adb->get($groupName); $result .= $c->l('grp_ERR_INTERNAL_FAILURE') . ':' . $groupName unless ($rec); + $res = ''; if ( ! $result ) { - my $res = delete_group( $c, $groupName ); + $res = delete_group( $c, $groupName ); $result .= $res unless $res eq 'OK'; if ( ! $result ) { $result = $c->l('grp_DELETED_GROUP') . ' ' . $groupName; - $trt = 'SUC'; + $res = 'OK'; } } } - $grp_datas{'group'} = $groupName; - $grp_datas{'trt'} = $trt; + # common parts - $c->stash( title => $title, notif => $result, grp_datas => \%grp_datas ); - if ($grp_datas{trt} ne 'SUC') { - return $c->render(template => 'groups'); + if ($res ne 'OK') { + $c->stash( error => $result ); + my %members = @{$c->gen_members_list($groupName)}; + $c->stash( title => $title, members => \%members, grp_datas => \%grp_datas ); + return $c->render('groups'); } - $c->redirect_to('/groups'); + my $message = "'Groups' updates ($trt) DONE"; + $c->app->log->info($message); + $c->flash( success => $result ); + + $c->redirect_to('/groups'); }; + sub delete_group { my ( $c, $groupName ) = @_; @@ -265,7 +269,7 @@ ($groupName) = ($groupName =~ /^([a-z][\-\_\.a-z0-9]*)$/); return (system ("/sbin/e-smith/signal-event", "group-delete", "$groupName") || - !$adb->get($groupName)->delete()) ? + ! $adb->get($groupName)->delete()) ? $c->l('DELETE_ERROR') : 'OK'; } diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Printers.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Printers.pm --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Printers.pm 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Printers.pm 2020-04-26 12:55:00.000000000 +0400 @@ -28,7 +28,6 @@ my %prt_datas = (); my $title = $c->l('prt_FORM_TITLE'); - my $modul = ''; $prt_datas{'trt'} = 'LIST'; @@ -38,7 +37,7 @@ @printerDrivers = $adb->printers(); } - $c->stash( title => $title, modul => $modul, prt_datas => \%prt_datas, printerDrivers => \@printerDrivers ); + $c->stash( title => $title, prt_datas => \%prt_datas, printerDrivers => \@printerDrivers ); $c->render(template => 'printers'); }; @@ -52,18 +51,17 @@ my $trt = ($c->param('trt') || 'LIST'); my $printer = $c->param('printer') || ''; - $trt = 'DEL' if ( $printer ); - $trt = 'ADD' if ( $rt eq 'printeradd' ); + #$trt = 'DEL' if ( $printer ); + #$trt = 'ADD' if ( $rt eq 'printeradd' ); my %prt_datas = (); my $title = $c->l('prt_FORM_TITLE'); - my $modul = ''; $prt_datas{'trt'} = $trt; if ( $trt eq 'ADD' ) { - # 'locations list' (call printerLocation_list() within template) + # nothing } @@ -87,7 +85,7 @@ } - $c->stash( title => $title, modul => $modul, prt_datas => \%prt_datas ); + $c->stash( title => $title, prt_datas => \%prt_datas ); $c->render( template => 'printers' ); }; @@ -101,13 +99,11 @@ my $rt = $c->current_route; my $trt = ($c->param('trt') || 'LIST'); -# if ( $trt =~ /^([A-Z]3)$/ ) { -# $trt = $1; -# } else { -# return $c->l('prt_ERR_INPUT_CODE') . ': ' . $trt; -# } + my %prt_datas = (); + my $title = $c->l('prt_FORM_TITLE'); + $prt_datas{'trt'} = $trt; - my $result = ''; + my ($res, $result) = ''; if ( $trt eq 'ADD' ) { @@ -116,23 +112,21 @@ my $location = ($c->param('Location') || ''); # controls - my $res = validate_printer( $c, $name, $description, $location ); + $res = $c->validate_printer( $name, $description, $location ); $result .= $res unless $res eq 'OK'; if ( $location eq 'remote' and ! $result) { - my %prt_datas = (); - my $title = $c->l('prt_FORM_TITLE'); - my $modul = ''; $prt_datas{'trt'} = 'NET'; $prt_datas{'name'} = $name; $prt_datas{'description'} = $description; $prt_datas{'location'} = $location; - $c->stash( title => $title, modul => $modul, prt_datas => \%prt_datas ); + $c->stash( title => $title, prt_datas => \%prt_datas ); return $c->render( template => 'printers' ); } + $res = ''; if ( ! $result ) { - $res = new_printer( $c, $name, $description, $location ); + $res = $c->new_printer( $name, $description, $location ); #$remoteName, $address ); $result .= $res unless $res eq 'OK'; if ( ! $result ) { @@ -149,12 +143,17 @@ my $remoteName = ($c->param ('RemoteName') || ''); my $address = ($c->param ('Address') || ''); + $prt_datas{'name'} = $name; + $prt_datas{'description'} = $description; + $prt_datas{'location'} = $location; + # controls - my $res = validate_network( $c, $location, $remoteName, $address); + $res = $c->validate_network( $location, $remoteName, $address); $result .= $res unless $res eq 'OK'; + $res = ''; if ( ! $result ) { - $res = new_printer( $c, $name, $description, $location, $remoteName, $address ); + $res = $c->new_printer( $name, $description, $location, $remoteName, $address ); $result .= $res unless $res eq 'OK'; if ( ! $result ) { $result = $c->l('prt_CREATED_SUCCESSFULLY') . ' ' . $name; @@ -175,8 +174,9 @@ my $rec = $adb->get($printer); $result .= $c->l('prt_ERR_INTERNAL_FAILURE') . ':' . $printer unless ($rec); + $res = ''; if ( ! $result ) { - my $res = del_printer( $c, $printer ); + $res = $c->del_printer( $printer ); $result .= $res unless $res eq 'OK'; if ( ! $result ) { $result = $c->l('prt_DELETED_SUCCESSFULLY') . ' ' . $printer; @@ -184,10 +184,20 @@ } } - my $title = $c->l('prt_FORM_TITLE'); + # common parts + + if ($res ne 'OK') { + $c->stash( error => $result ); + $c->stash( title => $title, prt_datas => \%prt_datas ); + return $c->render('printers'); + } + + my $message = "'Printers' updates ($trt) DONE"; + $c->app->log->info($message); + $c->flash( success => $result ); + #$c->flash( error => 'No changes applied !!' ); # for testing purpose - $c->stash( title => $title, modul => $result ); - $c->render(template => 'module'); + $c->redirect_to('/printers'); }; diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Pseudonyms.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Pseudonyms.pm --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Pseudonyms.pm 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Pseudonyms.pm 2020-04-26 16:37:25.000000000 +0400 @@ -36,7 +36,7 @@ my $title = $c->l('pse_FORM_TITLE'); my $notif = ''; - $pse_datas{trt} = 'LIST'; + $pse_datas{trt} = 'LST'; my @pseudonyms; if ($adb) @@ -44,24 +44,6 @@ @pseudonyms = $adb->pseudonyms(); } -# foreach my $i (0 .. $#pseudonyms) { -# if ( $pseudonyms[$i]->prop('type') eq 'pseudonym' ) { -# my $account = $pseudonyms[$i]->prop('Account'); -# my $accountO = $account; -# $account = "Administrator" if ($account eq "admin"); -# $account = $c->l("pse_EVERYONE") if ($account eq "shared"); -# my $visible = $pseudonyms[$i]->prop('Visible'); -# $account .= $c->l("pse_LOCAL_ONLY") -# if (defined $visible && $visible eq "internal"); -# if ( $account ne $accountO ) { -# $c->app->log->info( "pseudo $i: $accountO -> $account " ); -# $pseudonyms[$i] =~ s/$accountO/$account/; -# # . $c->dumper( $pseudonyms[$i] ) ) -# } -# } -# } -# $c->app->log->info("pseudos: " . $c->dumper(@pseudonyms)); - $c->stash( title => $title, notif => $notif, pse_datas => \%pse_datas, pseudonyms => \@pseudonyms ); $c->render(template => 'pseudonyms'); @@ -74,21 +56,15 @@ $c->app->log->info($c->log_req); my $rt = $c->current_route; - my $trt = ($c->param('trt') || 'LIST'); + my $trt = ($c->param('trt') || 'LST'); my $pseudonym = $c->param('pseudonym') || ''; - $trt = 'DEL' if ( $rt eq 'pseudodel1' ); - $trt = 'UPD' if ( $rt eq 'pseudoupd1' ); - $trt = 'ADD' if ( $rt eq 'pseudoadd1' ); - - my %pse_datas = (); my $title = $c->l('pse_FORM_TITLE'); - my $notif = ''; - + my %pse_datas = (); $pse_datas{'trt'} = $trt; if ( $trt eq 'ADD' ) { - + #nothing } if ( $trt eq 'UPD' ) { @@ -114,7 +90,7 @@ } } - if ( $trt eq 'LIST' ) { + if ( $trt eq 'LST' ) { my @pseudonyms; if ($adb) { @pseudonyms = $adb->pseudonyms(); @@ -123,7 +99,7 @@ } - $c->stash( title => $title, notif => $notif, pse_datas => \%pse_datas ); + $c->stash( title => $title, pse_datas => \%pse_datas ); $c->render( template => 'pseudonyms' ); }; @@ -135,40 +111,41 @@ $c->app->log->info($c->log_req); my $rt = $c->current_route; - my $trt = ($c->param('trt') || 'LIST'); + my $trt = ($c->param('trt') || 'LST'); + my $title = $c->l('pse_FORM_TITLE'); my %pse_datas = (); - my $result = ''; + $pse_datas{'trt'} = $trt; + + my ($res, $result) = ''; #my $pseudonym = uri_unescape($c->param('Pseudonym')); my $pseudonym = $c->param('Pseudonym'); + $pse_datas{'pseudonym'} = $pseudonym; if ( $trt eq 'ADD' ) { my $account = $c->param('Account'); - # controls (validate ?????) - my $res = validate_new_pseudonym_name( $c, $pseudonym, $account ); + # controls + $res = $c->validate_new_pseudonym_name( $pseudonym, $account ); $result .= $res unless $res eq 'OK'; #$result .= ' blocked'; + $res = ''; if ( ! $result ) { - $adb->new_record( $pseudonym, { type => 'pseudonym', Account => $account} ) or $result .= "Error occurred while creating pseudonym in database."; - # Untaint $pseudonym before use in system() ($pseudonym) = ($pseudonym =~ /(.+)/); system( "/sbin/e-smith/signal-event", "pseudonym-create", "$pseudonym",) == 0 or $result .= 'pse_CREATE_ERROR.'; - } - if ( ! $result ) { + $res = 'OK'; $result = $c->l('pse_CREATE_SUCCEEDED') . ' ' . $pseudonym; - $trt = 'SUC'; } } @@ -186,62 +163,60 @@ } # controls - #my $res = ''; + #$res = ''; #$res = validate_description( $c, $account ); #$result .= $res unless $res eq 'OK'; #$result .= 'blocked'; + $res = ''; if ( ! $result ) { - $adb->get($pseudonym)->merge_props(%props) or $result .= "Error occurred while modifying pseudonym in database."; - # Untaint $pseudonym before use in system() ($pseudonym) = ($pseudonym =~ /(.+)/); system( "/sbin/e-smith/signal-event", "pseudonym-modify", "$pseudonym",) == 0 or $result .= "Error occurred while modifying pseudonym."; - } - if ( ! $result ) { - $result = $c->l('pse_MODIFY_SUCCEEDED') . ' ' . $pseudonym; - $trt = 'SUC'; + $res = 'OK'; + $result = $c->l('pse_MODIFY_SUCCEEDED') . ' ' . $pseudonym; } } - if ( $trt eq 'DEL' ) { # controls - my $res = ''; + $res = ''; $res = validate_is_pseudonym($c, $pseudonym); $result .= $res unless $res eq 'OK'; #$result .= 'blocked'; + $res = ''; if ( ! $result ) { - my $res = delete_pseudonym( $c, $pseudonym ); + $res = $c->delete_pseudonym( $pseudonym ); $result .= $res unless $res eq 'OK'; if ( ! $result ) { + $res = 'OK'; $result = $c->l('pse_REMOVE_SUCCEEDED') . ' ' . $pseudonym; - $trt = 'SUC'; } } } - my $title = $c->l('pse_FORM_TITLE'); - $pse_datas{'pseudonym'} = $pseudonym; - $pse_datas{'trt'} = $trt; + # common parts -# $c->stash( title => $title, notif => $result ); -# $c->render(template => 'module'); - $c->stash( title => $title, notif => $result, pse_datas => \%pse_datas ); - if ($pse_datas{trt} ne 'SUC') { - return $c->render(template => 'pseudonyms'); + if ( $res ne 'OK' ) { + $c->stash( error => $result); + $c->stash( title => $title, pse_datas => \%pse_datas ); + return $c->render('pseudonyms'); } - $c->redirect_to('/pseudonyms'); + my $message = "'Pseudonyms' updates $trt DONE"; + $c->app->log->info($message); + $c->flash( success => $result ); + + $c->redirect_to('/pseudonyms'); }; @@ -384,30 +359,22 @@ my ($c, $pseudonym, $account) = @_; my $acct = $adb->get($pseudonym); + if (defined $acct) { return($c->l('pse_NAME_IN_USE')); - } - elsif ($pseudonym =~ /@/) - { - use esmith::DomainsDB; + } elsif ($pseudonym =~ /@/) { + use esmith::DomainsDB; my $ddb = esmith::DomainsDB->open_ro or die "Couldn't open DomainsDB\n"; - my ($lhs, $rhs) = split /@/, $pseudonym; - return ($c->l('pse_PSEUDONYM_INVALID_DOMAIN')) unless ($ddb->get($rhs)); + return ($c->l('pse_PSEUDONYM_INVALID_SAMEACCT')) if ($lhs eq $account); + return ('OK'); # p:' . $pseudonym . ' a:' . $account); - return ($c->l('pse_PSEUDONYM_INVALID_SAMEACCT')) - if ($lhs eq $account); - - return ('OK p:' . $pseudonym . ' a:' . $account); - } - elsif ( $pseudonym !~ /^([a-z0-9][a-z0-9\.\-_!#\?~\$\^\+&`%\/\*]*)$/ ) - { + } elsif ( $pseudonym !~ /^([a-z0-9][a-z0-9\.\-_!#\?~\$\^\+&`%\/\*]*)$/ ) { return($c->l('pse_VALID_PSEUDONYM_NAMES')); - } - else { + } else { return('OK'); } } diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Starterwebsite.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Starterwebsite.pm --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Starterwebsite.pm 2020-04-14 13:05:12.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr/Controller/Starterwebsite.pm 2020-04-25 19:49:29.000000000 +0400 @@ -52,15 +52,15 @@ if (change2_settings( $c, $companyname, $header1, $desc1, $header2, $desc2 ) != 0) { $result .= 'Htm file creation error !!'; } - + if ( $result eq '' ) { my $url = "http://www.".$db->get('DomainName')->value(); my $href = "$url"; - $result = $c->render_to_string(inline => $c->l('sws_SUCCESS').'

'.$href); + $result = $c->render_to_string(inline => $c->l('sws_SUCCESS').'
'.$href); } - $c->stash( title => $title, modul => $result ); - $c->render(template => 'module'); + $c->flash( success => $result ); + $c->redirect_to("/"); }; @@ -81,6 +81,7 @@ return 0; } + sub format_page { my ($c, $companyname, $header1, $desc1, $header2, $desc2) = @_; diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr.pm smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr.pm --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr.pm 2020-04-16 15:27:03.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/lib/SrvMngr.pm 2020-04-25 13:19:29.000000000 +0400 @@ -5,8 +5,12 @@ use Mojolicious::Lite; +#has description => 'server manager 2 : mojolicious app'; +#has usage => 'called via apache server cgi mode'; + use utf8; +#use SrvMngr::Navigation; use SrvMngr::I18N; use SrvMngr::Model::Main; @@ -141,8 +145,7 @@ #----------------------------------------------------- my $navigation_ctlr_ignore = - "(\.\.?|Initial\.pm|Manual\.pm|Swttheme\.pm|Request\.pm|Modules\.pm|" . - "Main\.pm|Welcome\.pm|Modsearch\.pm(-.*)?)"; + "(\.\.?|Initial\.pm|Manual\.pm|Swttheme\.pm|Request\.pm|Modules\.pm|Modsearch\.pm(-.*)?)"; my $navigation_cgi_ignore = "(\.\.?|navigation|noframes|online-manual|(internal|pleasewait)(-.*)?)"; @@ -277,6 +280,13 @@ my $c = shift; my $lang = shift || ''; + #sub lg_sp { + #app->log->info("hook_b_r->panel route. lang: $lang namespace: $moduleLong ldir; $I18Ndir"); + #$c->languages( $lang ) if ( defined $lang ); + #$c->i18ns( $moduleLong ); + #return 0; + #} + my $panel = $c->tx->req->url; $panel = '/initial' if ($panel eq ''); @@ -289,11 +299,20 @@ app->log->info("$module $moduleLong $I18Ndir"); if ( -d $I18Ndir ) { - app->log->info("hook_b_r->panel route : lang: $lang namespace: $moduleLong"); - #if ( $module eq 'Manual' or $module eq 'Clamav') { + app->log->info("hook_b_r->panel route. lang: $lang namespace: $moduleLong ldir; $I18Ndir"); + $c->languages( $lang ) if ( defined $lang ); + $c->i18ns( $moduleLong ); + #lg_sp(); + } else { + ( $moduleLong = $moduleLong) =~ s/.$//; + ( $I18Ndir = $I18Ndir) =~ s/.$//; + if ( -d $I18Ndir ) { + app->log->info("hook_b_r->panel route. lang: $lang namespace: $moduleLong ldir; $I18Ndir"); $c->languages( $lang ) if ( defined $lang ); $c->i18ns( $moduleLong ); - #} + } else { + warn "Locale lexicon missing for $module \n"; + } } }; diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/script/srvmngr.pl smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/script/srvmngr.pl --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/script/srvmngr.pl 2020-04-16 14:41:47.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/script/srvmngr.pl 2020-04-27 10:47:14.468000000 +0400 @@ -15,7 +15,7 @@ use FindBin; use lib "$FindBin::Bin/lib"; use lib "$FindBin::Bin/../lib"; -use lib "$FindBin::Bin/../cgi-bin/srvmngr/lib"; +#use lib "$FindBin::Bin/../cgi-bin/srvmngr/lib"; my $config = plugin 'Config'; @@ -78,28 +78,18 @@ $r->get('/directory')->to('directory#main')->name('directory'); $r->post('/directory')->to('directory#do_update')->name('directory2'); -$r->get('/domains')->to('domains#main')->name('domains'); -$r->post('/domains')->to('domains#do_display')->name('domainadd1'); -$r->post('/domainadd')->to('domains#do_update')->name('domainadd2'); -$r->get('/domainupd')->to('domains#do_display')->name('domainupd1'); -$r->post('/domainupd')->to('domains#do_update')->name('domainupd2'); -$r->get('/domaindel')->to('domains#do_display')->name('domaindel1'); -$r->post('/domaindel')->to('domains#do_update')->name('domaindel2'); -$r->get('/domainup2')->to('domains#do_display')->name('domainup21'); -$r->post('/domainup2')->to('domains#do_update')->name('domainup22'); +$r->get('/domains')->to('domains#main')->name('domainsg'); +$r->post('/domains')->to('domains#do_display')->name('domainsp'); +$r->get('/domains2')->to('domains#do_display')->name('domains2g'); +$r->post('/domains2')->to('domains#do_update')->name('domains2p'); $r->get('/emailsettings')->to('emailsettings#main')->name('emailsettings'); $r->post('/emailsettings')->to('emailsettings#do_display')->name('emailsetting'); -$r->get('/emailsettingd')->to('emailsettings#do_display')->name('emailsettingd'); $r->post('/emailsettingd')->to('emailsettings#do_update')->name('emailsettingu'); -$r->get('/groups')->to('groups#main')->name('groups'); -$r->post('/groups')->to('groups#do_display')->name('groupadd1'); -$r->post('/groupadd')->to('groups#do_update')->name('groupadd2'); -$r->get('/groupupd')->to('groups#do_display')->name('groupupd1'); -$r->post('/groupupd')->to('groups#do_update')->name('groupupd2'); -$r->get('/groupdel')->to('groups#do_display')->name('groupdel1'); -$r->post('/groupdel')->to('groups#do_update')->name('groupdel2'); +$r->get('/groups')->to('groups#main')->name('groupsg'); +$r->get('/groups2')->to('groups#do_display')->name('groups2g'); +$r->post('/groups2')->to('groups#do_update')->name('groups2p'); $r->get('/hostentries')->to('hostentries#main')->name('hostentries'); $r->post('/hostentries')->to('hostentries#do_display')->name('hostentryadd'); @@ -131,23 +121,16 @@ $r->get('/portforwardingdel')->to('portforwarding#do_display')->name('portforwardingdel'); $r->post('/portforwardingdel1')->to('portforwarding#do_display')->name('portforwardingdel1'); -$r->get('/printers')->to('printers#main')->name('printers'); -$r->post('/printers')->to('printers#do_display')->name('printeradd'); -$r->get('/printers2')->to('printers#do_update')->name('printernet'); -$r->post('/printers2')->to('printers#do_update')->name('printerupd'); -$r->get('/printdel')->to('printers#do_display')->name('printerdel'); -$r->post('/printdel')->to('printers#do_update')->name('printerdel2'); +$r->get('/printers')->to('printers#main')->name('printersg'); +$r->get('/printers2')->to('printers#do_display')->name('printers2g'); +$r->post('/printers2')->to('printers#do_update')->name('printers2p'); $r->get('/proxy')->to('proxy#main')->name('proxy'); $r->post('/proxy')->to('proxy#do_update')->name('proxy2'); -$r->get('/pseudonyms')->to('pseudonyms#main')->name('pseudonyms'); -$r->post('/pseudonyms')->to('pseudonyms#do_display')->name('pseudoadd1'); -$r->post('/pseudoadd')->to('pseudonyms#do_update')->name('pseudoadd2'); -$r->get('/pseudoupd')->to('pseudonyms#do_display')->name('pseudoupd1'); -$r->post('/pseudoupd')->to('pseudonyms#do_update')->name('pseudoupd2'); -$r->get('/pseudodel')->to('pseudonyms#do_display')->name('pseudodel1'); -$r->post('/pseudodel')->to('pseudonyms#do_update')->name('pseudodel2'); +$r->get('/pseudonyms')->to('pseudonyms#main')->name('pseudonymsg'); +$r->get('/pseudonyms2')->to('pseudonyms#do_display')->name('pseudonyms2g'); +$r->post('/pseudonyms2')->to('pseudonyms#do_update')->name('pseudonyms2p'); $r->get('/qmailanalog')->to('qmailanalog#main')->name('qmailanalog'); $r->post('/qmailanalog')->to('qmailanalog#do_update')->name('qmailanalog2'); @@ -170,8 +153,6 @@ $r->get('/support')->to('support#main')->name('support'); -$r->post('/swttheme')->to('swttheme#main')->name('swttheme'); - $r->get('/useraccounts')->to('useraccounts#main')->name('useraccounts'); $r->post('/useraccounts')->to('useraccounts#do_display')->name('useraccountadd'); $r->get('/useraccountd')->to('useraccounts#do_display')->name('useraccountdis'); @@ -224,6 +205,9 @@ app->hook(before_routes => sub { my $c = shift; + if ( not defined $c->session->{lang} ) { + SrvMngr::init_session_cgi ( $c ); + } lang_space( $c, $c->session->{lang} ); }); diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_desktop_backup.html.ep.inac smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_desktop_backup.html.ep.inac --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_desktop_backup.html.ep.inac 1970-01-01 04:00:00.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_desktop_backup.html.ep.inac 2020-04-26 23:23:08.000000000 +0400 @@ -0,0 +1,28 @@ +% layout 'default', title => "Sme server 2 - desktop-backup"; + +% content_for 'module' => begin + +
+ % if ($config->{debug} == 1) { +

+ %= dumper $c->current_route + %= dumper $bac_datas +

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

<%= $title%>

+ +

+ %=l 'bac_DESKTOP_BACKUP' +


+ %= hidden_field 'Function' => $bac_datas->{'function'} + +
+ +% end diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_tape_configure.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_tape_configure.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_tape_configure.html.ep 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_tape_configure.html.ep 2020-04-26 23:22:56.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - backup", share_dir => './'; +% layout 'default', title => "Sme server 2 - backup"; % content_for 'module' => begin @@ -10,6 +10,12 @@

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

<%= $title%>

diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_tape_restore.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_tape_restore.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_tape_restore.html.ep 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_tape_restore.html.ep 2020-04-26 23:22:43.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - backup", share_dir => './'; +% layout 'default', title => "Sme server 2 - backup"; % content_for 'module' => begin @@ -10,6 +10,12 @@

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

<%= $title%>

%= form_for '/backupd' => (method => 'POST') => begin diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/backup.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/backup.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/backup.html.ep 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/backup.html.ep 2020-04-26 23:21:14.000000000 +0400 @@ -10,6 +10,12 @@

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

<%= $title%>


Still incomplete click here for previous version --> diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_configure.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_configure.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_configure.html.ep 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_configure.html.ep 2020-04-26 23:22:31.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - backup", share_dir => './'; +% layout 'default', title => "Sme server 2 - backup"; % content_for 'module' => begin @@ -10,6 +10,12 @@

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

<%= $title%>

%= form_for '/backupd' => (method => 'POST') => begin diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_restore.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_restore.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_restore.html.ep 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_restore.html.ep 2020-04-26 23:22:16.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - backup", share_dir => './'; +% layout 'default', title => "Sme server 2 - backup"; % content_for 'module' => begin @@ -10,6 +10,12 @@

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

<%= $title%>

%= form_for '/backupd' => (method => 'POST') => begin diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_sel_restore.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_sel_restore.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_sel_restore.html.ep 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_sel_restore.html.ep 2020-04-26 23:22:00.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - backup", share_dir => './'; +% layout 'default', title => "Sme server 2 - backup"; % content_for 'module' => begin @@ -10,6 +10,12 @@

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

<%= $title%>

%= form_for '/backupd' => (method => 'POST') => begin diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_verify.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_verify.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_verify.html.ep 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/back_workstn_verify.html.ep 2020-04-26 23:21:36.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - backup", share_dir => './'; +% layout 'default', title => "Sme server 2 - backup"; % content_for 'module' => begin @@ -10,6 +10,12 @@

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

<%= $title%>

%= form_for '/backupd' => (method => 'POST') => begin diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/clamav.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/clamav.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/clamav.html.ep 2020-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/clamav.html.ep 2020-04-26 12:59:44.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - clamav", share_dir => './'; +% layout 'default', title => "Sme server 2 - clamav"; % content_for 'module' => begin
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-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/datetime.html.ep 2020-04-26 12:59:58.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - datetime", share_dir => './'; +% layout 'default', title => "Sme server 2 - datetime"; % content_for 'end' => begin
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-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/default.html.ep 2020-04-26 21:26:08.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => 'Sme server 2 - Support', share_dir => './'; +% layout 'default', title => 'Sme server 2 - Support'; % content_for 'module' => begin 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-04-14 16:50:23.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/directory.html.ep 2020-04-26 12:59:18.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - directory", share_dir => './'; +% layout 'default', title => "Sme server 2 - directory"; % content_for 'module' => begin
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-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/domains.html.ep 2020-04-26 00:33:18.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - domains", share_dir => './'; +% layout 'default', title => "Sme server 2 - domains"; % content_for 'module' => begin
@@ -10,27 +10,23 @@

% } -

<%= $title%>

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

<%= $title%>

- % if ($dom_datas->{trt} eq 'ADD') { + % 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 'UPD') { - %= include 'partials/_dom_upd' - %} elsif ($dom_datas->{trt} eq 'UP2') { - %= include 'partials/_dom_up2' - %} else { - %= include 'partials/_dom_list' - %} + %} 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-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailaccess.html.ep 2020-04-26 21:27:39.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - emailaccess", share_dir => './'; +% layout 'default', title => "Sme server 2 - emailaccess"; % content_for 'module' => begin
@@ -10,15 +10,15 @@

% } -

<%= $title%>

- - % if ( $notif ) { -
- %= $notif + % if ( stash 'error' ) { +
+ %= $c->render_to_string(inline => stash 'error')
%} - %= form_for 'emailsettingd' => (method => 'POST') => begin +

<%= $title%>

+ + %= form_for '/emailsettingd' => (method => 'POST') => begin %=l 'mai_DESC_POP_ACCESS_CONTROL' 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-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emaildeliver.html.ep 2020-04-26 21:27:52.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - emaildeliver", share_dir => './'; +% layout 'default', title => "Sme server 2 - emaildeliver"; % content_for 'module' => begin
@@ -10,15 +10,15 @@

% } -

<%= $title%>

- - % if ( $notif ) { -
- %= $notif + % if ( stash 'error' ) { +
+ %= $c->render_to_string(inline => stash 'error')
%} - %= form_for 'emailsettingd' => (method => 'POST') => begin +

<%= $title%>

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

%=l 'mai_TITLE_UNKNOWN' 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-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailfilter.html.ep 2020-04-26 21:27:46.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - emailfilter", share_dir => './'; +% layout 'default', title => "Sme server 2 - emailfilter"; % content_for 'module' => begin
@@ -9,16 +9,16 @@ %= dumper $mai_datas

% } - -

<%= $title%>

- % if ( $notif ) { -
- %= $notif + % if ( stash 'error' ) { +
+ %= $c->render_to_string(inline => stash 'error')
%} - %= form_for 'emailsettingd' => (method => 'POST') => begin +

<%= $title%>

+ + %= form_for '/emailsettingd' => (method => 'POST') => begin %=l 'mai_DESC_VIRUS_SCAN' 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-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailreceive.html.ep 2020-04-26 21:27:59.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - emailreceive", share_dir => './'; +% layout 'default', title => "Sme server 2 - emailreceive"; % content_for 'module' => begin
@@ -9,16 +9,16 @@ %= dumper $mai_datas

% } - -

<%= $title%>

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

<%= $title%>

- %= form_for 'emailsettingd' => (method => 'POST') => begin + %= form_for '/emailsettingd' => (method => 'POST') => begin %=l 'mai_DESC_MODE' 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-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/emailsettings.html.ep 2020-04-25 20:45:57.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - emailsettings", share_dir => './'; +% layout 'default', title => "Sme server 2 - emailsettings"; % content_for 'module' => begin
@@ -9,16 +9,16 @@ %= dumper $mai_datas

% } - -

<%= $title%>

- % if ( $notif ) { -
- %= $notif + % if ( stash 'error' ) { +
+ %= $c->render_to_string(inline => stash 'error')
%} - %= form_for 'emailsettingd' => (method => 'GET') => begin +

<%= $title%>

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

%=l 'mai_LABEL_POP_ACCESS_CONTROL' @@ -45,7 +45,7 @@

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

%=l 'mai_LABEL_VIRUS_SCAN' @@ -72,7 +72,7 @@

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

%=l 'mai_LABEL_MODE' @@ -93,7 +93,7 @@

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

%=l 'mai_LABEL_UNKNOWN' 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-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/exception_development.html.ep 2020-04-26 21:26:16.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => 'Sme server 2 - Error D', share_dir => ''; +% layout 'default', title => 'Sme server 2 - Error D'; % content_for 'module' => begin 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-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/groups.html.ep 2020-04-26 16:47:28.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - groups", share_dir => './'; +% layout 'default', title => "Sme server 2 - groups"; % content_for 'module' => begin

@@ -9,17 +9,14 @@ %= dumper $grp_datas

% } - -

<%= $title%>

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

<%= $title%>

% if ($grp_datas->{trt} eq 'ADD') { %= include 'partials/_grp_add' 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-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/hostentries.html.ep 2020-04-26 21:27:02.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - hostentries", share_dir => './'; +% layout 'default', title => "Sme server 2 - hostentries"; % content_for 'module' => begin
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-04-14 16:50:23.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/ibays.html.ep 2020-04-26 21:26:44.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - ibays", share_dir => './'; +% layout 'default', title => "Sme server 2 - ibays"; % content_for 'module' => begin
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-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/initial.html.ep 2020-04-26 12:58:38.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => 'Sme server 2 - Initial', share_dir => ''; +% layout 'default', title => 'Sme server 2 - Initial'; % content_for 'module' => begin @@ -9,6 +9,13 @@ % }
+ + % if ( stash 'error' ) { +
+ %= $c->render_to_string(inline => stash 'error') +
+ %} +

%= $title

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-04-14 16:50:35.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/localnetworks.html.ep 2020-04-26 21:29:30.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - localnetworks", share_dir => './'; +% layout 'default', title => "Sme server 2 - localnetworks"; % content_for 'module' => begin
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-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/manual.html.ep 2020-04-26 21:25:20.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => 'Sme server 2 - Manual', share_dir => ''; +% layout 'default', title => 'Sme server 2 - Manual'; % content_for 'module' => begin
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-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/module.html.ep 2020-04-26 21:25:58.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - module", share_dir => './'; +% layout 'default', title => "Sme server 2 - module"; % content_for 'module' => begin 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-04-14 16:50:31.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 2020-04-26 21:24:52.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'defaultlight', title => 'Sme server 2 - Error D', share_dir => ''; +% layout 'defaultlight', title => 'Sme server 2 - Error D'; % content_for 'module' => begin 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-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/not_found.html.ep 2020-04-26 12:57:35.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'defaultlight', title => 'Sme server 2 - Error P', share_dir => ''; +% layout 'defaultlight', title => 'Sme server 2 - Error P';



The page you were requesting 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-04-14 16:50:31.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 2020-04-25 23:46:40.000000000 +0400 @@ -1,7 +1,7 @@

% my $btn = l('REMOVE'); - %= form_for '/domaindel' => (method => 'POST') => begin + %= form_for '/domains2' => (method => 'POST') => begin

%=l 'dom_REMOVE_TITLE' 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-04-14 16:50:31.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 2020-04-26 00:37:05.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) %> @@ -60,9 +60,11 @@

+ %= hidden_field 'trt' => 'ADD' + % end - %= form_for '/domainup2' => (method => 'GET') => begin + %= form_for '/domains' => (method => 'POST') => begin
@@ -98,7 +100,7 @@ %= l 'dom_BUTTON_CORPORATE_DNS'

- %= hidden_field 'trt' => $dom_datas->{trt} + %= 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-04-14 16:50:31.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 2020-04-25 23:46:11.000000000 +0400 @@ -2,7 +2,7 @@ % my $btn = l('SAVE'); - %= form_for '/domainup2' => (method => 'POST') => begin + %= form_for '/domains2' => (method => 'POST') => begin


%=l 'dom_DESC_CORPORATE_DNS' 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-04-14 16:50:31.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 2020-04-25 23:46:25.000000000 +0400 @@ -2,7 +2,7 @@ % my $btn = l('ADD'); - %= form_for '/domainupd' => (method => 'POST') => begin + %= form_for '/domains2' => (method => 'POST') => begin

% if ( $dom_datas->{trt} eq "ADD" ) { diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_add.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_add.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_add.html.ep 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_add.html.ep 2020-04-26 16:50:59.000000000 +0400 @@ -2,12 +2,10 @@ % my $btn = l('ADD'); - %= form_for '/groupadd' => (method => 'POST') => begin -

-

+ %= form_for '/groups2' => (method => 'POST') => begin +

%=l 'CREATE_GROUP' -

-

+



%=l 'grp_GROUP_NAMING'

diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_del.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_del.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_del.html.ep 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_del.html.ep 2020-04-26 16:50:39.000000000 +0400 @@ -1,9 +1,8 @@
% my $btn = l('REMOVE'); - %= form_for '/groupdel' => (method => 'POST') => begin -

-

+ %= form_for '/groups2' => (method => 'POST') => begin +

%=l 'REMOVE_USER_GROUP'

diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_list.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_list.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_list.html.ep 2020-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_list.html.ep 2020-04-26 16:49:25.000000000 +0400 @@ -1,20 +1,18 @@
- % my $btn = l('GROUP_ADD'); - %= form_for '/groups' => (method => 'POST') => begin + %= form_for '/groups2' => (method => 'GET') => begin + + %= hidden_field 'trt' => 'ADD' -

-
+


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

-

-

+

%=l 'grp_CURRENT_LIST' -

-

+

% my $numGroups = @$groups; % if ($numGroups == 0){ %=l 'ACCOUNT_GROUP_NONE' @@ -38,11 +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'%> % } @@ -50,7 +45,6 @@ <%} %>

- %= hidden_field 'trt' => $grp_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/_grp_upd.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_upd.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_upd.html.ep 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_grp_upd.html.ep 2020-04-26 21:20:38.000000000 +0400 @@ -2,13 +2,11 @@ % my $btn = l('SAVE'); - %= form_for '/groupupd' => (method => 'POST') => begin -

-

+ %= form_for '/groups2' => (method => 'POST') => begin + +

%=l 'MODIFY_GROUP' -

-
-

+

diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_module.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_module.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_module.html.ep 2020-04-14 16:50:23.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_module.html.ep 2020-04-26 13:08:54.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => 'Sme server 2 - Support', share_dir => '../'; +% layout 'default', title => 'Sme server 2 - Support'; % content_for 'head' => begin %= include 'partials/_head' diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_add.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_add.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_add.html.ep 2020-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_add.html.ep 2020-04-26 12:51:27.000000000 +0400 @@ -6,10 +6,9 @@

%=l 'prt_CREATE_NEW_PRINTER' -

-

+
%=l 'prt_CREATE_NEW_DESC' -

+


diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_list.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_list.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_list.html.ep 2020-04-14 16:50:23.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_list.html.ep 2020-04-26 12:34:02.000000000 +0400 @@ -3,7 +3,9 @@ % my $btn = l('prt_INITIAL_BTN'); - %= form_for '/printers' => (method => 'POST') => begin + %= form_for '/printers2' => (method => 'GET') => begin + + %= hidden_field 'trt' => 'ADD'


@@ -53,10 +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'%> % } @@ -64,8 +63,6 @@ <%} %>

- %= hidden_field 'trt' => $prt_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/_prt_net.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_net.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_net.html.ep 2020-04-14 16:50:23.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_prt_net.html.ep 2020-04-26 12:52:35.000000000 +0400 @@ -28,9 +28,6 @@

- < field id="address" type="text" validation="hostname_or_ip" > - < field id="remoteName" type="text" value="raw" validation="nonblank" > -



%= submit_button "$btn", class => 'action' @@ -41,6 +38,6 @@ %= hidden_field 'Description' => $prt_datas->{description} %= hidden_field 'Location' => $prt_datas->{location} - % end + % end

diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_add.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_add.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_add.html.ep 2020-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_add.html.ep 2020-04-26 13:08:24.000000000 +0400 @@ -2,7 +2,7 @@ % my $btn = l('ADD'); - %= form_for '/pseudoadd' => (method => 'POST') => begin + %= form_for '/pseudonyms2' => (method => 'POST') => begin

%=l 'pse_TITLE_CREATE' diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_del.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_del.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_del.html.ep 2020-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_del.html.ep 2020-04-26 13:08:09.000000000 +0400 @@ -1,7 +1,7 @@
% my $btn = l('REMOVE'); - %= form_for '/pseudodel' => (method => 'POST') => begin + %= form_for '/pseudonyms2' => (method => 'POST') => begin

%=l 'pse_REMOVE_PSEUDONYM' diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_list.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_list.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_list.html.ep 2020-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_list.html.ep 2020-04-26 16:28:41.000000000 +0400 @@ -1,22 +1,20 @@
- % my $btn = l('pse_CLICK_TO_CREATE'); %= $c->render_to_string(inline => l('pse_DESCRIPTION')); - %= form_for '/pseudonyms' => (method => 'POST') => begin + %= form_for '/pseudonyms2' => (method => 'GET') => begin + + %= hidden_field 'trt' => 'ADD' -

-
+


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

-

-

+

%=l 'pse_CURRENT_PSEUDONYMS' -

-
+


% my $numPseudonyms = @$pseudonyms; % if ($numPseudonyms == 0){ %=l 'pse_ACCOUNT_PSEUDONYM_NONE' @@ -54,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) %> @@ -70,7 +68,6 @@ <%} %>

- %= hidden_field 'trt' => $pse_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/_pse_upd.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_upd.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_upd.html.ep 2020-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/partials/_pse_upd.html.ep 2020-04-26 13:07:54.000000000 +0400 @@ -2,7 +2,7 @@ % my $btn = l('SAVE'); - %= form_for '/pseudoupd' => (method => 'POST') => begin + %= form_for '/pseudonyms2' => (method => 'POST') => begin

%=l 'pse_MODIFY_PSEUDONYM' diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/portforwarding.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/portforwarding.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/portforwarding.html.ep 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/portforwarding.html.ep 2020-04-26 21:29:50.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - Port Forwards", share_dir => './'; +% layout 'default', title => "Sme server 2 - Port Forwards"; % content_for 'module' => begin
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/printers.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/printers.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/printers.html.ep 2020-04-14 16:50:23.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/printers.html.ep 2020-04-26 12:38:25.000000000 +0400 @@ -1,18 +1,22 @@ -% layout 'default', title => "Sme server 2 - printers", share_dir => './'; +% layout 'default', title => "Sme server 2 - printers"; % content_for 'module' => begin
- % if ($config->{debug} == 1) { + %if ($config->{debug} == 1) {

- (DBG)route: <%= $c->current_route %>
- (DBG)trt: <%= $prt_datas->{trt} %>
+ %= dumper $c->current_route + %= dumper $prt_datas

- % } - -

<%= $title%>

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

<%= $title%>

% if ($prt_datas->{trt} eq 'ADD') { %= include 'partials/_prt_add' diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/proxy.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/proxy.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/proxy.html.ep 2020-04-14 16:50:23.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/proxy.html.ep 2020-04-26 12:59:28.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - proxy", share_dir => './'; +% layout 'default', title => "Sme server 2 - proxy"; % content_for 'module' => begin
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/pseudonyms.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/pseudonyms.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/pseudonyms.html.ep 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/pseudonyms.html.ep 2020-04-26 13:05:58.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - pseudonyms", share_dir => './'; +% layout 'default', title => "Sme server 2 - pseudonyms"; % content_for 'module' => begin
@@ -10,15 +10,13 @@

% } -

<%= $title%>

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

<%= $title%>

% if ($pse_datas->{trt} eq 'ADD') { %= include 'partials/_pse_add' diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/qmailanalog.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/qmailanalog.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/qmailanalog.html.ep 2020-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/qmailanalog.html.ep 2020-04-26 12:59:36.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - qmailanalog", share_dir => './'; +% layout 'default', title => "Sme server 2 - qmailanalog"; % content_for 'module' => begin
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/quota.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/quota.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/quota.html.ep 2020-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/quota.html.ep 2020-04-26 13:00:06.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - quota", share_dir => './'; +% layout 'default', title => "Sme server 2 - quota"; % content_for 'module' => begin
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/reboot.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/reboot.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/reboot.html.ep 2020-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/reboot.html.ep 2020-04-26 21:26:30.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - reboot", share_dir => './'; +% layout 'default', title => "Sme server 2 - reboot"; % content_for 'module' => begin diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/remoteaccess.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/remoteaccess.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/remoteaccess.html.ep 2020-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/remoteaccess.html.ep 2020-04-26 21:27:24.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - remoteaccess", share_dir => './'; +% layout 'default', title => "Sme server 2 - remoteaccess"; % content_for 'module' => begin
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/review.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/review.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/review.html.ep 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/review.html.ep 2020-04-26 12:59:10.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => 'Sme server 2 - Review', share_dir => ''; +% layout 'default', title => 'Sme server 2 - Review'; % content_for 'module' => begin
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/starterwebsite.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/starterwebsite.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/starterwebsite.html.ep 2020-04-14 16:50:23.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/starterwebsite.html.ep 2020-04-26 12:58:49.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => 'Sme server 2 - Starter website', share_dir => './'; +% layout 'default', title => 'Sme server 2 - Starter website'; % content_for 'module' => begin
@@ -32,8 +32,8 @@
%= text_area 'l_desc2', cols => 40, class => 'input'
- %=l 'sws_DESC_SUBMIT' -

+ %= $c->render_to_string(inline => (l 'sws_DESC_SUBMIT')) +
%= submit_button "$btn", class => 'action' % end diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/support.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/support.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/support.html.ep 2020-04-14 16:50:23.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/support.html.ep 2020-04-26 12:58:56.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => 'Sme server 2 - Support', share_dir => './'; +% layout 'default', title => 'Sme server 2 - Support'; % content_for 'module' => begin
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/useraccounts.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/useraccounts.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/useraccounts.html.ep 2020-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/useraccounts.html.ep 2020-04-26 21:27:32.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - useraccounts", share_dir => './'; +% layout 'default', title => "Sme server 2 - useraccounts"; % content_for 'module' => begin
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/viewlogfiles.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/viewlogfiles.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/viewlogfiles.html.ep 2020-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/viewlogfiles.html.ep 2020-04-26 21:27:09.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - viewlogfiles", share_dir => './'; +% layout 'default', title => "Sme server 2 - viewlogfiles"; % content_for 'module' => begin
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/welcome.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/welcome.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/welcome.html.ep 2020-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/welcome.html.ep 2020-04-26 21:25:28.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => 'Sme server 2 - IndexT', share_dir => ''; +% layout 'default', title => 'Sme server 2 - IndexT'; % content_for 'module' => begin
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/whatever.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/whatever.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/whatever.html.ep 2020-04-14 16:50:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/whatever.html.ep 2020-04-26 21:25:47.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => 'Sme server 2 - Whatever D', share_dir => './'; +% layout 'default', title => 'Sme server 2 - Whatever D'; % content_for 'module' => begin diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/workgroup.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/workgroup.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/workgroup.html.ep 2020-04-14 16:50:23.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/workgroup.html.ep 2020-04-26 12:59:51.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - workgroup", share_dir => './'; +% layout 'default', title => "Sme server 2 - workgroup"; % content_for 'module' => begin
diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumconfig.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumconfig.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumconfig.html.ep 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumconfig.html.ep 2020-04-26 21:28:25.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - yum_config", share_dir => './'; +% layout 'default', title => "Sme server 2 - yum_config"; % content_for 'module' => begin diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yum.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yum.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yum.html.ep 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yum.html.ep 2020-04-26 21:27:17.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - yum", share_dir => './'; +% layout 'default', title => "Sme server 2 - yum"; % content_for 'module' => begin diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yuminstall.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yuminstall.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yuminstall.html.ep 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yuminstall.html.ep 2020-04-26 21:28:12.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - yum_install", share_dir => './'; +% layout 'default', title => "Sme server 2 - yum_install"; % content_for 'module' => begin diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumlogfile.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumlogfile.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumlogfile.html.ep 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumlogfile.html.ep 2020-04-26 21:28:40.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - yum_logfile", share_dir => './'; +% layout 'default', title => "Sme server 2 - yum_logfile"; % content_for 'module' => begin diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumpostupg.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumpostupg.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumpostupg.html.ep 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumpostupg.html.ep 2020-04-26 21:28:32.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - yum_update", share_dir => './'; +% layout 'default', title => "Sme server 2 - yum_update"; % content_for 'module' => begin diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumremove.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumremove.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumremove.html.ep 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumremove.html.ep 2020-04-26 21:28:19.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - yum_update", share_dir => './'; +% layout 'default', title => "Sme server 2 - yum_update"; % content_for 'module' => begin diff -aurN smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumupdate.html.ep smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumupdate.html.ep --- smeserver-manager-0.1.0.old/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumupdate.html.ep 2020-04-14 16:50:36.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/web/panels/manager2/cgi-bin/srvmngr/themes/default/templates/yumupdate.html.ep 2020-04-26 21:28:05.000000000 +0400 @@ -1,4 +1,4 @@ -% layout 'default', title => "Sme server 2 - yum_update", share_dir => './'; +% layout 'default', title => "Sme server 2 - yum_update"; % content_for 'module' => begin