Completed
Push — master ( ecf2d0...135f37 )
by Ankit
03:04
created
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/Search.php 1 patch
Spacing   +9 added lines, -9 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\Time;
6 6
 use ChatApp\Session;
7 7
 use Dotenv\Dotenv;
@@ -38,23 +38,23 @@  discard block
 block discarded – undo
38 38
         $suggestion = $suggestion->value;
39 39
         $flag = 0;
40 40
         $userId = Session::get('start');
41
-        if($userId != null && isset($suggestion))
41
+        if ($userId != null && isset($suggestion))
42 42
         {
43 43
             $suggestion = trim($suggestion);
44
-            if($suggestion != "")
44
+            if ($suggestion != "")
45 45
             {
46 46
                 $query = "SELECT * FROM login where login_id != '$userId' and name like '$suggestion%' ORDER BY name ASC";
47
-                if($result = $this->connect->query($query))
47
+                if ($result = $this->connect->query($query))
48 48
                 {
49
-                    if($result->num_rows > 0)
49
+                    if ($result->num_rows > 0)
50 50
                     {
51
-                        while($row = $result->fetch_assoc())
51
+                        while ($row = $result->fetch_assoc())
52 52
                         {
53 53
                             $check_id = $row["login_id"];
54 54
                             $query = "SELECT * from total_message where (user1 = '$check_id' and user2 = '$userId') or (user2 = '$check_id' and user1 = '$userId')";
55
-                            if($result1 = $this->connect->query($query))
55
+                            if ($result1 = $this->connect->query($query))
56 56
                             {
57
-                                if($result1->num_rows > 0)
57
+                                if ($result1->num_rows > 0)
58 58
                                 {
59 59
                                     $fetch = $result1->fetch_assoc();
60 60
                                     $fetch['time'] = $this->obTime->timeConversion($fetch['time']);
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
                         }
67 67
                     }
68 68
                 }
69
-                if($flag != 0)
69
+                if ($flag != 0)
70 70
                 {
71 71
                     $this->array = array_merge([], ["Search" => $this->array]);
72 72
                     return json_encode($this->array);
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.
src/Register.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 
3 3
 namespace ChatApp;
4 4
 
5
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
5
+require_once (dirname(__DIR__).'/vendor/autoload.php');
6 6
 use ChatApp\Validate;
7 7
 use ChatApp\Session;
8 8
 use Dotenv\Dotenv;
@@ -44,45 +44,45 @@  discard block
 block discarded – undo
44 44
 			$this->onError(["name" => " *Enter the name"]);
45 45
 		}
46 46
 
47
-		if(empty($email)) {
47
+		if (empty($email)) {
48 48
 			$this->onError(["email" => " *Enter the email address"]);
49 49
 		}
50
-		elseif(filter_var($email, FILTER_VALIDATE_EMAIL) == false) {
50
+		elseif (filter_var($email, FILTER_VALIDATE_EMAIL) == false) {
51 51
 			$this->onError(["email" => " *Enter correct Email address"]);
52 52
 		}
53 53
 		else
54 54
 		{
55
-			if($this->obValidate->validateEmailInDb($email) === 1)
55
+			if ($this->obValidate->validateEmailInDb($email) === 1)
56 56
 			{
57 57
 
58 58
 				$this->onError(["email" => " *Email is already registered"]);
59 59
 			}
60 60
 		}
61 61
 
62
-		if(empty($username)) {
62
+		if (empty($username)) {
63 63
 			$this->onError(["username" => " *Enter the username"]);
64 64
 		}
65 65
 		else
66 66
 		{
67
-			if($this->obValidate->validateUsernameInDb($username) === 1)
67
+			if ($this->obValidate->validateUsernameInDb($username) === 1)
68 68
 			{
69 69
 
70 70
 				$this->onError(["username" => " *Username is already registered"]);
71 71
 			}
72 72
 		}
73 73
 
74
-		if(empty($password)) {
74
+		if (empty($password)) {
75 75
 			$this->onError(["password" => " *Enter the password"]);
76 76
 		}
77 77
 
78
-		if(empty($mob)) {
78
+		if (empty($mob)) {
79 79
 			$this->onError(["mob" => " *Enter the Mobile Number"]);
80 80
 		}
81 81
 		elseif (!preg_match("/^[0-9]{10}$/", $mob)) {
82 82
 			$this->onError(["mob" => " *Enter correct Mobile Number"]);
83 83
 		}
84 84
 
85
-		if($this->key == 1)
85
+		if ($this->key == 1)
86 86
 		{
87 87
 			return json_encode($this->error);
88 88
 		}
@@ -91,26 +91,26 @@  discard block
 block discarded – undo
91 91
 			$this->key = 0;
92 92
 			$pass = md5($password);
93 93
 			$query = "INSERT INTO register VALUES(null, '$email', '$username', '$pass')";
94
-			if(!$this->connect->query($query)) {
94
+			if (!$this->connect->query($query)) {
95 95
 				$this->key = 1;
96 96
 				echo "You are not registered || Error in registration1";
97 97
 			}
98 98
 			else
99 99
 			{
100 100
 				$query = "SELECT id FROM register WHERE email = '$email'";
101
-				if($result = $this->connect->query($query)) {
101
+				if ($result = $this->connect->query($query)) {
102 102
 					$row = $result->fetch_assoc();
103 103
 					$userId = $row['id'];
104 104
 
105 105
 					$query = "INSERT INTO login VALUES('$userId', '$name', '$email', '$username', '$mob', 0)";
106
-					if(!$this->connect->query($query)) {
106
+					if (!$this->connect->query($query)) {
107 107
 						$this->key = 1;
108 108
 						echo "You are not registered || Error in registration2";
109 109
 					}
110 110
 					else
111 111
 					{
112 112
 						$query = "INSERT INTO profile VALUES('$userId', 'Joined OpenChat', 'Joined OpenChat', '')";
113
-						if(!$this->connect->query($query)) {
113
+						if (!$this->connect->query($query)) {
114 114
 							$this->key = 1;
115 115
 							echo "You are not registered || Error in registration3";
116 116
 						}
Please login to merge, or discard this patch.
src/User.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 
3 3
 
4 4
 namespace ChatApp;
5
-require_once (dirname(__DIR__) . '/vendor/autoload.php');
5
+require_once (dirname(__DIR__).'/vendor/autoload.php');
6 6
 use Dotenv\Dotenv;
7 7
 $dotenv = new Dotenv(dirname(__DIR__));
8 8
 $dotenv->load();
@@ -30,12 +30,12 @@  discard block
 block discarded – undo
30 30
 
31 31
     public function userDetails($userId, $para)
32 32
     {
33
-        if($para == True)
33
+        if ($para == True)
34 34
             $this->query = "SELECT * from login where login_id = '$userId'";
35 35
         else
36 36
             $this->query = "SELECT * from login where username = '$userId'";
37 37
         $this->result = $this->connect->query($this->query);
38
-        if($this->result->num_rows > 0)                   // if true
38
+        if ($this->result->num_rows > 0)                   // if true
39 39
         {
40 40
             $this->details = $this->result->fetch_assoc();
41 41
             return $this->details;
Please login to merge, or discard this patch.
src/Online.php 1 patch
Spacing   +3 added lines, -3 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();
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
             getenv('DB_NAME')
23 23
         );
24 24
         $query = "Update login set login_status = 1 where login_id = '$userId'";
25
-        if(!$connect->query($query));
25
+        if (!$connect->query($query));
26 26
             echo $connect->error;
27 27
         $connect->close();
28 28
     }
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
             getenv('DB_NAME')
37 37
         );
38 38
         $query = "Update login set login_status = 0 where login_id = '$userId'";
39
-        if(!$connect->query($query));
39
+        if (!$connect->query($query));
40 40
             echo $connect->error;
41 41
         $connect->close();
42 42
     }
Please login to merge, or discard this patch.
src/Reply.php 1 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__));
@@ -31,37 +31,37 @@  discard block
 block discarded – undo
31 31
     public function replyTo($msg)
32 32
     {
33 33
 
34
-        if(Session::get('start') != null && isset($msg))  //checks for session login and the value send
34
+        if (Session::get('start') != null && isset($msg))  //checks for session login and the value send
35 35
         {
36 36
             $userId = Session::get('start');
37
-            $msg = json_decode($msg);   //decode json value
37
+            $msg = json_decode($msg); //decode json value
38 38
             $identifier = $msg->name;
39 39
 
40
-            $receiverID = $identifier;  //stores id of the person whom message is to be sent
40
+            $receiverID = $identifier; //stores id of the person whom message is to be sent
41 41
 
42
-            if($identifier > $userId)    // geneate specific unique code to store messages
43
-                $identifier = $userId . ":" . $identifier;
42
+            if ($identifier > $userId)    // geneate specific unique code to store messages
43
+                $identifier = $userId.":".$identifier;
44 44
             else
45
-                $identifier = $identifier . ":" . $userId;
45
+                $identifier = $identifier.":".$userId;
46 46
 
47 47
             $reply = addslashes(trim($msg->reply[0])); // stores the message sent by the user.
48 48
 
49
-            $time = date("D d M Y H:i:s", time() + 16200);  // current time
49
+            $time = date("D d M Y H:i:s", time() + 16200); // current time
50 50
             $time_id = date("YmdHis", time() + 16200); //to sort the array on the basis of time
51 51
 
52 52
             //the sender id must not be equal to current session id
53
-            if($reply != "" && $receiverID != $userId)
53
+            if ($reply != "" && $receiverID != $userId)
54 54
             {
55 55
                 // check whether the receiver is authorized or registered
56 56
                 $query = "SELECT * from login where login_id = '$receiverID'";
57 57
 
58 58
                 $result = $this->connect->query($query);
59
-                if($result->num_rows > 0)     // if true
59
+                if ($result->num_rows > 0)     // if true
60 60
                 {
61 61
                     //check whether he is sending message for thr first time or he has sent messages before
62 62
                     $query = "SELECT * from total_message where identifier = '$identifier'";
63 63
                     $result = $this->connect->query($query);
64
-                    if($result->num_rows>0)               // if he has sent messages before
64
+                    if ($result->num_rows > 0)               // if he has sent messages before
65 65
                     {
66 66
                         // Update Total_Message Table
67 67
                         $query = "UPDATE total_message SET total_messages = total_messages+1, time = '$time', unread = 1, id = '$time_id' WHERE identifier = '$identifier'";
@@ -71,15 +71,15 @@  discard block
 block discarded – undo
71 71
                     else    // if he sends message for the first time
72 72
                     {
73 73
                         $length = strlen($userId);
74
-                        if(substr($identifier, 0, $length) == $userId) // generate specific unique code
74
+                        if (substr($identifier, 0, $length) == $userId) // generate specific unique code
75 75
                         {
76
-                            $user2 = substr($identifier, $length+1);
76
+                            $user2 = substr($identifier, $length + 1);
77 77
                             $user1 = $userId;
78 78
                         }
79 79
                         else
80 80
                         {
81 81
                             $user2 = $userId;
82
-                            $length = strlen($identifier) - $length-1;
82
+                            $length = strlen($identifier) - $length - 1;
83 83
                             $user1 = substr($identifier, 0, $length);
84 84
                         }
85 85
                         // insert Details in Total_Message Table
@@ -102,13 +102,13 @@  discard block
 block discarded – undo
102 102
 
103 103
     public function updateMessages($query, $identifier, $reply, $userId, $time)
104 104
     {
105
-        if($result = $this->connect->query($query))
105
+        if ($result = $this->connect->query($query))
106 106
         {
107 107
             //insert message in db
108 108
             $query = "INSERT into messages values('$identifier', '$reply', '$userId', '$time', null)";
109
-            if($result = $this->connect->query($query))
109
+            if ($result = $this->connect->query($query))
110 110
             {
111
-                echo "Messages is sent \n";    // if query is executed return true
111
+                echo "Messages is sent \n"; // if query is executed return true
112 112
             }
113 113
             else
114 114
             {
Please login to merge, or discard this patch.
src/SideBar.php 1 patch
Spacing   +8 added lines, -8 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\Time;
6 6
 use Dotenv\Dotenv;
7 7
 $dotenv = new Dotenv(dirname(__DIR__));
@@ -32,26 +32,26 @@  discard block
 block discarded – undo
32 32
 
33 33
     public function loadSideBar($userId)
34 34
     {
35
-        if(isset($userId))
35
+        if (isset($userId))
36 36
         {
37 37
             $query = "SELECT * FROM total_message WHERE user1='$userId' or user2='$userId'  ORDER BY id DESC";
38
-            if($result = $this->connect->query($query))
38
+            if ($result = $this->connect->query($query))
39 39
             {
40 40
                 if ($result->num_rows > 0)
41 41
                 {
42 42
                     $length = strlen($userId);
43
-                    while($row = $result->fetch_assoc())
43
+                    while ($row = $result->fetch_assoc())
44 44
                     {
45 45
                         $identifier = $row['identifier'];
46 46
                         $substring = substr($identifier, 0, $length);
47
-                        if($substring != $userId)
47
+                        if ($substring != $userId)
48 48
                         {
49 49
                             $this->data($substring, $row);
50 50
                         }
51 51
 
52 52
                         else
53 53
                         {
54
-                            $substring = substr($identifier, $length+1);
54
+                            $substring = substr($identifier, $length + 1);
55 55
                             $this->Data($substring, $row);
56 56
                         }
57 57
                     }
@@ -77,9 +77,9 @@  discard block
 block discarded – undo
77 77
     public function data($userId, $row)
78 78
     {
79 79
         $query = "SELECT username, name, login_status, login_id from login where login_id = '$userId'";
80
-        if($result = $this->connect->query($query))
80
+        if ($result = $this->connect->query($query))
81 81
         {
82
-            if($result->num_rows > 0)
82
+            if ($result->num_rows > 0)
83 83
             {
84 84
                 $fetch = $result->fetch_assoc();
85 85
                 $row['time'] = $this->obTime->timeConversion($row['time']);
Please login to merge, or discard this patch.
views/validate_login.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-require (dirname(__DIR__) . '/vendor/autoload.php');
3
+require (dirname(__DIR__).'/vendor/autoload.php');
4 4
 use ChatApp\Register;
5 5
 
6
-if(isset($_POST['q']))
6
+if (isset($_POST['q']))
7 7
 {
8 8
 	$registerField = json_decode($_POST['q']);
9 9
 	$name = $registerField->name;
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 	$password = $registerField->password;
14 14
 	$obRegister = new Register();
15 15
 	$result = $obRegister->authRegister($name, $email, $username, $password, $mob);
16
-	if(isset($result))
16
+	if (isset($result))
17 17
 		echo $result;
18 18
 	else
19 19
 		echo json_encode([]);
Please login to merge, or discard this patch.