Compute macros before building DN (ltb-project#225)

Author: coudot

htdocs/create.php

@@ -50,16 +50,6 @@
 
                 $create_attributes['objectclass'] = $create_objectclass;
 
-                $dn = "";
-
-                foreach ($create_dn_items as $dn_item) {
-                    $attribute = $attributes_map[$dn_item]['attribute'];
-                    if ($dn) { $dn .= "+"; }
-                    $dn .= $attribute . "=" . ldap_escape($create_attributes[$attribute][0], "", LDAP_ESCAPE_DN);
-                }
-
-                $dn .= "," . $create_base;
-
                 # Use macros
                 foreach ($create_items_macros as $item => $macro) {
                     $value = preg_replace_callback('/%(\w+)%/',
@@ -71,6 +61,17 @@ function ($matches) use ($item, $create_attributes, $attributes_map) {
                     $create_attributes[ $attributes_map[$item]['attribute'] ] = $value;
                 }
 
+                # Build DN
+                $dn = "";
+
+                foreach ($create_dn_items as $dn_item) {
+                    $attribute = $attributes_map[$dn_item]['attribute'];
+                    if ($dn) { $dn .= "+"; }
+                    $dn .= $attribute . "=" . ldap_escape($create_attributes[$attribute][0], "", LDAP_ESCAPE_DN);
+                }
+
+                $dn .= "," . $create_base;
+
                 # Create entry
                 if (!ldap_add($ldap, $dn, $create_attributes)) {
                     error_log("LDAP - modify failed for $dn");