Completed
Push — master ( dfdb4c...98f390 )
by Sam
23:19
created
gfunctions.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -332,7 +332,9 @@  discard block
 block discarded – undo
332 332
     } elseif ($type == 'boolean') {
333 333
         return ($input === 'true');
334 334
     } elseif ($type == 'intbool') {
335
-        if ($input == 1 || $input == 0) return $input;
335
+        if ($input == 1 || $input == 0) {
336
+            return $input;
337
+        }
336 338
     } else {
337 339
         return 0;
338 340
     }
@@ -388,8 +390,9 @@  discard block
 block discarded – undo
388 390
     $url .= "?s=$s&d=$d&r=$r";
389 391
     if ( $img ) {
390 392
         $url = '<img src="' . $url . '"';
391
-        foreach ( $atts as $key => $val )
392
-            $url .= ' ' . $key . '="' . $val . '"';
393
+        foreach ( $atts as $key => $val ) {
394
+                    $url .= ' ' . $key . '="' . $val . '"';
395
+        }
393 396
         $url .= ' />';
394 397
     }
395 398
     return $url;
Please login to merge, or discard this patch.
views/steam/dashboard.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@
 block discarded – undo
41 41
 								</div>
42 42
 							</div>
43 43
 						</li>
44
-			<?php }elseif ($row['type'] == 'waste') { ?>
44
+			<?php } elseif ($row['type'] == 'waste') { ?>
45 45
 						<li class="list-danger">
46 46
 							<i class=" fa fa-ellipsis-v"></i>
47 47
 							<div class="task-title">
Please login to merge, or discard this patch.
views/steam/life/dashboard.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -272,7 +272,8 @@  discard block
 block discarded – undo
272 272
                                     </tbody>
273 273
                                 </table>
274 274
                                 <?php echo '<a class="fa fa-caret-right fa-2x" style="float: right; padding-right:15px;" href="' . $settings['url'] . 'houses/' . $player->playerid . '"> More</a>';
275
-                            } else echo $lang['noHouse'] ?>
275
+                            } else {
276
+                                echo $lang['noHouse'] ?>
276 277
                         </div>
277 278
                     </div>
278 279
                 <?php } if ($player->playerid == $_SESSION['playerid']) { ?>
@@ -281,6 +282,7 @@  discard block
 block discarded – undo
281 282
                         <?php
282 283
                             $sql = "SELECT `classname`,`type`,`id`,`plate` FROM `vehicles` WHERE `pid` = '" . $player->playerid . "' ORDER BY `id` DESC LIMIT 8";
283 284
                             }
285
+                            }
284 286
                             $result_of_query = $db_link->query($sql);
285 287
                             if ($result_of_query->num_rows > 0) {
286 288
                                 $veh = $result_of_query->fetch_object();
Please login to merge, or discard this patch.
views/steam/life/houses.php 1 patch
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -7,13 +7,17 @@  discard block
 block discarded – undo
7 7
     $sql = "SELECT `id` FROM `houses` INNER JOIN `players` ON houses.pid=players.playerid WHERE `id` LIKE '" . $search . "' OR `pos` LIKE '" . $search . "' OR `inventory` LIKE '%" . $search . "%' OR `name` LIKE '%" . $search . "%' AND `pid` = '" . $_SESSION['playerid'] . "';";
8 8
     $result_of_query = $db_link->query($sql);
9 9
     $total_records = mysqli_num_rows($result_of_query);
10
-    if ($pageNum > $total_records) $pageNum = $total_records;
10
+    if ($pageNum > $total_records) {
11
+        $pageNum = $total_records;
12
+    }
11 13
     $sql = "SELECT `id`,`pid`,`pos`,`name`,`owned` FROM `houses` INNER JOIN `players` ON houses.pid=players.playerid WHERE `id` LIKE '" . $search . "' OR `pos` LIKE '" . $search . "' OR `inventory` LIKE '%" . $search . "%' OR `name` LIKE '%" . $search . "%' AND `pid` = '" . $_SESSION['playerid'] . "' " . $max . " ;";
12 14
 } else {
13 15
     $sql = "SELECT `id` FROM `houses`;";
14 16
     $result_of_query = $db_link->query($sql);
15 17
     $total_records = mysqli_num_rows($result_of_query);
16
-    if ($pageNum > $total_records) $pageNum = $total_records;
18
+    if ($pageNum > $total_records) {
19
+        $pageNum = $total_records;
20
+    }
17 21
     $sql = "SELECT `id`,`pid`,`pos`,`name`,`owned` FROM `houses` INNER JOIN `players` ON houses.pid=players.playerid AND `pid` = '" . $_SESSION['playerid'] . "' " . $max . " ;";
18 22
 }
19 23
 
@@ -65,4 +69,6 @@  discard block
 block discarded – undo
65 69
     </div>
66 70
 
67 71
 <?php
68
-} else echo errorMessage(3, $lang);
69 72
\ No newline at end of file
73
+} else {
74
+    echo errorMessage(3, $lang);
75
+}
Please login to merge, or discard this patch.
views/steam/life/cars.php 1 patch
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -10,13 +10,17 @@  discard block
 block discarded – undo
10 10
     $sql = "SELECT `id`,`pid`,`classname`,`active`,`type`,`plate`,`alive`,`active` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid WHERE `pid` LIKE '" . $_SESSION['playerid'] . "' OR `classname` LIKE '%" . $search . "%' OR `name` LIKE '%" . $search . "%' OR `plate` LIKE '" . $search . "' OR `inventory` LIKE '%" . $search . "%';";
