From cf8209414971b1ff5852baa8f8144cd35a2231d8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 12 Jan 2023 06:46:00 +0100
Subject: [PATCH 1/3] add rule to provide auth info if php is run in fpm mode

---
 op/.htaccess | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/op/.htaccess b/op/.htaccess
index 85718b048..deb356312 100644
--- a/op/.htaccess
+++ b/op/.htaccess
@@ -1,3 +1,4 @@
-RewriteEngine on
-RewriteCond %{REQUEST_URI} (.*)viewonline/([0-9]+)/([0-9]+)/(.+)$
-RewriteRule (.*)viewonline/([0-9]+)/([0-9]+)/(.+)$ $1op.ViewOnline.php?request=$2:$3 [PT]
+RewriteEngine on
+RewriteCond %{REQUEST_URI} (.*)viewonline/([0-9]+)/([0-9]+)/(.+)$
+RewriteRule (.*)viewonline/([0-9]+)/([0-9]+)/(.+)$ $1op.ViewOnline.php?request=$2:$3 [PT]
+RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization},last]

From c77938cd11e74cbbf9f33ddb9f2a53e7e2e65a90 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 13 Jan 2023 13:51:44 +0100
Subject: [PATCH 2/3] add extra content in document list row after last column

---
 views/bootstrap/class.Bootstrap.php   | 5 +++++
 views/bootstrap4/class.Bootstrap4.php | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index 035e390e0..7d52d926e 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -3172,6 +3172,11 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 			$content .= "<td>";
 			$content .= $this->documentListRowAction($document, $previewer, $skipcont, $version, $extracontent);
 			$content .= "</td>";
+			if(!empty($extracontent['columns_last'])) {
+				foreach($extracontent['columns_last'] as $col)
+					$content .= '<td>'.$col.'</td>';
+			}
+
 			if(!$skipcont)
 				$content .= $this->documentListRowEnd($document);
 		}
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 1bf5b646d..2c7a509f6 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -3250,6 +3250,11 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 			$content .= "<td>";
 			$content .= $this->documentListRowAction($document, $previewer, $skipcont, $version, $extracontent);
 			$content .= "</td>";
+			if(!empty($extracontent['columns_last'])) {
+				foreach($extracontent['columns_last'] as $col)
+					$content .= '<td>'.$col.'</td>';
+			}
+
 			if(!$skipcont)
 				$content .= $this->documentListRowEnd($document);
 		}

From cafc50ca4b5a1179ba08960f766584f36d0cb875 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 13 Jan 2023 21:21:41 +0100
Subject: [PATCH 3/3] pass logger to hooks

---
 inc/inc.DBInit.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/inc/inc.DBInit.php b/inc/inc.DBInit.php
index 7c1eff742..9949c5e9f 100644
--- a/inc/inc.DBInit.php
+++ b/inc/inc.DBInit.php
@@ -21,7 +21,7 @@
 if(isset($GLOBALS['SEEDDMS_HOOKS']['initDB'])) {
 	foreach($GLOBALS['SEEDDMS_HOOKS']['initDB'] as $hookObj) {
 		if (method_exists($hookObj, 'pretInitDB')) {
-			$hookObj->preInitDB(array('settings'=>$settings));
+			$hookObj->preInitDB(array('settings'=>$settings, 'logger'=>$logger));
 		}
 	}
 }
@@ -32,7 +32,7 @@ $db->connect() or die ("Could not connect to db-server \"" . $settings->_dbHostn
 if(isset($GLOBALS['SEEDDMS_HOOKS']['initDB'])) {
 	foreach($GLOBALS['SEEDDMS_HOOKS']['initDB'] as $hookObj) {
 		if (method_exists($hookObj, 'postInitDB')) {
-			$hookObj->postInitDB(array('db'=>$db, 'settings'=>$settings));
+			$hookObj->postInitDB(array('db'=>$db, 'settings'=>$settings, 'logger'=>$logger));
 		}
 	}
 }
@@ -40,7 +40,7 @@ if(isset($GLOBALS['SEEDDMS_HOOKS']['initDB'])) {
 if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) {
 	foreach($GLOBALS['SEEDDMS_HOOKS']['initDMS'] as $hookObj) {
 		if (method_exists($hookObj, 'pretInitDMS')) {
-			$hookObj->preInitDMS(array('db'=>$db, 'settings'=>$settings));
+			$hookObj->preInitDMS(array('db'=>$db, 'settings'=>$settings, 'logger'=>$logger));
 		}
 	}
 }
@@ -61,7 +61,7 @@ $dms->setMaxDirID($settings->_maxDirID);
 if(isset($GLOBALS['SEEDDMS_HOOKS']['initDMS'])) {
 	foreach($GLOBALS['SEEDDMS_HOOKS']['initDMS'] as $hookObj) {
 		if (method_exists($hookObj, 'postInitDMS')) {
-			$hookObj->postInitDMS(array('dms'=>$dms, 'settings'=>$settings));
+			$hookObj->postInitDMS(array('dms'=>$dms, 'settings'=>$settings, 'logger'=>$logger));
 		}
 	}
 }