@@ -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)) |
@@ -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')"; |
@@ -16,14 +16,15 @@ |
||
| 16 | 16 | function TimeConversion($time) |
| 17 | 17 | { |
| 18 | 18 | |
| 19 | - if(substr($time,4,11) == date("d M Y", time() + 16200)) |
|
| 20 | - $time = substr($time,16,5); |
|
| 21 | - else if(substr($time,7,8) == date("M Y", time() + 16200) && substr($time, 4,2) - date("d") < 7) |
|
| 22 | - $time = substr($time,0,3); |
|
| 23 | - else if(substr($time,11,4) == date("Y", time() + 16200)) |
|
| 24 | - $time = substr($time,4,6); |
|
| 25 | - else |
|
| 26 | - $time = substr($time,4,11); |
|
| 19 | + if(substr($time,4,11) == date("d M Y", time() + 16200)) { |
|
| 20 | + $time = substr($time,16,5); |
|
| 21 | + } else if(substr($time,7,8) == date("M Y", time() + 16200) && substr($time, 4,2) - date("d") < 7) { |
|
| 22 | + $time = substr($time,0,3); |
|
| 23 | + } else if(substr($time,11,4) == date("Y", time() + 16200)) { |
|
| 24 | + $time = substr($time,4,6); |
|
| 25 | + } else { |
|
| 26 | + $time = substr($time,4,11); |
|
| 27 | + } |
|
| 27 | 28 | |
| 28 | 29 | return $time; |
| 29 | 30 | } |
@@ -40,9 +40,9 @@ discard block |
||
| 40 | 40 | { |
| 41 | 41 | if ($result->num_rows>0) { |
| 42 | 42 | return 1; |
| 43 | + } else { |
|
| 44 | + return 0; |
|
| 43 | 45 | } |
| 44 | - else |
|
| 45 | - return 0; |
|
| 46 | 46 | } |
| 47 | 47 | } |
| 48 | 48 | |
@@ -52,9 +52,9 @@ discard block |
||
| 52 | 52 | if ($result=$this->connect->query($query)) { |
| 53 | 53 | if ($result->num_rows>0) { |
| 54 | 54 | return 1; |
| 55 | + } else { |
|
| 56 | + return 0; |
|
| 55 | 57 | } |
| 56 | - else |
|
| 57 | - return 0; |
|
| 58 | 58 | |
| 59 | 59 | } |
| 60 | 60 | } |
@@ -14,12 +14,13 @@ |
||
| 14 | 14 | $connect = mysqli_connect(DB_HOST, DB_USER, DB_PASSWORD, DB_NAME); |
| 15 | 15 | $query = "SELECT * from profile where login_id = '$userId'"; |
| 16 | 16 | $result = $connect->query($query); |
| 17 | - if($result->num_rows > 0) // if true |
|
| 17 | + if($result->num_rows > 0) { |
|
| 18 | + // if true |
|
| 18 | 19 | { |
| 19 | 20 | $details = $result->fetch_assoc(); |
| 20 | - return $details; |
|
| 21 | 21 | } |
| 22 | - else |
|
| 22 | + return $details; |
|
| 23 | + } else |
|
| 23 | 24 | { |
| 24 | 25 | return NULL; |
| 25 | 26 | } |
@@ -6,6 +6,9 @@ |
||
| 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 | } |
@@ -30,17 +30,19 @@ |
||
| 30 | 30 | |
| 31 | 31 | public function userDetails($userId, $para) |
| 32 | 32 | { |
| 33 | - if($para == True) |
|
| 34 | - $this->query = "SELECT * from login where login_id = '$userId'"; |
|
| 35 | - else |
|
| 36 | - $this->query = "SELECT * from login where username = '$userId'"; |
|
| 33 | + if($para == True) { |
|
| 34 | + $this->query = "SELECT * from login where login_id = '$userId'"; |
|
| 35 | + } else { |
|
| 36 | + $this->query = "SELECT * from login where username = '$userId'"; |
|
| 37 | + } |
|
| 37 | 38 | $this->result = $this->connect->query($this->query); |
| 38 | - if($this->result->num_rows > 0) // if true |
|
| 39 | + if($this->result->num_rows > 0) { |
|
| 40 | + // if true |
|
| 39 | 41 | { |
| 40 | 42 | $this->details = $this->result->fetch_assoc(); |
| 41 | - return $this->details; |
|
| 42 | 43 | } |
| 43 | - else |
|
| 44 | + return $this->details; |
|
| 45 | + } else |
|
| 44 | 46 | { |
| 45 | 47 | return NULL; |
| 46 | 48 | } |
@@ -12,8 +12,7 @@ |
||
| 12 | 12 | header('Location: ../../index.php'); |
| 13 | 13 | } |
| 14 | 14 | |
| 15 | -} |
|
| 16 | -else |
|
| 15 | +} else |
|
| 17 | 16 | { |
| 18 | 17 | echo "Please Login"; |
| 19 | 18 | } |
@@ -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 | } |