From 6bf1c9bb2968e1f0a64774279a587cfd05b17da5 Mon Sep 17 00:00:00 2001
From: Jill Stingray <stingray@jill.pl>
Date: Tue, 23 Jun 2020 20:02:52 +0000
Subject: [PATCH] Fix search

---
 Web/Models/Repositories/Users.php    | 8 ++++----
 Web/Presenters/templates/@layout.xml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Web/Models/Repositories/Users.php b/Web/Models/Repositories/Users.php
index 33d503f6..82434a18 100644
--- a/Web/Models/Repositories/Users.php
+++ b/Web/Models/Repositories/Users.php
@@ -38,16 +38,16 @@ class Users
     
     function find(string $query, int $page = 1, ?int $perPage = NULL): \Traversable
     {
-        $query   = "$query%";
+        $query   = "%$query%";
         $perPage = $perPage ?? OPENVK_DEFAULT_PER_PAGE;
-        foreach($this->users->where("first_name LIKE ? OR last_name LIKE ?", $query,$query)->page($page, $perPage) as $result)
+        foreach($this->users->where("CONCAT_WS(' ', first_name, last_name) LIKE ?", $query)->page($page, $perPage) as $result)
             yield new User($result);
     }
     
     function getFoundCount(string $query): int
     {
-        $query = "$query%";
-        return sizeof($this->users->where("first_name LIKE ? OR last_name LIKE ?", $query, $query));
+        $query = "%$query%";
+        return sizeof($this->users->where("CONCAT_WS(' ', first_name, last_name) LIKE ?", $query));
     }
     
     function getStatistics(): object
diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml
index a7ddbd3f..3003019d 100644
--- a/Web/Presenters/templates/@layout.xml
+++ b/Web/Presenters/templates/@layout.xml
@@ -69,7 +69,7 @@
                         <a href="/logout">{_"header_log_out"}</a>
                     </div>
                     <div class="link">
-                        <form action="search" method="get">
+                        <form action="/search" method="get">
                             <input type="search" name="query" placeholder="{_"header_search"}" style="background: url('/assets/packages/static/openvk/img/search_icon.png') no-repeat 3px 4px; background-color: #fff; padding-left: 18px;width: 120px;" />
                         </form>
                     </div>