@@ -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)) |
@@ -27,16 +27,20 @@ discard block |
||
27 | 27 | |
28 | 28 | public function replyTo($msg) |
29 | 29 | { |
30 | - if(!empty($msg)) //checks for the value send |
|
30 | + if(!empty($msg)) { |
|
31 | + //checks for the value send |
|
31 | 32 | { |
32 | 33 | $userId = $msg->userId; |
34 | + } |
|
33 | 35 | $identifier = $msg->name; |
34 | 36 | $receiverID = $identifier; //stores id of the person whom message is to be sent |
35 | 37 | |
36 | - if($identifier > $userId) // geneate specific unique code to store messages |
|
38 | + if($identifier > $userId) { |
|
39 | + // geneate specific unique code to store messages |
|
37 | 40 | $identifier = $userId . ":" . $identifier; |
38 | - else |
|
39 | - $identifier = $identifier . ":" . $userId; |
|
41 | + } else { |
|
42 | + $identifier = $identifier . ":" . $userId; |
|
43 | + } |
|
40 | 44 | |
41 | 45 | $reply = addslashes(trim($msg->reply[0])); // stores the message sent by the user. |
42 | 46 | |
@@ -50,27 +54,31 @@ discard block |
||
50 | 54 | $query = "SELECT * from login where login_id = '$receiverID'"; |
51 | 55 | |
52 | 56 | $result = $this->connect->query($query); |
53 | - if($result->num_rows > 0) // if true |
|
57 | + if($result->num_rows > 0) { |
|
58 | + // if true |
|
54 | 59 | { |
55 | 60 | //check whether he is sending message for thr first time or he has sent messages before |
56 | 61 | $query = "SELECT * from total_message where identifier = '$identifier'"; |
62 | + } |
|
57 | 63 | $result = $this->connect->query($query); |
58 | - if($result->num_rows>0) // if he has sent messages before |
|
64 | + if($result->num_rows>0) { |
|
65 | + // if he has sent messages before |
|
59 | 66 | { |
60 | 67 | // Update Total_Message Table |
61 | 68 | $query = "UPDATE total_message SET total_messages = total_messages+1, time = '$time', unread = 1, id = '$time_id' WHERE identifier = '$identifier'"; |
69 | + } |
|
62 | 70 | return $this->updateMessages($query, $identifier, $reply, $userId, $time); |
63 | 71 | |
64 | - } |
|
65 | - else // if he sends message for the first time |
|
72 | + } else // if he sends message for the first time |
|
66 | 73 | { |
67 | 74 | $length = strlen($userId); |
68 | - if(substr($identifier, 0, $length) == $userId) // generate specific unique code |
|
75 | + if(substr($identifier, 0, $length) == $userId) { |
|
76 | + // generate specific unique code |
|
69 | 77 | { |
70 | 78 | $user2 = substr($identifier, $length+1); |
71 | - $user1 = $userId; |
|
72 | 79 | } |
73 | - else |
|
80 | + $user1 = $userId; |
|
81 | + } else |
|
74 | 82 | { |
75 | 83 | $user2 = $userId; |
76 | 84 | $length = strlen($identifier) - $length-1; |
@@ -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 | } |