@@ -26,6 +26,9 @@ discard block |
||
26 | 26 | echo "New connection! ({$conn->resourceId})\n"; |
27 | 27 | } |
28 | 28 | |
29 | + /** |
|
30 | + * @param ConnectionInterface $conn |
|
31 | + */ |
|
29 | 32 | public function setID($conn) |
30 | 33 | { |
31 | 34 | session_id($conn->WebSocket->request->getCookies()['PHPSESSID']); |
@@ -126,30 +129,47 @@ discard block |
||
126 | 129 | return $obSidebar->LoadSideBar($data); |
127 | 130 | } |
128 | 131 | |
132 | + /** |
|
133 | + * @param string $data |
|
134 | + * @param boolean $para |
|
135 | + */ |
|
129 | 136 | public function onConversation($data, $para, $sessionId) |
130 | 137 | { |
131 | 138 | $obConversation = new Conversation($sessionId); |
132 | 139 | return $obConversation->ConversationLoad($data, $para); |
133 | 140 | } |
134 | 141 | |
142 | + /** |
|
143 | + * @param string $data |
|
144 | + * @param boolean $para |
|
145 | + */ |
|
135 | 146 | public function onReceiver($data, $para, $sessionId) |
136 | 147 | { |
137 | 148 | $obReceiver = new Receiver($sessionId); |
138 | 149 | return $obReceiver->ReceiverLoad($data, True); |
139 | 150 | } |
140 | 151 | |
152 | + /** |
|
153 | + * @param string $data |
|
154 | + */ |
|
141 | 155 | public function onSearch($data, $sessionId) |
142 | 156 | { |
143 | 157 | $obSearch = new Search($sessionId); |
144 | 158 | return $obSearch->SearchItem(json_decode($data)); |
145 | 159 | } |
146 | 160 | |
161 | + /** |
|
162 | + * @param string $data |
|
163 | + */ |
|
147 | 164 | public function onCompose($data, $sessionId) |
148 | 165 | { |
149 | 166 | $obCompose = new Compose($sessionId); |
150 | 167 | return $obCompose->SelectUser(json_decode($data)); |
151 | 168 | } |
152 | 169 | |
170 | + /** |
|
171 | + * @param string $data |
|
172 | + */ |
|
153 | 173 | public function onReply($data, $sessionId) |
154 | 174 | { |
155 | 175 | $obReply = new Reply($sessionId); |
@@ -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 |
@@ -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)) |
@@ -31,18 +31,22 @@ discard block |
||
31 | 31 | public function replyTo($msg) |
32 | 32 | { |
33 | 33 | |
34 | - if(Session::get('start') != null && isset($msg)) //checks for session login and the value send |
|
34 | + if(Session::get('start') != null && isset($msg)) { |
|
35 | + //checks for session login and the value send |
|
35 | 36 | { |
36 | 37 | $userId = Session::get('start'); |
38 | + } |
|
37 | 39 | $msg = json_decode($msg); //decode json value |
38 | 40 | $identifier = $msg->name; |
39 | 41 | |
40 | 42 | $receiverID = $identifier; //stores id of the person whom message is to be sent |
41 | 43 | |
42 | - if($identifier > $userId) // geneate specific unique code to store messages |
|
44 | + if($identifier > $userId) { |
|
45 | + // geneate specific unique code to store messages |
|
43 | 46 | $identifier = $userId . ":" . $identifier; |
44 | - else |
|
45 | - $identifier = $identifier . ":" . $userId; |
|
47 | + } else { |
|
48 | + $identifier = $identifier . ":" . $userId; |
|
49 | + } |
|
46 | 50 | |
47 | 51 | $reply = addslashes(trim($msg->reply[0])); // stores the message sent by the user. |
48 | 52 | |
@@ -56,27 +60,31 @@ discard block |
||
56 | 60 | $query = "SELECT * from login where login_id = '$receiverID'"; |
57 | 61 | |
58 | 62 | $result = $this->connect->query($query); |
59 | - if($result->num_rows > 0) // if true |
|
63 | + if($result->num_rows > 0) { |
|
64 | + // if true |
|
60 | 65 | { |
61 | 66 | //check whether he is sending message for thr first time or he has sent messages before |
62 | 67 | $query = "SELECT * from total_message where identifier = '$identifier'"; |
68 | + } |
|
63 | 69 | $result = $this->connect->query($query); |
64 | - if($result->num_rows>0) // if he has sent messages before |
|
70 | + if($result->num_rows>0) { |
|
71 | + // if he has sent messages before |
|
65 | 72 | { |
66 | 73 | // Update Total_Message Table |
67 | 74 | $query = "UPDATE total_message SET total_messages = total_messages+1, time = '$time', unread = 1, id = '$time_id' WHERE identifier = '$identifier'"; |
75 | + } |
|
68 | 76 | $this->updateMessages($query, $identifier, $reply, $userId, $time); |
69 | 77 | |
70 | - } |
|
71 | - else // if he sends message for the first time |
|
78 | + } else // if he sends message for the first time |
|
72 | 79 | { |
73 | 80 | $length = strlen($userId); |
74 | - if(substr($identifier, 0, $length) == $userId) // generate specific unique code |
|
81 | + if(substr($identifier, 0, $length) == $userId) { |
|
82 | + // generate specific unique code |
|
75 | 83 | { |
76 | 84 | $user2 = substr($identifier, $length+1); |
77 | - $user1 = $userId; |
|
78 | 85 | } |
79 | - else |
|
86 | + $user1 = $userId; |
|
87 | + } else |
|
80 | 88 | { |
81 | 89 | $user2 = $userId; |
82 | 90 | $length = strlen($identifier) - $length-1; |
@@ -86,14 +94,12 @@ discard block |
||
86 | 94 | $query = "INSERT into total_message values('$identifier', 1, '$user1', '$user2', 1, '$time', '$time_id')"; |
87 | 95 | $this->updateMessages($query, $identifier, $reply, $userId, $time); |
88 | 96 | } |
89 | - } |
|
90 | - else // if he is unauthorized echo message is failed |
|
97 | + } else // if he is unauthorized echo message is failed |
|
91 | 98 | { |
92 | 99 | echo "Message is failed"; |
93 | 100 | } |
94 | 101 | } |
95 | - } |
|
96 | - else |
|
102 | + } else |
|
97 | 103 | { |
98 | 104 | echo "failed"; |
99 | 105 | } |
@@ -109,8 +115,7 @@ discard block |
||
109 | 115 | if($result = $this->connect->query($query)) |
110 | 116 | { |
111 | 117 | echo "Messages is sent \n"; // if query is executed return true |
112 | - } |
|
113 | - else |
|
118 | + } else |
|
114 | 119 | { |
115 | 120 | echo "Message is failed"; |
116 | 121 | } |
@@ -40,18 +40,15 @@ |
||
40 | 40 | } |
41 | 41 | $this->array = array_merge([], ["Compose" => $this->array]); |
42 | 42 | return json_encode($this->array); |
43 | - } |
|
44 | - else |
|
43 | + } else |
|
45 | 44 | { |
46 | 45 | return json_encode(["Compose" => "Not Found"]); |
47 | 46 | } |
48 | - } |
|
49 | - else |
|
47 | + } else |
|
50 | 48 | { |
51 | 49 | return json_encode(["Compose" => "Query Failed"]); |
52 | 50 | } |
53 | - } |
|
54 | - else |
|
51 | + } else |
|
55 | 52 | { |
56 | 53 | return json_encode(["Compose" => "Not Found"]); |
57 | 54 | } |
@@ -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 | } |
@@ -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 | } |
@@ -38,27 +38,22 @@ |
||
38 | 38 | if($substring != $userId) |
39 | 39 | { |
40 | 40 | $this->Data($substring, $row); |
41 | - } |
|
42 | - |
|
43 | - else |
|
41 | + } else |
|
44 | 42 | { |
45 | 43 | $substring = substr($identifier, $length+1); |
46 | 44 | $this->Data($substring, $row); |
47 | 45 | } |
48 | 46 | } |
49 | 47 | return json_encode($this->array); |
50 | - } |
|
51 | - else |
|
48 | + } else |
|
52 | 49 | { |
53 | 50 | return json_encode(null); |
54 | 51 | } |
55 | - } |
|
56 | - else |
|
52 | + } else |
|
57 | 53 | { |
58 | 54 | echo "Query Failed"; |
59 | 55 | } |
60 | - } |
|
61 | - else |
|
56 | + } else |
|
62 | 57 | { |
63 | 58 | header('Location:../login.php'); |
64 | 59 | } |
@@ -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,10 +6,16 @@ |
||
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 | } |
12 | 15 | |
16 | + /** |
|
17 | + * @param string $key |
|
18 | + */ |
|
13 | 19 | public static function get($key){ |
14 | 20 | return (isset($_SESSION[$key]) ? $_SESSION[$key] : null); |
15 | 21 | } |