From 7fffe3867df7328308432dcb89078cd35ecaf153 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 14 Mar 2021 13:56:29 +0100
Subject: [PATCH 1/4] remove html code with formField()

---
 views/bootstrap/class.AttributeMgr.php | 78 +++++++++++++-------------
 1 file changed, 40 insertions(+), 38 deletions(-)

diff --git a/views/bootstrap/class.AttributeMgr.php b/views/bootstrap/class.AttributeMgr.php
index 234317f62..28857d099 100644
--- a/views/bootstrap/class.AttributeMgr.php
+++ b/views/bootstrap/class.AttributeMgr.php
@@ -189,7 +189,7 @@ $(document).ready( function() {
 			<input type="hidden" name="attrdefid" value="<?php echo $attrdef->getID()?>" />
 <?php
 		} else {
-  		echo createHiddenFieldWithKey('addattrdef');
+			echo createHiddenFieldWithKey('addattrdef');
 ?>
 			<input type="hidden" name="action" value="addattrdef">
 <?php
@@ -203,47 +203,49 @@ $(document).ready( function() {
 				'value'=>($attrdef ? htmlspecialchars($attrdef->getName()) : '')
 			)
 		);
-?>
-					<div class="control-group">
-						<label class="control-label">
-							<?php printMLText("attrdef_objtype");?>:
-						</label>
-						<div class="controls">
-						<select name="objtype"><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_all ?>"><?php printMLText('all'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_folder ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_folder) echo "selected"; ?>><?php printMLText('folder'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_document ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_document) echo "selected"; ?>><?php printMLText('document'); ?></option><option value="<?php echo SeedDMS_Core_AttributeDefinition::objtype_documentcontent ?>" <?php if($attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_documentcontent) echo "selected"; ?>><?php printMLText('documentcontent'); ?></option></select>
-						</div>
-					</div>
-
-
-					<div class="control-group">
-						<label class="control-label"><?php printMLText("attrdef_type");?>:</label>
-						<div class="controls">
-							<select name="type">
-								<optgroup label="<?= getMLText('types_generic') ?>">
-								<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_int ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int) echo "selected"; ?>><?php printMLText('attrdef_type_int'); ?></option>
-								<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_float ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_float) echo "selected"; ?>><?php printMLText('attrdef_type_float'); ?></option>
-								<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_string ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_string) echo "selected"; ?>><?php printMLText('attrdef_type_string'); ?></option>
-								<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_boolean ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_boolean) echo "selected"; ?>><?php printMLText('attrdef_type_boolean'); ?></option>
-								<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_date ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date) echo "selected"; ?>><?php printMLText('attrdef_type_date'); ?></option>
-								<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_email ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_email) echo "selected"; ?>><?php printMLText('attrdef_type_email'); ?></option>
-								<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_url ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_url) echo "selected"; ?>><?php printMLText('attrdef_type_url'); ?></option>
-								</optgroup>
-								<optgroup label="SeedDMS">
-								<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_folder ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_folder) echo "selected"; ?>><?php printMLText('attrdef_type_folder'); ?></option>
-								<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_document ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_document) echo "selected"; ?>><?php printMLText('attrdef_type_document'); ?></option>
-								<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_user ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_user) echo "selected"; ?>><?php printMLText('attrdef_type_user'); ?></option>
-								<option value="<?php echo SeedDMS_Core_AttributeDefinition::type_group ?>" <?php if($attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_group) echo "selected"; ?>><?php printMLText('attrdef_type_group'); ?></option>
-								</optgroup>
-<?php
+		$options = array();
+		$options[] = array(SeedDMS_Core_AttributeDefinition::objtype_all, getMLText('all'));
+		$options[] = array(SeedDMS_Core_AttributeDefinition::objtype_folder, getMLText('folder'), $attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_folder);
+		$options[] = array(SeedDMS_Core_AttributeDefinition::objtype_document, getMLText('document'), $attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_document);
+		$options[] = array(SeedDMS_Core_AttributeDefinition::objtype_documentcontent, getMLText('documentcontent'), $attrdef && $attrdef->getObjType() == SeedDMS_Core_AttributeDefinition::objtype_documentcontent);
+		$this->formField(
+			getMLText("attrdef_objtype"),
+			array(
+				'element'=>'select',
+				'name'=>'objtype',
+				'options'=>$options
+			)
+		);
+		$options = array();
+		$options[] = getMLText('types_generic');
+		$options[] = array(SeedDMS_Core_AttributeDefinition::type_int, getMLText('attrdef_type_int'), $attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int);
+		$options[] = array(SeedDMS_Core_AttributeDefinition::type_float, getMLText('attrdef_type_float'), $attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_float);
+		$options[] = array(SeedDMS_Core_AttributeDefinition::type_string, getMLText('attrdef_type_string'), $attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_string);
+		$options[] = array(SeedDMS_Core_AttributeDefinition::type_boolean, getMLText('attrdef_type_boolean'), $attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_boolean);
+		$options[] = array(SeedDMS_Core_AttributeDefinition::type_date, getMLText('attrdef_type_date'), $attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date);
+		$options[] = array(SeedDMS_Core_AttributeDefinition::type_email, getMLText('attrdef_type_email'), $attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_email);
+		$options[] = array(SeedDMS_Core_AttributeDefinition::type_url, getMLText('attrdef_type_url'), $attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_url);
+		$options[] = 'SeedDMS';
+		$options[] = array(SeedDMS_Core_AttributeDefinition::type_folder, getMLText('attrdef_type_folder'), $attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_folder);
+		$options[] = array(SeedDMS_Core_AttributeDefinition::type_document, getMLText('attrdef_type_document'), $attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_document);
+		$options[] = array(SeedDMS_Core_AttributeDefinition::type_user, getMLText('attrdef_type_user'), $attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_user);
+		$options[] = array(SeedDMS_Core_AttributeDefinition::type_group, getMLText('attrdef_type_group'), $attrdef && $attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_group);
 		if($moreoptions = $this->callHook('additionalTypes', $attrdef)) {
 			foreach($moreoptions as $option) {
-				echo '<option value="'.(int) $option['value'].'" '.($attrdef && $attrdef->getType() == $option['value'] ? "selected" : "").'>'.$option['name'].'</option>';
+				if(is_string($option))
+					$options[] = $option;
+				elseif(is_array($option))
+					$options[] = array((int) $option['value'], $option['name'], $attrdef && $attrdef->getType() == $option['value']);
 			}
 		}
