@@ -90,6 +90,11 @@ |
||
90 | 90 | $this->connect->close(); |
91 | 91 | } |
92 | 92 | |
93 | + /** |
|
94 | + * @param string $identifier |
|
95 | + * @param string $reply |
|
96 | + * @param string $time |
|
97 | + */ |
|
93 | 98 | function UpdateMessages($query, $identifier, $reply, $id, $time) |
94 | 99 | { |
95 | 100 | if($result = $this->connect->query($query)) |
@@ -27,16 +27,20 @@ discard block |
||
27 | 27 | |
28 | 28 | public function replyTo($msg) |
29 | 29 | { |
30 | - if(!empty($msg)) //checks for the value send |
|
30 | + if(!empty($msg)) { |
|
31 | + //checks for the value send |
|
31 | 32 | { |
32 | 33 | $userId = $msg->userId; |
34 | + } |
|
33 | 35 | $identifier = $msg->name; |
34 | 36 | $receiverID = $identifier; //stores id of the person whom message is to be sent |
35 | 37 | |
36 | - if($identifier > $userId) // geneate specific unique code to store messages |
|
38 | + if($identifier > $userId) { |
|
39 | + // geneate specific unique code to store messages |
|
37 | 40 | $identifier = $userId . ":" . $identifier; |
38 | - else |
|
39 | - $identifier = $identifier . ":" . $userId; |
|
41 | + } else { |
|
42 | + $identifier = $identifier . ":" . $userId; |
|
43 | + } |
|
40 | 44 | |
41 | 45 | $reply = addslashes(trim($msg->reply[0])); // stores the message sent by the user. |
42 | 46 | |
@@ -50,27 +54,31 @@ discard block |
||
50 | 54 | $query = "SELECT * from login where login_id = '$receiverID'"; |
51 | 55 | |
52 | 56 | $result = $this->connect->query($query); |
53 | - if($result->num_rows > 0) // if true |
|
57 | + if($result->num_rows > 0) { |
|
58 | + // if true |
|
54 | 59 | { |
55 | 60 | //check whether he is sending message for thr first time or he has sent messages before |
56 | 61 | $query = "SELECT * from total_message where identifier = '$identifier'"; |
62 | + } |
|
57 | 63 | $result = $this->connect->query($query); |
58 | - if($result->num_rows>0) // if he has sent messages before |
|
64 | + if($result->num_rows>0) { |
|
65 | + // if he has sent messages before |
|
59 | 66 | { |
60 | 67 | // Update Total_Message Table |
61 | 68 | $query = "UPDATE total_message SET total_messages = total_messages+1, time = '$time', unread = 1, id = '$time_id' WHERE identifier = '$identifier'"; |
69 | + } |
|
62 | 70 | return $this->updateMessages($query, $identifier, $reply, $userId, $time); |
63 | 71 | |
64 | - } |
|
65 | - else // if he sends message for the first time |
|
72 | + } else // if he sends message for the first time |
|
66 | 73 | { |
67 | 74 | $length = strlen($userId); |
68 | - if(substr($identifier, 0, $length) == $userId) // generate specific unique code |
|
75 | + if(substr($identifier, 0, $length) == $userId) { |
|
76 | + // generate specific unique code |
|
69 | 77 | { |
70 | 78 | $user2 = substr($identifier, $length+1); |
71 | - $user1 = $userId; |
|
72 | 79 | } |
73 | - else |
|
80 | + $user1 = $userId; |
|
81 | + } else |
|
74 | 82 | { |
75 | 83 | $user2 = $userId; |
76 | 84 | $length = strlen($identifier) - $length-1; |
@@ -16,14 +16,15 @@ |
||
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); |
|
25 | - else |
|
26 | - $time = substr($time,4,11); |
|
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 | + } else { |
|
26 | + $time = substr($time,4,11); |
|
27 | + } |
|
27 | 28 | |
28 | 29 | return $time; |
29 | 30 | } |
@@ -52,28 +52,23 @@ discard block |
||
52 | 52 | |
53 | 53 | $initial->conversation[0]->login_status = $this->online; |
54 | 54 | $from->send(json_encode($initial)); |
55 | - } |
|
56 | - elseif ($msg == 'Load Sidebar') |
|
55 | + } elseif ($msg == 'Load Sidebar') |
|
57 | 56 | { |
58 | 57 | @$initial->initial = json_decode($this->onSidebar($from->userId)); |
59 | 58 | $from->send(json_encode($initial)); |
60 | - } |
|
61 | - elseif (@json_decode($msg)->newConversation == 'Initiated') |
|
59 | + } elseif (@json_decode($msg)->newConversation == 'Initiated') |
|
62 | 60 | { |
63 | 61 | @$result->conversation = json_decode($this->onConversation($msg, False, $sessionId)); |
64 | 62 | $from->send(json_encode($result)); |
65 | - } |
|
66 | - elseif (@json_decode($msg)->search == 'search') |
|
63 | + } elseif (@json_decode($msg)->search == 'search') |
|
67 | 64 | { |
68 | 65 | $searchResult = $this->onSearch($msg, $sessionId); |
69 | 66 | $from->send($searchResult); |
70 | - } |
|
71 | - elseif (@json_decode($msg)->Compose == 'Compose') |
|
67 | + } elseif (@json_decode($msg)->Compose == 'Compose') |
|
72 | 68 | { |
73 | 69 | $composeResult = $this->onCompose($msg, $sessionId); |
74 | 70 | $from->send($composeResult); |
75 | - } |
|
76 | - else |
|
71 | + } else |
|
77 | 72 | { |
78 | 73 | $this->onReply($msg, $sessionId); |
79 | 74 | |
@@ -97,8 +92,7 @@ discard block |
||
97 | 92 | |
98 | 93 | $client->send(json_encode($result)); |
99 | 94 | $this->online = 1; |
100 | - } |
|
101 | - elseif($client == $from) |
|
95 | + } elseif($client == $from) |
|
102 | 96 | { |
103 | 97 | @$result->sidebar = json_decode($this->onSidebar($client->userId)); |
104 | 98 |
@@ -25,6 +25,9 @@ discard block |
||
25 | 25 | Online::setOnlineStatus($conn->userId); |
26 | 26 | } |
27 | 27 | |
28 | + /** |
|
29 | + * @param ConnectionInterface $conn |
|
30 | + */ |
|
28 | 31 | public function setID($conn) |
29 | 32 | { |
30 | 33 | session_id($conn->WebSocket->request->getCookies()['PHPSESSID']); |
@@ -129,18 +132,29 @@ discard block |
||
129 | 132 | return $obSidebar->loadSideBar($data); |
130 | 133 | } |
131 | 134 | |
135 | + /** |
|
136 | + * @param string $data |
|
137 | + * @param boolean $para |
|
138 | + */ |
|
132 | 139 | public function onConversation($data, $para, $sessionId) |
133 | 140 | { |
134 | 141 | $obConversation = new Conversation($sessionId); |
135 | 142 | return $obConversation->conversationLoad($data, $para); |
136 | 143 | } |
137 | 144 | |
145 | + /** |
|
146 | + * @param string $data |
|
147 | + * @param boolean $para |
|
148 | + */ |
|
138 | 149 | public function onReceiver($data, $para, $sessionId) |
139 | 150 | { |
140 | 151 | $obReceiver = new Receiver($sessionId); |
141 | 152 | return $obReceiver->receiverLoad($data, $para); |
142 | 153 | } |
143 | 154 | |
155 | + /** |
|
156 | + * @param string $data |
|
157 | + */ |
|
144 | 158 | public function onSearch($data, $sessionId) |
145 | 159 | { |
146 | 160 | $obSearch = new Search($sessionId); |
@@ -61,16 +61,14 @@ |
||
61 | 61 | { |
62 | 62 | $this->array = array_merge([], ["Search" => $this->array]); |
63 | 63 | return json_encode($this->array); |
64 | + } else { |
|
65 | + return json_encode(["Search" => "Not Found"]); |
|
64 | 66 | } |
65 | - else |
|
66 | - return json_encode(["Search" => "Not Found"]); |
|
67 | - } |
|
68 | - else |
|
67 | + } else |
|
69 | 68 | { |
70 | 69 | return json_encode(["Search" => "Not Found"]); |
71 | 70 | } |
72 | - } |
|
73 | - else |
|
71 | + } else |
|
74 | 72 | { |
75 | 73 | return json_encode(["Search" => "Not Found"]); |
76 | 74 | } |
@@ -40,9 +40,9 @@ discard block |
||
40 | 40 | { |
41 | 41 | if ($result->num_rows>0) { |
42 | 42 | return 1; |
43 | + } else { |
|
44 | + return 0; |
|
43 | 45 | } |
44 | - else |
|
45 | - return 0; |
|
46 | 46 | } |
47 | 47 | } |
48 | 48 | |
@@ -52,9 +52,9 @@ discard block |
||
52 | 52 | if ($result=$this->connect->query($query)) { |
53 | 53 | if ($result->num_rows>0) { |
54 | 54 | return 1; |
55 | + } else { |
|
56 | + return 0; |
|
55 | 57 | } |
56 | - else |
|
57 | - return 0; |
|
58 | 58 | |
59 | 59 | } |
60 | 60 | } |
@@ -14,12 +14,13 @@ |
||
14 | 14 | $connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME); |
15 | 15 | $query = "SELECT * from profile where login_id = '$userId'"; |
16 | 16 | $result = $connect->query($query); |
17 | - if($result->num_rows > 0) // if true |
|
17 | + if($result->num_rows > 0) { |
|
18 | + // if true |
|
18 | 19 | { |
19 | 20 | $details = $result->fetch_assoc(); |
20 | - return $details; |
|
21 | 21 | } |
22 | - else |
|
22 | + return $details; |
|
23 | + } else |
|
23 | 24 | { |
24 | 25 | return NULL; |
25 | 26 | } |
@@ -6,6 +6,9 @@ |
||
6 | 6 | class Session |
7 | 7 | { |
8 | 8 | |
9 | + /** |
|
10 | + * @param string $key |
|
11 | + */ |
|
9 | 12 | public static function put($key, $value){ |
10 | 13 | $_SESSION[$key] = $value; |
11 | 14 | } |
@@ -55,10 +55,11 @@ discard block |
||
55 | 55 | $login_id = (int)$fetch['login_id']; |
56 | 56 | |
57 | 57 | // Unique Identifier |
58 | - if($login_id > $userId) |
|
59 | - $identifier = $userId.':'.$login_id; |
|
60 | - else |
|
61 | - $identifier = $login_id.':'.$userId; |
|
58 | + if($login_id > $userId) { |
|
59 | + $identifier = $userId.':'.$login_id; |
|
60 | + } else { |
|
61 | + $identifier = $login_id.':'.$userId; |
|
62 | + } |
|
62 | 63 | |
63 | 64 | $query = "SELECT total_messages from total_message where identifier = '$identifier'"; |
64 | 65 | if($result = $this->connect->query($query)) |
@@ -67,11 +68,12 @@ discard block |
||
67 | 68 | { |
68 | 69 | $total = $result->fetch_assoc(); |
69 | 70 | $total = $total['total_messages']; |
70 | - if($total - $load > 0) |
|
71 | - if($total - $load > 10) |
|
71 | + if($total - $load > 0) { |
|
72 | + if($total - $load > 10) |
|
72 | 73 | $add_load = $load + 10; |
73 | - else |
|
74 | - $add_load = $total; |
|
74 | + } else { |
|
75 | + $add_load = $total; |
|
76 | + } |
|
75 | 77 | } |
76 | 78 | } |
77 | 79 | |
@@ -89,23 +91,19 @@ discard block |
||
89 | 91 | |
90 | 92 | $this->array = array_merge([['name' => $fetch['name'], 'username' => $fetch['username'], 'id' => $fetch['login_id'], 'load' => $add_load, 'login_status' => $fetch['login_status'], 'type' => 1]], $this->array); |
91 | 93 | return json_encode($this->array); |
92 | - } |
|
93 | - else |
|
94 | + } else |
|
94 | 95 | { |
95 | 96 | return json_encode([['name' => $fetch['name'], 'username' => $fetch['username'], 'id' => $fetch['login_id'], 'login_status' => $fetch['login_status'], 'type' => 0]]); |
96 | 97 | } |
97 | - } |
|
98 | - else |
|
98 | + } else |
|
99 | 99 | { |
100 | 100 | echo "Query Failed"; |
101 | 101 | } |
102 | - } |
|
103 | - else |
|
102 | + } else |
|
104 | 103 | { |
105 | 104 | echo "Query Failed"; |
106 | 105 | } |
107 | - } |
|
108 | - else |
|
106 | + } else |
|
109 | 107 | { |
110 | 108 | header('Location:../login.php'); |
111 | 109 | } |
@@ -30,17 +30,19 @@ |
||
30 | 30 | |
31 | 31 | public function userDetails($userId, $para) |
32 | 32 | { |
33 | - if($para == True) |
|
34 | - $this->query = "SELECT * from login where login_id = '$userId'"; |
|
35 | - else |
|
36 | - $this->query = "SELECT * from login where username = '$userId'"; |
|
33 | + if($para == True) { |
|
34 | + $this->query = "SELECT * from login where login_id = '$userId'"; |
|
35 | + } else { |
|
36 | + $this->query = "SELECT * from login where username = '$userId'"; |
|
37 | + } |
|
37 | 38 | $this->result = $this->connect->query($this->query); |
38 | - if($this->result->num_rows > 0) // if true |
|
39 | + if($this->result->num_rows > 0) { |
|
40 | + // if true |
|
39 | 41 | { |
40 | 42 | $this->details = $this->result->fetch_assoc(); |
41 | - return $this->details; |
|
42 | 43 | } |
43 | - else |
|
44 | + return $this->details; |
|
45 | + } else |
|
44 | 46 | { |
45 | 47 | return NULL; |
46 | 48 | } |