Completed
Push — master ( 3b96a7...361ab6 )
by Ankit
02:43 queued 11s
created
src/Login.php 3 patches
Braces   +5 added lines, -10 removed lines patch added patch discarded remove patch
@@ -30,8 +30,7 @@  discard block
 block discarded – undo
30 30
 		{
31 31
 			$this->key = 1;
32 32
 			$this->error = array_merge($this->error, ["login" => " *Enter the login field"]);
33
-		}
34
-		elseif (preg_match("/^[@]{1}$/", $login))
33
+		} elseif (preg_match("/^[@]{1}$/", $login))
35 34
 		{
36 35
 			if(filter_var($login, FILTER_VALIDATE_EMAIL) == false)
37 36
 			{
@@ -42,8 +41,7 @@  discard block
 block discarded – undo
42 41
 		if(empty($password)) {
43 42
 			$this->key = 1;
44 43
 			$this->error = array_merge($this->error, ["password" => " *Enter the password"]);
45
-		}
46
-		else
44
+		} else
47 45
 		{
48 46
 			$password = md5($password);
49 47
 		}
@@ -66,23 +64,20 @@  discard block
 block discarded – undo
66 64
 							return json_encode([
67 65
 								"location" => URL."/account.php"
68 66
 							]);
69
-						}
70
-						else
67
+						} else
71 68
 						{
72 69
 							$this->error = array_merge($this->error, ["password" => " *Invalid password"]);
73 70
 							return json_encode($this->error);
74 71
 						}
75 72
 					}
76
-				}
77
-				else
73
+				} else
78 74
 				{
79 75
 					$this->error = array_merge($this->error, ["login" => " *Invalid username or email"]);
80 76
 					return json_encode($this->error);
81 77
 				}
82 78
 			}
83 79
 
84
-		}
85
-		else
80
+		} else
86 81
 		{
87 82
 			return json_encode($this->error);
88 83
 		}
Please login to merge, or discard this patch.
Indentation   +73 added lines, -73 removed lines patch added patch discarded remove patch
@@ -11,88 +11,88 @@
 block discarded – undo
11 11
 class Login
