fixes for internal mxisd endpoints

This commit is contained in:
2018-03-08 13:20:26 +01:00
parent bce1d01b6d
commit d2b5cfbb5e
4 changed files with 20 additions and 9 deletions

View File

@@ -289,7 +289,7 @@ class mxDatabase
. " localpart LIKE '%" . $term . "%';";
foreach ($this->db->query($sql) as $row) {
array_push($result, [
"display_name" => $first_name . " " . $last_name,
"display_name" => $row["first_name"] . " " . $row["last_name"],
"user_id" => $row["localpart"],
]);
}
@@ -309,7 +309,7 @@ class mxDatabase
. " email = '" . $term . "';";
foreach ($this->db->query($sql) as $row) {
array_push($result, [
"display_name" => $first_name . " " . $last_name,
"display_name" => $row["first_name"] . " " . $row["last_name"],
"user_id" => $row["localpart"],
]);
}
@@ -319,6 +319,10 @@ class mxDatabase
}
if (!isset($mx_db)) {
$mx_db = new mxDatabase($config["databaseURI"], $config["databaseUser"], $config["databasePass"]);
if (isset($config["databaseUser"]) && isset($config["databasePass"])) {
$mx_db = new mxDatabase($config["databaseURI"], $config["databaseUser"], $config["databasePass"]);
} else {
$mx_db = new mxDatabase($config["databaseURI"]);
}
}
?>