Completed
Push — master ( 798c64...8bad15 )
by Florin
02:22
created
models/friends_model.php 1 patch
Spacing   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -29,16 +29,16 @@  discard block
 block discarded – undo
29 29
                    u.user_colour, 
30 30
                    s.session_id, 
31 31
                    s.session_time
32
-            FROM ". $this->user_friends_table ."
33
-            LEFT JOIN ". USERS_TABLE ." AS u ON u.user_id = ". $this->user_friends_table .".friend_id
34
-            LEFT JOIN ". SESSIONS_TABLE ." AS s ON s.session_user_id = u.user_id
35
-            WHERE ". $this->user_friends_table .".user_id = ". (int)$this->user->data['user_id'] ."
32
+            FROM ". $this->user_friends_table."
33
+            LEFT JOIN ". USERS_TABLE." AS u ON u.user_id = ".$this->user_friends_table.".friend_id
34
+            LEFT JOIN ". SESSIONS_TABLE." AS s ON s.session_user_id = u.user_id
35
+            WHERE ". $this->user_friends_table.".user_id = ".(int)$this->user->data['user_id']."
36 36
             GROUP BY u.user_id
37 37
         ";
38 38
 		$result = $this->db->sql_query($sql);
39 39
 
40 40
 		$friends = array();
