diff --git a/src/app/basket/controllers/BasketController.php b/src/app/basket/controllers/BasketController.php index b6757b7b9e46baea7384ac2e1bf77ae54ac393c1..d105a4eebcda999e270c7ca1ccc82f5f04f2ee84 100644 --- a/src/app/basket/controllers/BasketController.php +++ b/src/app/basket/controllers/BasketController.php @@ -60,7 +60,7 @@ class BasketController $data = $request->getParams(); - $check = Validator::stringType()->notEmpty()->validate($data['id']) && preg_match("/^[\w-]*$/", $data['id']) && (strlen($data['id']) < 32); + $check = Validator::stringType()->notEmpty()->validate($data['id']) && preg_match("/^[\w-]*$/", $data['id']) && (strlen($data['id']) <= 32); $check = $check && Validator::stringType()->notEmpty()->validate($data['basket_name']); $check = $check && Validator::stringType()->notEmpty()->validate($data['basket_desc']); $check = $check && Validator::stringType()->notEmpty()->validate($data['clause']); diff --git a/src/app/docserver/controllers/DocserverController.php b/src/app/docserver/controllers/DocserverController.php index f8e49c42cf80ec4276b7573027ca7a0035f2ad2a..0e694985899661f814f23939f9f7b55641bc8424 100644 --- a/src/app/docserver/controllers/DocserverController.php +++ b/src/app/docserver/controllers/DocserverController.php @@ -65,7 +65,7 @@ class DocserverController $data = $request->getParams(); - $check = Validator::stringType()->notEmpty()->validate($data['docserver_id']) && preg_match("/^[\w-]*$/", $data['docserver_id']) && (strlen($data['docserver_id']) < 32); + $check = Validator::stringType()->notEmpty()->validate($data['docserver_id']) && preg_match("/^[\w-]*$/", $data['docserver_id']) && (strlen($data['docserver_id']) <= 32); $check = $check && Validator::stringType()->notEmpty()->validate($data['docserver_type_id']); $check = $check && Validator::stringType()->notEmpty()->validate($data['device_label']); $check = $check && Validator::intVal()->notEmpty()->validate($data['size_limit_number']); diff --git a/src/core/lang/lang-fr.php b/src/core/lang/lang-fr.php index c0fc1896be5e26db95f1954aa18de95a9b80c659..8d00b684e5c12c41d697e1d2fa9abda1a911c980 100644 --- a/src/core/lang/lang-fr.php +++ b/src/core/lang/lang-fr.php @@ -119,7 +119,7 @@ define('_OTHER', 'Autre'); define('_NOTIFICATION_ALREADY_EXIST', 'Notification déjà existante'); define('_WRONG_PSW', 'Le mot de passe actuel n\'est pas correct'); define('_MAX_SIZE_UPLOAD_REACHED', 'Taille maximum de fichier dépassée'); -define('_PATH_OF_DOCSERVER_UNAPPROACHABLE', 'Chemin Docserver inaccessible'); +define('_PATH_OF_DOCSERVER_UNAPPROACHABLE', 'Chemin de la zone de stockage inaccessible'); define('_BACK_FROM_VACATION', 'de retour de son absence'); // LISTS