Completed
Push — master ( 3d3b9a...9e5156 )
by Sam
14s
created
views/templates/template.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,9 @@
 block discarded – undo
40 40
                 ?>
41 41
             <h5 class="centered">
42 42
                 <?php
43
-                if ($_SESSION['steamsignon']) echo '<i class="fa fa-steam-square"></i>';
43
+                if ($_SESSION['steamsignon']) {
44
+                    echo '<i class="fa fa-steam-square"></i>';
45
+                }
44 46
                 echo $_SESSION['user_name']; ?>
45 47
             </h5>
46 48
 
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -21,16 +21,16 @@  discard block
 block discarded – undo
21 21
             <p class="centered">
22 22
                 <?php if (!isset($_SESSION['profile_link'])) {
23 23
                     if (isset($_SESSION['user_email']) && $settings['gravatar']) {
24
-                        echo '<a href="' . $settings['url'] . 'profile">';
25
-                        echo '<img src="' . get_gravatar($_SESSION['user_email'],64,'retro') . '" class="img-circle" width="60" height="60"></a></p>';
24
+                        echo '<a href="'.$settings['url'].'profile">';
25
+                        echo '<img src="'.get_gravatar($_SESSION['user_email'], 64, 'retro').'" class="img-circle" width="60" height="60"></a></p>';
26 26
                     } else {
27
-                        echo '<a href="' . $settings['url'] . 'profile">';
28
-                        echo '<img src="' . $settings['url'] . 'assets/img/profile/' . $_SESSION['user_profile'] . '.jpg"';
27
+                        echo '<a href="'.$settings['url'].'profile">';
28
+                        echo '<img src="'.$settings['url'].'assets/img/profile/'.$_SESSION['user_profile'].'.jpg"';
29 29
                         echo 'class="img-circle" width="60" height="60"></a></p>';
30 30
                     }
31 31
                 } else {
32
-                    echo '<a href="' . $_SESSION['profile_link'] . '" target="_blank">';
33
-                    echo '<img src="' . $_SESSION['user_profile'] . '"';
32
+                    echo '<a href="'.$_SESSION['profile_link'].'" target="_blank">';
33
+                    echo '<img src="'.$_SESSION['user_profile'].'"';
34 34
                     echo 'class="img-circle" width="64" height="64"></a></p>';
35 35
                 }
36 36
                 ?>
@@ -48,9 +48,9 @@  discard block
 block discarded – undo
48 48
             </li>
49 49
 
50 50
 			<?php
