Completed
Push — master ( 3b96a7...361ab6 )
by Ankit
02:43 queued 11s
created
ajax/validate_login.php 1 patch
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.
ajax/validate_register.php 1 patch
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.
cmd.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -8,12 +8,12 @@
 block discarded – undo
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();
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.
message.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -138,6 +138,6 @@
 block discarded – undo
138 138
 <?php
139 139
 }
140 140
 else{
141
-	header('Location:'. getenv('APP_URL'));
141
+    header('Location:'. getenv('APP_URL'));
142 142
 }
143 143
 ?>
Please login to merge, or discard this patch.
src/Validate.php 1 patch
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -11,40 +11,40 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
src/Login.php 1 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.
src/Register.php 1 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.
profile_generate.php 1 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.