diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index 6350d2bf..be1781ea 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -2230,7 +2230,8 @@ Have fun!
- Password self reset (LAM Pro)
+ Password self reset (LAM
+ Pro)LAM Pro allows your users to reset their passwords by answering
a security question. The reset link is displayed on the
+ Hint: You can add the
+ passwordSelfReset object class to all your users with the multi edit tool.
+
Samba 4 note: Due to a bug in
Samba 4 you need to add the extension, save, and then select a
@@ -4365,7 +4370,7 @@ Run slapindex to rebuild the index.
Please check that you have an existing zone entry that can be used
- for the file upload. See above to create a new zone.
+ for the file upload. See above to create a new zone.Hint: If you use the function above to create a new zone then
please skip the "@" entry in the CSV file below. LAM creates this entry
@@ -5434,6 +5439,93 @@ objectclass: top
+
+ Multi edit
+
+ This tool allows you to modify a large list of LDAP entries in
+ batch mode. You can add new attributes/object classes, remove attributes
+ and set attributes to a specific value.
+
+ At the beginning, you need to specify where the entries are stored
+ that should be changed. You can select an account suffix, the tree
+ suffix or enter your own DN by selecting "Other".
+
+ Next, enter an additional LDAP filter to limit the entries that
+ should be changed. E.g. use "(objectclass=inetOrgPerson)" to filter for
+ users. You may also enter e.g. "(!(objectClass=passwordSelfReset))" to
+ match all accounts that do not yet have the password self reset
+ feature.
+
+
+
+
+ Now, it is time to define the changes that should be done. The
+ following operations are possible:
+
+
+
+ Add: Adds an attribute value if not yet existing. Please do
+ not use for single-value attributes that already have a
+ value.
+
+
+
+ Modify: Sets an attribute to the given value. If the attribute
+ does not yet exist then it is added. If the attribute has multiple
+ values then all other values are removed.
+
+
+
+ Delete: Deletes the specified value from this attribute. If
+ you leave the value field blank then all attribute values are
+ removed.
+
+
+
+ Please note that all actions are run as separate LDAP commands.
+ You cannot add an object class and a required attribute at the same
+ time.
+
+
+
+
+
+
+
+
+
+ Dry run
+
+ You should always start with a dry run. It will not do any changes
+ to your LDAP directory but print out all modifications that will be
+ done. You will also be able to download the changes in LDIF format to
+ use with ldapmodify. This is useful if you want to adjust some actions
+ manually.
+
+
+
+
+
+
+
+
+
+ Apply changes
+
+ This will run the actions against your LDAP directory. You will
+ see which accounts are edited in the progress area and also if any
+ errors occured.
+
+
+
+
+
+
+
+
+
+
OU editor
diff --git a/lam/docs/manual-sources/images/multiEdit1.png b/lam/docs/manual-sources/images/multiEdit1.png
new file mode 100644
index 00000000..b2c90132
Binary files /dev/null and b/lam/docs/manual-sources/images/multiEdit1.png differ
diff --git a/lam/docs/manual-sources/images/multiEdit2.png b/lam/docs/manual-sources/images/multiEdit2.png
new file mode 100644
index 00000000..195b5104
Binary files /dev/null and b/lam/docs/manual-sources/images/multiEdit2.png differ
diff --git a/lam/docs/manual-sources/images/multiEdit3.png b/lam/docs/manual-sources/images/multiEdit3.png
new file mode 100644
index 00000000..362903ba
Binary files /dev/null and b/lam/docs/manual-sources/images/multiEdit3.png differ
diff --git a/lam/templates/multiEdit.php b/lam/templates/multiEdit.php
index 6902557b..102023a7 100644
--- a/lam/templates/multiEdit.php
+++ b/lam/templates/multiEdit.php
@@ -95,7 +95,7 @@ function displayStartPage() {
$suffixes = array_flip($suffixes);
natcasesort($suffixes);
$suffixes = array_flip($suffixes);
- $suffixes[_('other')] = '-';
+ $suffixes[_('Other')] = '-';
$suffixValues = array_values($suffixes);
$valSuffix = empty($_POST['suffix']) ? $suffixValues[0] : $_POST['suffix'];
$suffixSelect = new htmlSelect('suffix', $suffixes, array($valSuffix));