@@ -2,11 +2,9 @@ |
||
| 2 | 2 | namespace ChatApp; |
| 3 | 3 | use Ratchet\MessageComponentInterface; |
| 4 | 4 | use Ratchet\ConnectionInterface; |
| 5 | -use ChatApp\Models\Message; |
|
| 6 | 5 | use ChatApp\Reply; |
| 7 | 6 | use ChatApp\Conversation; |
| 8 | 7 | use ChatApp\Receiver; |
| 9 | -use ChatApp\SideBar; |
|
| 10 | 8 | use ChatApp\Search; |
| 11 | 9 | use ChatApp\Compose; |
| 12 | 10 | |
@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | |
| 38 | 38 | public function onMessage(ConnectionInterface $from, $msg) { |
| 39 | 39 | $sessionId = $from->WebSocket->request->getCookies()['PHPSESSID']; |
| 40 | - if($msg == 'OpenChat initiated..!') |
|
| 40 | + if ($msg == 'OpenChat initiated..!') |
|
| 41 | 41 | { |
| 42 | 42 | @$initial->initial = json_decode($this->onSidebar($from->userId)); |
| 43 | 43 | |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | $client->send(json_encode($result)); |
| 99 | 99 | $this->online = 1; |
| 100 | 100 | } |
| 101 | - elseif($client == $from) |
|
| 101 | + elseif ($client == $from) |
|
| 102 | 102 | { |
| 103 | 103 | @$result->sidebar = json_decode($this->onSidebar($client->userId)); |
| 104 | 104 | |
@@ -16,14 +16,14 @@ |
||
| 16 | 16 | function TimeConversion($time) |
| 17 | 17 | { |
| 18 | 18 | |
| 19 | - if(substr($time,4,11) == date("d M Y", time() + 16200)) |
|
| 20 | - $time = substr($time,16,5); |
|
| 21 | - else if(substr($time,7,8) == date("M Y", time() + 16200) && substr($time, 4,2) - date("d") < 7) |
|
| 22 | - $time = substr($time,0,3); |
|
| 23 | - else if(substr($time,11,4) == date("Y", time() + 16200)) |
|
| 24 | - $time = substr($time,4,6); |
|
| 19 | + if (substr($time, 4, 11) == date("d M Y", time() + 16200)) |
|
| 20 | + $time = substr($time, 16, 5); |
|
| 21 | + else if (substr($time, 7, 8) == date("M Y", time() + 16200) && substr($time, 4, 2) - date("d") < 7) |
|
| 22 | + $time = substr($time, 0, 3); |
|
| 23 | + else if (substr($time, 11, 4) == date("Y", time() + 16200)) |
|
| 24 | + $time = substr($time, 4, 6); |
|
| 25 | 25 | else |
| 26 | - $time = substr($time,4,11); |
|
| 26 | + $time = substr($time, 4, 11); |
|
| 27 | 27 | |
| 28 | 28 | return $time; |
| 29 | 29 | } |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | |
| 9 | 9 | class Message extends Model |
| 10 | 10 | { |
| 11 | - protected $table='message'; |
|
| 11 | + protected $table = 'message'; |
|
| 12 | 12 | |
| 13 | 13 | protected $fillable = ['identifier_message_number', 'message', 'sent_by', 'time']; |
| 14 | 14 | } |
@@ -7,7 +7,7 @@ |
||
| 7 | 7 | use Ratchet\WebSocket\WsServer; |
| 8 | 8 | use ChatApp\Chat; |
| 9 | 9 | |
| 10 | -$server =IoServer::factory( |
|
| 10 | +$server = IoServer::factory( |
|
| 11 | 11 | new HttpServer( |
| 12 | 12 | new WsServer( |
| 13 | 13 | new Chat() |
@@ -1,7 +1,7 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | namespace ChatApp; |
| 4 | -require_once (dirname(__DIR__) . '/config/database.php'); |
|
| 4 | +require_once (dirname(__DIR__).'/config/database.php'); |
|
| 5 | 5 | use ChatApp\Time; |
| 6 | 6 | |
| 7 | 7 | /** |
@@ -23,26 +23,26 @@ discard block |
||
| 23 | 23 | |
| 24 | 24 | public function LoadSideBar($userId) |
| 25 | 25 | { |
| 26 | - if(isset($userId)) |
|
| 26 | + if (isset($userId)) |
|
| 27 | 27 | { |
| 28 | 28 | $query = "SELECT * FROM total_message WHERE user1='$userId' or user2='$userId' ORDER BY id DESC"; |
| 29 | - if($result = $this->connect->query($query)) |
|
| 29 | + if ($result = $this->connect->query($query)) |
|
| 30 | 30 | { |
| 31 | 31 | if ($result->num_rows > 0) |
| 32 | 32 | { |
| 33 | 33 | $length = strlen($userId); |
| 34 | - while($row = $result->fetch_assoc()) |
|
| 34 | + while ($row = $result->fetch_assoc()) |
|
| 35 | 35 | { |
| 36 | 36 | $identifier = $row['identifier']; |
| 37 | 37 | $substring = substr($identifier, 0, $length); |
| 38 | - if($substring != $userId) |
|
| 38 | + if ($substring != $userId) |
|
| 39 | 39 | { |
| 40 | 40 | $this->Data($substring, $row); |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | else |
| 44 | 44 | { |
| 45 | - $substring = substr($identifier, $length+1); |
|
| 45 | + $substring = substr($identifier, $length + 1); |
|
| 46 | 46 | $this->Data($substring, $row); |
| 47 | 47 | } |
| 48 | 48 | } |
@@ -68,9 +68,9 @@ discard block |
||
| 68 | 68 | public function Data($id, $row) |
| 69 | 69 | { |
| 70 | 70 | $query = "SELECT username,name,login_status,login_id from login where login_id = '$id'"; |
| 71 | - if($result = $this->connect->query($query)) |
|
| 71 | + if ($result = $this->connect->query($query)) |
|
| 72 | 72 | { |
| 73 | - if($result->num_rows > 0) |
|
| 73 | + if ($result->num_rows > 0) |
|
| 74 | 74 | { |
| 75 | 75 | $fetch = $result->fetch_assoc(); |
| 76 | 76 | $row['time'] = $this->obTime->TimeConversion($row['time']); |
@@ -1,9 +1,9 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -require (__DIR__ . '/vendor/autoload.php'); |
|
| 3 | +require (__DIR__.'/vendor/autoload.php'); |
|
| 4 | 4 | use ChatApp\Session; |
| 5 | 5 | |
| 6 | -if(Session::get('start') != null) |
|
| 6 | +if (Session::get('start') != null) |
|
| 7 | 7 | { |
| 8 | 8 | Session::forget('start'); |
| 9 | 9 | header('Location: index.php'); |
@@ -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\Register; |
| 5 | 5 | |
| 6 | -if(isset($_POST['q'])) |
|
| 6 | +if (isset($_POST['q'])) |
|
| 7 | 7 | { |
| 8 | 8 | $registerField = json_decode($_POST['q']); |
| 9 | 9 | $name = $registerField->name; |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | $password = $registerField->password; |
| 14 | 14 | $obRegister = new Register(); |
| 15 | 15 | $result = $obRegister->authRegister($name, $email, $username, $password, $mob); |
| 16 | - if(isset($result)) |
|
| 16 | + if (isset($result)) |
|
| 17 | 17 | echo $result; |
| 18 | 18 | else |
| 19 | 19 | echo json_encode([]); |
@@ -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\Register; |
| 5 | 5 | |
| 6 | -if(isset($_POST['q'])) |
|
| 6 | +if (isset($_POST['q'])) |
|
| 7 | 7 | { |
| 8 | 8 | $registerField = json_decode($_POST['q']); |
| 9 | 9 | $name = $registerField->name; |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | $password = $registerField->password; |
| 14 | 14 | $obRegister = new Register(); |
| 15 | 15 | $result = $obRegister->authRegister($name, $email, $username, $password, $mob); |
| 16 | - if(isset($result)) |
|
| 16 | + if (isset($result)) |
|
| 17 | 17 | echo $result; |
| 18 | 18 | else |
| 19 | 19 | echo json_encode([]); |
@@ -1,21 +1,21 @@ |
||
| 1 | 1 | <?php |
| 2 | -require_once (__DIR__ . '/config/database.php'); |
|
| 3 | -require_once (__DIR__ . '/vendor/autoload.php'); |
|
| 2 | +require_once (__DIR__.'/config/database.php'); |
|
| 3 | +require_once (__DIR__.'/vendor/autoload.php'); |
|
| 4 | 4 | use ChatApp\Session; |
| 5 | 5 | use ChatApp\Profile; |
| 6 | 6 | |
| 7 | 7 | $connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME); |
| 8 | 8 | $userId = Session::get('start'); |
| 9 | 9 | $data = ''; |
| 10 | -if(isset($_POST['submit'])) |
|
| 10 | +if (isset($_POST['submit'])) |
|
| 11 | 11 | { |
| 12 | 12 | $data = Profile::getProfile($userId); |
| 13 | - if($data != NULL): |
|
| 13 | + if ($data != NULL): |
|
| 14 | 14 | $status = get($_POST['status'], $data['status']); |
| 15 | 15 | $edu = get($_POST['education'], $data['education']); |
| 16 | 16 | $gender = get($_POST['gender'], $data['gender']); |
| 17 | 17 | $query = "UPDATE profile set status='$status', education='$edu', gender='$gender' where login_id = '$userId'"; |
| 18 | - if($result = $connect->query($query)) |
|
| 18 | + if ($result = $connect->query($query)) |
|
| 19 | 19 | { |
| 20 | 20 | header('Location:'.URL.'/account.php'); |
| 21 | 21 | } |