Merge branch 'develop' of https://labs.maarch.org/maarch/MaarchCourrier into develop

apps/maarch_entreprise/indexing_searching/change_category_actions.php

@@ -10,7 +10,7 @@ $actions = $b->get_actions_from_current_basket(
     $_REQUEST['resId'], $_REQUEST['collId'], 'PAGE_USE', false
 );
 if (count($actions) > 0) {
-    $frmStr .= '<b>' . _ACTIONS . ' : </b>';
+    //$frmStr .= '<b>' . _ACTIONS . ' : </b>';
     $frmStr .= '<select name="chosen_action" id="chosen_action">';
 
 

core/class/class_resource.php

@@ -299,9 +299,10 @@
             elseif($data[$i]['column'] == 'filename' )
             {
                 $find_filename = true;
-                if(!preg_match("/^[0-9]+.([a-zA-Z][a-zA-Z][a-zA-Z][a-zA-Z]?|maarch)$/", $data[$i]['value']))
+                //if(!preg_match("/^[0-9]+.([a-zA-Z][a-zA-Z][a-zA-Z][a-zA-Z]?|maarch)$/", $data[$i]['value']))
+                if(!preg_match("/^[\w-.]+.([a-zA-Z-0-9][a-zA-Z-0-9][a-zA-Z-0-9][a-zA-Z-0-9]?|maarch)$/", $data[$i]['value']))
                 {
-                    $error .= _FILENAME_ERROR.'<br/>';
+                    $error .= _FILENAME_ERROR . ' ' . $data[$i]['value'] . '<br/>';
                 }
             }
             elseif($data[$i]['column'] == "offset_doc")

core/class/docservers_controler.php

@@ -1070,6 +1070,7 @@ class docservers_controler
                 $destinationDir = $pathOnDocserver . '0001'
                                 . DIRECTORY_SEPARATOR;
                 $fileDestinationName = '0001';
+                $fileDestinationName = $fileDestinationName . '_' . mt_rand();
                 return array(
                     'destinationDir' => $destinationDir,
                     'fileDestinationName' => $fileDestinationName,
@@ -1119,6 +1120,7 @@ class docservers_controler
                         . str_pad($newDir, 4, '0', STR_PAD_LEFT)
                         . DIRECTORY_SEPARATOR;
                     $fileDestinationName = '0001';
+                    $fileDestinationName = $fileDestinationName . '_' . mt_rand();
                     return array(
                         'destinationDir' => $destinationDir,
                         'fileDestinationName' => $fileDestinationName,
@@ -1142,6 +1144,7 @@ class docservers_controler
                     }
                 }
                 $fileDestinationName = str_pad($greater, 4, '0', STR_PAD_LEFT);
+                $fileDestinationName = $fileDestinationName . '_' . mt_rand();
                 return array(
                     'destinationDir' => $destinationDir,
                     'fileDestinationName' => $fileDestinationName,