diff -urN smeserver-manager-0.1.0.old/createlinks smeserver-manager-0.1.0/createlinks --- smeserver-manager-0.1.0.old/createlinks 2020-06-06 16:50:41.000000000 +0400 +++ smeserver-manager-0.1.0/createlinks 2020-06-12 22:38:05.635869737 +0400 @@ -18,14 +18,14 @@ } templates2events("$mngrdir/conf/srvmngr.conf", - qw( manager2-modify bootstrap-console-save console-save)); + qw( smanager-modify bootstrap-console-save console-save)); templates2events("/etc/systemd/system/smanager.service", - qw( manager2-modify bootstrap-console-save console-save)); + qw( smanager-modify bootstrap-console-save console-save)); # services to launch on event # actions to perform -for my $event (qw( yum-install yum-update yum-remove manager2-refresh bootstrap-console-save console-save)) +for my $event (qw( yum-install yum-update yum-remove smanager-refresh bootstrap-console-save console-save)) { event_link('navigation2-conf', "$event", '80'); event_link('routes2-conf', "$event", '80'); diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/50body smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/50body --- smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/50body 2020-05-31 16:09:46.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/50body 2020-06-12 22:38:43.291675967 +0400 @@ -1,7 +1,7 @@ { $OUT = <<'EOF'; -/* from e-smith-manager to smeserver_manager2 */ +/* from e-smith-manager to smanager (smeserver_manager2) */ /*---------------------------------------------------------------------- * copyright (C) 1999-2003 Mitel Networks Corporation diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/90contribs smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/90contribs --- smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/90contribs 2020-05-31 16:09:46.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_core.css/90contribs 2020-06-12 22:38:58.194599098 +0400 @@ -1,7 +1,7 @@ { $OUT =<<'HERE'; -/* from e-smith-manager to smeserver_manager2 */ +/* from e-smith-manager to smanager (smeserver_manager2) */ /*---------------------------------------------------------------------- * copyright (C) 1999-2003 Mitel Networks Corporation diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/50body smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/50body --- smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/50body 2020-05-31 16:09:46.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/50body 2020-06-12 22:39:17.459499580 +0400 @@ -1,7 +1,7 @@ { $OUT = <<'EOF'; -/* from e-smith-manager to smeserver_manager2 */ +/* from e-smith-manager to smanager (smeserver_manager2) */ /*---------------------------------------------------------------------- * copyright (C) 1999-2003 Mitel Networks Corporation diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/90contribs smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/90contribs --- smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/90contribs 2020-05-31 16:09:46.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_main.css/90contribs 2020-06-12 22:39:31.891427198 +0400 @@ -1,7 +1,7 @@ { $OUT =<<'HERE'; -/* from e-smith-manager to smeserver_manager2 */ +/* from e-smith-manager to smanager (smeserver_manager2) */ /*---------------------------------------------------------------------- * copyright (C) 1999-2003 Mitel Networks Corporation diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_menu.css/50body smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_menu.css/50body --- smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_menu.css/50body 2020-05-31 16:09:46.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/sme_menu.css/50body 2020-06-12 22:39:48.540353738 +0400 @@ -1,7 +1,7 @@ { $OUT = <<'EOF'; -/* from e-smith-manager to smeserver_manager2 */ +/* from e-smith-manager to smanager (smeserver_manager2) */ /*---------------------------------------------------------------------- * copyright (C) 1999-2003 Mitel Networks Corporation diff -urN smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body --- smeserver-manager-0.1.0.old/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body 2020-06-07 12:17:54.000000000 +0400 +++ smeserver-manager-0.1.0/root/etc/e-smith/templates/usr/share/smanager/themes/default/public/css/styles.css/50body 2020-06-12 22:40:03.642286411 +0400 @@ -1,7 +1,7 @@ { $OUT = <<'EOF'; -/* smeserver_manager2 */ +/* smanager (smeserver_manager2) */ /*---------------------------------------------------------------------- * copyright (C) 1999-2003 Mitel Networks Corporation diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm 2020-05-30 20:49:51.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Backup.pm 2020-06-12 22:35:06.612778233 +0400 @@ -781,7 +781,7 @@ $rec->set_prop('start', time); my $sec = 10; - print "Refresh: $sec; URL=/server-manager2/backup\n"; + print "Refresh: $sec; URL=/smanager/backup\n"; print $c->l('bac_NOW_RESTORING_FROM_TAPE'); print $c->l('bac_MUST_REBOOT_AFTER_RESTORE'); print $c->l('bac_PAGE_REFRESH_IN', $sec); diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Modules.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Modules.pm --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Modules.pm 2020-05-30 20:44:29.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Modules.pm 2020-06-12 22:51:41.055806376 +0400 @@ -27,21 +27,6 @@ }; -sub starterwebsite { - my $c = shift; - - $c->app->log->info($c->log_req); - - my $modul = $c->render_to_string(inline => "