12 12
 {
13 13
 
14
-	protected $key;
15
-	protected $error;
16
-	protected $connect;
14
+    protected $key;
15
+    protected $error;
16
+    protected $connect;
17 17
 
18
-	public function __construct()
19
-	{
20
-		$this->key = 0;
21
-		$this->connect = mysqli_connect(
18
+    public function __construct()
19
+    {
20
+        $this->key = 0;
21
+        $this->connect = mysqli_connect(
22 22
             getenv('DB_HOST'),
23 23
             getenv('DB_USER'),
24 24
             getenv('DB_PASSWORD'),
25 25
             getenv('DB_NAME')
26 26
         );
27
-		$this->error = array();
28
-	}
27
+        $this->error = array();
28
+    }
29 29
 
30
-	public function authLogin($login, $password)
31
-	{
30
+    public function authLogin($login, $password)
31
+    {
32 32
 
33
-		$login = trim($login);
34
-		$password = trim($password);
33
+        $login = trim($login);
34
+        $password = trim($password);
35 35
 
36
-		if(empty($login))
37
-		{
38
-			$this->key = 1;
39
-			$this->error = array_merge($this->error, ["login" => " *Enter the login field"]);
40
-		}
41
-		elseif (preg_match("/^[@]{1}$/", $login))
42
-		{
43
-			if(filter_var($login, FILTER_VALIDATE_EMAIL) == false)
44
-			{
45
-			$this->key = 1;
46
-			$this->error = array_merge($this->error, ["login" => " *Enter correct Email address"]);
47
-			}
48
-		}
49
-		if(empty($password)) {
50
-			$this->key = 1;
51
-			$this->error = array_merge($this->error, ["password" => " *Enter the password"]);
52
-		}
53
-		else
54
-		{
55
-			$password = md5($password);
56
-		}
36
+        if(empty($login))
37
+        {
38
+            $this->key = 1;
39
+            $this->error = array_merge($this->error, ["login" => " *Enter the login field"]);
40
+        }
41
+        elseif (preg_match("/^[@]{1}$/", $login))
42
+        {
43
+            if(filter_var($login, FILTER_VALIDATE_EMAIL) == false)
44
+            {
45
+            $this->key = 1;
46
+            $this->error = array_merge($this->error, ["login" => " *Enter correct Email address"]);
47
+            }
48
+        }
49
+        if(empty($password)) {
50
+            $this->key = 1;
51
+            $this->error = array_merge($this->error, ["password" => " *Enter the password"]);
52
+        }
53
+        else
54
+        {
55
+            $password = md5($password);
56
+        }
57 57
 
58
-		if($this->key == 0)
59
-		{
60
-			$query = "SELECT * FROM login WHERE email = '$login' or username = '$login'";
61
-			if ($result = $this->connect->query($query))
62
-			{
63
-				if ($result->num_rows > 0)
64
-				{
65
-					$row = $result->fetch_assoc();
66
-					$loginID = $row['login_id'];
67
-					$query = "SELECT id FROM register WHERE id = '$loginID' and password = '$password'";
68
-					if($result = $this->connect->query($query))
69
-					{
70
-						if ($result->num_rows > 0)
71
-						{
72
-							Session::put('start', $loginID);
73
-							return json_encode([
74
-								"location" => getenv('APP_URL')."/account.php"
75
-							]);
76
-						}
77
-						else
78
-						{
79
-							$this->error = array_merge($this->error, ["password" => " *Invalid password"]);
80
-							return json_encode($this->error);
81
-						}
82
-					}
83
-				}
84
-				else
85
-				{
86
-					$this->error = array_merge($this->error, ["login" => " *Invalid username or email"]);
87
-					return json_encode($this->error);
88
-				}
89
-			}
58
+        if($this->key == 0)
59
+        {
60
+            $query = "SELECT * FROM login WHERE email = '$login' or username = '$login'";
61
+            if ($result = $this->connect->query($query))
62
+            {
63
+                if ($result->num_rows > 0)
64
+                {
65
+                    $row = $result->fetch_assoc();
66
+                    $loginID = $row['login_id'];
67
+                    $query = "SELECT id FROM register WHERE id = '$loginID' and password = '$password'";
68
+                    if($result = $this->connect->query($query))
69
+                    {
70
+                        if ($result->num_rows > 0)
71
+                        {
72
+                            Session::put('start', $loginID);
73
+                            return json_encode([
74
+                                "location" => getenv('APP_URL')."/account.php"
75
+                            ]);
76
+                        }
77
+                        else
78
+                        {
79
+                            $this->error = array_merge($this->error, ["password" => " *Invalid password"]);
80
+                            return json_encode($this->error);
81
+                        }
82
+                    }
83
+                }
84
+                else
85
+                {
86
+                    $this->error = array_merge($this->error, ["login" => " *Invalid username or email"]);
87
+                    return json_encode($this->error);
88
+                }
89
+            }
90 90
 
91
-		}
92
-		else
93
-		{
94
-			return json_encode($this->error);
95
-		}
96
-		$this->connect->close();
97
-	}
91
+        }
92
+        else
93
+        {
94
+            return json_encode($this->error);
95
+        }
96
+        $this->connect->close();
97
+    }
98 98
 }
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 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__));
@@ -33,20 +33,20 @@  discard block
 block discarded – undo
33 33
 		$login = trim($login);
34 34
 		$password = trim($password);
35 35
 
36
-		if(empty($login))
36
+		if (empty($login))
37 37
 		{
38 38
 			$this->key = 1;
39 39
 			$this->error = array_merge($this->error, ["login" => " *Enter the login field"]);
40 40
 		}
41 41
 		elseif (preg_match("/^[@]{1}$/", $login))
42 42
 		{
43
-			if(filter_var($login, FILTER_VALIDATE_EMAIL) == false)
43
+			if (filter_var($login, FILTER_VALIDATE_EMAIL) == false)
44 44
 			{
45 45
 			$this->key = 1;
46 46
 			$this->error = array_merge($this->error, ["login" => " *Enter correct Email address"]);
47 47
 			}
48 48
 		}