51
-                if(isset($_SESSION['server_type']))
51
+                if (isset($_SESSION['server_type']))
52 52
                 {
53
-                    switch($_SESSION['server_type'])
53
+                    switch ($_SESSION['server_type'])
54 54
                     {
55 55
                         case 'life':
56 56
                             include("views/life/nav.php");
@@ -58,8 +58,8 @@  discard block
 block discarded – undo
58 58
                 }
59 59
 
60 60
                 foreach ($settings['plugins'] as &$plugin) {
61
-                    if (file_exists("plugins/". $plugin. "/nav.php")) {
62
-                        include("plugins/". $plugin."/nav.php");
61
+                    if (file_exists("plugins/".$plugin."/nav.php")) {
62
+                        include("plugins/".$plugin."/nav.php");
63 63
                     }
64 64
                 }
65 65
 
@@ -135,19 +135,19 @@  discard block
 block discarded – undo
135 135
                         <li>
136 136
                             <a href="<?php echo $settings['url'] ?>newDB">
137 137
                                 <i class="fa fa-fw fa-plus"></i>
138
-                                <span><?php echo $lang['new'] . ' ' . $lang['database'] ?></span>
138
+                                <span><?php echo $lang['new'].' '.$lang['database'] ?></span>
139 139
                             </a>
140 140
                         </li>
141 141
                         <li>
142 142
                             <a href="<?php echo $settings['url'] ?>newServer">
143 143
                                 <i class="fa fa-fw fa-plus"></i>
144
-                                <span><?php echo $lang['new'] . ' ' . $lang['server'] ?></span>
144
+                                <span><?php echo $lang['new'].' '.$lang['server'] ?></span>
145 145
                             </a>
146 146
                         </li>
147 147
                         <li>
148 148
                             <a href="<?php echo $settings['url'] ?>servers">
149 149
                                 <i class="fa fa-fw fa-cogs"></i>
150
-                                <span><?php echo $lang['edit'] . ' ' . $lang['databases'] ?></span>
150
+                                <span><?php echo $lang['edit'].' '.$lang['databases'] ?></span>
151 151
                             </a>
152 152
                         </li>
153 153
                         <li>
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
             <li>
171 171
                 <a data-toggle="modal" href="#changeDB">
172 172
                     <i class="fa fa-fw fa-cogs"></i>
173
-                    <span><?php echo $lang['database'] . 's' ?></span>
173
+                    <span><?php echo $lang['database'].'s' ?></span>
174 174
                 </a>
175 175
             </li>
176 176
             <?php } ?>
@@ -189,10 +189,10 @@  discard block
 block discarded – undo
189 189
     <section class="wrapper">
190 190
         <?php
191 191
         if (isset($error)) {
192
-            echo '<div style="margin-top: 120px;" class="alert alert-danger animated infinite bounce" role="alert">' . $error . '</div>';
192
+            echo '<div style="margin-top: 120px;" class="alert alert-danger animated infinite bounce" role="alert">'.$error.'</div>';
193 193
         }
194 194
         if (isset($message)) {
195
-            echo '<div style="margin-top: 120px;" class="alert alert-info animated infinite bounce" role="alert">' . $message . '</div>';
195
+            echo '<div style="margin-top: 120px;" class="alert alert-info animated infinite bounce" role="alert">'.$message.'</div>';
196 196
         }
197 197
         if (isset($page)) {
198 198
             include($page);
Please login to merge, or discard this patch.
views/templates/scripts.php 2 patches
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -77,7 +77,10 @@
 block discarded – undo
77 77
     </div>
78 78
 </div>
79 79
 <script async src="<?php echo $settings['url'] ?>assets/js/main.min.js"></script>
80
-<?php if (isset($_SESSION['forum_lang'])) echo '<script async type="text/javascript" src="' . $settings["url"] . 'assets/js/language/' . $_SESSION['forum_lang'] . '.js"></script>'; ?>
80
+<?php if (isset($_SESSION['forum_lang'])) {
81
+    echo '<script async type="text/javascript" src="' . $settings["url"] . 'assets/js/language/' . $_SESSION['forum_lang'] . '.js"></script>';
82
+}
83
+?>
81 84
 <script>
82 85
     function searchpage() {
83 86
         sn = document.getElementById('searchText').value;
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
             </div>
10 10
             <section class="task-panel tasks-widget">
11 11
                 <div class="panel-heading">
12
-                    <div class="pull-left"><h5><i class="fa fa-tasks"></i> <?php echo $lang['database'] . 's'  ?></h5></div>
12
+                    <div class="pull-left"><h5><i class="fa fa-tasks"></i> <?php echo $lang['database'].'s'  ?></h5></div>
13 13
                     <br>
14 14
                 </div>
15 15
                 <div class="panel-body">
@@ -77,11 +77,11 @@  discard block
 block discarded – undo
77 77
     </div>
78 78
 </div>
79 79
 <script async src="<?php echo $settings['url'] ?>assets/js/main.min.js"></script>
80
-<?php if (isset($_SESSION['forum_lang'])) echo '<script async type="text/javascript" src="' . $settings["url"] . 'assets/js/language/' . $_SESSION['forum_lang'] . '.js"></script>'; ?>
80
+<?php if (isset($_SESSION['forum_lang'])) echo '<script async type="text/javascript" src="'.$settings["url"].'assets/js/language/'.$_SESSION['forum_lang'].'.js"></script>'; ?>
81 81
 <script>
82 82
     function searchpage() {
83 83
         sn = document.getElementById('searchText').value;
84
-        redirecturl = '<?php echo $settings["url"] . $currentPage?>/' + sn;
84
+        redirecturl = '<?php echo $settings["url"].$currentPage?>/' + sn;
85 85
         document.location.href = redirecturl;
86 86
     }
87 87
 </script>
@@ -124,9 +124,9 @@  discard block
 block discarded – undo
124 124
                     $i = 1;
125 125
                     while ($row = mysqli_fetch_assoc($result_of_query)) {
126 126
                         if ($i < $total_records) {
127
-                            echo "['" . $row["date"] . "', " . $row["count"] . "],";
127
+                            echo "['".$row["date"]."', ".$row["count"]."],";
128 128
                         } else {
129
-                            echo "['" . $row["date"] . "', " . $row["count"] . "]";
129
+                            echo "['".$row["date"]."', ".$row["count"]."]";
130 130
                         }
131 131
                         $i++;
132 132
                     };
@@ -150,8 +150,8 @@  discard block
 block discarded – undo
150 150
 ?>
151 151
 <?php
152 152
 foreach ($settings['plugins'] as &$plugin) {
153
-    if (file_exists("plugins/" . $plugin . "/assets/scripts.js")) {
154
-        echo '<script type="text/javascript" src="' . $settings['url'] . 'plugins/' . $plugin . '/assets/scripts.js"></script>';
153
+    if (file_exists("plugins/".$plugin."/assets/scripts.js")) {
154
+        echo '<script type="text/javascript" src="'.$settings['url'].'plugins/'.$plugin.'/assets/scripts.js"></script>';
155 155
     }
156 156
 }
157 157
 
Please login to merge, or discard this patch.
views/templates/search.php 2 patches
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,14 +9,18 @@
 block discarded – undo
9 9
 <div class="form-inline pull-right-md">
10 10
     <form name='rows' method="post" action="<?php echo $settings['url'] . $currentPage ?>">
11 11
 
12
-            <input id='searchText' class="form-control" type='text' name='searchText' placeholder="<?php if (isset($search)) echo $search ?>">
12
+            <input id='searchText' class="form-control" type='text' name='searchText' placeholder="<?php if (isset($search)) {
13
+    echo $search ?>">
13 14
             <input style='margin-right: 10px;' class='btn btn-primary' type='button' name='search' onclick='searchpage();' value='<?php echo $lang['search'] ?>'>
14 15
     </form>
15 16
     <select style="margin-right:15px;" onchange="if (this.value) window.location.href='?items='+this.value" id='items' class="form-control" name='items'>
16 17
         <?php
17 18
         foreach ($settings['item'] as $item) {
18 19
             echo '<option value="'.$item.'"';
19
-            if ($item == $_SESSION['items']) echo ' selected';
20
+}
21
+            if ($item == $_SESSION['items']) {
22
+                echo ' selected';
23
+            }
20 24
             echo '>'.$item.'</option>';
21 25
         }
22 26
         ?>
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@
 block discarded – undo
7 7
 </style>
8 8
 
9 9
 <div class="form-inline pull-right-md">
10
-    <form id="search" name='rows' method="post" action="<?php echo $settings['url'] . $currentPage ?>">
10
+    <form id="search" name='rows' method="post" action="<?php echo $settings['url'].$currentPage ?>">
11 11
 
12 12
             <input id='searchText' class="form-control" type='text' name='searchText' placeholder="<?php if (isset($search)) echo $search ?>">
13 13
             <input id="searchButton" style='margin-right: 10px;' class='btn btn-primary' type='button' name='search' onclick='searchpage();' value='<?php echo $lang['search'] ?>'>
Please login to merge, or discard this patch.
views/life/gangs.php 2 patches
Braces   +12 added lines, -4 removed lines patch added patch discarded remove patch
@@ -16,20 +16,26 @@  discard block
 block discarded – undo
16 16
         $sql = "SELECT `id`,`name`,`owner`,`bank`,`members`,`maxmembers`,`active` FROM `gangs` WHERE `owner` IN ( " . $samepID . " ) OR `name` LIKE '%" . $search . "%' OR `id` = '" . $search . "' OR `owner` LIKE '" . $search . "' OR `members` LIKE '%" . $search . "%' ;";
17 17
         $result_of_query = $db_link->query($sql);
18 18
         $total_records = mysqli_num_rows($result_of_query);
19
-        if ($pageNum > $total_records) $pageNum = $total_records;
19
+        if ($pageNum > $total_records) {
20
+            $pageNum = $total_records;
21
+        }
20 22
         $sql = "SELECT `id`,`name`,`owner`,`bank`,`members`,`maxmembers`,`active` FROM `gangs` WHERE `owner` IN ( " . $samepID . " ) OR `name` LIKE '%" . $search . "%' OR `id` = '" . $search . "' OR `owner` LIKE '" . $search . "' OR `members` LIKE '%" . $search . "%' " . $max . " ;";
21 23
     } else {
22 24
         $sql = "SELECT `id` FROM `gangs` WHERE `name` LIKE '%" . $search . "%'  OR `id` = '" . $search . "' OR `owner` LIKE '" . $search . "' OR `members` LIKE '%" . $search . "%' ;";
23 25
         $result_of_query = $db_link->query($sql);
24 26
         $total_records = mysqli_num_rows($result_of_query);
25
-        if ($pageNum > $total_records) $pageNum = $total_records;
27
+        if ($pageNum > $total_records) {
28
+            $pageNum = $total_records;
29
+        }
26 30
         $sql = "SELECT `id`,`name`,`owner`,`bank`,`members`,`maxmembers`,`active` FROM `gangs` WHERE `name` LIKE '%" . $search . "%' OR `id` = '" . $search . "' OR `owner` LIKE '" . $search . "' OR `members` LIKE '%" . $search . "%' " . $max . " ;";
27 31
     }
28 32
 } else {
29 33
     $sql = "SELECT `id` FROM `gangs`;";
30 34
     $result_of_query = $db_link->query($sql);
31 35
     $total_records = mysqli_num_rows($result_of_query);
32
-    if ($pageNum > $total_records) $pageNum = $total_records;
36
+    if ($pageNum > $total_records) {
37
+        $pageNum = $total_records;
38
+    }
33 39
     $sql = "SELECT `id`,`name`,`owner`,`bank`,`members`,`maxmembers`,`active` FROM `gangs` " . $max . " ;";
34 40
 }
35 41
 $result_of_query = $db_link->query($sql);
@@ -100,4 +106,6 @@  discard block
 block discarded – undo
100 106
 </div>
101 107
 
102 108
 <?php
103
-} else echo errorMessage(3, $lang);
104 109
\ No newline at end of file
110
+} else {
111
+    echo errorMessage(3, $lang);
112
+}
Please login to merge, or discard this patch.
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 $db_link = serverConnect();
3 3
 
4
-$max = ' LIMIT ' . ($pageNum - 1) * $_SESSION['items'] . ',' . $_SESSION['items'];
4
+$max = ' LIMIT '.($pageNum - 1) * $_SESSION['items'].','.$_SESSION['items'];
5 5
 
