gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-29 13:07:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2020-05-22 14:25:30 +02:00
commit 16f8333e89
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -161,6 +161,7 @@
- new seeddms logo - new seeddms logo
- fix moving clipboard (Closes: #473) - fix moving clipboard (Closes: #473)
- show access rights of folder/document if user has write access - show access rights of folder/document if user has write access
- fix creating preview images of documents in drop folder
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.16 Changes in version 5.1.16

4
op/op.AddDocument.php
View File

@ -430,7 +430,9 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
if($settings->_overrideMimeType) { if($settings->_overrideMimeType) {
$finfo = finfo_open(FILEINFO_MIME_TYPE); $finfo = finfo_open(FILEINFO_MIME_TYPE);
$userfiletype = finfo_file($finfo, $userfiletmp); $tmpfiletype = finfo_file($finfo, $userfiletmp);
if($tmpfiletype != 'application/octet-stream')
$userfiletype = $tmpfiletype;
} }
if ((count($_FILES["userfile"]["tmp_name"])==1)&&($_POST["name"]!="")) if ((count($_FILES["userfile"]["tmp_name"])==1)&&($_POST["name"]!=""))

5
op/op.DropFolderPreview.php
View File

@ -48,6 +48,9 @@ $dir = $dropfolderdir.'/'.$user->getLogin();
if(!file_exists($dir.'/'.$filename)) if(!file_exists($dir.'/'.$filename))
exit; exit;
$finfo = finfo_open(FILEINFO_MIME_TYPE);
$mimetype = finfo_file($finfo, $dir.'/'.$filename);
if(!empty($_GET["width"])) if(!empty($_GET["width"]))
$previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $_GET["width"]); $previewer = new SeedDMS_Preview_Previewer($settings->_cacheDir, $_GET["width"]);
else else
@ -55,7 +58,7 @@ else
$previewer->setConverters($settings->_converters['preview']); $previewer->setConverters($settings->_converters['preview']);
$previewer->setXsendfile($settings->_enableXsendfile); $previewer->setXsendfile($settings->_enableXsendfile);
if(!$previewer->hasRawPreview($dir.'/'.$filename, 'dropfolder/')) if(!$previewer->hasRawPreview($dir.'/'.$filename, 'dropfolder/'))
$previewer->createRawPreview($dir.'/'.$filename, 'dropfolder/'); $previewer->createRawPreview($dir.'/'.$filename, 'dropfolder/', $mimetype);
header('Content-Type: image/png'); header('Content-Type: image/png');
$previewer->getRawPreview($dir.'/'.$filename, 'dropfolder/'); $previewer->getRawPreview($dir.'/'.$filename, 'dropfolder/');

4
op/op.UpdateDocument.php
View File

@ -102,7 +102,9 @@ if (isset($_FILES['userfile']) && $_FILES['userfile']['error'] == 0) {
if($settings->_overrideMimeType) { if($settings->_overrideMimeType) {
$finfo = finfo_open(FILEINFO_MIME_TYPE); $finfo = finfo_open(FILEINFO_MIME_TYPE);
$userfiletype = finfo_file($finfo, $userfiletmp); $tmpfiletype = finfo_file($finfo, $userfiletmp);
if($tmpfiletype != 'application/octet-stream')
$userfiletype = $tmpfiletype;
} }
} elseif($settings->_dropFolderDir) { } elseif($settings->_dropFolderDir) {
if($_POST['dropfolderfileform1']) { if($_POST['dropfolderfileform1']) {