gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-11 17:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.0.x' into seeddms-5.1.x

Browse Source
This commit is contained in:
Uwe Steinmann 2017-04-11 06:55:06 +02:00
commit 9e054cd6cf
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -22,6 +22,9 @@
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 5.0.12 Changes in version 5.0.12
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
- show name and parent folder of document/folder in search list on different
lines
- check for guest login, admin ip and disabled accounts in webdav server
- merged changes from 4.3.35 - merged changes from 4.3.35
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

9
views/bootstrap/class.Search.php
View File

@ -577,13 +577,14 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
print "<tr id=\"table-row-folder-".$folder->getID()."\" draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">"; print "<tr id=\"table-row-folder-".$folder->getID()."\" draggable=\"true\" rel=\"folder_".$folder->getID()."\" class=\"folder table-row-folder\" formtoken=\"".createFormKey('movefolder')."\">";
print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><img src=\"".$this->imgpath."folder.png\" width=\"24\" height=\"24\" border=0></a></td>"; print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><img src=\"".$this->imgpath."folder.png\" width=\"24\" height=\"24\" border=0></a></td>";
print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\">"; print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\">";
print $folderName;
print "</a>";
print "<br /><span style=\"font-size: 85%;\">".getMLText('in_folder').": /";
$path = $folder->getPath(); $path = $folder->getPath();
print "/";
for ($i = 1; $i < count($path)-1; $i++) { for ($i = 1; $i < count($path)-1; $i++) {
print htmlspecialchars($path[$i]->getName())."/"; print htmlspecialchars($path[$i]->getName())."/";
} }
print $folderName; print "</span>";
print "</a>";
print "<br /><span style=\"font-size: 85%; font-style: italic; color: #666;\">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".date('Y-m-d', $folder->getDate())."</b></span>"; print "<br /><span style=\"font-size: 85%; font-style: italic; color: #666;\">".getMLText('owner').": <b>".htmlspecialchars($owner->getFullName())."</b>, ".getMLText('creation_date').": <b>".date('Y-m-d', $folder->getDate())."</b></span>";
if (in_array(3, $searchin)) $comment = $this->markQuery(htmlspecialchars($folder->getComment())); if (in_array(3, $searchin)) $comment = $this->markQuery(htmlspecialchars($folder->getComment()));
else $comment = htmlspecialchars($folder->getComment()); else $comment = htmlspecialchars($folder->getComment());
@ -603,7 +604,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
} }
print "</td>"; print "</td>";
print "<td></td>"; print "<td></td>";
print "<td>"; print "<td nowrap>";
print "<div class=\"list-action\">"; print "<div class=\"list-action\">";
if($folder->getAccessMode($user) >= M_ALL) { if($folder->getAccessMode($user) >= M_ALL) {
$this->printDeleteFolderButton($folder, 'splash_rm_folder'); $this->printDeleteFolderButton($folder, 'splash_rm_folder');