From ad8f562702a27bd95053d8519868f0f7a6c66ba8 Mon Sep 17 00:00:00 2001
From: David Surville <david.surville@unicaen.fr>
Date: Wed, 2 Jun 2021 16:16:19 +0200
Subject: [PATCH] =?UTF-8?q?[Fix]=20Prise=20en=20compte=20d'un=20dipl=C3=B4?=
=?UTF-8?q?me=20inconnu=20({INCONUU})=20dans=20l'attribut=20supannEtuInscr?=
=?UTF-8?q?iption?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/UnicaenLdap/Entity/Base/People.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/UnicaenLdap/Entity/Base/People.php b/src/UnicaenLdap/Entity/Base/People.php
index d8d43f1..3a1a8d5 100644
--- a/src/UnicaenLdap/Entity/Base/People.php
+++ b/src/UnicaenLdap/Entity/Base/People.php
@@ -292,7 +292,7 @@ class People extends Entity
'\[typedip=(?<typedip>\{[\w\-:]+\}\w*)\]' . // {SISE}.* ou {INCONNU}
'\[cursusann=(?<cursusann>\{SUPANN\}\w+)\]' .
'\[affect=(?<affect>[\w\-]+)\]' .
- '\[diplome=(?<diplome>\{[\w\-:]+\}\w+)\]' .
+ '\[diplome=(?<diplome>\{[\w\-:]+\}\w*)\]' .
'\[etape=(?<etape>\{[\w\-:]+\}.+)\]$/';
static protected $inscription_complement_pattern =
'/^\[anneeinsc=(?<anneeinsc>\d{4})\]' .
@@ -818,7 +818,7 @@ class People extends Entity
* @var string $diplome
* @var string $etape
*/
- foreach (['regimeinsc', 'sectdisc', 'typedip'] as $part) {
+ foreach (['regimeinsc', 'sectdisc', 'typedip', 'diplome'] as $part) {
$$part = preg_match("/^($siseLabel|$inconnuLabel)\w*$/", $matches[$part])
? $matches[$part]
: sprintf('%s%s', $siseLabel, $matches[$part]);
@@ -843,7 +843,7 @@ class People extends Entity
return preg_replace(
self::$inscription_pattern,
- "[etab=\\1][anneeinsc=\\2][regimeinsc=$regimeinsc][sectdisc=$sectdisc][typedip=$typedip][cursusann=$cursusann][affect=$affect][diplome=\\8][etape=$etape]",
+ "[etab=\\1][anneeinsc=\\2][regimeinsc=$regimeinsc][sectdisc=$sectdisc][typedip=$typedip][cursusann=$cursusann][affect=$affect][diplome=$diplome][etape=$etape]",
$v, 1);
} else {
return null;
--
GitLab