Merge branch 'master' into PHRAS-4062-admin-users-list-and-request-im…

…provement
alchemy-fr · Jun 10, 2024 · 4967b3d · 4967b3d
2 parents 22989ae + 0c0021d
commit 4967b3d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/Alchemy/Phrasea/Authentication/RegistrationService.php b/lib/Alchemy/Phrasea/Authentication/RegistrationService.php
@@ -204,7 +204,7 @@ public function registerUser(array $data, array $selectedCollections = null, $pr
 
         foreach (self::$userPropertySetterMap as $property => $method) {
             if (isset($data[$property])) {
-                $user->$method($data[$property]);
+                $user->$method($this->app['unicode']->remove_nonazAZ09($data[$property], true, true, true, true));
             }
         }
 

diff --git a/lib/classes/unicode.php b/lib/classes/unicode.php
@@ -1643,7 +1643,7 @@ public function remove_diacritics($string)
         return $this->convert($string, static::CONVERT_TO_ND);
     }
 
-    public function remove_nonazAZ09($string, $keep_underscores = true, $keep_minus = true, $keep_dot = false)
+    public function remove_nonazAZ09($string, $keep_underscores = true, $keep_minus = true, $keep_dot = false, $keep_space = false)
     {
         $string = $this->remove_diacritics($string);
 
@@ -1652,7 +1652,7 @@ public function remove_nonazAZ09($string, $keep_underscores = true, $keep_minus
         for ($i = 0; $i < $l; $i ++) {
             $c = mb_substr($string, $i, 1);
             if(($c>='a'&&$c<='z')||($c>='A'&&$c<='Z')||($c>='0'&&$c<='9')
-                ||($keep_underscores&&$c=='_')||($keep_dot&&$c=='.')||($keep_minus&&$c=='-')) {
+                ||($keep_underscores&&$c=='_')||($keep_dot&&$c=='.')||($keep_minus&&$c=='-')||($keep_space&&$c==' ')) {
                 $out .= $c;
             }
         }