-?>
-							</select>
-						</div>
-					</div>
-<?php
+		$this->formField(
+			getMLText("attrdef_type"),
+			array(
+				'element'=>'select',
+				'name'=>'type',
+				'options'=>$options
+			)
+		);
 		$this->formField(
 			getMLText("attrdef_multiple"),
 			array(

From e9d606ce2791a830864412ea5b5281751aedd979 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 14 Mar 2021 13:57:21 +0100
Subject: [PATCH 2/4] add optgroup in formField()

---
 views/bootstrap/class.Bootstrap.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index f2bf74c1f..ff2cc853c 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -956,11 +956,15 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 				echo ">";
 				if(isset($value['options']) && is_array($value['options'])) {
 					foreach($value['options'] as $val) {
+						if(is_string($val)) {
+							echo '<optgroup label="'.$val.'">';
+						} elseif(is_array($val)) {
 						echo '<option value="'.$val[0].'"'.(!empty($val[2]) ? ' selected' : '');
 						if(!empty($val[3]) && is_array($val[3]))
 							foreach($val[3] as $a)
 								echo ' '.$a[0].'="'.$a[1].'"';
 						echo '>'.$val[1].'</option>';
+						}
 					}
 				}
 				echo '</select>';

From 2cb2de2846375f91a1c38235e92d43862f35c0f3 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 14 Mar 2021 14:05:11 +0100
Subject: [PATCH 3/4] remove container

---
 views/bootstrap/class.UsrView.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/views/bootstrap/class.UsrView.php b/views/bootstrap/class.UsrView.php
index 09c9ea48c..b566573ae 100644
--- a/views/bootstrap/class.UsrView.php
+++ b/views/bootstrap/class.UsrView.php
@@ -44,7 +44,6 @@ class SeedDMS_View_UsrView extends SeedDMS_Bootstrap_Style {
 		$this->pageNavigation(getMLText("my_account"), "my_account");
 
 		$this->contentHeading(getMLText("users"));
-		$this->contentContainerStart();
 
 		echo "<table class=\"table table-condensed\">\n";
 		echo "<thead>\n<tr>\n";
@@ -76,7 +75,6 @@ class SeedDMS_View_UsrView extends SeedDMS_Bootstrap_Style {
 
 		echo "</table>\n";
 
-		$this->contentContainerEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */

From 7c18872531e96be39ccd384b183ca8a7a913fcb8 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sun, 14 Mar 2021 14:11:14 +0100
Subject: [PATCH 4/4] fix some php warning because of missing view variables

---
 out/out.ManageNotify.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/out/out.ManageNotify.php b/out/out.ManageNotify.php
index 4ffc38452..5678023ba 100644
--- a/out/out.ManageNotify.php
+++ b/out/out.ManageNotify.php
@@ -35,6 +35,9 @@ if ($user->isGuest()) {
 }
 
 if($view) {
+	$view->setParam('showtree', showtree());
+	$view->setParam('enableRecursiveCount', $settings->_enableRecursiveCount);
+	$view->setParam('maxRecursiveCount', $settings->_maxRecursiveCount);
 	$view->setParam('cachedir', $settings->_cacheDir);
 	$view->setParam('previewWidthList', $settings->_previewWidthList);
 	$view->setParam('timeout', $settings->_cmdTimeout);