From b7779e3154ff03704e86a2fd718face6c6678323 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 25 Jun 2013 16:54:36 +0200 Subject: [PATCH] set filetype of uploaded document --- utils/adddoc.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/utils/adddoc.php b/utils/adddoc.php index 47dcdb423..21940a789 100644 --- a/utils/adddoc.php +++ b/utils/adddoc.php @@ -112,9 +112,9 @@ if(isset($options['f'])) { exit(1); } -$filetype = ''; +$mimetype = ''; if(isset($options['t'])) { - $filetype = $options['t']; + $mimetype = $options['t']; } $reqversion = 0; @@ -146,9 +146,12 @@ $user = $dms->getUser(1); if(is_readable($filename)) { if(filesize($filename)) { $finfo = new finfo(FILEINFO_MIME); - if(!$filetype) { - $filetype = $finfo->file($filename); + if(!$mimetype) { + $mimetype = $finfo->file($filename); } + $lastDotIndex = strrpos(basename($filename), "."); + if (is_bool($lastDotIndex) && !$lastDotIndex) $filetype = "."; + else $filetype = substr($filename, $lastDotIndex); } else { echo "File has zero size\n"; exit(1); @@ -187,7 +190,7 @@ $approvers = array(); $res = $folder->addDocument($name, $comment, $expires, $user, $keywords, $categories, $filetmp, basename($filename), - '', $filetype, $sequence, $reviewers, + $filetype, $mimetype, $sequence, $reviewers, $approvers, $reqversion, $version_comment); if (is_bool($res) && !$res) {