lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: new verification

Browse Source
This commit is contained in:
Regis Houssin 2010-10-17 06:50:45 +00:00
parent 8210299895
commit 73f5667974
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
build/perl/virtualmin/dolibarr.pl
View File

@ -89,7 +89,7 @@ else {
"At top level")); "At top level"));
if ($d->{'ssl'} && $ver >= 2.9) { if ($d->{'ssl'} && $ver >= 2.9) {
$rv .= &ui_table_row("Force https connection?", $rv .= &ui_table_row("Force https connection?",
&ui_yesno_radio("forcehttps", 0)); &ui_yesno_radio("forcehttps", 0));
} }
} }
return $rv; return $rv;
@ -193,7 +193,7 @@ $charset = $dbtype eq "mysql" ? $mycharset : $pgcharset;
$collate = $dbtype eq "mysql" ? $mycollate : "C"; $collate = $dbtype eq "mysql" ? $mycollate : "C";
$path = &script_path_url($d, $opts); $path = &script_path_url($d, $opts);
if ($path =~ /^https:/) { if ($path =~ /^https:/ || $d->{'ssl'}) {
$url = "https://$d->{'dom'}"; $url = "https://$d->{'dom'}";
} }
else { else {
@ -249,7 +249,7 @@ if ($upgrade) {
# Remove the installation directory. # Remove the installation directory.
local $dinstall = "$opts->{'dir'}/install"; local $dinstall = "$opts->{'dir'}/install";
$dinstall =~ s/\/$//; $dinstall =~ s/\/$//;
$out = &run_as_domain_user($d, "rm -Rf ".quotemeta($dinstall )); $out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
} }
else { else {
@ -287,10 +287,9 @@ else {
# Remove the installation directory and protect config file. # Remove the installation directory and protect config file.
local $dinstall = "$opts->{'dir'}/install"; local $dinstall = "$opts->{'dir'}/install";
$dinstall =~ s/\/$//; $dinstall =~ s/\/$//;
$out = &run_as_domain_user($d, "rm -Rf ".quotemeta($dinstall )); $out = &run_as_domain_user($d, "rm -rf ".quotemeta($dinstall));
&set_ownership_permissions(undef, undef, 0644, $cfile); &set_ownership_permissions(undef, undef, 0644, $cfile);
&set_ownership_permissions(undef, undef, 0755, $cfiledir); &set_ownership_permissions(undef, undef, 0755, $cfiledir);
} }
# Return a URL for the user # Return a URL for the user
@ -347,7 +346,7 @@ return (1, "Dolibarr directory and tables deleted.");
sub script_dolibarr_latest sub script_dolibarr_latest
{ {
local ($ver) = @_; local ($ver) = @_;
if ($ver >= 2.8) { if ($ver >= 2.9) {
return ( "http://www.dolibarr.fr/files/stable/", return ( "http://www.dolibarr.fr/files/stable/",
"dolibarr\\-(2\\.[0-9\\.]+)" ); "dolibarr\\-(2\\.[0-9\\.]+)" );
} }