ankitjain28may /
openchat
@@ -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 | |
@@ -3,7 +3,6 @@ |
||
| 3 | 3 | namespace ChatApp; |
| 4 | 4 | require_once (dirname(__DIR__) . '/database.php'); |
| 5 | 5 | use ChatApp\User; |
| 6 | -use ChatApp\Time; |
|
| 7 | 6 | use ChatApp\Conversation; |
| 8 | 7 | /** |
| 9 | 8 | * |
@@ -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\User; |
| 6 | 6 | use ChatApp\Time; |
| 7 | 7 | use ChatApp\Conversation; |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | $name = $this->messages['name']; |
| 32 | 32 | $this->messages = json_decode($this->conversation->ConversationLoad($msg, True)); |
| 33 | 33 | $id = json_decode($msg)->username; |
| 34 | - for ($i=1 ; $i < count($this->messages); $i++) { |
|
| 34 | + for ($i = 1; $i < count($this->messages); $i++) { |
|
| 35 | 35 | $this->messages[$i]->start = $id; |
| 36 | 36 | } |
| 37 | 37 | $this->messages[0]->username = $username; |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | session_start(); |
| 3 | -if(isset($_SESSION['start'])) |
|
| 3 | +if (isset($_SESSION['start'])) |
|
| 4 | 4 | { |
| 5 | 5 | header("Location: account.php"); |
| 6 | 6 | } |
@@ -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,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | session_start(); |
| 3 | -if(isset($_SESSION['start']) and empty($_GET['user'])) |
|
| 3 | +if (isset($_SESSION['start']) and empty($_GET['user'])) |
|
| 4 | 4 | { |
| 5 | 5 | ?> |
| 6 | 6 | <!DOCTYPE html> |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | |
| 131 | 131 | <?php |
| 132 | 132 | } |
| 133 | -else{ |
|
| 133 | +else { |
|
| 134 | 134 | header('Location:http://www.localhost/openchat/login.php'); |
| 135 | 135 | } |
| 136 | 136 | ?> |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | session_start(); |
| 3 | -if(isset($_SESSION['start'])) |
|
| 3 | +if (isset($_SESSION['start'])) |
|
| 4 | 4 | { |
| 5 | 5 | header("Location: account.php"); |
| 6 | 6 | } |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | // Define database connection constants |
| 3 | 3 | define('DB_HOST', 'localhost'); |
| 4 | 4 | define('DB_USER', 'root'); |
| 5 | - define('DB_PASSWORD',''); |
|
| 5 | + define('DB_PASSWORD', ''); |
|
| 6 | 6 | define('DB_NAME', 'openchat'); |
| 7 | 7 | define('URL', URL()); |
| 8 | 8 | |
@@ -12,7 +12,7 @@ discard block |
||
| 12 | 12 | $host = $_SERVER['SERVER_NAME']; |
| 13 | 13 | $port = $_SERVER['SERVER_PORT']; |
| 14 | 14 | $fol = ""; |
| 15 | - if(@$_SERVER['SERVER_ADDR']!=NULL) |
|
| 15 | + if (@$_SERVER['SERVER_ADDR'] != NULL) |
|
| 16 | 16 | { |
| 17 | 17 | $fol = "/".explode('/', $_SERVER['PHP_SELF'])[1]; |
| 18 | 18 | } |
