Cyberbyte-Studios / CyberWorks

views/life/houses.php

Braces +3 added lines, -1 removed lines

@@ -69,4 +69,6 @@
     </div>
 
 <?php
-} else echo errorMessage(3, $lang);
+} else {
+    echo errorMessage(3, $lang);
+}

Spacing +10 added lines, -10 removed lines

@@ -1,16 +1,16 @@ 
 <?php
 $db_link = serverConnect();
-$max = 'LIMIT ' . ($pageNum - 1) * $_SESSION['items'] . ',' . $_SESSION['items'];
+$max = 'LIMIT '.($pageNum - 1) * $_SESSION['items'].','.$_SESSION['items'];
 
 if (isset($search)) {
-    logAction($_SESSION['user_name'], $lang['searched'] . ' (' . $search . ') ' . $lang['in'] . ' ' . $lang['vehicles'], 1);
-    $sql = "SELECT `id` FROM `houses` INNER JOIN `players` ON houses.pid=players.playerid WHERE `pid` LIKE '" . $search . "' OR `pos` LIKE '" . $search . "' OR `inventory` LIKE '%" . $search . "%' OR `name` LIKE '%" . $search . "%';";
+    logAction($_SESSION['user_name'], $lang['searched'].' ('.$search.') '.$lang['in'].' '.$lang['vehicles'], 1);
+    $sql = "SELECT `id` FROM `houses` INNER JOIN `players` ON houses.pid=players.playerid WHERE `pid` LIKE '".$search."' OR `pos` LIKE '".$search."' OR `inventory` LIKE '%".$search."%' OR `name` LIKE '%".$search."%';";
     $result_of_query = $db_link->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
     if ($pageNum > $total_records) {
         $pageNum = $total_records;
     }
-    $sql = "SELECT `id`,`pid`,`pos`,`name`,`owned` FROM `houses` INNER JOIN `players` ON houses.pid=players.playerid WHERE `pid` LIKE '" . $search . "' OR `pos` LIKE '" . $search . "' OR `inventory` LIKE '%" . $search . "%' OR `name` LIKE '%" . $search . "%' " . $max . " ;";
+    $sql = "SELECT `id`,`pid`,`pos`,`name`,`owned` FROM `houses` INNER JOIN `players` ON houses.pid=players.playerid WHERE `pid` LIKE '".$search."' OR `pos` LIKE '".$search."' OR `inventory` LIKE '%".$search."%' OR `name` LIKE '%".$search."%' ".$max." ;";
 } else {
     $sql = "SELECT `id` FROM `houses`;";
     $result_of_query = $db_link->query($sql);
@@ -18,7 +18,7 @@ 
     if ($pageNum > $total_records) {
         $pageNum = $total_records;
     }
-    $sql = "SELECT `id`,`pid`,`pos`,`name`,`owned` FROM `houses` INNER JOIN `players` ON houses.pid=players.playerid " . $max . " ;";
+    $sql = "SELECT `id`,`pid`,`pos`,`name`,`owned` FROM `houses` INNER JOIN `players` ON houses.pid=players.playerid ".$max." ;";
 }
 
 $result_of_query = $db_link->query($sql);
@@ -45,7 +45,7 @@ 
                 <th><i class="fa fa-user"></i> <?php echo $lang['position']; ?></th>
                 <th class="hidden-xs"><i class="fa fa-user"></i> <?php echo $lang['owned']; ?></th>
                 <?php if ($_SESSION['permissions']['edit']['houses']) {
-    echo '<th>' . $lang['edit'] . '</th>';
+    echo '<th>'.$lang['edit'].'</th>';
 }
 ?>
             </tr>
@@ -54,11 +54,11 @@ 
             <?php
             while ($row = mysqli_fetch_assoc($result_of_query)) {
                 echo "<tr>";
-                echo "<td>" . $row["name"] . "</td>";
-                echo "<td>" . substr($row["pos"], 1, -1) . "</td>";
-                echo "<td class='hidden-xs'>" . yesNo($row["owned"], $lang) . "</td>";
+                echo "<td>".$row["name"]."</td>";
+                echo "<td>".substr($row["pos"], 1, -1)."</td>";
+                echo "<td class='hidden-xs'>".yesNo($row["owned"], $lang)."</td>";
                 if ($_SESSION['permissions']['edit']['houses']) {
-                    echo "<td><a class='btn btn-primary btn-xs' href='" . $settings['url'] . "editHouse/" . $row["id"] . "'>";
+                    echo "<td><a class='btn btn-primary btn-xs' href='".$settings['url']."editHouse/".$row["id"]."'>";
                     echo "<i class='fa fa-pencil'></i></a></td>";
                 }
                 echo "</tr>";

views/life/medics.php

Braces +9 added lines, -3 removed lines

@@ -7,14 +7,18 @@ 
     $sql = "SELECT `uid` FROM `players` WHERE `uid` LIKE '" . $search . "' OR `name` LIKE '%" . $search . "%' OR `playerid` LIKE '" . $search . "';";
     $result_of_query = $db_link->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
-    if ($pageNum > $total_records) $pageNum = $total_records;
+    if ($pageNum > $total_records) {
+        $pageNum = $total_records;
+    }
     $sql = "SELECT `playerid`,`name`,`bankacc`,`cash`,`coplevel`,`mediclevel`,`adminlevel`,`uid` FROM `players` WHERE `uid` LIKE '" . $search . "' OR `name` LIKE '%" . $search . "%' OR `playerid` LIKE '" . $search . "'" . $max . " ;";
     logAction($_SESSION['user_name'], $lang['searched'] . ' (' . $search . ') ' . $lang['in'] . ' ' . $lang['players'], 1);
 } else {
     $sql = "SELECT `uid` FROM `players`;";
     $result_of_query = $db_link->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
-    if ($pageNum > $total_records) $pageNum = $total_records;
+    if ($pageNum > $total_records) {
+        $pageNum = $total_records;
+    }
     $sql = "SELECT `playerid`,`name`,`bankacc`,`cash`,`coplevel`,`mediclevel`,`adminlevel`,`uid` FROM `players` " . $max . " ;";
 }
 
@@ -107,4 +111,6 @@ 
                 ?>
         </div>
 <?php
-} else echo '<h3>' . errorMessage(36, $lang) . '</h3>';
+} else {
+    echo '<h3>' . errorMessage(36, $lang) . '</h3>';
+}

Spacing +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 $db_link = serverConnect();
 
-$max = 'LIMIT ' . ($pageNum - 1) * $_SESSION['items'] . ',' . $_SESSION['items'];
+$max = 'LIMIT '.($pageNum - 1) * $_SESSION['items'].','.$_SESSION['items'];
 
 if (isset($search)) {
-    $sql = "SELECT `uid` FROM `players` WHERE `uid` LIKE '" . $search . "' OR `name` LIKE '%" . $search . "%' OR `playerid` LIKE '" . $search . "' AND `mediclevel` >= '1' ORDER BY `mediclevel` DESC;";
+    $sql = "SELECT `uid` FROM `players` WHERE `uid` LIKE '".$search."' OR `name` LIKE '%".$search."%' OR `playerid` LIKE '".$search."' AND `mediclevel` >= '1' ORDER BY `mediclevel` DESC;";
     $result_of_query = $db_link->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
     if ($pageNum > $total_records) $pageNum = $total_records;
-    $sql = "SELECT `name`,`mediclevel`,`playerid`,`uid` FROM `players` WHERE `uid` LIKE '" . $search . "' OR `name` LIKE '%" . $search . "%' OR `playerid` LIKE '" . $search . "' AND `mediclevel` >= '1' ORDER BY `mediclevel` DESC " . $max . "  ;";
-    logAction($_SESSION['user_name'], $lang['searched'] . ' (' . $search . ') ' . $lang['in'] . ' ' . $lang['players'], 1);
+    $sql = "SELECT `name`,`mediclevel`,`playerid`,`uid` FROM `players` WHERE `uid` LIKE '".$search."' OR `name` LIKE '%".$search."%' OR `playerid` LIKE '".$search."' AND `mediclevel` >= '1' ORDER BY `mediclevel` DESC ".$max."  ;";
+    logAction($_SESSION['user_name'], $lang['searched'].' ('.$search.') '.$lang['in'].' '.$lang['players'], 1);
 } else {
     $sql = "SELECT `uid` FROM `players` WHERE `mediclevel` >= '1' ORDER BY `mediclevel` DESC;";
     $result_of_query = $db_link->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
     if ($pageNum > $total_records) $pageNum = $total_records;
-    $sql = "SELECT `name`,`mediclevel`,`playerid`,`uid` FROM `players` WHERE `mediclevel` >= '1' ORDER BY `mediclevel` DESC " . $max . " ;";
+    $sql = "SELECT `name`,`mediclevel`,`playerid`,`uid` FROM `players` WHERE `mediclevel` >= '1' ORDER BY `mediclevel` DESC ".$max." ;";
 }
 
 $result_of_query = $db_link->query($sql);
@@ -25,7 +25,7 @@ 
     }
     $pids = implode(',', $pids);
     if ($settings['steamAPI'] && $_SESSION['permissions']['view']['steam'] && !$settings['performance'] && $settings['vacTest']) {
-        $api = "http://api.steampowered.com/ISteamUser/GetPlayerBans/v1/?key=" . $settings['steamAPI'] . "&steamids=" . $pids;
+        $api = "http://api.steampowered.com/ISteamUser/GetPlayerBans/v1/?key=".$settings['steamAPI']."&steamids=".$pids;
         $bans = get_object_vars(json_decode(file_get_contents($api)));
         $bans = $bans['players'];
         $steamPlayers = count($bans);
@@ -53,7 +53,7 @@ 
                 <th><i class="fa fa-eye"></i><?php echo $lang['playerID']; ?></th>
                 <th><i class="fa fa-user"></i><?php echo $lang['rank']; ?></th>
                 <?php if ($_SESSION['permissions']['edit']['player']) {
-                    echo '<th><i class="fa fa-pencil"></i> ' . $lang['edit'] . '</th>';
+                    echo '<th><i class="fa fa-pencil"></i> '.$lang['edit'].'</th>';
                 }
                 ?>
             </tr>
@@ -63,26 +63,26 @@ 
             while ($row = mysqli_fetch_assoc($result_of_query)) {
                 $playersID = $row["playerid"];
                 echo "<tr>";
-                echo "<td>" . $row["name"] . "</td>";
-                echo "<td>" . $row["playerid"] . "</td>";
-                echo "<td class='hidden-xs'>" . $row["mediclevel"] . "</td>";
+                echo "<td>".$row["name"]."</td>";
+                echo "<td>".$row["playerid"]."</td>";
+                echo "<td class='hidden-xs'>".$row["mediclevel"]."</td>";
                 if ($_SESSION['permissions']['edit']['player']) {
-                    echo "<td><a class='btn btn-primary btn-xs' href='" . $settings['url'] . "editPlayer/" . $row["uid"] . "'>";
+                    echo "<td><a class='btn btn-primary btn-xs' href='".$settings['url']."editPlayer/".$row["uid"]."'>";
                     echo "<i class='fa fa-pencil'></i></a></td>";
                 } else {
-                    echo "<td><a class='btn btn-primary btn-xs' href='" . $settings['url'] . "editPlayer/" . $row["uid"] . "'>";
+                    echo "<td><a class='btn btn-primary btn-xs' href='".$settings['url']."editPlayer/".$row["uid"]."'>";
                     echo "<i class='fa fa-eye'></i></a></td>";
                 }
                 if ($_SESSION['permissions']['view']['steam'] && $steamPlayers > 0) {
-                    echo "<td><a href='http://steamcommunity.com/profiles/" . $row["playerid"] . "' ";
+                    echo "<td><a href='http://steamcommunity.com/profiles/".$row["playerid"]."' ";
                     for ($player = 0; $player <= $steamPlayers; $player++) {
                         if ($bans[$player]->SteamId == $row['playerid']) {
                             if ($bans[$player]->VACBanned == true) {
-                                echo "<td><a href='http://steamcommunity.com/profiles/" . $row["playerid"] . "' ";
+                                echo "<td><a href='http://steamcommunity.com/profiles/".$row["playerid"]."' ";
                                 echo "class='btn btn-danger btn-xs hidden-xs' target='_blank'><i class='fa fa-steam'></i></a>";
 
                             } else {
-                                echo "<td><a href='http://steamcommunity.com/profiles/" . $row["playerid"] . "' ";
+                                echo "<td><a href='http://steamcommunity.com/profiles/".$row["playerid"]."' ";
                                 echo "class='btn btn-primary btn-xs hidden-xs' target='_blank'><i class='fa fa-steam'></i></a>"; }
                         }
                     }
@@ -95,4 +95,4 @@ 
             ?>
     </div>
     <?php
-} else echo '<h3>' . errorMessage(36, $lang) . '</h3>';
+} else echo '<h3>'.errorMessage(36, $lang).'</h3>';

views/life/police.php

Braces +9 added lines, -3 removed lines

@@ -7,14 +7,18 @@ 
     $sql = "SELECT `uid` FROM `players` WHERE `uid` LIKE '" . $search . "' OR `name` LIKE '%" . $search . "%' OR `playerid` LIKE '" . $search . "';";
     $result_of_query = $db_link->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
-    if ($pageNum > $total_records) $pageNum = $total_records;
+    if ($pageNum > $total_records) {
+        $pageNum = $total_records;
+    }
     $sql = "SELECT `playerid`,`name`,`bankacc`,`cash`,`coplevel`,`mediclevel`,`adminlevel`,`uid` FROM `players` WHERE `uid` LIKE '" . $search . "' OR `name` LIKE '%" . $search . "%' OR `playerid` LIKE '" . $search . "'" . $max . " ;";
     logAction($_SESSION['user_name'], $lang['searched'] . ' (' . $search . ') ' . $lang['in'] . ' ' . $lang['players'], 1);
 } else {
     $sql = "SELECT `uid` FROM `players`;";
     $result_of_query = $db_link->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
-    if ($pageNum > $total_records) $pageNum = $total_records;
+    if ($pageNum > $total_records) {
+        $pageNum = $total_records;
+    }
     $sql = "SELECT `playerid`,`name`,`bankacc`,`cash`,`coplevel`,`mediclevel`,`adminlevel`,`uid` FROM `players` " . $max . " ;";
 }
 
