From fe4e0c644c61d781fb1ee8a071915bef6ccbb2ca Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Sep 2020 07:27:12 +0200
Subject: [PATCH 1/2] do not redirect ajax calls

---
 index.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/index.php b/index.php
index 7123a957b..98b5511f3 100644
--- a/index.php
+++ b/index.php
@@ -42,6 +42,9 @@ if(true) {
 				include($file);
 				exit;
 			}
+			if($request->isXhr()) {
+				exit;
+			}
 //			print_r($request->getUri());
 //			exit;
 			return $c['response']

From ca1dce466d76d62bca968ef25b1865054a7e0ae0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 23 Sep 2020 08:37:51 +0200
Subject: [PATCH 2/2] backport printVersionAttributes(), nicer output of
 reviewers and approvers

---
 views/bootstrap/class.ViewDocument.php | 84 ++++++++++++++++----------
 1 file changed, 52 insertions(+), 32 deletions(-)

diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index 516501d67..d785f73cf 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -98,6 +98,23 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 <?php
 	} /* }}} */
 
+	protected function printVersionAttributes($folder, $version) { /* {{{ */
+			$attributes = $version->getAttributes();
+			if($attributes) {
+				foreach($attributes as $attribute) {
+					$arr = $this->callHook('showDocumentContentAttribute', $version, $attribute);
+					if(is_array($arr)) {
+						print "<li>".$arr[0].": ".$arr[1]."</li>\n";
+					} else {
+						$attrdef = $attribute->getAttributeDefinition();
+						print "<li>".htmlspecialchars($attrdef->getName()).": ";
+						$this->printAttributeValue($attribute);
+						echo "</li>\n";
+					}
+				}
+			}
+	} /* }}} */
+
 	function documentListItem() { /* {{{ */
 		$dms = $this->params['dms'];
 		$user = $this->params['user'];
@@ -623,18 +640,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				print "<p style=\"font-style: italic;\">".htmlspecialchars($latestContent->getComment())."</p>";
 		}
 		print "<ul class=\"actions unstyled\">\n";
-		$attributes = $latestContent->getAttributes();
-		if($attributes) {
-			foreach($attributes as $attribute) {
-				$arr = $this->callHook('showDocumentContentAttribute', $latestContent, $attribute);
-				if(is_array($arr)) {
-					print "<li>".$arr[0].": ".$arr[1]."</li>\n";
-				} else {
-					$attrdef = $attribute->getAttributeDefinition();
-					print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $attribute->getValueAsArray()))."</li>\n";
-				}
-			}
-		}
+		$this->printVersionAttributes($folder, $latestContent);
 		print "</ul></td>\n";
 
 		print "<td width='10%'>";
@@ -784,6 +790,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "</tr>\n";
 
 			foreach ($reviewStatus as $r) {
+				$class = '';
+				switch($r['status']) {
+				case '-1':
+					$class = 'error';
+					break;
+				case '1':
+					$class = 'success';
+					break;
+				}
 				$required = null;
 				$is_reviewer = false;
 				$accesserr = '';
@@ -822,7 +837,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						}
 						break;
 				}
-				print "<tr".($r['status'] == 1 ? ' class="success"' : ($r['status'] == -1 ? ' class="error"' : '')).">\n";
+				print "<tr>\n";
 				print "<td>".$reqName."</td>\n";
 				print "<td><i style=\"font-size: 80%;\">".$r["date"]." - ";
 				/* $updateUser is the user who has done the review */
@@ -834,10 +849,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&reviewlogid=".$r['reviewLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
 				}
 				print "</td>\n";
-				print "<td>".getReviewStatusText($r["status"])."</td>\n";
+					print "<td>";
+					if($class)
+						echo "<i class=\"fa fa-circle text-".$class."\"></i> ";
+					print getReviewStatusText($r["status"])."</td>\n";
 				print "<td><ul class=\"unstyled\">";
 				if($accesserr)
-					echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
+						echo "<li><span class=\"text-error\">".$accesserr."</span></li>";
 
 				if($accessop->mayReview()) {
 					if ($is_reviewer) {
@@ -872,6 +890,15 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 			print "</tr>\n";
 
 			foreach ($approvalStatus as $a) {
+				$class = '';
+				switch($a['status']) {
+				case '-1':
+					$class = 'error';
+					break;
+				case '1':
+					$class = 'success';
+					break;
+				}
 				$required = null;
 				$is_approver = false;
 				$accesserr = '';
@@ -910,7 +937,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						}
 						break;
 				}
-				print "<tr".($a['status'] == 1 ? ' class="success"' : ($a['status'] == -1 ? ' class="error"' : ($a['status'] == -2 ? ' class=""' : ''))).">\n";
+				print "<tr>\n";
 				print "<td>".$reqName."</td>\n";
 				print "<td><i style=\"font-size: 80%;\">".$a["date"]." - ";
 				/* $updateUser is the user who has done the approval */
@@ -922,10 +949,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 					echo "<a href=\"../op/op.Download.php?documentid=".$documentid."&approvelogid=".$a['approveLogID']."\" class=\"btn btn-mini\"><i class=\"fa fa-download\"></i> ".getMLText('download')."</a>";
 				}
 				echo "</td>\n";
-				print "<td>".getApprovalStatusText($a["status"])."</td>\n";
+					print "<td>";
+					if($class)
+						echo "<i class=\"fa fa-circle text-".$class."\"></i> ";
+					print getApprovalStatusText($a["status"])."</td>\n";
 				print "<td><ul class=\"unstyled\">";
 				if($accesserr)
-					echo "<li><span class=\"alert alert-error\">".$accesserr."</span></li>";
+						echo "<li><span class=\"text-error\">".$accesserr."</span></li>";
 
 				if($accessop->mayApprove()) {
 					if ($is_approver) {
@@ -938,7 +968,8 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 				}
 
 				print "</ul>";
-				print "</td>\n</tr>\n";
+				print "</td>\n";
+				print "</tr>\n";
 			}
 		}
 
@@ -947,7 +978,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 		print "</div>";
 		print "</div>";
 
-		if($user->isAdmin()) {
+		if($user->isAdmin() || $user->getId() == $document->getOwner()->getId()) {
 ?>
 			<div class="row-fluid">
 <?php
@@ -1250,18 +1281,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
 						print "<p style=\"font-style: italic;\">".htmlspecialchars($version->getComment())."</p>";
 				}
 				print "<ul class=\"actions unstyled\">\n";
-				$attributes = $version->getAttributes();
-				if($attributes) {
-					foreach($attributes as $attribute) {
-						$arr = $this->callHook('showDocumentContentAttribute', $version, $attribute);
-						if(is_array($arr)) {
-							print "<li>".$arr[0].": ".$arr[1]."</li>\n";
-						} else {
-							$attrdef = $attribute->getAttributeDefinition();
-							print "<li>".htmlspecialchars($attrdef->getName()).": ".htmlspecialchars(implode(', ', $attribute->getValueAsArray()))."</li>\n";
-						}
-					}
-				}
+				$this->printVersionAttributes($folder, $version);
 				print "</ul></td>\n";
 //				print "<td>".htmlspecialchars($version->getComment())."</td>";
 				print "<td>".getOverallStatusText($vstat["status"])."</td>";