From ec0816e825d9f006e1eae9c44d69a00e87c62e6c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 23 Jun 2015 07:02:15 +0200 Subject: [PATCH] finfo returns only mimetype --- op/op.AddDocument.php | 6 +++--- op/op.UpdateDocument.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php index 8c34c9745..23df24275 100644 --- a/op/op.AddDocument.php +++ b/op/op.AddDocument.php @@ -226,10 +226,10 @@ if($settings->_dropFolderDir) { if($_FILES["userfile"]['error'][0] != 0) $_FILES["userfile"] = array(); } - $finfo = finfo_open(FILEINFO_MIME); - $mimetype = explode(';', finfo_file($finfo, $fullfile)); + $finfo = finfo_open(FILEINFO_MIME_TYPE); + $mimetype = finfo_file($finfo, $fullfile); $_FILES["userfile"]['tmp_name'][] = $fullfile; - $_FILES["userfile"]['type'][] = $mimetype[0]; + $_FILES["userfile"]['type'][] = $mimetype; $_FILES["userfile"]['name'][] = $_POST["dropfolderfileform1"]; $_FILES["userfile"]['size'][] = filesize($fullfile); $_FILES["userfile"]['error'][] = 0; diff --git a/op/op.UpdateDocument.php b/op/op.UpdateDocument.php index d8e6b47c4..70d924015 100644 --- a/op/op.UpdateDocument.php +++ b/op/op.UpdateDocument.php @@ -77,10 +77,10 @@ if ($_FILES['userfile']['error'] == 0) { if($_POST['dropfolderfileform1']) { $fullfile = $settings->_dropFolderDir.'/'.$user->getLogin().'/'.$_POST["dropfolderfileform1"]; if(file_exists($fullfile)) { - $finfo = finfo_open(FILEINFO_MIME); - $mimetype = explode(';', finfo_file($finfo, $fullfile)); + $finfo = finfo_open(FILEINFO_MIME_TYPE); + $mimetype = finfo_file($finfo, $fullfile); $userfiletmp = $fullfile; - $userfiletype = $mimetype[0]; + $userfiletype = $mimetype; $userfilename= $_POST["dropfolderfileform1"]; } else { UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));