6 6
 if (isset($search)) {
7
-    logAction($_SESSION['user_name'], $lang['searched'] . ' (' . $search . ') ' . $lang['in'] . ' ' . $lang['gangs'], 1);
8
-    $sql = "SELECT `playerid` FROM `players` WHERE `name` LIKE '%" . $search . "%' ";
7
+    logAction($_SESSION['user_name'], $lang['searched'].' ('.$search.') '.$lang['in'].' '.$lang['gangs'], 1);
8
+    $sql = "SELECT `playerid` FROM `players` WHERE `name` LIKE '%".$search."%' ";
9 9
     $result_of_query = $db_link->query($sql);
10 10
     if ($result_of_query->num_rows > 0) {
11 11
         while ($row = mysqli_fetch_row($result_of_query)) {
@@ -13,24 +13,24 @@  discard block
 block discarded – undo
13 13
         }
14 14
         $samepID = array_reduce($samepID, 'array_merge', array());
15 15
         $samepID = implode(',', $samepID);
16
-        $sql = "SELECT `id`,`name`,`owner`,`bank`,`members`,`maxmembers`,`active` FROM `gangs` WHERE `owner` IN ( " . $samepID . " ) OR `name` LIKE '%" . $search . "%' OR `id` = '" . $search . "' OR `owner` LIKE '" . $search . "' OR `members` LIKE '%" . $search . "%' ;";
16
+        $sql = "SELECT `id`,`name`,`owner`,`bank`,`members`,`maxmembers`,`active` FROM `gangs` WHERE `owner` IN ( ".$samepID." ) OR `name` LIKE '%".$search."%' OR `id` = '".$search."' OR `owner` LIKE '".$search."' OR `members` LIKE '%".$search."%' ;";
17 17
         $result_of_query = $db_link->query($sql);
18 18
         $total_records = mysqli_num_rows($result_of_query);
19 19
         if ($pageNum > $total_records) $pageNum = $total_records;
20
-        $sql = "SELECT `id`,`name`,`owner`,`bank`,`members`,`maxmembers`,`active` FROM `gangs` WHERE `owner` IN ( " . $samepID . " ) OR `name` LIKE '%" . $search . "%' OR `id` = '" . $search . "' OR `owner` LIKE '" . $search . "' OR `members` LIKE '%" . $search . "%' " . $max . " ;";
20
+        $sql = "SELECT `id`,`name`,`owner`,`bank`,`members`,`maxmembers`,`active` FROM `gangs` WHERE `owner` IN ( ".$samepID." ) OR `name` LIKE '%".$search."%' OR `id` = '".$search."' OR `owner` LIKE '".$search."' OR `members` LIKE '%".$search."%' ".$max." ;";
21 21
     } else {
22
-        $sql = "SELECT `id` FROM `gangs` WHERE `name` LIKE '%" . $search . "%'  OR `id` = '" . $search . "' OR `owner` LIKE '" . $search . "' OR `members` LIKE '%" . $search . "%' ;";
22
+        $sql = "SELECT `id` FROM `gangs` WHERE `name` LIKE '%".$search."%'  OR `id` = '".$search."' OR `owner` LIKE '".$search."' OR `members` LIKE '%".$search."%' ;";
23 23
         $result_of_query = $db_link->query($sql);
24 24
         $total_records = mysqli_num_rows($result_of_query);
25 25
         if ($pageNum > $total_records) $pageNum = $total_records;
26
-        $sql = "SELECT `id`,`name`,`owner`,`bank`,`members`,`maxmembers`,`active` FROM `gangs` WHERE `name` LIKE '%" . $search . "%' OR `id` = '" . $search . "' OR `owner` LIKE '" . $search . "' OR `members` LIKE '%" . $search . "%' " . $max . " ;";
26
+        $sql = "SELECT `id`,`name`,`owner`,`bank`,`members`,`maxmembers`,`active` FROM `gangs` WHERE `name` LIKE '%".$search."%' OR `id` = '".$search."' OR `owner` LIKE '".$search."' OR `members` LIKE '%".$search."%' ".$max." ;";
27 27
     }
28 28
 } else {
29 29
     $sql = "SELECT `id` FROM `gangs`;";
30 30
     $result_of_query = $db_link->query($sql);
31 31
     $total_records = mysqli_num_rows($result_of_query);
32 32
     if ($pageNum > $total_records) $pageNum = $total_records;
33
-    $sql = "SELECT `id`,`name`,`owner`,`bank`,`members`,`maxmembers`,`active` FROM `gangs` " . $max . " ;";
33
+    $sql = "SELECT `id`,`name`,`owner`,`bank`,`members`,`maxmembers`,`active` FROM `gangs` ".$max." ;";
34 34
 }
35 35
 $result_of_query = $db_link->query($sql);
