Fixes to allow overriding attribute labels properly

www/account_manager/new_user.php

@@ -289,14 +289,13 @@ render_js_email_generator('uid','mail');
 
   foreach ($attribute_map as $attribute => $attr_r) {
     $label   = $attr_r['label'];
-    $onkeyup = $attr_r['onkeyup'];
     if ($attribute == $LDAP['account_attribute']) { $label = "<strong>$label</strong><sup>&ast;</sup>"; }
   ?>
      <div class="form-group" id="<?php print $attribute; ?>_div">
       <label for="<?php print $attribute; ?>" class="col-sm-3 control-label"><?php print $label; ?></label>
       <div class="col-sm-6">
        <input type="text" class="form-control" id="<?php print $attribute; ?>" name="<?php print $attribute; ?>" value="<?php if (isset($$attribute)) { print $$attribute; } ?>" <?php
-         if (isset($onkeyup)) { print "onkeyup=\"$onkeyup;\""; } ?>>
+         if (isset($attr_r['onkeyup'])) { print "onkeyup=\"${attr_r['onkeyup']};\""; } ?>>
       </div>
      </div>
   <?php

www/account_manager/show_group.php

@@ -89,22 +89,16 @@ if (isset($_POST["update_members"])) {
  $members_to_add = array_diff($updated_membership,$current_members);
 
  if ($initialise_group == TRUE) {
-   if ($LDAP['rfc2307bis_check_run'] != TRUE) { $rfc2307bis_available = ldap_detect_rfc2307bis($ldap_connection); }
-   if ($rfc2307bis_available == TRUE) {
    $initial_member = array_shift($members_to_add);
-   }
-   else {
-     $initial_member = "";
-   }
    $group_add = ldap_new_group($ldap_connection,$group_cn,$initial_member);
  }
+ foreach ($members_to_add as $this_member) {
+  ldap_add_member_to_group($ldap_connection,$group_cn,$this_member);
+ }
 
  foreach ($members_to_del as $this_member) {
   ldap_delete_member_from_group($ldap_connection,$group_cn,$this_member);
  }
- foreach ($members_to_add as $this_member) {
-  ldap_add_member_to_group($ldap_connection,$group_cn,$this_member);
- }
 
  $non_members = array_diff($all_people,$updated_membership);
  $group_members = $updated_membership;

www/account_manager/show_user.php

@@ -390,8 +390,8 @@ if ($ldap_search) {
 <?php
 
   foreach ($attribute_map as $attribute => $attr_r) {
-    if (isset($attr_r['label'])) { $label = $attr_r['label']; } else { $label = ""; }
+    $label = $attr_r['label'];
-    if (isset($attr_r['onkeyup'])) { $onkeyup = $attr_r['onkeyup']; } else { $label = ""; }
+    if (isset($attr_r['onkeyup'])) { $onkeyup = $attr_r['onkeyup']; } else { $onkeyup = ""; }
     if ($attribute == $LDAP['account_attribute']) { $label = "<strong>$label</strong><sup>&ast;</sup>"; }
   ?>
      <div class="form-group" id="<?php print $attribute; ?>_div">

www/includes/ldap_functions.inc.php

@@ -587,20 +587,14 @@ function ldap_new_group($ldap_connection,$group_name,$initial_member="") {
    $highest_gid = ldap_get_highest_id($ldap_connection,'gid');
    $new_gid = $highest_gid + 1;
 
-   if ($rfc2307bis_available == FALSE) {
+   if ($rfc2307bis_available == FALSE) { $objectclasses = array('top','posixGroup'); } else { array('top','groupOfUniqueNames','posixGroup'); }
-    $new_group_array=array( 'objectClass' => array('top','posixGroup'),
-                            'cn' => $new_group,
-                            'gidNumber' => $new_gid
-                          );
-   }
-   else {
    if ($LDAP['group_membership_uses_uid'] == FALSE) { $initial_member = "${LDAP['account_attribute']}=$initial_member,${LDAP['user_dn']}"; }
-    $new_group_array=array( 'objectClass' => array('top','groupOfUniqueNames','posixGroup'),
+
+   $new_group_array=array( 'objectClass' => $objectclasses,
                            'cn' => $new_group,
                            'gidNumber' => $new_gid,
                            $LDAP['group_membership_attribute'] => $initial_member
                          );
-   }
 
    $group_dn="cn=$new_group,${LDAP['group_dn']}";
 
@@ -759,39 +753,40 @@ function ldap_new_account($ldap_connection,$account_r) {
 
    if ($result['count'] == 0) {
 
-    $highest_uid = ldap_get_highest_id($ldap_connection,'uid');
-    $new_uid = $highest_uid + 1;
-
-    $default_gid = ldap_get_gid_of_group($ldap_connection,$DEFAULT_USER_GROUP);
-
-    if (!is_numeric($default_gid)) {
-     $group_add = ldap_new_group($ldap_connection,$account_identifier);
-     $gid = ldap_get_gid_of_group($ldap_connection,$account_identifier);
-     $add_to_group = $account_identifier;
-    }
-    else {
-     $gid = $default_gid;
-     $add_to_group = $DEFAULT_USER_GROUP;
-    }
-
      $hashed_pass = ldap_hashed_password($account_r['password']);
+     unset($account_r['password']);
 
      $objectclasses = $LDAP['account_objectclasses'];
      if (isset($LDAP['account_additional_objectclasses']) and $LDAP['account_additional_objectclasses'] != "") {
        $objectclasses = array_merge($objectclasses, explode(",", $LDAP['account_additional_objectclasses']));
      }
 
-    $account_attributes = array('objectClass' => $objectclasses,
+     $account_attributes = array('objectclass' => $objectclasses,
-                                'displayName' => $account_r['givenname'] . " " . $account_r['sn'],
+                                 'userpassword' => $hashed_pass,
-                                'uidNumber' => $new_uid,
-                                'gidNumber' => $gid,
-                                'loginShell' => $DEFAULT_USER_SHELL,
-                                'homeDirectory' => "/home/" . $account_r['uid'],
-                                'userPassword' => $hashed_pass,
                        );
 
-    unset($account_r['password']);
+     $account_attributes = array_merge($account_r, $account_attributes);
-    $account_attributes = array_merge($account_attributes, $account_r);
+
+     if (!isset($account_attributes['uidnumber']) or !is_numeric($account_attributes['uidnumber'])) {
+       $highest_uid = ldap_get_highest_id($ldap_connection,'uid');
+       $account_attributes['uidnumber'] = $highest_uid + 1;
+     }
+
+     if (!isset($account_attributes['gidnumber']) or !is_numeric($account_attributes['gidnumber'])) {
+       $default_gid = ldap_get_gid_of_group($ldap_connection,$DEFAULT_USER_GROUP);
+       if (!is_numeric($default_gid)) {
+         $group_add = ldap_new_group($ldap_connection,$account_identifier,$account_identifier);
+         $account_attributes['gidnumber'] = ldap_get_gid_of_group($ldap_connection,$account_identifier);
+       }
+       else {
+        $account_attributes['gidnumber'] = $default_gid;
+        $add_to_group = $DEFAULT_USER_GROUP;
+       }
+     }
+
+     if (empty($account_attributes['displayname']))   { $account_attributes['displayname']   = $account_attributes['givenname'] . " " . $account_attributes['sn']; }
+     if (empty($account_attributes['loginshell']))    { $account_attributes['loginshell']    = $DEFAULT_USER_SHELL; }
+     if (empty($account_attributes['homedirectory'])) { $account_attributes['homedirectory'] = "/home/${account_identifier}"; }
 
      $add_account = @ ldap_add($ldap_connection,
                                "${LDAP['account_attribute']}=$account_identifier,${LDAP['user_dn']}",
@@ -803,6 +798,8 @@ function ldap_new_account($ldap_connection,$account_r) {
        ldap_add_member_to_group($ldap_connection,$add_to_group,$account_identifier);
 
        $this_uid = fetch_id_stored_in_ldap($ldap_connection,"uid");
+       $new_uid = $account_attributes['uidnumber'];
+
        if ($this_uid != FALSE) {
          $update_uid = @ ldap_mod_replace($ldap_connection, "cn=lastUID,${LDAP['base_dn']}", array( 'serialNumber' => $new_uid ));
          if ($update_uid) {