Completed
Push — master ( ac04d5...f7aa57 )
by Sam
02:51
created
views/life/editVeh.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -321,4 +321,6 @@
 block discarded – undo
321 321
             </div>
322 322
         </div>
323 323
     </div>
324
-<?php } else echo "<h1>" . errorMessage(32, $lang) . "</h1>";
325 324
\ No newline at end of file
325
+<?php } else {
326
+    echo "<h1>" . errorMessage(32, $lang) . "</h1>";
327
+}
Please login to merge, or discard this patch.
views/life/medics.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 						</ul>
72 72
 					</div>
73 73
 					<?php
74
-                    echo "<a class='btn btn-primary' href='" . $settings['url'] . "medic/".$total_pages."'>" . $lang['last'] . "</a></center>";
74
+                    echo "<a class='btn btn-primary' href='" . $settings['url'] . "medic/" . $total_pages . "'>" . $lang['last'] . "</a></center>";
75 75
                 } ?>
76 76
                 <br>
77 77
                 </tbody>
@@ -79,5 +79,5 @@  discard block
 block discarded – undo
79 79
         </div>
80 80
     </div>
81 81
 <?php } else {
82
-    echo '<h1>'.errorMessage(36,$lang).'</h1>';
82
+    echo '<h1>' . errorMessage(36, $lang) . '</h1>';
83 83
 }
Please login to merge, or discard this patch.
views/life/notes.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -89,7 +89,8 @@  discard block
 block discarded – undo
89 89
             </div>
90 90
             <div class="col-md-3 pull-right">
91 91
                 <form style="float:right;" name='search'>
92
-                    <input id='searchText' type='text' name='searchText' placeholder="<?php if (isset($search)) echo $search ?>">
92
+                    <input id='searchText' type='text' name='searchText' placeholder="<?php if (isset($search)) {
93
+    echo $search ?>">
93 94
                     <input class='btn btn-sm btn-primary' type='button' name='search'
94 95
                            onclick='searchpage();' value='<?php echo $lang['search'] ?>'>
95 96
                 </form>
@@ -99,7 +100,9 @@  discard block
 block discarded – undo
99 100
         <table class="table table-striped table-advance table-hover">
100 101
             <thead>
101 102
             <tr>
102
-                <th><i class="fa fa-eye"></i> <?php echo $lang['owner']; ?></th>
103
+                <th><i class="fa fa-eye"></i> <?php echo $lang['owner'];
104
+}
105
+?></th>
103 106
                 <th><i class="fa fa-car"></i> <?php echo $lang['class']; ?></th>
104 107
                 <th class="hidden-xs"><i class="fa fa-car"></i> <?php echo $lang['type']; ?></th>
105 108
                 <th class="hidden-xs"><i class="fa fa-car"></i> <?php echo $lang['plate']; ?></th>
Please login to merge, or discard this patch.
views/life/police.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
 						</div>
75 75
 
76 76
 						<?php
77
-                        echo "<a class='btn btn-primary' href='" . $settings['url'] . "police/".$total_pages."'>" . $lang['last'] . "</a></center>";
77
+                        echo "<a class='btn btn-primary' href='" . $settings['url'] . "police/" . $total_pages . "'>" . $lang['last'] . "</a></center>";
78 78
                     }
79 79
                     ?>
80 80
                     <br>
Please login to merge, or discard this patch.
views/databases.php 1 patch
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,4 +68,6 @@
 block discarded – undo
68 68
         </div>
69 69
     </div>
70 70
 <?php
71
-} else  echo errorMessage(3, $lang);
72 71
\ No newline at end of file
72
+} else {
73
+    echo errorMessage(3, $lang);
74
+}
Please login to merge, or discard this patch.
index.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@
 block discarded – undo
