Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

CHANGELOG

@@ -296,6 +296,7 @@
   document, still send it to uploader of version
 - set default language in login form if language selector is turned off
 - do not show full list of notifiers to none admins
+- do not list document/folders in sequence selector if its number exceeds 50
 
 --------------------------------------------------------------------------------
                      Changes in version 5.1.33

controllers/class.AddDocument.php

@@ -56,13 +56,40 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 		$reqversion = $this->getParam('reqversion');
 		$version_comment = $this->getParam('versioncomment');
 		$attributes = $this->getParam('attributes');
-		foreach($attributes as $attrdefid=>$attribute) {
+		foreach($attributes as $attrdefid=>&$attribute) {
 			if($attrdef = $dms->getAttributeDefinition($attrdefid)) {
 				if(null === ($ret = $this->callHook('validateAttribute', $attrdef, $attribute))) {
 				if($attribute) {
 					switch($attrdef->getType()) {
 					case SeedDMS_Core_AttributeDefinition::type_date:
-						$attribute = date('Y-m-d', makeTsFromDate($attribute));
+						if(is_array($attribute))
+							$attribute = array_map(fn($value): string => date('Y-m-d', makeTsFromDate($value)), $attribute);
+						else
+							$attribute = date('Y-m-d', makeTsFromDate($attribute));
+						break;
+					case SeedDMS_Core_AttributeDefinition::type_folder:
+						if(is_array($attribute))
+							$attribute = array_map(fn($value): object => $dms->getFolder((int) $value), $attribute);
+						else
+							$attribute = $dms->getFolder((int) $attribute);
+						break;
+					case SeedDMS_Core_AttributeDefinition::type_document:
+						if(is_array($attribute))
+							$attribute = array_map(fn($value): object => $dms->getDocument((int) $value), $attribute);
+						else
+							$attribute = $dms->getDocument((int) $attribute);
+						break;
+					case SeedDMS_Core_AttributeDefinition::type_user:
+						if(is_array($attribute))
+							$attribute = array_map(fn($value): object => $dms->getUser((int) $value), $attribute);
+						else
+							$attribute = $dms->getUser((int) $attribute);
+						break;
+					case SeedDMS_Core_AttributeDefinition::type_group:
+						if(is_array($attribute))
+							$attribute = array_map(fn($value): object => $dms->getGroup((int) $value), $attribute);
+						else
+							$attribute = $dms->getGroup((int) $attribute);
 						break;
 					}
 					if(!$attrdef->validate($attribute, null, true)) {
@@ -80,13 +107,40 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common {
 			}
 		}
 		if($attributes_version = $this->getParam('attributesversion')) {
-			foreach($attributes_version as $attrdefid=>$attribute) {
+			foreach($attributes_version as $attrdefid=>&$attribute) {
 				if($attrdef = $dms->getAttributeDefinition($attrdefid)) {
 					if(null === ($ret = $this->callHook('validateAttribute', $attrdef, $attribute))) {
 					if($attribute) {
 						switch($attrdef->getType()) {
 						case SeedDMS_Core_AttributeDefinition::type_date:
-							$attribute = date('Y-m-d', makeTsFromDate($attribute));
+							if(is_array($attribute))
+								$attribute = array_map(fn($value): string => date('Y-m-d', makeTsFromDate($value)), $attribute);
+							else
+								$attribute = date('Y-m-d', makeTsFromDate($attribute));
+							break;
+						case SeedDMS_Core_AttributeDefinition::type_folder:
+							if(is_array($attribute))
+								$attribute = array_map(fn($value): object => $dms->getFolder((int) $value), $attribute);
+							else
+								$attribute = $dms->getFolder((int) $attribute);
+							break;
+						case SeedDMS_Core_AttributeDefinition::type_document:
+							if(is_array($attribute))
+								$attribute = array_map(fn($value): object => $dms->getDocument((int) $value), $attribute);
+							else
+								$attribute = $dms->getDocument((int) $attribute);
+							break;
+						case SeedDMS_Core_AttributeDefinition::type_user:
+							if(is_array($attribute))
+								$attribute = array_map(fn($value): object => $dms->getUser((int) $value), $attribute);
+							else
+								$attribute = $dms->getUser((int) $attribute);
+							break;
+						case SeedDMS_Core_AttributeDefinition::type_group:
+							if(is_array($attribute))
+								$attribute = array_map(fn($value): object => $dms->getGroup((int) $value), $attribute);
+							else
+								$attribute = $dms->getGroup((int) $attribute);
 							break;
 						}
 						if(!$attrdef->validate($attribute, null, true)) {

controllers/class.AddSubFolder.php

@@ -41,13 +41,40 @@ class SeedDMS_Controller_AddSubFolder extends SeedDMS_Controller_Common {
 		$comment = $this->getParam('comment');
 		$sequence = $this->getParam('sequence');
 		$attributes = $this->getParam('attributes');
-		foreach($attributes as $attrdefid=>$attribute) {
+		foreach($attributes as $attrdefid=>&$attribute) {
 			if($attrdef = $dms->getAttributeDefinition($attrdefid)) {
 				if(null === ($ret = $this->callHook('validateAttribute', $attrdef, $attribute))) {
 				if($attribute) {
 					switch($attrdef->getType()) {
 					case SeedDMS_Core_AttributeDefinition::type_date:
-						$attribute = date('Y-m-d', makeTsFromDate($attribute));
+						if(is_array($attribute))
+							$attribute = array_map(fn($value): string => date('Y-m-d', makeTsFromDate($value)), $attribute);
+						else
+							$attribute = date('Y-m-d', makeTsFromDate($attribute));
+						break;
+					case SeedDMS_Core_AttributeDefinition::type_folder:
+						if(is_array($attribute))
+							$attribute = array_map(fn($value): object => $dms->getFolder((int) $value), $attribute);
+						else
+							$attribute = $dms->getFolder((int) $attribute);
+						break;
+					case SeedDMS_Core_AttributeDefinition::type_document:
+						if(is_array($attribute))
+							$attribute = array_map(fn($value): object => $dms->getDocument((int) $value), $attribute);
+						else
+							$attribute = $dms->getDocument((int) $attribute);
+						break;
+					case SeedDMS_Core_AttributeDefinition::type_user:
+						if(is_array($attribute))
+							$attribute = array_map(fn($value): object => $dms->getUser((int) $value), $attribute);
+						else
+							$attribute = $dms->getUser((int) $attribute);
+						break;
+					case SeedDMS_Core_AttributeDefinition::type_group:
+						if(is_array($attribute))
+							$attribute = array_map(fn($value): object => $dms->getGroup((int) $value), $attribute);
+						else
+							$attribute = $dms->getGroup((int) $attribute);
 						break;
 					}
 					if(!$attrdef->validate($attribute, null, true)) {

controllers/class.EditDocument.php

@@ -122,7 +122,34 @@ class SeedDMS_Controller_EditDocument extends SeedDMS_Controller_Common {
 						if($attribute) {
 							switch($attrdef->getType()) {
 							case SeedDMS_Core_AttributeDefinition::type_date:
-								$attribute = date('Y-m-d', makeTsFromDate($attribute));
+								if(is_array($attribute))
+									$attribute = array_map(fn($value): string => date('Y-m-d', makeTsFromDate($value)), $attribute);
+								else
+									$attribute = date('Y-m-d', makeTsFromDate($attribute));
+								break;
+							case SeedDMS_Core_AttributeDefinition::type_folder:
+								if(is_array($attribute))
+									$attribute = array_map(fn($value): object => $dms->getFolder((int) $value), $attribute);
+								else
+									$attribute = $dms->getFolder((int) $attribute);
+								break;
+							case SeedDMS_Core_AttributeDefinition::type_document:
+								if(is_array($attribute))
+									$attribute = array_map(fn($value): object => $dms->getDocument((int) $value), $attribute);
+								else
+									$attribute = $dms->getDocument((int) $attribute);
+								break;
+							case SeedDMS_Core_AttributeDefinition::type_user:
+								if(is_array($attribute))
+									$attribute = array_map(fn($value): object => $dms->getUser((int) $value), $attribute);
+								else
+									$attribute = $dms->getUser((int) $attribute);
+								break;
+							case SeedDMS_Core_AttributeDefinition::type_group:
+								if(is_array($attribute))
+									$attribute = array_map(fn($value): object => $dms->getGroup((int) $value), $attribute);
+								else
+									$attribute = $dms->getGroup((int) $attribute);
 								break;
 							}
 							if(!$attrdef->validate($attribute, $document, false)) {

controllers/class.EditFolder.php

@@ -51,33 +51,61 @@ class SeedDMS_Controller_EditFolder extends SeedDMS_Controller_Common {
 			$oldattributes = $folder->getAttributes();
 			if($attributes) {
 				foreach($attributes as $attrdefid=>$attribute) {
-					$attrdef = $dms->getAttributeDefinition($attrdefid);
+					if($attrdef = $dms->getAttributeDefinition($attrdefid)) {
-					if(null === ($ret = $this->callHook('validateAttribute', $attrdef, $attribute))) {
+						if(null === ($ret = $this->callHook('validateAttribute', $attrdef, $attribute))) {
-					if($attribute) {
+						if($attribute) {
-						switch($attrdef->getType()) {
+							switch($attrdef->getType()) {
-						case SeedDMS_Core_AttributeDefinition::type_date:
+							case SeedDMS_Core_AttributeDefinition::type_date:
-							$attribute = date('Y-m-d', makeTsFromDate($attribute));
+								if(is_array($attribute))
-							break;
+									$attribute = array_map(fn($value): string => date('Y-m-d', makeTsFromDate($value)), $attribute);
-						}
+								else
-						if(!$attrdef->validate($attribute, $folder, false)) {
+									$attribute = date('Y-m-d', makeTsFromDate($attribute));
-							$this->errormsg	= getAttributeValidationText($attrdef->getValidationError(), $attrdef->getName(), $attribute);
+								break;
-							return false;
+							case SeedDMS_Core_AttributeDefinition::type_folder:
-						}
+								if(is_array($attribute))
+									$attribute = array_map(fn($value): object => $dms->getFolder((int) $value), $attribute);
+								else
+									$attribute = $dms->getFolder((int) $attribute);
+								break;
+							case SeedDMS_Core_AttributeDefinition::type_document:
+								if(is_array($attribute))
+									$attribute = array_map(fn($value): object => $dms->getDocument((int) $value), $attribute);
+								else
+									$attribute = $dms->getDocument((int) $attribute);
+								break;
+							case SeedDMS_Core_AttributeDefinition::type_user:
+								if(is_array($attribute))
+									$attribute = array_map(fn($value): object => $dms->getUser((int) $value), $attribute);
+								else
+									$attribute = $dms->getUser((int) $attribute);
+								break;
+							case SeedDMS_Core_AttributeDefinition::type_group:
+								if(is_array($attribute))
+									$attribute = array_map(fn($value): object => $dms->getGroup((int) $value), $attribute);
+								else
+									$attribute = $dms->getGroup((int) $attribute);
+								break;
+							}
+							if(!$attrdef->validate($attribute, $folder, false)) {
+								$this->errormsg	= getAttributeValidationText($attrdef->getValidationError(), $attrdef->getName(), $attribute);
+								return false;
+							}
 
-						if(!isset($oldattributes[$attrdefid]) || $attribute != $oldattributes[$attrdefid]->getValue()) {
+							if(!isset($oldattributes[$attrdefid]) || $attribute != $oldattributes[$attrdefid]->getValue()) {
-							if(!$folder->setAttributeValue($dms->getAttributeDefinition($attrdefid), $attribute))
+								if(!$folder->setAttributeValue($dms->getAttributeDefinition($attrdefid), $attribute))
+									return false;
+							}
+						} elseif($attrdef->getMinValues() > 0) {
+							$this->errormsg = getMLText("attr_min_values", array("attrname"=>$attrdef->getName()));
+								return false;
+						} elseif(isset($oldattributes[$attrdefid])) {
+							if(!$folder->removeAttribute($dms->getAttributeDefinition($attrdefid)))
+								return false;
+						}
+						} else {
+							if($ret === false)
 								return false;
 						}
-					} elseif($attrdef->getMinValues() > 0) {
-						$this->errormsg = getMLText("attr_min_values", array("attrname"=>$attrdef->getName()));
-							return false;
-					} elseif(isset($oldattributes[$attrdefid])) {
-						if(!$folder->removeAttribute($dms->getAttributeDefinition($attrdefid)))
-							return false;
-					}
-					} else {
-						if($ret === false)
-							return false;
 					}
 				}
 			}

inc/inc.ClassNotificationService.php

@@ -644,7 +644,7 @@ class SeedDMS_NotificationService {
 					$params['name'] = $document->getName();
 					$params['document_id'] = $document->getId();
 					$params['attribute_name'] = $attribute->getAttributeDefinition()->getName();
-					$params['attribute_old_value'] = $oldattributes[$attrdefid]->getValue();
+					$params['attribute_old_value'] = $oldattributes[$attrdefid]->getValueAsString();
 					$params['attribute_new_value'] = isset($newattributes[$attrdefid]) ? $newattributes[$attrdefid]->getValue() : '';
 					$params['folder_path'] = $folder->getFolderPathPlain();
 					$params['username'] = $user->getFullName();
@@ -669,7 +669,7 @@ class SeedDMS_NotificationService {
 					$params['name'] = $document->getName();
 					$params['document_id'] = $document->getId();
 					$params['attribute_name'] = $dms->getAttributeDefinition($attrdefid)->getName();
-					$params['attribute_value'] = $attribute->getValue();
+					$params['attribute_value'] = $attribute->getValueAsString();
 					$params['folder_path'] = $folder->getFolderPathPlain();
 					$params['username'] = $user->getFullName();
 					$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID();
@@ -699,8 +699,8 @@ class SeedDMS_NotificationService {
 					$params['name'] = $folder->getName();
 					$params['folder_id'] = $folder->getId();
 					$params['attribute_name'] = $attribute->getAttributeDefinition()->getName();
-					$params['attribute_old_value'] = $oldattributes[$attrdefid]->getValue();
+					$params['attribute_old_value'] = $oldattributes[$attrdefid]->getValueAsString();
-					$params['attribute_new_value'] = isset($newattributes[$attrdefid]) ? $newattributes[$attrdefid]->getValue() : '';
+					$params['attribute_new_value'] = isset($newattributes[$attrdefid]) ? $newattributes[$attrdefid]->getValueAsString() : '';
 					$params['folder_path'] = $folder->getFolderPathPlain();
 					$params['username'] = $user->getFullName();
 					$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
@@ -722,8 +722,9 @@ class SeedDMS_NotificationService {
 					$message = "folder_attribute_added_email_body";
 					$params = array();
 					$params['name'] = $folder->getName();
+					$params['folder_id'] = $folder->getId();
 					$params['attribute_name'] = $dms->getAttributeDefinition($attrdefid)->getName();
-					$params['attribute_value'] = $attribute->getValue();
+					$params['attribute_value'] = $attribute->getValueAsString();
 					$params['folder_path'] = $folder->getFolderPathPlain();
 					$params['username'] = $user->getFullName();
 					$params['url'] = getBaseUrl().$this->settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();

op/op.EditAttributes.php

@@ -75,27 +75,55 @@ foreach($version->getAttributes() as $ai=>$aa)
 $attributes = $_POST["attributes"];
 if($attributes) {
 	foreach($attributes as $attrdefid=>$attribute) {
-		$attrdef = $dms->getAttributeDefinition($attrdefid);
+		if($attrdef = $dms->getAttributeDefinition($attrdefid)) {
-		if($attribute) {
+			if($attribute) {
-			switch($attrdef->getType()) {
+				switch($attrdef->getType()) {
-			case SeedDMS_Core_AttributeDefinition::type_date:
+				case SeedDMS_Core_AttributeDefinition::type_date:
-				$attribute = date('Y-m-d', makeTsFromDate($attribute));
+					if(is_array($attribute))
-				break;
+						$attribute = array_map(fn($value): string => date('Y-m-d', makeTsFromDate($value)), $attribute);
-			}
+					else
-			if(!$attrdef->validate($attribute, $version, false)) {
+						$attribute = date('Y-m-d', makeTsFromDate($attribute));
-				$errmsg = getAttributeValidationText($attrdef->getValidationError(), $attrdef->getName(), $attribute);
+					break;
-				UI::exitError(getMLText("document_title", array("documentname" => $document->getName())), $errmsg);
+				case SeedDMS_Core_AttributeDefinition::type_folder:
-			}
+					if(is_array($attribute))
-			if(!isset($oldattributes[$attrdefid]) || $attribute != $oldattributes[$attrdefid]->getValue()) {
+						$attribute = array_map(fn($value): object => $dms->getFolder((int) $value), $attribute);
-				if(!$version->setAttributeValue($dms->getAttributeDefinition($attrdefid), $attribute)) {
+					else
-					UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
+						$attribute = $dms->getFolder((int) $attribute);
+					break;
+				case SeedDMS_Core_AttributeDefinition::type_document:
+					if(is_array($attribute))
+						$attribute = array_map(fn($value): object => $dms->getDocument((int) $value), $attribute);
+					else
+						$attribute = $dms->getDocument((int) $attribute);
+					break;
+				case SeedDMS_Core_AttributeDefinition::type_user:
+					if(is_array($attribute))
+						$attribute = array_map(fn($value): object => $dms->getUser((int) $value), $attribute);
+					else
+						$attribute = $dms->getUser((int) $attribute);
+					break;
+				case SeedDMS_Core_AttributeDefinition::type_group:
+					if(is_array($attribute))
+						$attribute = array_map(fn($value): object => $dms->getGroup((int) $value), $attribute);
+					else
+						$attribute = $dms->getGroup((int) $attribute);
+					break;
 				}
+				if(!$attrdef->validate($attribute, $version, false)) {
+					$errmsg = getAttributeValidationText($attrdef->getValidationError(), $attrdef->getName(), $attribute);
+					UI::exitError(getMLText("document_title", array("documentname" => $document->getName())), $errmsg);
+				}
+				if(!isset($oldattributes[$attrdefid]) || $attribute != $oldattributes[$attrdefid]->getValue()) {
+					if(!$version->setAttributeValue($dms->getAttributeDefinition($attrdefid), $attribute)) {
+						UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("error_occured"));
+					}
+				}
+			} elseif($attrdef->getMinValues() > 0) {
+				UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
+			} elseif(isset($oldattributes[$attrdefid])) {
+				if(!$version->removeAttribute($dms->getAttributeDefinition($attrdefid)))
+					UI::exitError(getMLText("document_title", array("documentname" => $folder->getName())),getMLText("error_occured"));
 			}
-		} elseif($attrdef->getMinValues() > 0) {
-			UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
-		} elseif(isset($oldattributes[$attrdefid])) {
-			if(!$version->removeAttribute($dms->getAttributeDefinition($attrdefid)))
-				UI::exitError(getMLText("document_title", array("documentname" => $folder->getName())),getMLText("error_occured"));
 		}
 	}
 }

views/bootstrap/class.AddDocument.php

@@ -256,7 +256,7 @@ console.log(params);
 			}
 		}
 		if(!$nodocumentformfields || !in_array('sequence', $nodocumentformfields)) {
-			$this->formField(getMLText("sequence"), $this->getSequenceChooser($folder->getDocuments('s')).($orderby != 's' ? "<br />".getMLText('order_by_sequence_off') : ''));
+			$this->formField(getMLText("sequence"), $this->getSequenceChooser($folder, 'd').($orderby != 's' ? "<br />".getMLText('order_by_sequence_off') : ''));
 		} else {
 			$minmax = $folder->getDocumentsMinMax();
 			if($this->params['defaultposition'] == 'start') {

views/bootstrap/class.AddSubFolder.php

@@ -98,7 +98,7 @@ $(document).ready( function() {
 			)
 		);
 		if(!$nofolderformfields || !in_array('sequence', $nofolderformfields)) {
-            $this->formField(getMLText("sequence"), $this->getSequenceChooser($folder->getSubFolders('s')).($orderby != 's' ? "<br />".getMLText('order_by_sequence_off') : ''));
+            $this->formField(getMLText("sequence"), $this->getSequenceChooser($folder, 'f').($orderby != 's' ? "<br />".getMLText('order_by_sequence_off') : ''));
 		} else {
 			$minmax = $folder->getFoldersMinMax();
 			if($this->params['defaultposition'] == 'start') {

views/bootstrap/class.AttributeMgr.php

@@ -93,14 +93,26 @@ $(document).ready( function() {
 						$content .= "</tr></thead>\n<tbody>\n";
 						$separator = $selattrdef->getValueSetSeparator();
 						foreach($res['frequencies'][$type] as $entry) {
-							$value = $selattrdef->parseValue($entry['value']);
+							if(is_array($entry['value'])) {
+								$values = $entry['value'];
+							} else {
+								$values = [$entry['value']];
+							}
+							$value = [];
+							foreach($values as $v) {
+								if(is_object($v))
+									$value[] = $v->getId();
+								else
+									$value[] = $v;
+							}
+//							$value = $selattrdef->parseValue($entry['value']);
 							$content .= "<tr>";
 							$content .= "<td>".htmlspecialchars(implode('<span style="color: #aaa;">'.($separator ? ' '.$separator.' ' : ' ; ').'</span>', $value))."</td>";
 							$content .= "<td><a href=\"../out/out.Search.php?fullsearch=0&resultmode=".($type == 'folder' ? 2 : ($type == 'document' ? 1 : 3))."&";
 							if($selattrdef->getType() == SeedDMS_Core_AttributeDefinition::type_date)
 								$content .= "attributes[".$selattrdef->getID()."][from]=".urlencode($entry['value'])."&attributes[".$selattrdef->getID()."][to]=".urlencode($entry['value']);
 							else
-								$content .= "attributes[".$selattrdef->getID()."]=".urlencode($entry['value']);
+								$content .= "attributes[".$selattrdef->getID()."]=".urlencode($value[0]);
 							$content .= "\">".urlencode($entry['c'])."</a></td>";
 							$content .= "<td>";
 							/* various checks, if the value is valid */

views/bootstrap/class.Bootstrap.php

@@ -1714,17 +1714,43 @@ $(document).ready(function() {
 		print "</select>";
 	} /* }}} */
 
-	function printSequenceChooser($objArr, $keepID = -1) { /* {{{ */
+	function printSequenceChooser($parent, $type, $keepID = -1) { /* {{{ */
-		echo $this->getSequenceChooser($objArr, $keepID);
+		echo $this->getSequenceChooser($parent, $type, $keepID);
 	} /* }}} */
 
-	function getSequenceChooser($objArr, $keepID = -1) { /* {{{ */
+	/**
-		if (count($objArr) > 0) {
+	 * Return html code for sequence chooser
-			$max = $objArr[count($objArr)-1]->getSequence() + 1;
+	 *
-			$min = $objArr[0]->getSequence() - 1;
+	 * This method will return the html code of the ѕelect menu for setting
+	 * the ѕequence number of a document or folder. The select menu will contain
+	 * a list of all siblings to select to positon relative to a sibling.
+	 * For performance reasons the select menu will not contain any siblings
+	 * if the number of siblings is greater than 50.
+	 *
+	 * @param $parent object parent folder of new or updated document/folder
+	 * @param $type string type of new object 'f'=folder, 'd'=document
+	 * @param $keepID integer id of current object
+	 */
+	function getSequenceChooser($parent, $type, $keepID = -1) { /* {{{ */
+		$objArr = [];
+		if($type == 'd') {
+			if(($c = $parent->hasDocuments()) < 50)
+				$objArr = $parent->getDocuments('s');
+			$minmax = $parent->getDocumentsMinMax();
+		} elseif($type = 'f') {
+			if(($c = $parent->hasSubFolders()) < 50)
+				$objArr = $parent->getSubFolders('s');
+			$minmax = $parent->getFoldersMinMax();
+		} else
+			return '';
+
+		if ($objArr) {
+			$min = $minmax['min']-1.0;
+			$max = $minmax['max']+1.0;
 		}
 		else {
-			$max = 1.0;
+			$min = (float) $minmax['min'];
+			$max = $minmax['max']+1.0;
 		}
 		$content = "<select name=\"sequence\">\n";
 		if ($keepID != -1) {
@@ -1732,7 +1758,7 @@ $(document).ready(function() {
 		}
 		if($this->params['defaultposition'] != 'start')
 			$content .= "  <option value=\"".$max."\">" . getMLText("seq_end");
-		if (count($objArr) > 0) {
+		if ($c > 0) {
 			$content .= "  <option value=\"".$min."\">" . getMLText("seq_start");
 		}
 		if($this->params['defaultposition'] == 'start')
@@ -1975,26 +2001,23 @@ $(document).ready(function() {
 		case SeedDMS_Core_AttributeDefinition::type_folder:
 			$attrs = $attribute->getValueAsArray();
 			$tmp = array();
-			foreach($attrs as $attr) {
+			foreach($attrs as $targetfolder) {
-				if($targetfolder = $dms->getFolder(intval($attr)))
+				$tmp[] = '<a href="'.$this->params['settings']->_httpRoot.'out/out.ViewFolder.php?folderid='.$targetfolder->getId().'">'.htmlspecialchars($targetfolder->getName()).'</a>';
-					$tmp[] = '<a href="'.$this->params['settings']->_httpRoot.'out/out.ViewFolder.php?folderid='.$targetfolder->getId().'">'.htmlspecialchars($targetfolder->getName()).'</a>';
 			}
 			return implode('<br />', $tmp);
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_document:
 			$attrs = $attribute->getValueAsArray();
 			$tmp = array();
-			foreach($attrs as $attr) {
+			foreach($attrs as $targetdoc) {
-				if($targetdoc = $dms->getDocument(intval($attr)))
+				$tmp[] = '<a href="'.$this->params['settings']->_httpRoot.'out/out.ViewDocument.php?documentid='.$targetdoc->getId().'">'.htmlspecialchars($targetdoc->getName()).'</a>';
-					$tmp[] = '<a href="'.$this->params['settings']->_httpRoot.'out/out.ViewDocument.php?documentid='.$targetdoc->getId().'">'.htmlspecialchars($targetdoc->getName()).'</a>';
 			}
 			return implode('<br />', $tmp);
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_user:
 			$attrs = $attribute->getValueAsArray();
 			$tmp = array();
-			foreach($attrs as $attr) {
+			foreach($attrs as $curuser) {
-				$curuser = $dms->getUser((int) $attr);
 				$tmp[] = htmlspecialchars($curuser->getFullname()." (".$curuser->getLogin().")");
 			}
 			return implode('<br />', $tmp);
@@ -2002,8 +2025,7 @@ $(document).ready(function() {
 		case SeedDMS_Core_AttributeDefinition::type_group:
 			$attrs = $attribute->getValueAsArray();
 			$tmp = array();
-			foreach($attrs as $attr) {
+			foreach($attrs as $curgroup) {
-				$curgroup = $dms->getGroup((int) $attr);
 				$tmp[] = htmlspecialchars($curgroup->getName());
 			}
 			return implode('<br />', $tmp);
@@ -2053,23 +2075,18 @@ $(document).ready(function() {
 			$content .= "<input type=\"text\" id=\"".$attr_id."\" name=\"".$attr_name."\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '')." data-rule-number=\"true\"/>";
 			break; */
 		case SeedDMS_Core_AttributeDefinition::type_folder:
-			$objvalue = $attribute ? (is_object($attribute) ? (int) $attribute->getValue() : (int) $attribute) : 0;
+			$target = $attribute ? $attribute->getValue() : null;
-			if($objvalue)
-				$target = $dms->getFolder($objvalue);
-			else
-				$target = null;
 			$content .= $this->getFolderChooserHtml("attr".$attrdef->getId(), M_READWRITE, -1, $target, $attr_name, false);
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_document:
-			$objvalue = $attribute ? (is_object($attribute) ? (int) $attribute->getValue() : (int) $attribute) : 0;
+			$target = $attribute ? $attribute->getValue() : null;
-			if($objvalue)
-				$target = $dms->getDocument($objvalue);
-			else
-				$target = null;
 			$content .= $this->getDocumentChooserHtml("attr".$attrdef->getId(), M_READ, -1, $target, $attr_name);
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_user:
-			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValueAsArray() : (is_string($attribute) ? [$attribute] : $attribute)) : array();
+			$target = $attribute ? $attribute->getValueAsArray() : [];
+			$objvalue = [];
+			foreach($target as $t)
+				$objvalue[] = $t->getId();
 			$users = $dms->getAllUsers();
 			if($users) {
 				$allowempty = $attrdef->getMinValues() == 0;
@@ -2089,7 +2106,10 @@ $(document).ready(function() {
 			}
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_group:
-			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValueAsArray() : (is_string($attribute) ? [$attribute] : $attribute)) : array();
+			$target = $attribute ? $attribute->getValueAsArray() : [];
+			$objvalue = [];
+			foreach($target as $t)
+				$objvalue[] = $t->getId();
 			$groups = $dms->getAllGroups();
 			if($groups) {
 				$allowempty = $attrdef->getMinValues() == 0;

views/bootstrap/class.EditDocument.php

@@ -201,7 +201,7 @@ $(document).ready( function() {
 		}
 		if(!$nodocumentformfields || !in_array('sequence', $nodocumentformfields)) {
 		if ($folder->getAccessMode($user) > M_READ) {
-			$this->formField(getMLText("sequence"), $this->getSequenceChooser($folder->getDocuments('s'), $document->getID()).($orderby != 's' ? "<br />".getMLText('order_by_sequence_off') : ''));
+			$this->formField(getMLText("sequence"), $this->getSequenceChooser($folder, 'd', $document->getID()).($orderby != 's' ? "<br />".getMLText('order_by_sequence_off') : ''));
 		}
 		}
 		if($attrdefs) {

views/bootstrap/class.EditFolder.php

@@ -108,7 +108,7 @@ $(document).ready(function() {
 		$parent = ($folder->getID() == $rootfolderid) ? false : $folder->getParent();
 		if(!$nofolderformfields || !in_array('sequence', $nofolderformfields)) {
 			if ($parent && $parent->getAccessMode($user) > M_READ) {
-				$this->formField(getMLText("sequence"), $this->getSequenceChooser($parent->getSubFolders('s'), $folder->getID()).($orderby != 's' ? "<br />".getMLText('order_by_sequence_off') : ''));
+				$this->formField(getMLText("sequence"), $this->getSequenceChooser($parent, 'f', $folder->getID()).($orderby != 's' ? "<br />".getMLText('order_by_sequence_off') : ''));
 			}
 		}
 		if($attrdefs) {

views/bootstrap/class.Search.php

@@ -1517,7 +1517,7 @@ $(document).ready(function() {
 								$attrstr .= $arr;
 							} else {
 								$attrdef = $docattribute->getAttributeDefinition();
-								$attrstr .= "<tr><td>".htmlspecialchars($attrdef->getName())."</td><td>".htmlspecialchars(implode(', ', $docattribute->getValueAsArray()))."</td></tr>\n";
+								$attrstr .= "<tr><td>".htmlspecialchars($attrdef->getName())."</td><td>".htmlspecialchars($docattribute->getValueAsString())."</td></tr>\n";
 							}
 						}
 						$attrstr .= "</table>\n";

views/bootstrap4/class.Bootstrap4.php

@@ -1671,17 +1671,43 @@ $(document).ready(function() {
 		print "</select>";
 	} /* }}} */
 
-	function printSequenceChooser($objArr, $keepID = -1) { /* {{{ */
+	function printSequenceChooser($parent, $type, $keepID = -1) { /* {{{ */
-		echo $this->getSequenceChooser($objArr, $keepID);
+		echo $this->getSequenceChooser($parent, $type, $keepID);
 	} /* }}} */
 
-	function getSequenceChooser($objArr, $keepID = -1) { /* {{{ */
+	/**
-		if (count($objArr) > 0) {
+	 * Return html code for sequence chooser
-			$max = $objArr[count($objArr)-1]->getSequence() + 1;
+	 *
-			$min = $objArr[0]->getSequence() - 1;
+	 * This method will return the html code of the ѕelect menu for setting
+	 * the ѕequence number of a document or folder. The select menu will contain
+	 * a list of all siblings to select to positon relative to a sibling.
+	 * For performance reasons the select menu will not contain any siblings
+	 * if the number of siblings is greater than 50.
+	 *
+	 * @param $parent object parent folder of new or updated document/folder
+	 * @param $type string type of new object 'f'=folder, 'd'=document
+	 * @param $keepID integer id of current object
+	 */
+	function getSequenceChooser($parent, $type, $keepID = -1) { /* {{{ */
+		$objArr = [];
+		if($type == 'd') {
+			if(($c = $parent->hasDocuments()) < 50)
+				$objArr = $parent->getDocuments('s');
+			$minmax = $parent->getDocumentsMinMax();
+		} elseif($type = 'f') {
+			if(($c = $parent->hasSubFolders()) < 50)
+				$objArr = $parent->getSubFolders('s');
+			$minmax = $parent->getFoldersMinMax();
+		} else
+			return '';
+
+		if ($objArr) {
+			$min = $minmax['min']-1.0;
+			$max = $minmax['max']+1.0;
 		}
 		else {
-			$max = 1.0;
+			$min = (float) $minmax['min'];
+			$max = $minmax['max']+1.0;
 		}
 		$content = "<select class=\"form-control\" name=\"sequence\">\n";
 		if ($keepID != -1) {
@@ -1689,7 +1715,7 @@ $(document).ready(function() {
 		}
 		if($this->params['defaultposition'] != 'start')
 			$content .= "  <option value=\"".$max."\">" . getMLText("seq_end");
-		if (count($objArr) > 0) {
+		if ($c > 0) {
 			$content .= "  <option value=\"".$min."\">" . getMLText("seq_start");
 		}
 		if($this->params['defaultposition'] == 'start')
@@ -1938,26 +1964,23 @@ $(document).ready(function() {
 		case SeedDMS_Core_AttributeDefinition::type_folder:
 			$attrs = $attribute->getValueAsArray();
 			$tmp = array();
-			foreach($attrs as $attr) {
+			foreach($attrs as $targetfolder) {
-				if($targetfolder = $dms->getFolder(intval($attr)))
+				$tmp[] = '<a href="'.$this->params['settings']->_httpRoot.'out/out.ViewFolder.php?folderid='.$targetfolder->getId().'">'.htmlspecialchars($targetfolder->getName()).'</a>';
-					$tmp[] = '<a href="'.$this->params['settings']->_httpRoot.'out/out.ViewFolder.php?folderid='.$targetfolder->getId().'">'.htmlspecialchars($targetfolder->getName()).'</a>';
 			}
 			return implode('<br />', $tmp);
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_document:
 			$attrs = $attribute->getValueAsArray();
 			$tmp = array();
-			foreach($attrs as $attr) {
+			foreach($attrs as $targetdoc) {
-				if($targetdoc = $dms->getDocument(intval($attr)))
+				$tmp[] = '<a href="'.$this->params['settings']->_httpRoot.'out/out.ViewDocument.php?documentid='.$targetdoc->getId().'">'.htmlspecialchars($targetdoc->getName()).'</a>';
-					$tmp[] = '<a href="'.$this->params['settings']->_httpRoot.'out/out.ViewDocument.php?documentid='.$targetdoc->getId().'">'.htmlspecialchars($targetdoc->getName()).'</a>';
 			}
 			return implode('<br />', $tmp);
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_user:
 			$attrs = $attribute->getValueAsArray();
 			$tmp = array();
-			foreach($attrs as $attr) {
+			foreach($attrs as $curuser) {
-				$curuser = $dms->getUser((int) $attr);
 				$tmp[] = htmlspecialchars($curuser->getFullname()." (".$curuser->getLogin().")");
 			}
 			return implode('<br />', $tmp);
@@ -1965,8 +1988,7 @@ $(document).ready(function() {
 		case SeedDMS_Core_AttributeDefinition::type_group:
 			$attrs = $attribute->getValueAsArray();
 			$tmp = array();
-			foreach($attrs as $attr) {
+			foreach($attrs as $curgroup) {
-				$curgroup = $dms->getGroup((int) $attr);
 				$tmp[] = htmlspecialchars($curgroup->getName());
 			}
 			return implode('<br />', $tmp);
@@ -2000,17 +2022,11 @@ $(document).ready(function() {
 			$content .= "<input type=\"checkbox\" id=\"".$attr_id."\" name=\"".$attr_name."\" value=\"1\" ".($objvalue ? 'checked' : '')." />";
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_date:
-			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : '';
+			$objvalue = $attribute ? getReadableDate((is_object($attribute) ? $attribute->getValue() : $attribute)) : '';
 			$dateformat = getConvertDateFormat($this->params['settings']->_dateformat);
-			/*
-				$content .= '<span class="input-append date datepicker" data-date="'.getReadableDate(').'" data-date-format="'.$dateformat.'" data-date-language="'.str_replace('_', '-', $this->params['session']->getLanguage()).'">
-					<input id="'.$attr_id.'" class="span9" size="16" name="'.$attr_name.'" type="text" value="'.($objvalue ? $objvalue : '').'">
-          <span class="add-on"><i class="fa fa-calendar"></i></span>
-					</span>';
-			*/
 			$content = '
 <div class="input-group date">
-	<input type="text" class="form-control" id="'.$attr_id.'" name="'.$attr_name.'" value="'.($objvalue ? getReadableDate($objvalue) : '').'" data-date="'.getReadableDate().'" data-date-format="'.$dateformat.'" data-date-language="'.str_replace('_', '-', $this->params['session']->getLanguage()).'" data-date-autoclose="true" data-provide="datepicker">
+	<input type="text" class="form-control" id="'.$attr_id.'" name="'.$attr_name.'" value="'.($objvalue ? $objvalue : '').'" data-date="'.getReadableDate().'" data-date-format="'.$dateformat.'" data-date-language="'.str_replace('_', '-', $this->params['session']->getLanguage()).'" data-date-autoclose="true" data-provide="datepicker">
 	<div class="input-group-append">
 		<span class="input-group-text"><i class="fa fa-calendar"></i></span>
 	</div>
@@ -2026,23 +2042,18 @@ $(document).ready(function() {
 			$content .= "<input type=\"text\" class=\"form-control\" id=\"".$attr_id."\" name=\"".$attr_name."\" value=\"".htmlspecialchars($objvalue)."\"".((!$norequire && $attrdef->getMinValues() > 0) ? ' required="required"' : '')." data-rule-number=\"true\"/>";
 			break; */
 		case SeedDMS_Core_AttributeDefinition::type_folder:
-			$objvalue = $attribute ? (is_object($attribute) ? (int) $attribute->getValue() : (int) $attribute) : 0;
+			$target = $attribute ? $attribute->getValue() : null;
-			if($objvalue)
-				$target = $dms->getFolder($objvalue);
-			else
-				$target = null;
 			$content .= $this->getFolderChooserHtml("attr".$attrdef->getId(), M_READWRITE, -1, $target, $attr_name, false);
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_document:
-			$objvalue = $attribute ? (is_object($attribute) ? (int) $attribute->getValue() : (int) $attribute) : 0;
+			$target = $attribute ? $attribute->getValue() : null;
-			if($objvalue)
-				$target = $dms->getDocument($objvalue);
-			else
-				$target = null;
 			$content .= $this->getDocumentChooserHtml("attr".$attrdef->getId(), M_READ, -1, $target, $attr_name);
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_user:
-			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValueAsArray() : (is_string($attribute) ? [$attribute] : $attribute)) : array();
+			$target = $attribute ? $attribute->getValueAsArray() : [];
+			$objvalue = [];
+			foreach($target as $t)
+				$objvalue[] = $t->getId();
 			$users = $dms->getAllUsers();
 			if($users) {
 				$allowempty = $attrdef->getMinValues() == 0;
@@ -2062,7 +2073,10 @@ $(document).ready(function() {
 			}
 			break;
 		case SeedDMS_Core_AttributeDefinition::type_group:
-			$objvalue = $attribute ? (is_object($attribute) ? $attribute->getValueAsArray() : (is_string($attribute) ? [$attribute] : $attribute)) : array();
+			$target = $attribute ? $attribute->getValueAsArray() : [];
+			$objvalue = [];
+			foreach($target as $t)
+				$objvalue[] = $t->getId();
 			$groups = $dms->getAllGroups();
 			if($groups) {
 				$allowempty = $attrdef->getMinValues() == 0;