From 8352a81fc77fe29334cc18069282a12c29e15c7e Mon Sep 17 00:00:00 2001
From: Roland Gruber <post@rolandgruber.de>
Date: Sun, 10 Nov 2013 12:58:56 +0000
Subject: [PATCH] selfRegistration: support constant values

---
 lam/HISTORY                       |  1 +
 lam/docs/manual-sources/howto.xml | 98 +++++++++++++++++++++++++++----
 lam/phpdoc.sh                     |  1 -
 3 files changed, 88 insertions(+), 12 deletions(-)

diff --git a/lam/HISTORY b/lam/HISTORY
index 1a1e7bb2..3f2692ed 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -9,6 +9,7 @@ December 2013 4.4
    -> Bind DLZ support
    -> Samba/Shadow: display password change date in self service
    -> Custom fields: support custom label and icon, auto-completion
+   -> User self registration: support constant attribute values
   - fixed bugs:
    -> Format of photo in Personal tab (158)
 
diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index 3f27c74d..8eb99212 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -6620,18 +6620,92 @@ Run slapindex to rebuild the index.
           password and email address are mandatory anyway and need not be
           specified.</para>
 
-          <para>Each line represents one LDAP attribute. The options are
-          separated by "::". The first option specifies if the attribute is
-          mandatory. It can have the values "optional" and "required". The
-          second option is the LDAP attribute name and the third one is a
-          descriptive label for it. Options four and five are used for input
-          validation. Please enter the regular expression (e.g.
-          "/^[0-9a-zA-Z]+$/") and an error message if the value does not match
-          it. For a syntax description see <ulink
-          url="http://perldoc.perl.org/perlre.html">here</ulink>. Validation
-          is optional.</para>
+          <para>Each line represents one LDAP attribute. The settings are
+          separated by "::". The first setting specifies the field type. The
+          second setting is the LDAP attribute name. Depending on the field
+          type you can enter additional options:</para>
 
-          <para>Example:</para>
+          <table>
+            <title></title>
+
+            <tgroup cols="6">
+              <tbody>
+                <row>
+                  <entry><emphasis role="bold">Description</emphasis></entry>
+
+                  <entry><emphasis role="bold">Type</emphasis></entry>
+
+                  <entry><emphasis role="bold">Attribute
+                  name</emphasis></entry>
+
+                  <entry><emphasis role="bold">First option</emphasis></entry>
+
+                  <entry><emphasis role="bold">Second
+                  option</emphasis></entry>
+
+                  <entry><emphasis role="bold">Third option</emphasis></entry>
+                </row>
+
+                <row>
+                  <entry>An optional input field that is displayed on the
+                  registration page.</entry>
+
+                  <entry>optional</entry>
+
+                  <entry>e.g. "givenName"</entry>
+
+                  <entry>Label that is displayed on page</entry>
+
+                  <entry>optional regular expression for validation (e.g.
+                  "/^[0-9a-zA-Z]+$/")</entry>
+
+                  <entry>validation message if value does not match validation
+                  expression</entry>
+                </row>
+
+                <row>
+                  <entry>A required input field that is displayed on the
+                  registration page. Self registration cannot be done if such
+                  a field is left empty by the user.</entry>
+
+                  <entry>required</entry>
+
+                  <entry>e.g. "sn"</entry>
+
+                  <entry>Label that is displayed on page</entry>
+
+                  <entry>optional regular expression for validation (e.g.
+                  "/^[0-9a-zA-Z]+$/")</entry>
+
+                  <entry>validation message if value does not match validation
+                  expression</entry>
+                </row>
+
+                <row>
+                  <entry>Constant attribute value, not visible for the user.
+                  Can be used to set some initial values or data that must not
+                  be edited by the user.</entry>
+
+                  <entry>constant</entry>
+
+                  <entry>e.g. "homeDirectory"</entry>
+
+                  <entry>attribute value, supports wirldcards to insert other
+                  attribute values (e.g. "@@uid@@")</entry>
+
+                  <entry></entry>
+
+                  <entry></entry>
+                </row>
+              </tbody>
+            </tgroup>
+          </table>
+
+          <para>For a syntax description of validation expressions see <ulink
+          url="http://perldoc.perl.org/perlre.html">here</ulink>. Validation
+          is optional, you can leave these options blank.</para>
+
+          <para><emphasis role="bold">Example:</emphasis></para>
 
           <para>optional::givenName::First name::/^[[:alnum:] ]+$/u::Please
           enter a valid first name.</para>
@@ -6639,6 +6713,8 @@ Run slapindex to rebuild the index.
           <para>required::sn::Last name::/^[[:alnum:] ]+$/u::Please enter a
           valid last name.</para>
 
+          <para>constant::homeDirectory::/home/@@uid@@</para>
+
           <para>If you use the object class "inetOrgPerson" and do not provide
           the "cn" attribute then LAM will set it to the user name
           value.</para>
diff --git a/lam/phpdoc.sh b/lam/phpdoc.sh
index 7f6a7d18..66b781e1 100755
--- a/lam/phpdoc.sh
+++ b/lam/phpdoc.sh
@@ -3,4 +3,3 @@
 rm -rf docs/devel/phpdoc
 mkdir docs/devel/phpdoc
 phpdoc -d ./ -t docs/devel/phpdoc --title "LDAP Account Manager" --template old-ocean --defaultpackagename main -e php,inc
-rm phpdoc*.log