36 36
 if ($result_of_query->num_rows > 0) {
@@ -52,18 +52,18 @@  discard block
 block discarded – undo
52 52
         <thead>
53 53
         <tr>
54 54
             <th class="hidden-xs"><i class="fa fa-eye"></i> <?php echo $lang['id']; ?></th>
55
-            <th><i class="fa fa-user"></i> <?php echo $lang['gang'] . " " . $lang['name']; ?></th>
55
+            <th><i class="fa fa-user"></i> <?php echo $lang['gang']." ".$lang['name']; ?></th>
56 56
             <th class="hidden-xs"><i class="fa fa-user"></i> <?php echo $lang['owner']; ?></th>
57 57
             <th class="hidden-xs"><i class="fa fa-bank"></i> <?php echo $lang['bank']; ?></th>
58 58
             <?php if ($_SESSION['permissions']['edit']['gangs']) {
59
-                echo '<th class="hidden-xs"><i class="fa fa-user"></i> ' . $lang['members'] . '</th>';
59
+                echo '<th class="hidden-xs"><i class="fa fa-user"></i> '.$lang['members'].'</th>';
60 60
             } else {
61
-                echo '<th><i class="fa fa-user"></i> ' . $lang['members'] . '</th>';
61
+                echo '<th><i class="fa fa-user"></i> '.$lang['members'].'</th>';
62 62
             }?>
63 63
             <th class="hidden-xs"><i class="fa fa-user"></i> <?php echo $lang['maxMembers']; ?></th>
64 64
             <th class="hidden-xs"><i class="fa fa-user"></i> <?php echo $lang['active']; ?></th>
65 65
             <?php if ($_SESSION['permissions']['edit']['gangs']) {
66
-                echo '<th><i class="fa fa-pencil"></i>' . $lang['edit'] . '</th>';
66
+                echo '<th><i class="fa fa-pencil"></i>'.$lang['edit'].'</th>';
67 67
             }
68 68
             ?>
69 69
         </tr>
@@ -72,21 +72,21 @@  discard block
 block discarded – undo
72 72
         <?php
73 73
         while ($row = mysqli_fetch_assoc($result_of_query)) {
74 74
             echo "<tr>";
75
-            echo "<td class='hidden-xs'>" . $row["id"] . "</td>";
76
-            echo "<td>" . $row["name"] . "</td>";
77
-            echo "<td class='hidden-xs'>" . nameID($row["owner"], $db_link) . "</td>";
78
-            echo "<td class='hidden-xs'>" . $row["bank"] . "</td>";
75
+            echo "<td class='hidden-xs'>".$row["id"]."</td>";
76
+            echo "<td>".$row["name"]."</td>";
77
+            echo "<td class='hidden-xs'>".nameID($row["owner"], $db_link)."</td>";
78
+            echo "<td class='hidden-xs'>".$row["bank"]."</td>";
79 79
             $members = substr_count($row['members'], ",");
80 80
             $members++;
81 81
             if ($_SESSION['permissions']['edit']['gangs']) {
82
-                echo "<td class='hidden-xs'>" . $members . "</td>";
82
+                echo "<td class='hidden-xs'>".$members."</td>";
83 83
             } else {
84
-                echo "<td>" . $members . "</td>";
84
+                echo "<td>".$members."</td>";
85 85
             }
86
-            echo "<td class='hidden-xs'>" . $row["maxmembers"] . "</td>";
87
-            echo "<td class='hidden-xs'>" . yesNo($row["active"], $lang) . "</td>";
86
+            echo "<td class='hidden-xs'>".$row["maxmembers"]."</td>";
87
+            echo "<td class='hidden-xs'>".yesNo($row["active"], $lang)."</td>";
88 88
             if ($_SESSION['permissions']['edit']['gangs']) {
89
-                echo "<td><a class='btn btn-primary btn-xs' href='" . $settings['url'] . "editGang/" . $row["id"] . "'>";
89
+                echo "<td><a class='btn btn-primary btn-xs' href='".$settings['url']."editGang/".$row["id"]."'>";
90 90
                 echo "<i class='fa fa-pencil'></i></a></td>";
91 91
             }
92 92
             echo "</tr>";
Please login to merge, or discard this patch.
views/life/notes.php 2 patches
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.
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -9,29 +9,29 @@  discard block
 block discarded – undo
9 9
     $page = 1;
10 10
 }
11 11
 
12
-$max = 'LIMIT ' . ($page - 1) * $_SESSION['items'] . ',' . $_SESSION['items'];
12
+$max = 'LIMIT '.($page - 1) * $_SESSION['items'].','.$_SESSION['items'];
13 13
 
14 14
 if (isset($search)) {
15
-    logAction($_SESSION['user_name'], $lang['searched'] . ' (' . $search . ') ' . $lang['in'] . ' ' . $lang['vehicles'], 1);
16
-    $sql = "SELECT `playerid` FROM `players` WHERE `name` LIKE '%" . $search . "%' ";
15
+    logAction($_SESSION['user_name'], $lang['searched'].' ('.$search.') '.$lang['in'].' '.$lang['vehicles'], 1);
16
+    $sql = "SELECT `playerid` FROM `players` WHERE `name` LIKE '%".$search."%' ";
17 17
     $result_of_query = $db_link->query($sql);
18 18
     if ($result_of_query->num_rows > 0) {
19 19
         while ($row = mysqli_fetch_row($result_of_query)) {
20 20
             $samepID[] = $row;
21 21
         }
22 22
         $samepID = array_reduce($samepID, 'array_merge', array());
23
-        $sql = "SELECT * FROM `vehicles` WHERE `pid` LIKE '" . $search . "' OR `classname` LIKE '%" . $search . "%' OR `pid` IN (" . implode(',', $samepID) . ") OR `plate` LIKE '" . $search . "' OR `inventory` LIKE '%" . $search . "%';";
23
+        $sql = "SELECT * FROM `vehicles` WHERE `pid` LIKE '".$search."' OR `classname` LIKE '%".$search."%' OR `pid` IN (".implode(',', $samepID).") OR `plate` LIKE '".$search."' OR `inventory` LIKE '%".$search."%';";
24 24
         $result_of_query = $db_link->query($sql);
25 25
         $total_records = mysqli_num_rows($result_of_query);
26
-        $sql = "SELECT * FROM `vehicles` WHERE `pid` LIKE '" . $search . "' OR `classname` LIKE '%" . $search . "%' OR `pid` IN (" . implode(',', $samepID) . ") OR `plate` LIKE '" . $search . "' OR `inventory` LIKE '%" . $search . "%'" . $max . " ;";
26
+        $sql = "SELECT * FROM `vehicles` WHERE `pid` LIKE '".$search."' OR `classname` LIKE '%".$search."%' OR `pid` IN (".implode(',', $samepID).") OR `plate` LIKE '".$search."' OR `inventory` LIKE '%".$search."%'".$max." ;";
27 27
     } else {
28
-        $sql = "SELECT * FROM `vehicles` WHERE `pid` LIKE '" . $search . "' OR `classname` LIKE '%" . $search . "%' OR `plate` LIKE '" . $search . "' OR `inventory` LIKE '%" . $search . "%';";
28
+        $sql = "SELECT * FROM `vehicles` WHERE `pid` LIKE '".$search."' OR `classname` LIKE '%".$search."%' OR `plate` LIKE '".$search."' OR `inventory` LIKE '%".$search."%';";
29 29
         $result_of_query = $db_link->query($sql);
30 30
         $total_records = mysqli_num_rows($result_of_query);
31
-        $sql = "SELECT * FROM `vehicles` WHERE `pid` LIKE '" . $search . "' OR `classname` LIKE '%" . $search . "%' OR `plate` LIKE '" . $search . "' OR `inventory` LIKE '%" . $search . "%'" . $max . " ;";
31
+        $sql = "SELECT * FROM `vehicles` WHERE `pid` LIKE '".$search."' OR `classname` LIKE '%".$search."%' OR `plate` LIKE '".$search."' OR `inventory` LIKE '%".$search."%'".$max." ;";
32 32
     }
33 33
 } else {
34
-        $sql = "SELECT * FROM `vehicles` " . $max . " ;";
34
+        $sql = "SELECT * FROM `vehicles` ".$max." ;";
35 35
 }
36 36
 $result_of_query = $db_link->query($sql);
37 37
 ?>
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
     <div class="col-lg-12">
41 41
         <h1 class="page-header">
42 42
             <?php echo $lang['vehicles']; ?>
43
-            <small><?php echo " " . $lang['overview']; ?></small>
43
+            <small><?php echo " ".$lang['overview']; ?></small>
44 44
         </h1>
45 45
     </div>
46 46
 </div>
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
     <div class="content-panel">
51 51
         <h4>
52 52
             <i class="fa fa-car"></i>
53
-            <?php echo " " . $lang['vehicles']; ?>
53
+            <?php echo " ".$lang['vehicles']; ?>
54 54
             <div class="col-md-2 pull-right">
55 55
                 <form style="float:right;" name='rows' method="post" action="<?php echo $settings['url'] ?>vehicles">
56 56
                     <select id='items' name='items'>
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
                 <th class="hidden-xs"><i class="fa fa-car"></i> <?php echo $lang['alive']; ?></th>
107 107
                 <th class="hidden-xs"><i class="fa fa-info"></i> <?php echo $lang['active']; ?></th>
108 108
                 <?php if ($_SESSION['user_level'] >= $_SESSION['permission']['edit']['playet']) {
109
-    echo '<th><i class="fa fa-pencil"></i><div class="hidden-xs"> ' . $lang['edit'] . '</div></th>';
109
+    echo '<th><i class="fa fa-pencil"></i><div class="hidden-xs"> '.$lang['edit'].'</div></th>';
110 110
 }
111 111
 ?>
112 112
             </tr>
@@ -115,14 +115,14 @@  discard block
 block discarded – undo
115 115
             <?php
116 116
             while ($row = mysqli_fetch_assoc($result_of_query)) {
117 117
                 echo "<tr>";
118
-                echo "<td>" . nameID($row["pid"]) . "</td>";
119
-                echo "<td>" . carName($row["classname"]) . "</td>";
120
-                echo "<td class='hidden-xs'>" . carType($row["type"], $lang) . "</td>";
121
-                echo "<td class='hidden-xs'>" . $row["plate"] . "</td>";
122
-                echo "<td class='hidden-xs'>" . yesNo($row["alive"], $lang) . "</td>";
123
-                echo "<td class='hidden-xs'>" . yesNo($row["active"], $lang) . "</td>";
118
+                echo "<td>".nameID($row["pid"])."</td>";
119
+                echo "<td>".carName($row["classname"])."</td>";
120
+                echo "<td class='hidden-xs'>".carType($row["type"], $lang)."</td>";
121
+                echo "<td class='hidden-xs'>".$row["plate"]."</td>";
122
+                echo "<td class='hidden-xs'>".yesNo($row["alive"], $lang)."</td>";
123
+                echo "<td class='hidden-xs'>".yesNo($row["active"], $lang)."</td>";
124 124
                 if ($_SESSION['user_level'] >= P_EDIT_VEHICLES) {
125
-                    echo "<td><a class='btn btn-primary btn-xs' href='" . $settings['url'] . "editVeh/" . $row["id"] . "'>";
125
+                    echo "<td><a class='btn btn-primary btn-xs' href='".$settings['url']."editVeh/".$row["id"]."'>";
126 126
                     echo "<i class='fa fa-pencil'></i></a></td>";
127 127
                 }
128 128
                 echo "</tr>";
@@ -134,24 +134,24 @@  discard block
 block discarded – undo
134 134
                 $total_pages = ceil($total_records / $_SESSION['items']);
135 135
                 if ($total_pages > 1) {
136 136
 
137
-                    echo "<center><a class='btn btn-primary' href='" . $settings['url'] . "vehicles/" . $search . "?page=1'>" . $lang['first'] . "</a> ";
137
+                    echo "<center><a class='btn btn-primary' href='".$settings['url']."vehicles/".$search."?page=1'>".$lang['first']."</a> ";
138 138
                     ?>
139 139
                     <div class="btn-group">
140 140
                         <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
141
-                            <?php echo $lang['page'] . " " ?><span class="caret"></span>
141
+                            <?php echo $lang['page']." " ?><span class="caret"></span>
142 142
                         </button>
143 143
 
144 144
                         <ul class="dropdown-menu scrollable-menu" role="menu">
145 145
                             <?php
146 146
                             for ($i = 1; $i <= $total_pages; $i++) {
147 147
                                 ?>
148
-                                <li><?php echo "<a href='" . $settings['url'] . "vehicles/" . $search . "?page=" . $i . "'>" . $i . "</a> "; ?></li>
148
+                                <li><?php echo "<a href='".$settings['url']."vehicles/".$search."?page=".$i."'>".$i."</a> "; ?></li>
149 149
                             <?php }; ?>
150 150
                         </ul>
151 151
                     </div>
152 152
 
153 153
                     <?php
154
-                    echo "<a class='btn btn-primary' href='" . $settings['url'] . "vehicles/" . $search . "?page=" . $total_pages . "'>" . $lang['last'] . "</a></center>";
154
+                    echo "<a class='btn btn-primary' href='".$settings['url']."vehicles/".$search."?page=".$total_pages."'>".$lang['last']."</a></center>";
155 155
                 }
156 156
             } else {
157 157
                 $sql = "SELECT `id` FROM `vehicles`;";
@@ -159,24 +159,24 @@  discard block
 block discarded – undo
159 159
                 $total_records = mysqli_num_rows($result_of_query);
160 160
                 $total_pages = ceil($total_records / $_SESSION['items']);
161 161
                 if ($total_pages > 1) {
162
-                    echo "<center><a class='btn btn-primary' href='" . $settings['url'] . "vehicles?page=1'>" . $lang['first'] . "</a> ";
162
+                    echo "<center><a class='btn btn-primary' href='".$settings['url']."vehicles?page=1'>".$lang['first']."</a> ";
163 163
                     ?>
164 164
                     <div class="btn-group">
165 165
                         <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
166
-                            <?php echo $lang['page'] . " " ?><span class="caret"></span>
166
+                            <?php echo $lang['page']." " ?><span class="caret"></span>
167 167
                         </button>
168 168
 
169 169
                         <ul class="dropdown-menu scrollable-menu" role="menu">
170 170
                             <?php
171 171
                             for ($i = 1; $i <= $total_pages; $i++) {
172 172
                                 ?>
173
-                                <li><?php echo "<a href='" . $settings['url'] . "vehicles?page=" . $i . "'>" . $i . "</a> "; ?></li>
173
+                                <li><?php echo "<a href='".$settings['url']."vehicles?page=".$i."'>".$i."</a> "; ?></li>
174 174
                             <?php }; ?>
175 175
                         </ul>
176 176
                     </div>
177 177
 
178 178
                     <?php
179
-                    echo "<a class='btn btn-primary' href='" . $settings['url'] . "vehicles?page=$total_pages'>" . $lang['last'] . "</a></center>";
179
+                    echo "<a class='btn btn-primary' href='".$settings['url']."vehicles?page=$total_pages'>".$lang['last']."</a></center>";
180 180
                 }
181 181
             }
182 182
             ?>
Please login to merge, or discard this patch.
views/databases.php 2 patches
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.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -5,16 +5,16 @@  discard block
 block discarded – undo
5 5
     $page = 1;
6 6
 }
