From f8b78c7212091c5e5da0033f49f7dc5d3ce0db10 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 1 Jul 2022 09:50:37 +0200
Subject: [PATCH 1/6] include vendor/autoload.php after setting include path

---
 inc/inc.Settings.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/inc/inc.Settings.php b/inc/inc.Settings.php
index 3014536ce..a21c8b57a 100644
--- a/inc/inc.Settings.php
+++ b/inc/inc.Settings.php
@@ -64,9 +64,6 @@ ini_set('include_path', $settings->_rootDir.'pear'. PATH_SEPARATOR .ini_get('inc
 if(!empty($settings->_extraPath)) {
 	ini_set('include_path', $settings->_extraPath. PATH_SEPARATOR .ini_get('include_path'));
 }
-/* composer is installed in pear directory, but install tool does not need it */
-if(!defined("SEEDDMS_INSTALL"))
-	require_once $settings->_rootDir.'../pear/vendor/autoload.php';
 
 if(isset($settings->_maxExecutionTime)) {
 	if (php_sapi_name() !== "cli") {
@@ -98,3 +95,7 @@ ini_set('include_path', $settings->_rootDir. PATH_SEPARATOR .ini_get('include_pa
  * relative to it.
  */
 ini_set('include_path', $settings->_rootDir.'../pear'. PATH_SEPARATOR .ini_get('include_path'));
+
+/* composer is installed in pear directory, but install tool does not need it */
+if(!defined("SEEDDMS_INSTALL"))
+	require_once 'vendor/autoload.php';

From 0799f908f1485355fdabea4c5f5be263f6095b33 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Fri, 1 Jul 2022 09:51:30 +0200
Subject: [PATCH 2/6] remove old get_magic_quotes code

---
 inc/inc.Settings.php | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/inc/inc.Settings.php b/inc/inc.Settings.php
index a21c8b57a..83688f255 100644
--- a/inc/inc.Settings.php
+++ b/inc/inc.Settings.php
@@ -71,22 +71,6 @@ if(isset($settings->_maxExecutionTime)) {
 	}
 }
 
-if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
-	$process = array(&$_GET, &$_POST, &$_COOKIE, &$_REQUEST);
-	while (list($key, $val) = each($process)) {
-		foreach ($val as $k => $v) {
-			unset($process[$key][$k]);
-			if (is_array($v)) {
-				$process[$key][stripslashes($k)] = $v;
-				$process[] = &$process[$key][stripslashes($k)];
-			} else {
-				$process[$key][stripslashes($k)] = stripslashes($v);
-			}
-		}
-	}
-	unset($process);
-}
-
 /* Add root Dir. Needed because the view classes are included
  * relative to it.
  */

From dd8f1b7a8e7da4f9275b74f1c589faa4ca3c2d61 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Jul 2022 09:15:12 +0200
Subject: [PATCH 3/6] fix SeedDMS_Core_DMS::addAttributeDefinition() when
 objtype is 0

---
 SeedDMS_Core/Core/inc.ClassDMS.php | 2 +-
 SeedDMS_Core/package.xml           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 991f21f01..de4e37330 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -2703,7 +2703,7 @@ class SeedDMS_Core_DMS {
 		if (is_object($this->getAttributeDefinitionByName($name))) {
 			return false;
 		}
-		if(!$objtype)
+		if($objtype < SeedDMS_Core_AttributeDefinition::objtype_all || $objtype > SeedDMS_Core_AttributeDefinition::objtype_documentcontent)
 			return false;
 		if(!$type)
 			return false;
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 76b616b57..e0077eb64 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -24,6 +24,7 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
+fix SeedDMS_Core_DMS::addAttributeDefinition() when objtype is 0
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">

From d47e2377bbbd232a1b42524f67d117009b781435 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Jul 2022 09:16:47 +0200
Subject: [PATCH 4/6] do not explode() attrtype and objtype, if an array is
 needed it can be set in conf.php

---
 views/bootstrap/class.Settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php
index e6e1103c5..f325ab812 100644
--- a/views/bootstrap/class.Settings.php
+++ b/views/bootstrap/class.Settings.php
@@ -615,7 +615,7 @@ if(($kkk = $this->callHook('getFullSearchEngine')) && is_array($kkk))
 									case "attributedefinitions":
 										$objtype = empty($conf['objtype']) ? 0 : $conf['objtype'];
 										$attrtype = empty($conf['attrtype']) ? 0 : $conf['attrtype'];
-										$recs = $dms->getAllAttributeDefinitions(explode(',', $objtype), explode(',', $attrtype));
+										$recs = $dms->getAllAttributeDefinitions($objtype, $attrtype);
 										if($recs) {
 											echo "<select class=\"chzn-select\"".($allowempty ? " data-allow-clear=\"true\"" : "")."\" name=\"extensions[".$extname."][".$confkey."][]\"".(!empty($conf['multiple']) ? "  multiple" : "").(!empty($conf['size']) ? "  size=\"".$conf['size']."\"" : "")." data-placeholder=\"".getMLText("select_attribute_value")."\">";
 											if($allowempty)

From 96ef4571835dd48899fbac45dc0db4145a2801ad Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Jul 2022 09:20:44 +0200
Subject: [PATCH 5/6] first create a list of action buttons and then render it
 in documetListRow

---
 views/bootstrap/class.Bootstrap.php    | 25 +++++++++++++++----------
 views/bootstrap/styles/application.css |  2 +-
 views/bootstrap4/class.Bootstrap4.php  | 25 +++++++++++++++----------
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index e3af611d8..363ae17b9 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -294,7 +294,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "<div class=\"navbar navbar-inverse navbar-fixed-top\">\n";
 		echo " <div class=\"navbar-inner\">\n";
 		echo "  <div class=\"container-fluid\">\n";
-		echo "   <a href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".(!empty($this->params['dms']) ? $this->params['dms']->getRootFolder()->getId() : '1')."\">".(!empty($this->extraheader['logo']) ? '<img src="'.$this->extraheader['logo'].'"/>' : '<img src="'.$this->params['settings']->_httpRoot.'views/bootstrap/images/seeddms-logo.svg"/>')."</a>";
+		echo "   <a href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".(!empty($this->params['dms']) ? $this->params['dms']->getRootFolder()->getId() : '1')."\">".(!empty($this->extraheader['logo']) ? '<img id="navbar-logo" src="'.$this->extraheader['logo'].'"/>' : '<img id="navbar-logo" src="'.$this->params['settings']->_httpRoot.'views/bootstrap/images/seeddms-logo.svg"/>')."</a>";
 		echo "   <a class=\"brand\" href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</a>\n";
 		echo "  </div>\n";
 		echo " </div>\n";
@@ -313,7 +313,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo "   <a class=\"btn btn-navbar\" href=\"".$this->params['settings']->_httpRoot."op/op.Logout.php\">\n";
 		echo "     <span class=\"fa fa-sign-out\"></span>\n";
 		echo "   </a>\n";
-		echo "   <a href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\">".(!empty($this->extraheader['logo']) ? '<img src="'.$this->extraheader['logo'].'">' : '<img src="'.$this->params['settings']->_httpRoot.'views/bootstrap/images/seeddms-logo.svg">')."</a>";
+		echo "   <a href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\">".(!empty($this->extraheader['logo']) ? '<img id="navbar-logo" src="'.$this->extraheader['logo'].'">' : '<img id="navbar-logo" src="'.$this->params['settings']->_httpRoot.'views/bootstrap/images/seeddms-logo.svg">')."</a>";
 		echo "   <a class=\"brand\" href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\"><span class=\"hidden-phone\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</span></a>\n";
 
 		/* user profile menu {{{ */
@@ -2976,32 +2976,37 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 
 		$content = '';
 		$content .= "<div class=\"list-action\">";
+		$actions = array();
 		if(!empty($extracontent['begin_action_list']))
 			$content .= $extracontent['begin_action_list'];
 		if($accessop->check_view_access('RemoveDocument')) {
 			if($document->getAccessMode($user) >= M_ALL) {
-				$content .= $this->printDeleteDocumentButton($document, 'splash_rm_document', true);
+				$actions['remove_document'] = $this->printDeleteDocumentButton($document, 'splash_rm_document', true);
 			} else {
-				$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-remove"></i></span>';
+				$actions['remove_document'] = '<span style="padding: 2px; color: #CCC;"><i class="fa fa-remove"></i></span>';
 			}
 		}
 		$docID = $document->getID();
 		if($document->getAccessMode($user) >= M_READWRITE) {
-			$content .= '<a href="'.$this->params['settings']->_httpRoot.'out/out.EditDocument.php?documentid='.$docID.'" title="'.getMLText("edit_document_props").'"><i class="fa fa-edit"></i></a>';
+			$actions['edit_document'] = '<a href="'.$this->params['settings']->_httpRoot.'out/out.EditDocument.php?documentid='.$docID.'" title="'.getMLText("edit_document_props").'"><i class="fa fa-edit"></i></a>';
 		} else {
-			$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-edit"></i></span>';
+			$actions['edit_document'] = '<span style="padding: 2px; color: #CCC;"><i class="fa fa-edit"></i></span>';
 		}
 		if($document->getAccessMode($user) >= M_READWRITE) {
-			$content .= $this->printLockButton($document, 'splash_document_locked', 'splash_document_unlocked', true);
+			$actions['lock_document'] = $this->printLockButton($document, 'splash_document_locked', 'splash_document_unlocked', true);
 		}
 		if($document->getAccessMode($user) >= M_READWRITE) {
-			$content .= $this->printAccessButton($document, true);
+			$actions['document_access'] = $this->printAccessButton($document, true);
 		}
 		if($enableClipboard) {
-			$content .= '<a class="addtoclipboard" rel="D'.$docID.'" msg="'.getMLText('splash_added_to_clipboard').'" title="'.getMLText("add_to_clipboard").'"><i class="fa fa-copy"></i></a>';
+			$actions['add_to_clipboard'] = '<a class="addtoclipboard" rel="D'.$docID.'" msg="'.getMLText('splash_added_to_clipboard').'" title="'.getMLText("add_to_clipboard").'"><i class="fa fa-copy"></i></a>';
 		}
 		if($onepage)
-			$content .= '<a href="'.$this->params['settings']->_httpRoot.'out/out.ViewDocument.php?documentid='.$docID.'" title="'.getMLText("view_document").'"><i class="fa fa-eye"></i></a>';
+			$actions['view_document'] = '<a href="'.$this->params['settings']->_httpRoot.'out/out.ViewDocument.php?documentid='.$docID.'" title="'.getMLText("view_document").'"><i class="fa fa-eye"></i></a>';
+		foreach($actions as $action) {
+			if(is_string($action))
+				$content .= $action;
+		}
 		if(!empty($extracontent['end_action_list']))
 			$content .= $extracontent['end_action_list'];
 		$content .= "</div>";
diff --git a/views/bootstrap/styles/application.css b/views/bootstrap/styles/application.css
index 78702cab6..89714c175 100644
--- a/views/bootstrap/styles/application.css
+++ b/views/bootstrap/styles/application.css
@@ -7,7 +7,7 @@
 	margin: auto auto;
 	width: 460px;
 }
-.navbar img {
+#navbar-logo {
 	height: 1.93rem;
 	float: left;
 	padding-top: 5px;
diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php
index 8eca84eed..5c2bb7e54 100644
--- a/views/bootstrap4/class.Bootstrap4.php
+++ b/views/bootstrap4/class.Bootstrap4.php
@@ -306,7 +306,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 
 	function globalBanner() { /* {{{ */
 		echo "<nav class=\"navbar navbar-expand-lg navbar-dark bg-dark fixed-top\">\n";
-		echo " <a class=\"navbar-brand\" href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php\">".(!empty($this->extraheader['logo']) ? '<img src="'.$this->extraheader['logo'].'"/>' : '<img src="'.$this->params['settings']->_httpRoot.'views/bootstrap4/images/seeddms-logo.svg"/>')." <span class=\"d-none d-md-inline-block ml-4\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</span></a>\n";
+		echo " <a class=\"navbar-brand\" href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php\">".(!empty($this->extraheader['logo']) ? '<img id="navbar-logo" src="'.$this->extraheader['logo'].'"/>' : '<img id="navbar-logo" src="'.$this->params['settings']->_httpRoot.'views/bootstrap4/images/seeddms-logo.svg"/>')." <span class=\"d-none d-md-inline-block ml-4\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</span></a>\n";
 		echo "</nav>\n";
 	} /* }}} */
 
@@ -314,7 +314,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		$dms = $this->params['dms'];
 		$accessobject = $this->params['accessobject'];
 		echo "<nav class=\"navbar navbar-expand-lg navbar-dark bg-dark border-bottom fixed-top\">\n";
-		echo " <a class=\"navbar-brand\" href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\">".(!empty($this->extraheader['logo']) ? '<img src="'.$this->extraheader['logo'].'">' : '<img src="'.$this->params['settings']->_httpRoot.'views/bootstrap4/images/seeddms-logo.svg">')." <span class=\"d-none d-md-inline-block ml-4\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</span></a>\n";
+		echo " <a class=\"navbar-brand\" href=\"".$this->params['settings']->_httpRoot."out/out.ViewFolder.php?folderid=".$this->params['dms']->getRootFolder()->getId()."\">".(!empty($this->extraheader['logo']) ? '<img id="navbar-logo" src="'.$this->extraheader['logo'].'">' : '<img id="navbar-logo" src="'.$this->params['settings']->_httpRoot.'views/bootstrap4/images/seeddms-logo.svg">')." <span class=\"d-none d-md-inline-block ml-4\">".(strlen($this->params['sitename'])>0 ? $this->params['sitename'] : "SeedDMS")."</span></a>\n";
 
 		if(isset($this->params['user']) && $this->params['user']) {
 			/* search form {{{ */
@@ -3051,32 +3051,37 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
 
 		$content = '';
 		$content .= "<div class=\"list-action\">";
+		$actions = array();
 		if(!empty($extracontent['begin_action_list']))
 			$content .= $extracontent['begin_action_list'];
 		if($accessop->check_view_access('RemoveDocument')) {
 			if($document->getAccessMode($user) >= M_ALL) {
-				$content .= $this->printDeleteDocumentButton($document, 'splash_rm_document', true);
+				$actions['remove_document'] = $this->printDeleteDocumentButton($document, 'splash_rm_document', true);
 			} else {
-				$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-remove"></i></span>';
+				$actions['remove_document'] = '<span style="padding: 2px; color: #CCC;"><i class="fa fa-remove"></i></span>';
 			}
 		}
 		$docID = $document->getID();
 		if($document->getAccessMode($user) >= M_READWRITE) {
-			$content .= '<a href="'.$this->params['settings']->_httpRoot.'out/out.EditDocument.php?documentid='.$docID.'" title="'.getMLText("edit_document_props").'"><i class="fa fa-edit"></i></a>';
+			$actions['edit_document'] = '<a href="'.$this->params['settings']->_httpRoot.'out/out.EditDocument.php?documentid='.$docID.'" title="'.getMLText("edit_document_props").'"><i class="fa fa-edit"></i></a>';
 		} else {
-			$content .= '<span style="padding: 2px; color: #CCC;"><i class="fa fa-edit"></i></span>';
+			$actions['edit_document'] = '<span style="padding: 2px; color: #CCC;"><i class="fa fa-edit"></i></span>';
 		}
 		if($document->getAccessMode($user) >= M_READWRITE) {
-			$content .= $this->printLockButton($document, 'splash_document_locked', 'splash_document_unlocked', true);
+			$actions['lock_document'] = $this->printLockButton($document, 'splash_document_locked', 'splash_document_unlocked', true);
 		}
 		if($document->getAccessMode($user) >= M_READWRITE) {
-			$content .= $this->printAccessButton($document, true);
+			$actions['document_access'] = $this->printAccessButton($document, true);
 		}
 		if($enableClipboard) {
-			$content .= '<a class="addtoclipboard" rel="D'.$docID.'" msg="'.getMLText('splash_added_to_clipboard').'" title="'.getMLText("add_to_clipboard").'"><i class="fa fa-copy"></i></a>';
+			$actions['add_to_clipboard'] = '<a class="addtoclipboard" rel="D'.$docID.'" msg="'.getMLText('splash_added_to_clipboard').'" title="'.getMLText("add_to_clipboard").'"><i class="fa fa-copy"></i></a>';
 		}
 		if($onepage)
-			$content .= '<a href="'.$this->params['settings']->_httpRoot.'out/out.ViewDocument.php?documentid='.$docID.'" title="'.getMLText("view_document").'"><i class="fa fa-eye"></i></a>';
+			$actions['view_document'] = '<a href="'.$this->params['settings']->_httpRoot.'out/out.ViewDocument.php?documentid='.$docID.'" title="'.getMLText("view_document").'"><i class="fa fa-eye"></i></a>';
+		foreach($actions as $action) {
+			if(is_string($action))
+				$content .= $action;
+		}
 		if(!empty($extracontent['end_action_list']))
 			$content .= $extracontent['end_action_list'];
 		$content .= "</div>";

From 53db4c2d3a9bb28e6db074dd618db1fe273c07ae Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 6 Jul 2022 09:21:17 +0200
Subject: [PATCH 6/6] add changes for 5.1.27

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 7136db989..ae07c8fbc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 --------------------------------------------------------------------------------
                      Changes in version 5.1.27
 --------------------------------------------------------------------------------
+- fix adding new attribute definition if object type is 'all'
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.26