| @@ -16,14 +16,14 @@ | ||
| 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); | |
| 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 | 25 | else | 
| 26 | - $time = substr($time,4,11); | |
| 26 | + $time = substr($time, 4, 11); | |
| 27 | 27 | |
| 28 | 28 | return $time; | 
| 29 | 29 | } | 
| @@ -8,7 +8,7 @@ | ||
| 8 | 8 | |
| 9 | 9 | class Message extends Model | 
| 10 | 10 |  { | 
| 11 | - protected $table='message'; | |
| 11 | + protected $table = 'message'; | |
| 12 | 12 | |
| 13 | 13 | protected $fillable = ['identifier_message_number', 'message', 'sent_by', 'time']; | 
| 14 | 14 | } | 
| @@ -7,7 +7,7 @@ | ||
| 7 | 7 | use Ratchet\WebSocket\WsServer; | 
| 8 | 8 | use ChatApp\Chat; | 
| 9 | 9 | |
| 10 | -$server =IoServer::factory( | |
| 10 | +$server = IoServer::factory( | |
| 11 | 11 | new HttpServer( | 
| 12 | 12 | new WsServer( | 
| 13 | 13 | new Chat() | 
| @@ -8,12 +8,12 @@ | ||
| 8 | 8 | use ChatApp\Chat; | 
| 9 | 9 | |
| 10 | 10 | $server =IoServer::factory( | 
| 11 | - new HttpServer( | |
| 12 | - new WsServer( | |
| 13 | - new Chat() | |
| 14 | - ) | |
| 15 | - ) | |
| 16 | - , | |
| 17 | - 8080 | |
| 18 | - ); | |
| 11 | + new HttpServer( | |
| 12 | + new WsServer( | |
| 13 | + new Chat() | |
| 14 | + ) | |
| 15 | + ) | |
| 16 | + , | |
| 17 | + 8080 | |
| 18 | + ); | |
| 19 | 19 | $server->run(); | 
| @@ -6,15 +6,15 @@ | ||
| 6 | 6 | class Session | 
| 7 | 7 |  { | 
| 8 | 8 | |
| 9 | -    public static function put($key, $value){ | |
| 9 | +    public static function put($key, $value) { | |
| 10 | 10 | $_SESSION[$key] = $value; | 
| 11 | 11 | } | 
| 12 | 12 | |
| 13 | -    public static function get($key){ | |
| 13 | +    public static function get($key) { | |
| 14 | 14 | return (isset($_SESSION[$key]) ? $_SESSION[$key] : null); | 
| 15 | 15 | } | 
| 16 | 16 | |
| 17 | -    public static function forget($key){ | |
| 17 | +    public static function forget($key) { | |
| 18 | 18 | unset($_SESSION[$key]); | 
| 19 | 19 | } | 
| 20 | 20 | } | 
| @@ -76,8 +76,8 @@ | ||
| 76 | 76 | } | 
| 77 | 77 | |
| 78 | 78 | /** | 
| 79 | - * @dataProvider ClassNameProvider | |
| 80 | - */ | |
| 79 | + * @dataProvider ClassNameProvider | |
| 80 | + */ | |
| 81 | 81 | public function testClassExists($className) | 
| 82 | 82 |      { | 
| 83 | 83 | $this->assertTrue(class_exists($className)); | 
| @@ -1,13 +1,13 @@ | ||
| 1 | 1 | <?php | 
| 2 | 2 | |
| 3 | -require_once (__DIR__ . '/vendor/autoload.php'); | |
| 3 | +require_once (__DIR__.'/vendor/autoload.php'); | |
| 4 | 4 | use ChatApp\Session; | 
| 5 | 5 | use Dotenv\Dotenv; | 
| 6 | 6 | $dotenv = new Dotenv(__DIR__); | 
| 7 | 7 | $dotenv->load(); | 
| 8 | 8 | |
| 9 | 9 | |
| 10 | -if(Session::get('start') != null) | |
| 10 | +if (Session::get('start') != null) | |
| 11 | 11 |  { | 
| 12 | 12 |      header("Location:".getenv('APP_URL')."/account.php"); | 
| 13 | 13 | } | 
| @@ -1,7 +1,7 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | 2 | |
| 3 | 3 | namespace ChatApp; | 
| 4 | -require_once (dirname(__DIR__) . '/vendor/autoload.php'); | |
| 4 | +require_once (dirname(__DIR__).'/vendor/autoload.php'); | |
| 5 | 5 | use ChatApp\Session; | 
| 6 | 6 | use ChatApp\Time; | 
| 7 | 7 | use ChatApp\User; | 
| @@ -40,7 +40,7 @@ discard block | ||
| 40 | 40 |      { | 
| 41 | 41 | |
| 42 | 42 | $flag = 1; | 
| 43 | -        if(Session::get('start') != null && isset($msg)) | |
| 43 | +        if (Session::get('start') != null && isset($msg)) | |
| 44 | 44 |          { | 
| 45 | 45 | $add_load = 0; | 
| 46 | 46 |              $userId = Session::get('start'); | 
| @@ -50,25 +50,25 @@ discard block | ||
| 50 | 50 | |
| 51 | 51 | $fetch = $this->obUser->userDetails($username, $para); | 
| 52 | 52 | |
| 53 | - if($fetch != NULL) | |
| 53 | + if ($fetch != NULL) | |
| 54 | 54 |              { | 
| 55 | 55 | $login_id = (int)$fetch['login_id']; | 
| 56 | 56 | |
| 57 | 57 | // Unique Identifier | 
| 58 | - if($login_id > $userId) | |
| 58 | + if ($login_id > $userId) | |
| 59 | 59 | $identifier = $userId.':'.$login_id; | 
| 60 | 60 | else | 
| 61 | 61 | $identifier = $login_id.':'.$userId; | 
| 62 | 62 | |
| 63 | 63 | $query = "SELECT total_messages from total_message where identifier = '$identifier'"; | 
| 64 | - if($result = $this->connect->query($query)) | |
| 64 | + if ($result = $this->connect->query($query)) | |
| 65 | 65 |                  { | 
| 66 | - if($result->num_rows > 0) | |
| 66 | + if ($result->num_rows > 0) | |
| 67 | 67 |                      { | 
| 68 | 68 | $total = $result->fetch_assoc(); | 
| 69 | 69 | $total = $total['total_messages']; | 
| 70 | - if($total - $load > 0) | |
| 71 | - if($total - $load > 10) | |
| 70 | + if ($total - $load > 0) | |
| 71 | + if ($total - $load > 10) | |
| 72 | 72 | $add_load = $load + 10; | 
| 73 | 73 | else | 
| 74 | 74 | $add_load = $total; | 
| @@ -76,14 +76,14 @@ discard block | ||
| 76 | 76 | } | 
| 77 | 77 | |
| 78 | 78 | $query = "SELECT message, time, sent_by FROM messages WHERE identifier_message_number = '$identifier' ORDER BY id DESC limit ".$load; | 
| 79 | - if($result = $this->connect->query($query)) | |
| 79 | + if ($result = $this->connect->query($query)) | |
| 80 | 80 |                  { | 
| 81 | - if($result->num_rows > 0) | |
| 81 | + if ($result->num_rows > 0) | |
| 82 | 82 |                      { | 
| 83 | - while($row = $result->fetch_assoc()) | |
| 83 | + while ($row = $result->fetch_assoc()) | |
| 84 | 84 |                          { | 
| 85 | 85 | $row['time'] = $this->obTime->timeConversion($row['time']); | 
| 86 | - $row = array_merge($row,['start' => $userId]); | |
| 86 | + $row = array_merge($row, ['start' => $userId]); | |
| 87 | 87 | $this->array = array_merge($this->array, [$row]); | 
| 88 | 88 | } | 
| 89 | 89 | |
| @@ -1,7 +1,7 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | 2 | |
| 3 | 3 | namespace ChatApp; | 
| 4 | -require_once (dirname(__DIR__) . '/vendor/autoload.php'); | |
| 4 | +require_once (dirname(__DIR__).'/vendor/autoload.php'); | |
| 5 | 5 | use ChatApp\Session; | 
| 6 | 6 | use Dotenv\Dotenv; | 
| 7 | 7 | $dotenv = new Dotenv(dirname(__DIR__)); | 
| @@ -34,18 +34,18 @@ discard block | ||
| 34 | 34 | public function selectUser($msg) | 
| 35 | 35 |      { | 
| 36 | 36 | $msg = $msg->value; | 
| 37 | -        if(Session::get('start') != null && isset($msg)) | |
| 37 | +        if (Session::get('start') != null && isset($msg)) | |
| 38 | 38 |          { | 
| 39 | 39 |              $userId = Session::get('start'); | 
| 40 | 40 | $suggestion = trim($msg); | 
| 41 | - if($suggestion != "" ) | |
| 41 | + if ($suggestion != "") | |
| 42 | 42 |              { | 
| 43 | 43 | $query = "SELECT * FROM login where login_id != '$userId' and name like '$suggestion%' ORDER BY name DESC"; | 
| 44 | - if($result = $this->connect->query($query)) | |
| 44 | + if ($result = $this->connect->query($query)) | |
| 45 | 45 |                  { | 
| 46 | - if($result->num_rows > 0) | |
| 46 | + if ($result->num_rows > 0) | |
| 47 | 47 |                      { | 
| 48 | - while($row = $result->fetch_assoc()) | |
| 48 | + while ($row = $result->fetch_assoc()) | |
| 49 | 49 |                          { | 
| 50 | 50 | $this->array = array_merge($this->array, [$row]); | 
| 51 | 51 | } | 
| @@ -11,40 +11,40 @@ | ||
| 11 | 11 | */ | 
| 12 | 12 | class Validate | 
| 13 | 13 |  { | 
| 14 | - protected $connect; | |
| 14 | + protected $connect; | |
| 15 | 15 | |
| 16 | - public function __construct() | |
| 17 | -	{ | |
| 18 | - $this->connect = mysqli_connect( | |
| 16 | + public function __construct() | |
| 17 | +    { | |
| 18 | + $this->connect = mysqli_connect( | |
| 19 | 19 |              getenv('DB_HOST'), | 
| 20 | 20 |              getenv('DB_USER'), | 
| 21 | 21 |              getenv('DB_PASSWORD'), | 
| 22 | 22 |              getenv('DB_NAME') | 
| 23 | 23 | ); | 
| 24 | - } | |
| 24 | + } | |
| 25 | 25 | |
| 26 | - public function validateEmailInDb($email) | |
| 27 | -	{ | |
| 28 | - $query = "SELECT login_id FROM login WHERE email = '$email'"; | |
| 29 | - if ($result = $this->connect->query($query)) | |
| 30 | -		{ | |
| 31 | -			if ($result->num_rows > 0) { | |
| 32 | - return 1; | |
| 33 | - } | |
| 34 | - else | |
| 35 | - return 0; | |
| 36 | - } | |
| 37 | - } | |
| 26 | + public function validateEmailInDb($email) | |
| 27 | +    { | |
| 28 | + $query = "SELECT login_id FROM login WHERE email = '$email'"; | |
| 29 | + if ($result = $this->connect->query($query)) | |
| 30 | +        { | |
| 31 | +            if ($result->num_rows > 0) { | |
| 32 | + return 1; | |
| 33 | + } | |
| 34 | + else | |
| 35 | + return 0; | |
| 36 | + } | |
| 37 | + } | |
| 38 | 38 | |
| 39 | - function validateUsernameInDb($username) | |
| 40 | -	{ | |
| 41 | - $query = "SELECT login_id FROM login WHERE username = '$username'"; | |
| 42 | -		if ($result = $this->connect->query($query)) { | |
| 43 | -			if ($result->num_rows > 0) { | |
| 44 | - return 1; | |
| 45 | - } | |
| 46 | - else | |
| 47 | - return 0; | |
| 48 | - } | |
| 49 | - } | |
| 39 | + function validateUsernameInDb($username) | |
| 40 | +    { | |
| 41 | + $query = "SELECT login_id FROM login WHERE username = '$username'"; | |
| 42 | +        if ($result = $this->connect->query($query)) { | |
| 43 | +            if ($result->num_rows > 0) { | |
| 44 | + return 1; | |
| 45 | + } | |
| 46 | + else | |
| 47 | + return 0; | |
| 48 | + } | |
| 49 | + } | |
| 50 | 50 | } | 
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | <?php | 
| 2 | 2 | namespace ChatApp; | 
| 3 | -require_once (dirname(__DIR__) . '/vendor/autoload.php'); | |
| 3 | +require_once (dirname(__DIR__).'/vendor/autoload.php'); | |
| 4 | 4 | use Dotenv\Dotenv; | 
| 5 | 5 | $dotenv = new Dotenv(dirname(__DIR__)); | 
| 6 | 6 | $dotenv->load(); |