Completed
Push — master ( 3b96a7...361ab6 )
by Ankit
02:43 queued 11s
created
ajax/validate_login.php 1 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.
ajax/validate_register.php 1 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 1 patch
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.
src/Register.php 1 patch
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.
account.php 1 patch
Braces   +31 added lines, -22 removed lines patch added patch discarded remove patch
@@ -22,19 +22,19 @@  discard block
 block discarded – undo
22 22
 		$location = getenv('APP_URL') . "/account.php/". $row['username'];
23 23
 		header("Location:".$location);
24 24
 	}
25
-}
26
-elseif ($user != "account.php")
25
+} elseif ($user != "account.php")
27 26
 {
28 27
 	$obUser = new User();
29 28
 	$row = $obUser->UserDetails($user, False);
30 29
 	if($row != NULL):
31 30
 		$userId = $row['login_id'];
32 31
 		$details = Profile::getProfile($userId);
33
-		if($details != NULL)
34
-			$row = array_merge($row, $details);
35
-		else
36
-			header("Location:".getenv('APP_URL')."/error.php");
37
-?>
32
+		if($details != NULL) {
33
+					$row = array_merge($row, $details);
34
+		} else {
35
+					header("Location:".getenv('APP_URL')."/error.php");
36
+		}
37
+		?>
38 38
 
39 39
 		<!Doctype html>
40 40
 		<html>
@@ -51,10 +51,13 @@  discard block
 block discarded – undo
51 51
 		                <?php if(Session::get('start') != null): ?>
52 52
 							<li><a href="../message.php">Message</a></li>
53 53
 							<li><a href="../logout.php">Log out</a></li>
54
-						<?php else: ?>
54
+						<?php else {
55
+    : ?>
55 56
 							<li><a href="../login.php">Login</a></li>
56 57
 							<li><a href="../register.php">Register</a></li>
57
-						<?php endif; ?>
58
+						<?php endif;
59
+}
60
+?>
58 61
 		            </ul>
59 62
 		        </div>
60 63
 
@@ -68,16 +71,21 @@  discard block
 block discarded – undo
68 71
 						<div class="brief">
69 72
 							<h1 id="name">Name: <?php echo $row['name']; ?></h1><br>
70 73
 							<?php foreach ($row as $key => $value) {
71
-								if($key =='username' && $value != null)
72
-									echo '<p>Username: '.$row["username"] .'</p><br>';
73
-								if($key == 'email' && $value != null)
74
-									echo '<p>Email Id: '.$row["email"] .'</p><br>';
75
-								if($key == 'status' && $value != null)
76
-									echo '<p>Status: '.$row["status"] .'</p><br>';
77
-								if($key == 'education' && $value != null)
78
-									echo '<p>Education: '.$row["education"] .'</p><br>';
79
-								if($key == 'gender' && $value != null)
80
-									echo '<p>Gender: 	'.$row["gender"] .'</p><br>';
74
+								if($key =='username' && $value != null) {
75
+																	echo '<p>Username: '.$row["username"] .'</p><br>';
76
+								}
77
+								if($key == 'email' && $value != null) {
78
+																	echo '<p>Email Id: '.$row["email"] .'</p><br>';
79
+								}
80
+								if($key == 'status' && $value != null) {
81
+																	echo '<p>Status: '.$row["status"] .'</p><br>';
82
+								}
83
+								if($key == 'education' && $value != null) {
84
+																	echo '<p>Education: '.$row["education"] .'</p><br>';
85
+								}
86
+								if($key == 'gender' && $value != null) {
87
+																	echo '<p>Gender: 	'.$row["gender"] .'</p><br>';
88
+								}
81 89
 							}
82 90
 							?>
83 91
 						</div>
@@ -119,11 +127,12 @@  discard block
 block discarded – undo
119 127
 			</body>
120 128
 		</html>
121 129
 <?php
122
-	else:
130
+	else {
131
+	    :
123 132
 		header("Location:".getenv('APP_URL')."/error.php");
133
+	}
124 134
 	endif;
125
-}
126
-else
135
+} else
127 136
 {
128 137
 	header("Location: ".getenv('APP_URL'));
129 138
 }
