From da27f27f788e1ca9123eca7a6c17d88e1ded964d Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 9 Sep 2010 21:43:47 +0000 Subject: [PATCH] Fix: bad link --- htdocs/fichinter/document.php | 52 +++++++++++++++++------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php index d9c7093dbfd..b0c50103e4e 100644 --- a/htdocs/fichinter/document.php +++ b/htdocs/fichinter/document.php @@ -28,10 +28,10 @@ */ require("../main.inc.php"); -require_once(DOL_DOCUMENT_ROOT."/fichinter/fichinter.class.php"); +require_once(DOL_DOCUMENT_ROOT."/fichinter/class/fichinter.class.php"); require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); require_once(DOL_DOCUMENT_ROOT."/lib/fichinter.lib.php"); -require_once(DOL_DOCUMENT_ROOT."/html.formfile.class.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); $langs->load("other"); $langs->load("fichinter"); @@ -69,32 +69,32 @@ $modulepart='fichinter'; */ if ($_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC)) { - /* - * Creation repertoire si n'existe pas - */ - if (! is_dir($upload_dir)) create_exdir($upload_dir); + require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); - if (is_dir($upload_dir)) - { - $result = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . $_FILES['userfile']['name'],0); - if ($result > 0) - { - $mesg = '
'.$langs->trans("FileTransferComplete").'
'; - //print_r($_FILES); - } - else if ($result == -99) - { - // Files infected by a virus - $langs->load("errors"); - $mesg = '
'.$langs->trans("ErrorFileIsInfectedWithAVirus").'
'; - } - else if ($result < 0) + if (create_exdir($upload_dir) >= 0) + { + $resupload=dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . $_FILES['userfile']['name'],0,0,$_FILES['userfile']['error']); + if (is_numeric($resupload) && $resupload > 0) { - // Echec transfert (fichier depassant la limite ?) - $mesg = '
'.$langs->trans("ErrorFileNotUploaded").'
'; - // print_r($_FILES); + $mesg = '
'.$langs->trans("FileTransferComplete").'
'; } - } + else + { + $langs->load("errors"); + if ($resupload < 0) // Unknown error + { + $mesg = '
'.$langs->trans("ErrorFileNotUploaded").'
'; + } + else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload)) // Files infected by a virus + { + $mesg = '
'.$langs->trans("ErrorFileIsInfectedWithAVirus").'
'; + } + else // Known error + { + $mesg = '
'.$langs->trans($resupload).'
'; + } + } + } } @@ -162,7 +162,7 @@ if ($object->id) // List of document $param='&id='.$object->id; - $formfile->list_of_documents($filearray,$object,'fichinter',$param); + $formfile->list_of_documents($filearray,$object,'ficheinter',$param); } else