diff --git a/htdocs/ecm/docmine.php b/htdocs/ecm/docmine.php index b768348bfe452cb1fe279dfc66c9e65ea33e122b..730181d439ff24e59ae6c0faa1e31429f5542dda 100644 --- a/htdocs/ecm/docmine.php +++ b/htdocs/ecm/docmine.php @@ -90,29 +90,40 @@ $upload_dir = $conf->ecm->dir_output.'/'.$relativepath; // Envoie fichier if ( $_POST["sendit"] && $conf->upload != 0) { - if (! is_dir($upload_dir)) create_exdir($upload_dir); - - if (is_dir($upload_dir)) - { - $result = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . $_FILES['userfile']['name'],0); - if ($result > 0) - { - //$mesg = '<div class="ok">'.$langs->trans("FileTransferComplete").'</div>'; - //print_r($_FILES); - $result=$ecmdir->changeNbOfFiles('+'); - } - else if ($result < 0) - { - // Echec transfert (fichier depassant la limite ?) - $mesg = '<div class="error">'.$langs->trans("ErrorFileNotUploaded").'</div>'; - // print_r($_FILES); - } - else - { - // Fichier infect? par un virus - $mesg = '<div class="error">'.$langs->trans("ErrorFileIsInfectedWith",$result).'</div>'; - } - } + if (! is_dir($upload_dir)) + { + $result=create_exdir($upload_dir); + } + + if (is_dir($upload_dir)) + { + $result = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . $_FILES['userfile']['name'],0); + if ($result > 0) + { + //$mesg = '<div class="ok">'.$langs->trans("FileTransferComplete").'</div>'; + //print_r($_FILES); + $result=$ecmdir->changeNbOfFiles('+'); + } + else if ($result < 0) + { + // Echec transfert (fichier depassant la limite ?) + $langs->load("errors"); + $mesg = '<div class="error">'.$langs->trans("ErrorFileNotUploaded").'</div>'; + // print_r($_FILES); + } + else + { + // File infected by a virus + $langs->load("errors"); + $mesg = '<div class="error">'.$langs->trans("ErrorFileIsInfectedWith",$result).'</div>'; + } + } + else + { + // Echec transfert (fichier depassant la limite ?) + $langs->load("errors"); + $mesg = '<div class="error">'.$langs->trans("ErrorFailToCreateDir",$upload_dir).'</div>'; + } } // Remove file diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang index 3af5dd0b5bf24e2112cd39e0a67982d30e718934..af8550ce61fb0021dbce0ecc008e30f034958ca1 100644 --- a/htdocs/langs/en_US/errors.lang +++ b/htdocs/langs/en_US/errors.lang @@ -3,6 +3,7 @@ ErrorDuplicateTrigger=A trigger file with class nam '<b>%s</b>' is present sevar ErrorFailToDeleteFile=Failed to remove file '<b>%s</b>'. ErrorFailToCreateFile=Failed to create file '<b>%s</b>'. ErrorFailToRenameDir=Failed to rename directory '<b>%s</b>' into '<b>%s</b>'. +ErrorFailToCreateDir=Failed to create directory '<b>%s</b>'. ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as contact for this type. ErrorCashAccountAcceptsOnlyCashMoney=This bank account is a cash account, so it accepts payments of type cash only. ErrorFromToAccountsMustDiffers=Source and targets bank accounts must be different. diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang index 5bfeda2056ee9ff387cd98b9d5a63f8058eabc45..d5d5cc95926634fc70604c5f771960a8f148771f 100644 --- a/htdocs/langs/fr_FR/errors.lang +++ b/htdocs/langs/fr_FR/errors.lang @@ -3,6 +3,7 @@ ErrorDuplicateTrigger=Un fichier trigger de classe '<b>%s</b>' est present plusi ErrorFailToCreateFile=Echec de la cr�ation du fichier '<b>%s</b>'. ErrorFailToDeleteFile=Echec de l'effacement du fichier '<b>%s</b>'. ErrorFailToRenameDir=Echec du renommage du r�pertoire '<b>%s</b>' en '<b>%s</b>'. +ErrorFailToCreateDir=Echec de cr�ation du r�pertoire '<b>%s</b>'. ErrorThisContactIsAlreadyDefinedAsThisType=Ce contact est d�j� d�fini comme contact pour ce type. ErrorCashAccountAcceptsOnlyCashMoney=Ce compte bancaire est de type caisse et n'accepte que les mode de r�glement de type <b>esp�ce</b>. ErrorFromToAccountsMustDiffers=Le compte source et destination doivent etre diff�rents.