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

Better filter to exclude mysqldump warning

Browse Source
This commit is contained in:
Laurent Destailleur 2016-02-22 13:32:01 +01:00
parent 762ab060e4
commit a08fa814ec
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -198,10 +198,12 @@ if ($what == 'mysql')
$ok=0; $ok=0;
dol_syslog("Run command ".$fullcommandcrypted); dol_syslog("Run command ".$fullcommandcrypted);
$handlein = popen($fullcommandclear, 'r'); $handlein = popen($fullcommandclear, 'r');
$i=0;
while (!feof($handlein)) while (!feof($handlein))
{ {
$i++; // output line number
$read = fgets($handlein); $read = fgets($handlein);
if (preg_match('/'.preg_quote('Warning: Using a password').'/i', $read)) continue; if ($i == 1 && preg_match('/'.preg_quote('Warning: Using a password').'/i', $read)) continue;
fwrite($handle,$read); fwrite($handle,$read);
if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1; if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1; elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;