Merge branch 'develop' into 18.04

apps/maarch_entreprise/xml/entreprise.xml

@@ -117,11 +117,11 @@
         </process_mode>
         <process_mode>
             <label>SVA</label>
-            <process_mode_priority>poiuytre1313nbvc</process_mode_priority>
+            <process_mode_priority>poiuytre1357nbvc</process_mode_priority>
         </process_mode>
         <process_mode>
             <label>SVR</label>
-            <process_mode_priority>poiuytre1313nbvc</process_mode_priority>
+            <process_mode_priority>poiuytre1357nbvc</process_mode_priority>
         </process_mode>
     </process_modes>
     <priorities>

src/app/contact/controllers/ContactController.php

@@ -166,30 +166,33 @@ class ContactController
     {
         $customId = CoreConfigModel::getCustomId();
 
-        if (is_dir("custom/{$customId}/referential")) {
-            $banDirectory = "custom/{$customId}/referential/";
-        } else {
-            $banDirectory = 'referential/';
+        if (is_dir("custom/{$customId}/referential/ban/indexes")) {
+            $customFilesDepartments = scandir("custom/{$customId}/referential/ban/indexes");
+        }
+        if (is_dir("referential/ban/indexes")) {
+            $filesDepartments = scandir("referential/ban/indexes");
         }
 
-        $empty_folder = true;
-        $empty_files = true;
-
-        if (is_dir($banDirectory)) {
-            $empty_folder = false;
+        $departments = [];
+        if (!empty($customFilesDepartments)) {
+            foreach ($customFilesDepartments as $value) {
+                if ($value != '.' && $value != '..') {
+                    $departments[] = $value;
+                }
+            }
         }
-        if ($files = glob($banDirectory.'ban/indexes/'.'/*')) {
-            $empty_files = false;
-            $arrayNumDep = array();
-            foreach ($files as $key => $value) {
-                array_push($arrayNumDep, basename($value));
+        if (!empty($filesDepartments)) {
+            foreach ($filesDepartments as $value) {
+                if ($value != '.' && $value != '..' && !in_array($value, $departments)) {
+                    $departments[] = $value;
+                }
             }
-
-            return $arrayNumDep;
         }
 
-        if (!$empty_folder && !$empty_files) {
-            return true;
+
+        if (!empty($departments)) {
+            sort($departments, SORT_NUMERIC);
+            return $departments;
         } else {
             return false;
         }

src/core/controllers/CoreController.php

@@ -37,7 +37,7 @@ class CoreController
 
         $aInit['scriptsToinject'] = [];
 
-        $scriptsToInject =  scandir('dist');
+        $scriptsToInject = scandir('dist');
         foreach ($scriptsToInject as $key => $value) {
             if (strstr($value, 'inline.') !== false || strstr($value, 'main.') !== false || strstr($value, 'vendor.') !== false || strstr($value, 'scripts.') !== false) {
                 if (strstr($value, '.js.map') === false) {