Please login to merge, or discard this patch.
src/Conversation.php 1 patch
Braces   +14 added lines, -16 removed lines patch added patch discarded remove patch
@@ -55,10 +55,11 @@  discard block
 block discarded – undo
55 55
                 $login_id = (int)$fetch['login_id'];
56 56
 
57 57
                 // Unique Identifier
58
-                if($login_id > $userId)
59
-                    $identifier = $userId.':'.$login_id;
60
-                else
61
-                    $identifier = $login_id.':'.$userId;
58
+                if($login_id > $userId) {
59
+                                    $identifier = $userId.':'.$login_id;
60
+                } else {
61
+                                    $identifier = $login_id.':'.$userId;
62
+                }
62 63
 
63 64
                 $query = "SELECT total_messages from total_message where identifier = '$identifier'";
64 65
                 if($result = $this->connect->query($query))
@@ -67,11 +68,12 @@  discard block
 block discarded – undo
67 68
                     {
68 69
                         $total = $result->fetch_assoc();
69 70
                         $total = $total['total_messages'];
70
-                        if($total - $load > 0)
71
-                            if($total - $load > 10)
71
+                        if($total - $load > 0) {
72
+                                                    if($total - $load > 10)
72 73
                                 $add_load = $load + 10;
73
-                            else
74
-                                $add_load = $total;
74
+                        } else {
75
+                                                            $add_load = $total;
76
+                            }
75 77
                     }
76 78
                 }
77 79
 
@@ -89,23 +91,19 @@  discard block
 block discarded – undo
89 91
 
90 92
                         $this->array = array_merge([['name' => $fetch['name'], 'username' => $fetch['username'], 'id' => $fetch['login_id'], 'load' => $add_load, 'login_status' => $fetch['login_status'], 'type' => 1]], $this->array);
91 93
                         return json_encode($this->array);
92
-                    }
93
-                    else
94
+                    } else
94 95
                     {
95 96
                         return json_encode([['name' => $fetch['name'], 'username' => $fetch['username'], 'id' => $fetch['login_id'], 'login_status' => $fetch['login_status'], 'type' => 0]]);
96 97
                     }
97
-                }
98
-                else
98
+                } else
99 99
                 {
100 100
                     echo "Query Failed";
101 101
                 }
102
-            }
103
-            else
102
+            } else
104 103
             {
105 104
                 echo "Query Failed";
106 105
             }
107
-        }
108
-        else
106
+        } else
109 107
         {
110 108
             header('Location:../login.php');
111 109
         }
Please login to merge, or discard this patch.
src/User.php 1 patch
Braces   +9 added lines, -7 removed lines patch added patch discarded remove patch
@@ -30,17 +30,19 @@
 block discarded – undo
30 30
 
31 31
     public function userDetails($userId, $para)
