@@ -4,8 +4,6 @@ |
||
| 4 | 4 | use PHPUnit_Framework_TestCase; |
| 5 | 5 | use ChatApp\Register; |
| 6 | 6 | use ChatApp\Search; |
| 7 | -use ChatApp\Session; |
|
| 8 | - |
|
| 9 | 7 | use Dotenv\Dotenv; |
| 10 | 8 | $dotenv = new Dotenv(dirname(__DIR__)); |
| 11 | 9 | $dotenv->load(); |
@@ -1,7 +1,7 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | namespace ChatApp; |
| 4 | -require_once (dirname(__DIR__) . '/vendor/autoload.php'); |
|
| 4 | +require_once (dirname(__DIR__).'/vendor/autoload.php'); |
|
| 5 | 5 | use ChatApp\Time; |
| 6 | 6 | use ChatApp\Session; |
| 7 | 7 | use Dotenv\Dotenv; |
@@ -38,23 +38,23 @@ discard block |
||
| 38 | 38 | $suggestion = $suggestion->value; |
| 39 | 39 | $flag = 0; |
| 40 | 40 | $userId = Session::get('start'); |
| 41 | - if($userId != null && !empty($suggestion)) |
|
| 41 | + if ($userId != null && !empty($suggestion)) |
|
| 42 | 42 | { |
| 43 | 43 | $suggestion = trim($suggestion); |
| 44 | - if($suggestion != "") |
|
| 44 | + if ($suggestion != "") |
|
| 45 | 45 | { |
| 46 | 46 | $query = "SELECT * FROM login where login_id != '$userId' and name like '$suggestion%' ORDER BY name DESC"; |
| 47 | - if($result = $this->connect->query($query)) |
|
| 47 | + if ($result = $this->connect->query($query)) |
|
| 48 | 48 | { |
| 49 | - if($result->num_rows > 0) |
|
| 49 | + if ($result->num_rows > 0) |
|
| 50 | 50 | { |
| 51 | - while($row = $result->fetch_assoc()) |
|
| 51 | + while ($row = $result->fetch_assoc()) |
|
| 52 | 52 | { |
| 53 | 53 | $check_id = $row["login_id"]; |
| 54 | 54 | $query = "SELECT * from total_message where (user1 = '$check_id' and user2 = '$userId') or (user2 = '$check_id' and user1 = '$userId')"; |
| 55 | - if($result1 = $this->connect->query($query)) |
|
| 55 | + if ($result1 = $this->connect->query($query)) |
|
| 56 | 56 | { |
| 57 | - if($result1->num_rows > 0) |
|
| 57 | + if ($result1->num_rows > 0) |
|
| 58 | 58 | { |
| 59 | 59 | $fetch = $result1->fetch_assoc(); |
| 60 | 60 | $fetch['time'] = $this->obTime->timeConversion($fetch['time']); |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | - if($flag != 0) |
|
| 69 | + if ($flag != 0) |
|
| 70 | 70 | { |
| 71 | 71 | $this->array = array_merge([], ["Search" => $this->array]); |
| 72 | 72 | return json_encode($this->array); |