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

discard fileType if just '.'

Browse Source
This commit is contained in:
Uwe Steinmann 2019-10-01 14:05:29 +02:00
parent 721aaed1c1
commit ae4a65e8bc
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
SeedDMS_Core/Core/inc.ClassDocument.php
View File

@ -1470,6 +1470,8 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
$version = $resArr[0]['m']+1; $version = $resArr[0]['m']+1;
} }
if($fileType == '.')
$fileType = '';
$filesize = SeedDMS_Core_File::fileSize($tmpFile); $filesize = SeedDMS_Core_File::fileSize($tmpFile);
$checksum = SeedDMS_Core_File::checksum($tmpFile); $checksum = SeedDMS_Core_File::checksum($tmpFile);
@ -1639,6 +1641,9 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
if(!$content) if(!$content)
return false; return false;
if($fileType == '.')
$fileType = '';
/* Check if $user, $orgFileName, $fileType and $mimetype are the same */ /* Check if $user, $orgFileName, $fileType and $mimetype are the same */
if($user->getID() != $content->getUser()->getID()) { if($user->getID() != $content->getUser()->getID()) {
return false; return false;
@ -2858,7 +2863,16 @@ class SeedDMS_Core_DocumentContent extends SeedDMS_Core_Object { /* {{{ */
return $this->_user; return $this->_user;
} /* }}} */ } /* }}} */
function getPath() { return $this->_document->getDir() . $this->_version . $this->_fileType; } /**
* Return path of file on disk relative to the content directory
*
* Since version 5.1.13 a single '.' in the fileType will be skipped.
* On Windows a file named 'name.' will be saved as 'name' but the fileType
* will contain the a single '.'.
*
* @return string path of file on disc
*/
function getPath() { return $this->_document->getDir() . $this->_version . ($this->_fileType != '.' ? $this->_fileType : ''); }
function setDate($date = false) { /* {{{ */ function setDate($date = false) { /* {{{ */
$db = $this->_document->_dms->getDB(); $db = $this->_document->_dms->getDB();

1
SeedDMS_Core/package.xml
View File

@ -26,6 +26,7 @@
<notes> <notes>
- add decorators - add decorators
- add new methods SeedDMS_Core_Document::isType(), SeedDMS_Core_Folder::isType(), SeedDMS_Core_DocumentContent::isType(). Use them instead of checking the class name. - add new methods SeedDMS_Core_Document::isType(), SeedDMS_Core_Folder::isType(), SeedDMS_Core_DocumentContent::isType(). Use them instead of checking the class name.
- skip a fileType with just a '.'
</notes> </notes>
<contents> <contents>
<dir baseinstalldir="SeedDMS" name="/"> <dir baseinstalldir="SeedDMS" name="/">