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

Fix: Error management

Browse Source
This commit is contained in:
Laurent Destailleur 2010-09-07 19:18:10 +00:00
parent e6a3225ae7
commit 00f3f5903e
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/admin/security_other.php
View File

@ -64,9 +64,11 @@ if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC))
{
$mesg = '<div class="error">'.$langs->trans("ErrorFileNotUploaded").'</div>';
}
else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload)) // Files infected by a virus
else if (preg_match('/ErrorFileIsInfectedWithAVirus.(.*)/',$resupload,$reg)) // Files infected by a virus
{
$mesg = '<div class="error">'.$langs->trans("ErrorFileIsInfectedWithAVirus").'</div>';
$mesg = '<div class="error">'.$langs->trans("ErrorFileIsInfectedWithAVirus");
$mesg.= '<br>'.$langs->trans("Information").': '.$langs->trans($reg[1]);
$mesg.= '</div>';
}
else // Known error
{

7
htdocs/lib/antivir.class.php
View File

@ -50,9 +50,10 @@ class AntiVir
}
/**
* \brief Scan a file with antivirus
* \param file File to scan
* \return int <0 if KO (-98 if error, -99 if virus), 0 if OK
* Scan a file with antivirus.
* This function runs the command defined in setup. This antivirus command must return 0 if OK.
* @param file File to scan
* @return int <0 if KO (-98 if error, -99 if virus), 0 if OK
*/
function dol_avscan_file($file)
{