Make automatic real name field order configurable

diff --git a/ldap-useradmin/CHANGELOG b/ldap-useradmin/CHANGELOG
index ae13867..72f2c35 100644 (file)
--- a/ldap-useradmin/CHANGELOG
+++ b/ldap-useradmin/CHANGELOG
@@ -58,3 +58,5 @@ Added locking to prevent concurrent writes to the LDAP database, to prevent UID
 ---- Changes since 1.400 ----
 By default, all new Unix users are given the person object class too, as this seems to be needed in most new LDAP schemas.
 Added support for LDAP SSHA passwords, thanks to Bill Moyers and John Gray.
+---- Changes since 1.430 ----
+The order of the first name and surname in the real name can be changed by a new Module Config setting.

diff --git a/ldap-useradmin/config b/ldap-useradmin/config
index 2b4551c..1c1412c 100644 (file)
--- a/ldap-useradmin/config
+++ b/ldap-useradmin/config
@@ -17,3 +17,4 @@ samba_gclass=sambaGroup
 alias_same=0
 given_class=inetOrgPerson
 person=1
+given_order=0

diff --git a/ldap-useradmin/config-*-linux b/ldap-useradmin/config-*-linux
index 2b45aae..6ba25cf 100644 (file)
--- a/ldap-useradmin/config-*-linux
+++ b/ldap-useradmin/config-*-linux
@@ -17,3 +17,4 @@ samba_gclass=sambaGroup
 alias_same=0
 given_class=inetOrgPerson
 person=1
+given_order=0

diff --git a/ldap-useradmin/config-coherent-linux b/ldap-useradmin/config-coherent-linux
index 6d877ee..a30574d 100644 (file)
--- a/ldap-useradmin/config-coherent-linux
+++ b/ldap-useradmin/config-coherent-linux
@@ -16,3 +16,4 @@ samba_gclass=sambaGroup
 alias_same=0
 given_class=inetOrgPerson
 person=1
+given_order=0

diff --git a/ldap-useradmin/config-debian-linux b/ldap-useradmin/config-debian-linux
index ef7558a..a8a304e 100644 (file)
--- a/ldap-useradmin/config-debian-linux
+++ b/ldap-useradmin/config-debian-linux
@@ -16,3 +16,4 @@ samba_gclass=sambaGroup
 alias_same=0
 given_class=inetOrgPerson
 person=1
+given_order=0

diff --git a/ldap-useradmin/config-debian-linux-3.1 b/ldap-useradmin/config-debian-linux-3.1
index 0fc69e5..253b7cf 100644 (file)
--- a/ldap-useradmin/config-debian-linux-3.1
+++ b/ldap-useradmin/config-debian-linux-3.1
@@ -16,3 +16,4 @@ samba_gclass=sambaGroup
 alias_same=0
 given_class=inetOrgPerson
 person=1
+given_order=0

diff --git a/ldap-useradmin/config-debian-linux-4.0-* b/ldap-useradmin/config-debian-linux-4.0-*
index e3fde45..ae3bf41 100644 (file)
--- a/ldap-useradmin/config-debian-linux-4.0-*
+++ b/ldap-useradmin/config-debian-linux-4.0-*
@@ -16,3 +16,4 @@ samba_gclass=sambaGroup
 alias_same=0
 other_class=inetOrgPerson
 person=1
+given_order=0

diff --git a/ldap-useradmin/config-debian-squirrelmail-linux b/ldap-useradmin/config-debian-squirrelmail-linux
index 3eb06df..0017cb6 100644 (file)
--- a/ldap-useradmin/config-debian-squirrelmail-linux
+++ b/ldap-useradmin/config-debian-squirrelmail-linux
@@ -22,3 +22,4 @@ samba_gclass=sambaGroup
 alias_same=0
 given_class=inetOrgPerson
 person=1
+given_order=0

diff --git a/ldap-useradmin/config-macos b/ldap-useradmin/config-macos
index 812b56d..926990a 100644 (file)
--- a/ldap-useradmin/config-macos
+++ b/ldap-useradmin/config-macos
@@ -17,3 +17,4 @@ samba_gclass=sambaGroup
 alias_same=0
 given_class=inetOrgPerson
 person=1
+given_order=0