32 32
     {
33
-        if($para == True)
34
-            $this->query = "SELECT * from login where login_id = '$userId'";
35
-        else
36
-            $this->query = "SELECT * from login where username = '$userId'";
33
+        if($para == True) {
34
+                    $this->query = "SELECT * from login where login_id = '$userId'";
35
+        } else {
36
+                    $this->query = "SELECT * from login where username = '$userId'";
37
+        }
37 38
         $this->result = $this->connect->query($this->query);
38
-        if($this->result->num_rows > 0)                   // if true
39
+        if($this->result->num_rows > 0) {
40
+            // if true
39 41
         {
40 42
             $this->details = $this->result->fetch_assoc();
41
-            return $this->details;
42 43
         }
43
-        else
44
+            return $this->details;
45
+        } else
44 46
         {
45 47
             return NULL;
46 48
         }
Please login to merge, or discard this patch.
src/Reply.php 1 patch
Braces   +22 added lines, -17 removed lines patch added patch discarded remove patch
@@ -31,18 +31,22 @@  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)) {
35
+            //checks for session login and the value send
35 36
         {
36 37
             $userId = Session::get('start');
38
+        }
37 39
             $msg = json_decode($msg);   //decode json value
38 40
             $identifier = $msg->name;
39 41
 
40 42
             $receiverID = $identifier;  //stores id of the person whom message is to be sent
41 43
 
42
-            if($identifier > $userId)    // geneate specific unique code to store messages
44
+            if($identifier > $userId) {
45
+                // geneate specific unique code to store messages
43 46
                 $identifier = $userId . ":" . $identifier;
44
-            else
45
-                $identifier = $identifier . ":" . $userId;
47
+            } else {
48
+                            $identifier = $identifier . ":" . $userId;
49
+            }
46 50
 
47 51
             $reply = addslashes(trim($msg->reply[0])); // stores the message sent by the user.
48 52
 
@@ -56,27 +60,31 @@  discard block
 block discarded – undo
56 60
                 $query = "SELECT * from login where login_id = '$receiverID'";
57 61
 
58 62
                 $result = $this->connect->query($query);
59
-                if($result->num_rows > 0)     // if true
63
+                if($result->num_rows > 0) {
64
+                    // if true
60 65
                 {
61 66
                     //check whether he is sending message for thr first time or he has sent messages before
62 67
                     $query = "SELECT * from total_message where identifier = '$identifier'";
68
+                }
63 69
                     $result = $this->connect->query($query);
64
-                    if($result->num_rows>0)               // if he has sent messages before
70
+                    if($result->num_rows>0) {
71
+                        // if he has sent messages before
65 72
                     {
66 73
                         // Update Total_Message Table
67 74
                         $query = "UPDATE total_message SET total_messages = total_messages+1, time = '$time', unread = 1, id = '$time_id' WHERE identifier = '$identifier'";
75
+                    }
68 76
                         $this->updateMessages($query, $identifier, $reply, $userId, $time);
69 77
 
70
-                    }
71
-                    else    // if he sends message for the first time
78
+                    } else    // if he sends message for the first time
72 79
                     {
73 80
                         $length = strlen($userId);
74
-                        if(substr($identifier, 0, $length) == $userId) // generate specific unique code
81
+                        if(substr($identifier, 0, $length) == $userId) {
82
+                            // generate specific unique code
75 83
                         {
76 84
                             $user2 = substr($identifier, $length+1);
77
-                            $user1 = $userId;
78 85
                         }
79
-                        else
86
+                            $user1 = $userId;
87
+                        } else
80 88
                         {
81 89
                             $user2 = $userId;
82 90
                             $length = strlen($identifier) - $length-1;
@@ -86,14 +94,12 @@  discard block
 block discarded – undo
86 94
                         $query = "INSERT into total_message values('$identifier', 1, '$user1', '$user2', 1, '$time', '$time_id')";
87 95
                         $this->updateMessages($query, $identifier, $reply, $userId, $time);
88 96
                     }
89
-                }
90
-                else // if he is unauthorized echo message is failed
97
+                } else // if he is unauthorized echo message is failed
91 98
                 {
92 99
                     echo "Message is failed";
93 100
                 }
94 101
             }
95
-        }
96
-        else
102
+        } else
97 103
         {
98 104
             echo "failed";
99 105
         }
@@ -109,8 +115,7 @@  discard block
 block discarded – undo
109 115
             if($result = $this->connect->query($query))
110 116
             {
111 117
                 echo "Messages is sent \n";    // if query is executed return true
112
-            }
113
-            else
118
+            } else
114 119
             {
115 120
                 echo "Message is failed";
116 121
             }
Please login to merge, or discard this patch.