7 7
 
8
-$max = ' LIMIT ' . ($page - 1) * $_SESSION['items'] . ',' . $_SESSION['items'];
8
+$max = ' LIMIT '.($page - 1) * $_SESSION['items'].','.$_SESSION['items'];
9 9
 
10 10
 if (isset($search)) {
11
-    logAction($_SESSION['user_name'], $lang['searched'] . ' (' . $search . ') ' . $lang['in'] . ' ' . $lang['database'], 1);
12
-    $sql = "SELECT * FROM `db` WHERE `dbid` LIKE '" . $search . "' OR `type` LIKE '%" . $search . "%';"; //todo: name searching
11
+    logAction($_SESSION['user_name'], $lang['searched'].' ('.$search.') '.$lang['in'].' '.$lang['database'], 1);
12
+    $sql = "SELECT * FROM `db` WHERE `dbid` LIKE '".$search."' OR `type` LIKE '%".$search."%';"; //todo: name searching
13 13
     $result_of_query = $db_connection->query($sql);
14 14
     $total_records = mysqli_num_rows($result_of_query);
15
-    $sql = "SELECT * FROM `db` WHERE `dbid` LIKE '" . $search . "' OR `type` LIKE '%" . $search . "%'" . $max . " ;";
15
+    $sql = "SELECT * FROM `db` WHERE `dbid` LIKE '".$search."' OR `type` LIKE '%".$search."%'".$max." ;";
16 16
 } else {
17
-    $sql = "SELECT * FROM `db` " . $max . " ;";
17
+    $sql = "SELECT * FROM `db` ".$max." ;";
18 18
 }
19 19
 
20 20
 $result_of_query = $db_connection->query($sql);
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
             <table class="table table-striped table-advance table-hover">
35 35
                 <h4>
36 36
                     <i class="fa fa-sitemap"></i>
37
-                    <?php echo " " . $lang['wantList']; ?>
37
+                    <?php echo " ".$lang['wantList']; ?>
38 38
 
39 39
                 </h4>
40 40
                 <hr class="hidden-xs">
@@ -52,11 +52,11 @@  discard block
 block discarded – undo
52 52
                 <?php
53 53
                 while ($row = mysqli_fetch_assoc($result_of_query)) {
54 54
                     echo "<tr>";
55
-                    echo "<td class='hidden-xs'>" . $row["wantedID"] . "</td>";
56
-                    echo "<td>" . $row["wantedName"] . "</td>";
57
-                    echo "<td class='hidden-xs'>" . $row["wantedBounty"] . "</td>";
58
-                    echo "<td class='hidden-xs'>" . yesNo($row["active"], $lang) . "</td>";
59
-                    echo "<td><a class='btn btn-primary btn-xs' href='editWanted/" . $row["wantedID"] . "'>";
55
+                    echo "<td class='hidden-xs'>".$row["wantedID"]."</td>";
56
+                    echo "<td>".$row["wantedName"]."</td>";
57
+                    echo "<td class='hidden-xs'>".$row["wantedBounty"]."</td>";
58
+                    echo "<td class='hidden-xs'>".yesNo($row["active"], $lang)."</td>";
59
+                    echo "<td><a class='btn btn-primary btn-xs' href='editWanted/".$row["wantedID"]."'>";
60 60
                     echo "<i class='fa fa-pencil'></i></a></td>";
61 61
                     echo "</tr>";
62 62
                 };
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.
Braces   +13 added lines, -6 removed lines patch added patch discarded remove patch
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
                             logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
240 240
                             $page = "views/life/admins.php";
241 241
                         }
