@@ -129,8 +129,7 @@ |
||
129 | 129 | </html> |
130 | 130 | |
131 | 131 | <?php |
132 | -} |
|
133 | -else{ |
|
132 | +} else{ |
|
134 | 133 | header('Location:http://www.localhost/openchat/login.php'); |
135 | 134 | } |
136 | 135 | ?> |
@@ -18,14 +18,12 @@ |
||
18 | 18 | if($result = $connect->query($query)) |
19 | 19 | { |
20 | 20 | header('Location:'.URL.'/account.php'); |
21 | - } |
|
22 | - else |
|
21 | + } else |
|
23 | 22 | { |
24 | 23 | header("Location:".URL."/error.php"); |
25 | 24 | } |
26 | 25 | endif; |
27 | -} |
|
28 | -else |
|
26 | +} else |
|
29 | 27 | { |
30 | 28 | header("Location:".URL."/error.php"); |
31 | 29 | } |
@@ -22,19 +22,19 @@ discard block |
||
22 | 22 | $location = getenv('APP_URL') . "/views/account.php/". $row['username']; |
23 | 23 | header("Location:".$location); |
24 | 24 | } |
25 | -} |
|
26 | -elseif ($user != "account.php") |
|
25 | +} elseif ($user != "account.php") |
|
27 | 26 | { |
28 | 27 | $obUser = new User(); |
29 | 28 | $row = $obUser->userDetails($user, False); |
30 | 29 | if($row != NULL): |
31 | 30 | $userId = $row['login_id']; |
32 | 31 | $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 | -?> |
|
32 | + if($details != NULL) { |
|
33 | + $row = array_merge($row, $details); |
|
34 | + } else { |
|
35 | + header("Location:".getenv('APP_URL')."/views/error.php"); |
|
36 | + } |
|
37 | + ?> |
|
38 | 38 | |
39 | 39 | <!Doctype html> |
40 | 40 | <html> |
@@ -51,10 +51,13 @@ discard block |
||
51 | 51 | <?php if(Session::get('start') != null): ?> |
52 | 52 | <li><a href="../message.php">Message</a></li> |
53 | 53 | <li><a href="../logout.php">Log out</a></li> |
54 | - <?php else: ?> |
|
54 | + <?php else { |
|
55 | + : ?> |
|
55 | 56 | <li><a href="../login.php">Login</a></li> |
56 | 57 | <li><a href="../register.php">Register</a></li> |
57 | - <?php endif; ?> |
|
58 | + <?php endif; |
|
59 | +} |
|
60 | +?> |
|
58 | 61 | </ul> |
59 | 62 | </div> |
60 | 63 | |
@@ -68,16 +71,21 @@ discard block |
||
68 | 71 | <div class="brief"> |
69 | 72 | <h1 id="name">Name: <?php echo $row['name']; ?></h1><br> |
70 | 73 | <?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>'; |
|
74 | + if($key =='username' && $value != null) { |
|
75 | + echo '<p>Username: '.$row["username"] .'</p><br>'; |
|
76 | + } |
|
77 | + if($key == 'email' && $value != null) { |
|
78 | + echo '<p>Email Id: '.$row["email"] .'</p><br>'; |
|
79 | + } |
|
80 | + if($key == 'status' && $value != null) { |
|
81 | + echo '<p>Status: '.$row["status"] .'</p><br>'; |
|
82 | + } |
|
83 | + if($key == 'education' && $value != null) { |
|
84 | + echo '<p>Education: '.$row["education"] .'</p><br>'; |
|
85 | + } |
|
86 | + if($key == 'gender' && $value != null) { |
|
87 | + echo '<p>Gender: '.$row["gender"] .'</p><br>'; |
|
88 | + } |
|
81 | 89 | } |
82 | 90 | ?> |
83 | 91 | </div> |
@@ -119,11 +127,12 @@ discard block |
||
119 | 127 | </body> |
120 | 128 | </html> |
121 | 129 | <?php |
122 | - else: |
|
130 | + else { |
|
131 | + : |
|
123 | 132 | header("Location:".getenv('APP_URL')."/views/error.php"); |
133 | + } |
|
124 | 134 | endif; |
125 | -} |
|
126 | -else |
|
135 | +} else |
|
127 | 136 | { |
128 | 137 | header("Location: ".getenv('APP_URL')."/views/"); |
129 | 138 | } |
@@ -13,9 +13,10 @@ |
||
13 | 13 | $password = $registerField->password; |
14 | 14 | $obRegister = new Register(); |
15 | 15 | $result = $obRegister->authRegister($name, $email, $username, $password, $mob); |
16 | - if(isset($result)) |
|
17 | - echo $result; |
|
18 | - else |
|
19 | - echo json_encode([]); |
|
20 | -} |
|
16 | + if(isset($result)) { |
|
17 | + echo $result; |
|
18 | + } else { |
|
19 | + echo json_encode([]); |
|
20 | + } |
|
21 | + } |
|
21 | 22 |
@@ -72,8 +72,7 @@ |
||
72 | 72 | return json_encode($this->error); |
73 | 73 | } |
74 | 74 | return json_encode(["Error" => "You are not registered, ".$this->connect->error ]); |
75 | - } |
|
76 | - else |
|
75 | + } else |
|
77 | 76 | { |
78 | 77 | return json_encode($this->error); |
79 | 78 | } |
@@ -44,8 +44,7 @@ |
||
44 | 44 | if(filter_var($email, FILTER_VALIDATE_EMAIL) == false) |
45 | 45 | { |
46 | 46 | $this->onError("email", " *Enter correct Email address"); |
47 | - } |
|
48 | - else if($this->obValidate->validateEmailInDb($email) === 1) |
|
47 | + } else if($this->obValidate->validateEmailInDb($email) === 1) |
|
49 | 48 | { |
50 | 49 | $this->onError("email", " *Email is already registered"); |
51 | 50 | } |
@@ -14,8 +14,9 @@ |
||
14 | 14 | 'passLogin' => $password |
15 | 15 | ); |
16 | 16 | $result = $obLogin->authLogin($data); |
17 | - if(isset($result)) |
|
18 | - echo $result; |
|
19 | - else |
|
20 | - echo json_encode([]); |
|
21 | -} |
|
22 | 17 | \ No newline at end of file |
18 | + if(isset($result)) { |
|
19 | + echo $result; |
|
20 | + } else { |
|
21 | + echo json_encode([]); |
|
22 | + } |
|
23 | + } |
|
23 | 24 | \ No newline at end of file |
@@ -31,17 +31,21 @@ discard block |
||
31 | 31 | public function replyTo($msg) |
32 | 32 | { |
33 | 33 | $msg = json_decode($msg); //decode json value |
34 | - if(Session::get('start') != null && !empty($msg)) //checks for session login and the value send |
|
34 | + if(Session::get('start') != null && !empty($msg)) { |
|
35 | + //checks for session login and the value send |
|
35 | 36 | { |
36 | 37 | $userId = Session::get('start'); |
38 | + } |
|
37 | 39 | $identifier = $msg->name; |
38 | 40 | |
39 | 41 | $receiverID = $identifier; //stores id of the person whom message is to be sent |
40 | 42 | |
41 | - if($identifier > $userId) // geneate specific unique code to store messages |
|
43 | + if($identifier > $userId) { |
|
44 | + // geneate specific unique code to store messages |
|
42 | 45 | $identifier = $userId . ":" . $identifier; |
43 | - else |
|
44 | - $identifier = $identifier . ":" . $userId; |
|
46 | + } else { |
|
47 | + $identifier = $identifier . ":" . $userId; |
|
48 | + } |
|
45 | 49 | |
46 | 50 | $reply = addslashes(trim($msg->reply[0])); // stores the message sent by the user. |
47 | 51 | |
@@ -55,27 +59,31 @@ discard block |
||
55 | 59 | $query = "SELECT * from login where login_id = '$receiverID'"; |
56 | 60 | |
57 | 61 | $result = $this->connect->query($query); |
58 | - if($result->num_rows > 0) // if true |
|
62 | + if($result->num_rows > 0) { |
|
63 | + // if true |
|
59 | 64 | { |
60 | 65 | //check whether he is sending message for thr first time or he has sent messages before |
61 | 66 | $query = "SELECT * from total_message where identifier = '$identifier'"; |
67 | + } |
|
62 | 68 | $result = $this->connect->query($query); |
63 | - if($result->num_rows>0) // if he has sent messages before |
|
69 | + if($result->num_rows>0) { |
|
70 | + // if he has sent messages before |
|
64 | 71 | { |
65 | 72 | // Update Total_Message Table |
66 | 73 | $query = "UPDATE total_message SET total_messages = total_messages+1, time = '$time', unread = 1, id = '$time_id' WHERE identifier = '$identifier'"; |
74 | + } |
|
67 | 75 | return $this->updateMessages($query, $identifier, $reply, $userId, $time); |
68 | 76 | |
69 | - } |
|
70 | - else // if he sends message for the first time |
|
77 | + } else // if he sends message for the first time |
|
71 | 78 | { |
72 | 79 | $length = strlen($userId); |
73 | - if(substr($identifier, 0, $length) == $userId) // generate specific unique code |
|
80 | + if(substr($identifier, 0, $length) == $userId) { |
|
81 | + // generate specific unique code |
|
74 | 82 | { |
75 | 83 | $user2 = substr($identifier, $length+1); |
76 | - $user1 = $userId; |
|
77 | 84 | } |
78 | - else |
|
85 | + $user1 = $userId; |
|
86 | + } else |
|
79 | 87 | { |
80 | 88 | $user2 = $userId; |
81 | 89 | $length = strlen($identifier) - $length-1; |
@@ -85,14 +93,12 @@ discard block |
||
85 | 93 | $query = "INSERT into total_message values('$identifier', 1, '$user1', '$user2', 1, '$time', '$time_id')"; |
86 | 94 | return $this->updateMessages($query, $identifier, $reply, $userId, $time); |
87 | 95 | } |
88 | - } |
|
89 | - else // if he is unauthorized echo message is failed |
|
96 | + } else // if he is unauthorized echo message is failed |
|
90 | 97 | { |
91 | 98 | return "Invalid Authentication"; |
92 | 99 | } |
93 | 100 | } |
94 | - } |
|
95 | - else |
|
101 | + } else |
|
96 | 102 | { |
97 | 103 | return "Failed"; |
98 | 104 | } |
@@ -107,8 +113,7 @@ discard block |
||
107 | 113 | if($this->connect->query($query)) |
108 | 114 | { |
109 | 115 | return "Messages is sent"; // if query is executed return true |
110 | - } |
|
111 | - else |
|
116 | + } else |
|
112 | 117 | { |
113 | 118 | return "Message is failed"; |
114 | 119 | } |