gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-12 04:31:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

do not use mimetype delivered by server if overrideMimeType is set

Browse Source
This commit is contained in:
Uwe Steinmann 2015-06-23 07:45:18 +02:00
parent 515e95c227
commit d46d2b265d
7 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
op/op.AddDocument.php
View File

@ -252,6 +252,11 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){
$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION); $fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
if($settings->_overrideMimeType) {
$finfo = finfo_open(FILEINFO_MIME_TYPE);
$userfiletype = finfo_file($finfo, $userfiletmp);
}
if ((count($_FILES["userfile"]["tmp_name"])==1)&&($_POST["name"]!="")) if ((count($_FILES["userfile"]["tmp_name"])==1)&&($_POST["name"]!=""))
$name = $_POST["name"]; $name = $_POST["name"];
else $name = basename($userfilename); else $name = basename($userfilename);

5
op/op.AddFile.php
View File

@ -59,6 +59,11 @@ $userfilename = $_FILES["userfile"]["name"];
$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION); $fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
if($settings->_overrideMimeType) {
$finfo = finfo_open(FILEINFO_MIME_TYPE);
$userfiletype = finfo_file($finfo, $userfiletmp);
}
$res = $document->addDocumentFile($name, $comment, $user, $userfiletmp, $res = $document->addDocumentFile($name, $comment, $user, $userfiletmp,
basename($userfilename),$fileType, $userfiletype ); basename($userfilename),$fileType, $userfiletype );

5
op/op.AddFile2.php
View File

@ -70,6 +70,11 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION); $fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
if($settings->_overrideMimeType) {
$finfo = finfo_open(FILEINFO_MIME_TYPE);
$userfiletype = finfo_file($finfo, $userfiletmp);
}
$res = $document->addDocumentFile($name, $comment, $user, $userfiletmp, $res = $document->addDocumentFile($name, $comment, $user, $userfiletmp,
basename($userfilename),$fileType, $userfiletype ); basename($userfilename),$fileType, $userfiletype );

5
op/op.AddMultiDocument.php
View File

@ -174,6 +174,11 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION); $fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
if($settings->_overrideMimeType) {
$finfo = finfo_open(FILEINFO_MIME_TYPE);
$userfiletype = finfo_file($finfo, $userfiletmp);
}
if(isset($_POST["name"]) && $_POST["name"] != "") if(isset($_POST["name"]) && $_POST["name"] != "")
$name = $_POST["name"]; $name = $_POST["name"];
else else

5
op/op.Ajax.php
View File

@ -474,6 +474,11 @@ switch($command) {
$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION); $fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
if($settings->_overrideMimeType) {
$finfo = finfo_open(FILEINFO_MIME_TYPE);
$userfiletype = finfo_file($finfo, $userfiletmp);
}
if (!empty($_POST["name"])) if (!empty($_POST["name"]))
$name = $_POST["name"]; $name = $_POST["name"];
else else

5
op/op.UpdateDocument.php
View File

@ -71,6 +71,11 @@ if ($_FILES['userfile']['error'] == 0) {
$userfiletmp = $_FILES["userfile"]["tmp_name"]; $userfiletmp = $_FILES["userfile"]["tmp_name"];
$userfiletype = $_FILES["userfile"]["type"]; $userfiletype = $_FILES["userfile"]["type"];
$userfilename = $_FILES["userfile"]["name"]; $userfilename = $_FILES["userfile"]["name"];
if($settings->_overrideMimeType) {
$finfo = finfo_open(FILEINFO_MIME_TYPE);
$userfiletype = finfo_file($finfo, $userfiletmp);
}
} elseif($settings->_dropFolderDir) { } elseif($settings->_dropFolderDir) {
if($_POST['dropfolderfileform1']) { if($_POST['dropfolderfileform1']) {
$fullfile = $settings->_dropFolderDir.'/'.$user->getLogin().'/'.$_POST["dropfolderfileform1"]; $fullfile = $settings->_dropFolderDir.'/'.$user->getLogin().'/'.$_POST["dropfolderfileform1"];

5
op/op.UpdateDocument2.php
View File

@ -73,6 +73,11 @@ if( move_uploaded_file( $source_file_path, $target_file_path ) ) {
$fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION); $fileType = ".".pathinfo($userfilename, PATHINFO_EXTENSION);
if($settings->_overrideMimeType) {
$finfo = finfo_open(FILEINFO_MIME_TYPE);
$userfiletype = finfo_file($finfo, $userfiletmp);
}
// Get the list of reviewers and approvers for this document. // Get the list of reviewers and approvers for this document.
$reviewers = array(); $reviewers = array();
$approvers = array(); $approvers = array();