49
-		if(empty($password)) {
49
+		if (empty($password)) {
50 50
 			$this->key = 1;
51 51
 			$this->error = array_merge($this->error, ["password" => " *Enter the password"]);
52 52
 		}
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 			$password = md5($password);
56 56
 		}
57 57
 
58
-		if($this->key == 0)
58
+		if ($this->key == 0)
59 59
 		{
60 60
 			$query = "SELECT * FROM login WHERE email = '$login' or username = '$login'";
61 61
 			if ($result = $this->connect->query($query))
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 					$row = $result->fetch_assoc();
66 66
 					$loginID = $row['login_id'];
67 67
 					$query = "SELECT id FROM register WHERE id = '$loginID' and password = '$password'";
68
-					if($result = $this->connect->query($query))
68
+					if ($result = $this->connect->query($query))
69 69
 					{
70 70
 						if ($result->num_rows > 0)
71 71
 						{
Please login to merge, or discard this patch.
src/Profile.php 2 patches
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -14,12 +14,13 @@
 block discarded – undo
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
         }
Please login to merge, or discard this 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.
logout.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-require (__DIR__ . '/vendor/autoload.php');
3
+require (__DIR__.'/vendor/autoload.php');
4 4
 use ChatApp\Session;
5 5
 
6
-if(Session::get('start') != null)
6
+if (Session::get('start') != null)
7 7
 {
8 8
     Session::forget('start');
9 9
     header('Location: index.php');
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,8 +12,7 @@
 block discarded – undo
12 12
         header('Location: ../../index.php');
13 13
     }
14 14
 
15
-}
16
-else
15
+} else
17 16
 {
18 17
 	echo "Please Login";
19 18
 }
Please login to merge, or discard this patch.
ajax/validate_login.php 3 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -5,13 +5,13 @@
 block discarded – undo
5 5
 
6 6
 if(isset($_POST['q']))
7 7
 {
8
-	$loginField = json_decode($_POST['q']);
9
-	$login = $loginField->login;
10
-	$password = $loginField->password;
11
-	$obLogin = new Login();
12
-	$result = $obLogin->authLogin($login, $password);
13
-	if(isset($result))
14
-		echo $result;
15
-	else
16
-		echo json_encode([]);
8
+    $loginField = json_decode($_POST['q']);
9
+    $login = $loginField->login;
10
+    $password = $loginField->password;
11
+    $obLogin = new Login();
12
+    $result = $obLogin->authLogin($login, $password);
13
+    if(isset($result))
14
+        echo $result;
15
+    else
16
+        echo json_encode([]);
17 17
 }
18 18
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +6 added lines, -5 removed lines patch added patch discarded remove patch
@@ -10,8 +10,9 @@
 block discarded – undo
10 10
 	$password = $loginField->password;
11 11
 	$obLogin = new Login();
12 12
 	$result = $obLogin->authLogin($login, $password);
13
-	if(isset($result))
14
-		echo $result;
15
-	else
16
-		echo json_encode([]);
17
-}
18 13
\ No newline at end of file
14
+	if(isset($result)) {
15
+			echo $result;
16
+	} else {
17
+			echo json_encode([]);
18
+	}
19
+	}
19 20
\ No newline at end of file
Please login to merge, or discard this 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.
ajax/validate_register.php 3 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -5,17 +5,17 @@
 block discarded – undo
5 5
 
6 6
 if(isset($_POST['q']))
7 7
 {
8
-	$registerField = json_decode($_POST['q']);
9
-	$name = $registerField->name;
10
-	$email = $registerField->email;
11
-	$username = $registerField->username;
12
-	$mob = $registerField->mob;
13
-	$password = $registerField->password;
14
-	$obRegister = new Register();
15
-	$result = $obRegister->authRegister($name, $email, $username, $password, $mob);
16
-	if(isset($result))
17
-		echo $result;
18
-	else
19
-		echo json_encode([]);
8
+    $registerField = json_decode($_POST['q']);
9
+    $name = $registerField->name;
10
+    $email = $registerField->email;
11
+    $username = $registerField->username;
12
+    $mob = $registerField->mob;
13
+    $password = $registerField->password;
14
+    $obRegister = new Register();
15
+    $result = $obRegister->authRegister($name, $email, $username, $password, $mob);
16
+    if(isset($result))
17
+        echo $result;
18
+    else
19
+        echo json_encode([]);
20 20
 }
