@@ -51,9 +51,9 @@ discard block |
||
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | /** |
| 54 | - * @depends test_authRegister |
|
| 55 | - * Testing for the register with empty username |
|
| 56 | - */ |
|
| 54 | + * @depends test_authRegister |
|
| 55 | + * Testing for the register with empty username |
|
| 56 | + */ |
|
| 57 | 57 | public function test_authregisterEmptyUsername() |
| 58 | 58 | { |
| 59 | 59 | $output = $this->obRegister->authregister( |
@@ -77,9 +77,9 @@ discard block |
||
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | /** |
| 80 | - * @depends test_authRegister |
|
| 81 | - * Testing for the register with invalid email credentials |
|
| 82 | - */ |
|
| 80 | + * @depends test_authRegister |
|
| 81 | + * Testing for the register with invalid email credentials |
|
| 82 | + */ |
|
| 83 | 83 | public function test_authregisterInvalidEmail() |
| 84 | 84 | { |
| 85 | 85 | $output = $this->obRegister->authregister( |
@@ -103,9 +103,9 @@ discard block |
||
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | /** |
| 106 | - * @depends test_authRegister |
|
| 107 | - * Testing for the register with repeated credentials |
|
| 108 | - */ |
|
| 106 | + * @depends test_authRegister |
|
| 107 | + * Testing for the register with repeated credentials |
|
| 108 | + */ |
|
| 109 | 109 | public function test_authregisterInvalidCredentials() |
| 110 | 110 | { |
| 111 | 111 | $output = $this->obRegister->authregister( |
@@ -137,9 +137,9 @@ discard block |
||
| 137 | 137 | } |
| 138 | 138 | |
| 139 | 139 | /** |
| 140 | - * @depends test_authRegister |
|
| 141 | - * Testing for the login with correct credentials |
|
| 142 | - */ |
|
| 140 | + * @depends test_authRegister |
|
| 141 | + * Testing for the login with correct credentials |
|
| 142 | + */ |
|
| 143 | 143 | |
| 144 | 144 | public function test_authLogin() |
| 145 | 145 | { |
@@ -163,9 +163,9 @@ discard block |
||
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | /** |
| 166 | - * @depends test_authRegister |
|
| 167 | - * Testing for the login with empty credentials |
|
| 168 | - */ |
|
| 166 | + * @depends test_authRegister |
|
| 167 | + * Testing for the login with empty credentials |
|
| 168 | + */ |
|
| 169 | 169 | |
| 170 | 170 | public function test_authLoginEmptyValues() |
| 171 | 171 | { |
@@ -191,9 +191,9 @@ discard block |
||
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | /** |
| 194 | - * @depends test_authRegister |
|
| 195 | - * Testing for the login with invalid or wrong email |
|
| 196 | - */ |
|
| 194 | + * @depends test_authRegister |
|
| 195 | + * Testing for the login with invalid or wrong email |
|
| 196 | + */ |
|
| 197 | 197 | |
| 198 | 198 | public function test_authLoginWrongEmail() |
| 199 | 199 | { |
@@ -215,9 +215,9 @@ discard block |
||
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | /** |
| 218 | - * @depends test_authRegister |
|
| 219 | - * Testing for the login with invalid email credentials |
|
| 220 | - */ |
|
| 218 | + * @depends test_authRegister |
|
| 219 | + * Testing for the login with invalid email credentials |
|
| 220 | + */ |
|
| 221 | 221 | public function test_authLoginInvalidUsernameEmail() |
| 222 | 222 | { |
| 223 | 223 | $output = $this->obLogin->authLogin( |
@@ -238,9 +238,9 @@ discard block |
||
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | /** |
| 241 | - * @depends test_authRegister |
|
| 242 | - * Testing for the login with invalid password credentials |
|
| 243 | - */ |
|
| 241 | + * @depends test_authRegister |
|
| 242 | + * Testing for the login with invalid password credentials |
|
| 243 | + */ |
|
| 244 | 244 | public function test_authLoginInvalidPassword() |
| 245 | 245 | { |
| 246 | 246 | $output = $this->obLogin->authLogin( |
@@ -260,9 +260,9 @@ discard block |
||
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | /** |
| 263 | - * @depends test_authRegister |
|
| 264 | - * Testing for the Profile::class with valid login_id |
|
| 265 | - */ |
|
| 263 | + * @depends test_authRegister |
|
| 264 | + * Testing for the Profile::class with valid login_id |
|
| 265 | + */ |
|
| 266 | 266 | public function test_getProfile() |
| 267 | 267 | { |
| 268 | 268 | $output = Profile::getProfile(1); |
@@ -275,9 +275,9 @@ discard block |
||
| 275 | 275 | } |
| 276 | 276 | |
| 277 | 277 | /** |
| 278 | - * @depends test_authRegister |
|
| 279 | - * Testing for the Profile::class with invalid login_id |
|
| 280 | - */ |
|
| 278 | + * @depends test_authRegister |
|
| 279 | + * Testing for the Profile::class with invalid login_id |
|
| 280 | + */ |
|
| 281 | 281 | public function test_getProfileInvalidID() |
| 282 | 282 | { |
| 283 | 283 | $output = Profile::getProfile(0); |
@@ -285,9 +285,9 @@ discard block |
||
| 285 | 285 | } |
| 286 | 286 | |
| 287 | 287 | /** |
| 288 | - * @depends test_authRegister |
|
| 289 | - * Testing for the User::class with valid login_id |
|
| 290 | - */ |
|
| 288 | + * @depends test_authRegister |
|
| 289 | + * Testing for the User::class with valid login_id |
|
| 290 | + */ |
|
| 291 | 291 | public function test_userDetails() |
| 292 | 292 | { |
| 293 | 293 | $expectedOutput = [ |
@@ -306,9 +306,9 @@ discard block |
||
| 306 | 306 | } |
| 307 | 307 | |
| 308 | 308 | /** |
| 309 | - * @depends test_authRegister |
|
| 310 | - * Testing for the User::class with invalid data |
|
| 311 | - */ |
|
| 309 | + * @depends test_authRegister |
|
| 310 | + * Testing for the User::class with invalid data |
|
| 311 | + */ |
|
| 312 | 312 | public function test_userDetailsInvalidID() |
| 313 | 313 | { |
| 314 | 314 | $output = $this->obUser->userDetails(0, True); |
@@ -316,9 +316,9 @@ discard block |
||
| 316 | 316 | } |
| 317 | 317 | |
| 318 | 318 | /** |
| 319 | - * @depends test_authRegister |
|
| 320 | - * Testing for the Validate::class for email |
|
| 321 | - */ |
|
| 319 | + * @depends test_authRegister |
|
| 320 | + * Testing for the Validate::class for email |
|
| 321 | + */ |
|
| 322 | 322 | public function test_validateEmailInDb() |
| 323 | 323 | { |
| 324 | 324 | $output = $this->obValidate->validateEmailInDb('[email protected]'); |
@@ -326,9 +326,9 @@ discard block |
||
| 326 | 326 | } |
| 327 | 327 | |
| 328 | 328 | /** |
| 329 | - * @depends test_authRegister |
|
| 330 | - * Testing for the Validate::class for username |
|
| 331 | - */ |
|
| 329 | + * @depends test_authRegister |
|
| 330 | + * Testing for the Validate::class for username |
|
| 331 | + */ |
|
| 332 | 332 | public function test_validateUsernameInDb() |
| 333 | 333 | { |
| 334 | 334 | $output = $this->obValidate->validateUsernameInDb('test'); |
@@ -336,9 +336,9 @@ discard block |
||
| 336 | 336 | } |
| 337 | 337 | |
| 338 | 338 | /** |
| 339 | - * @depends test_authRegister |
|
| 340 | - * Testing for the Validate::class for non-existing username |
|
| 341 | - */ |
|
| 339 | + * @depends test_authRegister |
|
| 340 | + * Testing for the Validate::class for non-existing username |
|
| 341 | + */ |
|
| 342 | 342 | public function test_validateUsernameInDbNot() |
| 343 | 343 | { |
| 344 | 344 | $output = $this->obValidate->validateUsernameInDb('abc'); |
@@ -346,9 +346,9 @@ discard block |
||
| 346 | 346 | } |
| 347 | 347 | |
| 348 | 348 | /** |
| 349 | - * @depends test_authRegister |
|
| 350 | - * Testing for the Validate::class for non-existing email |
|
| 351 | - */ |
|
| 349 | + * @depends test_authRegister |
|
| 350 | + * Testing for the Validate::class for non-existing email |
|
| 351 | + */ |
|
| 352 | 352 | public function test_validateEmailInDbNot() |
| 353 | 353 | { |
| 354 | 354 | $output = $this->obValidate->validateEmailInDb('[email protected]'); |
@@ -356,9 +356,9 @@ discard block |
||
| 356 | 356 | } |
| 357 | 357 | |
| 358 | 358 | /** |
| 359 | - * @depends test_authRegister |
|
| 360 | - * Testing for the Online::class |
|
| 361 | - */ |
|
| 359 | + * @depends test_authRegister |
|
| 360 | + * Testing for the Online::class |
|
| 361 | + */ |
|
| 362 | 362 | public function test_Online() |
| 363 | 363 | { |
| 364 | 364 | Online::setOnlineStatus(1); |
@@ -373,9 +373,9 @@ discard block |
||
| 373 | 373 | |
| 374 | 374 | |
| 375 | 375 | /** |
| 376 | - * @depends test_Online |
|
| 377 | - * Empty the DB |
|
| 378 | - */ |
|
| 376 | + * @depends test_Online |
|
| 377 | + * Empty the DB |
|
| 378 | + */ |
|
| 379 | 379 | public function test_EmptyDB() |
| 380 | 380 | { |
| 381 | 381 | $connect = mysqli_connect( |
@@ -8,7 +8,6 @@ |
||
| 8 | 8 | use ChatApp\Compose; |
| 9 | 9 | use ChatApp\Reply; |
| 10 | 10 | use ChatApp\Session; |
| 11 | - |
|
| 12 | 11 | use Dotenv\Dotenv; |
| 13 | 12 | $dotenv = new Dotenv(dirname(__DIR__)); |
| 14 | 13 | $dotenv->load(); |
@@ -189,12 +189,12 @@ discard block |
||
| 189 | 189 | "passLogin" => 'testing' |
| 190 | 190 | ] |
| 191 | 191 | ); |
| 192 | - $outputEmail = (array) json_decode($outputEmail); |
|
| 192 | + $outputEmail = (array)json_decode($outputEmail); |
|
| 193 | 193 | $this->assertEquals($expectedOutput, $outputEmail); |
| 194 | 194 | $currentId = Session::get('start'); |
| 195 | 195 | Session::forget('start'); |
| 196 | 196 | |
| 197 | - $msg =(object) [ |
|
| 197 | + $msg = (object)[ |
|
| 198 | 198 | "name" => $userId, |
| 199 | 199 | "reply" => [ |
| 200 | 200 | 0 => "Hello World" |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | $output = $obReply->replyTo($msg); |
| 207 | 207 | $this->assertEquals("Messages is sent", $output); |
| 208 | 208 | |
| 209 | - $msg =(object) [ |
|
| 209 | + $msg = (object)[ |
|
| 210 | 210 | "name" => $currentId, |
| 211 | 211 | "reply" => [ |
| 212 | 212 | 0 => "Hello World" |
@@ -221,7 +221,7 @@ discard block |
||
| 221 | 221 | $output = $obReply->replyTo([]); |
| 222 | 222 | $this->assertEquals("Failed", $output); |
| 223 | 223 | |
| 224 | - $output = $obReply->replyTo((object) [ |
|
| 224 | + $output = $obReply->replyTo((object)[ |
|
| 225 | 225 | "name" => -1, |
| 226 | 226 | "reply" => [ |
| 227 | 227 | 0 => "Hello World" |
@@ -230,7 +230,7 @@ discard block |
||
| 230 | 230 | ]); |
| 231 | 231 | $this->assertEquals("Invalid Authentication", $output); |
| 232 | 232 | |
| 233 | - $output = $obReply->replyTo((object) [ |
|
| 233 | + $output = $obReply->replyTo((object)[ |
|
| 234 | 234 | "name" => $userId, |
| 235 | 235 | "reply" => [ |
| 236 | 236 | 0 => "Hello" |
@@ -50,9 +50,9 @@ discard block |
||
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | /** |
| 53 | - * @depends testAuthRegister |
|
| 54 | - * Register User2 |
|
| 55 | - */ |
|
| 53 | + * @depends testAuthRegister |
|
| 54 | + * Register User2 |
|
| 55 | + */ |
|
| 56 | 56 | public function testAuthRegister2() |
| 57 | 57 | { |
| 58 | 58 | $output = $this->obRegister->authRegister( |
@@ -77,9 +77,9 @@ discard block |
||
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | /** |
| 80 | - * @depends testAuthRegister2 |
|
| 81 | - * Testing for the register with empty username |
|
| 82 | - */ |
|
| 80 | + * @depends testAuthRegister2 |
|
| 81 | + * Testing for the register with empty username |
|
| 82 | + */ |
|
| 83 | 83 | public function testCompose() |
| 84 | 84 | { |
| 85 | 85 | $expectedOutput = ['location' => 'http://127.0.0.1/openchat/views/account.php']; |
@@ -134,9 +134,9 @@ discard block |
||
| 134 | 134 | } |
| 135 | 135 | |
| 136 | 136 | /** |
| 137 | - * @depends testAuthRegister2 |
|
| 138 | - * Testing for Search Class |
|
| 139 | - */ |
|
| 137 | + * @depends testAuthRegister2 |
|
| 138 | + * Testing for Search Class |
|
| 139 | + */ |
|
| 140 | 140 | public function testSearch($userId) |
| 141 | 141 | { |
| 142 | 142 | $expectedOutput = ['location' => 'http://127.0.0.1/openchat/views/account.php']; |
@@ -178,9 +178,9 @@ discard block |
||
| 178 | 178 | |
| 179 | 179 | |
| 180 | 180 | /** |
| 181 | - * @depends testAuthRegister2 |
|
| 182 | - * Testing for Reply Class |
|
| 183 | - */ |
|
| 181 | + * @depends testAuthRegister2 |
|
| 182 | + * Testing for Reply Class |
|
| 183 | + */ |
|
| 184 | 184 | public function testReply($userId) |
| 185 | 185 | { |
| 186 | 186 | $expectedOutput = ['location' => 'http://127.0.0.1/openchat/views/account.php']; |
@@ -236,9 +236,9 @@ discard block |
||
| 236 | 236 | |
| 237 | 237 | |
| 238 | 238 | /** |
| 239 | - * @depends testReply |
|
| 240 | - * Testing for Search Class |
|
| 241 | - */ |
|
| 239 | + * @depends testReply |
|
| 240 | + * Testing for Search Class |
|
| 241 | + */ |
|
| 242 | 242 | public function testSearchWithTotalMessages() |
| 243 | 243 | { |
| 244 | 244 | $expectedOutput = ['location' => 'http://127.0.0.1/openchat/views/account.php']; |
@@ -264,8 +264,8 @@ discard block |
||
| 264 | 264 | } |
| 265 | 265 | |
| 266 | 266 | /** |
| 267 | - * Testing for Search Class |
|
| 268 | - */ |
|
| 267 | + * Testing for Search Class |
|
| 268 | + */ |
|
| 269 | 269 | public function testSidebar() |
| 270 | 270 | { |
| 271 | 271 | $expectedOutput = ['location' => 'http://127.0.0.1/openchat/views/account.php']; |
@@ -294,9 +294,9 @@ discard block |
||
| 294 | 294 | |
| 295 | 295 | |
| 296 | 296 | /** |
| 297 | - * @depends testSidebar |
|
| 298 | - * Empty the DB |
|
| 299 | - */ |
|
| 297 | + * @depends testSidebar |
|
| 298 | + * Empty the DB |
|
| 299 | + */ |
|
| 300 | 300 | public function test_EmptyDB() |
| 301 | 301 | { |
| 302 | 302 | $connect = mysqli_connect( |
@@ -47,8 +47,7 @@ |
||
| 47 | 47 | if($substring != $userId) |
| 48 | 48 | { |
| 49 | 49 | $this->data($substring, $row); |
| 50 | - } |
|
| 51 | - else |
|
| 50 | + } else |
|
| 52 | 51 | { |
| 53 | 52 | $substring = substr($identifier, $length+1); |
| 54 | 53 | $this->Data($substring, $row); |
@@ -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 Dotenv\Dotenv; |
| 7 | 7 | $dotenv = new Dotenv(dirname(__DIR__)); |
@@ -32,18 +32,18 @@ discard block |
||
| 32 | 32 | |
| 33 | 33 | public function loadSideBar($userId) |
| 34 | 34 | { |
| 35 | - if(!empty($userId)) |
|
| 35 | + if (!empty($userId)) |
|
| 36 | 36 | { |
| 37 | 37 | $query = "SELECT * FROM total_message WHERE user1='$userId' or user2='$userId' ORDER BY id DESC"; |
| 38 | - if($result = $this->connect->query($query)) |
|
| 38 | + if ($result = $this->connect->query($query)) |
|
| 39 | 39 | { |
| 40 | 40 | if ($result->num_rows > 0) |
| 41 | 41 | { |
| 42 | - while($row = $result->fetch_assoc()) |
|
| 42 | + while ($row = $result->fetch_assoc()) |
|
| 43 | 43 | { |
| 44 | 44 | $identifier = $row['identifier']; |
| 45 | 45 | $substring = explode(":", $identifier); |
| 46 | - if($substring[0] != $userId) |
|
| 46 | + if ($substring[0] != $userId) |
|
| 47 | 47 | { |
| 48 | 48 | $this->data($substring[0], $row); |
| 49 | 49 | } |
@@ -64,9 +64,9 @@ discard block |
||
| 64 | 64 | public function data($userId, $row) |
| 65 | 65 | { |
| 66 | 66 | $query = "SELECT username, name, login_status, login_id from login where login_id = '$userId'"; |
| 67 | - if($result = $this->connect->query($query)) |
|
| 67 | + if ($result = $this->connect->query($query)) |
|
| 68 | 68 | { |
| 69 | - if($result->num_rows > 0) |
|
| 69 | + if ($result->num_rows > 0) |
|
| 70 | 70 | { |
| 71 | 71 | $fetch = $result->fetch_assoc(); |
| 72 | 72 | $row['time'] = $this->obTime->timeConversion($row['time']); |
@@ -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\Session; |
| 6 | 6 | use Dotenv\Dotenv; |
| 7 | 7 | $dotenv = new Dotenv(dirname(__DIR__)); |
@@ -33,14 +33,14 @@ discard block |
||
| 33 | 33 | $userId = $msg->userId; |
| 34 | 34 | $suggestion = $msg->value; |
| 35 | 35 | $suggestion = trim($suggestion); |
| 36 | - if(!empty($userId) && !empty($suggestion)) |
|
| 36 | + if (!empty($userId) && !empty($suggestion)) |
|
| 37 | 37 | { |
| 38 | 38 | $query = "SELECT * FROM login where login_id != '$userId' and name like '$suggestion%' ORDER BY name DESC"; |
| 39 | - if($result = $this->connect->query($query)) |
|
| 39 | + if ($result = $this->connect->query($query)) |
|
| 40 | 40 | { |
| 41 | - if($result->num_rows > 0) |
|
| 41 | + if ($result->num_rows > 0) |
|
| 42 | 42 | { |
| 43 | - while($row = $result->fetch_assoc()) |
|
| 43 | + while ($row = $result->fetch_assoc()) |
|
| 44 | 44 | { |
| 45 | 45 | $this->array = array_merge($this->array, [$row]); |
| 46 | 46 | } |
@@ -50,10 +50,11 @@ discard block |
||
| 50 | 50 | $login_id = (int)$fetch['login_id']; |
| 51 | 51 | |
| 52 | 52 | // Unique Identifier |
| 53 | - if($login_id > $userId) |
|
| 54 | - $identifier = $userId.':'.$login_id; |
|
| 55 | - else |
|
| 56 | - $identifier = $login_id.':'.$userId; |
|
| 53 | + if($login_id > $userId) { |
|
| 54 | + $identifier = $userId.':'.$login_id; |
|
| 55 | + } else { |
|
| 56 | + $identifier = $login_id.':'.$userId; |
|
| 57 | + } |
|
| 57 | 58 | |
| 58 | 59 | $query = "SELECT total_messages from total_message where identifier = '$identifier'"; |
| 59 | 60 | if($result = $this->connect->query($query)) |
@@ -62,11 +63,12 @@ discard block |
||
| 62 | 63 | { |
| 63 | 64 | $total = $result->fetch_assoc(); |
| 64 | 65 | $total = $total['total_messages']; |
| 65 | - if($total - $load > 0) |
|
| 66 | - if($total - $load > 10) |
|
| 66 | + if($total - $load > 0) { |
|
| 67 | + if($total - $load > 10) |
|
| 67 | 68 | $add_load = $load + 10; |
| 68 | - else |
|
| 69 | - $add_load = $total; |
|
| 69 | + } else { |
|
| 70 | + $add_load = $total; |
|
| 71 | + } |
|
| 70 | 72 | } |
| 71 | 73 | } |
| 72 | 74 | |
@@ -84,8 +86,7 @@ discard block |
||
| 84 | 86 | |
| 85 | 87 | $this->array = array_merge([['name' => $fetch['name'], 'username' => $fetch['username'], 'id' => $fetch['login_id'], 'load' => $add_load, 'login_status' => $fetch['login_status'], 'type' => 1]], $this->array); |
| 86 | 88 | return json_encode($this->array); |
| 87 | - } |
|
| 88 | - else |
|
| 89 | + } else |
|
| 89 | 90 | { |
| 90 | 91 | return json_encode([['name' => $fetch['name'], 'username' => $fetch['username'], 'id' => $fetch['login_id'], 'login_status' => $fetch['login_status'], 'type' => 0]]); |
| 91 | 92 | } |
@@ -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\User; |
| 7 | 7 | use Dotenv\Dotenv; |
@@ -35,38 +35,38 @@ discard block |
||
| 35 | 35 | public function conversationLoad($msg, $para) |
| 36 | 36 | { |
| 37 | 37 | $msg = json_decode($msg); |
| 38 | - if(!empty($msg)) |
|
| 38 | + if (!empty($msg)) |
|
| 39 | 39 | { |
| 40 | 40 | $userId = $msg->userId; |
| 41 | 41 | $add_load = 0; |
| 42 | 42 | $details = $msg->details; |
| 43 | 43 | $load = $msg->load; |
| 44 | 44 | |
| 45 | - if($para == True) |
|
| 45 | + if ($para == True) |
|
| 46 | 46 | { |
| 47 | 47 | $details = convert_uudecode(hex2bin($details)); |
| 48 | 48 | } |
| 49 | 49 | $fetch = $this->obUser->userDetails($details, $para); |
| 50 | 50 | |
| 51 | - if($fetch != NULL) |
|
| 51 | + if ($fetch != NULL) |
|
| 52 | 52 | { |
| 53 | 53 | $login_id = (int)$fetch['login_id']; |
| 54 | 54 | |
| 55 | 55 | // Unique Identifier |
| 56 | - if($login_id > $userId) |
|
| 56 | + if ($login_id > $userId) |
|
| 57 | 57 | $identifier = $userId.':'.$login_id; |
| 58 | 58 | else |
| 59 | 59 | $identifier = $login_id.':'.$userId; |
| 60 | 60 | |
| 61 | 61 | $query = "SELECT total_messages from total_message where identifier = '$identifier'"; |
| 62 | - if($result = $this->connect->query($query)) |
|
| 62 | + if ($result = $this->connect->query($query)) |
|
| 63 | 63 | { |
| 64 | - if($result->num_rows > 0) |
|
| 64 | + if ($result->num_rows > 0) |
|
| 65 | 65 | { |
| 66 | 66 | $total = $result->fetch_assoc(); |
| 67 | 67 | $total = $total['total_messages']; |
| 68 | - if($total - $load > 0) |
|
| 69 | - if($total - $load > 10) |
|
| 68 | + if ($total - $load > 0) |
|
| 69 | + if ($total - $load > 10) |
|
| 70 | 70 | $add_load = $load + 10; |
| 71 | 71 | else |
| 72 | 72 | $add_load = $total; |
@@ -74,14 +74,14 @@ discard block |
||
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | $query = "SELECT message, time, sent_by FROM messages WHERE identifier_message_number = '$identifier' ORDER BY id DESC limit ".$load; |
| 77 | - if($result = $this->connect->query($query)) |
|
| 77 | + if ($result = $this->connect->query($query)) |
|
| 78 | 78 | { |
| 79 | - if($result->num_rows > 0) |
|
| 79 | + if ($result->num_rows > 0) |
|
| 80 | 80 | { |
| 81 | - while($row = $result->fetch_assoc()) |
|
| 81 | + while ($row = $result->fetch_assoc()) |
|
| 82 | 82 | { |
| 83 | 83 | $row['time'] = $this->obTime->timeConversion($row['time']); |
| 84 | - $row = array_merge($row,['start' => $userId]); |
|
| 84 | + $row = array_merge($row, ['start' => $userId]); |
|
| 85 | 85 | $this->array = array_merge($this->array, [$row]); |
| 86 | 86 | } |
| 87 | 87 | |
@@ -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 Dotenv\Dotenv; |
| 7 | 7 | $dotenv = new Dotenv(dirname(__DIR__)); |
@@ -34,20 +34,20 @@ discard block |
||
| 34 | 34 | $userId = $suggestion->userId; |
| 35 | 35 | $suggestion = trim($suggestion->value); |
| 36 | 36 | $flag = 0; |
| 37 | - if(!empty($userId) && !empty($suggestion)) |
|
| 37 | + if (!empty($userId) && !empty($suggestion)) |
|
| 38 | 38 | { |
| 39 | 39 | $query = "SELECT * FROM login where login_id != '$userId' and name like '$suggestion%' ORDER BY name DESC"; |
| 40 | - if($result = $this->connect->query($query)) |
|
| 40 | + if ($result = $this->connect->query($query)) |
|
| 41 | 41 | { |
| 42 | - if($result->num_rows > 0) |
|
| 42 | + if ($result->num_rows > 0) |
|
| 43 | 43 | { |
| 44 | - while($row = $result->fetch_assoc()) |
|
| 44 | + while ($row = $result->fetch_assoc()) |
|
| 45 | 45 | { |
| 46 | 46 | $check_id = $row["login_id"]; |
| 47 | 47 | $query = "SELECT * from total_message where (user1 = '$check_id' and user2 = '$userId') or (user2 = '$check_id' and user1 = '$userId')"; |
| 48 | - if($result1 = $this->connect->query($query)) |
|
| 48 | + if ($result1 = $this->connect->query($query)) |
|
| 49 | 49 | { |
| 50 | - if($result1->num_rows > 0) |
|
| 50 | + if ($result1->num_rows > 0) |
|
| 51 | 51 | { |
| 52 | 52 | $fetch = $result1->fetch_assoc(); |
| 53 | 53 | $fetch['time'] = $this->obTime->timeConversion($fetch['time']); |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | } |
| 60 | 60 | } |
| 61 | 61 | } |
| 62 | - if($flag != 0) |
|
| 62 | + if ($flag != 0) |
|
| 63 | 63 | { |
| 64 | 64 | $this->array = array_merge([], ["Search" => $this->array]); |
| 65 | 65 | return json_encode($this->array); |