Completed
Push — master ( 06d3fe...de24cb )
by Ankit
02:59
created
src/Reply.php 2 patches
Doc Comments   +5 added lines patch added patch discarded remove patch
@@ -90,6 +90,11 @@
 block discarded – undo
90 90
         $this->connect->close();
91 91
     }
92 92
 
93
+    /**
94
+     * @param string $identifier
95
+     * @param string $reply
96
+     * @param string $time
97
+     */
93 98
     function UpdateMessages($query, $identifier, $reply, $id, $time)
94 99
     {
95 100
         if($result = $this->connect->query($query))
Please login to merge, or discard this patch.
Braces   +14 added lines, -8 removed lines patch added patch discarded remove patch
@@ -26,19 +26,22 @@  discard block
 block discarded – undo
26 26
 
27 27
     public function replyTo($msg)
28 28
     {
29
-        if(!empty($msg))  //checks for the value send
29
+        if(!empty($msg)) {
30
+            //checks for the value send
30 31
         {
31 32
             $userId = $msg->userId;
33
+        }
32 34
             $receiverID = $msg->name; //stores id of the person whom message is to be sent
33 35
             $identifier = "";
34 36
 
35
-            if($receiverID > $userId)     // geneate specific unique code to store messages
37
+            if($receiverID > $userId) {
38
+                // geneate specific unique code to store messages
36 39
             {
37 40
                 $user1 = $userId;
41
+            }
38 42
                 $user2 = $receiverID;
39 43
                 $identifier = $userId . ":" . $receiverID;
40
-            }
41
-            else
44
+            } else
42 45
             {
43 46
                 $user1 = $receiverID;
44 47
                 $user2 = $userId;
@@ -57,19 +60,22 @@  discard block
 block discarded – undo
57 60
                 $query = "SELECT * from login where login_id = '$receiverID'";
58 61
 
59 62
                 $result = $this->connect->query($query);
60
-                if($result->num_rows > 0)     // if true
63
+                if($result->num_rows > 0) {
64
+                    // if true
61 65
                 {
62 66
                     //check whether he is sending message for thr first time or he has sent messages before
63 67
                     $query = "SELECT * from total_message where identifier = '$identifier'";
68
+                }
64 69
                     $result = $this->connect->query($query);
65
-                    if($result->num_rows > 0)               // if he has sent messages before
70
+                    if($result->num_rows > 0) {
71
+                        // if he has sent messages before
66 72
                     {
67 73
                         // Update Total_Message Table
68 74
                         $query = "UPDATE total_message SET total_messages = total_messages+1, time = '$time', unread = 1, id = '$time_id' WHERE identifier = '$identifier'";
75
+                    }
69 76
                         return $this->updateMessages($query, $identifier, $reply, $userId, $time);
70 77
 
71
-                    }
72
-                    else    // if he sends message for the first time
78
+                    } else    // if he sends message for the first time
73 79
                     {
74 80
                         // insert Details in Total_Message Table
75 81
                         $query = "INSERT into total_message values('$identifier', 1, '$user1', '$user2', 1, '$time', '$time_id')";
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/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.
src/Session.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -6,6 +6,9 @@
 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
     }
Please login to merge, or discard this patch.
views/logout.php 1 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.
views/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.
views/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.
views/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') . "/views/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')."/views/error.php");
37
-?>
32
+		if($details != NULL) {
33
+					$row = array_merge($row, $details);
34
+		} else {
35
+					header("Location:".getenv('APP_URL')."/views/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')."/views/error.php");
133
+	}
124 134
 	endif;
125
-}
126
-else
135
+} else
127 136
 {
128 137
 	header("Location: ".getenv('APP_URL')."/views/");
129 138
 }
Please login to merge, or discard this patch.