gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-03-12 08:55:54 +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 2020-12-01 21:48:21 +01:00
commit bf22fe7e6a
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -201,6 +201,8 @@
SeedDMS_Bootstrap_Style::getDropFolderChooserHtml() (CVE-2020-28726)
- prevent cross site scripting in views/bootstrap/class.DropFileChooser.php
folderid wasn't checked propperly for being an integer (CVE-2020-28727)
- output format for dates can be configured
- add filter function to notification service
--------------------------------------------------------------------------------
Changes in version 5.1.20

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

@ -3307,7 +3307,7 @@ $(document).ready(function() {
echo $reqName;
echo "</td>";
echo "<td>";
echo "<i style=\"font-size: 80%;\">".$rec['date']." - ";
echo "<i style=\"font-size: 80%;\">".getLongReadableDate($rec['date'])." - ";
$updateuser = $dms->getUser($rec["userID"]);
if(!is_object($updateuser))
echo getMLText("unknown_user");

6
views/bootstrap/class.DocumentVersionDetail.php
View File

@ -387,7 +387,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
}
print "<tr".($r['status'] == 1 ? ' class="success"' : ($r['status'] == -1 ? ' class="error"' : '')).">\n";
print "<td>".$reqName."</td>\n";
print "<td><i style=\"font-size: 80%;\">".$r["date"]." - ";
print "<td><i style=\"font-size: 80%;\">".getLongReadableDate($r["date"])." - ";
/* $updateUser is the user who has done the review */
$updateUser = $dms->getUser($r["userID"]);
print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</i><br />";
@ -441,7 +441,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
}
print "<tr".($a['status'] == 1 ? ' class="success"' : ($a['status'] == -1 ? ' class="error"' : ($a['status'] == -2 ? ' class=""' : ''))).">\n";
print "<td>".$reqName."</td>\n";
print "<td><i style=\"font-size: 80%;\">".$a["date"]." - ";
print "<td><i style=\"font-size: 80%;\">".getLongReadableDate($a["date"])." - ";
/* $updateUser is the user who has done the approval */
$updateUser = $dms->getUser($a["userID"]);
print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$a["userID"]."'")."</i><br />";
@ -554,7 +554,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Bootstrap_Style {
$fullname = $suser->getFullName();
else
$fullname = "--";
echo "<tr><td>".$entry['date']."</td><td>".getOverallStatusText($entry['status'])."</td><td>".$fullname."</td><td>".$entry['comment']."</td></tr>\n";
echo "<tr><td>".getLongReadableDate($entry['date'])."</td><td>".getOverallStatusText($entry['status'])."</td><td>".$fullname."</td><td>".$entry['comment']."</td></tr>\n";
}
print "</tbody>\n</table>\n";
$this->contentContainerEnd();

6
views/bootstrap/class.ViewDocument.php
View File

@ -802,7 +802,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
$fullname = htmlspecialchars($suser->getFullName());
else
$fullname = "--";
echo "<tr><td>".$entry['date']."</td><td>".getOverallStatusText($entry['status'])."</td><td>".$fullname."</td><td>".htmlspecialchars($entry['comment'])."</td></tr>\n";
echo "<tr><td>".getLongReadableDate($entry['date'])."</td><td>".getOverallStatusText($entry['status'])."</td><td>".$fullname."</td><td>".htmlspecialchars($entry['comment'])."</td></tr>\n";
}
print "</tbody>\n</table>\n";
$this->contentContainerEnd();
@ -910,7 +910,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
if($user->isAdmin() || $r["status"] > -2) {
print "<tr>\n";
print "<td>".$reqName."</td>\n";
print "<td><i style=\"font-size: 80%;\">".$r["date"]." - ";
print "<td><i style=\"font-size: 80%;\">".getLongReadableDate($r["date"])." - ";
/* $updateUser is the user who has done the review */
$updateUser = $dms->getUser($r["userID"]);
print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."</i><br />";
@ -1014,7 +1014,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
if($user->isAdmin() || $a["status"] > -2) {
print "<tr>\n";
print "<td>".$reqName."</td>\n";
print "<td><i style=\"font-size: 80%;\">".$a["date"]." - ";
print "<td><i style=\"font-size: 80%;\">".getLongReadableDate($a["date"])." - ";
/* $updateUser is the user who has done the approval */
$updateUser = $dms->getUser($a["userID"]);
print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$a["userID"]."'")."</i><br />";