Completed
Push — master ( 9edb5e...d40969 )
by Ankit
03:51
created
src/Reply.php 2 patches
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -90,6 +90,11 @@
 block discarded – undo
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))
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
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__));
@@ -27,35 +27,35 @@  discard block
 block discarded – undo
27 27
 
28 28
     public function replyTo($msg)
29 29
     {
30
-        if(!empty($msg))  //checks for the value send
30
+        if (!empty($msg))  //checks for the value send
31 31
         {
32 32
             $userId = $msg->userId;
33 33
             $identifier = $msg->name;
34
-            $receiverID = $identifier;  //stores id of the person whom message is to be sent
34
+            $receiverID = $identifier; //stores id of the person whom message is to be sent
35 35
 
36
-            if($identifier > $userId)    // geneate specific unique code to store messages
37
-                $identifier = $userId . ":" . $identifier;
36
+            if ($identifier > $userId)    // geneate specific unique code to store messages
37
+                $identifier = $userId.":".$identifier;
38 38
             else
39
-                $identifier = $identifier . ":" . $userId;
39
+                $identifier = $identifier.":".$userId;
40 40
 
41 41
             $reply = addslashes(trim($msg->reply[0])); // stores the message sent by the user.
42 42
 
43
-            $time = date("D d M Y H:i:s", time() + 16200);  // current time
43
+            $time = date("D d M Y H:i:s", time() + 16200); // current time
44 44
             $time_id = date("YmdHis", time() + 16200); //to sort the array on the basis of time
45 45
 
46 46
             //the sender id must not be equal to current session id
47
-            if($reply != "" && $receiverID != $userId)
47
+            if ($reply != "" && $receiverID != $userId)
48 48
             {
49 49
                 // check whether the receiver is authorized or registered
50 50
                 $query = "SELECT * from login where login_id = '$receiverID'";
51 51
 
52 52
                 $result = $this->connect->query($query);
53
-                if($result->num_rows > 0)     // if true
53
+                if ($result->num_rows > 0)     // if true
54 54
                 {
55 55
                     //check whether he is sending message for thr first time or he has sent messages before
56 56
                     $query = "SELECT * from total_message where identifier = '$identifier'";
57 57
                     $result = $this->connect->query($query);
58
-                    if($result->num_rows>0)               // if he has sent messages before
58
+                    if ($result->num_rows > 0)               // if he has sent messages before
59 59
                     {
60 60
                         // Update Total_Message Table
61 61
                         $query = "UPDATE total_message SET total_messages = total_messages+1, time = '$time', unread = 1, id = '$time_id' WHERE identifier = '$identifier'";
@@ -65,15 +65,15 @@  discard block
 block discarded – undo
65 65
                     else    // if he sends message for the first time
66 66
                     {
67 67
                         $length = strlen($userId);
68
-                        if(substr($identifier, 0, $length) == $userId) // generate specific unique code
68
+                        if (substr($identifier, 0, $length) == $userId) // generate specific unique code
69 69
                         {
70
-                            $user2 = substr($identifier, $length+1);
70
+                            $user2 = substr($identifier, $length + 1);
71 71
                             $user1 = $userId;
72 72
                         }
73 73
                         else
74 74
                         {
75 75
                             $user2 = $userId;
76
-                            $length = strlen($identifier) - $length-1;
76
+                            $length = strlen($identifier) - $length - 1;
77 77
                             $user1 = substr($identifier, 0, $length);
78 78
                         }
79 79
                         // insert Details in Total_Message Table
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
                         return $this->updateMessages($query, $identifier, $reply, $userId, $time);
82 82
                     }
83 83
                 }
84
-                return "Invalid Authentication";  // if he is unauthorized echo message is failed
84
+                return "Invalid Authentication"; // if he is unauthorized echo message is failed
85 85
             }
86 86
         }
87 87
         return "Failed";
@@ -89,13 +89,13 @@  discard block
 block discarded – undo
89 89
 
90 90
     public function updateMessages($query, $identifier, $reply, $userId, $time)
91 91
     {
92
-        if($result = $this->connect->query($query))
92
+        if ($result = $this->connect->query($query))
93 93
         {
94 94
             //insert message in db
95 95
             $query = "INSERT into messages values('$identifier', '$reply', '$userId', '$time', null)";
96
-            if($this->connect->query($query))
96
+            if ($this->connect->query($query))
97 97
             {
98
-                return "Messages is sent";    // if query is executed return true
98
+                return "Messages is sent"; // if query is executed return true
99 99
             }
100 100
             return "Message is failed";
101 101
         }
Please login to merge, or discard this patch.
src/Time.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -16,14 +16,14 @@
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
cmd.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
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()
Please login to merge, or discard this patch.
src/Session.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -6,15 +6,15 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -6,6 +6,9 @@
 block discarded – undo
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
     }
Please login to merge, or discard this patch.
index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
src/Conversation.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
src/Validate.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
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();
Please login to merge, or discard this patch.
src/Receiver.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
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\User;
6 6
 use ChatApp\Session;
7 7
 use ChatApp\Conversation;
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
         $name = $this->messages['name'];
37 37
         $this->messages = json_decode($this->conversation->conversationLoad($msg, True));
38 38
         $id = json_decode($msg)->username;
39
-        for ($i=1 ; $i < count($this->messages); $i++) {
39
+        for ($i = 1; $i < count($this->messages); $i++) {
40 40
             $this->messages[$i]->start = $id;
41 41
         }
42 42
         $this->messages[0]->username = $username;
Please login to merge, or discard this patch.
src/Profile.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
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 Dotenv\Dotenv;
6 6
 $dotenv = new Dotenv(dirname(__DIR__));
7 7
 $dotenv->load();
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
         );
24 24
         $query = "SELECT * from profile where login_id = '$userId'";
25 25
         $result = $connect->query($query);
26
-        if($result->num_rows > 0)                   // if true
26
+        if ($result->num_rows > 0)                   // if true
27 27
         {
28 28
             $details = $result->fetch_assoc();
29 29
             return $details;
Please login to merge, or discard this patch.