@@ -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 | } |
@@ -15,7 +15,7 @@ |
||
15 | 15 | <div class="header"> |
16 | 16 | <a id="brand" href="#">OpenChat</a> |
17 | 17 | <ul class="nav-right"> |
18 | - <?php if(isset($_SESSION['start'])) |
|
18 | + <?php if (isset($_SESSION['start'])) |
|
19 | 19 | { |
20 | 20 | ?> |
21 | 21 | <li><a href="account.php">Account</a></li> |
@@ -1,7 +1,7 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | namespace ChatApp; |
4 | -require_once (dirname(__DIR__) . '/database.php'); |
|
4 | +require_once (dirname(__DIR__).'/database.php'); |
|
5 | 5 | |
6 | 6 | /** |
7 | 7 | * |
@@ -23,18 +23,18 @@ discard block |
||
23 | 23 | public function SelectUser($msg) |
24 | 24 | { |
25 | 25 | $msg = $msg->value; |
26 | - if(isset($_SESSION['start']) && isset($msg)) |
|
26 | + if (isset($_SESSION['start']) && isset($msg)) |
|
27 | 27 | { |
28 | 28 | $id = $_SESSION['start']; |
29 | 29 | $suggestion = trim($msg); |
30 | - if($suggestion != "" ) |
|
30 | + if ($suggestion != "") |
|
31 | 31 | { |
32 | 32 | $query = "SELECT * FROM login where login_id != '$id' and name like '$suggestion%' ORDER BY name DESC"; |
33 | - if($result = $this->connect->query($query)) |
|
33 | + if ($result = $this->connect->query($query)) |
|
34 | 34 | { |
35 | - if($result->num_rows > 0) |
|
35 | + if ($result->num_rows > 0) |
|
36 | 36 | { |
37 | - while($row = $result->fetch_assoc()) |
|
37 | + while ($row = $result->fetch_assoc()) |
|
38 | 38 | { |
39 | 39 | $this->array = array_merge($this->array, [$row]); |
40 | 40 | } |
@@ -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 | } |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | |
4 | 4 | namespace ChatApp; |
5 | -require_once (dirname(__DIR__) . '/database.php'); |
|
5 | +require_once (dirname(__DIR__).'/database.php'); |
|
6 | 6 | |
7 | 7 | /** |
8 | 8 | * For retreiving User Information |
@@ -21,12 +21,12 @@ discard block |
||
21 | 21 | |
22 | 22 | function UserDetails($id, $para) |
23 | 23 | { |
24 | - if($para == True) |
|
24 | + if ($para == True) |
|
25 | 25 | $this->query = "SELECT * from login where login_id = '$id'"; |
26 | 26 | else |
27 | 27 | $this->query = "SELECT * from login where username = '$id'"; |
28 | 28 | $this->result = $this->connect->query($this->query); |
29 | - if($this->result->num_rows > 0) // if true |
|
29 | + if ($this->result->num_rows > 0) // if true |
|
30 | 30 | { |
31 | 31 | $this->details = $this->result->fetch_assoc(); |
32 | 32 | return $this->details; |
@@ -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 |
@@ -1,7 +1,7 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | namespace ChatApp; |
4 | -require_once (dirname(__DIR__) . '/database.php'); |
|
4 | +require_once (dirname(__DIR__).'/database.php'); |
|
5 | 5 | use ChatApp\Time; |
6 | 6 | use ChatApp\User; |
7 | 7 | |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | { |
31 | 31 | |
32 | 32 | $flag = 1; |
33 | - if(isset($_SESSION['start']) && isset($msg)) |
|
33 | + if (isset($_SESSION['start']) && isset($msg)) |
|
34 | 34 | { |
35 | 35 | $add_load = 0; |
36 | 36 | $id = $_SESSION['start']; |
@@ -40,25 +40,25 @@ discard block |
||
40 | 40 | |
41 | 41 | $fetch = $this->obUser->UserDetails($username, $para); |
42 | 42 | |
43 | - if($fetch != NULL) |
|
43 | + if ($fetch != NULL) |
|
44 | 44 | { |
45 | 45 | $login_id = (int)$fetch['login_id']; |
46 | 46 | |
47 | 47 | // Unique Identifier |
48 | - if($login_id > $id) |
|
48 | + if ($login_id > $id) |
|
49 | 49 | $identifier = $id.':'.$login_id; |
50 | 50 | else |
51 | 51 | $identifier = $login_id.':'.$id; |
52 | 52 | |
53 | 53 | $query = "SELECT total_messages from total_message where identifier = '$identifier'"; |
54 | - if($result = $this->connect->query($query)) |
|
54 | + if ($result = $this->connect->query($query)) |
|
55 | 55 | { |
56 | - if($result->num_rows > 0) |
|
56 | + if ($result->num_rows > 0) |
|
57 | 57 | { |
58 | 58 | $total = $result->fetch_assoc(); |
59 | 59 | $total = $total['total_messages']; |
60 | - if($total - $load > 0) |
|
61 | - if($total - $load > 10) |
|
60 | + if ($total - $load > 0) |
|
61 | + if ($total - $load > 10) |
|
62 | 62 | $add_load = $load + 10; |
63 | 63 | else |
64 | 64 | $add_load = $total; |
@@ -66,14 +66,14 @@ discard block |
||
66 | 66 | } |
67 | 67 | |
68 | 68 | $query = "SELECT message, time, sent_by FROM messages WHERE identifier_message_number = '$identifier' ORDER BY id DESC limit ".$load; |
69 | - if($result = $this->connect->query($query)) |
|
69 | + if ($result = $this->connect->query($query)) |
|
70 | 70 | { |
71 | - if($result->num_rows > 0) |
|
71 | + if ($result->num_rows > 0) |
|
72 | 72 | { |
73 | - while($row = $result->fetch_assoc()) |
|
73 | + while ($row = $result->fetch_assoc()) |
|
74 | 74 | { |
75 | 75 | $row['time'] = $this->obTime->TimeConversion($row['time']); |
76 | - $row = array_merge($row,['start' => $id]); |
|
76 | + $row = array_merge($row, ['start' => $id]); |
|
77 | 77 | $this->array = array_merge($this->array, [$row]); |
78 | 78 | } |
79 | 79 |
@@ -1,7 +1,7 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | namespace ChatApp; |
4 | -require_once (dirname(__DIR__) . '/database.php'); |
|
4 | +require_once (dirname(__DIR__).'/database.php'); |
|
5 | 5 | |
6 | 6 | /** |
7 | 7 | * Store Message in the Database |
@@ -21,37 +21,37 @@ discard block |
||
21 | 21 | function replyTo($msg) |
22 | 22 | { |
23 | 23 | |
24 | - if(isset($_SESSION['start']) && isset($msg)) //checks for session login and the value send |
|
24 | + if (isset($_SESSION['start']) && isset($msg)) //checks for session login and the value send |
|
25 | 25 | { |
26 | 26 | $id = $_SESSION['start']; |
27 | - $msg = json_decode($msg); //decode json value |
|
27 | + $msg = json_decode($msg); //decode json value |
|
28 | 28 | $identifier = $msg->name; |
29 | 29 | |
30 | - $receiverID = $identifier; //stores id of the person whom message is to be sent |
|
30 | + $receiverID = $identifier; //stores id of the person whom message is to be sent |
|
31 | 31 | |
32 | - if($identifier > $id) // geneate specific unique code to store messages |
|
32 | + if ($identifier > $id) // geneate specific unique code to store messages |
|
33 | 33 | $identifier = $id.":".$identifier; |
34 | 34 | else |
35 | 35 | $identifier = $identifier.":".$id; |
36 | 36 | |
37 | 37 | $reply = addslashes(trim($msg->reply[0])); // stores the message sent by the user. |
38 | 38 | |
39 | - $time = date("D d M Y H:i:s", time() + 16200); // current time |
|
39 | + $time = date("D d M Y H:i:s", time() + 16200); // current time |
|
40 | 40 | $time_id = date("YmdHis", time() + 16200); //to sort the array on the basis of time |
41 | 41 | |
42 | 42 | //the sender id must not be equal to current session id |
43 | - if($reply != "" && $receiverID != $id) |
|
43 | + if ($reply != "" && $receiverID != $id) |
|
44 | 44 | { |
45 | 45 | // check whether the receiver is authorized or registered |
46 | 46 | $query = "SELECT * from login where login_id = '$receiverID'"; |
47 | 47 | |
48 | 48 | $result = $this->connect->query($query); |
49 | - if($result->num_rows > 0) // if true |
|
49 | + if ($result->num_rows > 0) // if true |
|
50 | 50 | { |
51 | 51 | //check whether he is sending message for thr first time or he has sent messages before |
52 | 52 | $query = "SELECT * from total_message where identifier = '$identifier'"; |
53 | 53 | $result = $this->connect->query($query); |
54 | - if($result->num_rows>0) // if he has sent messages before |
|
54 | + if ($result->num_rows > 0) // if he has sent messages before |
|
55 | 55 | { |
56 | 56 | // Update Total_Message Table |
57 | 57 | $query = "UPDATE total_message SET total_messages = total_messages+1, time = '$time', unread = 1, id = '$time_id' WHERE identifier = '$identifier'"; |
@@ -61,15 +61,15 @@ discard block |
||
61 | 61 | else // if he sends message for the first time |
62 | 62 | { |
63 | 63 | $length = strlen($id); |
64 | - if(substr($identifier, 0, $length) == $id) // generate specific unique code |
|
64 | + if (substr($identifier, 0, $length) == $id) // generate specific unique code |
|
65 | 65 | { |
66 | - $user2 = substr($identifier, $length+1); |
|
66 | + $user2 = substr($identifier, $length + 1); |
|
67 | 67 | $user1 = $id; |
68 | 68 | } |
69 | 69 | else |
70 | 70 | { |
71 | 71 | $user2 = $id; |
72 | - $length = strlen($identifier) - $length-1; |
|
72 | + $length = strlen($identifier) - $length - 1; |
|
73 | 73 | $user1 = substr($identifier, 0, $length); |
74 | 74 | } |
75 | 75 | // insert Details in Total_Message Table |
@@ -92,13 +92,13 @@ discard block |
||
92 | 92 | |
93 | 93 | function UpdateMessages($query, $identifier, $reply, $id, $time) |
94 | 94 | { |
95 | - if($result = $this->connect->query($query)) |
|
95 | + if ($result = $this->connect->query($query)) |
|
96 | 96 | { |
97 | 97 | //insert message in db |
98 | 98 | $query = "INSERT into messages values('$identifier', '$reply', '$id', '$time', null)"; |
99 | - if($result = $this->connect->query($query)) |
|
99 | + if ($result = $this->connect->query($query)) |
|
100 | 100 | { |
101 | - echo "Messages is sent \n"; // if query is executed return true |
|
101 | + echo "Messages is sent \n"; // if query is executed return true |
|
102 | 102 | } |
103 | 103 | else |
104 | 104 | { |