Эх сурвалжийг харах

Add user_type is null for better backwarads compatibility

markjcrane 2 жил өмнө
parent
commit
4bb3889c21

+ 1 - 1
core/authentication/resources/classes/plugins/database.php

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

+ 1 - 1
core/authentication/resources/classes/plugins/email.php

@@ -132,7 +132,7 @@ class plugin_email {
 					$sql .= "and domain_uuid = :domain_uuid ";
 					$sql .= "and domain_uuid = :domain_uuid ";
 					$parameters['domain_uuid'] = $_SESSION["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'];
 				$parameters['username'] = $_REQUEST['username'];
 				$database = new database;
 				$database = new database;
 				$row = $database->select($sql, $parameters, 'row');
 				$row = $database->select($sql, $parameters, 'row');

+ 1 - 1
core/authentication/resources/classes/plugins/ldap.php

@@ -131,7 +131,7 @@ class plugin_ldap {
 					$sql .= "and domain_uuid = :domain_uuid ";
 					$sql .= "and domain_uuid = :domain_uuid ";
 					$parameters['domain_uuid'] = $this->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;
 				$parameters['username'] = $this->username;
 				$database = new database;
 				$database = new database;
 				$row = $database->select($sql, $parameters, 'row');
 				$row = $database->select($sql, $parameters, 'row');

+ 1 - 1
core/authentication/resources/classes/plugins/totp.php

@@ -149,7 +149,7 @@ class plugin_totp {
 					$sql .= "and domain_uuid = :domain_uuid ";
 					$sql .= "and domain_uuid = :domain_uuid ";
 					$parameters['domain_uuid'] = $this->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;
 				$parameters['username'] = $this->username;
 				$database = new database;
 				$database = new database;
 				$row = $database->select($sql, $parameters, 'row');
 				$row = $database->select($sql, $parameters, 'row');