@@ -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__)); |
@@ -37,13 +37,13 @@ discard block |
||
| 37 | 37 | |
| 38 | 38 | if (preg_match("/^[@]{1}$/", $login)) |
| 39 | 39 | { |
| 40 | - if(filter_var($login, FILTER_VALIDATE_EMAIL) == false) |
|
| 40 | + if (filter_var($login, FILTER_VALIDATE_EMAIL) == false) |
|
| 41 | 41 | { |
| 42 | 42 | $this->onError("login", " *Enter correct Email address"); |
| 43 | 43 | } |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | - if($this->flag == 0) |
|
| 46 | + if ($this->flag == 0) |
|
| 47 | 47 | { |
| 48 | 48 | $password = md5($password); |
| 49 | 49 | $query = "SELECT * FROM login WHERE email = '$login' or username = '$login'"; |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | $row = $result->fetch_assoc(); |
| 55 | 55 | $loginID = $row['login_id']; |
| 56 | 56 | $query = "SELECT id FROM register WHERE id = '$loginID' and password = '$password'"; |
| 57 | - if($result = $this->connect->query($query)) |
|
| 57 | + if ($result = $this->connect->query($query)) |
|
| 58 | 58 | { |
| 59 | 59 | if ($result->num_rows > 0) |
| 60 | 60 | { |
@@ -66,12 +66,12 @@ discard block |
||
| 66 | 66 | $this->onError("passLogin", " *Invalid password"); |
| 67 | 67 | return json_encode($this->error); |
| 68 | 68 | } |
| 69 | - return json_encode(["Error" => "You are not registered, ".$this->connect->error ]); |
|
| 69 | + return json_encode(["Error" => "You are not registered, ".$this->connect->error]); |
|
| 70 | 70 | } |
| 71 | 71 | $this->onError("login", " *Invalid username or email"); |
| 72 | 72 | return json_encode($this->error); |
| 73 | 73 | } |
| 74 | - return json_encode(["Error" => "You are not registered, ".$this->connect->error ]); |
|
| 74 | + return json_encode(["Error" => "You are not registered, ".$this->connect->error]); |
|
| 75 | 75 | } |
| 76 | 76 | else |
| 77 | 77 | { |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | foreach ($data as $key => $value) { |
| 96 | 96 | $data[$key] = trim($data[$key]); |
| 97 | 97 | $value = trim($value); |
| 98 | - if(empty($value)) |
|
| 98 | + if (empty($value)) |
|
| 99 | 99 | { |
| 100 | 100 | $this->onError($key, $errorCode[$key]); |
| 101 | 101 | } |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | namespace ChatApp; |
| 4 | 4 | |
| 5 | -require_once (dirname(__DIR__) . '/vendor/autoload.php'); |
|
| 5 | +require_once (dirname(__DIR__).'/vendor/autoload.php'); |
|
| 6 | 6 | use ChatApp\Validate; |
| 7 | 7 | use ChatApp\Session; |
| 8 | 8 | use Dotenv\Dotenv; |
@@ -41,16 +41,16 @@ discard block |
||
| 41 | 41 | $password = $data["passRegister"]; |
| 42 | 42 | $userId = ''; |
| 43 | 43 | |
| 44 | - if(filter_var($email, FILTER_VALIDATE_EMAIL) == false) |
|
| 44 | + if (filter_var($email, FILTER_VALIDATE_EMAIL) == false) |
|
| 45 | 45 | { |
| 46 | 46 | $this->onError("email", " *Enter correct Email address"); |
| 47 | 47 | } |
| 48 | - else if($this->obValidate->validateEmailInDb($email) === 1) |
|
| 48 | + else if ($this->obValidate->validateEmailInDb($email) === 1) |
|
| 49 | 49 | { |
| 50 | 50 | $this->onError("email", " *Email is already registered"); |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | - if($this->obValidate->validateUsernameInDb($username) === 1) |
|
| 53 | + if ($this->obValidate->validateUsernameInDb($username) === 1) |
|
| 54 | 54 | { |
| 55 | 55 | $this->onError("username", " *Username is already registered"); |
| 56 | 56 | } |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | $this->onError("mob", " *Enter correct Mobile Number"); |
| 60 | 60 | } |
| 61 | 61 | |
| 62 | - if($this->flag == 1) |
|
| 62 | + if ($this->flag == 1) |
|
| 63 | 63 | { |
| 64 | 64 | return json_encode($this->error); |
| 65 | 65 | } |
@@ -67,26 +67,26 @@ discard block |
||
| 67 | 67 | $password = md5($password); |
| 68 | 68 | |
| 69 | 69 | $query = "INSERT INTO register VALUES(null, '$email', '$username', '$password')"; |
| 70 | - if(!$this->connect->query($query)) |
|
| 70 | + if (!$this->connect->query($query)) |
|
| 71 | 71 | { |
| 72 | - return json_encode(["Error" => "You are not registered, ".$this->connect->error ]); |
|
| 72 | + return json_encode(["Error" => "You are not registered, ".$this->connect->error]); |
|
| 73 | 73 | } |
| 74 | 74 | $query = "SELECT id FROM register WHERE email = '$email'"; |
| 75 | - if($result = $this->connect->query($query)) |
|
| 75 | + if ($result = $this->connect->query($query)) |
|
| 76 | 76 | { |
| 77 | 77 | $row = $result->fetch_assoc(); |
| 78 | 78 | $userId = $row['id']; |
| 79 | 79 | $query = "INSERT INTO login VALUES('$userId', '$name', '$email', '$username', '$mob', 0)"; |
| 80 | 80 | |
| 81 | - if(!$this->connect->query($query)) |
|
| 81 | + if (!$this->connect->query($query)) |
|
| 82 | 82 | { |
| 83 | - return json_encode(["Error" => "You are not registered, ".$this->connect->error ]); |
|
| 83 | + return json_encode(["Error" => "You are not registered, ".$this->connect->error]); |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | $query = "INSERT INTO profile VALUES('$userId', 'Joined OpenChat', 'Joined OpenChat', '')"; |
| 87 | - if(!$this->connect->query($query)) |
|
| 87 | + if (!$this->connect->query($query)) |
|
| 88 | 88 | { |
| 89 | - return json_encode(["Error" => "You are not registered, ".$this->connect->error ]); |
|
| 89 | + return json_encode(["Error" => "You are not registered, ".$this->connect->error]); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | Session::put('start', $userId); |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | foreach ($data as $key => $value) { |
| 117 | 117 | $data[$key] = trim($data[$key]); |
| 118 | 118 | $value = trim($value); |
| 119 | - if(empty($value)) |
|
| 119 | + if (empty($value)) |
|
| 120 | 120 | { |
| 121 | 121 | $this->onError($key, $errorCode[$key]); |
| 122 | 122 | } |
@@ -1,9 +1,9 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -require (dirname(__DIR__) . '/vendor/autoload.php'); |
|
| 3 | +require (dirname(__DIR__).'/vendor/autoload.php'); |
|
| 4 | 4 | use ChatApp\Login; |
| 5 | 5 | |
| 6 | -if(isset($_POST['q'])) |
|
| 6 | +if (isset($_POST['q'])) |
|
| 7 | 7 | { |
| 8 | 8 | $loginField = json_decode($_POST['q']); |
| 9 | 9 | $login = $loginField->login; |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | 'passLogin' => $password |
| 15 | 15 | ); |
| 16 | 16 | $result = $obLogin->authLogin($data); |
| 17 | - if(isset($result)) |
|
| 17 | + if (isset($result)) |
|
| 18 | 18 | echo $result; |
| 19 | 19 | else |
| 20 | 20 | echo json_encode([]); |
@@ -38,9 +38,9 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | public function onMessage(ConnectionInterface $from, $msg) { |
| 40 | 40 | $sessionId = $from->WebSocket->request->getCookies()['PHPSESSID']; |
| 41 | - if($msg == 'OpenChat initiated..!') |
|
| 41 | + if ($msg == 'OpenChat initiated..!') |
|
| 42 | 42 | { |
| 43 | - $initial = (object) array(); |
|
| 43 | + $initial = (object)array(); |
|
| 44 | 44 | $initial->initial = json_decode($this->onSidebar($from->userId)); |
| 45 | 45 | |
| 46 | 46 | $initial->conversation = json_decode( |
@@ -56,13 +56,13 @@ discard block |
||
| 56 | 56 | } |
| 57 | 57 | elseif ($msg == 'Load Sidebar') |
| 58 | 58 | { |
| 59 | - $sidebar = (object) array(); |
|
| 59 | + $sidebar = (object)array(); |
|
| 60 | 60 | $sidebar->sidebar = json_decode($this->onSidebar($from->userId)); |
| 61 | 61 | $from->send(json_encode($sidebar)); |
| 62 | 62 | } |
| 63 | 63 | elseif (@json_decode($msg)->newConversation == 'Initiated') |
| 64 | 64 | { |
| 65 | - $result = (object) array(); |
|
| 65 | + $result = (object)array(); |
|
| 66 | 66 | $result->conversation = json_decode($this->onConversation($msg, False, $sessionId)); |
| 67 | 67 | $from->send(json_encode($result)); |
| 68 | 68 | } |
@@ -102,7 +102,7 @@ discard block |
||
| 102 | 102 | $client->send(json_encode($receiveResult)); |
| 103 | 103 | $this->online = 1; |
| 104 | 104 | } |
| 105 | - elseif($client == $from) |
|
| 105 | + elseif ($client == $from) |
|
| 106 | 106 | { |
| 107 | 107 | $sentResult->sidebar = json_decode($this->onSidebar($client->userId)); |
| 108 | 108 | |