mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-20 07:30:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-80849-main' of https://github.com/davewoloszyn/moodle

Browse Source
This commit is contained in:
Huong Nguyen 2024-04-29 08:55:02 +07:00
commit f686d2a6c7
No known key found for this signature in database
GPG Key ID: 40D88AB693A3E72A
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
communication/provider/matrix/classes/matrix_user_manager.php
View File

@ -24,6 +24,12 @@ namespace communication_matrix;
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class matrix_user_manager {
/**
* Prefix for Matrix usernames when they are detected as numeric.
*/
const MATRIX_USER_PREFIX = 'user';
/**
* Gets matrix user id from moodle.
*
@ -56,6 +62,11 @@ class matrix_user_manager {
$username = preg_replace('/[@#$%^&*()+{}|<>?!,]/i', '.', $username);
$username = ltrim(rtrim($username, '.'), '.');
// Matrix/Synapse servers will not allow numeric usernames.
if (is_numeric($username)) {
$username = self::MATRIX_USER_PREFIX . $username;
}
$homeserver = self::get_formatted_matrix_home_server();
return "@{$username}:{$homeserver}";

5
communication/provider/matrix/tests/matrix_user_manager_test.php
View File

@ -126,6 +126,11 @@ class matrix_user_manager_test extends \advanced_testcase {
'colin.creavey',
'@colin.creavey:matrix.example.org',
],
'numeric username' => [
'https://matrix.example.org',
'123456',
'@' . matrix_user_manager::MATRIX_USER_PREFIX . '123456:matrix.example.org',
],
];
}