@@ -33,6 +33,9 @@ discard block |
||
33 | 33 | } |
34 | 34 | } |
35 | 35 | |
36 | + /** |
|
37 | + * @param string $email |
|
38 | + */ |
|
36 | 39 | function validate_email_in_db($email) |
37 | 40 | { |
38 | 41 | $query="SELECT login_id FROM login WHERE email='$email'"; |
@@ -46,6 +49,9 @@ discard block |
||
46 | 49 | } |
47 | 50 | } |
48 | 51 | |
52 | + /** |
|
53 | + * @param string $username |
|
54 | + */ |
|
49 | 55 | function validate_username_in_db($username) |
50 | 56 | { |
51 | 57 | $query="SELECT login_id FROM login WHERE username='$username'"; |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | { |
9 | 9 | $this->connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME); |
10 | 10 | |
11 | - $query="CREATE TABLE IF NOT EXISTS register ( |
|
11 | + $query = "CREATE TABLE IF NOT EXISTS register ( |
|
12 | 12 | id int primary key auto_increment unique not null, |
13 | 13 | email varchar(255) unique not null, |
14 | 14 | username varchar(255) unique not null, |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | echo "Table is not created || Query failed"; |
20 | 20 | } |
21 | 21 | |
22 | - $query="CREATE TABLE IF NOT EXISTS login ( |
|
22 | + $query = "CREATE TABLE IF NOT EXISTS login ( |
|
23 | 23 | login_id int primary key not null, |
24 | 24 | name varchar(255) not null, |
25 | 25 | email varchar(255) unique not null, |
@@ -35,10 +35,10 @@ discard block |
||
35 | 35 | |
36 | 36 | function validate_email_in_db($email) |
37 | 37 | { |
38 | - $query="SELECT login_id FROM login WHERE email='$email'"; |
|
39 | - if ($result=$this->connect->query($query)) |
|
38 | + $query = "SELECT login_id FROM login WHERE email='$email'"; |
|
39 | + if ($result = $this->connect->query($query)) |
|
40 | 40 | { |
41 | - if ($result->num_rows>0) { |
|
41 | + if ($result->num_rows > 0) { |
|
42 | 42 | return 1; |
43 | 43 | } |
44 | 44 | else |
@@ -48,9 +48,9 @@ discard block |
||
48 | 48 | |
49 | 49 | function validate_username_in_db($username) |
50 | 50 | { |
51 | - $query="SELECT login_id FROM login WHERE username='$username'"; |
|
52 | - if ($result=$this->connect->query($query)) { |
|
53 | - if ($result->num_rows>0) { |
|
51 | + $query = "SELECT login_id FROM login WHERE username='$username'"; |
|
52 | + if ($result = $this->connect->query($query)) { |
|
53 | + if ($result->num_rows > 0) { |
|
54 | 54 | return 1; |
55 | 55 | } |
56 | 56 | else |
@@ -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); |
@@ -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 |
@@ -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)) |
@@ -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 | { |
@@ -65,6 +65,9 @@ |
||
65 | 65 | $this->connect->close(); |
66 | 66 | } |
67 | 67 | |
68 | + /** |
|
69 | + * @param string $id |
|
70 | + */ |
|
68 | 71 | function Data($id, $row) |
69 | 72 | { |
70 | 73 | $query = "SELECT username,name,login_status,login_id from login where login_id = '$id'"; |
@@ -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 | |
7 | 7 | /** |
@@ -23,26 +23,26 @@ discard block |
||
23 | 23 | |
24 | 24 | 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 | 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,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 | } |
@@ -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,6 +2,6 @@ |
||
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 | ?> |
@@ -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> |
@@ -6,40 +6,40 @@ discard block |
||
6 | 6 | session_start(); |
7 | 7 | include 'database.php'; |
8 | 8 | $connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME); |
9 | -$user=substr($_SERVER['REQUEST_URI'],22); |
|
9 | +$user = substr($_SERVER['REQUEST_URI'], 22); |
|
10 | 10 | // var_dump($user); |
11 | -if(isset($_SESSION['start']) and !$user) |
|
11 | +if (isset($_SESSION['start']) and !$user) |
|
12 | 12 | { |
13 | - $login_id=$_SESSION['start']; |
|
14 | - $query="SELECT username from login where login_id='$login_id'"; |
|
15 | - if($result=$connect->query($query)) |
|
13 | + $login_id = $_SESSION['start']; |
|
14 | + $query = "SELECT username from login where login_id='$login_id'"; |
|
15 | + if ($result = $connect->query($query)) |
|
16 | 16 | { |
17 | - if($result->num_rows >0) |
|
17 | + if ($result->num_rows > 0) |
|
18 | 18 | { |
19 | - $row=$result->fetch_assoc(); |
|
20 | - $location="http://localhost/openchat/account.php/".$row['username']; |
|
19 | + $row = $result->fetch_assoc(); |
|
20 | + $location = "http://localhost/openchat/account.php/".$row['username']; |
|
21 | 21 | header("Location:".$location); |
22 | 22 | } |
23 | 23 | } |
24 | 24 | |
25 | 25 | } |
26 | 26 | |
27 | -else if($user) |
|
27 | +else if ($user) |
|
28 | 28 | { |
29 | - $query="SELECT * from login where username='$user'"; |
|
30 | - if($result=$connect->query($query)) |
|
29 | + $query = "SELECT * from login where username='$user'"; |
|
30 | + if ($result = $connect->query($query)) |
|
31 | 31 | { |
32 | - if($result->num_rows >0) |
|
32 | + if ($result->num_rows > 0) |
|
33 | 33 | { |
34 | - $row=$result->fetch_assoc(); |
|
35 | - $id=$row['login_id']; |
|
36 | - $query="SELECT * from profile where login_id='$id'"; |
|
37 | - if($result=$connect->query($query)) |
|
34 | + $row = $result->fetch_assoc(); |
|
35 | + $id = $row['login_id']; |
|
36 | + $query = "SELECT * from profile where login_id='$id'"; |
|
37 | + if ($result = $connect->query($query)) |
|
38 | 38 | { |
39 | - if($result->num_rows>0) |
|
39 | + if ($result->num_rows > 0) |
|
40 | 40 | { |
41 | - $r=$result->fetch_assoc(); |
|
42 | - $row=array_merge($row,$r); |
|
41 | + $r = $result->fetch_assoc(); |
|
42 | + $row = array_merge($row, $r); |
|
43 | 43 | // var_dump($row); |
44 | 44 | } |
45 | 45 | } |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | <a id="brand" href="">OpenChat</a> |
62 | 62 | <ul class="nav-right"> |
63 | 63 | <li><a href="../index.php">About</a></li> |
64 | - <?php if(isset($_SESSION['start'])) |
|
64 | + <?php if (isset($_SESSION['start'])) |
|
65 | 65 | { |
66 | 66 | ?> |
67 | 67 | <li><a href="../message.php">Message</a></li> |
@@ -92,20 +92,20 @@ discard block |
||
92 | 92 | <div class="brief"> |
93 | 93 | <h1 id="name">Name: <?php echo $row['name']; ?></h1><br> |
94 | 94 | <?php foreach ($row as $key => $value) { |
95 | - if($key=='username' and $value!=null) |
|
96 | - echo '<p>Username: '.$row["username"] .'</p><br>'; |
|
97 | - if($key=='email' and $value!=null) |
|
98 | - echo '<p>Email Id: '.$row["email"] .'</p><br>'; |
|
99 | - if($key=='status' and $value!=null) |
|
100 | - echo '<p>Status: '.$row["status"] .'</p><br>'; |
|
101 | - if($key=='education' and $value!=null) |
|
102 | - echo '<p>Education: '.$row["education"] .'</p><br>'; |
|
103 | - if($key=='gender' and $value!=null) |
|
104 | - echo '<p>Gender: '.$row["gender"] .'</p><br>'; |
|
95 | + if ($key == 'username' and $value != null) |
|
96 | + echo '<p>Username: '.$row["username"].'</p><br>'; |
|
97 | + if ($key == 'email' and $value != null) |
|
98 | + echo '<p>Email Id: '.$row["email"].'</p><br>'; |
|
99 | + if ($key == 'status' and $value != null) |
|
100 | + echo '<p>Status: '.$row["status"].'</p><br>'; |
|
101 | + if ($key == 'education' and $value != null) |
|
102 | + echo '<p>Education: '.$row["education"].'</p><br>'; |
|
103 | + if ($key == 'gender' and $value != null) |
|
104 | + echo '<p>Gender: '.$row["gender"].'</p><br>'; |
|
105 | 105 | } |
106 | 106 | ?> |
107 | 107 | </div> |
108 | - <?php if($_SESSION['start']==$row['login_id']) |
|
108 | + <?php if ($_SESSION['start'] == $row['login_id']) |
|
109 | 109 | { |
110 | 110 | ?> |
111 | 111 | <div class="edit"><a href="#">Edit Profile</a></div> |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | </div> |
116 | 116 | |
117 | 117 | <?php |
118 | - if($_SESSION['start']==$row['login_id']) |
|
118 | + if ($_SESSION['start'] == $row['login_id']) |
|
119 | 119 | { |
120 | 120 | ?> |
121 | 121 | |
@@ -126,8 +126,8 @@ discard block |
||
126 | 126 | <label>Education : </label> |
127 | 127 | <input type="text" name="education" id="education" value="<?php echo $row['education']; ?>"></input> |
128 | 128 | <label>Gender : </label><br> |
129 | - <input type="radio" name="gender" id="gender" value="Male" <?php echo ($row['gender']=='Male')?'checked':'' ?>> Male<br> |
|
130 | - <input type="radio" name="gender" id="gender" value="Female" <?php echo ($row['gender']=='Female')?'checked':'' ?>> Female<br> |
|
129 | + <input type="radio" name="gender" id="gender" value="Male" <?php echo ($row['gender'] == 'Male') ? 'checked' : '' ?>> Male<br> |
|
130 | + <input type="radio" name="gender" id="gender" value="Female" <?php echo ($row['gender'] == 'Female') ? 'checked' : '' ?>> Female<br> |
|
131 | 131 | <input type="submit" name="submit" value="Done" id="submit"> |
132 | 132 | </form> |
133 | 133 | </div> |