mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-06-18 02:59:27 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
3c2f8f6013
|
@ -785,7 +785,9 @@ final class SeedDMS_RestapiController { /* {{{ */
|
||||||
$workflow = array_shift($workflows);
|
$workflow = array_shift($workflows);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$temp = $file_info->file;
|
$temp = tempnam(sys_get_temp_dir(), 'FOO');
|
||||||
|
file_put_contents($temp, (string) $file_info->getStream());
|
||||||
|
|
||||||
$finfo = finfo_open(FILEINFO_MIME_TYPE);
|
$finfo = finfo_open(FILEINFO_MIME_TYPE);
|
||||||
$userfiletype = finfo_file($finfo, $temp);
|
$userfiletype = finfo_file($finfo, $temp);
|
||||||
$fileType = ".".pathinfo($origfilename, PATHINFO_EXTENSION);
|
$fileType = ".".pathinfo($origfilename, PATHINFO_EXTENSION);
|
||||||
|
@ -924,7 +926,8 @@ final class SeedDMS_RestapiController { /* {{{ */
|
||||||
$file_info = array_pop($uploadedFiles);
|
$file_info = array_pop($uploadedFiles);
|
||||||
if ($origfilename == null)
|
if ($origfilename == null)
|
||||||
$origfilename = $file_info->getClientFilename();
|
$origfilename = $file_info->getClientFilename();
|
||||||
$temp = $file_info->file;
|
$temp = tempnam(sys_get_temp_dir(), 'FOO');
|
||||||
|
file_put_contents($temp, (string) $file_info->getStream());
|
||||||
|
|
||||||
/* Check if the uploaded file is identical to last version */
|
/* Check if the uploaded file is identical to last version */
|
||||||
$lc = $document->getLatestContent();
|
$lc = $document->getLatestContent();
|
||||||
|
@ -1057,7 +1060,7 @@ final class SeedDMS_RestapiController { /* {{{ */
|
||||||
$keywords = isset($params['keywords']) ? $params['keywords'] : '';
|
$keywords = isset($params['keywords']) ? $params['keywords'] : '';
|
||||||
$origfilename = isset($params['origfilename']) ? $params['origfilename'] : null;
|
$origfilename = isset($params['origfilename']) ? $params['origfilename'] : null;
|
||||||
$content = $request->getBody();
|
$content = $request->getBody();
|
||||||
$temp = tempnam('/tmp', 'lajflk');
|
$temp = tempnam(sys_get_temp_dir(), 'lajflk');
|
||||||
$handle = fopen($temp, "w");
|
$handle = fopen($temp, "w");
|
||||||
fwrite($handle, $content);
|
fwrite($handle, $content);
|
||||||
fclose($handle);
|
fclose($handle);
|
||||||
|
@ -1125,7 +1128,8 @@ final class SeedDMS_RestapiController { /* {{{ */
|
||||||
$origfilename = $file_info->getClientFilename();
|
$origfilename = $file_info->getClientFilename();
|
||||||
if (trim($docname) == '')
|
if (trim($docname) == '')
|
||||||
$docname = $origfilename;
|
$docname = $origfilename;
|
||||||
$temp = $file_info->file;
|
$temp = tempnam(sys_get_temp_dir(), 'FOO');
|
||||||
|
file_put_contents($temp, (string) $file_info->getStream());
|
||||||
$finfo = finfo_open(FILEINFO_MIME_TYPE);
|
$finfo = finfo_open(FILEINFO_MIME_TYPE);
|
||||||
$userfiletype = finfo_file($finfo, $temp);
|
$userfiletype = finfo_file($finfo, $temp);
|
||||||
$fileType = ".".pathinfo($origfilename, PATHINFO_EXTENSION);
|
$fileType = ".".pathinfo($origfilename, PATHINFO_EXTENSION);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user