Support user profile URL search term in api_users_search()

diff --git a/include/api.php b/include/api.php
index 681515cc376cc0a9bfeb11bad6ad05521b972cb4..0828d9646e22b1d80b737e6c2edd7168d07bb019 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -1416,32 +1416,37 @@ function api_users_search($type)
        $userlist = [];
 
        if (!empty($_GET['q'])) {
-               $r = q("SELECT id FROM `contact` WHERE `uid` = 0 AND `name` = '%s'", DBA::escape($_GET["q"]));
-
-               if (!DBA::isResult($r)) {
-                       $r = q("SELECT `id` FROM `contact` WHERE `uid` = 0 AND `nick` = '%s'", DBA::escape($_GET["q"]));
-               }
+               $contacts = Contact::selectToArray(
+                       ['id'],
+                       [
+                               '`uid` = 0 AND (`name` = ? OR `nick` = ? OR `url` = ? OR `addr` = ?)',
+                               $_GET['q'],
+                               $_GET['q'],
+                               $_GET['q'],
+                               $_GET['q'],
+                       ]
+               );
 
-               if (DBA::isResult($r)) {
+               if (DBA::isResult($contacts)) {
                        $k = 0;
-                       foreach ($r as $user) {
-                               $user_info = api_get_user($a, $user["id"]);
+                       foreach ($contacts as $contact) {
+                               $user_info = api_get_user($a, $contact['id']);
 
-                               if ($type == "xml") {
-                                       $userlist[$k++.":user"] = $user_info;
+                               if ($type == 'xml') {
+                                       $userlist[$k++ . ':user'] = $user_info;
                                } else {
                                        $userlist[] = $user_info;
                                }
                        }
-                       $userlist = ["users" => $userlist];
+                       $userlist = ['users' => $userlist];
                } else {
-                       throw new BadRequestException("User ".$_GET["q"]." not found.");
+                       throw new NotFoundException('User ' . $_GET['q'] . ' not found.');
                }
        } else {
-               throw new BadRequestException("No user specified.");
+               throw new BadRequestException('No search term specified.');
        }
 
-       return api_format_data("users", $type, $userlist);
+       return api_format_data('users', $type, $userlist);
 }
 
 /// @TODO move to top of file or somewhere better