21 21
 
Please login to merge, or discard this 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.
Braces   +6 added lines, -5 removed lines patch added patch discarded remove patch
@@ -13,9 +13,10 @@
 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))
17
-		echo $result;
18
-	else
19
-		echo json_encode([]);
20
-}
16
+	if(isset($result)) {
17
+			echo $result;
18
+	} else {
19
+			echo json_encode([]);
20
+	}
21
+	}
21 22
 
Please login to merge, or discard this patch.
profile_generate.php 3 patches
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -18,14 +18,12 @@
 block discarded – undo
18 18
 		if($result = $connect->query($query))
19 19
 		{
20 20
 			header('Location:'.URL.'/account.php');
21
-		}
22
-		else
21
+		} else
23 22
 		{
24 23
 			header("Location:".URL."/error.php");
25 24
 		}
26 25
 	endif;
27
-}
28
-else
26
+} else
29 27
 {
30 28
 	header("Location:".URL."/error.php");
31 29
 }
Please login to merge, or discard this patch.
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -10,37 +10,37 @@
 block discarded – undo
10 10
 $connect = mysqli_connect(
11 11
     getenv('DB_HOST'),
12 12
     getenv('DB_USER'),
13
-	getenv('DB_PASSWORD'),
14
-	getenv('DB_NAME')
13
+    getenv('DB_PASSWORD'),
14
+    getenv('DB_NAME')
15 15
 );
16 16
 
17 17
 $userId = Session::get('start');
18 18
 $data = '';
19 19
 if(isset($_POST['submit']))
20 20
 {
21
-	$data = Profile::getProfile($userId);
22
-	if($data != NULL):
23
-		$status = get($_POST['status'], $data['status']);
24
-		$edu = get($_POST['education'], $data['education']);
25
-		$gender = get($_POST['gender'], $data['gender']);
26
-		$query = "UPDATE profile set status = '$status', education = '$edu', gender = '$gender' where login_id = '$userId'";
27
-		if($result = $connect->query($query))
28
-		{
29
-			header('Location:'.getenv('APP_URL').'/account.php');
30
-		}
31
-		else
32
-		{
33
-			header("Location:".getenv('APP_URL')."/error.php");
34
-		}
35
-	endif;
21
+    $data = Profile::getProfile($userId);
22
+    if($data != NULL):
23
+        $status = get($_POST['status'], $data['status']);
24
+        $edu = get($_POST['education'], $data['education']);
25
+        $gender = get($_POST['gender'], $data['gender']);
26
+        $query = "UPDATE profile set status = '$status', education = '$edu', gender = '$gender' where login_id = '$userId'";
27
+        if($result = $connect->query($query))
28
+        {
29
+            header('Location:'.getenv('APP_URL').'/account.php');
30
+        }
31
+        else
32
+        {
33
+            header("Location:".getenv('APP_URL')."/error.php");
34
+        }
35
+    endif;
36 36
 }
37 37
 else
38 38
 {
39
-	header("Location:".getenv('APP_URL')."/error.php");
39
+    header("Location:".getenv('APP_URL')."/error.php");
40 40
 }
41 41
 
42 42
 function get($value, $default)
43 43
 {
44
-	$value = trim($value);
45
-	return (isset($value) ? $value : $default);
44
+    $value = trim($value);
45
+    return (isset($value) ? $value : $default);
46 46
 }
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 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 ChatApp\Profile;
6 6
 use Dotenv\Dotenv;
@@ -16,15 +16,15 @@  discard block
 block discarded – undo
16 16
 
17 17
 $userId = Session::get('start');
18 18
 $data = '';