diff --git a/ldap-useradmin/config-mandrake-linux b/ldap-useradmin/config-mandrake-linux
index 6d877ee..a30574d 100644 (file)
--- a/ldap-useradmin/config-mandrake-linux
+++ b/ldap-useradmin/config-mandrake-linux
@@ -16,3 +16,4 @@ samba_gclass=sambaGroup
 alias_same=0
 given_class=inetOrgPerson
 person=1
+given_order=0

diff --git a/ldap-useradmin/config-redhat-linux b/ldap-useradmin/config-redhat-linux
index 6d877ee..a30574d 100644 (file)
--- a/ldap-useradmin/config-redhat-linux
+++ b/ldap-useradmin/config-redhat-linux
@@ -16,3 +16,4 @@ samba_gclass=sambaGroup
 alias_same=0
 given_class=inetOrgPerson
 person=1
+given_order=0

diff --git a/ldap-useradmin/config-sol-linux b/ldap-useradmin/config-sol-linux
index 6d877ee..a30574d 100644 (file)
--- a/ldap-useradmin/config-sol-linux
+++ b/ldap-useradmin/config-sol-linux
@@ -16,3 +16,4 @@ samba_gclass=sambaGroup
 alias_same=0
 given_class=inetOrgPerson
 person=1
+given_order=0

diff --git a/ldap-useradmin/config-suse-linux b/ldap-useradmin/config-suse-linux
index e90cd33..8611a86 100644 (file)
--- a/ldap-useradmin/config-suse-linux
+++ b/ldap-useradmin/config-suse-linux
@@ -16,3 +16,4 @@ samba_gclass=sambaGroup
 alias_same=0
 given_class=inetOrgPerson
 person=1
+given_order=0

diff --git a/ldap-useradmin/config-trustix-linux b/ldap-useradmin/config-trustix-linux
index e90cd33..8611a86 100644 (file)
--- a/ldap-useradmin/config-trustix-linux
+++ b/ldap-useradmin/config-trustix-linux
@@ -16,3 +16,4 @@ samba_gclass=sambaGroup
 alias_same=0
 given_class=inetOrgPerson
 person=1
+given_order=0

diff --git a/ldap-useradmin/config-united-linux b/ldap-useradmin/config-united-linux
index e90cd33..8611a86 100644 (file)
--- a/ldap-useradmin/config-united-linux
+++ b/ldap-useradmin/config-united-linux
@@ -16,3 +16,4 @@ samba_gclass=sambaGroup
 alias_same=0
 given_class=inetOrgPerson
 person=1
+given_order=0

diff --git a/ldap-useradmin/config.info b/ldap-useradmin/config.info
index 7886f9d..60221a2 100644 (file)
--- a/ldap-useradmin/config.info
+++ b/ldap-useradmin/config.info
@@ -11,6 +11,7 @@ other_class=Other objectClasses to add to new users,0
 gother_class=Other objectClasses to add to new groups,0
 given=Show fields for given name and surname?,1,1-Yes,0-No
 given_class=Object class to add for given name?,0
+given_order=Order for first name and surname,1,1-Surname, Firstname,0-Firstname Surname
 slappasswd=Full path to <tt>slappasswd</tt> program,0
 
 line9=LDAP attributes,11

diff --git a/ldap-useradmin/edit_user.cgi b/ldap-useradmin/edit_user.cgi
index 15b9389..c3eb279 100755 (executable)
--- a/ldap-useradmin/edit_user.cgi
+++ b/ldap-useradmin/edit_user.cgi
@@ -128,7 +128,14 @@ else {
 if ($config{'given'}) {
        # Show Full name inputs
        if ($in{'new'}) {
-               $onch = "onChange='form.real.value = form.firstname.value+\" \"+form.lastname.value'";
+               if ($config{'given_order'} == 0) {
+                       # Firstname surname
+                       $onch = "onChange='form.real.value = form.firstname.value+\" \"+form.lastname.value'";
+                       }
+               else {
+                       # Surname, firstname
+                       $onch = "onChange='form.real.value = form.lastname.value+\", \"+form.firstname.value'";
+                       }
                }
        print "<tr> <td><b>$text{'uedit_firstname'}</b></td>\n";
        print "<td><input name=firstname size=20 value=\"$firstname\" $onch></td>\n";