bn8/ldapsaisie
1
0
Fork 0
mirror of https://gitlab.easter-eggs.com/ee/ldapsaisie.git synced 2024-11-18 16:19:06 +01:00
Code Issues Projects Releases Wiki Activity

LSformElement supannRessourceEtat & supannRessourceEtatDate: do not check etat value on parsing attribute value

Browse source
This commit is contained in:
Benjamin Renard 2021-06-11 16:43:59 +02:00
parent c87f609610
commit 107d8ba0af
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/includes/class/class.LSformElement_supannRessourceEtat.php
View file

@ -66,7 +66,7 @@ class LSformElement_supannRessourceEtat extends LSformElement_supannCompositeAtt
* @return array|null La valeur parsée, ou NULL en cas de problème * @return array|null La valeur parsée, ou NULL en cas de problème
*/ */
public function parseCompositeValue($value) { public function parseCompositeValue($value) {
if (preg_match('/\{(?<ressource>[^\}]+)\}(?<etat>[AIS])(:(?<sous_etat>.*))?/', $value, $matches)) { if (preg_match('/\{(?<ressource>[^\}]+)\}(?<etat>[^:]+)(:(?<sous_etat>.*))?/', $value, $matches)) {
$parseValue = array( $parseValue = array(
'ressource' => $matches['ressource'], 'ressource' => $matches['ressource'],
'etat' => $matches['etat'], 'etat' => $matches['etat'],

2
src/includes/class/class.LSformElement_supannRessourceEtatDate.php
View file

@ -78,7 +78,7 @@ class LSformElement_supannRessourceEtatDate extends LSformElement_supannComposit
* @return array|null La valeur parsée, ou NULL en cas de problème * @return array|null La valeur parsée, ou NULL en cas de problème
*/ */
public function parseCompositeValue($value) { public function parseCompositeValue($value) {
if (preg_match('/\{(?<ressource>[^\}]+)\}(?<etat>[AIS]):(?<sous_etat>[^\:]*):(?<date_debut>[0-9]{8})?:(?<date_fin>[0-9]{8})?/', $value, $matches)) { if (preg_match('/\{(?<ressource>[^\}]+)\}(?<etat>[^:]+):(?<sous_etat>[^\:]*):(?<date_debut>[0-9]{8})?:(?<date_fin>[0-9]{8})?/', $value, $matches)) {
$parseValue = array( $parseValue = array(
'ressource' => $matches['ressource'], 'ressource' => $matches['ressource'],
'etat' => $matches['etat'], 'etat' => $matches['etat'],