242
-                    }  elseif ($currentPage == 'police') {
242
+                    } elseif ($currentPage == 'police') {
243 243
                         if ($_SESSION['permissions']['view']['player']) {
244 244
                             if ($query) {
245 245
                                 $search = $url['path'][$settings['base'] + 1];
@@ -522,15 +522,20 @@  discard block
 block discarded – undo
522 522
             if ($settings['2factor']) {
523 523
                 if ($_SESSION['2factor'] == 0) {
524 524
                 if ($settings['force2factor'] == 'steam') {
525
-                    if (!$_SESSION['steamsignon']) $_SESSION['2factor'] == 5;
526
-                } elseif ($settings['force2factor'] == 'all') $_SESSION['2factor'] == 5;
525
+                    if (!$_SESSION['steamsignon']) {
526
+                        $_SESSION['2factor'] == 5;
527
+                    }
528
+                } elseif ($settings['force2factor'] == 'all') {
529
+                    $_SESSION['2factor'] == 5;
530
+                }
527 531
                     $page = 'views/core/2factor.php';
528 532
                 } elseif ($_SESSION['2factor'] == 1 || $_SESSION['2factor'] == 3) {
529 533
                 if (isset($_POST['code'])) {
530 534
                     $sql = "SELECT `twoFactor` FROM `users` WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
531 535
                     $user = $db_connection->query($sql)->fetch_object();
532
-                    if ($gauth->verifyCode($user->twoFactor, $_POST['code'])) $_SESSION['2factor'] = 2;
533
-                    else {
536
+                    if ($gauth->verifyCode($user->twoFactor, $_POST['code'])) {
537
+                        $_SESSION['2factor'] = 2;
538
+                    } else {
534 539
                     $sql = "SELECT `backup` FROM `users` WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
535 540
                     $user = $db_connection->query($sql)->fetch_object();
536 541
                     if ($user->backup == $_POST['code']) {
@@ -540,7 +545,9 @@  discard block
 block discarded – undo
540 545
                         $page = 'views/core/2factor.php';
541 546
                     }
542 547
                     }
543
-                } else $page = 'views/core/2factor.php';
548
+                } else {
549
+                    $page = 'views/core/2factor.php';
550
+                }
544 551
                 }
545 552
             }
546 553
 
Please login to merge, or discard this patch.
Spacing   +58 added lines, -58 removed lines patch added patch discarded remove patch
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
     }
32 32
 
33 33
     foreach ($settings['plugins'] as &$plugin) {
34
-        if (file_exists("plugins/" . $plugin . "/lang/lang.php")) {
35
-            include("plugins/" . $plugin . "/lang/lang.php");
34
+        if (file_exists("plugins/".$plugin."/lang/lang.php")) {
35
+            include("plugins/".$plugin."/lang/lang.php");
36 36
         }
37 37
     }
38 38
 
@@ -75,9 +75,9 @@  discard block
 block discarded – undo
75 75
 
76 76
     $key = 0;
77 77
     foreach ($settings['plugins'] as &$plugin) {
78
-        if (file_exists("plugins/" . $plugin . "/plugin.json")) {
79
-            if (file_exists("plugins/" . $plugin . "/init.php")) {
80
-                include("plugins/" . $plugin . "/init.php");
78
+        if (file_exists("plugins/".$plugin."/plugin.json")) {
79
+            if (file_exists("plugins/".$plugin."/init.php")) {
80
+                include("plugins/".$plugin."/init.php");
81 81
             }
82 82
         } else {
83 83
             if (array_count_values($settings['plugins']) <= 1) {
@@ -106,8 +106,8 @@  discard block
 block discarded – undo
106 106
             $_SESSION['formtoken'][1] = time();
107 107
 
108 108
             if (isset($_GET['items'])) {
109
-                if (in_array($_GET['items'],$settings['item'])) {
110
-                    $sql = "UPDATE `users` SET `items` = " . $_GET['items'] . " WHERE `user_id` = '" . $_SESSION['user_id'] . "' ";
109
+                if (in_array($_GET['items'], $settings['item'])) {
110
+                    $sql = "UPDATE `users` SET `items` = ".$_GET['items']." WHERE `user_id` = '".$_SESSION['user_id']."' ";
111 111
                     $db_connection->query($sql);
112 112
                     $_SESSION['items'] = intval($_GET['items']);
113 113
                 }
@@ -157,12 +157,12 @@  discard block
 block discarded – undo
157 157
                                 if ($query) {
158 158
                                     $search = $url['path'][$settings['base'] + 1];
159 159
                                 }
160
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
160
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
161 161
                                 $page = "views/life/messages.php";
162 162
                             } else {
163 163
                                 $err = errorMessage(5, $lang);
164 164
                                 $page = "views/templates/error.php";
165
-                                logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'messages'", 3);
165
+                                logAction($_SESSION['user_name'], $lang['failedAccess']." 'messages'", 3);
166 166
                             }
167 167
                         }
168 168
 
@@ -171,19 +171,19 @@  discard block
 block discarded – undo
171 171
                             if ($query) {
172 172
                                 $search = $url['path'][$settings['base'] + 1];
173 173
                             }
174
-                            logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
174
+                            logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
175 175
                             $page = "views/life/players.php";
176 176
                         } else {
177 177
                             $err = errorMessage(5, $lang);
178 178
                             $page = "views/templates/error.php";
179
-                            logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'players'", 3);
179
+                            logAction($_SESSION['user_name'], $lang['failedAccess']." 'players'", 3);
180 180
                         }
181 181
 
182 182
                     } elseif ($currentPage == 'editplayer') {
183 183
                         if ($_SESSION['permissions']['edit']['player']) {
184 184
                             if ($query) {
185 185
                                 $uID = $url['path'][$settings['base'] + 1];
186
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
186
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
187 187
                                 $page = "views/life/editPlayer.php";
188 188
                             } else {
189 189
                                 $err = errorMessage(8, $lang);
@@ -199,19 +199,19 @@  discard block
 block discarded – undo
199 199
                             if ($query) {
200 200
                                 $search = $url['path'][$settings['base'] + 1];
201 201
                             }
202
-                            logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
202
+                            logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
203 203
                             $page = "views/life/vehicles.php";
204 204
                         } else {
205 205
                             $err = errorMessage(5, $lang);
206 206
                             $page = "views/templates/error.php";
207
-                            logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'vehicles'", 3);
207
+                            logAction($_SESSION['user_name'], $lang['failedAccess']." 'vehicles'", 3);
208 208
                         }
209 209
 
210 210
                     } elseif ($currentPage == 'editveh') {
211 211
                         if ($_SESSION['permissions']['edit']['vehicles']) {
212 212
                             if ($query) {
213 213
                                 $vehID = $url['path'][$settings['base'] + 1];
214
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
214
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
215 215
                                 $page = "views/life/editVeh.php";
216 216
                             } else {
217 217
                                 $err = errorMessage(8, $lang);
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
                         } else {
221 221
                             $err = errorMessage(5, $lang);
222 222
                             $page = "views/templates/error.php";
223
-                            logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'editVeh'", 3);
223
+                            logAction($_SESSION['user_name'], $lang['failedAccess']." 'editVeh'", 3);
224 224
                         }
225 225
 
226 226
                     } elseif ($currentPage == 'medic') {
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
                             if ($query) {
229 229
                                 $search = $url['path'][$settings['base'] + 1];
230 230
                             }
231
-                            logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
231
+                            logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
232 232
                             $page = "views/life/medics.php";
233 233
                         }
234 234
                     } elseif ($currentPage == 'admins') {
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
                             if ($query) {
237 237
                                 $search = $url['path'][$settings['base'] + 1];
238 238
                             }
239
-                            logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
239
+                            logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
240 240
                             $page = "views/life/admins.php";
241 241
                         }
242 242
                     }  elseif ($currentPage == 'police') {
@@ -244,12 +244,12 @@  discard block
 block discarded – undo
244 244
                             if ($query) {
245 245
                                 $search = $url['path'][$settings['base'] + 1];
246 246
                             }
247
-                            logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
247
+                            logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
248 248
                             $page = "views/life/police.php";
249 249
                         } else {
250 250
                             $err = errorMessage(5, $lang);
251 251
                             $page = "views/templates/error.php";
252
-                            logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'houses'", 3);
252
+                            logAction($_SESSION['user_name'], $lang['failedAccess']." 'houses'", 3);
253 253
                         }
254 254
 
255 255
                     } elseif ($currentPage == 'houses') {
@@ -257,19 +257,19 @@  discard block
 block discarded – undo
257 257
                             if ($query) {
258 258
                                 $search = $url['path'][$settings['base'] + 1];
259 259
                             }
260
-                            logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
260
+                            logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
261 261
                             $page = "views/life/houses.php";
262 262
                         } else {
263 263
                             $err = errorMessage(5, $lang);
264 264
                             $page = "views/templates/error.php";
265
-                            logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'houses'", 3);
265
+                            logAction($_SESSION['user_name'], $lang['failedAccess']." 'houses'", 3);
266 266
                         }
267 267
 
268 268
                     } elseif ($currentPage == 'edithouse') {
269 269
                         if ($_SESSION['permissions']['edit']['houses']) {
270 270
                             if ($query) {
271 271
                                 $hID = $url['path'][$settings['base'] + 1];
272
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
272
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
273 273
                                 $page = "views/life/editHouse.php";
274 274
                             } else {
275 275
                                 $err = errorMessage(8, $lang);
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
                         } else {
279 279
                             $err = errorMessage(5, $lang);
280 280
                             $page = "views/templates/error.php";
281
-                            logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'editHouse'", 3);
281
+                            logAction($_SESSION['user_name'], $lang['failedAccess']." 'editHouse'", 3);
282 282
                         }
283 283
 
284 284
                     } elseif ($currentPage == 'gangs') {
@@ -286,19 +286,19 @@  discard block
 block discarded – undo
286 286
                             if ($query) {
287 287
                                 $search = $url['path'][$settings['base'] + 1];
288 288
                             }
289
-                            logAction($_SESSION['user_name'], $lang['visited'] . " 'gangs'", 1);
289
+                            logAction($_SESSION['user_name'], $lang['visited']." 'gangs'", 1);
290 290
                             $page = "views/life/gangs.php";
291 291
                         } else {
292 292
                             $err = errorMessage(5, $lang);
293 293
                             $page = "views/templates/error.php";
294
-                            logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'gangs'", 3);
294
+                            logAction($_SESSION['user_name'], $lang['failedAccess']." 'gangs'", 3);
295 295
                         }
296 296
 
297 297
                     } elseif ($currentPage == 'editgang') {
298 298
                         if ($_SESSION['permissions']['edit']['gangs']) {
299 299
                             if ($query) {
300 300
                                 $gID = $url['path'][$settings['base'] + 1];
301
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
301
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
302 302
                                 $page = "views/life/editGang.php";
303 303
                             } else {
304 304
                                 $err = errorMessage(8, $lang);
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
                         } else {
308 308
                             $err = errorMessage(5, $lang);
309 309
                             $page = "views/templates/error.php";
310
-                            logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'editGang'", 3);
310
+                            logAction($_SESSION['user_name'], $lang['failedAccess']." 'editGang'", 3);
311 311
                         }
312 312
 
313 313
                     } elseif ($currentPage == 'wanted') {
@@ -315,19 +315,19 @@  discard block
 block discarded – undo
315 315
                             if ($query) {
316 316
                                 $search = $url['path'][$settings['base'] + 1];
317 317
                             }
318
-                            logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
318
+                            logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
319 319
                             $page = "views/life/wanted.php";
320 320
                         } else {
321 321
                             $err = errorMessage(5, $lang);
322 322
                             $page = "views/templates/error.php";
323
-                            logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'wanted'", 3);
323
+                            logAction($_SESSION['user_name'], $lang['failedAccess']." 'wanted'", 3);
324 324
                         }
325 325
 
326 326
                     } elseif ($currentPage == 'editwanted') {
327 327
                         if ($_SESSION['permissions']['edit']['wanted']) {
328 328
                             if ($query) {
329 329
                                 $wantedID = $url['path'][$settings['base'] + 1];
330
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
330
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
331 331
                                 $page = "views/life/editWanted.php";
332 332
                             } else {
333 333
                                 $err = errorMessage(8, $lang);
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
                         } else {
337 337
                             $err = errorMessage(5, $lang);
338 338
                             $page = "views/templates/error.php";
339
-                            logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'editWanted'", 3);
339
+                            logAction($_SESSION['user_name'], $lang['failedAccess']." 'editWanted'", 3);
340 340
                         }
341 341
                     }
342 342
 
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
                     } elseif ($currentPage == 'editveh') {
349 349
                         if ($query) {
350 350
                             $vehID = $url['path'][$settings['base'] + 1];
351
-                            logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
351
+                            logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
352 352
                             $page = "views/steam/life/editVeh.php";
353 353
                         } else {
354 354
                             $err = errorMessage(8, $lang);
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
                     } elseif ($currentPage == 'edithouse') {
358 358
                         if ($query) {
359 359
                             $hID = $url['path'][$settings['base'] + 1];
360
-                            logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
360
+                            logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
361 361
                             $page = "views/steam/life/editHouse.php";
362 362
                         } else {
363 363
                             $err = errorMessage(8, $lang);
@@ -368,7 +368,7 @@  discard block
 block discarded – undo
368 368
             }
369 369
             if ($currentPage == 'newdb' || $currentPage == 'newserver' || $currentPage == 'settings' || $currentPage == 'editstaff' || $currentPage == 'staff' || $currentPage == 'pluginstore' || $currentPage == 'newuser' || $currentPage == 'logs') {
370 370
                 if (isset($_POST['passTest'])) {
371
-                    $sql = "SELECT user_password_hash FROM users WHERE user_id = '" . $_SESSION['user_id'] . "';";
371
+                    $sql = "SELECT user_password_hash FROM users WHERE user_id = '".$_SESSION['user_id']."';";
372 372
                     $pass = $db_connection->query($sql)->fetch_object()->user_password_hash;
373 373
                     if (password_verify($_POST['passTest'], $pass)) {
374 374
                         $_SESSION['sudo'] = time();
@@ -381,38 +381,38 @@  discard block
 block discarded – undo
381 381
                     } else {
382 382
                         if ($currentPage == 'newdb') {
383 383
                             if ($_SESSION['permissions']['super_admin']) {
384
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 2);
384
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 2);
385 385
                                 $page = "views/core/newDB.php";
386 386
                             } else {
387 387
                                 $err = errorMessage(5, $lang);
388 388
                                 $page = "views/templates/error.php";
389
-                                logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'newDB'", 3);
389
+                                logAction($_SESSION['user_name'], $lang['failedAccess']." 'newDB'", 3);
390 390
                             }
391 391
                         } elseif ($currentPage == 'newserver') {
392 392
                             if ($_SESSION['permissions']['super_admin']) {
393
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 2);
393
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 2);
394 394
                                 $page = "views/core/newServer.php";
395 395
                             } else {
396 396
                                 $err = errorMessage(5, $lang);
397 397
                                 $page = "views/templates/error.php";
398
-                                logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'newServer'", 3);
398
+                                logAction($_SESSION['user_name'], $lang['failedAccess']." 'newServer'", 3);
399 399
                             }
400 400
 
401 401
                         } elseif ($currentPage == 'settings') {
402 402
                             if ($_SESSION['permissions']['super_admin']) {
403
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 2);
403
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 2);
404 404
                                 $page = "views/core/settings.php";
405 405
                             } else {
406 406
                                 $err = errorMessage(5, $lang);
407 407
                                 $page = "views/templates/error.php";
408
-                                logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'settings'", 3);
408
+                                logAction($_SESSION['user_name'], $lang['failedAccess']." 'settings'", 3);
409 409
                             }
410 410
 
411 411
                         } elseif ($currentPage == 'editstaff') {
412 412
                             if ($_SESSION['permissions']['edit']['staff']) {
413 413
                                 if ($query) {
414 414
                                     $uId = $url['path'][$settings['base'] + 1];
415
-                                    logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 2);
415
+                                    logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 2);
416 416
                                     $page = "views/core/editStaff.php";
417 417
                                 } else {
418 418
                                     $err = errorMessage(8, $lang);
@@ -420,38 +420,38 @@  discard block
 block discarded – undo
420 420
                                 }
421 421
                             } else {
422 422
                                 $err = errorMessage(5, $lang); $page = "views/templates/error.php";
423
-                                logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'editStaff'", 3);
423
+                                logAction($_SESSION['user_name'], $lang['failedAccess']." 'editStaff'", 3);
424 424
                             }
425 425
                         } elseif ($currentPage == 'staff') {
426 426
                             if ($_SESSION['permissions']['view']['staff']) {
427 427
                                 if ($query) {
428 428
                                     $search = $url['path'][$settings['base'] + 1];
429 429
                                 }
430
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 2);
430
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 2);
431 431
                                 $page = "views/core/staff.php";