# my (\$lang, \$releaseVersion, - -
# \$c->stash\(\'lang\', \'releaseVer\' -# \'navigation\'

"); - - $c->stash( modul => $modul, PwdSet => '1', Unsafe => '0' ); - -}; - - sub support { my $c = shift; diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Starterwebsite.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Starterwebsite.pm --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Starterwebsite.pm 2020-05-30 20:45:45.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Starterwebsite.pm 1970-01-01 04:00:00.000000000 +0400 @@ -1,160 +0,0 @@ -package SrvMngr::Controller::Starterwebsite; - -#---------------------------------------------------------------------- -# heading : Miscellaneous -# description : Create starter web site -# navigation : 7000 7100 -# -# routes : end -#---------------------------------------------------------------------- -use strict; -use warnings; -use Mojo::Base 'Mojolicious::Controller'; - -use Locale::gettext; -use esmith::util qw( chownFile ); - -use SrvMngr::I18N; -use SrvMngr qw(theme_list init_session); - -our $db = esmith::ConfigDB->open_ro || die "Couldn't open config db"; - -sub main { - my $c = shift; - $c->app->log->info($c->log_req); - - my $title = $c->l('sws_FORM_TITLE'); - my $modul = $c->render_to_string(inline => $c->l('sws_DESCRIPTION')); - - $c->stash( title => $title, modul => $modul ); - $c->render(template => 'starterwebsite'); -}; - - -sub do_site { - my $c = shift; - $c->app->log->info($c->log_req); - - my $companyname = $c->param('l_company'); - my $header1 = $c->param('l_header1'); - my $desc1 = $c->param('l_desc1'); - my $header2 = $c->param('l_header2'); - my $desc2 = $c->param('l_desc2'); - - my $result = ""; -# if ( ( $companyname !~ /[\p{L}]+/ ) || ( $header1 !~ /[\p{L}]+/ ) || ( $desc1 !~ /[\p{L}]+/ ) ) { - if (($companyname =~ /^\s*$/s) or ($header1 =~ /^\s*$/s) or ($desc1 =~ /^\s*$/s)) { - $result .= 'Minimum information required !, '; - } - - my $title = $c->l('sws_FORM_TITLE'); - - 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); - } - - $c->flash( success => $result ); - $c->redirect_to("/"); -}; - - -sub change2_settings { - my ($c, $companyname, $header1, $desc1, $header2, $desc2) = @_; - - my $primary_location = '/home/e-smith/files/ibays/Primary/html/index.htm'; - - if (! open (WR, ">$primary_location")) { return 1; } - - format_page($c, $companyname, $header1, $desc1, $header2, $desc2); - - close WR; - - esmith::util::chownFile("admin", "shared", - $primary_location); - chmod 0640, $primary_location; - return 0; -} - - -sub format_page { - my ($c, $companyname, $header1, $desc1, $header2, $desc2) = @_; - - - print WR "\n"; - print WR "\n"; - print WR "\n"; - print WR "\n"; - print WR "\n"; - print WR "$companyname\n"; - print WR "\n"; - print WR "\n"; - print WR "\n"; - print WR "\n"; - print WR "\n"; - print WR "\n"; - print WR "\n"; - print WR "\n"; - print WR "\n"; - print WR "\n"; - print WR "\n"; - print WR "\n"; - print WR "\n"; - print WR "\n"; - print WR "\n"; - print WR "

$companyname

 \n"; - print WR "\n"; - - if ($header1 !~ /^\s*$/s) - { - print WR "

$header1

\n"; - print WR "\n"; - } - - if ($desc1 !~ /^\s*$/s) - { - $desc1 =~ s/^\s*(.*?)\s*$/$1/s; - $desc1 =~ s/\r\s*\r/

/sg; - - print WR "\n"; - print WR "

\n"; - print WR "$desc1\n"; - print WR "

\n"; - print WR "\n"; - print WR "\n"; - } - - if ($header2 !~ /^\s*$/s) - { - print WR "

$header2

