From 4969d9feefd435659e7a0bc1e38720029239e26a Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 7 Oct 2010 17:12:26 +0000
Subject: [PATCH] Fix: recovers encode and collate of database
---
build/perl/virtualmin/dolibarr.pl | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/build/perl/virtualmin/dolibarr.pl b/build/perl/virtualmin/dolibarr.pl
index 4d6334319b7..98460047f0c 100644
--- a/build/perl/virtualmin/dolibarr.pl
+++ b/build/perl/virtualmin/dolibarr.pl
@@ -184,6 +184,10 @@ local $cfile = $cfiledir."conf.php";
local $oldcfile = &transname();
local $olddocdir = &transname();
local $url;
+$tmpl = &get_template($d->{'template'});
+$charset = $tmpl->{'mysql_charset'};
+$collate = $tmpl->{'mysql_collate'};
+$encoding = $tmpl->{'postgres_encoding'};
$path = &script_path_url($d, $opts);
if ($path =~ /^https:/) {
$url = "https://$d->{'dom'}";
@@ -241,8 +245,7 @@ if ($upgrade) {
# Remove the installation directory.
local $dinstall = "$opts->{'dir'}/install";
$dinstall =~ s/\/$//;
- $out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall )."/* ");
- $out = &run_as_domain_user($d, "rmdir ".quotemeta($dinstall ));
+ $out = &run_as_domain_user($d, "rm -Rf ".quotemeta($dinstall ));
}
else {
@@ -257,6 +260,8 @@ else {
[ "db_pass", $dbpass ],
[ "action", "set" ],
[ "main_force_https", $opts->{'forcehttps'} ],
+ [ "dolibarr_main_db_character_set", $charset ],
+ [ "dolibarr_main_db_collation", $collate ],
);
local $err = &call_dolibarr_wizard_page(\@params, "etape1", $d, $opts);
return (-1, "Dolibarr wizard failed : $err") if ($err);
@@ -278,8 +283,7 @@ else {
# Remove the installation directory and protect config file.
local $dinstall = "$opts->{'dir'}/install";
$dinstall =~ s/\/$//;
- $out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall )."/* ");
- $out = &run_as_domain_user($d, "rmdir ".quotemeta($dinstall ));
+ $out = &run_as_domain_user($d, "rm -Rf ".quotemeta($dinstall ));
&set_ownership_permissions(undef, undef, 0644, $cfile);
&set_ownership_permissions(undef, undef, 0755, $cfiledir);
--
GitLab