diff --git a/SHA256SUMS b/SHA256SUMS index 848dd3f2..9dbf3672 100644 --- a/SHA256SUMS +++ b/SHA256SUMS @@ -1 +1 @@ -fd8de60b9b00116d2bf86975782fe1d3235ab14ec36fa650fd43acb9bbe451ad \ No newline at end of file +3ea88b81e74bb5f2313b6e611feccdd9303a7b15308159df41e23e19f2010f4e \ No newline at end of file diff --git a/fonctions/validators.php b/fonctions/validators.php index 06ac63b1..ed18990c 100644 --- a/fonctions/validators.php +++ b/fonctions/validators.php @@ -40,21 +40,21 @@ GUMP::add_validator("mobilphone", function ($field, $input, $param = NULL) { if (empty($input[$field])) return TRUE; - $find = preg_match('/^0[6-7]{1}(([0-9]{2}){4})|((\s[0-9]{2}){4})|((-[0-9]{2}){4})$/i', $input[$field]); + $find = preg_match('/^0[6-7]{1}(([0-9]{2}){4})|((\s[0-9]{2}){4})|((\xc2\xa0[0-9]{2}){4})|((-[0-9]{2}){4})$/i', $input[$field]); if ($find != '1') return FALSE; else return TRUE; }, 'Le champ {field} n\'est pas un numéro de téléphone mobile valide'); GUMP::add_validator("phone", function ($field, $input, $param = NULL) { if (empty($input[$field])) return TRUE; - $find = preg_match('/^0[1-6]{1}(([0-9]{2}){4})|((\s[0-9]{2}){4})|((-[0-9]{2}){4})$/i', $input[$field]); + $find = preg_match('/^0[1-6]{1}(([0-9]{2}){4})|((\s[0-9]{2}){4})|((\xc2\xa0[0-9]{2}){4})|((-[0-9]{2}){4})$/i', $input[$field]); if ($find != '1') return FALSE; else return TRUE; }, 'Le champ {field} n\'est pas un numéro de téléphone valide'); GUMP::add_validator("genericPhone", function ($field, $input, $param = NULL) { if (empty($input[$field])) return TRUE; - $find = preg_match('/^(?:(?:\+|00)33|0)\s*[1-9](?:[\s.-]*\d{2}){4}$/mix', $input[$field]); + $find = preg_match('/^(?:(?:\+|00)33|0)\s*[1-9](?:[\s.\xc2\xa0.-]*\d{2}){4}$/mix', $input[$field]); if ($find != '1') return FALSE; else return TRUE; }, 'Le champ {field} n\'est pas un numéro de téléphone international valide'); diff --git a/upgrade/base/sqlInstall.sql b/upgrade/base/sqlInstall.sql index ce62f73c..f9fb8a42 100644 --- a/upgrade/base/sqlInstall.sql +++ b/upgrade/base/sqlInstall.sql @@ -1270,7 +1270,7 @@ INSERT IGNORE INTO `prescriptions` (`cat`, `label`, `description`, `fromID`, `to -- system INSERT IGNORE INTO `system` (`name`, `groupe`, `value`) VALUES -('base', 'module', 'v8.0.2'), +('base', 'module', 'v8.0.3'), ('state', 'system', 'normal'); -- univtags_type diff --git a/upgrade/base/sqlUpgrade_v8.0.2_v8.0.3.sql b/upgrade/base/sqlUpgrade_v8.0.2_v8.0.3.sql new file mode 100644 index 00000000..2b272ce5 --- /dev/null +++ b/upgrade/base/sqlUpgrade_v8.0.2_v8.0.3.sql @@ -0,0 +1,2 @@ +-- Mise à jour n° de version +UPDATE `system` SET `value`='v8.0.3' WHERE `name`='base' and `groupe`='module'; \ No newline at end of file diff --git a/versionMedShakeEHR-base.txt b/versionMedShakeEHR-base.txt index c65342d2..c06dd948 100644 --- a/versionMedShakeEHR-base.txt +++ b/versionMedShakeEHR-base.txt @@ -1 +1 @@ -v8.0.2 +v8.0.3