\n"; - print WR "\n"; - } - - if ($desc2 !~ /^\s*$/s) - { - $desc2 =~ s/^\s*(.*?)\s*$/$1/s; - $desc2 =~ s/\r\s*\r/

/sg; - - print WR "\n"; - print WR "

\n"; - print WR "$desc2\n"; - print WR "

\n"; - print WR "\n"; - print WR "\n"; - } - - print WR "\n"; - print WR "
\n"; - print WR "\n"; - print WR "\n"; - - close WR; -} - - -1; diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Swttheme.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Swttheme.pm --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Swttheme.pm 2020-05-30 20:48:00.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Swttheme.pm 2020-06-12 22:34:34.661937324 +0400 @@ -34,8 +34,8 @@ # } $c->session->{CurrentTheme} = $theme; - $db->get('manager2')->set_prop('Theme', $theme); - system ("/sbin/e-smith/signal-event manager2-modify") == 0 + $db->get('smanager')->set_prop('Theme', $theme); + system ("/sbin/e-smith/signal-event smanager-modify") == 0 or warn "$c->l('ERROR_UPDATING')"; } diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm 2020-05-30 20:48:54.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/Controller/Useraccounts.pm 2020-06-12 23:46:57.892515085 +0400 @@ -785,7 +785,8 @@ $acct->merge_props(%newProperties); - $adb->create_user_auto_pseudonyms($acctName); + $adb->create_user_auto_pseudonyms($acctName) + if ( ($cdb->get_prop('pseudonyms','create') || 'enabled') eq 'enabled' ); my @old_groups = $adb->user_group_list($acctName); my @new_groups = @{$c->every_param("groupMemberships")}; @@ -826,7 +827,8 @@ my $acct = $adb->new_record($acctName) or warn "Can't create new account for $acctName (does it already exist?)\n"; $acct->reset_props(%userprops); - $adb->create_user_auto_pseudonyms($acctName); + $adb->create_user_auto_pseudonyms($acctName) + if ( ($cdb->get_prop('pseudonyms','create') || 'enabled') eq 'enabled' ); my @groups = @{$c->every_param("groupMemberships")}; $adb->add_user_to_groups($acctName, @groups); diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Starterwebsite/starterwebsite_en.lex smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Starterwebsite/starterwebsite_en.lex --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Starterwebsite/starterwebsite_en.lex 2020-04-15 21:43:42.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Starterwebsite/starterwebsite_en.lex 1970-01-01 04:00:00.000000000 +0400 @@ -1,38 +0,0 @@ - -'sws_FORM_TITLE' => 'Create a starter website', -'sws_SUCCESS' => 'Successfully created starter web site (wrote file index.htm). - You can visit your new website at the address below:', -'sws_DESCRIPTION' => '

-To create a simple web page for your company, fill -in the fields below and click on Create. -

-You can leave any field blank if you do not need it. -

-The text that you enter below will be line wrapped -for a nicer appearance in your web page. Leave a blank line -whenever you want to start a new paragraph. If you need -to force a line break without starting a new paragraph (for -example after each line of a mailing address), then type -the four-character sequence -

<BR>
-where you would like each line break. -

-Do not use this option -if you have already customized your web site, since it will -overwrite the "index.htm" file in your web site directory. -

', -'sws_LABEL_COMPANYNAME' => 'Company name', -'sws_DESC_HEADER1' => 'First header, typically used for short phrases such -as "Leader in the field of textile manufacturing"', -'sws_DESC_TEXT1' => 'Text following first header, typically used for a -paragraph of marketing information.', -'sws_DESC_HEADER2' => 'Second header, typically used for short phrases such -as "For more information" or "To order our products":', -'sws_DESC_TEXT2' => 'Text following second header, typically used for contact -or ordering information:', -'sws_DESC_SUBMIT' => '

When you create this web page, the file -"index.htm" will be overwritten -in your web site directory.

-

Do you wish to proceed?

', -'sws_Create starter web site' => 'Create starter web site', - diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Starterwebsite/starterwebsite_fr.lex smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Starterwebsite/starterwebsite_fr.lex --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Starterwebsite/starterwebsite_fr.lex 2020-05-27 14:53:01.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Starterwebsite/starterwebsite_fr.lex 1970-01-01 04:00:00.000000000 +0400 @@ -1,21 +0,0 @@ -sws_FORM_TITLE => 'Création d\'un premier site Web', -'sws_FORM_TITLE' => -'Création d\'un premier site Web', -'sws_SUCCESS' => -'Création réussie de votre premier site Web (écriture du fichier index.htm). Vous pouvez voir ce nouveau site Web à l\'adresse suivante :', -'sws_DESCRIPTION' => -'