@@ -107,4 +111,6 @@ 
                 ?>
         </div>
 <?php
-} else echo '<h3>' . errorMessage(36, $lang) . '</h3>';
+} else {
+    echo '<h3>' . errorMessage(36, $lang) . '</h3>';
+}

Spacing +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 $db_link = serverConnect();
 
-$max = 'LIMIT ' . ($pageNum - 1) * $_SESSION['items'] . ',' . $_SESSION['items'];
+$max = 'LIMIT '.($pageNum - 1) * $_SESSION['items'].','.$_SESSION['items'];
 
 if (isset($search)) {
-    $sql = "SELECT `uid` FROM `players` WHERE `uid` LIKE '" . $search . "' OR `name` LIKE '%" . $search . "%' OR `playerid` LIKE '" . $search . "' AND `coplevel` >= '1' ORDER BY `coplevel` DESC;";
+    $sql = "SELECT `uid` FROM `players` WHERE `uid` LIKE '".$search."' OR `name` LIKE '%".$search."%' OR `playerid` LIKE '".$search."' AND `coplevel` >= '1' ORDER BY `coplevel` DESC;";
     $result_of_query = $db_link->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
     if ($pageNum > $total_records) $pageNum = $total_records;
-    $sql = "SELECT `name`,`coplevel`,`playerid`,`uid` FROM `players` WHERE `uid` LIKE '" . $search . "' OR `name` LIKE '%" . $search . "%' OR `playerid` LIKE '" . $search . "' AND `coplevel` >= '1' ORDER BY `coplevel` DESC " . $max . "  ;";
-    logAction($_SESSION['user_name'], $lang['searched'] . ' (' . $search . ') ' . $lang['in'] . ' ' . $lang['players'], 1);
+    $sql = "SELECT `name`,`coplevel`,`playerid`,`uid` FROM `players` WHERE `uid` LIKE '".$search."' OR `name` LIKE '%".$search."%' OR `playerid` LIKE '".$search."' AND `coplevel` >= '1' ORDER BY `coplevel` DESC ".$max."  ;";
+    logAction($_SESSION['user_name'], $lang['searched'].' ('.$search.') '.$lang['in'].' '.$lang['players'], 1);
 } else {
     $sql = "SELECT `uid` FROM `players` WHERE `coplevel` >= '1' ORDER BY `coplevel` DESC;";
     $result_of_query = $db_link->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
     if ($pageNum > $total_records) $pageNum = $total_records;
-    $sql = "SELECT `name`,`coplevel`,`playerid`,`uid` FROM `players` WHERE `coplevel` >= '1' ORDER BY `coplevel` DESC " . $max . " ;";
+    $sql = "SELECT `name`,`coplevel`,`playerid`,`uid` FROM `players` WHERE `coplevel` >= '1' ORDER BY `coplevel` DESC ".$max." ;";
 }
 
 $result_of_query = $db_link->query($sql);
