ankitjain28may /
openchat
@@ -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 | } |
@@ -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 |
@@ -26,19 +26,22 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | public function replyTo($msg) |
| 28 | 28 | { |
| 29 | - if(!empty($msg)) //checks for the value send |
|
| 29 | + if(!empty($msg)) { |
|
| 30 | + //checks for the value send |
|
| 30 | 31 | { |
| 31 | 32 | $userId = $msg->userId; |
| 33 | + } |
|
| 32 | 34 | $receiverID = $msg->name; //stores id of the person whom message is to be sent |
| 33 | 35 | $identifier = ""; |
| 34 | 36 | |
| 35 | - if($receiverID > $userId) // geneate specific unique code to store messages |
|
| 37 | + if($receiverID > $userId) { |
|
| 38 | + // geneate specific unique code to store messages |
|
| 36 | 39 | { |
| 37 | 40 | $user1 = $userId; |
| 41 | + } |
|
| 38 | 42 | $user2 = $receiverID; |
| 39 | 43 | $identifier = $userId . ":" . $receiverID; |
| 40 | - } |
|
| 41 | - else |
|
| 44 | + } else |
|
| 42 | 45 | { |
| 43 | 46 | $user1 = $receiverID; |
| 44 | 47 | $user2 = $userId; |
@@ -57,19 +60,22 @@ discard block |
||
| 57 | 60 | $query = "SELECT * from login where login_id = '$receiverID'"; |
| 58 | 61 | |
| 59 | 62 | $result = $this->connect->query($query); |
| 60 | - if($result->num_rows > 0) // if true |
|
| 63 | + if($result->num_rows > 0) { |
|
| 64 | + // if true |
|
| 61 | 65 | { |
| 62 | 66 | //check whether he is sending message for thr first time or he has sent messages before |
| 63 | 67 | $query = "SELECT * from total_message where identifier = '$identifier'"; |
| 68 | + } |
|
| 64 | 69 | $result = $this->connect->query($query); |
| 65 | - if($result->num_rows > 0) // if he has sent messages before |
|
| 70 | + if($result->num_rows > 0) { |
|
| 71 | + // if he has sent messages before |
|
| 66 | 72 | { |
| 67 | 73 | // Update Total_Message Table |
| 68 | 74 | $query = "UPDATE total_message SET total_messages = total_messages+1, time = '$time', unread = 1, id = '$time_id' WHERE identifier = '$identifier'"; |
| 75 | + } |
|
| 69 | 76 | return $this->updateMessages($query, $identifier, $reply, $userId, $time); |
| 70 | 77 | |
| 71 | - } |
|
| 72 | - else // if he sends message for the first time |
|
| 78 | + } else // if he sends message for the first time |
|
| 73 | 79 | { |
| 74 | 80 | // insert Details in Total_Message Table |
| 75 | 81 | $query = "INSERT into total_message values('$identifier', 1, '$user1', '$user2', 1, '$time', '$time_id')"; |
@@ -33,18 +33,18 @@ |
||
| 33 | 33 | if($para == True) |
| 34 | 34 | { |
| 35 | 35 | $this->query = "SELECT * from login where login_id = '$details'"; |
| 36 | - } |
|
| 37 | - else |
|
| 36 | + } else |
|
| 38 | 37 | { |
| 39 | 38 | $this->query = "SELECT * from login where username = '$details'"; |
| 40 | 39 | } |
| 41 | 40 | $this->result = $this->connect->query($this->query); |
| 42 | - if($this->result->num_rows > 0) // if true |
|
| 41 | + if($this->result->num_rows > 0) { |
|
| 42 | + // if true |
|
| 43 | 43 | { |
| 44 | 44 | $this->details = $this->result->fetch_assoc(); |
| 45 | - return $this->details; |
|
| 46 | 45 | } |
| 47 | - else |
|
| 46 | + return $this->details; |
|
| 47 | + } else |
|
| 48 | 48 | { |
| 49 | 49 | return NULL; |
| 50 | 50 | } |
@@ -20,11 +20,12 @@ |
||
| 20 | 20 | 'mob' => $mob |
| 21 | 21 | ); |
| 22 | 22 | $result = $obRegister->authRegister($data); |
| 23 | - if(isset($result)) |
|
| 24 | - echo $result; |
|
| 25 | - else |
|
| 26 | - echo json_encode([]); |
|
| 27 | -} |
|
| 23 | + if(isset($result)) { |
|
| 24 | + echo $result; |
|
| 25 | + } else { |
|
| 26 | + echo json_encode([]); |
|
| 27 | + } |
|
| 28 | + } |
|
| 28 | 29 | |
| 29 | 30 | |
| 30 | 31 | |
@@ -11,8 +11,7 @@ |
||
| 11 | 11 | { |
| 12 | 12 | Session::forget('start'); |
| 13 | 13 | header('Location:'.getenv('APP_URL')."/index.php"); |
| 14 | -} |
|
| 15 | -else |
|
| 14 | +} else |
|
| 16 | 15 | { |
| 17 | 16 | echo "Please Login"; |
| 18 | 17 | } |
@@ -27,14 +27,12 @@ |
||
| 27 | 27 | if($result = $connect->query($query)) |
| 28 | 28 | { |
| 29 | 29 | header('Location:'.getenv('APP_URL').'/views/account.php'); |
| 30 | - } |
|
| 31 | - else |
|
| 30 | + } else |
|
| 32 | 31 | { |
| 33 | 32 | header("Location:".getenv('APP_URL')."/views/error.php"); |
| 34 | 33 | } |
| 35 | 34 | endif; |
| 36 | -} |
|
| 37 | -else |
|
| 35 | +} else |
|
| 38 | 36 | { |
| 39 | 37 | header("Location:".getenv('APP_URL')."/views/error.php"); |
| 40 | 38 | } |