Pour créer une page Web simple pour votre organisation, remplissez les champs ci-dessous et cliquez sur le bouton "Créer".

Vous pouvez laisser n\'importe lequel de ces champs vide si vous n\'en avez pas l\'utilité.

Le texte que vous taperez ci-dessous s\'affichera avec des retours à la ligne automatiques pour que la page Web soit conforme à ce que vous tapez. Laissez une ligne vide chaque fois que vous voulez commencer un nouveau paragraphe. Si vous avez besoin d\'imposer un retour à la ligne sans commencer un nouveau paragraphe (par exemple, après chaque ligne d\'une adresse), alors tapez la séquence de quatre caractères :

<BR>
où vous souhaitez avoir le saut de ligne.

N\'utilisez pas cette fonctionnalité si vous avez déjà personnalisé votre site Web, car elle écrasera le contenu du fichier "index.htm" de votre site primaire.

', -'sws_LABEL_COMPANYNAME' => -'Nom de votre organisation', -'sws_DESC_HEADER1' => -'Le premier en-tête est généralement utilisé pour des phrases courtes comme "Leader dans le domaine de la fabrication textile" :', -'sws_DESC_TEXT1' => -'Le texte qui suit le premier en-tête est généralement utilisé pour décrire votre organisation de façon détaillée :', -'sws_DESC_HEADER2' => -'Le deuxième en-tête est généralement utilisé pour des phrases courtes comme "Pour de plus amples informations" ou "Pour commander nos produits" :', -'sws_DESC_TEXT2' => -'Le texte qui suit le deuxième en-tête est généralement utilisé pour fournir les informations relatives au contact ou à la commande :', -'sws_DESC_SUBMIT' => -'

Lorsque vous créerez cette page Web, le fichier "index.htm" sera écrasé dans le répertoire de votre site primaire.

Voulez-vous continuer ?

