diff --git a/lam/HISTORY b/lam/HISTORY index 9bd89801..61369113 100644 --- a/lam/HISTORY +++ b/lam/HISTORY @@ -3,6 +3,7 @@ September 2017 6.1 - LAM Pro: -> Custom fields: support wildcards in text fields such as $firstname -> Custom fields: specify minimum/maximum count for multi-value entries + -> Custom fields: new type for constant values - Fixed bugs: -> Password modify page reports error on password change when posixAccount is present for users -> Nginx configuration files did not include "fastcgi_param SCRIPT_FILENAME $request_filename;" (193) diff --git a/lam/docs/manual-sources/chapter-modules.xml b/lam/docs/manual-sources/chapter-modules.xml index e80b4cce..7549005e 100644 --- a/lam/docs/manual-sources/chapter-modules.xml +++ b/lam/docs/manual-sources/chapter-modules.xml @@ -5130,9 +5130,17 @@ OK (10 msec) Constant value This will set the attribute to a constant value. You can also - specify wild cards to inject other attribute's values: + specify wildcards to inject other attribute's values. - Wildcards + + + + + + + + + Wildcards: @@ -5160,7 +5168,7 @@ OK (10 msec) - (attribute): space if attribute is set + ((attribute)): space if attribute is set @@ -5173,45 +5181,53 @@ OK (10 msec) memberUid=("user1", "user2") (specified value -> resulting LDAP value): - - - "my constant" -> "my constant" - + + - - "%gn%" -> "Steve" - + + - - "%gn%(gn)%sn%" -> "Steve Miller" (would be "Miller" if gn is - empty) - + + - - "§memberUid|, §" -> "user1, user2" - - + + - Validation expressions: + + - The validation expressions follow the standard of Perl regular - expressions. They start and end with a "/". The beginning of a - line is specified by "^" and the end by "$". + + - Examples: + + - /^[a-z0-9]+$/ allows small letters and numbers. The value must not - be empty ("+"). + + - /^[a-z0-9]+$/i allows small and capital letters ("i" at the end - means ignore case) and numbers. The value must not be empty ("+"). + + - Special characters that must be escaped with "\": "\", ".", "(", - ")" + + - E.g. /^[a-z0-9\.]$/i + + +
Constant valueResulting LDAP value
my constantmy constant
%gn%Steve
%gn%((gn))%sn%Steve Miller (would be "Miller" if gn is empty)
§memberUid|, §user1, user2
+ + + + Presentation: + + The LDAP value will be shown as text. + + + + + + + + @@ -5240,6 +5256,30 @@ OK (10 msec) + + + + + Validation expressions: + + The validation expressions follow the standard of Perl regular + expressions. They start and end with a "/". The beginning of a + line is specified by "^" and the end by "$". + + Examples: + + /^[a-z0-9]+$/ allows small letters and numbers. The value must not + be empty ("+"). + + /^[a-z0-9]+$/i allows small and capital letters ("i" at the end + means ignore case) and numbers. The value must not be empty ("+"). + + Special characters that must be escaped with "\": "\", ".", "(", + ")" + + E.g. /^[a-z0-9\.]$/i
diff --git a/lam/docs/manual-sources/chapter-selfService.xml b/lam/docs/manual-sources/chapter-selfService.xml index ed08f35c..2e258962 100644 --- a/lam/docs/manual-sources/chapter-selfService.xml +++ b/lam/docs/manual-sources/chapter-selfService.xml @@ -1549,27 +1549,110 @@ - Validation expressions: + + - The validation expressions follow the standard of Perl regular - expressions. They start and end with a "/". The beginning of a - line is specified by "^" and the end by "$". + Constant value - Examples: + This will set the attribute to a constant value. You can also + specify wildcards to inject other attribute's values. - /^[a-z0-9]+$/ allows small letters and numbers. The value must not - be empty ("+"). + + + + + + + - /^[a-z0-9]+$/i allows small and capital letters ("i" at the end - means ignore case) and numbers. The value must not be empty - ("+"). + Wildcards: - Special characters that must be escaped with "\": "\", ".", "(", - ")" + + + %attribute%: attribute value + - E.g. /^[a-z0-9\.]$/i + + @attribute@: first character of attribute + + + + ?attribute?: first character of attribute in lower case + + + + !attribute!: first character of attribute in upper case + + + + ??attribute??: attribute in lower case + + + + !!attribute!!: attribute in upper case + + + + ((attribute)): space if attribute is set + + + + §attribute|;§; attribute values separted by ";" (you can set + other separators if you want) + + + + Examples for attributes gn="Steve", sn="Miller" and + memberUid=("user1", "user2") (specified value -> resulting LDAP + value): + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Constant valueResulting LDAP value
my constantmy constant
%gn%Steve
%gn%((gn))%sn%Steve Miller (would be "Miller" if gn is empty)
§memberUid|, §user1, user2
+ + + + Presentation: + + The LDAP value will be shown as text. + + + + + + + + @@ -1598,6 +1681,31 @@ + + + + + Validation expressions: + + The validation expressions follow the standard of Perl regular + expressions. They start and end with a "/". The beginning of a + line is specified by "^" and the end by "$". + + Examples: + + /^[a-z0-9]+$/ allows small letters and numbers. The value must not + be empty ("+"). + + /^[a-z0-9]+$/i allows small and capital letters ("i" at the end + means ignore case) and numbers. The value must not be empty + ("+"). + + Special characters that must be escaped with "\": "\", ".", "(", + ")" + + E.g. /^[a-z0-9\.]$/i
diff --git a/lam/docs/manual-sources/images/customFields28.png b/lam/docs/manual-sources/images/customFields28.png new file mode 100644 index 00000000..fc8d5db2 Binary files /dev/null and b/lam/docs/manual-sources/images/customFields28.png differ diff --git a/lam/docs/manual-sources/images/customFields29.png b/lam/docs/manual-sources/images/customFields29.png new file mode 100644 index 00000000..7d39f17c Binary files /dev/null and b/lam/docs/manual-sources/images/customFields29.png differ