--- a/lib/ldap.inc.php	2012-08-18 16:40:12.000000000 +0200
+++ b/lib/ldap.inc.php	2015-03-11 11:23:31.535584235 +0100
@@ -38,12 +38,9 @@
 define ('LDAP_EDIR_FAX', 'facsimileTelephoneNumber');
 define ('LDAP_EDIR_DESCRIPTION', 'description');
 define ('LDAP_EDIR_GRPONUSER', TRUE); // Is group membership contained on the user (more optimal)
-define ('LDAP_EDIR_GRPFULLDN', TRUE); // Is the membership stored as a full DN or just the CN? ONLY Used when checking group
 define ('LDAP_EDIR_USERATTRIBUTE', 'cn'); // Attribute to locate user with
 define ('LDAP_EDIR_USEROBJECTTYPE', 'inetOrgPerson');
-define ('LDAP_EDIR_GRPOBJECTTYPE', 'groupOfNames');
 define ('LDAP_EDIR_GRPATTRIBUTEUSER', 'groupMembership');  // On user
-define ('LDAP_EDIR_GRPATTRIBUTEGRP', 'member');  // On group
 define ('LDAP_EDIR_ADDRESS1', 'street');
 define ('LDAP_EDIR_CITY', 'physicalDeliveryOfficeName');
 define ('LDAP_EDIR_COUNTY', 'st'); // State in the US
@@ -62,12 +59,9 @@
 define ('LDAP_AD_FAX', 'facsimileTelephoneNumber');
 define ('LDAP_AD_DESCRIPTION', 'description');
 define ('LDAP_AD_GRPONUSER', TRUE); // Is group membership contained on the user (more optimal)
-define ('LDAP_AD_GRPFULLDN', TRUE); // Is the membership stored as a full DN or just the CN?
 define ('LDAP_AD_USERATTRIBUTE', 'sAMAccountName'); // Attribute to locate user with
 define ('LDAP_AD_USEROBJECTTYPE', 'user');
-define ('LDAP_AD_GRPOBJECTTYPE', 'group');
 define ('LDAP_AD_GRPATTRIBUTEUSER', 'memberOf'); // On User
-define ('LDAP_AD_GRPATTRIBUTEGRP', 'member');  // On group
 define ('LDAP_AD_ADDRESS1', 'streetAddress');
 define ('LDAP_AD_CITY', 'l');
 define ('LDAP_AD_COUNTY', 'st');
@@ -93,12 +87,9 @@
 define ('LDAP_OPENLDAP_FAX', 'facsimileTelephoneNumber');
 define ('LDAP_OPENLDAP_DESCRIPTION', 'description');
 define ('LDAP_OPENLDAP_GRPONUSER', FALSE); // Is group membership contained on the user (more optimal)
-define ('LDAP_OPENLDAP_GRPFULLDN', FALSE); // Is the membership stored as a full DN or just the CN?
 define ('LDAP_OPENLDAP_USERATTRIBUTE', 'uid'); // Attribute to locate user with
 define ('LDAP_OPENLDAP_USEROBJECTTYPE', 'inetOrgPerson');
-define ('LDAP_OPENLDAP_GRPOBJECTTYPE', 'posixGroup');
 // Not LDAP_OPENLDAP_USERGROUPUSER not present as users dont store groups membership
-define ('LDAP_OPENLDAP_GRPATTRIBUTEGRP', 'memberUid'); // On group
 define ('LDAP_OPENLDAP_ADDRESS1', 'postalAddress');
 define ('LDAP_OPENLDAP_CITY', 'l');
 define ('LDAP_OPENLDAP_COUNTY', 'st'); // NOT PRESENT all in one attribute
@@ -117,12 +108,9 @@
 define ('LDAP_CUSTOM_FAX', 'facsimileTelephoneNumber');
 define ('LDAP_CUSTOM_DESCRIPTION', 'description');
 define ('LDAP_CUSTOM_GRPONUSER', FALSE); // Is group membership contained on the user (more optimal)
-define ('LDAP_CUSTOM_GRPFULLDN', FALSE); // Is the membership stored as a full DN or just the CN?
 define ('LDAP_CUSTOM_USERATTRIBUTE', 'uid'); // Attribute to locate user with
 define ('LDAP_CUSTOM_USEROBJECTTYPE', 'inetOrgPerson');