432 432
                             } else {
433 433
                                 $err = errorMessage(5, $lang); $page = "views/templates/error.php";
434
-                                logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'staff'", 3);
434
+                                logAction($_SESSION['user_name'], $lang['failedAccess']." 'staff'", 3);
435 435
                             }
436 436
 
437 437
                         } elseif ($currentPage == 'pluginstore') {
438 438
                             if ($_SESSION['permissions']['super_admin']) {
439
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 2);
439
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 2);
440 440
                                 $page = "views/core/pluginstore.php";
441 441
                             } else {
442 442
                                 $err = errorMessage(5, $lang); $page = "views/templates/error.php";
443
-                                logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'pluginstore'", 3);
443
+                                logAction($_SESSION['user_name'], $lang['failedAccess']." 'pluginstore'", 3);
444 444
                             }
445 445
 
446 446
                         } elseif ($currentPage == 'newuser') {
447 447
                             if ($_SESSION['permissions']['edit']['staff']) {
448 448
                                 require_once("classes/registration.php");
449 449
                                 $registration = new Registration();
450
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 2);
450
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 2);
451 451
                                 $page = "views/core/newUser.php";
452 452
                             } else {
453 453
                                 $err = errorMessage(5, $lang); $page = "views/templates/error.php";
454
-                                logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'newUser'", 3);
454
+                                logAction($_SESSION['user_name'], $lang['failedAccess']." 'newUser'", 3);
455 455
                             }
