| @@ -40,18 +40,15 @@ | ||
| 40 | 40 | } | 
| 41 | 41 | $this->array = array_merge([], ["Compose" => $this->array]); | 
| 42 | 42 | return json_encode($this->array); | 
| 43 | - } | |
| 44 | - else | |
| 43 | + } else | |
| 45 | 44 |                      { | 
| 46 | 45 | return json_encode(["Compose" => "Not Found"]); | 
| 47 | 46 | } | 
| 48 | - } | |
| 49 | - else | |
| 47 | + } else | |
| 50 | 48 |                  { | 
| 51 | 49 | return json_encode(["Compose" => "Query Failed"]); | 
| 52 | 50 | } | 
| 53 | - } | |
| 54 | - else | |
| 51 | + } else | |
| 55 | 52 |              { | 
| 56 | 53 | return json_encode(["Compose" => "Not Found"]); | 
| 57 | 54 | } | 
| @@ -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 | } | 
| @@ -52,28 +52,23 @@ discard block | ||
| 52 | 52 | |
| 53 | 53 | $initial->conversation[0]->login_status = $this->online; | 
| 54 | 54 | $from->send(json_encode($initial)); | 
| 55 | - } | |
| 56 | - elseif ($msg == 'Load Sidebar') | |
| 55 | + } elseif ($msg == 'Load Sidebar') | |
| 57 | 56 |          { | 
| 58 | 57 | @$initial->initial = json_decode($this->onSidebar($from->userId)); | 
| 59 | 58 | $from->send(json_encode($initial)); | 
| 60 | - } | |
| 61 | - elseif (@json_decode($msg)->newConversation == 'Initiated') | |
| 59 | + } elseif (@json_decode($msg)->newConversation == 'Initiated') | |
| 62 | 60 |          { | 
| 63 | 61 | @$result->conversation = json_decode($this->onConversation($msg, False, $sessionId)); | 
| 64 | 62 | $from->send(json_encode($result)); | 
| 65 | - } | |
| 66 | - elseif (@json_decode($msg)->search == 'search') | |
| 63 | + } elseif (@json_decode($msg)->search == 'search') | |
| 67 | 64 |          { | 
| 68 | 65 | $searchResult = $this->onSearch($msg, $sessionId); | 
| 69 | 66 | $from->send($searchResult); | 
| 70 | - } | |
| 71 | - elseif (@json_decode($msg)->Compose == 'Compose') | |
| 67 | + } elseif (@json_decode($msg)->Compose == 'Compose') | |
| 72 | 68 |          { | 
| 73 | 69 | $composeResult = $this->onCompose($msg, $sessionId); | 
| 74 | 70 | $from->send($composeResult); | 
| 75 | - } | |
| 76 | - else | |
| 71 | + } else | |
| 77 | 72 |          { | 
| 78 | 73 | $this->onReply($msg, $sessionId); | 
| 79 | 74 | |
| @@ -97,8 +92,7 @@ discard block | ||
| 97 | 92 | |
| 98 | 93 | $client->send(json_encode($result)); | 
| 99 | 94 | $this->online = 1; | 
| 100 | - } | |
| 101 | - elseif($client == $from) | |
| 95 | + } elseif($client == $from) | |
| 102 | 96 |                  { | 
| 103 | 97 | @$result->sidebar = json_decode($this->onSidebar($client->userId)); | 
| 104 | 98 | |
| @@ -61,16 +61,14 @@ | ||
| 61 | 61 |                  { | 
| 62 | 62 | $this->array = array_merge([], ["Search" => $this->array]); | 
| 63 | 63 | return json_encode($this->array); | 
| 64 | +                } else { | |
| 65 | + return json_encode(["Search" => "Not Found"]); | |
| 64 | 66 | } | 
| 65 | - else | |
| 66 | - return json_encode(["Search" => "Not Found"]); | |
| 67 | - } | |
| 68 | - else | |
| 67 | + } else | |
| 69 | 68 |              { | 
| 70 | 69 | return json_encode(["Search" => "Not Found"]); | 
| 71 | 70 | } | 
| 72 | - } | |
| 73 | - else | |
| 71 | + } else | |
| 74 | 72 |          { | 
| 75 | 73 | return json_encode(["Search" => "Not Found"]); | 
| 76 | 74 | } | 
| @@ -38,27 +38,22 @@ | ||
| 38 | 38 | if($substring != $userId) | 
| 39 | 39 |                          { | 
| 40 | 40 | $this->Data($substring, $row); | 
| 41 | - } | |
| 42 | - | |
| 43 | - else | |
| 41 | + } else | |
| 44 | 42 |                          { | 
| 45 | 43 | $substring = substr($identifier, $length+1); | 
| 46 | 44 | $this->Data($substring, $row); | 
| 47 | 45 | } | 
| 48 | 46 | } | 
| 49 | 47 | return json_encode($this->array); | 
| 50 | - } | |
| 51 | - else | |
| 48 | + } else | |
| 52 | 49 |                  { | 
| 53 | 50 | return json_encode(null); | 
| 54 | 51 | } | 
| 55 | - } | |
| 56 | - else | |
| 52 | + } else | |
| 57 | 53 |              { | 
| 58 | 54 | echo "Query Failed"; | 
| 59 | 55 | } | 
| 60 | - } | |
| 61 | - else | |
| 56 | + } else | |
| 62 | 57 |          { | 
| 63 | 58 |              header('Location:../login.php'); | 
| 64 | 59 | } | 
| @@ -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 | } | 
| @@ -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 | } | 
| @@ -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 | } | 
| @@ -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(); | 
| @@ -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)); |