41
-		while($row = $this->db->sql_fetchrow($result))
41
+		while ($row = $this->db->sql_fetchrow($result))
42 42
 		{
43 43
 			$friends[] = array(
44 44
 				'user_id' => $row['user_id'],
@@ -63,15 +63,15 @@  discard block
 block discarded – undo
63 63
 					`sender_id`,
64 64
 					`status`,
65 65
 					`time`
66
-			FROM ". $this->friends_request_table ."
67
-			WHERE `user_id` = ". (int)$this->user->data['user_id'] ."
66
+			FROM ". $this->friends_request_table."
67
+			WHERE `user_id` = ". (int)$this->user->data['user_id']."
68 68
                     AND `status` = 0
69 69
 			ORDER BY `time` DESC
70 70
 		";
71 71
 
72 72
 		$result = $this->db->sql_query($sql);
73 73
 
74
-		while($row = $this->db->sql_fetchrow($result))
74
+		while ($row = $this->db->sql_fetchrow($result))
75 75
 		{
76 76
 			$requests[] = $row;
77 77
 		}
@@ -87,8 +87,8 @@  discard block
 block discarded – undo
87 87
 					`sender_id`,
88 88
 					`status`,
89 89
 					`time`
90
-			FROM ". $this->friends_request_table ."
91
-			WHERE `request_id` = ". (int)$id ."
90
+			FROM ". $this->friends_request_table."
91
+			WHERE `request_id` = ". (int)$id."
92 92
                 AND `status` = 0
93 93
 			ORDER BY `time` DESC
94 94
 			LIMIT 1
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 		$result = $this->db->sql_query($sql);
97 97
 		$row = $this->db->sql_fetchrow($result);
98 98
 		
99
-		if($this->approve_friend_request($id))
99
+		if ($this->approve_friend_request($id))
100 100
 		{		
101 101
 			return $row;
102 102
 		}
@@ -114,8 +114,8 @@  discard block
 block discarded – undo
114 114
 					`sender_id`,
115 115
 					`status`,
116 116
 					`time`
117
-			FROM ". $this->friends_request_table ."
118
-			WHERE `sender_id` = ". (int)$sender_id ."
117
+			FROM ". $this->friends_request_table."
118
+			WHERE `sender_id` = ". (int)$sender_id."
119 119
                 AND `status` = 0
120 120
 			ORDER BY `time` DESC
121 121
 			LIMIT 1 
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 
129 129
 	public function insert_friends_request(array $data) {
130 130
 		$sql = "
131
-      INSERT INTO " . $this->friends_request_table . "
131
+      INSERT INTO " . $this->friends_request_table."
132 132
         (
133 133
           `user_id`,
134 134
           `sender_id`,
@@ -137,21 +137,21 @@  discard block
 block discarded – undo
137 137
         )
138 138
       VALUES
139 139
         (
140
-          " . ( int ) $data ['user_id'] . ",
141
-          " . ( int ) $data ['sender_id'] . ",
140
+          " . (int)$data ['user_id'].",
141
+          " . (int)$data ['sender_id'].",
142 142
           0,
143
-          " . time () . "
143
+          " . time()."
144 144
         )
145 145
     ";
146
-		$this->db->sql_query ( $sql );
146
+		$this->db->sql_query($sql);
147 147
 
148
-		return $this->db->sql_nextid ();
148
+		return $this->db->sql_nextid();
149 149
 	}
150 150
 
151 151
 	public function delete_friend_request($request_id)
152 152
 	{
153 153
 		$sql = "
154
-			DELETE FROM ". $this->friends_request_table ." WHERE `request_id` = ". (int)$request_id ."
154
+			DELETE FROM ". $this->friends_request_table." WHERE `request_id` = ".(int)$request_id."
155 155
 		";
156 156
 
157 157
 		return $this->db->sql_query($sql);
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
 	public function approve_friend_request($request_id)
161 161
 	{
162 162
 		$sql = "
163
-			UPDATE ". $this->friends_request_table ." SET `status` = 1 WHERE `request_id` = ". (int)$request_id ."
163
+			UPDATE ". $this->friends_request_table." SET `status` = 1 WHERE `request_id` = ".(int)$request_id."
164 164
 		";
165 165
 
166 166
 		return $this->db->sql_query($sql);
@@ -170,21 +170,21 @@  discard block
 block discarded – undo
170 170
 	{
171 171
 
172 172
 		$check_friend = $this->check_friend($data);
173
-		if($check_friend == false)
173
+		if ($check_friend == false)
174 174
 		{
175 175
 			$sql = "
176
-				INSERT INTO ". $this->user_friends_table ."
176
+				INSERT INTO ". $this->user_friends_table."
177 177
 					(
178 178
 						`user_id`,
179 179
 						`friend_id`
180 180
 					)
181 181
 				VALUES
182 182
 					(
183
-						". (int)$data['user_id'] .",
184
-						". (int)$data['friend_id'] ."
183
+						". (int)$data['user_id'].",
184
+						". (int)$data['friend_id']."
185 185
 					)
186 186
 			";
187
-			if($this->db->sql_query($sql))
187
+			if ($this->db->sql_query($sql))
188 188
 			{
189 189
 				$aux = $data['user_id'];
190 190
 				$data['user_id'] = $data['friend_id'];
@@ -208,13 +208,13 @@  discard block
 block discarded – undo
208 208
 	{
209 209
 		$sql = "
210 210
 			SELECT COUNT(*) AS `count`
211
-			FROM ". $this->user_friends_table ."
212
-			WHERE `user_id` = ". (int)$data['user_id'] ."
213
-			 		AND `friend_id` = ". (int)$data['friend_id'] ."
211
+			FROM ". $this->user_friends_table."
212
+			WHERE `user_id` = ". (int)$data['user_id']."
213
+			 		AND `friend_id` = ". (int)$data['friend_id']."
214 214
 		";
215 215
 		$this->db->sql_query($sql);
216 216
 		$count = $this->db->sql_fetchfield('count');
217
-		if($count > 0)
217
+		if ($count > 0)
218 218
 		{
219 219
 			return true;
220 220
 		}
@@ -228,15 +228,15 @@  discard block
 block discarded – undo
228 228
 	{
229 229
 		$sql = "
230 230
 			SELECT COUNT(*) AS `count`
231
-			FROM ". $this->friends_request_table ."
232
-			WHERE `user_id` = ". (int)$data['user_id'] ."
233
-					AND `sender_id` = ". (int)$data['sender_id'] ."
231
+			FROM ". $this->friends_request_table."
232
+			WHERE `user_id` = ". (int)$data['user_id']."
233
+					AND `sender_id` = ". (int)$data['sender_id']."
234 234
 					AND `status` = 0
235 235
 			LIMIT 1
236 236
 		";
237 237
 		$this->db->sql_query($sql);
238 238
 		$count = $this->db->sql_fetchfield('count');
239
-		if($count > 0)
239
+		if ($count > 0)
240 240
 		{
241 241
 			return true;
242 242
 		}
@@ -248,10 +248,10 @@  discard block
 block discarded – undo
248 248
     
249 249
     public function remove_friend($user_id)
250 250
     {
251
-        $sql = "DELETE FROM ". $this->user_friends_table ." WHERE `user_id` = ". (int)$user_id ."";
251
+        $sql = "DELETE FROM ".$this->user_friends_table." WHERE `user_id` = ".(int)$user_id."";
252 252
         $this->db->sql_query($sql);
253 253
         
254
-        $sql = "DELETE FROM ". $this->user_friends_table ." WHERE `friend_id` = ". (int)$user_id ."";
254
+        $sql = "DELETE FROM ".$this->user_friends_table." WHERE `friend_id` = ".(int)$user_id."";
255 255
         $this->db->sql_query($sql);
256 256
     }
257 257
 
Please login to merge, or discard this patch.
libs/emojione.php 1 patch
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -2401,7 +2401,7 @@  discard block
 block discarded – undo
2401 2401
 	// useful for sending emojis back to mobile devices
2402 2402
 	static function shortnameToUnicode($string) {
2403 2403
 		$string = preg_replace_callback('/'.self::$ignoredRegexp.'|('.self::$shortcodeRegexp.')/Si', 'static::shortnameToUnicodeCallback', $string);
2404
-		if(self::$ascii) {
2404
+		if (self::$ascii) {
2405 2405
 			$string = preg_replace_callback('/'.self::$ignoredRegexp.'|((\\s|^)'.self::$asciiRegexp.'(?=\\s|$|[!,\.]))/S', 'static::asciiToUnicodeCallback', $string);
2406 2406
 		}
2407 2407
 		return $string;
@@ -2414,7 +2414,7 @@  discard block
 block discarded – undo
2414 2414
 	}
2415 2415
 	static function shortnameToImage($string) {
2416 2416
 		$string = preg_replace_callback('/'.self::$ignoredRegexp.'|('.self::$shortcodeRegexp.')/Si', 'static::shortnameToImageCallback', $string);
2417
-		if(self::$ascii) {
2417
+		if (self::$ascii) {
2418 2418
 			$string = preg_replace_callback('/'.self::$ignoredRegexp.'|((\\s|^)'.self::$asciiRegexp.'(?=\\s|$|[!,\.]))/S', 'static::asciiToImageCallback', $string);
2419 2419
 		}
2420 2420
 		return $string;
@@ -2430,7 +2430,7 @@  discard block
 block discarded – undo
2430 2430
 	// ######## preg_replace callbacks
2431 2431
 	// ##########################################
2432 2432
 	static function shortnameToAsciiCallback($m) {
2433
-		if((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
2433
+		if ((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
2434 2434
 			return $m[0];
2435 2435
 		}
2436 2436
 		else {
@@ -2438,7 +2438,7 @@  discard block
 block discarded – undo
2438 2438
 
2439 2439
 			$shortname = $m[0];
2440 2440
 
2441
-			if(!isset(self::$shortcode_replace[$shortname])) {
2441
+			if (!isset(self::$shortcode_replace[$shortname])) {
2442 2442
 				return $m[0];
2443 2443
 			}
2444 2444
 
@@ -2448,7 +2448,7 @@  discard block
 block discarded – undo
2448 2448
 		}
2449 2449
 	}
2450 2450
 	static function shortnameToUnicodeCallback($m) {
2451
-		if((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
2451
+		if ((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
2452 2452
 			return $m[0];
2453 2453
 		}
2454 2454
 		else {
@@ -2456,7 +2456,7 @@  discard block
 block discarded – undo
2456 2456
 
2457 2457
 			$shortname = $m[1];
2458 2458
 
2459
-			if(!isset($flipped[$shortname])) {
2459
+			if (!isset($flipped[$shortname])) {
2460 2460
 				return $m[0];
2461 2461
 			}
2462 2462
 
@@ -2466,13 +2466,13 @@  discard block
 block discarded – undo
2466 2466
 		}
2467 2467
 	}
2468 2468
 	static function shortnameToImageCallback($m) {
2469
-		if((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
2469
+		if ((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
2470 2470
 			return $m[0];
2471 2471
 		}
2472 2472
 		else {
2473 2473
 			$shortname = $m[1];
2474 2474
 
2475
-			if(!isset(self::$shortcode_replace[$shortname])) {
2475
+			if (!isset(self::$shortcode_replace[$shortname])) {
2476 2476
 				return $m[0];
2477 2477
 			}
2478 2478
 
@@ -2480,11 +2480,11 @@  discard block
 block discarded – undo
2480 2480
 			$unicode = self::$shortcode_replace[$shortname];
2481 2481
 			$filename = strtoupper($unicode);
2482 2482
 
2483
-			if(self::$unicodeAlt) { $alt = self::convert($unicode); }
2483
+			if (self::$unicodeAlt) { $alt = self::convert($unicode); }
2484 2484
 			else { $alt = $shortname; }
2485 2485
 
2486
-			if(self::$imageType == 'png') {
2487
-				if(self::$sprites) {
2486
+			if (self::$imageType == 'png') {
2487
+				if (self::$sprites) {
2488 2488
 					return '<span class="emojione-'.strtoupper($unicode).'" title="'.htmlspecialchars($shortname).'">'.$alt.'</span>';
2489 2489
 				}
2490 2490
 				else {
@@ -2492,7 +2492,7 @@  discard block
 block discarded – undo
2492 2492
 				}
2493 2493
 			}
2494 2494
 
2495
-			if(self::$sprites) {
2495
+			if (self::$sprites) {
2496 2496
 				return '<svg class="emojione"><description>'.$alt.'</description><use xlink:href="'.self::$imagePathSVGSprites.'#emoji-'.strtoupper($unicode).'"></use></svg>';
2497 2497
 			}
2498 2498
 			else {
@@ -2501,7 +2501,7 @@  discard block
 block discarded – undo
2501 2501
 		}
2502 2502
 	}
2503 2503
 	static function asciiToUnicodeCallback($m) {
2504
-		if((!is_array($m)) || (!isset($m[3])) || (empty($m[3]))) {
2504
+		if ((!is_array($m)) || (!isset($m[3])) || (empty($m[3]))) {
2505 2505
 			return $m[0];
2506 2506
 		}
2507 2507
 		else {
@@ -2511,7 +2511,7 @@  discard block
 block discarded – undo
2511 2511
 		}
2512 2512
 	}
2513 2513
 	static function asciiToImageCallback($m) {
2514
-		if((!is_array($m)) || (!isset($m[3])) || (empty($m[3]))) {
2514
+		if ((!is_array($m)) || (!isset($m[3])) || (empty($m[3]))) {
2515 2515
 			return $m[0];
2516 2516
 		}
2517 2517
 		else {
@@ -2519,11 +2519,11 @@  discard block
 block discarded – undo
2519 2519
 			$unicode = self::$ascii_replace[$shortname];
2520 2520
 
2521 2521
 			// unicode char or shortname for the alt tag? (unicode is better for copying and pasting the resulting text)
2522
-			if(self::$unicodeAlt) { $alt = self::convert($unicode); }
2522
+			if (self::$unicodeAlt) { $alt = self::convert($unicode); }
2523 2523
 			else { $alt = htmlspecialchars($shortname); }
2524 2524
 
2525
-			if(self::$imageType == 'png') {
2526
-				if(self::$sprites) {
2525
+			if (self::$imageType == 'png') {
2526
+				if (self::$sprites) {
2527 2527
 					return $m[2].'<span class="emojione-'.strtoupper($unicode).'" title="'.htmlspecialchars($shortname).'">'.$alt.'</span>';
2528 2528
 				}
2529 2529
 				else {
@@ -2531,7 +2531,7 @@  discard block
 block discarded – undo
2531 2531
 				}
2532 2532
 			}
2533 2533
 
2534
-			if(self::$sprites) {
2534
+			if (self::$sprites) {
2535 2535
 				return $m[2].'<svg class="emojione"><description>'.$alt.'</description><use xlink:href="'.self::$imagePathSVGSprites.'#emoji-'.strtoupper($unicode).'"></use></svg>';
2536 2536
 			}
2537 2537
 			else {
@@ -2540,14 +2540,14 @@  discard block
 block discarded – undo
2540 2540
 		}
2541 2541
 	}
2542 2542
 	static function toShortCallback($m) {
2543
-		if((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
2543
+		if ((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
2544 2544
 			return $m[0];
2545 2545
 		}
2546 2546
 		else {
2547 2547
 			$unicode = $m[1];
2548
-			if(!isset(self::$unicode_replace[$unicode])) {
2548
+			if (!isset(self::$unicode_replace[$unicode])) {
2549 2549
 				$unicode = substr($m[1], 0, 4);
2550
-				if(!isset(self::$unicode_replace[$unicode])) {
2550
+				if (!isset(self::$unicode_replace[$unicode])) {
2551 2551
 					return $m[0];
2552 2552
 				}
2553 2553
 			}
@@ -2556,15 +2556,15 @@  discard block
 block discarded – undo
2556 2556
 		}
2557 2557
 	}
2558 2558
 	static function unicodeToImageCallback($m) {
2559
-		if((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
2559
+		if ((!is_array($m)) || (!isset($m[1])) || (empty($m[1]))) {
2560 2560
 			return $m[0];
2561 2561
 		}
2562 2562
 		else {
2563 2563
 			$unicode = $m[1];
2564 2564
 
2565
-			if(!isset(self::$unicode_replace[$unicode])) {
2565
+			if (!isset(self::$unicode_replace[$unicode])) {
2566 2566
 				$unicode = substr($m[1], 0, 4);
2567
-				if(!isset(self::$unicode_replace[$unicode])) {
2567
+				if (!isset(self::$unicode_replace[$unicode])) {
2568 2568
 					return $m[0];
2569 2569
 				}
2570 2570
 			}
@@ -2572,11 +2572,11 @@  discard block
 block discarded – undo
2572 2572
 			$shortname = self::$unicode_replace[$unicode];
2573 2573
 			$filename = strtoupper(self::$shortcode_replace[$shortname]);
2574 2574
 
2575
-			if(self::$unicodeAlt) { $alt = $unicode; }
2575
+			if (self::$unicodeAlt) { $alt = $unicode; }
2576 2576
 			else { $alt = $shortname; }
2577 2577
 
2578
-			if(self::$imageType == 'png') {
2579
-				if(self::$sprites) {
2578
+			if (self::$imageType == 'png') {
2579
+				if (self::$sprites) {
2580 2580
 					return '<span class="emojione-'.strtoupper($unicode).'" title="'.htmlspecialchars($shortname).'">'.$alt.'</span>';
2581 2581
 				}
2582 2582
 				else {
@@ -2584,7 +2584,7 @@  discard block
 block discarded – undo
2584 2584
 				}
2585 2585
 			}
2586 2586
 
2587
-			if(self::$sprites) {
2587
+			if (self::$sprites) {
2588 2588
 				return '<svg class="emojione"><description>'.$alt.'</description><use xlink:href="'.self::$imagePathSVGSprites.'#emoji-'.strtoupper($unicode).'"></use></svg>';
2589 2589
 			}
2590 2590
 			else {
@@ -2597,9 +2597,9 @@  discard block
 block discarded – undo
2597 2597
 	// ######## helper methods
2598 2598
 	// ##########################################
2599 2599
 	static function convert($unicode) {
2600
-		if(stristr($unicode,'-')) {
2601
-			$pairs = explode('-',$unicode);
2602
-			return '&#x'.implode(';&#x',$pairs).';';
2600
+		if (stristr($unicode, '-')) {
2601
+			$pairs = explode('-', $unicode);
2602
+			return '&#x'.implode(';&#x', $pairs).';';
2603 2603
 		}
2604 2604
 		else {
2605 2605
 			return '&#x'.$unicode.';';
Please login to merge, or discard this patch.
migrations/m3_ucp_friends_module.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 					array(
21 21
 						'module_basename'   => '\florinp\messenger\ucp\ucp_friends_module',
22 22
 						'module_class' => 'ucp_friends_module',
23
-						'modes' => array('friends','requests'),
23
+						'modes' => array('friends', 'requests'),
24 24
 					),
25 25
 				)
26 26
 			),
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 					array(
37 37
 						'module_basename'   => '\florinp\messenger\ucp\ucp_friends_module',
38 38
 						'module_class' => 'ucp_friends_module',
39
-						'modes' => array('friends','requests'),
39
+						'modes' => array('friends', 'requests'),
40 40
 					)
41 41
 				)
42 42
 			),
Please login to merge, or discard this patch.
notification/type/friend_request.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -63,12 +63,12 @@
 block discarded – undo
63 63
   public function get_title()
64 64
   {
65 65
 	$user_id = $this->user_loader->load_user_by_username($this->get_data('sender_username'));
66
-	return $this->user->lang('FRIEND_REQUEST_FROM') .$this->user_loader->get_username($user_id, 'no_profile');
66
+	return $this->user->lang('FRIEND_REQUEST_FROM').$this->user_loader->get_username($user_id, 'no_profile');
67 67
   }
68 68
 
69 69
   public function get_url()
70 70
   {
71
-	return append_sid($this->phpbb_root_path . 'ucp.' . $this->php_ext, "i=-florinp-messenger-ucp-ucp_friends_module&amp;mode=requests");
71
+	return append_sid($this->phpbb_root_path.'ucp.'.$this->php_ext, "i=-florinp-messenger-ucp-ucp_friends_module&amp;mode=requests");
72 72
   }
73 73
 
74 74
   public function get_avatar()
Please login to merge, or discard this patch.
ucp/ucp_friends_module.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -17,22 +17,22 @@  discard block
 block discarded – undo
17 17
 
18 18
 	$this->tpl_name = 'friends';
19 19
 
20
-	switch($mode)
20
+	switch ($mode)
21 21
 	{
22 22
 	  case 'friends':
23 23
 		
24 24
 		$action = $request->variable('action', '');
25
-		switch($action)
25
+		switch ($action)
26 26
 		{
27 27
 			case 'add_friend':
28 28
 				$user_id = $request->variable('user_id', 0);
29
-				if($user_id > 0)
29
+				if ($user_id > 0)
30 30
 				{
31
-				  if(confirm_box(true))
31
+				  if (confirm_box(true))
32 32
 				  {
33 33
 					$user_id = $request->variable('user_id', 0);
34 34
 					$redirect_url = $request->variable('redirect_url', '');
35
-					if($friends_controller->send_request($user_id))
35
+					if ($friends_controller->send_request($user_id))
36 36
 					{
37 37
 					  redirect($redirect_url);
38 38
 					}
@@ -71,17 +71,17 @@  discard block
 block discarded – undo
71 71
 			}
72 72
 		  break;
73 73
 			default:
74
-				if($request->is_set_post('action'))
74
+				if ($request->is_set_post('action'))
75 75
 				{
76 76
 					$action = $request->variable('action', '');
77
-					switch($action) 
77
+					switch ($action) 
78 78
 					{
79 79
 						case 'remove':
80
-							if(confirm_box(true))
80
+							if (confirm_box(true))
81 81
 							{
82 82
 								$user_id = $request->variable('user_id', array(0));
83 83
 								$redirect_url = $request->variable('redirect_url', '');
84
-								if($friends_controller->remove_friend($user_id))
84
+								if ($friends_controller->remove_friend($user_id))
85 85
 								{
86 86
 								  redirect($redirect_url);
87 87
 								}
@@ -106,15 +106,15 @@  discard block
 block discarded – undo
106 106
 
107 107
 	  case 'requests':
108 108
 
109
-		if($request->is_set_post('action'))
109
+		if ($request->is_set_post('action'))
110 110
 		{
111 111
 		  $action = $request->variable('action', '');
112 112
 
113
-		  switch($action)
113
+		  switch ($action)
114 114
 		  {
115 115
 			case 'delete':
116 116
 
117
-			  if(confirm_box(true))
117
+			  if (confirm_box(true))
118 118
 			  {
119 119
 				$requests_id = $request->variable('requests_id', array(0));
120 120
 				$friends_controller->delete_request($requests_id);
@@ -138,14 +138,14 @@  discard block
 block discarded – undo
138 138
 		}
139 139
         
140 140
 		$action = $request->variable('action', '');
141
-		switch($action)
141
+		switch ($action)
142 142
 		{
143 143
 			case 'cancel_request':
144
-				if(confirm_box(true))
144
+				if (confirm_box(true))
145 145
 			  {
146 146
 				$request_id = $request->variable('request_id', 0);
147 147
 				$redirect_url = $request->variable('redirect_url', '');
148
-				if($friends_controller->delete_request($request_id))
148
+				if ($friends_controller->delete_request($request_id))
149 149
 				{
150 150
 					redirect($redirect_url);
151 151
 				}
Please login to merge, or discard this patch.
libs/database.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -12,8 +12,8 @@  discard block
 block discarded – undo
12 12
     {
13 13
         global $phpbb_root_path;
14 14
 
15
-        $database = $phpbb_root_path . 'store/messenger.db';
16
-        parent::__construct('sqlite:' . $database);
15
+        $database = $phpbb_root_path.'store/messenger.db';
16
+        parent::__construct('sqlite:'.$database);
17 17
         parent::setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
18 18
     }
19 19
 
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
         //ksort($data);
42 42
 
43 43
         $fieldNames = implode('`, `', array_keys($data));
44
-        $fieldValues = ':' . implode(', :', array_keys($data));
44
+        $fieldValues = ':'.implode(', :', array_keys($data));
45 45
 
46 46
         $sth = $this->prepare("INSERT INTO $table (`$fieldNames`) VALUES ($fieldValues)");
47 47
 
Please login to merge, or discard this patch.
libs/upload.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -147,10 +147,10 @@  discard block
 block discarded – undo
147 147
      */
148 148
     public function __construct($phpbb_root_path)
149 149
     {
150
-            $phpbb_root_path = $phpbb_root_path . 'store/messenger/files';
150
+            $phpbb_root_path = $phpbb_root_path.'store/messenger/files';
151 151
         // set & create destination path
152 152
         if (!$this->set_destination($phpbb_root_path)) {
153
-            throw new Exception('Upload: Can\'t create destination. ' . $this->root . $this->destination);
153
+            throw new Exception('Upload: Can\'t create destination. '.$this->root.$this->destination);
154 154
         }
155 155
 
156 156
         //create finfo object
@@ -244,8 +244,8 @@  discard block
 block discarded – undo
244 244
         $this->file['filename'] = $this->filename;
245 245
 
246 246
         //set full path
247
-        $this->file['full_path'] = $this->root . $this->destination . $this->filename;
248
-        $this->file['path'] = $this->destination . $this->filename;
247
+        $this->file['full_path'] = $this->root.$this->destination.$this->filename;
248
+        $this->file['path'] = $this->destination.$this->filename;
249 249
 
250 250
         $status = move_uploaded_file($this->tmp_name, $this->file['full_path']);
251 251
 
@@ -476,7 +476,7 @@  discard block
 block discarded – undo
476 476
      */
477 477
     protected function set_destination($destination)
478 478
     {
479
-        $this->destination = $destination . DIRECTORY_SEPARATOR;
479
+        $this->destination = $destination.DIRECTORY_SEPARATOR;
480 480
         return $this->destination_exist() ? TRUE : $this->create_destination();
481 481
     }
482 482
 
@@ -487,7 +487,7 @@  discard block
 block discarded – undo
487 487
      */
488 488
     protected function destination_exist()
489 489
     {
490
-        return is_writable($this->root . $this->destination);
490
+        return is_writable($this->root.$this->destination);
491 491
     }
492 492
 
493 493
     /**
@@ -497,7 +497,7 @@  discard block
 block discarded – undo
497 497
      */
498 498
     protected function create_destination()
499 499
     {
500
-        return mkdir($this->root . $this->destination, $this->default_permissions, true);
500
+        return mkdir($this->root.$this->destination, $this->default_permissions, true);
501 501
     }
502 502
 
503 503
     /**
@@ -507,7 +507,7 @@  discard block
 block discarded – undo
507 507
      */
508 508
     protected function create_new_filename()
509 509
     {
510
-        $filename = sha1(mt_rand(1, 9999) . $this->destination . uniqid()) . time() . '.' . $this->extension;
510
+        $filename = sha1(mt_rand(1, 9999).$this->destination.uniqid()).time().'.'.$this->extension;
511 511
         $this->set_filename($filename);
512 512
     }
513 513
 
Please login to merge, or discard this patch.
libs/download.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
      * @param string $phpbb_root_path phpBB root path
34 34
      */
35 35
     public function __construct($phpbb_root_path) {
36
-        $this->directory = $phpbb_root_path . 'store/messenger/files';
36
+        $this->directory = $phpbb_root_path.'store/messenger/files';
37 37
     }
38 38
 
39 39
 
@@ -43,10 +43,10 @@  discard block
 block discarded – undo
43 43
      * @throws InvalidArgumentException when the file not exist or is not readable
44 44
      */
45 45
     public function setFile($filename) {
46
-        $file_full_path = $this->directory . '/'. $filename;
47
-        if(!is_file($file_full_path)) {
46
+        $file_full_path = $this->directory.'/'.$filename;
47
+        if (!is_file($file_full_path)) {
48 48
             throw new InvalidArgumentException("File does not exist");
49
-        } else if(!is_readable($file_full_path)) {
49
+        } else if (!is_readable($file_full_path)) {
50 50
             throw new InvalidArgumentException("File to download is not readable.");
51 51
         }
52 52
         $this->filename = $filename;
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
      * @param bool|true $forceDownload
81 81
      */
82 82
     public function sendDownload($forceDownload = true) {
83
-        if(headers_sent()) {
83
+        if (headers_sent()) {
84 84
             throw new \RuntimeException("Cannot send file to the browser, since the headers were already sent");
85 85
         }
86 86
         $mimeType = $this->getMimeType();
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
         header("Cache-Control: private", false);
96 96
         header("Content-Type: application/octet-stream");
97 97
 
98
-        if($forceDownload) {
98
+        if ($forceDownload) {
99 99
             header("Content-Disposition: attachment; filename=\"{$this->filename}\";");
100 100
         } else {
101 101
             header("Content-Disposition: filename=\"{$this->filename}\";");
Please login to merge, or discard this patch.
controller/main.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -219,7 +219,7 @@
 block discarded – undo
219 219
         }
220 220
 
221 221
         $friends = $this->model->getFriends();
222
-        $friends_online = array_filter($friends, function ($friend) {
222
+        $friends_online = array_filter($friends, function($friend) {
223 223
             return $friend['user_status'] != 0;
224 224
         });
225 225
 
Please login to merge, or discard this patch.