Completed
Push — master ( 3b96a7...361ab6 )
by Ankit
02:43 queued 11s
created
src/Compose.php 1 patch
Braces   +3 added lines, -6 removed lines patch added patch discarded remove patch
@@ -40,18 +40,15 @@
 block discarded – undo
40 40
                         }
41 41
                         $this->array = array_merge([], ["Compose" => $this->array]);
42 42
                         return json_encode($this->array);
43
-                    }
44
-                    else
43
+                    } else
45 44
                     {
46 45
                         return json_encode(["Compose" => "Not Found"]);
47 46
                     }
48
-                }
49
-                else
47
+                } else
50 48
                 {
51 49
                     return json_encode(["Compose" => "Query Failed"]);
52 50
                 }
53
-            }
54
-            else
51
+            } else
55 52
             {
56 53
                 return json_encode(["Compose" => "Not Found"]);
57 54
             }
Please login to merge, or discard this patch.
src/Time.php 1 patch
Braces   +9 added lines, -8 removed lines patch added patch discarded remove patch
@@ -16,14 +16,15 @@
 block discarded – undo
16 16
     function TimeConversion($time)
17 17
     {
18 18
 
19
-        if(substr($time,4,11) == date("d M Y", time() + 16200))
20
-            $time = substr($time,16,5);
21
-        else if(substr($time,7,8) == date("M Y", time() + 16200) && substr($time, 4,2) - date("d") < 7)
22
-            $time = substr($time,0,3);
23
-        else if(substr($time,11,4) == date("Y", time() + 16200))
24
-            $time = substr($time,4,6);
25
-        else
26
-            $time = substr($time,4,11);
19
+        if(substr($time,4,11) == date("d M Y", time() + 16200)) {
20
+                    $time = substr($time,16,5);
21
+        } else if(substr($time,7,8) == date("M Y", time() + 16200) && substr($time, 4,2) - date("d") < 7) {
22
+                    $time = substr($time,0,3);
23
+        } else if(substr($time,11,4) == date("Y", time() + 16200)) {
24
+                    $time = substr($time,4,6);
25
+        } else {
26
+                    $time = substr($time,4,11);
27
+        }
27 28
 
28 29
         return $time;
29 30
     }
Please login to merge, or discard this patch.
src/Chat.php 1 patch
Braces   +6 added lines, -12 removed lines patch added patch discarded remove patch
@@ -52,28 +52,23 @@  discard block
 block discarded – undo
52 52
 
53 53
             $initial->conversation[0]->login_status = $this->online;
54 54
             $from->send(json_encode($initial));
55
-        }
56
-        elseif ($msg == 'Load Sidebar')
55
+        } elseif ($msg == 'Load Sidebar')
57 56
         {
58 57
             @$initial->initial = json_decode($this->onSidebar($from->userId));
59 58
             $from->send(json_encode($initial));
60
-        }
61
-        elseif (@json_decode($msg)->newConversation == 'Initiated')
59
+        } elseif (@json_decode($msg)->newConversation == 'Initiated')
62 60
         {
63 61
             @$result->conversation = json_decode($this->onConversation($msg, False, $sessionId));
64 62
             $from->send(json_encode($result));
65
-        }
66
-        elseif (@json_decode($msg)->search == 'search')
63
+        } elseif (@json_decode($msg)->search == 'search')
67 64
         {
68 65
             $searchResult = $this->onSearch($msg, $sessionId);
69 66
             $from->send($searchResult);
70
-        }
71
-        elseif (@json_decode($msg)->Compose == 'Compose')
67
+        } elseif (@json_decode($msg)->Compose == 'Compose')
72 68
         {
73 69
             $composeResult = $this->onCompose($msg, $sessionId);
74 70
             $from->send($composeResult);
75
-        }
76
-        else
71
+        } else
77 72
         {
78 73
             $this->onReply($msg, $sessionId);
79 74
 
@@ -97,8 +92,7 @@  discard block
 block discarded – undo
97 92
 
98 93
                     $client->send(json_encode($result));
99 94
                     $this->online = 1;
100
-                }
101
-                elseif($client == $from)
95
+                } elseif($client == $from)
102 96
                 {
103 97
                     @$result->sidebar = json_decode($this->onSidebar($client->userId));
104 98
 
Please login to merge, or discard this patch.
src/Search.php 1 patch
Braces   +4 added lines, -6 removed lines patch added patch discarded remove patch
@@ -61,16 +61,14 @@
 block discarded – undo
61 61
                 {
62 62
                     $this->array = array_merge([], ["Search" => $this->array]);
63 63
                     return json_encode($this->array);
64
+                } else {
65
+                                    return json_encode(["Search" => "Not Found"]);
64 66
                 }
65
-                else
66
-                    return json_encode(["Search" => "Not Found"]);
67
-            }
68
-            else
67
+            } else
69 68
             {
70 69
                 return json_encode(["Search" => "Not Found"]);
71 70
             }
72
-        }
73
-        else
71
+        } else
74 72
         {
75 73
             return json_encode(["Search" => "Not Found"]);
76 74
         }
Please login to merge, or discard this patch.
src/SideBar.php 1 patch
Braces   +4 added lines, -9 removed lines patch added patch discarded remove patch
@@ -38,27 +38,22 @@
 block discarded – undo
38 38
                         if($substring != $userId)
39 39
                         {
40 40
                             $this->Data($substring, $row);
41
-                        }
42
-
43
-                        else
41
+                        } else
44 42
                         {
45 43
                             $substring = substr($identifier, $length+1);
46 44
                             $this->Data($substring, $row);
47 45
                         }
48 46
                     }
49 47
                     return json_encode($this->array);
50
-                }
51
-                else
48
+                } else
52 49
                 {
53 50
                     return json_encode(null);
54 51
                 }
55
-            }
56
-            else
52
+            } else
57 53
             {
58 54
                 echo "Query Failed";
59 55
             }
60
-        }
61
-        else
56
+        } else
62 57
         {
63 58
             header('Location:../login.php');
64 59
         }
Please login to merge, or discard this patch.
message.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -129,8 +129,7 @@
 block discarded – undo
129 129
 </html>
130 130
 
131 131
 <?php
132
-}
133
-else{
132
+} else{
134 133
 	header('Location:http://www.localhost/openchat/login.php');
135 134
 }
136 135
 ?>
Please login to merge, or discard this patch.
src/Login.php 1 patch
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.
src/Validate.php 1 patch
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -40,9 +40,9 @@  discard block
 block discarded – undo
40 40
 		{
41 41
 			if ($result->num_rows>0) {
42 42
 				return 1;
43
+			} else {
44
+							return 0;
43 45
 			}
44
-			else
45
-				return 0;
46 46
 		}
47 47
 	}
48 48
 
@@ -52,9 +52,9 @@  discard block
 block discarded – undo
52 52
 		if ($result=$this->connect->query($query)) {
53 53
 			if ($result->num_rows>0) {
54 54
 				return 1;
55
+			} else {
56
+							return 0;
55 57
 			}
56
-			else
57
-				return 0;
58 58
 			
59 59
 		}
60 60
 	}
Please login to merge, or discard this patch.
src/Profile.php 1 patch
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.