@@ -3,10 +3,8 @@ |
||
| 3 | 3 | namespace ChatApp\Tests; |
| 4 | 4 | use PHPUnit_Framework_TestCase; |
| 5 | 5 | use ChatApp\Register; |
| 6 | -use ChatApp\Search; |
|
| 7 | 6 | use ChatApp\Reply; |
| 8 | 7 | use ChatApp\Session; |
| 9 | - |
|
| 10 | 8 | use Dotenv\Dotenv; |
| 11 | 9 | $dotenv = new Dotenv(dirname(__DIR__)); |
| 12 | 10 | $dotenv->load(); |
@@ -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 | } |