@@ -14,8 +14,9 @@ |
||
| 14 | 14 | 'passLogin' => $password |
| 15 | 15 | ); |
| 16 | 16 | $result = $obLogin->authLogin($data); |
| 17 | - if(isset($result)) |
|
| 18 | - echo $result; |
|
| 19 | - else |
|
| 20 | - echo json_encode([]); |
|
| 21 | -} |
|
| 22 | 17 | \ No newline at end of file |
| 18 | + if(isset($result)) { |
|
| 19 | + echo $result; |
|
| 20 | + } else { |
|
| 21 | + echo json_encode([]); |
|
| 22 | + } |
|
| 23 | + } |
|
| 23 | 24 | \ No newline at end of file |
@@ -5,25 +5,25 @@ |
||
| 5 | 5 | |
| 6 | 6 | if(isset($_POST['q'])) |
| 7 | 7 | { |
| 8 | - $registerField = json_decode($_POST['q']); |
|
| 9 | - $name = $registerField->name; |
|
| 10 | - $email = $registerField->email; |
|
| 11 | - $username = $registerField->username; |
|
| 12 | - $mob = $registerField->mob; |
|
| 13 | - $password = $registerField->password; |
|
| 14 | - $obRegister = new Register(); |
|
| 15 | - $data = array( |
|
| 16 | - 'name' => $name, |
|
| 17 | - 'email' => $email, |
|
| 18 | - 'username' => $username, |
|
| 19 | - 'passRegister' => $password, |
|
| 20 | - 'mob' => $mob |
|
| 21 | - ); |
|
| 22 | - $result = $obRegister->authRegister($data); |
|
| 23 | - if(isset($result)) |
|
| 24 | - echo $result; |
|
| 25 | - else |
|
| 26 | - echo json_encode([]); |
|
| 8 | + $registerField = json_decode($_POST['q']); |
|
| 9 | + $name = $registerField->name; |
|
| 10 | + $email = $registerField->email; |
|
| 11 | + $username = $registerField->username; |
|
| 12 | + $mob = $registerField->mob; |
|
| 13 | + $password = $registerField->password; |
|
| 14 | + $obRegister = new Register(); |
|
| 15 | + $data = array( |
|
| 16 | + 'name' => $name, |
|
| 17 | + 'email' => $email, |
|
| 18 | + 'username' => $username, |
|
| 19 | + 'passRegister' => $password, |
|
| 20 | + 'mob' => $mob |
|
| 21 | + ); |
|
| 22 | + $result = $obRegister->authRegister($data); |
|
| 23 | + if(isset($result)) |
|
| 24 | + echo $result; |
|
| 25 | + else |
|
| 26 | + echo json_encode([]); |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | |
@@ -20,11 +20,12 @@ |
||
| 20 | 20 | 'mob' => $mob |
| 21 | 21 | ); |
| 22 | 22 | $result = $obRegister->authRegister($data); |
| 23 | - if(isset($result)) |
|
| 24 | - echo $result; |
|
| 25 | - else |
|
| 26 | - echo json_encode([]); |
|
| 27 | -} |
|
| 23 | + if(isset($result)) { |
|
| 24 | + echo $result; |
|
| 25 | + } else { |
|
| 26 | + echo json_encode([]); |
|
| 27 | + } |
|
| 28 | + } |
|
| 28 | 29 | |
| 29 | 30 | |
| 30 | 31 | |
@@ -175,6 +175,6 @@ |
||
| 175 | 175 | <?php |
| 176 | 176 | } |
| 177 | 177 | else{ |
| 178 | - header('Location:'. getenv('APP_URL')."/index.php"); |
|
| 178 | + header('Location:'. getenv('APP_URL')."/index.php"); |
|
| 179 | 179 | } |
| 180 | 180 | ?> |
@@ -168,8 +168,7 @@ |
||
| 168 | 168 | </html> |
| 169 | 169 | |
| 170 | 170 | <?php |
| 171 | -} |
|
| 172 | -else{ |
|
| 171 | +} else{ |
|
| 173 | 172 | header('Location:'. getenv('APP_URL')."/index.php"); |
| 174 | 173 | } |
| 175 | 174 | ?> |
@@ -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( |
@@ -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( |