gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-09 13:06:14 +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 2018-04-03 06:17:42 +02:00
commit 28e65a1520
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -112,6 +112,7 @@
- check if converters are set in out/out.ViewDocument.php at all (Closes #394) - check if converters are set in out/out.ViewDocument.php at all (Closes #394)
- do not remove user when transfering objects - do not remove user when transfering objects
- do not periodically count tasks if task list in menu is turned off - do not periodically count tasks if task list in menu is turned off
- use utf8_basename() in op.ImportFS.php
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.6 Changes in version 5.1.6

2
controllers/class.UpdateDocument.php
View File

@ -61,7 +61,7 @@ class SeedDMS_Controller_UpdateDocument extends SeedDMS_Controller_Common {
$result = $this->callHook('updateDocument'); $result = $this->callHook('updateDocument');
if($result === null) { if($result === null) {
$filesize = SeedDMS_Core_File::fileSize($userfiletmp); $filesize = SeedDMS_Core_File::fileSize($userfiletmp);
$contentResult=$document->addContent($comment, $user, $userfiletmp, basename($userfilename), $filetype, $userfiletype, $reviewers, $approvers, $version=0, $attributes, $workflow, $initialdocumentstatus); $contentResult=$document->addContent($comment, $user, $userfiletmp, utf8_basename($userfilename), $filetype, $userfiletype, $reviewers, $approvers, $version=0, $attributes, $workflow, $initialdocumentstatus);
if ($this->hasParam('expires')) { if ($this->hasParam('expires')) {
if($document->setExpires($this->getParam('expires'))) { if($document->setExpires($this->getParam('expires'))) {

4
op/op.ImportFS.php
View File

@ -57,7 +57,7 @@ function import_folder($dirname, $folder) { /* {{{ */
$path = $dirname.'/'.$entry; $path = $dirname.'/'.$entry;
if($entry != '.' && $entry != '..' && $entry != '.svn') { if($entry != '.' && $entry != '..' && $entry != '.svn') {
if(is_file($path)) { if(is_file($path)) {
$name = basename($path); $name = utf8_basename($path);
$filetmp = $path; $filetmp = $path;
$reviewers = array(); $reviewers = array();
@ -86,7 +86,7 @@ function import_folder($dirname, $folder) { /* {{{ */
} }
set_time_limit(30); set_time_limit(30);
} elseif(is_dir($path)) { } elseif(is_dir($path)) {
$name = basename($path); $name = utf8_basename($path);
if($newfolder = $folder->addSubFolder($name, '', $user, $sequence)) { if($newfolder = $folder->addSubFolder($name, '', $user, $sequence)) {
$foldercount++; $foldercount++;
if(!import_folder($path, $newfolder)) if(!import_folder($path, $newfolder))