@@ -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); |
@@ -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)) |
@@ -8,12 +8,12 @@ |
||
8 | 8 | use ChatApp\Chat; |
9 | 9 | |
10 | 10 | $server =IoServer::factory( |
11 | - new HttpServer( |
|
12 | - new WsServer( |
|
13 | - new Chat() |
|
14 | - ) |
|
15 | - ) |
|
16 | - , |
|
17 | - 8080 |
|
18 | - ); |
|
11 | + new HttpServer( |
|
12 | + new WsServer( |
|
13 | + new Chat() |
|
14 | + ) |
|
15 | + ) |
|
16 | + , |
|
17 | + 8080 |
|
18 | + ); |
|
19 | 19 | $server->run(); |
@@ -76,8 +76,8 @@ |
||
76 | 76 | } |
77 | 77 | |
78 | 78 | /** |
79 | - * @dataProvider ClassNameProvider |
|
80 | - */ |
|
79 | + * @dataProvider ClassNameProvider |
|
80 | + */ |
|
81 | 81 | public function testClassExists($className) |
82 | 82 | { |
83 | 83 | $this->assertTrue(class_exists($className)); |
@@ -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 | } |
@@ -11,40 +11,40 @@ |
||
11 | 11 | */ |
12 | 12 | class Validate |
13 | 13 | { |
14 | - protected $connect; |
|
14 | + protected $connect; |
|
15 | 15 | |
16 | - public function __construct() |
|
17 | - { |
|
18 | - $this->connect = mysqli_connect( |
|
16 | + public function __construct() |
|
17 | + { |
|
18 | + $this->connect = mysqli_connect( |
|
19 | 19 | getenv('DB_HOST'), |
20 | 20 | getenv('DB_USER'), |
21 | 21 | getenv('DB_PASSWORD'), |
22 | 22 | getenv('DB_NAME') |
23 | 23 | ); |
24 | - } |
|
24 | + } |
|
25 | 25 | |
26 | - public function validateEmailInDb($email) |
|
27 | - { |
|
28 | - $query = "SELECT login_id FROM login WHERE email = '$email'"; |
|
29 | - if ($result = $this->connect->query($query)) |
|
30 | - { |
|
31 | - if ($result->num_rows > 0) { |
|
32 | - return 1; |
|
33 | - } |
|
34 | - else |
|
35 | - return 0; |
|
36 | - } |
|
37 | - } |
|
26 | + public function validateEmailInDb($email) |
|
27 | + { |
|
28 | + $query = "SELECT login_id FROM login WHERE email = '$email'"; |
|
29 | + if ($result = $this->connect->query($query)) |
|
30 | + { |
|
31 | + if ($result->num_rows > 0) { |
|
32 | + return 1; |
|
33 | + } |
|
34 | + else |
|
35 | + return 0; |
|
36 | + } |
|
37 | + } |
|
38 | 38 | |
39 | - function validateUsernameInDb($username) |
|
40 | - { |
|
41 | - $query = "SELECT login_id FROM login WHERE username = '$username'"; |
|
42 | - if ($result = $this->connect->query($query)) { |
|
43 | - if ($result->num_rows > 0) { |
|
44 | - return 1; |
|
45 | - } |
|
46 | - else |
|
47 | - return 0; |
|
48 | - } |
|
49 | - } |
|
39 | + function validateUsernameInDb($username) |
|
40 | + { |
|
41 | + $query = "SELECT login_id FROM login WHERE username = '$username'"; |
|
42 | + if ($result = $this->connect->query($query)) { |
|
43 | + if ($result->num_rows > 0) { |
|
44 | + return 1; |
|
45 | + } |
|
46 | + else |
|
47 | + return 0; |
|
48 | + } |
|
49 | + } |
|
50 | 50 | } |
@@ -10,37 +10,37 @@ |
||
10 | 10 | $connect = mysqli_connect( |
11 | 11 | getenv('DB_HOST'), |
12 | 12 | getenv('DB_USER'), |
13 | - getenv('DB_PASSWORD'), |
|
14 | - getenv('DB_NAME') |
|
13 | + getenv('DB_PASSWORD'), |
|
14 | + getenv('DB_NAME') |
|
15 | 15 | ); |
16 | 16 | |
17 | 17 | $userId = Session::get('start'); |
18 | 18 | $data = ''; |
19 | 19 | if(isset($_POST['submit'])) |
20 | 20 | { |
21 | - $data = Profile::getProfile($userId); |
|
22 | - if($data != NULL): |
|
23 | - $status = get($_POST['status'], $data['status']); |
|
24 | - $edu = get($_POST['education'], $data['education']); |
|
25 | - $gender = get($_POST['gender'], $data['gender']); |
|
26 | - $query = "UPDATE profile set status = '$status', education = '$edu', gender = '$gender' where login_id = '$userId'"; |
|
27 | - if($result = $connect->query($query)) |
|
28 | - { |
|
29 | - header('Location:'.getenv('APP_URL').'/views/account.php'); |
|
30 | - } |
|
31 | - else |
|
32 | - { |
|
33 | - header("Location:".getenv('APP_URL')."/views/error.php"); |
|
34 | - } |
|
35 | - endif; |
|
21 | + $data = Profile::getProfile($userId); |
|
22 | + if($data != NULL): |
|
23 | + $status = get($_POST['status'], $data['status']); |
|
24 | + $edu = get($_POST['education'], $data['education']); |
|
25 | + $gender = get($_POST['gender'], $data['gender']); |
|
26 | + $query = "UPDATE profile set status = '$status', education = '$edu', gender = '$gender' where login_id = '$userId'"; |
|
27 | + if($result = $connect->query($query)) |
|
28 | + { |
|
29 | + header('Location:'.getenv('APP_URL').'/views/account.php'); |
|
30 | + } |
|
31 | + else |
|
32 | + { |
|
33 | + header("Location:".getenv('APP_URL')."/views/error.php"); |
|
34 | + } |
|
35 | + endif; |
|
36 | 36 | } |
37 | 37 | else |
38 | 38 | { |
39 | - header("Location:".getenv('APP_URL')."/views/error.php"); |
|
39 | + header("Location:".getenv('APP_URL')."/views/error.php"); |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | function get($value, $default) |
43 | 43 | { |
44 | - $value = trim($value); |
|
45 | - return (isset($value) ? $value : $default); |
|
44 | + $value = trim($value); |
|
45 | + return (isset($value) ? $value : $default); |
|
46 | 46 | } |
@@ -14,26 +14,26 @@ discard block |
||
14 | 14 | $userId = Session::get('start'); |
15 | 15 | if($userId != null && $user == "account.php") |
16 | 16 | { |
17 | - $obUser = new User(); |
|
18 | - $row = $obUser->userDetails($userId, True); |
|
17 | + $obUser = new User(); |
|
18 | + $row = $obUser->userDetails($userId, True); |
|
19 | 19 | |
20 | - if($row != NULL) |
|
21 | - { |
|
22 | - $location = getenv('APP_URL') . "/views/account.php/". $row['username']; |
|
23 | - header("Location:".$location); |
|
24 | - } |
|
20 | + if($row != NULL) |
|
21 | + { |
|
22 | + $location = getenv('APP_URL') . "/views/account.php/". $row['username']; |
|
23 | + header("Location:".$location); |
|
24 | + } |
|
25 | 25 | } |
26 | 26 | elseif ($user != "account.php") |
27 | 27 | { |
28 | - $obUser = new User(); |
|
29 | - $row = $obUser->userDetails($user, False); |
|
30 | - if($row != NULL): |
|
31 | - $userId = $row['login_id']; |
|
32 | - $details = Profile::getProfile($userId); |
|
33 | - if($details != NULL) |
|
34 | - $row = array_merge($row, $details); |
|
35 | - else |
|
36 | - header("Location:".getenv('APP_URL')."/views/error.php"); |
|
28 | + $obUser = new User(); |
|
29 | + $row = $obUser->userDetails($user, False); |
|
30 | + if($row != NULL): |
|
31 | + $userId = $row['login_id']; |
|
32 | + $details = Profile::getProfile($userId); |
|
33 | + if($details != NULL) |
|
34 | + $row = array_merge($row, $details); |
|
35 | + else |
|
36 | + header("Location:".getenv('APP_URL')."/views/error.php"); |
|
37 | 37 | ?> |
38 | 38 | |
39 | 39 | <!Doctype html> |
@@ -68,18 +68,18 @@ discard block |
||
68 | 68 | <div class="brief"> |
69 | 69 | <h1 id="name">Name: <?php echo $row['name']; ?></h1><br> |
70 | 70 | <?php foreach ($row as $key => $value) { |
71 | - if($key =='username' && $value != null) |
|
72 | - echo '<p>Username: '.$row["username"] .'</p><br>'; |
|
73 | - if($key == 'email' && $value != null) |
|
74 | - echo '<p>Email Id: '.$row["email"] .'</p><br>'; |
|
75 | - if($key == 'status' && $value != null) |
|
76 | - echo '<p>Status: '.$row["status"] .'</p><br>'; |
|
77 | - if($key == 'education' && $value != null) |
|
78 | - echo '<p>Education: '.$row["education"] .'</p><br>'; |
|
79 | - if($key == 'gender' && $value != null) |
|
80 | - echo '<p>Gender: '.$row["gender"] .'</p><br>'; |
|
81 | - } |
|
82 | - ?> |
|
71 | + if($key =='username' && $value != null) |
|
72 | + echo '<p>Username: '.$row["username"] .'</p><br>'; |
|
73 | + if($key == 'email' && $value != null) |
|
74 | + echo '<p>Email Id: '.$row["email"] .'</p><br>'; |
|
75 | + if($key == 'status' && $value != null) |
|
76 | + echo '<p>Status: '.$row["status"] .'</p><br>'; |
|
77 | + if($key == 'education' && $value != null) |
|
78 | + echo '<p>Education: '.$row["education"] .'</p><br>'; |
|
79 | + if($key == 'gender' && $value != null) |
|
80 | + echo '<p>Gender: '.$row["gender"] .'</p><br>'; |
|
81 | + } |
|
82 | + ?> |
|
83 | 83 | </div> |
84 | 84 | <?php if(Session::get('start') == $row['login_id']): ?> |
85 | 85 | <div class="edit"> |
@@ -89,8 +89,8 @@ discard block |
||
89 | 89 | </div> |
90 | 90 | |
91 | 91 | <?php |
92 | - if(Session::get('start') == $row['login_id']): |
|
93 | - ?> |
|
92 | + if(Session::get('start') == $row['login_id']): |
|
93 | + ?> |
|
94 | 94 | |
95 | 95 | <div class="boxx" id="profile"> |
96 | 96 | <form method="post" action="../profile_generate.php"> |
@@ -105,8 +105,8 @@ discard block |
||
105 | 105 | </form> |
106 | 106 | </div> |
107 | 107 | <?php |
108 | - endif; |
|
109 | - ?> |
|
108 | + endif; |
|
109 | + ?> |
|
110 | 110 | </div> |
111 | 111 | |
112 | 112 | <div class="footer"> |
@@ -119,13 +119,13 @@ discard block |
||
119 | 119 | </body> |
120 | 120 | </html> |
121 | 121 | <?php |
122 | - else: |
|
123 | - header("Location:".getenv('APP_URL')."/views/error.php"); |
|
124 | - endif; |
|
122 | + else: |
|
123 | + header("Location:".getenv('APP_URL')."/views/error.php"); |
|
124 | + endif; |
|
125 | 125 | } |
126 | 126 | else |
127 | 127 | { |
128 | - header("Location: ".getenv('APP_URL')."/views/"); |
|
128 | + header("Location: ".getenv('APP_URL')."/views/"); |
|
129 | 129 | } |
130 | 130 | ?> |
131 | 131 |
@@ -97,6 +97,9 @@ |
||
97 | 97 | } |
98 | 98 | |
99 | 99 | |
100 | + /** |
|
101 | + * @param string $value |
|
102 | + */ |
|
100 | 103 | public function onError($key, $value) |
101 | 104 | { |
102 | 105 | $this->flag = 1; |
@@ -12,115 +12,115 @@ |
||
12 | 12 | |
13 | 13 | class Register |
14 | 14 | { |
15 | - protected $error; |
|
16 | - protected $flag; |
|
17 | - protected $obValidate; |
|
18 | - protected $connect; |
|
19 | - |
|
20 | - public function __construct() |
|
21 | - { |
|
22 | - $this->error = array(); |
|
23 | - $this->flag = 0; |
|
24 | - $this->connect = mysqli_connect( |
|
15 | + protected $error; |
|
16 | + protected $flag; |
|
17 | + protected $obValidate; |
|
18 | + protected $connect; |
|
19 | + |
|
20 | + public function __construct() |
|
21 | + { |
|
22 | + $this->error = array(); |
|
23 | + $this->flag = 0; |
|
24 | + $this->connect = mysqli_connect( |
|
25 | 25 | getenv('DB_HOST'), |
26 | 26 | getenv('DB_USER'), |
27 | 27 | getenv('DB_PASSWORD'), |
28 | 28 | getenv('DB_NAME') |
29 | 29 | ); |
30 | - $this->obValidate = new Validate(); |
|
31 | - |
|
32 | - } |
|
33 | - |
|
34 | - public function authRegister($data) |
|
35 | - { |
|
36 | - $data = $this->emptyValue($data); |
|
37 | - $name = $data["name"]; |
|
38 | - $email = $data["email"]; |
|
39 | - $username = $data["username"]; |
|
40 | - $mob = $data["mob"]; |
|
41 | - $password = $data["passRegister"]; |
|
42 | - $userId = ''; |
|
43 | - |
|
44 | - if(filter_var($email, FILTER_VALIDATE_EMAIL) == false) |
|
45 | - { |
|
46 | - $this->onError("email", " *Enter correct Email address"); |
|
47 | - } |
|
48 | - else if($this->obValidate->validateEmailInDb($email) === 1) |
|
49 | - { |
|
50 | - $this->onError("email", " *Email is already registered"); |
|
51 | - } |
|
52 | - |
|
53 | - if($this->obValidate->validateUsernameInDb($username) === 1) |
|
54 | - { |
|
55 | - $this->onError("username", " *Username is already registered"); |
|
56 | - } |
|
57 | - |
|
58 | - if (!preg_match("/^[0-9]{10}$/", $data["mob"])) { |
|
59 | - $this->onError("mob", " *Enter correct Mobile Number"); |
|
60 | - } |
|
61 | - |
|
62 | - if($this->flag == 1) |
|
63 | - { |
|
64 | - return json_encode($this->error); |
|
65 | - } |
|
66 | - |
|
67 | - $password = md5($password); |
|
68 | - |
|
69 | - $query = "INSERT INTO register VALUES(null, '$email', '$username', '$password')"; |
|
70 | - if(!$this->connect->query($query)) |
|
71 | - { |
|
72 | - return json_encode(["Error" => "You are not registered, ".$this->connect->error ]); |
|
73 | - } |
|
74 | - $query = "SELECT id FROM register WHERE email = '$email'"; |
|
75 | - if($result = $this->connect->query($query)) |
|
76 | - { |
|
77 | - $row = $result->fetch_assoc(); |
|
78 | - $userId = $row['id']; |
|
79 | - $query = "INSERT INTO login VALUES('$userId', '$name', '$email', '$username', '$mob', 0)"; |
|
80 | - |
|
81 | - if(!$this->connect->query($query)) |
|
82 | - { |
|
83 | - return json_encode(["Error" => "You are not registered, ".$this->connect->error ]); |
|
84 | - } |
|
85 | - |
|
86 | - $query = "INSERT INTO profile VALUES('$userId', 'Joined OpenChat', 'Joined OpenChat', '')"; |
|
87 | - if(!$this->connect->query($query)) |
|
88 | - { |
|
89 | - return json_encode(["Error" => "You are not registered, ".$this->connect->error ]); |
|
90 | - } |
|
91 | - |
|
92 | - Session::put('start', $userId); |
|
93 | - return json_encode([ |
|
94 | - "location" => getenv('APP_URL')."/views/account.php" |
|
95 | - ]); |
|
96 | - } |
|
97 | - } |
|
98 | - |
|
99 | - |
|
100 | - public function onError($key, $value) |
|
101 | - { |
|
102 | - $this->flag = 1; |
|
103 | - $this->error = array_merge($this->error, [["key" => $key, "value" => $value]]); |
|
104 | - } |
|
105 | - |
|
106 | - public function emptyValue($data) |
|
107 | - { |
|
108 | - $errorCode = array( |
|
109 | - "name" => " *Enter the name", |
|
110 | - "email" => " *Enter the email address", |
|
111 | - "username" => " *Enter the username", |
|
112 | - "passRegister" => " *Enter the password", |
|
113 | - "mob" => " *Enter the Mobile Number" |
|
114 | - ); |
|
115 | - |
|
116 | - foreach ($data as $key => $value) { |
|
117 | - $data[$key] = trim($data[$key]); |
|
118 | - $value = trim($value); |
|
119 | - if(empty($value)) |
|
120 | - { |
|
121 | - $this->onError($key, $errorCode[$key]); |
|
122 | - } |
|
123 | - } |
|
124 | - return $data; |
|
125 | - } |
|
30 | + $this->obValidate = new Validate(); |
|
31 | + |
|
32 | + } |
|
33 | + |
|
34 | + public function authRegister($data) |
|
35 | + { |
|
36 | + $data = $this->emptyValue($data); |
|
37 | + $name = $data["name"]; |
|
38 | + $email = $data["email"]; |
|
39 | + $username = $data["username"]; |
|
40 | + $mob = $data["mob"]; |
|
41 | + $password = $data["passRegister"]; |
|
42 | + $userId = ''; |
|
43 | + |
|
44 | + if(filter_var($email, FILTER_VALIDATE_EMAIL) == false) |
|
45 | + { |
|
46 | + $this->onError("email", " *Enter correct Email address"); |
|
47 | + } |
|
48 | + else if($this->obValidate->validateEmailInDb($email) === 1) |
|
49 | + { |
|
50 | + $this->onError("email", " *Email is already registered"); |
|
51 | + } |
|
52 | + |
|
53 | + if($this->obValidate->validateUsernameInDb($username) === 1) |
|
54 | + { |
|
55 | + $this->onError("username", " *Username is already registered"); |
|
56 | + } |
|
57 | + |
|
58 | + if (!preg_match("/^[0-9]{10}$/", $data["mob"])) { |
|
59 | + $this->onError("mob", " *Enter correct Mobile Number"); |
|
60 | + } |
|
61 | + |
|
62 | + if($this->flag == 1) |
|
63 | + { |
|
64 | + return json_encode($this->error); |
|
65 | + } |
|
66 | + |
|
67 | + $password = md5($password); |
|
68 | + |
|
69 | + $query = "INSERT INTO register VALUES(null, '$email', '$username', '$password')"; |
|
70 | + if(!$this->connect->query($query)) |
|
71 | + { |
|
72 | + return json_encode(["Error" => "You are not registered, ".$this->connect->error ]); |
|
73 | + } |
|
74 | + $query = "SELECT id FROM register WHERE email = '$email'"; |
|
75 | + if($result = $this->connect->query($query)) |
|
76 | + { |
|
77 | + $row = $result->fetch_assoc(); |
|
78 | + $userId = $row['id']; |
|
79 | + $query = "INSERT INTO login VALUES('$userId', '$name', '$email', '$username', '$mob', 0)"; |
|
80 | + |
|
81 | + if(!$this->connect->query($query)) |
|
82 | + { |
|
83 | + return json_encode(["Error" => "You are not registered, ".$this->connect->error ]); |
|
84 | + } |
|
85 | + |
|
86 | + $query = "INSERT INTO profile VALUES('$userId', 'Joined OpenChat', 'Joined OpenChat', '')"; |
|
87 | + if(!$this->connect->query($query)) |
|
88 | + { |
|
89 | + return json_encode(["Error" => "You are not registered, ".$this->connect->error ]); |
|
90 | + } |
|
91 | + |
|
92 | + Session::put('start', $userId); |
|
93 | + return json_encode([ |
|
94 | + "location" => getenv('APP_URL')."/views/account.php" |
|
95 | + ]); |
|
96 | + } |
|
97 | + } |
|
98 | + |
|
99 | + |
|
100 | + public function onError($key, $value) |
|
101 | + { |
|
102 | + $this->flag = 1; |
|
103 | + $this->error = array_merge($this->error, [["key" => $key, "value" => $value]]); |
|
104 | + } |
|
105 | + |
|
106 | + public function emptyValue($data) |
|
107 | + { |
|
108 | + $errorCode = array( |
|
109 | + "name" => " *Enter the name", |
|
110 | + "email" => " *Enter the email address", |
|
111 | + "username" => " *Enter the username", |
|
112 | + "passRegister" => " *Enter the password", |
|
113 | + "mob" => " *Enter the Mobile Number" |
|
114 | + ); |
|
115 | + |
|
116 | + foreach ($data as $key => $value) { |
|
117 | + $data[$key] = trim($data[$key]); |
|
118 | + $value = trim($value); |
|
119 | + if(empty($value)) |
|
120 | + { |
|
121 | + $this->onError($key, $errorCode[$key]); |
|
122 | + } |
|
123 | + } |
|
124 | + return $data; |
|
125 | + } |
|
126 | 126 | } |