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

FIX #7590

Browse Source
This commit is contained in:
Laurent Destailleur 2017-11-25 01:58:11 +01:00
parent d90f68837a
commit 88841ccbae
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/admin/tools/dolibarr_export.php
View File

@ -463,6 +463,19 @@ if (! empty($_SESSION["commandbackuplastdone"]))
$_SESSION["commandbackuptorun"]='';
$_SESSION["commandbackupresult"]='';
}
if (! empty($_SESSION["commandbackuptorun"]))
{
print '<br><font class="warning">'.$langs->trans("YouMustRunCommandFromCommandLineAfterLoginToUser",$dolibarr_main_db_user,$dolibarr_main_db_user).':</font><br>'."\n";
print '<textarea id="commandbackuptoruntext" rows="'.ROWS_2.'" class="centpercent">'.$_SESSION["commandbackuptorun"].'</textarea><br>'."\n";
print ajax_autoselect("commandbackuptoruntext", 0);
print '<br>';
//print $paramclear;
$_SESSION["commandbackuplastdone"]='';
$_SESSION["commandbackuptorun"]='';
$_SESSION["commandbackupresult"]='';
}
?>
</div> <!-- end div center button -->

6
htdocs/admin/tools/export.php
View File

@ -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');
}*/
}

4
htdocs/core/class/utils.class.php
View File

@ -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;