@@ -25,7 +25,7 @@ 
     }
     $pids = implode(',', $pids);
     if ($settings['steamAPI'] && $_SESSION['permissions']['view']['steam'] && !$settings['performance'] && $settings['vacTest']) {
-        $api = "http://api.steampowered.com/ISteamUser/GetPlayerBans/v1/?key=" . $settings['steamAPI'] . "&steamids=" . $pids;
+        $api = "http://api.steampowered.com/ISteamUser/GetPlayerBans/v1/?key=".$settings['steamAPI']."&steamids=".$pids;
         $bans = get_object_vars(json_decode(file_get_contents($api)));
         $bans = $bans['players'];
         $steamPlayers = count($bans);
@@ -53,7 +53,7 @@ 
                 <th><i class="fa fa-eye"></i><?php echo $lang['playerID']; ?></th>
                 <th><i class="fa fa-user"></i><?php echo $lang['rank']; ?></th>
                 <?php if ($_SESSION['permissions']['edit']['player']) {
-                    echo '<th><i class="fa fa-pencil"></i> ' . $lang['edit'] . '</th>';
+                    echo '<th><i class="fa fa-pencil"></i> '.$lang['edit'].'</th>';
                 }
                 ?>
             </tr>
@@ -63,26 +63,26 @@ 
             while ($row = mysqli_fetch_assoc($result_of_query)) {
                 $playersID = $row["playerid"];
                 echo "<tr>";
-                echo "<td>" . $row["name"] . "</td>";
-                echo "<td>" . $row["playerid"] . "</td>";
-                echo "<td class='hidden-xs'>" . $row["coplevel"] . "</td>";
+                echo "<td>".$row["name"]."</td>";
+                echo "<td>".$row["playerid"]."</td>";
+                echo "<td class='hidden-xs'>".$row["coplevel"]."</td>";
                 if ($_SESSION['permissions']['edit']['player']) {
-                    echo "<td><a class='btn btn-primary btn-xs' href='" . $settings['url'] . "editPlayer/" . $row["uid"] . "'>";
+                    echo "<td><a class='btn btn-primary btn-xs' href='".$settings['url']."editPlayer/".$row["uid"]."'>";
                     echo "<i class='fa fa-pencil'></i></a></td>";
                 } else {
-                    echo "<td><a class='btn btn-primary btn-xs' href='" . $settings['url'] . "editPlayer/" . $row["uid"] . "'>";
+                    echo "<td><a class='btn btn-primary btn-xs' href='".$settings['url']."editPlayer/".$row["uid"]."'>";
                     echo "<i class='fa fa-eye'></i></a></td>";
                 }
                 if ($_SESSION['permissions']['view']['steam'] && $steamPlayers > 0) {
-                    echo "<td><a href='http://steamcommunity.com/profiles/" . $row["playerid"] . "' ";
+                    echo "<td><a href='http://steamcommunity.com/profiles/".$row["playerid"]."' ";
                     for ($player = 0; $player <= $steamPlayers; $player++) {
                         if ($bans[$player]->SteamId == $row['playerid']) {
                             if ($bans[$player]->VACBanned == true) {
-                                echo "<td><a href='http://steamcommunity.com/profiles/" . $row["playerid"] . "' ";
+                                echo "<td><a href='http://steamcommunity.com/profiles/".$row["playerid"]."' ";
                                 echo "class='btn btn-danger btn-xs hidden-xs' target='_blank'><i class='fa fa-steam'></i></a>";
 
                             } else {
-                                echo "<td><a href='http://steamcommunity.com/profiles/" . $row["playerid"] . "' ";
+                                echo "<td><a href='http://steamcommunity.com/profiles/".$row["playerid"]."' ";
                                 echo "class='btn btn-primary btn-xs hidden-xs' target='_blank'><i class='fa fa-steam'></i></a>"; }
                         }
                     }
@@ -95,4 +95,4 @@ 
             ?>
     </div>
     <?php
-} else echo '<h3>' . errorMessage(36, $lang) . '</h3>';
+} else echo '<h3>'.errorMessage(36, $lang).'</h3>';

classes/googleAuth.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
-     * PHP Class for handling Google Authenticator 2-factor authentication
-     *
-     * @author Michael Kliewe
-     * @copyright 2012 Michael Kliewe
-     * @license http://www.opensource.org/licenses/bsd-license.php BSD License
-     * @link http://www.phpgangsta.de/
-     */
+ * PHP Class for handling Google Authenticator 2-factor authentication
+ *
+ * @author Michael Kliewe
+ * @copyright 2012 Michael Kliewe
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ * @link http://www.phpgangsta.de/
+ */
 
 class PHPGangsta_GoogleAuthenticator
 {

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
         $secretkey = $this->_base32Decode($secret);
 
         // Pack time into binary string
-        $time = chr(0) . chr(0) . chr(0) . chr(0) . pack('N*', $timeSlice);
+        $time = chr(0).chr(0).chr(0).chr(0).pack('N*', $timeSlice);
         // Hash it with users secret key
         $hm = hash_hmac('SHA1', $time, $secretkey, true);
         // Use last nipple of result as index/offset
@@ -73,8 +73,8 @@ 
      * @return string
      */
     public function getQRCodeGoogleUrl($name, $secret) {
-        $urlencoded = urlencode('otpauth://totp/' . $name . '?secret=' . $secret . '');
-        return 'https://chart.googleapis.com/chart?chs=200x200&chld=M|0&cht=qr&chl=' . $urlencoded . '';
+        $urlencoded = urlencode('otpauth://totp/'.$name.'?secret='.$secret.'');
+        return 'https://chart.googleapis.com/chart?chs=200x200&chld=M|0&cht=qr&chl='.$urlencoded.'';
     }
 
     /**

views/life/admins.php

Braces +9 added lines, -3 removed lines

@@ -7,14 +7,18 @@ 
     $sql = "SELECT `uid` FROM `players` WHERE `uid` LIKE '" . $search . "' OR `name` LIKE '%" . $search . "%' OR `playerid` LIKE '" . $search . "';";
     $result_of_query = $db_link->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
-    if ($pageNum > $total_records) $pageNum = $total_records;
+    if ($pageNum > $total_records) {
+        $pageNum = $total_records;
+    }
     $sql = "SELECT `playerid`,`name`,`bankacc`,`cash`,`coplevel`,`mediclevel`,`adminlevel`,`uid` FROM `players` WHERE `uid` LIKE '" . $search . "' OR `name` LIKE '%" . $search . "%' OR `playerid` LIKE '" . $search . "'" . $max . " ;";
     logAction($_SESSION['user_name'], $lang['searched'] . ' (' . $search . ') ' . $lang['in'] . ' ' . $lang['players'], 1);
 } else {
     $sql = "SELECT `uid` FROM `players`;";
     $result_of_query = $db_link->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
-    if ($pageNum > $total_records) $pageNum = $total_records;
+    if ($pageNum > $total_records) {
+        $pageNum = $total_records;
+    }
     $sql = "SELECT `playerid`,`name`,`bankacc`,`cash`,`coplevel`,`mediclevel`,`adminlevel`,`uid` FROM `players` " . $max . " ;";
 }
 
@@ -107,4 +111,6 @@ 
                 ?>
         </div>
 <?php
-} else echo '<h3>' . errorMessage(36, $lang) . '</h3>';
+} else {
+    echo '<h3>' . errorMessage(36, $lang) . '</h3>';
+}

Spacing +16 added lines, -16 removed lines

@@ -1,21 +1,21 @@ 
 <?php
 $db_link = serverConnect();
 
-$max = 'LIMIT ' . ($pageNum - 1) * $_SESSION['items'] . ',' . $_SESSION['items'];
+$max = 'LIMIT '.($pageNum - 1) * $_SESSION['items'].','.$_SESSION['items'];
 
 if (isset($search)) {
-    $sql = "SELECT `uid` FROM `players` WHERE `uid` LIKE '" . $search . "' OR `name` LIKE '%" . $search . "%' OR `playerid` LIKE '" . $search . "' AND `adminlevel` >= '1' ORDER BY `adminlevel` DESC;";
+    $sql = "SELECT `uid` FROM `players` WHERE `uid` LIKE '".$search."' OR `name` LIKE '%".$search."%' OR `playerid` LIKE '".$search."' AND `adminlevel` >= '1' ORDER BY `adminlevel` DESC;";
     $result_of_query = $db_link->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
     if ($pageNum > $total_records) $pageNum = $total_records;
-    $sql = "SELECT `name`,`adminlevel`,`playerid`,`uid` FROM `players` WHERE `uid` LIKE '" . $search . "' OR `name` LIKE '%" . $search . "%' OR `playerid` LIKE '" . $search . "' AND `adminlevel` >= '1' ORDER BY `adminlevel` DESC " . $max . "  ;";
-    logAction($_SESSION['user_name'], $lang['searched'] . ' (' . $search . ') ' . $lang['in'] . ' ' . $lang['players'], 1);
+    $sql = "SELECT `name`,`adminlevel`,`playerid`,`uid` FROM `players` WHERE `uid` LIKE '".$search."' OR `name` LIKE '%".$search."%' OR `playerid` LIKE '".$search."' AND `adminlevel` >= '1' ORDER BY `adminlevel` DESC ".$max."  ;";
+    logAction($_SESSION['user_name'], $lang['searched'].' ('.$search.') '.$lang['in'].' '.$lang['players'], 1);
 } else {
     $sql = "SELECT `uid` FROM `players` WHERE `adminlevel` >= '1' ORDER BY `adminlevel` DESC;";
     $result_of_query = $db_link->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
     if ($pageNum > $total_records) $pageNum = $total_records;
-    $sql = "SELECT `name`,`adminlevel`,`playerid`,`uid` FROM `players` WHERE `adminlevel` >= '1' ORDER BY `adminlevel` DESC " . $max . " ;";
+    $sql = "SELECT `name`,`adminlevel`,`playerid`,`uid` FROM `players` WHERE `adminlevel` >= '1' ORDER BY `adminlevel` DESC ".$max." ;";
 }
 
 $result_of_query = $db_link->query($sql);
@@ -25,7 +25,7 @@ 
     }
     $pids = implode(',', $pids);
     if ($settings['steamAPI'] && $_SESSION['permissions']['view']['steam'] && !$settings['performance'] && $settings['vacTest']) {
-        $api = "http://api.steampowered.com/ISteamUser/GetPlayerBans/v1/?key=" . $settings['steamAPI'] . "&steamids=" . $pids;
+        $api = "http://api.steampowered.com/ISteamUser/GetPlayerBans/v1/?key=".$settings['steamAPI']."&steamids=".$pids;
         $bans = get_object_vars(json_decode(file_get_contents($api)));
         $bans = $bans['players'];
         $steamPlayers = count($bans);
@@ -53,7 +53,7 @@ 
                 <th><i class="fa fa-eye"></i><?php echo $lang['playerID']; ?></th>
                 <th><i class="fa fa-user"></i><?php echo $lang['rank']; ?></th>
                 <?php if ($_SESSION['permissions']['edit']['player']) {
-                    echo '<th><i class="fa fa-pencil"></i> ' . $lang['edit'] . '</th>';
+                    echo '<th><i class="fa fa-pencil"></i> '.$lang['edit'].'</th>';
                 }
                 ?>
             </tr>
@@ -63,26 +63,26 @@ 
             while ($row = mysqli_fetch_assoc($result_of_query)) {
                 $playersID = $row["playerid"];
                 echo "<tr>";
-                echo "<td>" . $row["name"] . "</td>";
-                echo "<td>" . $row["playerid"] . "</td>";
-                echo "<td class='hidden-xs'>" . $row["adminlevel"] . "</td>";
+                echo "<td>".$row["name"]."</td>";
+                echo "<td>".$row["playerid"]."</td>";
+                echo "<td class='hidden-xs'>".$row["adminlevel"]."</td>";
                 if ($_SESSION['permissions']['edit']['player']) {
-                    echo "<td><a class='btn btn-primary btn-xs' href='" . $settings['url'] . "editPlayer/" . $row["uid"] . "'>";
+                    echo "<td><a class='btn btn-primary btn-xs' href='".$settings['url']."editPlayer/".$row["uid"]."'>";
                     echo "<i class='fa fa-pencil'></i></a></td>";
                 } else {
-                    echo "<td><a class='btn btn-primary btn-xs' href='" . $settings['url'] . "editPlayer/" . $row["uid"] . "'>";
+                    echo "<td><a class='btn btn-primary btn-xs' href='".$settings['url']."editPlayer/".$row["uid"]."'>";
                     echo "<i class='fa fa-eye'></i></a></td>";
                 }
                 if ($_SESSION['permissions']['view']['steam'] && $steamPlayers > 0) {
-                    echo "<td><a href='http://steamcommunity.com/profiles/" . $row["playerid"] . "' ";
+                    echo "<td><a href='http://steamcommunity.com/profiles/".$row["playerid"]."' ";
                     for ($player = 0; $player <= $steamPlayers; $player++) {
                         if ($bans[$player]->SteamId == $row['playerid']) {
                             if ($bans[$player]->VACBanned == true) {
-                                echo "<td><a href='http://steamcommunity.com/profiles/" . $row["playerid"] . "' ";
+                                echo "<td><a href='http://steamcommunity.com/profiles/".$row["playerid"]."' ";
                                 echo "class='btn btn-danger btn-xs hidden-xs' target='_blank'><i class='fa fa-steam'></i></a>";
 
                             } else {
-                                echo "<td><a href='http://steamcommunity.com/profiles/" . $row["playerid"] . "' ";
+                                echo "<td><a href='http://steamcommunity.com/profiles/".$row["playerid"]."' ";
                                 echo "class='btn btn-primary btn-xs hidden-xs' target='_blank'><i class='fa fa-steam'></i></a>"; }
                         }
                     }
@@ -95,4 +95,4 @@ 
             ?>
     </div>
     <?php
-} else echo '<h3>' . errorMessage(36, $lang) . '</h3>';
+} else echo '<h3>'.errorMessage(36, $lang).'</h3>';

views/life/dashboard.php

Braces +8 added lines, -2 removed lines

@@ -16,7 +16,10 @@ 
                     </h1>
                 </div>
             </div>
-            <?php if (isset($_SESSION['update'])) echo '<div class="alert alert-info" role="alert">' . $land['updateMessage'] . ' (' . $_SESSION['message']->version . ') <a href="https://github.com/Cyberbyte-Studios/CyberWorks/releases">Download Section</a</div>'; ?>
+            <?php if (isset($_SESSION['update'])) {
+    echo '<div class="alert alert-info" role="alert">' . $land['updateMessage'] . ' (' . $_SESSION['message']->version . ') <a href="https://github.com/Cyberbyte-Studios/CyberWorks/releases">Download Section</a</div>';
+}
+?>
             <div class="row">
                 <div class="col-lg-4">
                     <div class="content-panel">
@@ -177,7 +180,10 @@ 
                     </h1>
                 </div>
             </div>
-            <?php if (isset($_SESSION['update'])) echo '<div class="alert alert-info" role="alert">' . $land['updateMessage'] . ' (' . $_SESSION['message']->version . ') <a href="https://github.com/Cyberbyte-Studios/CyberWorks/releases">Download Section</a</div>'; ?>
+            <?php if (isset($_SESSION['update'])) {
+    echo '<div class="alert alert-info" role="alert">' . $land['updateMessage'] . ' (' . $_SESSION['message']->version . ') <a href="https://github.com/Cyberbyte-Studios/CyberWorks/releases">Download Section</a</div>';
+}
+?>
             <div class="row">
                 <div class="col-lg-3 col-md-4 col-lg-offset-1">
                     <div class="panel panel-success">

Spacing +41 added lines, -41 removed lines

@@ -16,14 +16,14 @@ 
                     </h1>
                 </div>
             </div>
-            <?php if (isset($_SESSION['update'])) echo '<div class="alert alert-info" role="alert">' . $land['updateMessage'] . ' (' . $_SESSION['message']->version . ') <a href="https://github.com/Cyberbyte-Studios/CyberWorks/releases">Download Section</a</div>'; ?>
+            <?php if (isset($_SESSION['update'])) echo '<div class="alert alert-info" role="alert">'.$land['updateMessage'].' ('.$_SESSION['message']->version.') <a href="https://github.com/Cyberbyte-Studios/CyberWorks/releases">Download Section</a</div>'; ?>
             <div class="row">
                 <div class="col-lg-4">
                     <div class="content-panel">
                         <table class="table table-striped table-advance table-hover">
                             <h4>
                                 <i class="fa fa-taxi fa-fw"></i>
-                                <?php echo $lang['police'] . " " . $lang['overview']; ?>
+                                <?php echo $lang['police']." ".$lang['overview']; ?>
                                 <div class="col-lg-3 pull-right">
                                     <a href="<?php echo $settings['url'] ?>police"><?php echo $lang['viewAll']; ?> <i
                                             class="fa fa-arrow-circle-right"></i></a>
@@ -46,9 +46,9 @@ 
                     while ($row = mysqli_fetch_assoc($result_of_query)) {
                         $playersID = $row["playerid"];
                         echo "<tr>";
-                        echo "<td>" . $row["name"] . "</td>";
-                        echo "<td>" . $playersID . "</td>";
-                        echo "<td>" . $row["coplevel"] . "</td>";
+                        echo "<td>".$row["name"]."</td>";
+                        echo "<td>".$playersID."</td>";
+                        echo "<td>".$row["coplevel"]."</td>";
                         echo "</tr>";
                     };
                     ?>
@@ -78,9 +78,9 @@ 
                         $result_of_query = $db_link->query($sql);
                         while ($row = mysqli_fetch_assoc($result_of_query)) {
                             echo "<tr>";
-                            echo "<td>" . $row["name"] . "</td>";
-                            echo "<td>" . $row["cash"] . "</td>";
-                            echo "<td>" . $row["bankacc"] . "</td>";
+                            echo "<td>".$row["name"]."</td>";
+                            echo "<td>".$row["cash"]."</td>";
+                            echo "<td>".$row["bankacc"]."</td>";
                             echo "</tr>";
                         };
                         ?>
@@ -93,17 +93,17 @@ 
                     <table class="table table-striped table-advance table-hover">
                         <h4>
                             <i class="fa fa-ambulance fa-fw"></i>
-                            <?php echo $lang['medic'] . " " . $lang['overview']; ?>
+                            <?php echo $lang['medic']." ".$lang['overview']; ?>
                             <div class="col-lg-3 pull-right">
-                                <a href="<?php echo $settings['url'] ?>medic"><?php echo $lang['viewAll'] . " "; ?> <i
+                                <a href="<?php echo $settings['url'] ?>medic"><?php echo $lang['viewAll']." "; ?> <i
                                         class="fa fa-arrow-circle-right"></i></a>
                             </div>
                         </h4>
                         <hr>
                         <thead>
                         <tr>
-                            <th><i class="fa fa-user"></i><?php echo " " . $lang['name']; ?></th>
-                            <th><i class="fa fa-eye"></i><?php echo " " . $lang['playerID']; ?></th>
+                            <th><i class="fa fa-user"></i><?php echo " ".$lang['name']; ?></th>
+                            <th><i class="fa fa-eye"></i><?php echo " ".$lang['playerID']; ?></th>
                             <th>
                                 <?php echo $lang['rank']; ?></th>
                         </tr>
@@ -116,9 +116,9 @@ 
                         while ($row = mysqli_fetch_assoc($result_of_query)) {
                             $playersID = $row["playerid"];
                             echo "<tr>";
-                            echo "<td>" . $row["name"] . "</td>";
-                            echo "<td>" . $playersID . "</td>";
-                            echo "<td>" . $row["mediclevel"] . "</td>";
+                            echo "<td>".$row["name"]."</td>";
+                            echo "<td>".$playersID."</td>";
+                            echo "<td>".$row["mediclevel"]."</td>";
                             echo "</tr>";
                         };
                         ?>
@@ -134,7 +134,7 @@ 
                         <table class="table table-striped table-advance table-hover">
                             <h4>
                                 <i class="fa fa-taxi fa-fw"></i>
-                                <?php echo $lang['admin'] . " " . $lang['overview']; ?>
+                                <?php echo $lang['admin']." ".$lang['overview']; ?>
                                 <div class="col-lg-3 pull-right">
                                     <a href="<?php echo $settings['url'] ?>admins"><?php echo $lang['viewAll']; ?> <i
                                             class="fa fa-arrow-circle-right"></i></a>
@@ -157,9 +157,9 @@ 
                     while ($row = mysqli_fetch_assoc($result_of_query)) {
                         $playersID = $row["playerid"];
                         echo "<tr>";
-                        echo "<td>" . $row["name"] . "</td>";
-                        echo "<td>" . $playersID . "</td>";
-                        echo "<td>" . $row["adminlevel"] . "</td>";
+                        echo "<td>".$row["name"]."</td>";
+                        echo "<td>".$playersID."</td>";
+                        echo "<td>".$row["adminlevel"]."</td>";
                         echo "</tr>";
                     };
                     ?>
@@ -177,7 +177,7 @@ 
                     </h1>
                 </div>
             </div>
-            <?php if (isset($_SESSION['update'])) echo '<div class="alert alert-info" role="alert">' . $land['updateMessage'] . ' (' . $_SESSION['message']->version . ') <a href="https://github.com/Cyberbyte-Studios/CyberWorks/releases">Download Section</a</div>'; ?>
+            <?php if (isset($_SESSION['update'])) echo '<div class="alert alert-info" role="alert">'.$land['updateMessage'].' ('.$_SESSION['message']->version.') <a href="https://github.com/Cyberbyte-Studios/CyberWorks/releases">Download Section</a</div>'; ?>
             <div class="row">
                 <div class="col-lg-3 col-md-4 col-lg-offset-1">
                     <div class="panel panel-success">
@@ -191,7 +191,7 @@ 
                                     $sql = "SELECT `name` FROM `players` ORDER BY `insert_time` DESC LIMIT 1;";
                                     $result_of_query = $db_link->query($sql);
                                     while ($row = mysqli_fetch_assoc($result_of_query)) {
-                                        echo "<h1>" . $row["name"] . "</h1>";
+                                        echo "<h1>".$row["name"]."</h1>";
                                     };
                                     ?>
                                     <div>Newest Player</div>
@@ -212,7 +212,7 @@ 
                                         $sql = "SELECT `uid` FROM `players`;";
                                         $result_of_query = $db_link->query($sql);
                                         $total_records = mysqli_num_rows($result_of_query);
-                                        echo "<h1>" . $total_records . "</h1>";
+                                        echo "<h1>".$total_records."</h1>";
                                     ?>
                                     <div>Players</div>
                                 </div>
@@ -232,7 +232,7 @@ 
                                     $sql = "SELECT `id` FROM `vehicles`;";
                                     $result_of_query = $db_link->query($sql);
                                     $total_records = mysqli_num_rows($result_of_query);
-                                    echo "<h1>" . $total_records . "</h1>";
+                                    echo "<h1>".$total_records."</h1>";
                                     ?>
                                     <span>Vehicles</span>
                                 </div>
@@ -259,13 +259,13 @@ 
                             <li class="active">
                                 <a href="#police" data-toggle="tab">
                                     <i class="fa fa-taxi fa-fw"></i>
-                                    <small><?php echo $lang['police'] . " " . $lang['overview']; ?></small>
+                                    <small><?php echo $lang['police']." ".$lang['overview']; ?></small>
                                 </a>
                             </li>
                             <li>
                                 <a href="#medic" data-toggle="tab">
                                     <i class="fa fa-ambulance fa-fw"></i>
-                                    <small><?php echo $lang['medic'] . " " . $lang['overview']; ?></small>
+                                    <small><?php echo $lang['medic']." ".$lang['overview']; ?></small>
                                 </a>
                             </li>
                             <li>
@@ -277,7 +277,7 @@ 
                             <li>
                                 <a href="#admins" data-toggle="tab">
                                     <i class="fa fa-users fa-fw"></i>
-                                    <small><?php echo $lang['admin'] . " " . $lang['overview']; ?></small>
+                                    <small><?php echo $lang['admin']." ".$lang['overview']; ?></small>
                                 </a>
                             </li>
                         </ul>
@@ -287,7 +287,7 @@ 
                                     <table class="table table-striped table-advance table-hover">
                                         <h4>
                                             <i class="fa fa-taxi fa-fw"></i>
-                                            <?php echo $lang['police'] . " " . $lang['overview']; ?>
+                                            <?php echo $lang['police']." ".$lang['overview']; ?>
                                             <div class="col-lg-3 pull-right">
                                                 <a href="<?php echo $settings['url'] ?>police"><?php echo $lang['viewAll']; ?> <i
                                                         class="fa fa-arrow-circle-right"></i></a>
@@ -308,9 +308,9 @@ 
                                         while ($row = mysqli_fetch_assoc($result_of_query)) {
                                             $playersID = $row["playerid"];
                                             echo "<tr>";
-                                            echo "<td>" . $row["name"] . "</td>";
-                                            echo "<td>" . $playersID . "</td>";
-                                            echo "<td>" . $row["coplevel"] . "</td>";
+                                            echo "<td>".$row["name"]."</td>";
+                                            echo "<td>".$playersID."</td>";
+                                            echo "<td>".$row["coplevel"]."</td>";
                                             echo "</tr>";
                                         };
                                         ?>
@@ -321,7 +321,7 @@ 
                                     <table class="table table-striped table-advance table-hover">
                                         <h4>
                                             <i class="fa fa-ambulance fa-fw"></i>
-                                            <?php echo $lang['medic'] . " " . $lang['overview']; ?>
+                                            <?php echo $lang['medic']." ".$lang['overview']; ?>
                                             <div class="col-lg-3 pull-right">
                                                 <a href="<?php echo $settings['url'] ?>medic"><?php echo $lang['viewAll']; ?> <i
                                                         class="fa fa-arrow-circle-right"></i></a>
@@ -342,9 +342,9 @@ 
                                         while ($row = mysqli_fetch_assoc($result_of_query)) {
                                             $playersID = $row["playerid"];
                                             echo "<tr>";
-                                            echo "<td>" . $row["name"] . "</td>";
-                                            echo "<td>" . $playersID . "</td>";
-                                            echo "<td>" . $row["mediclevel"] . "</td>";
+                                            echo "<td>".$row["name"]."</td>";
+                                            echo "<td>".$playersID."</td>";
+                                            echo "<td>".$row["mediclevel"]."</td>";
                                             echo "</tr>";
                                         };
                                         ?>
@@ -371,9 +371,9 @@ 
                                         $result_of_query = $db_link->query($sql);
                                         while ($row = mysqli_fetch_assoc($result_of_query)) {
                                             echo "<tr>";
-                                            echo "<td>" . $row["name"] . "</td>";
-                                            echo "<td>" . $row["cash"] . "</td>";
-                                            echo "<td>" . $row["bankacc"] . "</td>";
+                                            echo "<td>".$row["name"]."</td>";
+                                            echo "<td>".$row["cash"]."</td>";
+                                            echo "<td>".$row["bankacc"]."</td>";
                                             echo "</tr>";
                                         };
                                         ?>
@@ -384,7 +384,7 @@ 
                                     <table class="table table-striped table-advance table-hover">
                                         <h4>
                                             <i class="fa fa-taxi fa-fw"></i>
-                                            <?php echo $lang['admin'] . " " . $lang['overview']; ?>
+                                            <?php echo $lang['admin']." ".$lang['overview']; ?>
                                             <div class="col-lg-3 pull-right">
                                                 <a href="<?php echo $settings['url'] ?>admins"><?php echo $lang['viewAll']; ?> <i
                                                         class="fa fa-arrow-circle-right"></i></a>
@@ -405,9 +405,9 @@ 
                                         while ($row = mysqli_fetch_assoc($result_of_query)) {
                                             $playersID = $row["playerid"];
                                             echo "<tr>";
-                                            echo "<td>" . $row["name"] . "</td>";
-                                            echo "<td>" . $playersID . "</td>";
-                                            echo "<td>" . $row["adminlevel"] . "</td>";
+                                            echo "<td>".$row["name"]."</td>";
+                                            echo "<td>".$playersID."</td>";
+                                            echo "<td>".$row["adminlevel"]."</td>";
                                             echo "</tr>";
                                         };
                                         ?>

views/core/editStaff.php

Indentation +16 added lines, -16 removed lines

@@ -5,7 +5,7 @@ 
 if ($result_of_query->num_rows > 0) {
     $user = $result_of_query->fetch_object();
 	
-	if($_SESSION['user_level'] >= $user->user_level) {
+    if($_SESSION['user_level'] >= $user->user_level) {
 
     if (isset($_POST["staffName"])) {
         if (formtoken::validateToken($_POST)) {
@@ -14,18 +14,18 @@ 
             $staffPID = $_POST['staffPID'];
             $permissions = include 'config/permissions.php';
             if (isset($_POST['ban'])) {
-				if ($user->user_level == 5 && $_SESSION['user_level'] < 5) { $staffRank = 5; } else { $staffRank = 0; }
-			} else {
-				if ($_POST['staffRank'] > $_SESSION['user_level'] || $user->user_level > $_SESSION['user_level']) { $staffRank = $user->user_level; } else { $staffRank = $_POST['staffRank']; }
-			}
-	    	$userPerms = json_encode($permissions[$staffRank]);
+                if ($user->user_level == 5 && $_SESSION['user_level'] < 5) { $staffRank = 5; } else { $staffRank = 0; }
+            } else {
+                if ($_POST['staffRank'] > $_SESSION['user_level'] || $user->user_level > $_SESSION['user_level']) { $staffRank = $user->user_level; } else { $staffRank = $_POST['staffRank']; }
+            }
+            $userPerms = json_encode($permissions[$staffRank]);
 	
             $sql = "UPDATE `users` SET `user_name`='" . $staffName . "',`user_email`='" . $staffEmail . "',`playerid`='" . $staffPID . "',`user_level`='" . $staffRank . "', `permissions`='" . $userPerms . "' WHERE `user_id` ='" . $uId . "';";
             $result_of_query = $db_connection->query($sql);
-			if ($user->user_level != $_POST['staffRank']) logAction($_SESSION['user_name'], $lang['edited'] . " " . $_POST['staffName'] . "\'s " . $lang['staff'] . " " . $lang['rank'] . " " . $lang['from'] . " (" . $settings['ranks'][$user->user_level] . ") " . $lang['to'] . " (" . $settings['ranks'][$_POST['staffRank']] . ")", 2);
-			if ($user->user_name != $_POST['staffName']) logAction($_SESSION['user_name'], $lang['edited'] . " " . $user->user_name . "\'s " . strtolower($lang['name']) . " " . $lang['to'] . " " . $_POST['staffName'] . "", 2);
-			if ($user->playerid != $_POST['staffPID']) logAction($_SESSION['user_name'], $lang['edited'] . " " . $_POST['staffName'] . "\'s " . $lang['player'] . " " . $lang['id'] . " " . $lang['from'] . " (" . $user->playerid . ") " . $lang['to'] . " (" . $_POST['staffPID'] . ")", 2);
-			if ($user->user_email != $_POST['staffEmail']) logAction($_SESSION['user_name'], $lang['edited'] . " " . $user->user_name . "\'s " . strtolower($lang['email']) . " " . $lang['from'] . " (" . $user->user_email . ") " . $lang['to'] . " (" . $_POST['staffEmail'] . ")", 2);
+            if ($user->user_level != $_POST['staffRank']) logAction($_SESSION['user_name'], $lang['edited'] . " " . $_POST['staffName'] . "\'s " . $lang['staff'] . " " . $lang['rank'] . " " . $lang['from'] . " (" . $settings['ranks'][$user->user_level] . ") " . $lang['to'] . " (" . $settings['ranks'][$_POST['staffRank']] . ")", 2);
+            if ($user->user_name != $_POST['staffName']) logAction($_SESSION['user_name'], $lang['edited'] . " " . $user->user_name . "\'s " . strtolower($lang['name']) . " " . $lang['to'] . " " . $_POST['staffName'] . "", 2);
+            if ($user->playerid != $_POST['staffPID']) logAction($_SESSION['user_name'], $lang['edited'] . " " . $_POST['staffName'] . "\'s " . $lang['player'] . " " . $lang['id'] . " " . $lang['from'] . " (" . $user->playerid . ") " . $lang['to'] . " (" . $_POST['staffPID'] . ")", 2);
+            if ($user->user_email != $_POST['staffEmail']) logAction($_SESSION['user_name'], $lang['edited'] . " " . $user->user_name . "\'s " . strtolower($lang['email']) . " " . $lang['from'] . " (" . $user->user_email . ") " . $lang['to'] . " (" . $_POST['staffEmail'] . ")", 2);
 			
             message(ucfirst($_POST['staffName']) . ' ' . $lang['updated']);
         } else message($lang['expired']);
@@ -104,12 +104,12 @@ 
                 echo "<center>";
                 echo "<h4>" . $lang['name'] . ":  <input id='staffName' class='form-control' name='staffName' type='text' value='" . $user->user_name . "'></h4>";
                 echo "<h4>" . $lang['emailAdd'] . ": <input id='staffEmail' class='form-control' name='staffEmail' type='text' value='" . $user->user_email . "'></h4>";
-				echo "<h4>" . $lang['rank'] . ": ";
-				echo "<select id='staffRank' class='form-control' name='staffRank'>";
+                echo "<h4>" . $lang['rank'] . ": ";
+                echo "<select id='staffRank' class='form-control' name='staffRank'>";
 				
-				for ($lvl = 0; $lvl <= $_SESSION['user_level']; $lvl++) {
-					echo '<option value="' . $lvl . '"' . select($lvl, $user->user_level) . '>' . $settings['ranks'][$lvl] . '</option>';
-				}
+                for ($lvl = 0; $lvl <= $_SESSION['user_level']; $lvl++) {
+                    echo '<option value="' . $lvl . '"' . select($lvl, $user->user_level) . '>' . $settings['ranks'][$lvl] . '</option>';
+                }
 				
                 echo "</select></h4>";
                 echo "<h4>" . $lang['playerID'] . ":  <input id='staffPID' class='form-control' name='staffPID' type='text' value='" . $user->playerid . "'></h4>";
@@ -1104,7 +1104,7 @@ 
     <?php } ?>
 <?php
 } else {
-	echo '<h3>' . errorMessage(5, $lang) . '</h3>';
+    echo '<h3>' . errorMessage(5, $lang) . '</h3>';
 }
 
 } else {

Braces +18 added lines, -6 removed lines

@@ -22,13 +22,23 @@ 
 	
             $sql = "UPDATE `users` SET `user_name`='" . $staffName . "',`user_email`='" . $staffEmail . "',`playerid`='" . $staffPID . "',`user_level`='" . $staffRank . "', `permissions`='" . $userPerms . "' WHERE `user_id` ='" . $uId . "';";
             $result_of_query = $db_connection->query($sql);
-			if ($user->user_level != $_POST['staffRank']) logAction($_SESSION['user_name'], $lang['edited'] . " " . $_POST['staffName'] . "\'s " . $lang['staff'] . " " . $lang['rank'] . " " . $lang['from'] . " (" . $settings['ranks'][$user->user_level] . ") " . $lang['to'] . " (" . $settings['ranks'][$_POST['staffRank']] . ")", 2);
-			if ($user->user_name != $_POST['staffName']) logAction($_SESSION['user_name'], $lang['edited'] . " " . $user->user_name . "\'s " . strtolower($lang['name']) . " " . $lang['to'] . " " . $_POST['staffName'] . "", 2);
-			if ($user->playerid != $_POST['staffPID']) logAction($_SESSION['user_name'], $lang['edited'] . " " . $_POST['staffName'] . "\'s " . $lang['player'] . " " . $lang['id'] . " " . $lang['from'] . " (" . $user->playerid . ") " . $lang['to'] . " (" . $_POST['staffPID'] . ")", 2);
-			if ($user->user_email != $_POST['staffEmail']) logAction($_SESSION['user_name'], $lang['edited'] . " " . $user->user_name . "\'s " . strtolower($lang['email']) . " " . $lang['from'] . " (" . $user->user_email . ") " . $lang['to'] . " (" . $_POST['staffEmail'] . ")", 2);
+			if ($user->user_level != $_POST['staffRank']) {
+			    logAction($_SESSION['user_name'], $lang['edited'] . " " . $_POST['staffName'] . "\'s " . $lang['staff'] . " " . $lang['rank'] . " " . $lang['from'] . " (" . $settings['ranks'][$user->user_level] . ") " . $lang['to'] . " (" . $settings['ranks'][$_POST['staffRank']] . ")", 2);
+			}
+			if ($user->user_name != $_POST['staffName']) {
+			    logAction($_SESSION['user_name'], $lang['edited'] . " " . $user->user_name . "\'s " . strtolower($lang['name']) . " " . $lang['to'] . " " . $_POST['staffName'] . "", 2);
+			}
+			if ($user->playerid != $_POST['staffPID']) {
+			    logAction($_SESSION['user_name'], $lang['edited'] . " " . $_POST['staffName'] . "\'s " . $lang['player'] . " " . $lang['id'] . " " . $lang['from'] . " (" . $user->playerid . ") " . $lang['to'] . " (" . $_POST['staffPID'] . ")", 2);
+			}
+			if ($user->user_email != $_POST['staffEmail']) {
+			    logAction($_SESSION['user_name'], $lang['edited'] . " " . $user->user_name . "\'s " . strtolower($lang['email']) . " " . $lang['from'] . " (" . $user->user_email . ") " . $lang['to'] . " (" . $_POST['staffEmail'] . ")", 2);
+			}
 			
             message(ucfirst($_POST['staffName']) . ' ' . $lang['updated']);
-        } else message($lang['expired']);
+        } else {
+            message($lang['expired']);
+        }
     }
     if (isset($_POST["viewPlayer"])) {
         if (formtoken::validateToken($_POST)) {
@@ -80,7 +90,9 @@ 
             message("Permissions Updated");
             session_destroy();
             session_start();
-        } else message($lang['expired']);
+        } else {
+            message($lang['expired']);
+        }
     }
     ?>
     <div class="row">

Spacing +44 added lines, -44 removed lines

@@ -1,11 +1,11 @@ 
 <?php
-$sql = 'SELECT * FROM `users` WHERE `user_id` ="' . $uId . '";';
+$sql = 'SELECT * FROM `users` WHERE `user_id` ="'.$uId.'";';
 $result_of_query = $db_connection->query($sql);
 
 if ($result_of_query->num_rows > 0) {
     $user = $result_of_query->fetch_object();
 	
-	if($_SESSION['user_level'] >= $user->user_level) {
+	if ($_SESSION['user_level'] >= $user->user_level) {
 
     if (isset($_POST["staffName"])) {
         if (formtoken::validateToken($_POST)) {
@@ -20,14 +20,14 @@ 
 			}
 	    	$userPerms = json_encode($permissions[$staffRank]);
 	
-            $sql = "UPDATE `users` SET `user_name`='" . $staffName . "',`user_email`='" . $staffEmail . "',`playerid`='" . $staffPID . "',`user_level`='" . $staffRank . "', `permissions`='" . $userPerms . "' WHERE `user_id` ='" . $uId . "';";
+            $sql = "UPDATE `users` SET `user_name`='".$staffName."',`user_email`='".$staffEmail."',`playerid`='".$staffPID."',`user_level`='".$staffRank."', `permissions`='".$userPerms."' WHERE `user_id` ='".$uId."';";
             $result_of_query = $db_connection->query($sql);
-			if ($user->user_level != $_POST['staffRank']) logAction($_SESSION['user_name'], $lang['edited'] . " " . $_POST['staffName'] . "\'s " . $lang['staff'] . " " . $lang['rank'] . " " . $lang['from'] . " (" . $settings['ranks'][$user->user_level] . ") " . $lang['to'] . " (" . $settings['ranks'][$_POST['staffRank']] . ")", 2);
-			if ($user->user_name != $_POST['staffName']) logAction($_SESSION['user_name'], $lang['edited'] . " " . $user->user_name . "\'s " . strtolower($lang['name']) . " " . $lang['to'] . " " . $_POST['staffName'] . "", 2);
-			if ($user->playerid != $_POST['staffPID']) logAction($_SESSION['user_name'], $lang['edited'] . " " . $_POST['staffName'] . "\'s " . $lang['player'] . " " . $lang['id'] . " " . $lang['from'] . " (" . $user->playerid . ") " . $lang['to'] . " (" . $_POST['staffPID'] . ")", 2);
-			if ($user->user_email != $_POST['staffEmail']) logAction($_SESSION['user_name'], $lang['edited'] . " " . $user->user_name . "\'s " . strtolower($lang['email']) . " " . $lang['from'] . " (" . $user->user_email . ") " . $lang['to'] . " (" . $_POST['staffEmail'] . ")", 2);
+			if ($user->user_level != $_POST['staffRank']) logAction($_SESSION['user_name'], $lang['edited']." ".$_POST['staffName']."\'s ".$lang['staff']." ".$lang['rank']." ".$lang['from']." (".$settings['ranks'][$user->user_level].") ".$lang['to']." (".$settings['ranks'][$_POST['staffRank']].")", 2);
+			if ($user->user_name != $_POST['staffName']) logAction($_SESSION['user_name'], $lang['edited']." ".$user->user_name."\'s ".strtolower($lang['name'])." ".$lang['to']." ".$_POST['staffName']."", 2);
+			if ($user->playerid != $_POST['staffPID']) logAction($_SESSION['user_name'], $lang['edited']." ".$_POST['staffName']."\'s ".$lang['player']." ".$lang['id']." ".$lang['from']." (".$user->playerid.") ".$lang['to']." (".$_POST['staffPID'].")", 2);
+			if ($user->user_email != $_POST['staffEmail']) logAction($_SESSION['user_name'], $lang['edited']." ".$user->user_name."\'s ".strtolower($lang['email'])." ".$lang['from']." (".$user->user_email.") ".$lang['to']." (".$_POST['staffEmail'].")", 2);
 			
-            message(ucfirst($_POST['staffName']) . ' ' . $lang['updated']);
+            message(ucfirst($_POST['staffName']).' '.$lang['updated']);
         } else message($lang['expired']);
     }
     if (isset($_POST["viewPlayer"])) {
@@ -75,7 +75,7 @@ 
 	
             $userPerms = json_encode($permissions);
 	
-            $sql = "UPDATE `users` SET `permissions`='" . $userPerms . "' WHERE `user_id` ='" . $uId . "';";
+            $sql = "UPDATE `users` SET `permissions`='".$userPerms."' WHERE `user_id` ='".$uId."';";
             $result_of_query = $db_connection->query($sql);
             message("Permissions Updated");
             session_destroy();
@@ -94,31 +94,31 @@ 
     <div class="col-md-4">
         <div class="panel panel-default">
             <div class="panel-heading">
-                <h3 class="panel-title"><i class="fa fa-users fa-fw"></i><?php echo " " . $lang['staff']; ?></h3>
+                <h3 class="panel-title"><i class="fa fa-users fa-fw"></i><?php echo " ".$lang['staff']; ?></h3>
             </div>
             <div class="panel-body">
                 <?php
-                echo '<form method="post" action="' . $settings['url'] . 'editStaff/' . $uId . '" name="editform">';
+                echo '<form method="post" action="'.$settings['url'].'editStaff/'.$uId.'" name="editform">';
                 echo formtoken::getField();
 				
                 echo "<center>";
-                echo "<h4>" . $lang['name'] . ":  <input id='staffName' class='form-control' name='staffName' type='text' value='" . $user->user_name . "'></h4>";
-                echo "<h4>" . $lang['emailAdd'] . ": <input id='staffEmail' class='form-control' name='staffEmail' type='text' value='" . $user->user_email . "'></h4>";
-				echo "<h4>" . $lang['rank'] . ": ";
+                echo "<h4>".$lang['name'].":  <input id='staffName' class='form-control' name='staffName' type='text' value='".$user->user_name."'></h4>";
+                echo "<h4>".$lang['emailAdd'].": <input id='staffEmail' class='form-control' name='staffEmail' type='text' value='".$user->user_email."'></h4>";
+				echo "<h4>".$lang['rank'].": ";
 				echo "<select id='staffRank' class='form-control' name='staffRank'>";
 				
 				for ($lvl = 0; $lvl <= $_SESSION['user_level']; $lvl++) {
-					echo '<option value="' . $lvl . '"' . select($lvl, $user->user_level) . '>' . $settings['ranks'][$lvl] . '</option>';
+					echo '<option value="'.$lvl.'"'.select($lvl, $user->user_level).'>'.$settings['ranks'][$lvl].'</option>';
 				}
 				
                 echo "</select></h4>";
-                echo "<h4>" . $lang['playerID'] . ":  <input id='staffPID' class='form-control' name='staffPID' type='text' value='" . $user->playerid . "'></h4>";
+                echo "<h4>".$lang['playerID'].":  <input id='staffPID' class='form-control' name='staffPID' type='text' value='".$user->playerid."'></h4>";
                 echo "</center>";
 
-                echo "<input id='user_id' type='hidden' name='user_id' value='" . $uId . "'>";
-                echo "<center><input class='btn btn-lg btn-primary'  type='submit'  name='edit' value='" . $lang['subChange'] . "'>";
+                echo "<input id='user_id' type='hidden' name='user_id' value='".$uId."'>";
+                echo "<center><input class='btn btn-lg btn-primary'  type='submit'  name='edit' value='".$lang['subChange']."'>";
                 if ($_SESSION['user_id'] <> $uId) {
-                                    echo "  <input class='btn btn-lg btn-danger' type='submit'  name='ban' value='" . $lang['ban'] . "'>";
+                                    echo "  <input class='btn btn-lg btn-danger' type='submit'  name='ban' value='".$lang['ban']."'>";
                 }
                 ?>
                 </center>
@@ -133,8 +133,8 @@ 
                 <h3 class="panel-title"><i class="fa fa-users fa-fw"></i><?php echo $lang['perms']; ?></h3>
             </div>
             <div class="panel-body">
-				<?php echo "<form method='post' action='" . $settings['url'] . 'editStaff/' . $uId . "' name='permsUpdate'>";
-                $permissions = json_decode($user->permissions,true);
+				<?php echo "<form method='post' action='".$settings['url'].'editStaff/'.$uId."' name='permsUpdate'>";
+                $permissions = json_decode($user->permissions, true);
                 ?>
 				<div class="col-md-4" style='padding-right: 0px; padding-left: 0px;'>
 					<div class="panel-heading">
@@ -438,7 +438,7 @@ 
 				</div>
 				<div class="col-md-4" style='padding-right: 0px; padding-left: 0px;'>
 					<div class="panel-heading">
-						<div class="pull-left"><h5><i class="fa fa-tasks"></i><?php echo ' ' . $lang['perm_view']; ?></h5></div>
+						<div class="pull-left"><h5><i class="fa fa-tasks"></i><?php echo ' '.$lang['perm_view']; ?></h5></div>
 							<br>
 						</div>
 						<div class="panel-body">
@@ -769,7 +769,7 @@ 
 				</div>
 				<div class="col-md-4" style='padding-right: 0px; padding-left: 0px;'>
 					<div class="panel-heading">
-						<div class="pull-left"><h5><i class="fa fa-tasks"></i><?php echo ' ' . $lang['perm_edit']; ?></h5></div>
+						<div class="pull-left"><h5><i class="fa fa-tasks"></i><?php echo ' '.$lang['perm_edit']; ?></h5></div>
 							<br>
 						</div>
 						<div class="panel-body">
@@ -779,7 +779,7 @@ 
 									<li class="list-success">
 										<i class=" fa fa-ellipsis-v"></i>
 										<div class="task-title">
-											<span class="task-title-sp"><?php echo ' ' . $lang['perm_edit_player']; ?></span>
+											<span class="task-title-sp"><?php echo ' '.$lang['perm_edit_player']; ?></span>
 											<?php if ($_SESSION['permissions']['permissions']['edit']) { ?>
 											<div class="pull-right hidden-phone" style="padding-right:5px;">
 												<select name="editPlayer" id="editPlayer">
@@ -794,7 +794,7 @@ 
 									<li class="list-danger">
 										<i class=" fa fa-ellipsis-v"></i>
 										<div class="task-title">
-											<span class="task-title-sp"><?php echo ' ' . $lang['perm_edit_player']; ?></span>
+											<span class="task-title-sp"><?php echo ' '.$lang['perm_edit_player']; ?></span>
 											<?php if ($_SESSION['permissions']['permissions']['edit']) { ?>
 											<div class="pull-right hidden-phone" style="padding-right:5px;">
 												<select name="editPlayer" id="editPlayer">
@@ -811,7 +811,7 @@ 
 									<li class="list-success">
 										<i class=" fa fa-ellipsis-v"></i>
 										<div class="task-title">
-											<span class="task-title-sp"><?php echo ' ' . $lang['perm_edit_vehicles']; ?></span>
+											<span class="task-title-sp"><?php echo ' '.$lang['perm_edit_vehicles']; ?></span>
 											<?php if ($_SESSION['permissions']['permissions']['edit']) { ?>
 											<div class="pull-right hidden-phone" style="padding-right:5px;">
 												<select name="editVehicles" id="editVehicles">
@@ -826,7 +826,7 @@ 
 									<li class="list-danger">
 										<i class=" fa fa-ellipsis-v"></i>
 										<div class="task-title">
-											<span class="task-title-sp"><?php echo ' ' . $lang['perm_edit_vehicles']; ?></span>
+											<span class="task-title-sp"><?php echo ' '.$lang['perm_edit_vehicles']; ?></span>
 											<?php if ($_SESSION['permissions']['permissions']['edit']) { ?>
 											<div class="pull-right hidden-phone" style="padding-right:5px;">
 												<select name="editVehicles" id="editVehicles">
@@ -843,7 +843,7 @@ 
 									<li class="list-success">
 										<i class=" fa fa-ellipsis-v"></i>
 										<div class="task-title">
-											<span class="task-title-sp"><?php echo ' ' . $lang['perm_edit_houses']; ?></span>
+											<span class="task-title-sp"><?php echo ' '.$lang['perm_edit_houses']; ?></span>
 											<?php if ($_SESSION['permissions']['permissions']['edit']) { ?>
 											<div class="pull-right hidden-phone" style="padding-right:5px;">
 												<select name="editHouses" id="editHouses">
@@ -858,7 +858,7 @@ 
 									<li class="list-danger">
 										<i class=" fa fa-ellipsis-v"></i>
 										<div class="task-title">
-											<span class="task-title-sp"><?php echo ' ' . $lang['perm_edit_houses']; ?></span>
+											<span class="task-title-sp"><?php echo ' '.$lang['perm_edit_houses']; ?></span>
 											<?php if ($_SESSION['permissions']['permissions']['edit']) { ?>
 											<div class="pull-right hidden-phone" style="padding-right:5px;">
 												<select name="editHouses" id="editHouses">
@@ -875,7 +875,7 @@ 
 									<li class="list-success">
 										<i class=" fa fa-ellipsis-v"></i>
 										<div class="task-title">
-											<span class="task-title-sp"><?php echo ' ' . $lang['perm_edit_gangs']; ?></span>
+											<span class="task-title-sp"><?php echo ' '.$lang['perm_edit_gangs']; ?></span>
 											<?php if ($_SESSION['permissions']['permissions']['edit']) { ?>
 											<div class="pull-right hidden-phone" style="padding-right:5px;">
 												<select name="editGangs" id="editGangs">
@@ -890,7 +890,7 @@ 
 									<li class="list-danger">
 										<i class=" fa fa-ellipsis-v"></i>
 										<div class="task-title">
-											<span class="task-title-sp"><?php echo ' ' . $lang['perm_edit_gangs']; ?></span>
+											<span class="task-title-sp"><?php echo ' '.$lang['perm_edit_gangs']; ?></span>
 											<?php if ($_SESSION['permissions']['permissions']['edit']) { ?>
 											<div class="pull-right hidden-phone" style="padding-right:5px;">
 												<select name="editGangs" id="editGangs">
@@ -907,7 +907,7 @@ 
 									<li class="list-success">
 										<i class=" fa fa-ellipsis-v"></i>
 										<div class="task-title">
-											<span class="task-title-sp"><?php echo ' ' . $lang['perm_edit_wanted']; ?></span>
+											<span class="task-title-sp"><?php echo ' '.$lang['perm_edit_wanted']; ?></span>
 											<?php if ($_SESSION['permissions']['permissions']['edit']) { ?>
 											<div class="pull-right hidden-phone" style="padding-right:5px;">
 												<select name="editWanted" id="editWanted">
@@ -922,7 +922,7 @@ 
 									<li class="list-danger">
 										<i class=" fa fa-ellipsis-v"></i>
 										<div class="task-title">
-											<span class="task-title-sp"><?php echo ' ' . $lang['perm_edit_wanted']; ?></span>
+											<span class="task-title-sp"><?php echo ' '.$lang['perm_edit_wanted']; ?></span>
 											<?php if ($_SESSION['permissions']['permissions']['edit']) { ?>
 											<div class="pull-right hidden-phone" style="padding-right:5px;">
 												<select name="editWanted" id="editWanted">
@@ -939,7 +939,7 @@ 
 									<li class="list-success">
 										<i class=" fa fa-ellipsis-v"></i>
 										<div class="task-title">
-											<span class="task-title-sp"><?php echo ' ' . $lang['perm_edit_licences']; ?></span>
+											<span class="task-title-sp"><?php echo ' '.$lang['perm_edit_licences']; ?></span>
 											<?php if ($_SESSION['permissions']['permissions']['edit']) { ?>
 											<div class="pull-right hidden-phone" style="padding-right:5px;">
 												<select name="editLIC" id="editLIC">
@@ -954,7 +954,7 @@ 
 									<li class="list-danger">
 										<i class=" fa fa-ellipsis-v"></i>
 										<div class="task-title">
-											<span class="task-title-sp"><?php echo ' ' . $lang['perm_edit_licences']; ?></span>
+											<span class="task-title-sp"><?php echo ' '.$lang['perm_edit_licences']; ?></span>
 											<?php if ($_SESSION['permissions']['permissions']['edit']) { ?>
 											<div class="pull-right hidden-phone" style="padding-right:5px;">
 												<select name="editLIC" id="editLIC">
@@ -971,7 +971,7 @@ 
 									<li class="list-success">
 										<i class=" fa fa-ellipsis-v"></i>
 										<div class="task-title">
-											<span class="task-title-sp"><?php echo ' ' . $lang['perm_edit_inventory']; ?></span>
+											<span class="task-title-sp"><?php echo ' '.$lang['perm_edit_inventory']; ?></span>
 											<?php if ($_SESSION['permissions']['permissions']['edit']) { ?>
 											<div class="pull-right hidden-phone" style="padding-right:5px;">
 												<select name="editINV" id="editINV">
@@ -986,7 +986,7 @@ 
 									<li class="list-danger">
 										<i class=" fa fa-ellipsis-v"></i>
 										<div class="task-title">
-											<span class="task-title-sp"><?php echo ' ' . $lang['perm_edit_inventory']; ?></span>
+											<span class="task-title-sp"><?php echo ' '.$lang['perm_edit_inventory']; ?></span>
 											<?php if ($_SESSION['permissions']['permissions']['edit']) { ?>
 											<div class="pull-right hidden-phone" style="padding-right:5px;">
 												<select name="editINV" id="editINV">
@@ -1002,7 +1002,7 @@ 
 									<li class="list-success">
 										<i class=" fa fa-ellipsis-v"></i>
 										<div class="task-title">
-											<span class="task-title-sp"><?php echo ' ' . $lang['perm_edit_ranks']; ?></span>
+											<span class="task-title-sp"><?php echo ' '.$lang['perm_edit_ranks']; ?></span>
 											<?php if ($_SESSION['permissions']['permissions']['edit']) { ?>
 											<div class="pull-right hidden-phone" style="padding-right:5px;">
 												<select name="editRanks" id="editRanks">
@@ -1017,7 +1017,7 @@ 
 									<li class="list-danger">
 										<i class=" fa fa-ellipsis-v"></i>
 										<div class="task-title">
-											<span class="task-title-sp"><?php echo ' ' . $lang['perm_edit_ranks']; ?></span>
+											<span class="task-title-sp"><?php echo ' '.$lang['perm_edit_ranks']; ?></span>
 											<?php if ($_SESSION['permissions']['permissions']['edit']) { ?>
 											<div class="pull-right hidden-phone" style="padding-right:5px;">
 												<select name="editRanks" id="editRanks">
@@ -1033,7 +1033,7 @@ 
 									<li class="list-success">
 										<i class=" fa fa-ellipsis-v"></i>
 										<div class="task-title">
-											<span class="task-title-sp"><?php echo ' ' . $lang['perm_edit_bank']; ?></span>
+											<span class="task-title-sp"><?php echo ' '.$lang['perm_edit_bank']; ?></span>
 											<?php if ($_SESSION['permissions']['permissions']['edit']) { ?>
 											<div class="pull-right hidden-phone" style="padding-right:5px;">
 												<select name="editBank" id="editBank">
@@ -1048,7 +1048,7 @@ 
 									<li class="list-danger">
 										<i class=" fa fa-ellipsis-v"></i>
 										<div class="task-title">
-											<span class="task-title-sp"><?php echo ' ' . $lang['perm_edit_bank']; ?></span>
+											<span class="task-title-sp"><?php echo ' '.$lang['perm_edit_bank']; ?></span>
 											<?php if ($_SESSION['permissions']['permissions']['edit']) { ?>
 											<div class="pull-right hidden-phone" style="padding-right:5px;">
 												<select name="editBank" id="editBank">
@@ -1064,7 +1064,7 @@ 
 									<li class="list-success">
 										<i class=" fa fa-ellipsis-v"></i>
 										<div class="task-title">
-											<span class="task-title-sp"><?php echo ' ' . $lang['perm_edit_ignLVL']; ?></span>
+											<span class="task-title-sp"><?php echo ' '.$lang['perm_edit_ignLVL']; ?></span>
 											<?php if ($_SESSION['permissions']['permissions']['edit']) { ?>
 											<div class="pull-right hidden-phone" style="padding-right:5px;">
 												<select name="editignLVL" id="editignLVL">
@@ -1079,7 +1079,7 @@ 
 									<li class="list-danger">
 										<i class=" fa fa-ellipsis-v"></i>
 										<div class="task-title">
-											<span class="task-title-sp"><?php echo ' ' . $lang['perm_edit_ignLVL']; ?></span>
+											<span class="task-title-sp"><?php echo ' '.$lang['perm_edit_ignLVL']; ?></span>
 											<?php if ($_SESSION['permissions']['permissions']['edit']) { ?>
 											<div class="pull-right hidden-phone" style="padding-right:5px;">
 												<select name="editignLVL" id="editignLVL">
@@ -1104,7 +1104,7 @@ 
     <?php } ?>
 <?php
 } else {
-	echo '<h3>' . errorMessage(5, $lang) . '</h3>';
+	echo '<h3>'.errorMessage(5, $lang).'</h3>';
 }
 
 } else {

views/core/staff.php

Indentation +2 added lines, -2 removed lines

@@ -63,8 +63,8 @@
                     echo "<td><a class='btn btn-primary btn-xs' href='" . $settings['url'] . "editStaff/" . $row["user_id"] . "'>";
                     echo "<i class='fa fa-pencil'></i></a></td>";
                 } else {
-					echo "<td></td>";
-				}
+                    echo "<td></td>";
+                }
                 echo "</tr>";
             };
             echo "</tbody></table>";

Braces +9 added lines, -3 removed lines

@@ -7,14 +7,18 @@ 
     $sql = "SELECT `uid` FROM `players` WHERE `uid` LIKE '" . $search . "' OR `name` LIKE '" . $search . "' OR `playerid` LIKE '" . $search . "';";
     $result_of_query = $db_link->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
-    if ($pageNum > $total_records) $pageNum = $total_records;
+    if ($pageNum > $total_records) {
+        $pageNum = $total_records;
+    }
     $sql = "SELECT `playerid`,`name`,`bankacc`,`cash`,`coplevel`,`mediclevel`,`adminlevel`,`uid` FROM `players` WHERE `uid` LIKE '" . $search . "' OR `name` LIKE '" . $search . "' OR `playerid` LIKE '" . $search . "'" . $max . " ;";
     logAction($_SESSION['user_name'], $lang['searched'] . ' (' . $search . ') ' . $lang['in'] . ' ' . $lang['players'], 1);
 } else {
     $sql = "SELECT `uid` FROM `players`;";
     $result_of_query = $db_link->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
-    if ($pageNum > $total_records) $pageNum = $total_records;
+    if ($pageNum > $total_records) {
+        $pageNum = $total_records;
+    }
     $sql = "SELECT `playerid`,`name`,`bankacc`,`cash`,`coplevel`,`mediclevel`,`adminlevel`,`uid` FROM `players` " . $max . " ;";
 }
 
@@ -107,4 +111,6 @@ 
                 ?>
         </div>
 <?php
-} else echo '<h3>' . errorMessage(36, $lang) . '</h3>';
\ No newline at end of file
+} else {
+    echo '<h3>' . errorMessage(36, $lang) . '</h3>';
+}

Spacing +13 added lines, -13 removed lines

@@ -1,19 +1,19 @@ 
 <?php
-$max = 'LIMIT ' . ($pageNum - 1) * $_SESSION['items'] . ',' . $_SESSION['items'];
+$max = 'LIMIT '.($pageNum - 1) * $_SESSION['items'].','.$_SESSION['items'];
 
 if (isset($search)) {
-    $sql = "SELECT * FROM `users` WHERE `user_name` LIKE '%" . $search . "%' OR `user_email` LIKE '" . $search . "' OR `user_id` LIKE '" . $search . "' OR `playerid` LIKE '%" . $search . "%';";
+    $sql = "SELECT * FROM `users` WHERE `user_name` LIKE '%".$search."%' OR `user_email` LIKE '".$search."' OR `user_id` LIKE '".$search."' OR `playerid` LIKE '%".$search."%';";
     $result_of_query = $db_connection->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
     if ($pageNum > $total_records) $pageNum = $total_records;
-    $sql = "SELECT * FROM `users` WHERE `user_name` LIKE '%" . $search . "%' OR `user_email` LIKE '" . $search . "' OR `user_id` LIKE '" . $search . "' OR `playerid` LIKE '%" . $search . "%'" . $max . " ;";
-    logAction($_SESSION['user_name'], $lang['searched'] . ' (' . $search . ') ' . $lang['in'] . ' ' . $lang['users'], 1);
+    $sql = "SELECT * FROM `users` WHERE `user_name` LIKE '%".$search."%' OR `user_email` LIKE '".$search."' OR `user_id` LIKE '".$search."' OR `playerid` LIKE '%".$search."%'".$max." ;";
+    logAction($_SESSION['user_name'], $lang['searched'].' ('.$search.') '.$lang['in'].' '.$lang['users'], 1);
 } else {
     $sql = "SELECT `user_name` FROM `users`;";
     $result_of_query = $db_connection->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
     if ($pageNum > $total_records) $pageNum = $total_records;
-    $sql = "SELECT * FROM `users` ORDER BY `user_level` DESC " . $max . " ;";
+    $sql = "SELECT * FROM `users` ORDER BY `user_level` DESC ".$max." ;";
 }
 $result_of_query = $db_connection->query($sql);
 if ($result_of_query->num_rows > 0) {
@@ -37,7 +37,7 @@ 
                     <th><i class="fa fa-user"></i> <?php echo $lang['rank']; ?></th>
                     <th class='hidden-xs'><i class="fa fa-eye"></i> <?php echo $lang['playerID']; ?></th>
                     <?php if ($_SESSION['permissions']['edit']['staff']) {
-                        echo '<th><i class="fa fa-pencil"></i> ' . $lang['edit'] . '</th>';
+                        echo '<th><i class="fa fa-pencil"></i> '.$lang['edit'].'</th>';
                     }
                     ?>
                 </tr>
@@ -52,15 +52,15 @@ 
                     echo ' class="danger"';
                 }
                 echo ">";
-                echo "<td>" . $row["user_name"] . "</td>";
-                echo "<td class='hidden-xs'>" . $row["user_email"] . "</td>";
-                echo "<td>" . $settings['ranks'][$row["user_level"]];
+                echo "<td>".$row["user_name"]."</td>";
+                echo "<td class='hidden-xs'>".$row["user_email"]."</td>";
+                echo "<td>".$settings['ranks'][$row["user_level"]];
                 if ($row["user_level"] != 0) {
-                    echo " (" . $row["user_level"] . ")";
+                    echo " (".$row["user_level"].")";
                 }
-                echo "</td><td class='hidden-xs'>" . $row["playerid"] . "</td>";
+                echo "</td><td class='hidden-xs'>".$row["playerid"]."</td>";
                 if ($_SESSION['permissions']['edit']['staff'] && $_SESSION['user_level'] >= $row["user_level"]) {
-                    echo "<td><a class='btn btn-primary btn-xs' href='" . $settings['url'] . "editStaff/" . $row["user_id"] . "'>";
+                    echo "<td><a class='btn btn-primary btn-xs' href='".$settings['url']."editStaff/".$row["user_id"]."'>";
                     echo "<i class='fa fa-pencil'></i></a></td>";
                 } else {
 					echo "<td></td>";
@@ -72,4 +72,4 @@ 
             ?>
     </div>
     <?php
-} else echo '<h3>' . errorMessage(36, $lang) . '</h3>';
\ No newline at end of file
+} else echo '<h3>'.errorMessage(36, $lang).'</h3>';
\ No newline at end of file

views/life/editGang.php

Spacing +29 added lines, -29 removed lines

@@ -13,15 +13,15 @@ 
     <picture>logo.paa</picture>
     <title>CZ</title>';
 
-    $sql = "SELECT `name`,`members` FROM `gangs` WHERE `id` = '" . $gID . "';";
+    $sql = "SELECT `name`,`members` FROM `gangs` WHERE `id` = '".$gID."';";
     $result = $db_link->query($sql);
     $gang = $result->fetch_object();
     $members = str_replace('`]"', '', str_replace('"[`', '', $gang->members));
     $members = explode('`,`', $members);
     foreach ($members as $member) {
         $name = nameID($member, $db_link);
-        $xml .= '<member id="' . $member . '" nick="' . $name . '">
-        <name>'.$name . '</name><email></email><icq></icq><remark></remark></member>';
+        $xml .= '<member id="'.$member.'" nick="'.$name.'">
+        <name>'.$name.'</name><email></email><icq></icq><remark></remark></member>';
     }
     $xml .= '</squad>';
     var_dump($xml);
@@ -33,13 +33,13 @@ 
             switch ($_POST["editType"]) {
                 case "edit_members":
                     $gMem = clean($_POST["gMem"], 'string');
-                    $sql = "UPDATE `gangs` SET `members`='" . $gMem . "' WHERE `gangs`.`id` = '" . $gID . "'";
+                    $sql = "UPDATE `gangs` SET `members`='".$gMem."' WHERE `gangs`.`id` = '".$gID."'";
                     $result_of_query = $db_link->query($sql);
                     message($lang['updated']);
                     break;
 
                 case "del_gang":
-                    $sql = "DELETE FROM `gangs` WHERE `gangs`.`id` = '" . $gID . "'";
+                    $sql = "DELETE FROM `gangs` WHERE `gangs`.`id` = '".$gID."'";
                     $result_of_query = $db_link->query($sql);
                     message($lang['updated']);
                     break;
@@ -50,7 +50,7 @@ 
                     $gMM = clean($_POST["gMM"], 'int');
                     $gbank = clean($_POST["gbank"], 'int');
                     $gAct = clean($_POST["gAct"], 'int');
-                    $sql = "UPDATE `gangs` SET `owner`='" . $gowner . "',`name`='" . $gname . "',`maxmembers`='" . $gMM . "',`bank`='" . $gbank . "',`active`='" . $gAct . "' WHERE `gangs`.`id` = '" . $gID . "'";
+                    $sql = "UPDATE `gangs` SET `owner`='".$gowner."',`name`='".$gname."',`maxmembers`='".$gMM."',`bank`='".$gbank."',`active`='".$gAct."' WHERE `gangs`.`id` = '".$gID."'";
                     $result_of_query = $db_link->query($sql);
                     message($lang['updated']);
                     break;
@@ -61,7 +61,7 @@ 
     }
     }
 
-$sql = 'SELECT * FROM `gangs` WHERE `id` ="' . $gID . '";';
+$sql = 'SELECT * FROM `gangs` WHERE `id` ="'.$gID.'";';
 $result_of_query = $db_link->query($sql);
 if ($result_of_query->num_rows > 0) {
     $gang = $result_of_query->fetch_object();
@@ -70,22 +70,22 @@ 
     <div class="panel panel-default">
         <div class="panel-heading">
             <h2 class="panel-title"><i
-                    class="fa fa-child fa-fw"></i><?php echo nameID($gang->owner, $db_link) . "'s " . $lang['gang']; ?>
+                    class="fa fa-child fa-fw"></i><?php echo nameID($gang->owner, $db_link)."'s ".$lang['gang']; ?>
             </h2>
         </div>
         <div class="panel-body">
             <center><img src="<?php echo $settings['url'] ?>assets/img/uniform/U_BG_Guerilla2_3.jpg"/>
                 <?php
-                echo "<h4>" . $lang['owner'] . ": <a href='" . $settings['url'] . "editPlayer/" . uID($gang->owner, $db_link) . "'>" . nameID($gang->owner, $db_link) . "</a></h4>";
-                echo "<h4>" . $lang['name'] . ": " . $gang->name . "</h4>";
+                echo "<h4>".$lang['owner'].": <a href='".$settings['url']."editPlayer/".uID($gang->owner, $db_link)."'>".nameID($gang->owner, $db_link)."</a></h4>";
+                echo "<h4>".$lang['name'].": ".$gang->name."</h4>";
                 ?>
                 <span class="fa fa-2x fa-bank"></span>
-                <h4> <?php echo $lang['bank'] . ": " . $gang->bank; ?> </h4>
+                <h4> <?php echo $lang['bank'].": ".$gang->bank; ?> </h4>
                 <?php
                 if ($gang->active == 0) {
-                    echo "<h4><button type='button' class='gangActive btn btn-danger'>" . $lang["not"] . " " . $lang["active"] . "</button></h4> ";
+                    echo "<h4><button type='button' class='gangActive btn btn-danger'>".$lang["not"]." ".$lang["active"]."</button></h4> ";
                 } else {
-                    echo "<h4><button type='button' class='gangActive btn btn-success'>" . $lang["active"] . "</button></h4> ";
+                    echo "<h4><button type='button' class='gangActive btn btn-success'>".$lang["active"]."</button></h4> ";
                 }
                 if ($_SESSION['permissions']['edit']['gangs']) {
                     echo '<a data-toggle="modal" href="#edit_gang" class="btn btn-primary btn-xs" style="float: right; margin-right:3px;">';
@@ -106,7 +106,7 @@ 
         <div class="col-md-2 col-sm-2 col-md-offset-1 box0">
             <div class="box1">
                 <span class="fa fa-3x fa-users"></span>
-                <h4> <?php echo $lang['maxMembers'] . ": " . $gang->maxmembers; ?> </h4>
+                <h4> <?php echo $lang['maxMembers'].": ".$gang->maxmembers; ?> </h4>
             </div>
         </div>
     </div>
@@ -117,12 +117,12 @@ 
         </ul>
         <div id="myTabContent" class="tab-content">
             <div class="tab-pane fade active in well" id="civ_inv">
-                <h4 style="centred"><?php echo $lang['gang'] . " " . $lang['members']; ?> </h4>
+                <h4 style="centred"><?php echo $lang['gang']." ".$lang['members']; ?> </h4>
                 <?php
                     $return = stripArray($gang->members, 1);
 
                     foreach ($return as $value) {
-                        echo "<span class='label label-success' style='margin-right:3px; line-height:2;'>" . nameID($value, $db_link) . "</span> ";
+                        echo "<span class='label label-success' style='margin-right:3px; line-height:2;'>".nameID($value, $db_link)."</span> ";
                     }
                 }
                 ?>
@@ -143,10 +143,10 @@ 
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                 <h4 class="modal-title"><span
-                        class="glyphicon glyphicon-pencil"></span><?php echo " " . $lang['edit'] . " " . $lang['gang'] . " " . $lang['members']; ?>
+                        class="glyphicon glyphicon-pencil"></span><?php echo " ".$lang['edit']." ".$lang['gang']." ".$lang['members']; ?>
                 </h4>
             </div>
-            <form method="post" action="<?php echo $settings['url'] . 'editGang/' . $gID; ?>" role="form">
+            <form method="post" action="<?php echo $settings['url'].'editGang/'.$gID; ?>" role="form">
                 <?php echo formtoken::getField() ?>
                 <div class="modal-body">
                     <div class="form-group">
@@ -173,10 +173,10 @@ 
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                 <h4 class="modal-title">
                     <span
-                        class="glyphicon glyphicon-pencil"></span><?php echo " " . $lang['delete'] . " " . $lang['gang']; ?>
+                        class="glyphicon glyphicon-pencil"></span><?php echo " ".$lang['delete']." ".$lang['gang']; ?>
                 </h4>
             </div>
-            <form method="post" action="<?php echo $settings['url'] . 'editGang/' . $gID; ?>" role="form">
+            <form method="post" action="<?php echo $settings['url'].'editGang/'.$gID; ?>" role="form">
                 <?php echo formtoken::getField() ?>
                 <div class="modal-body">
                     <div class="form-group">
@@ -202,10 +202,10 @@ 
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                 <h4 class="modal-title"><span
-                        class="glyphicon glyphicon-pencil"></span><?php echo " " . $lang['edit'] . " " . $lang['gang']; ?>
+                        class="glyphicon glyphicon-pencil"></span><?php echo " ".$lang['edit']." ".$lang['gang']; ?>
                 </h4>
             </div>
-            <form method="post" action="<?php echo $settings['url'] . 'editGang/' . $gID; ?>" role="form">
+            <form method="post" action="<?php echo $settings['url'].'editGang/'.$gID; ?>" role="form">
                 <?php echo formtoken::getField() ?>
                 <div class="modal-body">
                     <div class="form-group">
@@ -215,14 +215,14 @@ 
                             <center>
                                 <?php
                                 echo "<center>";
-                                echo "<h3>" . $lang['name'] . ":  <input id='gname' name='gname' type='text' value='" . $gang->name . "'></td><br/>";
-                                echo "<h4>" . $lang['owner'] . ":   <input id='gowner' name='gowner' type='number' value='" . $gang->owner . "'></td><br/>";
-                                echo "<h4>" . $lang['maxMembers'] . ":   <input id='gMM' name='gMM' type='number' value='" . $gang->maxmembers . "'></td><br/>";
-                                echo "<h4>" . $lang['bank'] . ":    <input id='gbank' name='gbank' type='number' value='" . $gang->bank . "'></td><br/>";
-                                echo "<h4>" . $lang['active'] . ":   ";
+                                echo "<h3>".$lang['name'].":  <input id='gname' name='gname' type='text' value='".$gang->name."'></td><br/>";
+                                echo "<h4>".$lang['owner'].":   <input id='gowner' name='gowner' type='number' value='".$gang->owner."'></td><br/>";
+                                echo "<h4>".$lang['maxMembers'].":   <input id='gMM' name='gMM' type='number' value='".$gang->maxmembers."'></td><br/>";
+                                echo "<h4>".$lang['bank'].":    <input id='gbank' name='gbank' type='number' value='".$gang->bank."'></td><br/>";
+                                echo "<h4>".$lang['active'].":   ";
                                 echo "<select id='gAct' name='gAct'>";
-                                    echo '<option value="0"' . select('0', $gang->active) . '>' . $lang['no'] . '</option>';
-                                    echo '<option value="1"' . select('1', $gang->active) . '>' . $lang['yes'] . '</option>';
+                                    echo '<option value="0"'.select('0', $gang->active).'>'.$lang['no'].'</option>';
+                                    echo '<option value="1"'.select('1', $gang->active).'>'.$lang['yes'].'</option>';
                                 echo "</select>";
                                 echo "</center>";
                                 ?>