', -'sws_Create starter web site' => -'Votre premier site Web', diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test1/test1_en.lex smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test1/test1_en.lex --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test1/test1_en.lex 2020-04-19 22:25:19.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test1/test1_en.lex 1970-01-01 04:00:00.000000000 +0400 @@ -1,9 +0,0 @@ -'tst1_FORM_TITLE' => 'TEST Module 1 - simple display (\'review\')', -'tst1_TEST_DESCRIPTION' => '

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque et dui scelerisque, - scelerisque augue sit amet, dignissim risus. Maecenas non lacinia ex. Nunc tempus consequat quam eget tincidunt. - In nec justo sed diam tristique lobortis vitae eget enim. Ut auctor faucibus tempor. -

Pellentesque nec libero sit amet nibh pretium maximus sed a nibh. Praesent nec rutrum urna, aliquam dignissim nunc. - Proin pretium accumsan tellus, ac bibendum ante faucibus id. Nulla facilisi. Sed turpis risus, gravida a sapien ac, - tincidunt accumsan ex.

', -'tst1_LABEL_DOMAIN' => 'Domain ', -'tst1_LABEL_BACKUP_PROGRAM' => 'Backup program ', diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test2/test2_en.lex smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test2/test2_en.lex --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test2/test2_en.lex 2020-04-25 13:30:57.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test2/test2_en.lex 1970-01-01 04:00:00.000000000 +0400 @@ -1,12 +0,0 @@ -'tst2_FORM_TITLE' => 'TEST Module 2 - display and change (\'directory\')', -'tst2_TEST_DESCRIPTION' => '

Mauris nec viverra quam. Praesent at tempus dui, quis maximus nibh. Praesent sagittis ut velit placerat pharetra. Pellentesque ullamcorper metus at hendrerit rhoncus. Mauris eu lorem sem. In et mattis orci. Quisque faucibus sed leo vitae volutpat. Proin nec lobortis justo, ac consequat turpis. Etiam lectus dolor, interdum in sapien et, interdum laoreet nisi. Vivamus eget elit in eros elementum tincidunt. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque et dui scelerisque, - scelerisque augue sit amet, dignissim risus. Maecenas non lacinia ex. Nunc tempus consequat quam eget tincidunt. - In nec justo sed diam tristique lobortis vitae eget enim. Ut auctor faucibus tempor. -

Pellentesque nec libero sit amet nibh pretium maximus sed a nibh. Praesent nec rutrum urna, aliquam dignissim nunc. - Proin pretium accumsan tellus, ac bibendum ante faucibus id. Nulla facilisi. Sed turpis risus, gravida a sapien ac, - tincidunt accumsan ex.

', -'tst2_LABEL_DOMAIN' => 'Domain ', -'tst2_LABEL_BACKUP_PROGRAM' => 'Backup program ', -'tst2_DOMAIN_ERROR' => 'Error on Domain name ', -'tst2_BACKUP_PROGRAM_ERROR' => 'Error on Backup program ', -'tst2_ENABLE_BACKUP' => 'Backup ', diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test3/test3_en.lex smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test3/test3_en.lex --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test3/test3_en.lex 2020-04-25 13:22:34.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Test3/test3_en.lex 1970-01-01 04:00:00.000000000 +0400 @@ -1,20 +0,0 @@ -'tst3_FORM_TITLE' => 'TEST Module 3 - multiple choices (ex: \'email\')', -'tst3_TEST_DESCRIPTION' => '

Mauris nec viverra quam. Praesent at tempus dui, quis maximus nibh. Praesent sagittis ut velit placerat pharetra. Pellentesque ullamcorper metus at hendrerit rhoncus. Mauris eu lorem sem. In et mattis orci. Quisque faucibus sed leo vitae volutpat. Proin nec lobortis justo, ac consequat turpis. Etiam lectus dolor, interdum in sapien et, interdum laoreet nisi. Vivamus eget elit in eros elementum tincidunt. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque et dui scelerisque, - scelerisque augue sit amet, dignissim risus. Maecenas non lacinia ex. Nunc tempus consequat quam eget tincidunt. - In nec justo sed diam tristique lobortis vitae eget enim. Ut auctor faucibus tempor. -

Pellentesque nec libero sit amet nibh pretium maximus sed a nibh. Praesent nec rutrum urna, aliquam dignissim nunc. - Proin pretium accumsan tellus, ac bibendum ante faucibus id. Nulla facilisi. Sed turpis risus, gravida a sapien ac, - tincidunt accumsan ex.

', -'tst3_CHOICE' => 'Choice ', -'tst3_CHOICE1_DESCRIPTION' => 'The choice n°1 is the first one... yes', -'tst3_CHOICE2_DESCRIPTION' => 'The choice n°2 is the second one... yes', -'tst3_CHOICE1_LABEL' => 'Choice n°1', -'tst3_CHOICE2_LABEL' => 'Choice n°2', -'tst3_CHOICE1' => 'choice 1', -'tst3_CHOICE2' => 'choice 2', -'tst3_LABEL_DOMAIN' => 'Domain ', -'tst3_LABEL_BACKUP_PROGRAM' => 'Backup program ', -'tst3_TEST_FIN' => 'Proin pretium accumsan tellus, ac bibendum ante faucibus id.', -'tst3_DOMAIN_ERROR' => 'Error on the Domain name ', -'tst3_BACKUP_PROGRAM_ERROR' => 'Error on backup program ', -'tst3_ENABLE_BACKUP' => 'Backup ', diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Wbl/wbl_en.lex smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Wbl/wbl_en.lex --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Wbl/wbl_en.lex 2020-04-01 00:06:27.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Wbl/wbl_en.lex 1970-01-01 04:00:00.000000000 +0400 @@ -1,42 +0,0 @@ -'wbl_SAVE' => 'Save', -'wbl_PERFORM' => 'Perform', -'wbl_FORM_TITLE' => 'E-mail WBL', -'wbl_OPERATION_STATUS_REPORT' => 'Operation status report', -'wbl_WBL_DESCRIPTION' => 'E-mail traffic is scanned and may be blocked due to the various screening methods enabled. -You may use this panel to define e-mail white/black lists.', -'wbl_RBL_LIST_DESCRIPTION' => 'RBL\'s List is used to adjust DNSBL and RHSBL.', -'wbl_RBL_LIST' => 'RBL\'s List', -'wbl_BLACK_LIST_DESCRIPTION' => 'Black lists are used for rejecting e-mail traffic.', -'wbl_BLACK_LIST' => 'Black List', -'wbl_WHITE_LIST_DESCRIPTION' => 'White lists are used for accepting e-mail traffic.', -'wbl_WHITE_LIST' => 'White List', -'wbl_BLACK_TITLE' => 'This server includes built-in support for using the admin defined black lists, badhelo and - badmailfrom.', -'wbl_DNSBL_DESCRIPTION' => 'DNSBL is an abbreviation for "DNS blacklist".', -'wbl_DNSBL_LABEL' => 'DNSBL status', -'wbl_RHSBL_DESCRIPTION' => 'RHSBL is an abbreviation for "Right Hand Side Blacklist". ', -'wbl_RHSBL_LABEL' => 'RHSBL status', -'wbl_BADHELO_DESCRIPTION' => 'Check a HELO message delivered from a connecting host.Reject any -that appear in badhelo during the \'helo\' stage.', -'wbl_BADHELO_LABEL' => 'qpsmtpd badhelo', -'wbl_BADMAILFROM_DESCRIPTION' => 'Check envelope sender addresses. Reject any -that appear (@host or user@host) in badmailfrom during the \'mail\' stage.', -'wbl_BADMAILFROM_LABEL' => 'qmail badmailfrom', -'wbl_WHITE_TITLE' => 'Use this panel to modify your servers White List settings. All entries will be enabled by default', -'wbl_RRFH_LABEL' => 'Whitelists status', -'wbl_WHITELISTHOSTS_DESCRIPTION' => 'Any IP address listed in whitelisthosts will be exempted -from any further validation during the \'connect\' stage.', -'wbl_WHITELISTHOSTS_LABEL' => 'qpsmtpd whitelisthosts', -'wbl_WHITELISTHELO_DESCRIPTION' => 'be exempted from further validation during the \'helo\' stage.', -'wbl_WHITELISTHELO_LABEL' => 'qpsmtpd whitelisthelo', -'wbl_WHITELISTSENDERS_DESCRIPTION' => 'will be exempted from further validation during the \'mail\' stage.', -'wbl_WHITELISTSENDERS_LABEL' => 'qpsmtpd whitelistsenders', -'wbl_WHITELISTFROM_DESCRIPTION' => 'will be exempted from spamassassin rejection.', -'wbl_WHITELISTFROM_LABEL' => 'spamassassin whitelist_from', -'wbl_BLACKLISTFROM_LABEL' => 'spamassassin blacklist_from', -'wbl_BLACKLISTFROM_DESCRIPTION' => 'will be rejected by spamassassin.', -'wbl_SBLLIST_LABEL' => 'RHSBL (qpsmtpd SBLList)', -'wbl_SBLLIST_DESCRIPTION' => 'RHS block list - \'right hand side\' of senders host/domain will be checked against the following servers', -'wbl_RBLLIST_LABEL' => 'DNSBL Zones (qpsmtpd RBLList)', -'wbl_RBLLIST_DESCRIPTION' => 'DNS Block List - senders IP address will be checked against the following servers', -'wbl_RBL_TITLE' => 'Real-time Blackhole Lists are disabled by default. To help reduce spam you can enable RBLs here.', diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Wbl/wbl_fr.lex smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Wbl/wbl_fr.lex --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Wbl/wbl_fr.lex 2020-04-01 00:02:44.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Wbl/wbl_fr.lex 1970-01-01 04:00:00.000000000 +0400 @@ -1,37 +0,0 @@ -'wbl_SAVE' => 'Sauvegarder', -'wbl_PERFORM' => 'Exécuter', -'wbl_FORM_TITLE' => 'WBL courriel', -'wbl_OPERATION_STATUS_REPORT' => 'Rapport d\'état de l\'opération', -'wbl_WBL_DESCRIPTION' => 'Le trafic courriel est scanné et peut être bloqué en raison des différentes méthodes de dépistage activées. Vous pouvez utiliser ce panneau pour définir les listes blanches / noires de courriels.', -'wbl_RBL_LIST_DESCRIPTION' => 'La liste RBL est utilisée pour ajuster DNSBL et RHSBL.', -'wbl_RBL_LIST' => 'Liste RBL', -'wbl_BLACK_LIST_DESCRIPTION' => 'Les listes noires sont utilisées pour refuser le trafic de courriels.', -'wbl_BLACK_LIST' => 'Liste noire', -'wbl_WHITE_LIST_DESCRIPTION' => 'Les listes blanches sont utilisées pour accepter le trafic de courriels.', -'wbl_WHITE_LIST' => 'Liste blanche', -'wbl_BLACK_TITLE' => 'Ce serveur inclus un support intégré permettant à l\'administrateur de définir des listes noires, badhelo et badmailfrom.', -'wbl_DNSBL_DESCRIPTION' => 'DNSBL est une abréviation Anglaise pour "Liste noire DNS".', -'wbl_DNSBL_LABEL' => 'Statut DNSBL', -'wbl_RHSBL_DESCRIPTION' => 'RHSBL est une abréviation pour "Right Hand Side Blacklist".', -'wbl_RHSBL_LABEL' => 'Rapport d\'état de RHSBL', -'wbl_BADHELO_DESCRIPTION' => 'Vérifie un message HELO livré par un hôte se connectant. Ceci refuse tout ceux qui apparaissent dans badhelo au moment de la phase \'helo\'.', -'wbl_BADHELO_LABEL' => 'qpsmtpd badhelo', -'wbl_BADMAILFROM_DESCRIPTION' => 'Vérifie l\'adresse de l\'expéditeur. Refuse tout ce qui apparaît (@hôte ou utilisateur@hôte) dans\'badmailfrom\' pendant la phase \'mail\'', -'wbl_BADMAILFROM_LABEL' => 'qmail \'badmailfrom\'', -'wbl_WHITE_TITLE' => 'Utilisez cette page pour modifier les paramètres de liste blanche de de votre serveur. Toutes les entrées seront activées par default', -'wbl_RRFH_LABEL' => 'État des listes blanches', -'wbl_WHITELISTHOSTS_DESCRIPTION' => 'Toute IP présente dans whitelisthosts sera exemptée de toutes validations supplémentaires pendant la phase \'connexion\'', -'wbl_WHITELISTHOSTS_LABEL' => 'Qpsmtpd whitelisthosts', -'wbl_WHITELISTHELO_DESCRIPTION' => 'Tout hôte qui émet un HELO correspondant à une entrée dans whitelisthelo sera exempté de toute autre validation pendant la phase \'helo\'', -'wbl_WHITELISTHELO_LABEL' => 'qpsmtpd whitelisthelo', -'wbl_WHITELISTSENDERS_DESCRIPTION' => 'Tout expéditeur d\'un courriel (hôte.domaine ou utilisateur@hôte.domaine) correspondant à une entrée dans la liste blanche des expéditeurs (whitelistsenders) sera exempté de toutes validations supplémentaires durant la phase \'mail\'.', -'wbl_WHITELISTSENDERS_LABEL' => 'qpsmtpd whitelistsenders', -'wbl_WHITELISTFROM_DESCRIPTION' => 'Tout expéditeur d\'un courriel (*@hôte ou utilisateur@hôte) correspondant à une entrée dans whitelist_from sera exempté d\'un rejet par spamassassin.', -'wbl_WHITELISTFROM_LABEL' => 'spamassassin whitelist_from', -'wbl_BLACKLISTFROM_LABEL' => 'spamassassin blacklist_from', -'wbl_BLACKLISTFROM_DESCRIPTION' => 'Tout expéditeur d\'un courriel (*@hôte ou utilisateur@hôte) correspondant à une entrée dans blacklist_from sera rejeté par spamassassin.', -'wbl_SBLLIST_LABEL' => 'RHSBL (qpsmtpd SBLList)', -'wbl_SBLLIST_DESCRIPTION' => 'Liste de blocage RHS - (Right Hand Side) des expéditeurs hôte / domaine sera vérifié contre les serveurs suivants', -'wbl_RBLLIST_LABEL' => 'DNSBL Zones (qpsmtpd RBLList)', -'wbl_RBLLIST_DESCRIPTION' => 'Liste de bloquage DNS -L\'adresse IP des expéditeurs sera vérifiée à partir des serveurs suivants.', -'wbl_RBL_TITLE' => 'Les listes noires en temps réel sont désactivés par défaut. Pour aider à réduire le spam vous pouvez activer les RBLs ici.', diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr.pm smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr.pm --- smeserver-manager-0.1.0.old/root/usr/share/smanager/lib/SrvMngr.pm 2020-06-11 00:07:31.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/lib/SrvMngr.pm 2020-06-12 22:49:44.935405852 +0400 @@ -280,10 +280,6 @@ $if_admin->get('/remoteaccess')->to('remoteaccess#main')->name('remoteaccess'); $if_admin->post('/remoteaccess')->to('remoteaccess#do_action')->name('remoteaccessact'); - - $if_admin->get('/starterwebsite')->to('starterwebsite#main')->name('starterwebsite'); - $if_admin->post('/starterwebsite')->to('starterwebsite#do_site')->name('starterwebsite2'); - $if_admin->get('/support')->to('support#main')->name('support'); $if_admin->post('/swttheme')->to('swttheme#main')->name('swttheme'); diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_del.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_del.html.ep --- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_del.html.ep 2020-04-15 21:43:35.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_del.html.ep 2020-06-12 22:31:03.749947061 +0400 @@ -2,7 +2,7 @@ % my $btn = l('REMOVE'); - %= form_for '/useraccountd' => (method => 'POST') => begin + %= form_for '/useraccountsd' => (method => 'POST') => begin

%=l 'usr_REMOVE_ACCOUNT_TITLE' diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_lock.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_lock.html.ep --- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_lock.html.ep 2020-04-15 21:43:35.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_lock.html.ep 2020-06-12 22:30:55.885982832 +0400 @@ -2,7 +2,7 @@ % my $btn = l('usr_LOCK'); - %= form_for '/useraccountd' => (method => 'POST') => begin + %= form_for '/useraccountsd' => (method => 'POST') => begin

%=l 'usr_LOCK_ACCOUNT_TITLE' diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_pwd.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_pwd.html.ep --- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_pwd.html.ep 2020-04-15 21:43:35.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_pwd.html.ep 2020-06-12 22:30:46.902023483 +0400 @@ -2,7 +2,7 @@ % my $btn = l('SAVE'); - %= form_for '/useraccountd' => (method => 'POST') => begin + %= form_for '/useraccountsd' => (method => 'POST') => begin

%=l 'RESET_PASSWORD_TITLE' diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_pwds.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_pwds.html.ep --- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_pwds.html.ep 2020-04-15 21:43:35.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_pwds.html.ep 2020-06-12 22:32:28.173553165 +0400 @@ -2,7 +2,7 @@ % my $btn = l('SAVE'); - %= form_for '/useraccountd' => (method => 'POST') => begin + %= form_for '/useraccountsd' => (method => 'POST') => begin

%= l 'usr_SYSTEM_PASSWORD_DESCRIPTION'

diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep --- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep 2020-04-15 21:43:35.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_upd.html.ep 2020-06-12 22:31:35.364801567 +0400 @@ -3,7 +3,7 @@ % my $btn = l('ADD'); - %= form_for '/useraccountd' => (method => 'POST') => begin + %= form_for '/useraccountsd' => (method => 'POST') => begin

%=l 'usr_P2_TITLE' @@ -110,7 +110,7 @@

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

diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_upds.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_upds.html.ep --- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/partials/_usr_upds.html.ep 2020-04-15 21:43:35.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/partials/_usr_upds.html.ep 2020-06-12 22:32:18.189600593 +0400 @@ -2,7 +2,7 @@ % my $btn = l('SAVE'); - %= form_for '/useraccountd' => (method => 'POST') => begin + %= form_for '/useraccountsd' => (method => 'POST') => begin

%=l 'usr_MODIFY_ADMIN_TITLE' @@ -62,7 +62,7 @@

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

diff -urN smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/starterwebsite.html.ep smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/starterwebsite.html.ep --- smeserver-manager-0.1.0.old/root/usr/share/smanager/themes/default/templates/starterwebsite.html.ep 2020-04-26 12:58:49.000000000 +0400 +++ smeserver-manager-0.1.0/root/usr/share/smanager/themes/default/templates/starterwebsite.html.ep 1970-01-01 04:00:00.000000000 +0400 @@ -1,41 +0,0 @@ -% layout 'default', title => 'Sme server 2 - Starter website'; - -% content_for 'module' => begin -

-

Starter website


-
-

<%= $title %>

-
<%= $modul %>
-
- <% my $btn = l('CREATE'); - %> - %= form_for 'starterwebsite' => (method => 'POST') => begin - - %= label_for l_company => begin - %= l('sws_LABEL_COMPANYNAME') - % end - - %= text_field 'l_company', class => 'input' -

- %=l 'sws_DESC_HEADER1' -
- %= text_field 'l_header1', class => 'input' -
- %=l 'sws_DESC_TEXT1' -
- %= text_area 'l_desc1', cols => 40, class => 'input' -

- %=l 'sws_DESC_HEADER2' - %= text_field 'l_header2', class => 'input' -
- %=l 'sws_DESC_TEXT2' -
- %= text_area 'l_desc2', cols => 40, class => 'input' -
- %= $c->render_to_string(inline => (l 'sws_DESC_SUBMIT')) -
- %= submit_button "$btn", class => 'action' - % end - -
-%end \ Pas de fin de ligne à la fin du fichier