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

CHANGELOG

@@ -79,7 +79,10 @@
 --------------------------------------------------------------------------------
 - fix adding new workflows
 - fix moving documents/folders via drag&drop in Edge (Closes #286)
-- upate folder tree after moving a document/folder with drag&drop (Closes #288)
+- update folder tree after moving a document/folder with drag&drop (Closes #288)
+- trim each value of a value sets of attribute definitions bevor saving
+- assign role 'user' instead of 'admin' to accounts automatically created during
+  ldap authentication
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.29

SeedDMS_Core/Core/inc.ClassAttribute.php

@@ -589,6 +589,20 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 		return $this->_valueset;
 	} /* }}} */
 
+	/**
+	 * Get the separator used for the value set
+	 *
+	 * This is the first char of the value set string.
+	 *
+	 * @return string separator or an empty string if a value set is not set
+	 */
+	function getValueSetSeparator() { /* {{{ */
+		if(strlen($this->_valueset) > 1)
+			return $this->_valueset[0];
+		else
+			return '';
+	} /* }}} */
+
 	/**
 	 * Get the whole value set as an array
 	 *
@@ -638,7 +652,12 @@ class SeedDMS_Core_AttributeDefinition { /* {{{ */
 		}
 		$valuesetstr = implode(",", $tmp);
 	*/
-		$valuesetstr = $valueset;
+		if(trim($valueset)) {
+			$valuesetarr = array_map('trim', explode($valueset[0], substr($valueset, 1)));
+			$valuesetstr = $valueset[0].implode($valueset[0], $valuesetarr);
+		} else {
+			$valuesetstr = '';
+		}
 
 		$db = $this->_dms->getDB();
 

SeedDMS_Core/Core/inc.ClassDMS.php

@@ -2265,6 +2265,12 @@ class SeedDMS_Core_DMS {
 		}
 		if(!$type)
 			return false;
+		if(trim($valueset)) {
+			$valuesetarr = array_map('trim', explode($valueset[0], substr($valueset, 1)));
+			$valueset = $valueset[0].implode($valueset[0], $valuesetarr);
+		} else {
+			$valueset = '';
+		}
 		$queryStr = "INSERT INTO tblAttributeDefinitions (name, objtype, type, multiple, minvalues, maxvalues, valueset, regex) VALUES (".$this->db->qstr($name).", ".intval($objtype).", ".intval($type).", ".intval($multiple).", ".intval($minvalues).", ".intval($maxvalues).", ".$this->db->qstr($valueset).", ".$this->db->qstr($regex).")";
 		$res = $this->db->getResult($queryStr);
 		if (!$res)

SeedDMS_Core/package.xml

@@ -1244,5 +1244,37 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
 - all changes from 4.3.26 merged
    </notes>
   </release>
+  <release>
+   <date>2016-09-06</date>
+   <time>06:23:34</time>
+   <version>
+    <release>5.0.6</release>
+    <api>5.0.6</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- all changes from 4.3.29 merged
+   </notes>
+  </release>
+  <release>
+   <date>2016-10-07</date>
+   <time>06:23:34</time>
+   <version>
+    <release>5.0.7</release>
+    <api>5.0.7</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- all changes from 4.3.30 merged
+   </notes>
+  </release>
  </changelog>
 </package>

views/bootstrap/class.AttributeMgr.php

@@ -222,7 +222,7 @@ $(document).ready( function() {
 						</td>
 						<td>
 							<?php if($attrdef && strlen($attrdef->getValueSet()) > 30) { ?>
-							<textarea name="valueset" rows="5"><?php echo $attrdef ? $attrdef->getValueSet() : '' ?></textarea>
+							<textarea name="valueset" rows="5"><?php echo ($attrdef && $attrdef->getValueSet()) ? $attrdef->getValueSetSeparator().implode("\n".$attrdef->getValueSetSeparator(), $attrdef->getValueSetAsArray()) : '' ?></textarea>
 							<?php } else { ?>
 							<input type="text" value="<?php echo $attrdef ? $attrdef->getValueSet() : '' ?>" name="valueset" />
 							<?php } ?>