-define ('LDAP_CUSTOM_GRPOBJECTTYPE', 'posixGroup');
 // Not LDAP_CUSTOM_USERGROUPUSER not present as users dont store groups membership
-define ('LDAP_CUSTOM_GRPATTRIBUTEGRP', 'memberUid'); // On group
 define ('LDAP_CUSTOM_ADDRESS1', 'postalAddress');
 define ('LDAP_CUSTOM_CITY', 'l');
 define ('LDAP_CUSTOM_COUNTY', 'st'); // NOT PRESENT all in one attribute
@@ -132,10 +120,9 @@
 
 
 $ldap_vars = array("SURNAME", "FORENAMES", "REALNAME", "JOBTITLE", "EMAIL", "MOBILE",
-                    "TELEPHONE", "FAX", "DESCRIPTION", "GRPONUSER", "GRPFULLDN", "USERATTRIBUTE",
-                    "USEROBJECTTYPE", "GRPOBJECTTYPE", "GRPATTRIBUTEUSER", "GRPATTRIBUTEGRP",
-                    "ADDRESS1", "CITY", "COUNTY", "POSTCODE", "COURTESYTITLE", "LOGINDISABLEDATTRIBUTE",
-                    "LOGINDISABLEDVALUE");
+                    "TELEPHONE", "FAX", "DESCRIPTION", "GRPONUSER", "USERATTRIBUTE",
+                    "USEROBJECTTYPE",  "GRPATTRIBUTEUSER", "ADDRESS1", "CITY", "COUNTY",
+                    "POSTCODE", "COURTESYTITLE", "LOGINDISABLEDATTRIBUTE", "LOGINDISABLEDVALUE");
 
 
 if ($CONFIG['use_ldap'])
@@ -351,7 +338,8 @@
                 }
                 else
                 {
-                    debug_log("INVALID CUSTOMER", TRUE);
+//                    debug_log("INVALID CUSTOMER", TRUE);
+//debug_log($CONFIG['ldap_grpattributegrp'], TRUE);
                 }
             }
         }

--- a/lib/configvars.inc.php	2012-08-18 16:40:12.000000000 +0200
+++ b/lib/configvars.inc.php	2015-03-11 11:22:15.275587142 +0100
@@ -124,6 +124,9 @@
                         'ldap_manager_group',
                         'ldap_user_group',
                         'ldap_customer_group',
+                        'ldap_grpobjecttype',
+                        'ldap_grpattributegrp',
+                        'ldap_grpfulldn',
                         'ldap_default_customer_siteid',
                         'ldap_autocreate_customer',
                         'ldap_cache_passwords',
@@ -468,6 +471,17 @@
 $CFGVAR['ldap_customer_group']['title'] = 'LDAP Customer Group';
 $CFGVAR['ldap_customer_group']['help'] = 'The full DN of the group the identifies the person as a valid contact/customer e.g. <code>cn=sitcustomers,ou=sitracker,o=org</code>';
 
+$CFGVAR['ldap_grpobjecttype']['title'] = 'LDAP group objectClass';
+$CFGVAR['ldap_grpobjecttype']['help'] = 'The objectClass that define if a group is correct.';
+
+$CFGVAR['ldap_grpattributegrp']['title'] = 'LDAP group attribute';
+$CFGVAR['ldap_grpattributegrp']['help'] = 'The attribute where we look for the member';
+
+$CFGVAR['ldap_grpfulldn']['title'] = 'LDAP group full DN';
+$CFGVAR['ldap_grpfulldn']['help'] = "Is the membership stored as a full DN";
+$CFGVAR['ldap_grpfulldn']['options'] = 'TRUE|FALSE';
+$CFGVAR['ldap_grpfulldn']['type'] = 'select';
+
 $CFGVAR['ldap_default_customer_siteid']['title'] = 'LDAP Customer default site';
 $CFGVAR['ldap_default_customer_siteid']['help'] = 'Place LDAP customers as contacts under this site';
 $CFGVAR['ldap_default_customer_siteid']['type'] = 'siteselect';
@@ -642,4 +656,4 @@
     // file for setup as well, no plugins before sit is installed.
     plugin_do('cfgvar');
 }
-?>
\ Pas de fin de ligne à la fin du fichier
+?>