FEAT #7539 correct ldap connection and update migration script

apps/maarch_entreprise/log.php

@@ -140,10 +140,6 @@ if (!empty($_SESSION['error'])) {
         $xpLdapConf = new domxpath($ldapConf);
         $ldapConfig = simplexml_load_file($pathtoConfig);
 
-//        foreach ($xpLdapConf->query('/root/config/*') as $cf) {
-//            ${$cf->nodeName} = $cf->nodeValue;
-//        }
-
         foreach ($ldapConfig->config->ldap as $ldap) {
             $_SESSION['error'] = '';
             foreach ($ldap as $node => $value) {
@@ -197,7 +193,7 @@ if (!empty($_SESSION['error'])) {
                     continue;
                 } else {
                     echo functions::xssafe($conFailure->getMessage());
-                    exit;
+                    continue;
                 }
             }
 

migration/18.10/migrateLdap.php

@@ -39,11 +39,28 @@ foreach ($customs as $custom) {
         }
 
         if (file_exists("custom/{$custom}/modules/ldap/xml/config.xml")) {
-            $configXmlfile = simplexml_load_file("custom/{$custom}/modules/ldap/xml/config.xml");
+            $dom = new DOMDocument();
+            $dom->formatOutput = true;
 
-            $configXmlfile->config->addChild('standardConnect', 'false');
+            $dom->load("custom/{$custom}/modules/ldap/xml/config.xml");
 
-            $res = $configXmlfile->asXML();
+            $config = $dom->getElementsByTagName('config')[0];
+            $saveNodes = [];
+            foreach ($config->childNodes as $node) {
+                $saveNodes[] = $node;
+            }
+
+            while ($config->hasChildNodes()) {
+                $config->removeChild($config->firstChild);
+            }
+
+            $ldap = $dom->createElement('ldap');
+            foreach ($saveNodes as $node) {
+                $ldap->appendChild($node);
+            }
+            $ldap->appendChild($dom->createElement('standardConnect', 'false'));
+            $config->appendChild($ldap);
+            $res = $dom->saveXML($dom, LIBXML_NOEMPTYTAG);
             $fp = @fopen("custom/{$custom}/modules/ldap/xml/config.xml", "w+");
             if ($fp) {
                 fwrite($fp, $res);