diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index c09ab8ed3f9..f61f046254d 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -463,6 +463,19 @@ if (! empty($_SESSION["commandbackuplastdone"]))
$_SESSION["commandbackuptorun"]='';
$_SESSION["commandbackupresult"]='';
}
+if (! empty($_SESSION["commandbackuptorun"]))
+{
+ print '
'.$langs->trans("YouMustRunCommandFromCommandLineAfterLoginToUser",$dolibarr_main_db_user,$dolibarr_main_db_user).':
'."\n";
+ print '
'."\n";
+ print ajax_autoselect("commandbackuptoruntext", 0);
+ print '
';
+
+ //print $paramclear;
+
+ $_SESSION["commandbackuplastdone"]='';
+ $_SESSION["commandbackuptorun"]='';
+ $_SESSION["commandbackupresult"]='';
+}
?>
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 7e2fa8ee79d..018605d4872 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -214,10 +214,10 @@ else
$_SESSION["commandbackupresult"]=$resultstring;
}
- else
+ /*else
{
- setEventMessages($langs->trans("YouMustRunCommandFromCommandLineAfterLoginToUser",$dolibarr_main_db_user,$dolibarr_main_db_user), null, 'mesgs');
- }
+ setEventMessages($langs->trans("YouMustRunCommandFromCommandLineAfterLoginToUser",$dolibarr_main_db_user,$dolibarr_main_db_user), null, 'warnings');
+ }*/
}
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index cf5d02a7b31..51ebb2e9e32 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -196,7 +196,7 @@ class Utils
// Check type parameter
if ($type == 'auto') $type = $db->type;
- if (! in_array($type, array('pgsql', 'mysql', 'mysqli','mysqlnobin')))
+ if (! in_array($type, array('postgresql', 'pgsql', 'mysql', 'mysqli', 'mysqlnobin')))
{
$langs->load("errors");
$this->error=$langs->transnoentitiesnoconv("ErrorBadValueForParameter", $type, "Basetype");
@@ -381,7 +381,7 @@ class Utils
}
// POSTGRESQL
- if ($type == 'postgresql')
+ if ($type == 'postgresql' || $type == 'pgsql')
{
$cmddump=$conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;