From 3659ffbde51f86b73b94c5bd6b2afd6721ba22c7 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 27 Oct 2016 10:56:21 +0200
Subject: [PATCH] use new attribute validation code

---
 op/op.AddDocument.php | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/op/op.AddDocument.php b/op/op.AddDocument.php
index 2741aed8c..c6c0dbdeb 100644
--- a/op/op.AddDocument.php
+++ b/op/op.AddDocument.php
@@ -72,18 +72,9 @@ else
 foreach($attributes as $attrdefid=>$attribute) {
 	$attrdef = $dms->getAttributeDefinition($attrdefid);
 	if($attribute) {
-		if($attrdef->getRegex()) {
-			if(!preg_match($attrdef->getRegex(), $attribute)) {
-				UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("attr_no_regex_match"));
-			}
-		}
-		if(is_array($attribute)) {
-			if($attrdef->getMinValues() > count($attribute)) {
-				UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
-			}
-			if($attrdef->getMaxValues() && $attrdef->getMaxValues() < count($attribute)) {
-				UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("attr_max_values", array("attrname"=>$attrdef->getName())));
-			}
+		if(!$attrdef->validate($attribute)) {
+			$errmsg = getAttributeValidationText($attrdef->getValidationError(), $attrdef->getName(), $attribute);
+			UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())), $errmsg);
 		}
 	} elseif($attrdef->getMinValues() > 0) {
 		UI::exitError(getMLText("folder_title", array("foldername" => $folder->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));