87 87
     if (!$db_connection->connect_errno) {
88 88
         if ($login->isUserLoggedIn() == true) {
89 89
 
90
-           if ($_SESSION['multiDB'] && isset($_POST['dbid']) && isset($_POST['type'])) {
90
+            if ($_SESSION['multiDB'] && isset($_POST['dbid']) && isset($_POST['type'])) {
91 91
                 $_SESSION['server_type'] = $_POST['type'];
92 92
                 $_SESSION['dbid'] = $_POST['dbid'];
93 93
             }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@
 block discarded – undo
101 101
             $_SESSION['formtoken'][1] = time();
102 102
 
103 103
             if (isset($_GET['items'])) {
104
-                if (in_array($_GET['items'],$settings['item'])) {
104
+                if (in_array($_GET['items'], $settings['item'])) {
105 105
                     $sql = "UPDATE `users` SET `items` = " . $_GET['items'] . " WHERE `user_id` = '" . $_SESSION['user_id'] . "' ";
106 106
                     $db_connection->query($sql);
107 107
                     $_SESSION['items'] = intval($_GET['items']);
Please login to merge, or discard this patch.
Braces   +12 added lines, -5 removed lines patch added patch discarded remove patch
@@ -514,15 +514,20 @@  discard block
 block discarded – undo
514 514
             if ($settings['2factor']) {
515 515
                 if ($_SESSION['2factor'] == 0) {
516 516
                 if ($settings['force2factor'] == 'steam') {
517
-                    if (!$_SESSION['steamsignon']) $_SESSION['2factor'] == 5;
518
-                } elseif ($settings['force2factor'] == 'all') $_SESSION['2factor'] == 5;
517
+                    if (!$_SESSION['steamsignon']) {
518
+                        $_SESSION['2factor'] == 5;
519
+                    }
520
+                } elseif ($settings['force2factor'] == 'all') {
521
+                    $_SESSION['2factor'] == 5;
522
+                }
519 523
                     $page = 'views/core/2factor.php';
520 524
                 } elseif ($_SESSION['2factor'] == 1 || $_SESSION['2factor'] == 3) {
521 525
                 if (isset($_POST['code'])) {
522 526
                     $sql = "SELECT `twoFactor` FROM `users` WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
523 527
                     $user = $db_connection->query($sql)->fetch_object();
524
-                    if ($gauth->verifyCode($user->twoFactor, $_POST['code'])) $_SESSION['2factor'] = 2;
525
-                    else {
528
+                    if ($gauth->verifyCode($user->twoFactor, $_POST['code'])) {
529
+                        $_SESSION['2factor'] = 2;
530
+                    } else {
526 531
                     $sql = "SELECT `backup` FROM `users` WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
527 532
                     $user = $db_connection->query($sql)->fetch_object();
528 533
                     if ($user->backup == $_POST['code']) {
@@ -532,7 +537,9 @@  discard block
 block discarded – undo
532 537
                         $page = 'views/core/2factor.php';
533 538
                     }
534 539
                     }
535
-                } else $page = 'views/core/2factor.php';
540
+                } else {
541
+                    $page = 'views/core/2factor.php';
542
+                }
536 543
                 }
537 544
             }
538 545
 
Please login to merge, or discard this patch.
hooks/rcon_ban.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,8 +18,7 @@
 block discarded – undo
18 18
         {
19 19
             $cmd = 'ban ' . $rid . ' ' . $time . ' ' . $reason;
20 20
             $answer = rcon(decrypt($server->sq_ip), decrypt($server->sq_port), decrypt($server->rcon_pass), $cmd);
21
-        }
22
-        catch (Exception $e)
21
+        } catch (Exception $e)
23 22
         {
24 23
             echo $e->getMessage( );
25 24
         }
Please login to merge, or discard this patch.
hooks/rcon_players.php 1 patch
Braces   +4 added lines, -3 removed lines patch added patch discarded remove patch
@@ -18,7 +18,9 @@  discard block
 block discarded – undo
18 18
             $array = preg_split('/$\R?^/m', $out);
19 19
             $playersr = array();
20 20
 
21
-            if ($array[0] == '(0 players in total')  $array = array();
21
+            if ($array[0] == '(0 players in total') {
22
+                $array = array();
23
+            }
22 24
 
23 25
             for ($i = 0; $i < count($array); $i++)
24 26
             {
@@ -27,8 +29,7 @@  discard block
 block discarded – undo
27 29
 
28 30
             echo json_encode($playersr);
29 31
 
30
-        }
31
-        catch (Exception $e)
32
+        } catch (Exception $e)
32 33
         {
33 34
             echo $e->getMessage( );
34 35
             var_dump($e);
Please login to merge, or discard this patch.
hooks/rcon_command.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,8 +20,7 @@
 block discarded – undo
20 20
             try
21 21
             {
22 22
                 $answer = rcon(decrypt($server->sq_ip), decrypt($server->sq_port), decrypt($server->rcon_pass), $cmd);
23
-            }
24
-            catch (Exception $e)
23
+            } catch (Exception $e)
25 24
             {
26 25
                 echo $e->getMessage( );
27 26
             }
Please login to merge, or discard this patch.