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

Add user_type is null for better backwarads compatibility

This commit is contained in:
markjcrane 2023-07-14 12:38:45 -06:00
parent 4e861b0dcb
commit 4951647225
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/authentication/resources/classes/plugins/database.php
View File

@ -170,7 +170,7 @@ class plugin_database {
$sql .= "u.user_email, u.salt, u.api_key, u.domain_uuid, d.domain_name ";
$sql .= "from v_users as u, v_domains as d ";
$sql .= "where u.domain_uuid = d.domain_uuid ";
$sql .= "and user_type = 'default' ";
$sql .= "and (user_type = 'default' or user_type is null) ";
if (isset($this->key) && strlen($this->key) > 30) {
$sql .= "and u.api_key = :api_key ";
$parameters['api_key'] = $this->key;

2
core/authentication/resources/classes/plugins/email.php
View File

@ -132,7 +132,7 @@ class plugin_email {
$sql .= "and domain_uuid = :domain_uuid ";
$parameters['domain_uuid'] = $_SESSION["domain_uuid"];
}
$sql .= "and user_type = 'default' ";
$sql .= "and (user_type = 'default' or user_type is null) ";
$parameters['username'] = $_REQUEST['username'];
$database = new database;
$row = $database->select($sql, $parameters, 'row');

2
core/authentication/resources/classes/plugins/ldap.php
View File

@ -131,7 +131,7 @@ class plugin_ldap {
$sql .= "and domain_uuid = :domain_uuid ";
$parameters['domain_uuid'] = $this->domain_uuid;
}
$sql .= "and user_type = 'default' ";
$sql .= "and (user_type = 'default' or user_type is null) ";
$parameters['username'] = $this->username;
$database = new database;
$row = $database->select($sql, $parameters, 'row');

2
core/authentication/resources/classes/plugins/totp.php
View File

@ -149,7 +149,7 @@ class plugin_totp {
$sql .= "and domain_uuid = :domain_uuid ";
$parameters['domain_uuid'] = $this->domain_uuid;
}
$sql .= "and user_type = 'default' ";
$sql .= "and (user_type = 'default' or user_type is null) ";
$parameters['username'] = $this->username;
$database = new database;
$row = $database->select($sql, $parameters, 'row');