11 11
     $result_of_query = $db_link->query($sql);
12 12
     $total_records = mysqli_num_rows($result_of_query);
13
-    if ($pageNum > $total_records) $pageNum = $total_records;
13
+    if ($pageNum > $total_records) {
14
+        $pageNum = $total_records;
15
+    }
14 16
     $sql = "SELECT `id`,`pid`,`classname`,`active`,`type`,`plate`,`alive`,`active` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid WHERE `pid` LIKE '" . $_SESSION['playerid'] . "' OR `classname` LIKE '%" . $search . "%' OR `name` LIKE '%" . $search . "%' OR `plate` LIKE '" . $search . "' OR `inventory` LIKE '%" . $search . "%'" . $max . " ;";
15 17
 } else {
16 18
     $sql = "SELECT `id` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid WHERE `pid` LIKE '" . $_SESSION['playerid'] . "';";
17 19
     $result_of_query = $db_link->query($sql);
18 20
     $total_records = mysqli_num_rows($result_of_query);
19
-    if ($pageNum > $total_records) $pageNum = $total_records;
21
+    if ($pageNum > $total_records) {
22
+        $pageNum = $total_records;
23
+    }
20 24
     $sql = "SELECT `id`,`pid`,`classname`,`active`,`type`,`plate`,`alive`,`active` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid WHERE `pid` LIKE '" . $_SESSION['playerid'] . "' " . $max . " ;";
21 25
 }
22 26
 $result_of_query = $db_link->query($sql);
@@ -74,4 +78,6 @@  discard block
 block discarded – undo
74 78
     </table>
75 79
 </div>
76 80
 <?php
77
-} else echo errorMessage(3, $lang);
78 81
\ No newline at end of file
82
+} else {
83
+    echo errorMessage(3, $lang);
84
+}
Please login to merge, or discard this patch.
views/steam/life/player.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -277,7 +277,9 @@  discard block
 block discarded – undo
277 277
                                     </tbody>
278 278
                                 </table>
279 279
                                 <?php echo '<a class="fa fa-caret-right fa-2x" style="float: right; padding-right:15px;" href="' . $settings['url'] . 'houses/' . $player->playerid . '"> More</a>';
280
-                            } else  echo errorMessage(31, $lang);
280
+                            } else {
281
+                                echo errorMessage(31, $lang);
282
+                            }
281 283
                         < / div >
282 284
                     < / div >
283 285
                 < ? php } ?>
@@ -313,7 +315,9 @@  discard block
 block discarded – undo
313 315
                                 echo '</tbody></table>';
314 316
                                 echo '<a class="fa fa-caret-right fa-2x" style="float: right; padding-right:15px;" href="' . $settings['url'] . 'vehicles/' . $player->playerid . '"> More</a>';
315 317
 
316
-                            } else  echo errorMessage(31, $lang);
318
+                            } else {
319
+                                echo errorMessage(31, $lang);
320
+                            }
317 321
                         ?>
318 322
                         </div>
319 323
                     </div>
Please login to merge, or discard this patch.
views/core/servers.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@
 block discarded – undo
30 30
 								</div>
31 31
 							</div>
32 32
 						</li>
33
-					<?php }elseif ($row['type'] == 'waste') { ?>
33
+					<?php } elseif ($row['type'] == 'waste') { ?>
34 34
 						<li class="list-danger">
35 35
 							<i class=" fa fa-ellipsis-v"></i>
36 36
 							<div class="task-title">
Please login to merge, or discard this patch.
views/core/dashboard.php 1 patch
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,10 @@
 block discarded – undo
5 5
         </h1>
6 6
     </div>
7 7
 </div>
8
-<?php if (isset($_SESSION['update'])) echo '<div class="alert alert-info" role="alert">' . $land['updateMessage'] . ' (' . $_SESSION['message']->version . ')</div>'; ?>
8
+<?php if (isset($_SESSION['update'])) {
9
+    echo '<div class="alert alert-info" role="alert">' . $land['updateMessage'] . ' (' . $_SESSION['message']->version . ')</div>';
10
+}
11
+?>
9 12
 
10 13
 <div class="row mt mb">
11 14
   <div class="col-md-12">
Please login to merge, or discard this patch.
views/core/settings.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,7 +70,9 @@  discard block
 block discarded – undo
70 70
             <?php
71 71
             foreach ($settings['installedLanguage'] as $language) {
72 72
                 echo '<option value = "' . $language[1] . '" ';
73
-                if ($settings['language'] == $language[1]) echo 'selected';
73
+                if ($settings['language'] == $language[1]) {
74
+                    echo 'selected';
75
+                }
74 76
                 echo '> ' . $language[0] . '</option>';
75 77
             } ?>
76 78
         </select></div>
@@ -196,7 +198,9 @@  discard block
 block discarded – undo
196 198
     <span class='input-group-btn'><button style='margin-top: 21px;' class='btn btn-default reveal' type='button'><i class='fa fa-eye-slash'></i></button></span></div>
197 199
 
198 200
     <?php
199
-    if (!isset($pluginSettings)) echo '<h3>' . $lang['plugin'] . ' ' . $lang['settings'] . '</h3>';
201
+    if (!isset($pluginSettings)) {
202
+        echo '<h3>' . $lang['plugin'] . ' ' . $lang['settings'] . '</h3>';
203
+    }
200 204
     foreach ($settings['plugins'] as &$plugin) {
201 205
         if (file_exists("plugins/" . $plugin . "/settings.php")) {
202 206
             include("plugins/" . $plugin . "/settings.php");
Please login to merge, or discard this patch.