19
-if(isset($_POST['submit']))
19
+if (isset($_POST['submit']))
20 20
 {
21 21
 	$data = Profile::getProfile($userId);
22
-	if($data != NULL):
22
+	if ($data != NULL):
23 23
 		$status = get($_POST['status'], $data['status']);
24 24
 		$edu = get($_POST['education'], $data['education']);
25 25
 		$gender = get($_POST['gender'], $data['gender']);
26 26
 		$query = "UPDATE profile set status = '$status', education = '$edu', gender = '$gender' where login_id = '$userId'";
27
-		if($result = $connect->query($query))
27
+		if ($result = $connect->query($query))
28 28
 		{
29 29
 			header('Location:'.getenv('APP_URL').'/account.php');
30 30
 		}
Please login to merge, or discard this patch.
src/Register.php 3 patches
Braces   +8 added lines, -16 removed lines patch added patch discarded remove patch
@@ -36,11 +36,9 @@  discard block
 block discarded – undo
36 36
 
37 37
 		if(empty($email)) {
38 38
 			$this->onError(["email" => " *Enter the email address"]);
39
-		}
40
-		elseif(filter_var($email, FILTER_VALIDATE_EMAIL) == false) {
39
+		} elseif(filter_var($email, FILTER_VALIDATE_EMAIL) == false) {
41 40
 			$this->onError(["email" => " *Enter correct Email address"]);
42
-		}
43
-		else
41
+		} else
44 42
 		{
45 43
 			if($this->obValidate->validateEmailInDb($email) === 1)
46 44
 			{
@@ -51,8 +49,7 @@  discard block
 block discarded – undo
51 49
 
52 50
 		if(empty($username)) {
53 51
 			$this->onError(["username" => " *Enter the username"]);
54
-		}
55
-		else
52
+		} else
56 53
 		{
57 54
 			if($this->obValidate->validateUsernameInDb($username) === 1)
58 55
 			{
@@ -67,16 +64,14 @@  discard block
 block discarded – undo
67 64
 
68 65
 		if(empty($mob)) {
69 66
 			$this->onError(["mob" => " *Enter the Mobile Number"]);
70
-		}
71
-		elseif (!preg_match("/^[0-9]{10}$/", $mob)) {
67
+		} elseif (!preg_match("/^[0-9]{10}$/", $mob)) {
72 68
 			$this->onError(["mob" => " *Enter correct Mobile Number"]);
73 69
 		}
74 70
 
75 71
 		if($this->key == 1)
76 72
 		{
77 73
 			return json_encode($this->error);
78
-		}
79
-		else
74
+		} else
80 75
 		{
81 76
 			$this->key = 0;
82 77
 			$pass = md5($password);
@@ -84,8 +79,7 @@  discard block
 block discarded – undo
84 79
 			if(!$this->connect->query($query)) {
85 80
 				$this->key = 1;
86 81
 				echo "You are not registered || Error in registration1";
87
-			}
88
-			else
82
+			} else
89 83
 			{
90 84
 				$query = "SELECT id FROM register WHERE email = '$email'";
91 85
 				if($result = $this->connect->query($query)) {
@@ -96,8 +90,7 @@  discard block
 block discarded – undo
96 90
 					if(!$this->connect->query($query)) {
97 91
 						$this->key = 1;
98 92
 						echo "You are not registered || Error in registration2";
99
-					}
100
-					else
93
+					} else
101 94
 					{
102 95
 						$query = "INSERT INTO profile VALUES('$userId', 'Joined OpenChat', 'Joined OpenChat', '')";
103 96
 						if(!$this->connect->query($query)) {
@@ -113,8 +106,7 @@  discard block
 block discarded – undo
113 106
 			return json_encode([
114 107
 				"location" => URL."/account.php"
115 108
 			]);
116
-		}
117
-		else
109
+		} else
118 110
 		{
119 111
 			return json_encode($this->error);
120 112
 		}
Please login to merge, or discard this patch.
Indentation   +118 added lines, -118 removed lines patch added patch discarded remove patch
@@ -12,127 +12,127 @@
 block discarded – undo
12 12
 
13 13
 class Register
14 14
 {
15
-	protected $error;
16
-	protected $key;
17
-	protected $obValidate;
18
-	protected $connect;
19
-
20
-	public function __construct()
21
-	{
22
-		$this->error = array();
23
-		$this->key = 0;
24
-		$this->connect = mysqli_connect(
15
+    protected $error;
16
+    protected $key;
17
+    protected $obValidate;
18
+    protected $connect;
19
+
20
+    public function __construct()
21
+    {
22
+        $this->error = array();
23
+        $this->key = 0;
24
+        $this->connect = mysqli_connect(
25 25
             getenv('DB_HOST'),
26 26
             getenv('DB_USER'),
27 27
             getenv('DB_PASSWORD'),
28 28
             getenv('DB_NAME')
29 29
         );
30
-		$this->obValidate = new Validate();
31
-
32
-	}
33
-
34
-	public function authRegister($name, $email, $username, $password, $mob)
35
-	{
36
-		$name = trim($name);
37
-		$email = trim($email);
38
-		$username = trim($username);
39
-		$password = trim($password);
40
-		$mob = trim($mob);
41
-		$userId = '';
42
-
43
-		if (empty($name)) {
44
-			$this->onError(["name" => " *Enter the name"]);
45
-		}
46
-
47
-		if(empty($email)) {
48
-			$this->onError(["email" => " *Enter the email address"]);
49
-		}
50
-		elseif(filter_var($email, FILTER_VALIDATE_EMAIL) == false) {
51
-			$this->onError(["email" => " *Enter correct Email address"]);
52
-		}
53
-		else
54
-		{
55
-			if($this->obValidate->validateEmailInDb($email) === 1)
56
-			{
57
-
58
-				$this->onError(["email" => " *Email is already registered"]);
59
-			}
60
-		}
61
-
62
-		if(empty($username)) {
63
-			$this->onError(["username" => " *Enter the username"]);
64
-		}
65
-		else
66
-		{
67
-			if($this->obValidate->validateUsernameInDb($username) === 1)
68
-			{
69
-
70
-				$this->onError(["username" => " *Username is already registered"]);
71
-			}
72
-		}
73
-
74
-		if(empty($password)) {
75
-			$this->onError(["password" => " *Enter the password"]);
76
-		}
77
-
78
-		if(empty($mob)) {
79
-			$this->onError(["mob" => " *Enter the Mobile Number"]);
80
-		}
81
-		elseif (!preg_match("/^[0-9]{10}$/", $mob)) {
82
-			$this->onError(["mob" => " *Enter correct Mobile Number"]);
83
-		}
84
-
85
-		if($this->key == 1)
86
-		{
87
-			return json_encode($this->error);
88
-		}
89
-		else
90
-		{
91
-			$this->key = 0;
92
-			$pass = md5($password);
93
-			$query = "INSERT INTO register VALUES(null, '$email', '$username', '$pass')";
94
-			if(!$this->connect->query($query)) {
95
-				$this->key = 1;
96
-				echo "You are not registered || Error in registration1";
97
-			}
98
-			else
99
-			{
100
-				$query = "SELECT id FROM register WHERE email = '$email'";
101
-				if($result = $this->connect->query($query)) {
102
-					$row = $result->fetch_assoc();
103
-					$userId = $row['id'];
104
-
105
-					$query = "INSERT INTO login VALUES('$userId', '$name', '$email', '$username', '$mob', 0)";
106
-					if(!$this->connect->query($query)) {
107
-						$this->key = 1;
108
-						echo "You are not registered || Error in registration2";
109
-					}
110
-					else
111
-					{
112
-						$query = "INSERT INTO profile VALUES('$userId', 'Joined OpenChat', 'Joined OpenChat', '')";
113
-						if(!$this->connect->query($query)) {
114
-							$this->key = 1;
115
-							echo "You are not registered || Error in registration3";
116
-						}
117
-					}
118
-				}
119
-			}
120
-		}
121
-		if ($this->key == 0) {
122
-			Session::put('start', $userId);
123
-			return json_encode([
124
-				"location" => getenv('APP_URL')."/account.php"
125
-			]);
126
-		}
127
-		else
128
-		{
129
-			return json_encode($this->error);
130
-		}
131
-	}
132
-
133
-	public function onError($value)
134
-	{
135
-		$this->key = 1;
136
-		$this->error = array_merge($this->error, $value);
137
-	}
30
+        $this->obValidate = new Validate();
31
+
32
+    }
33
+
34
+    public function authRegister($name, $email, $username, $password, $mob)
35
+    {
36
+        $name = trim($name);
37
+        $email = trim($email);
38
+        $username = trim($username);
39
+        $password = trim($password);
40
+        $mob = trim($mob);
41
+        $userId = '';
42
+
43
+        if (empty($name)) {
44
+            $this->onError(["name" => " *Enter the name"]);
45
+        }
46
+
47
+        if(empty($email)) {
48
+            $this->onError(["email" => " *Enter the email address"]);
49
+        }
50
+        elseif(filter_var($email, FILTER_VALIDATE_EMAIL) == false) {
51
+            $this->onError(["email" => " *Enter correct Email address"]);
52
+        }
53
+        else
54
+        {
55
+            if($this->obValidate->validateEmailInDb($email) === 1)
56
+            {
57
+
58
+                $this->onError(["email" => " *Email is already registered"]);
59
+            }
60
+        }
61
+
62
+        if(empty($username)) {
63
+            $this->onError(["username" => " *Enter the username"]);
64
+        }
65
+        else
66
+        {
67
+            if($this->obValidate->validateUsernameInDb($username) === 1)
68
+            {
69
+
70
+                $this->onError(["username" => " *Username is already registered"]);
71
+            }
72
+        }
73
+
74
+        if(empty($password)) {
75
+            $this->onError(["password" => " *Enter the password"]);
76
+        }
77
+
78
+        if(empty($mob)) {
79
+            $this->onError(["mob" => " *Enter the Mobile Number"]);
80
+        }
81
+        elseif (!preg_match("/^[0-9]{10}$/", $mob)) {
82
+            $this->onError(["mob" => " *Enter correct Mobile Number"]);
83
+        }
84
+
85
+        if($this->key == 1)
86
+        {
87
+            return json_encode($this->error);
88
+        }
89
+        else
90
+        {
91
+            $this->key = 0;
92
+            $pass = md5($password);
93
+            $query = "INSERT INTO register VALUES(null, '$email', '$username', '$pass')";
94
+            if(!$this->connect->query($query)) {
95
+                $this->key = 1;
96
+                echo "You are not registered || Error in registration1";
97
+            }
98
+            else
99
+            {
100
+                $query = "SELECT id FROM register WHERE email = '$email'";
101
+                if($result = $this->connect->query($query)) {
102
+                    $row = $result->fetch_assoc();
103
+                    $userId = $row['id'];
104
+
105
+                    $query = "INSERT INTO login VALUES('$userId', '$name', '$email', '$username', '$mob', 0)";
106
+                    if(!$this->connect->query($query)) {
107
+                        $this->key = 1;
108
+                        echo "You are not registered || Error in registration2";
109
+                    }
110
+                    else
111
+                    {
112
+                        $query = "INSERT INTO profile VALUES('$userId', 'Joined OpenChat', 'Joined OpenChat', '')";
113
+                        if(!$this->connect->query($query)) {
114
+                            $this->key = 1;
115
+                            echo "You are not registered || Error in registration3";
116
+                        }
117
+                    }
118
+                }
119
+            }
120
+        }
121
+        if ($this->key == 0) {
122
+            Session::put('start', $userId);
123
+            return json_encode([
124
+                "location" => getenv('APP_URL')."/account.php"
125
+            ]);
126
+        }
127
+        else
128
+        {
129
+            return json_encode($this->error);
130
+        }
131
+    }
132
+
133
+    public function onError($value)
134
+    {
135
+        $this->key = 1;
136
+        $this->error = array_merge($this->error, $value);
137
+    }
138 138
 }
Please login to merge, or discard this 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.
tests/ExistsTest.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -76,8 +76,8 @@
 block discarded – undo
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));
Please login to merge, or discard this patch.
src/Session.php 2 patches
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -6,10 +6,16 @@
 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
     }
12 15
 
16
+    /**
17
+     * @param string $key
18
+     */
13 19
     public static function get($key){
14 20
         return (isset($_SESSION[$key]) ? $_SESSION[$key] : null);
15 21
     }
Please login to merge, or discard this patch.
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
 }
21 21
\ No newline at end of file
Please login to merge, or discard this patch.