Fix: Sanitize filename

This commit is contained in:
Laurent Destailleur 2011-01-14 01:24:00 +00:00
parent daa6438fa0
commit 5bde360164
5 changed files with 11 additions and 7 deletions

View File

@ -511,7 +511,7 @@ if ($_POST['action'] == 'send' && ! $_POST['addfile'] && ! $_POST['removedfile']
$result=$mailfile->sendfile();
if ($result)
{
$mesg='<div class="ok">'.$langs->trans('MailSuccessfulySent',$from,$sendto).'.</div>';
$mesg=$langs->trans('MailSuccessfulySent',$from,$sendto);
$error=0;
@ -969,7 +969,11 @@ if ($id > 0 || ! empty($ref))
* Show object in view mode
*/
if ($mesg) print $mesg."<br>";
if ($mesg)
{
if (! preg_match('/div class=/',$mesg)) print '<div class="ok">'.$mesg.'</div><br>';
else print $mesg."<br>";
}
$object->fetch($id,$ref);
@ -1612,7 +1616,7 @@ if ($id > 0 || ! empty($ref))
if (! empty($_REQUEST["mode"]) && $_REQUEST["mode"]=='init')
{
$formmail->clear_attached_files();
$formmail->add_attached_files($file,$object->ref.'.pdf','application/pdf');
$formmail->add_attached_files($file,dol_sanitizeFilename($object->ref).'.pdf','application/pdf');
}
$formmail->show_form();

View File

@ -1916,7 +1916,7 @@ else
if (! empty($_REQUEST["mode"]) && $_REQUEST["mode"]=='init')
{
$formmail->clear_attached_files();
$formmail->add_attached_files($file,$ref.'.pdf','application/pdf');
$formmail->add_attached_files($file,dol_sanitizeFilename($ref.'.pdf'),'application/pdf');
}
// Show form

View File

@ -2871,7 +2871,7 @@ else
if (! empty($_REQUEST["mode"]) && $_REQUEST["mode"]=='init')
{
$formmail->clear_attached_files();
$formmail->add_attached_files($file,$ref.'.pdf','application/pdf');
$formmail->add_attached_files($file,dol_sanitizeFilename($ref.'.pdf'),'application/pdf');
}
$formmail->show_form();

View File

@ -1474,7 +1474,7 @@ if ($id > 0 || ! empty($ref))
if (! empty($_REQUEST["mode"]) && $_REQUEST["mode"]=='init')
{
$formmail->clear_attached_files();
$formmail->add_attached_files($file,$ref.'.pdf','application/pdf');
$formmail->add_attached_files($file,dol_sanitizeFilename($ref.'.pdf'),'application/pdf');
}
// Show form

View File

@ -1867,7 +1867,7 @@ else
if (! empty($_REQUEST["mode"]) && $_REQUEST["mode"]=='init')
{
$formmail->clear_attached_files();
$formmail->add_attached_files($file,$ref.'.pdf','application/pdf');
$formmail->add_attached_files($file,dol_sanitizeFilename($ref.'.pdf'),'application/pdf');
}
// Show form