@@ -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)) |
@@ -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'"; |
@@ -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 | } |
@@ -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 | } |
@@ -5,13 +5,13 @@ |
||
5 | 5 | |
6 | 6 | if(isset($_POST['q'])) |
7 | 7 | { |
8 | - $loginField = json_decode($_POST['q']); |
|
9 | - $login = $loginField->login; |
|
10 | - $password = $loginField->password; |
|
11 | - $obLogin = new Login(); |
|
12 | - $result = $obLogin->authLogin($login, $password); |
|
13 | - if(isset($result)) |
|
14 | - echo $result; |
|
15 | - else |
|
16 | - echo json_encode([]); |
|
8 | + $loginField = json_decode($_POST['q']); |
|
9 | + $login = $loginField->login; |
|
10 | + $password = $loginField->password; |
|
11 | + $obLogin = new Login(); |
|
12 | + $result = $obLogin->authLogin($login, $password); |
|
13 | + if(isset($result)) |
|
14 | + echo $result; |
|
15 | + else |
|
16 | + echo json_encode([]); |
|
17 | 17 | } |
18 | 18 | \ No newline at end of file |
@@ -138,6 +138,6 @@ |
||
138 | 138 | <?php |
139 | 139 | } |
140 | 140 | else{ |
141 | - header('Location:'. getenv('APP_URL')."/index.php"); |
|
141 | + header('Location:'. getenv('APP_URL')."/index.php"); |
|
142 | 142 | } |
143 | 143 | ?> |
@@ -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 | } |