gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-14 21:51:32 +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 2022-06-09 09:04:17 +02:00
commit 6af82069e8
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -238,6 +238,7 @@
- add conversion service from tiff, gif to png - add conversion service from tiff, gif to png
- do not use logger in notification service if it was not initialized - do not use logger in notification service if it was not initialized
- fix editing of custom date fields - fix editing of custom date fields
- fix listing files/folders with umlauts when using webdav
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.1.25 Changes in version 5.1.25

2
views/bootstrap/class.Info.php
View File

@ -111,7 +111,7 @@ class SeedDMS_View_Info extends SeedDMS_Theme_Style {
echo "<th>".getMLText("name"); echo "<th>".getMLText("name");
echo "</th>\n"; echo "</th>\n";
echo "</tr>\n</thead>\n<tbody>\n"; echo "</tr>\n</thead>\n<tbody>\n";
$requiredext = array('zip', 'xml', 'xsl', 'json', 'intl', 'fileinfo', 'mbstring', 'curl', 'sqlite'); $requiredext = array('zip', 'xml', 'xsl', 'json', 'intl', 'fileinfo', 'mbstring', 'curl', 'sqlite3', 'imagick');
foreach(array_diff($requiredext, $phpextensions) as $extname) foreach(array_diff($requiredext, $phpextensions) as $extname)
echo "<tr><td>".$extname."</td><td>"."</td></tr>\n"; echo "<tr><td>".$extname."</td><td>"."</td></tr>\n";
echo "</tbody>\n</table>\n"; echo "</tbody>\n</table>\n";

11
webdav/webdav.php
View File

@ -384,8 +384,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
array_shift($patharr); array_shift($patharr);
$path = ''; $path = '';
foreach($patharr as $pathseg) foreach($patharr as $pathseg)
// $path .= '/'.rawurlencode($pathseg->getName()); $path .= '/'.rawurlencode($pathseg->getName());
$path .= '/'.$pathseg->getName(); // $path .= '/'.$pathseg->getName();
if(!$path) { if(!$path) {
$path = '/'; $path = '/';
$info["props"][] = $this->mkprop("isroot", "true"); $info["props"][] = $this->mkprop("isroot", "true");
@ -407,8 +407,8 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
array_shift($patharr); array_shift($patharr);
$path = '/'; $path = '/';
foreach($patharr as $pathseg) foreach($patharr as $pathseg)
// $path .= rawurlencode($pathseg->getName()).'/'; $path .= rawurlencode($pathseg->getName()).'/';
$path .= $pathseg->getName().'/'; // $path .= $pathseg->getName().'/';
// $info["path"] = htmlspecialchars($path.rawurlencode($obj->getName())); // $info["path"] = htmlspecialchars($path.rawurlencode($obj->getName()));
if($this->useorgfilename) { if($this->useorgfilename) {
/* Add the document id and version to the display name. /* Add the document id and version to the display name.
@ -572,6 +572,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
$displayname = $obj->getName().'/'; $displayname = $obj->getName().'/';
$filesize = 0; $filesize = 0;
$mtime = $obj->getDate(); $mtime = $obj->getDate();
$mimetype = '';
} else { } else {
$content = $obj->getLatestContent(); $content = $obj->getLatestContent();
@ -604,7 +605,7 @@ class HTTP_WebDAV_Server_SeedDMS extends HTTP_WebDAV_Server
printf($format, printf($format,
number_format($filesize), number_format($filesize),
strftime("%Y-%m-%d %H:%M:%S", $mtime), strftime("%Y-%m-%d %H:%M:%S", $mtime),
"<a href=\"".$_SERVER['SCRIPT_NAME'].htmlspecialchars($fullpath)."\">".htmlspecialchars($displayname, ENT_QUOTES)."</a>"); "<a href=\"".$_SERVER['SCRIPT_NAME'].htmlspecialchars($fullpath)."\"".($mimetype ? " title=\"".$mimetype."\"" : "").">".htmlspecialchars($displayname, ENT_QUOTES)."</a>");
} }
echo "</pre>"; echo "</pre>";