diff --git a/root/etc/e-smith/web/functions/dungog-domains b/root/etc/e-smith/web/functions/dungog-domains old mode 100755 new mode 100644 index a4dedb3..deea842 --- a/root/etc/e-smith/web/functions/dungog-domains +++ b/root/etc/e-smith/web/functions/dungog-domains @@ -131,7 +131,7 @@ sub showInitial ($$) print $q->hr; } - print $q->startform (-method => 'POST', -action => $q->url (-absolute => 1)); + print $q->start_form (-method => 'POST', -action => $q->url (-absolute => 1)); print $q->p ('Set pseudonyms for a single domain,
This panel just shows the pseudonyms for a single domain.
@@ -189,7 +189,7 @@ sub showInitial ($$) print $q->hidden (-name => 'MailServer', -override => 1, -default => 'skipMS'); print $q->hidden (-name => 'state', -override => 1, -default => 'save'); - print $q->endform; + print $q->end_form; print $q->p ($q->hr, $q->font ({size => "-1"}, "Copyright dungog.net")); print ''; @@ -218,7 +218,7 @@ sub modifyOptions ($$) print $q->hr; } - print $q->startform (-method => 'POST', -action => $q->url (-absolute => 1)); + print $q->start_form (-method => 'POST', -action => $q->url (-absolute => 1)); # find system users my @userlist = ('admin','everyone'); @@ -271,7 +271,7 @@ sub modifyOptions ($$) print $q->hidden (-name => 'domain', -override => 1, -default => $domain); print $q->hidden (-name => 'state', -override => 1, -default => 'performModifyOptions'); - print $q->endform; + print $q->end_form; print $q->p ($q->hr, $q->font ({size => "-1"}, "Copyright dungog.net")); print ''; @@ -325,7 +325,7 @@ sub modifyEmail ($$) print $q->hr; } - print $q->startform (-method => 'POST', -action => $q->url (-absolute => 1)); + print $q->start_form (-method => 'POST', -action => $q->url (-absolute => 1)); #commom with userpanel @@ -412,7 +412,7 @@ sub modifyEmail ($$) print $q->hidden (-name => 'state', -override => 1, -default => 'save'); print $q->hidden (-name => 'domain', -override => 1, -default => $domain); - print $q->endform; + print $q->end_form; print $q->p ($q->hr, $q->font ({size => "-1"}, "Copyright dungog.net")); print ''; @@ -480,7 +480,7 @@ sub editEmail ($$) my @sorted = sort @selected; - print $q->startform (-method => 'POST', -action => $q->url (-absolute => 1)); + print $q->start_form (-method => 'POST', -action => $q->url (-absolute => 1)); print $q->table ({border => 0, cellspacing => 0, cellpadding => 4}, @@ -508,7 +508,7 @@ sub editEmail ($$) print $q->hidden (-name => 'newuser', -override => 1, -default => $newuser); print $q->hidden (-name => 'state', -override => 1, -default => 'performEmail'); - print $q->endform; + print $q->end_form; print $q->p ($q->hr, $q->font ({size => "-1"}, "Copyright dungog.net")); print ''; @@ -617,4 +617,4 @@ sub performSave ($) showInitial ($q, "Settings saved and email restarted."); #showInitial ($q, "Settings saved and email restarted." ,"$domain"); -} +} \ No newline at end of file diff --git a/root/etc/e-smith/web/functions/userpanel-domains b/root/etc/e-smith/web/functions/userpanel-domains old mode 100755 new mode 100644 index 2a067cc..bc79de9 --- a/root/etc/e-smith/web/functions/userpanel-domains +++ b/root/etc/e-smith/web/functions/userpanel-domains @@ -177,7 +177,7 @@ sub showInitial ($$$) print $q->hr; } - print $q->startform (-method => 'POST', -action => $q->url (-absolute => 1)); + print $q->start_form (-method => 'POST', -action => $q->url (-absolute => 1)); #are there any ? my $domains = @domains; @@ -343,7 +343,7 @@ sub editEmail ($$) my @sorted = sort @selected; - print $q->startform (-method => 'POST', -action => $q->url (-absolute => 1)); + print $q->start_form (-method => 'POST', -action => $q->url (-absolute => 1)); print $q->table ({border => 0, cellspacing => 0, cellpadding => 4}, @@ -371,7 +371,7 @@ sub editEmail ($$) print $q->hidden (-name => 'newuser', -override => 1, -default => $newuser); print $q->hidden (-name => 'state', -override => 1, -default => 'performEmail'); - print $q->endform; + print $q->end_form; print $q->p ($q->hr, $q->font ({size => "-1"}, "Copyright dungog.net")); print ''; @@ -483,4 +483,4 @@ sub performSelect ($) my $swap = $q->param ('swap'); showInitial ($q, "Domain switched to $swap" ,"$swap"); -} +} \ No newline at end of file diff --git a/root/usr/share/smanager/lib/SrvMngr/Controller/Dungog_domains.pm b/root/usr/share/smanager/lib/SrvMngr/Controller/Dungog_domains.pm index 93b440e..e018d09 100644 --- a/root/usr/share/smanager/lib/SrvMngr/Controller/Dungog_domains.pm +++ b/root/usr/share/smanager/lib/SrvMngr/Controller/Dungog_domains.pm @@ -25,20 +25,17 @@ use SrvMngr qw(theme_list init_session); use Data::Dumper; use esmith::util; -use esmith::HostsDB; -use esmith::AccountsDB; +use esmith::HostsDB::UTF8; +use esmith::AccountsDB::UTF8; -our $db = esmith::ConfigDB->open(); -our $adb = esmith::AccountsDB->open(); +my $db = esmith::ConfigDB::UTF8->open(); +my $adb = esmith::AccountsDB::UTF8->open(); use constant FALSE => 0; use constant TRUE => 1; -our $domaindb = esmith::ConfigDB->open('/home/e-smith/db/domains') - or die "Unable to open domains db"; - -our $dungogdb = esmith::ConfigDB->open('/home/e-smith/db/dungog') - or die("Unable to open dungog db"); #Created by rpm +my $domaindb; +my $dungogdb; my %ddo_datas = (); @@ -49,6 +46,11 @@ sub main { my $c = shift; $c->app->log->info( $c->log_req ); + $db = esmith::ConfigDB::UTF8->open(); + $adb = esmith::AccountsDB::UTF8->open(); + $domaindb = esmith::ConfigDB::UTF8->open('/home/e-smith/db/domains') or die "Unable to open domains db"; + $dungogdb = esmith::ConfigDB::UTF8->open('/home/e-smith/db/dungog') or die("Unable to open dungog db"); #Created by rpm + my $title = $c->l('ddo_title'); my $modul = ''; @@ -80,6 +82,10 @@ sub do_Save { # my $c = shift; $c->app->log->info( $c->log_req ); + $db = esmith::ConfigDB::UTF8->open(); + $adb = esmith::AccountsDB::UTF8->open(); + $domaindb = esmith::ConfigDB::UTF8->open('/home/e-smith/db/domains') or die "Unable to open domains db"; + $dungogdb = esmith::ConfigDB::UTF8->open('/home/e-smith/db/dungog') or die("Unable to open dungog db"); #Created by rpm my $title = $c->l('ddo_title'); my $modul = ''; @@ -201,6 +207,10 @@ sub do_Email { my $c = shift; $c->app->log->info( $c->log_req ); + $db = esmith::ConfigDB::UTF8->open(); + $adb = esmith::AccountsDB::UTF8->open(); + $domaindb = esmith::ConfigDB::UTF8->open('/home/e-smith/db/domains') or die "Unable to open domains db"; + $dungogdb = esmith::ConfigDB::UTF8->open('/home/e-smith/db/dungog') or die("Unable to open dungog db"); #Created by rpm my %ddo_datas = (); my $title = $c->l('ddo_Email_Title'); @@ -227,6 +237,10 @@ sub do_Options { my $c = shift; $c->app->log->info( $c->log_req ); + $db = esmith::ConfigDB::UTF8->open(); + $adb = esmith::AccountsDB::UTF8->open(); + $domaindb = esmith::ConfigDB::UTF8->open('/home/e-smith/db/domains') or die "Unable to open domains db"; + $dungogdb = esmith::ConfigDB::UTF8->open('/home/e-smith/db/dungog') or die("Unable to open dungog db"); #Created by rpm my $title = $c->l('ddo_modify_options_TITLE'); my $modul = ''; @@ -272,6 +286,8 @@ sub do_DelPseudo { # my $c = shift; $c->app->log->info( $c->log_req ); + $db = esmith::ConfigDB::UTF8->open(); + $adb = esmith::AccountsDB::UTF8->open(); my $title = $c->l('ddo_title'); my $modul = ''; @@ -297,6 +313,8 @@ sub do_AddPseudo { my $c = shift; $c->app->log->info( $c->log_req ); + $db = esmith::ConfigDB::UTF8->open(); + $adb = esmith::AccountsDB::UTF8->open(); my $title = $c->l('ddo_Edit_Title'); my $modul = ''; @@ -404,4 +422,4 @@ sub get_accts { return sort @selected; } -1; +1; \ No newline at end of file diff --git a/smeserver-domains.spec b/smeserver-domains.spec index 2f8e2a7..1c09793 100644 --- a/smeserver-domains.spec +++ b/smeserver-domains.spec @@ -1,6 +1,6 @@ %define name smeserver-domains %define version 1.4 -%define release 12 +%define release 13 Summary: SMEserver rpm for domain pseudonyms Name: %{name} Version: %{version} @@ -22,6 +22,9 @@ AutoReqProv: no SMEserver rpm for more advanced domain controls %changelog +* Sun Oct 05 2025 Brian Read 1.4-13.sme +- Add UTF8 and avoid potential DB caching problems [SME: 13209] + * Sat Oct 04 2025 Brian Read 1.4-12.sme - Delete en.pm and create .lex file if needed [SME: 13214]