smecontribs/smeserver-webhosting
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Tue Oct 07 2025 Brian Read <brianr@koozali.org> 11.0.0-6.sme

Browse Source 
- Add UTF8 and avoid potential DB caching problems [SME: 13209]
This commit is contained in:
Brian Read
2025-10-07 14:53:12 +01:00
parent 50f108bc4f
commit 44cdc29645
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
root/usr/share/smanager/lib/SrvMngr/Controller/Webhosting.pm
View File

@@ -19,9 +19,9 @@ use Locale::gettext;
use SrvMngr::I18N; use SrvMngr::I18N;
use SrvMngr qw( theme_list init_session is_normal_password ); use SrvMngr qw( theme_list init_session is_normal_password );
use esmith::AccountsDB; use esmith::AccountsDB::UTF8;
use esmith::ConfigDB; use esmith::ConfigDB::UTF8;
use esmith::DomainsDB; use esmith::DomainsDB::UTF8;
use esmith::php; use esmith::php;
my ($adb,$cdb); my ($adb,$cdb);
@@ -80,8 +80,8 @@ our %optionsproperties =(
sub main { sub main {
$adb = esmith::AccountsDB->open() || die "Couldn't open accounts db"; $adb = esmith::AccountsDB::UTF8->open() || die "Couldn't open accounts db";
$cdb = esmith::ConfigDB->open() || die "Couldn't open config db"; $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
@@ -101,8 +101,8 @@ sub main {
sub do_display { sub do_display {
$adb = esmith::AccountsDB->open() || die "Couldn't open accounts db"; $adb = esmith::AccountsDB::UTF8->open() || die "Couldn't open accounts db";
$cdb = esmith::ConfigDB->open() || die "Couldn't open config db"; $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
my $c = shift; my $c = shift;
$c->app->log->info($c->log_req); $c->app->log->info($c->log_req);
@@ -212,8 +212,8 @@ sub do_action {
sub modify_ibay { sub modify_ibay {
$adb = esmith::AccountsDB->open() || die "Couldn't open accounts db"; $adb = esmith::AccountsDB::UTF8->open() || die "Couldn't open accounts db";
$cdb = esmith::ConfigDB->open() || die "Couldn't open config db"; $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
my ($c, $name) = @_; my ($c, $name) = @_;
@@ -296,8 +296,8 @@ sub modify_ibay {
sub get_current_value{ sub get_current_value{
$adb = esmith::AccountsDB->open() || die "Couldn't open accounts db"; $adb = esmith::AccountsDB::UTF8->open() || die "Couldn't open accounts db";
$cdb = esmith::ConfigDB->open() || die "Couldn't open config db"; $cdb = esmith::ConfigDB::UTF8->open() || die "Couldn't open config db";
my ($c, $name, $property) = @_; my ($c, $name, $property) = @_;
my $ibay = $adb->get($name); my $ibay = $adb->get($name);
my $key = $ibay->key; my $key = $ibay->key;
@@ -339,7 +339,7 @@ sub validate_up_post{
sub get_current_php_value { sub get_current_php_value {
$adb = esmith::AccountsDB->open() || die "Couldn't open accounts db"; $adb = esmith::AccountsDB::UTF8->open() || die "Couldn't open accounts db";
my ($c, $name) = @_; my ($c, $name) = @_;
my $ibay= $adb->get($name); my $ibay= $adb->get($name);
return "default" unless defined $ibay->prop('PHPVersion'); return "default" unless defined $ibay->prop('PHPVersion');
@@ -367,7 +367,7 @@ sub get_php_options {
sub print_options { sub print_options {
$adb = esmith::AccountsDB->open() || die "Couldn't open accounts db"; $adb = esmith::AccountsDB::UTF8->open() || die "Couldn't open accounts db";
my ($c, $property) = @_; my ($c, $property) = @_;
@@ -393,7 +393,7 @@ sub print_options {
sub print_disabledfunctions { sub print_disabledfunctions {
$adb = esmith::AccountsDB->open() || die "Couldn't open accounts db"; $adb = esmith::AccountsDB::UTF8->open() || die "Couldn't open accounts db";
my ($c) = @_; my ($c) = @_;
my $translate = $c->l('wh_DESC_DISABLEDFUNCTIONS'); my $translate = $c->l('wh_DESC_DISABLEDFUNCTIONS');
@@ -406,7 +406,7 @@ sub print_disabledfunctions {
sub print_phpbasedir { sub print_phpbasedir {
$adb = esmith::AccountsDB->open() || die "Couldn't open accounts db"; $adb = esmith::AccountsDB::UTF8->open() || die "Couldn't open accounts db";
my ($c) = @_; my ($c) = @_;
my $translate = $c->l('wh_DESC_PHPBASEDIR'); my $translate = $c->l('wh_DESC_PHPBASEDIR');

5
smeserver-webhosting.spec
View File

@@ -1,6 +1,6 @@
%define name smeserver-webhosting %define name smeserver-webhosting
%define version 11.0.0 %define version 11.0.0
%define release 5 %define release 6
Name: %{name} Name: %{name}
Version: %{version} Version: %{version}
@@ -50,6 +50,9 @@ rm -rf %{name}-%{version}
%defattr(-,root,root) %defattr(-,root,root)
%changelog %changelog
* Tue Oct 07 2025 Brian Read <brianr@koozali.org> 11.0.0-6.sme
- Add UTF8 and avoid potential DB caching problems [SME: 13209]
* Sat Oct 04 2025 Brian Read <brianr@koozali.org> 11.0.0-5.sme * Sat Oct 04 2025 Brian Read <brianr@koozali.org> 11.0.0-5.sme
- Remove smanager-refresh from spec file [SME: 13212] - Remove smanager-refresh from spec file [SME: 13212]