dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Users: Add setting to require username format be an email address or not.

Browse Source
This commit is contained in:
Nate
2020-10-16 11:48:07 -06:00
parent 68dfa0d66d
commit 06f79d79e7
9 changed files with 130 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/users/app_config.php
+8
View File
@@ -94,6 +94,14 @@
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "53cc1060-78f9-44ca-b9b0-17fb2fffd5e1";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "users";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "username_format";
$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
$apps[$x]['default_settings'][$y]['default_setting_value'] = "any";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "Require a specific username format.";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "e3f5f4cd-0f17-428a-b788-2f2db91b6dc7";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "users";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "password_length";
core/users/user_edit.php
+8
View File
@@ -152,6 +152,14 @@
if ($username == '') {
$invalid[] = $text['label-username'];
}
if ($_SESSION['users']['username_format']['text'] != '' && $_SESSION['users']['username_format']['text'] != 'any') {
if (
($_SESSION['users']['username_format']['text'] == 'email' && !valid_email($username)) ||
($_SESSION['users']['username_format']['text'] == 'no_email' && valid_email($username))
) {
message::add($text['message-username_format_invalid'], 'negative', 7500);
}
}
if ((permission_exists('user_edit') && $action == 'edit' && $username != $username_old && $username != '') ||
(permission_exists('user_add') && $action == 'add' && $username != '')) {
$sql = "select count(*) from v_users where username = :username ";