456 456
 
457 457
                         } elseif ($currentPage == 'logs' && $settings['logging']) {
@@ -459,11 +459,11 @@  discard block
 block discarded – undo
459 459
                                 if ($query) {
460 460
                                     $search = $url['path'][$settings['base'] + 1];
461 461
                                 }
462
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 2);
462
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 2);
463 463
                                 $page = "views/core/logs.php";
464 464
                             } else {
465 465
                                 $err = errorMessage(5, $lang); $page = "views/templates/error.php";
466
-                                logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'noPerm'", 3);
466
+                                logAction($_SESSION['user_name'], $lang['failedAccess']." 'noPerm'", 3);
467 467
                             }
468 468
                         }
469 469
                     }
@@ -473,7 +473,7 @@  discard block
 block discarded – undo
473 473
                 if ($_SESSION['permissions']['view']['curplayer']) {
474 474
                     if ($query) {
475 475
                         $sid = $url['path'][$settings['base'] + 1];
476
-                        logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 2);
476
+                        logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 2);
477 477
                         $page = "views/core/curPlayers.php";
478 478
                     } else {
479 479
                         $err = errorMessage(8, $lang);
@@ -482,21 +482,21 @@  discard block
 block discarded – undo
482 482
                 }
483 483
             } elseif ($currentPage == 'servers') {
484 484
                 if ($_SESSION['permissions']['super_admin']) {
485
-                    logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 2);
485
+                    logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 2);
486 486
                     $page = "views/core/servers.php";
487 487
                 }
488 488
             } elseif ($currentPage == 'editserver') {
489 489
                 if ($_SESSION['permissions']['super_admin']) {
490 490
                     if ($query) {
491 491
                         $id = $url['path'][$settings['base'] + 1];
492
-                        logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 2);
492
+                        logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 2);
493 493
                         $page = "views/core/editServer.php";
494 494
                     } else {$err = errorMessage(8, $lang); $page = "views/templates/error.php"; }
495 495
                 } else {$err = errorMessage(5, $lang); $page = "views/templates/error.php"; }
496 496
             }
497 497
             foreach ($settings['plugins'] as &$plugin) {
498
-                if (file_exists("plugins/" . $plugin . "/pageRules.php")) {
499
-                    include("plugins/" . $plugin . "/pageRules.php");
498
+                if (file_exists("plugins/".$plugin."/pageRules.php")) {
499
+                    include("plugins/".$plugin."/pageRules.php");
500 500
                 }
501 501
             }
502 502
 
@@ -527,11 +527,11 @@  discard block
 block discarded – undo
527 527
                     $page = 'views/core/2factor.php';
528 528
                 } elseif ($_SESSION['2factor'] == 1 || $_SESSION['2factor'] == 3) {
529 529
                 if (isset($_POST['code'])) {
530
-                    $sql = "SELECT `twoFactor` FROM `users` WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
530
+                    $sql = "SELECT `twoFactor` FROM `users` WHERE `user_id` = '".$_SESSION['user_id']."';";
531 531
                     $user = $db_connection->query($sql)->fetch_object();
532 532
                     if ($gauth->verifyCode($user->twoFactor, $_POST['code'])) $_SESSION['2factor'] = 2;
533 533
                     else {
534
-                    $sql = "SELECT `backup` FROM `users` WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
534
+                    $sql = "SELECT `backup` FROM `users` WHERE `user_id` = '".$_SESSION['user_id']."';";
535 535
                     $user = $db_connection->query($sql)->fetch_object();
536 536
                     if ($user->backup == $_POST['code']) {
537 537
                         $_SESSION['2factor'] = 2;
Please login to merge, or discard this patch.
hooks/rcon_ban.php 2 patches
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.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,13 +10,13 @@
 block discarded – undo
10 10
     $time = clean($_POST['TIME'], "int");
11 11
     $reason = clean($_POST['REASON'], "string");
12 12
 
13
-    $sql = "SELECT * FROM `servers` WHERE `use_sq` = 1 AND `sid` = " . $sid . ";";
13
+    $sql = "SELECT * FROM `servers` WHERE `use_sq` = 1 AND `sid` = ".$sid.";";
14 14
     $result_of_query = $db_connection->query($sql);
15 15
     if ($result_of_query->num_rows == 1) {
16 16
         $server = $result_of_query->fetch_object();
17 17
         try
18 18
         {
19
-            $cmd = 'ban ' . $rid . ' ' . $time . ' ' . $reason;
19
+            $cmd = 'ban '.$rid.' '.$time.' '.$reason;
20 20
             $answer = rcon(decrypt($server->sq_ip), decrypt($server->sq_port), decrypt($server->rcon_pass), $cmd);
21 21
         }
22 22
         catch (Exception $e)
Please login to merge, or discard this patch.
hooks/rcon_players.php 2 patches
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.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
 if (isset($_GET['sid'])) {
6 6
     $sid = clean($_GET['sid'], "int");
7 7
     $db_connection = masterConnect();
8
-    $sql = "SELECT `sq_ip`,`sq_port`,`rcon_pass` FROM `servers` WHERE `use_sq` = 1 AND `sid` = " . $sid . ";";
8
+    $sql = "SELECT `sq_ip`,`sq_port`,`rcon_pass` FROM `servers` WHERE `use_sq` = 1 AND `sid` = ".$sid.";";
9 9
     $result_of_query = $db_connection->query($sql);
10 10
     if ($result_of_query->num_rows == 1) {
11 11
         $server = $result_of_query->fetch_object();
Please login to merge, or discard this patch.