From 196ea676be3fe184bd28942e525f8114c321afec Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 22 Oct 2020 13:12:02 +0200
Subject: [PATCH] minor backports from 6.0.x

---
 views/bootstrap/class.Bootstrap.php | 39 ++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index fffc26021..aa3400cd7 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -583,6 +583,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	} /* }}} */
 
 	private function documentNavigationBar($document)	{ /* {{{ */
+		$accessobject = $this->params['accessobject'];
 		$accessMode = $document->getAccessMode($this->params['user']);
 		$docid=".php?documentid=" . $document->getID();
 		echo "<id=\"first\"><a href=\"../out/out.ViewDocument". $docid ."\" class=\"brand\">".getMLText("document")."</a>\n";
@@ -606,7 +607,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 					$menuitems['move_document'] = array('link'=>"../out/out.MoveDocument".$docid, 'label'=>'move_document');
 				}
 			}
-			if($this->params['accessobject']->maySetExpires()) {
+			if($accessobject->maySetExpires()) {
 				$menuitems['expires'] = array('link'=>"../out/out.SetExpires".$docid, 'label'=>'expires');
 			}
 		}
@@ -768,7 +769,8 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "<li><a href=\"../out/out.CalendarOld.php?mode=w".$ds."\">".getMLText("week_view")."</a></li>\n";
 		echo "<li><a href=\"../out/out.CalendarOld.php?mode=m".$ds."\">".getMLText("month_view")."</a></li>\n";
 		echo "<li><a href=\"../out/out.CalendarOld.php?mode=y".$ds."\">".getMLText("year_view")."</a></li>\n";
-		if (!$this->params['user']->isGuest()) echo "<li><a href=\"../out/out.AddEvent.php\">".getMLText("add_event")."</a></li>\n";
+		if (!$this->params['user']->isGuest())
+			echo "<li><a href=\"../out/out.AddEvent.php\">".getMLText("add_event")."</a></li>\n";
 		echo "</ul>\n";
 		echo "</div>\n";
 		return;
@@ -1277,7 +1279,7 @@ $(document).ready(function() {
 		$content = '';
 		$content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
 		$content .= "<div class=\"input-append\">\n";
-		$content .= "<input type=\"text\" id=\"choosedocsearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"docname".$formid."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" value=\"" . (($default) ? htmlspecialchars($default->getName()) : "") ."\"/>";
+		$content .= "<input type=\"text\" id=\"choosedocsearch".$formid."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"docname".$formid."\"value=\"" . (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" />";
 		$content .= "<button type=\"button\" class=\"btn\" id=\"cleardocument".$form."\" data-target=\"".$formid."\"><i class=\"fa fa-remove\"></i></button>";
 		if(!$skiptree)
 			$content .= "<a data-target=\"#docChooser".$formid."\" href=\"../out/out.DocumentChooser.php?form=".$formid."&folderid=".$this->params['rootfolderid']."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("document")."…</a>\n";
@@ -1512,7 +1514,12 @@ $(document).ready(function() {
 <?php
 	} /* }}} */
 
-	function printAttributeValue($attribute) { /* {{{ */
+	/**
+	 * Output a single attribute in the document info section
+	 *
+	 * @param object $attribute attribute
+	 */
+	protected function printAttributeValue($attribute) { /* {{{ */
 		echo self::getAttributeValue($attribute);
 	} /* }}} */
 
@@ -1836,10 +1843,12 @@ $(document).ready(function() {
 		print "<h4>".getMLText('error')."!</h4>";
 		print htmlspecialchars($error);
 		print "</div>";
-		print "<div><button class=\"btn history-back\">".getMLText('back')."</button></div>";
-		
-		$this->contentEnd();
-		$this->htmlEndPage();
+		if(!$plain) {	
+			print "<div><button class=\"btn history-back\">".getMLText('back')."</button></div>";
+
+			$this->contentEnd();
+			$this->htmlEndPage();
+		}
 		
 		add_log_line(" UI::exitError error=".$error." pagetitle=".$pagetitle, PEAR_LOG_ERR);
 
@@ -1926,9 +1935,9 @@ $(document).ready(function() {
 			$folder = $this->params['dms']->getFolder($folderid);
 			if(!$partialtree) {
 				$path = $folder->getPath();
+				/* Get the first folder (root folder) of path */
+				$folder = array_shift($path);
 			}
-			/* Get the first folder (root folder) of path */
-			$folder = array_shift($path);
 			$node = array('label'=>$folder->getName(), 'id'=>$folder->getID(), 'load_on_demand'=>false, 'is_folder'=>true);
 			if(!$folder->hasSubFolders()) {
 				$node['load_on_demand'] = true;
@@ -2628,9 +2637,6 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 		if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "...";
 		$docID = $document->getID();
 
-		if(!$skipcont)
-			$content .= $this->documentListRowStart($document);
-
 		if($version) {
 			$latestContent = $this->callHook('documentContent', $document, $version);
 			if($latestContent === null)
@@ -2642,6 +2648,9 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 		}
 
 		if($latestContent) {
+			if(!$skipcont)
+				$content .= $this->documentListRowStart($document);
+
 			$previewer->createPreview($latestContent);
 			$version = $latestContent->getVersion();
 			$status = $latestContent->getStatus();
@@ -2742,9 +2751,9 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 				$content .= $extracontent['end_action_list'];
 			$content .= "</div>";
 			$content .= "</td>";
+			if(!$skipcont)
+				$content .= $this->documentListRowEnd($document);
 		}
-		if(!$skipcont)
-			$content .= $this->documentListRowEnd($document);
 		return $content;
 	} /* }}} */