Cyberbyte-Studios / CyberWorks

validators/pid.php

Braces +11 added lines, -4 removed lines

@@ -11,18 +11,25 @@
         $api = "http://api.steampowered.com/ISteamUser/GetPlayerSummaries/v0002/?key=" . $settings['steamAPI'] . "&steamids=" . $_POST['player_id'];
         $player = json_decode(file_get_contents($api), true);
         $player = $player['response'];
-        if (empty($player['players'])) $isAvailable = false; else {
+        if (empty($player['players'])) {
+            $isAvailable = false;
+        } else {
             $isAvailable = true;
             $player = $player['players']['0'];
         }
     
-        if (isset($isAvailable) && isset($player['personaname'])) echo json_encode(array(
+        if (isset($isAvailable) && isset($player['personaname'])) {
+            echo json_encode(array(
             'valid' => $isAvailable,
             'name' => $player['personaname'],
             'url' => $player['profileurl']
         ));
-        elseif (isset($isAvailable)) echo json_encode(array(
+        } elseif (isset($isAvailable)) {
+            echo json_encode(array(
             'valid' => $isAvailable
         ));
+        }
     }
-} else echo json_encode(array('valid' => false));
\ No newline at end of file
+} else {
+    echo json_encode(array('valid' => false));
+}

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
 if (isset($_POST['player_id']) && isset($_SESSION['user_level'])) {
     if ($settings['steamAPI'] && $_SESSION['permissions']['view']['steam'] && !$settings['performance']) {
-        $api = "http://api.steampowered.com/ISteamUser/GetPlayerSummaries/v0002/?key=" . $settings['steamAPI'] . "&steamids=" . $_POST['player_id'];
+        $api = "http://api.steampowered.com/ISteamUser/GetPlayerSummaries/v0002/?key=".$settings['steamAPI']."&steamids=".$_POST['player_id'];
         $player = json_decode(file_get_contents($api), true);
         $player = $player['response'];
         if (empty($player['players'])) $isAvailable = false; else {

classes/registration.php

Indentation +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@
 <?php
 require_once("gfunctions.php");
 /**
-     * Class registration
-     * handles the user registration
-     */
+ * Class registration
+ * handles the user registration
+ */
 class Registration
 {
     /**

Spacing +4 added lines, -4 removed lines

@@ -86,7 +86,7 @@ 
                 // escaping, additionally removing everything that could be (html/javascript-) code
                 $user_name = $this->db_connection->real_escape_string(strip_tags($_POST['user_name'], ENT_QUOTES));
                 $user_email = $this->db_connection->real_escape_string(strip_tags($_POST['user_email'], ENT_QUOTES));
-                if(isset($_POST['player_id'])) {
+                if (isset($_POST['player_id'])) {
                     $playerid = $this->db_connection->real_escape_string(strip_tags($_POST['player_id'], ENT_QUOTES));
                 }
                 $user_password = $_POST['user_password_new'];
@@ -99,7 +99,7 @@ 
                 $user_password_hash = password_hash($user_password, PASSWORD_DEFAULT);
 
                 // check if user or email address already exists
-                $sql = "SELECT * FROM `users` WHERE `user_name` = '" . $user_name . "' OR `user_email = '" . $user_email . "';";
+                $sql = "SELECT * FROM `users` WHERE `user_name` = '".$user_name."' OR `user_email = '".$user_email."';";
                 $query_check_user_name = $this->db_connection->query($sql);
 
                 if ($query_check_user_name->num_rows == 1) {
@@ -113,10 +113,10 @@ 
                     if (!empty($playerid)) {
 
                         $sql = "INSERT INTO `users` (`user_name`, `user_password_hash`, `user_email`, `playerid`, `user_level`, `permissions`, `user_profile`) VALUES
-                    ('" . $user_name . "', '" . $user_password_hash . "', '" . $user_email . "', '" . $playerid . "', '" . $user_lvl . "', '" . $userPerms . "', '" . $user_pic . "');";
+                    ('" . $user_name."', '".$user_password_hash."', '".$user_email."', '".$playerid."', '".$user_lvl."', '".$userPerms."', '".$user_pic."');";
                     } else {
                         $sql = "INSERT INTO `users` (`user_name`, `user_password_hash`, `user_email`, `user_level`, `permissions`, `user_profile`) VALUES
-                    ('" . $user_name . "', '" . $user_password_hash . "', '" . $user_email . "', '" . $user_lvl . "', '" . $userPerms . "', '" . $user_pic . "');";
+                    ('" . $user_name."', '".$user_password_hash."', '".$user_email."', '".$user_lvl."', '".$userPerms."', '".$user_pic."');";
                     }
                     $query_new_user_insert = $this->db_connection->query($sql);
 

views/steam/life/houses.php

Braces +9 added lines, -3 removed lines

@@ -10,13 +10,17 @@ 
     $sql = "SELECT `id`,`pid`,`classname`,`active`,`type`,`plate`,`alive`,`active` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid WHERE `pid` LIKE '" . $_SESSION['playerid'] . "' OR `classname` LIKE '%" . $search . "%' OR `name` LIKE '%" . $search . "%' OR `plate` LIKE '" . $search . "' OR `inventory` LIKE '%" . $search . "%';";
     $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 `id`,`pid`,`classname`,`active`,`type`,`plate`,`alive`,`active` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid WHERE `pid` LIKE '" . $_SESSION['playerid'] . "' OR `classname` LIKE '%" . $search . "%' OR `name` LIKE '%" . $search . "%' OR `plate` LIKE '" . $search . "' OR `inventory` LIKE '%" . $search . "%'" . $max . " ;";
 } else {
     $sql = "SELECT `id` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid WHERE `pid` LIKE '" . $_SESSION['playerid'] . "';";
     $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 `id`,`pid`,`classname`,`active`,`type`,`plate`,`alive`,`active` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid WHERE `pid` LIKE '" . $_SESSION['playerid'] . "' " . $max . " ;";
 }
 $result_of_query = $db_link->query($sql);
@@ -74,4 +78,6 @@ 
     </table>
 </div>
 <?php
-} else echo errorMessage(3, $lang);
\ No newline at end of file
+} else {
+    echo errorMessage(3, $lang);
+}

Spacing +10 added lines, -10 removed lines

@@ -1,20 +1,20 @@ 
 <?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 `id` LIKE '" . $search . "' OR `pos` LIKE '" . $search . "' OR `inventory` LIKE '%" . $search . "%' OR `name` LIKE '%" . $search . "%' AND `pid` = '" . $_SESSION['playerid'] . "';";
+    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 `id` LIKE '".$search."' OR `pos` LIKE '".$search."' OR `inventory` LIKE '%".$search."%' OR `name` LIKE '%".$search."%' AND `pid` = '".$_SESSION['playerid']."';";
     $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 `id` LIKE '" . $search . "' OR `pos` LIKE '" . $search . "' OR `inventory` LIKE '%" . $search . "%' OR `name` LIKE '%" . $search . "%' AND `pid` = '" . $_SESSION['playerid'] . "' " . $max . " ;";
+    $sql = "SELECT `id`,`pid`,`pos`,`name`,`owned` FROM `houses` INNER JOIN `players` ON houses.pid=players.playerid WHERE `id` LIKE '".$search."' OR `pos` LIKE '".$search."' OR `inventory` LIKE '%".$search."%' OR `name` LIKE '%".$search."%' AND `pid` = '".$_SESSION['playerid']."' ".$max." ;";
 } else {
     $sql = "SELECT `id` FROM `houses`;";
     $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 AND `pid` = '" . $_SESSION['playerid'] . "' " . $max . " ;";
+    $sql = "SELECT `id`,`pid`,`pos`,`name`,`owned` FROM `houses` INNER JOIN `players` ON houses.pid=players.playerid AND `pid` = '".$_SESSION['playerid']."' ".$max." ;";
 }
 
 $result_of_query = $db_link->query($sql);
@@ -41,7 +41,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>
@@ -50,11 +50,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>";

classes/login.php

Braces +8 added lines, -2 removed lines

@@ -108,7 +108,9 @@ 
                             //if (!isset($verify->verify)) {
                                 $_SESSION['2factor'] = 0;
                                 if (!empty($result_row->twoFactor)) {
-                                    if ($settings['2factor']) $_SESSION['2factor'] = 1; else {
+                                    if ($settings['2factor']) {
+                                        $_SESSION['2factor'] = 1;
+                                    } else {
                                     $sql = "UPDATE `users` SET `backup`=NULL,`twoFactor`=NULL WHERE `userid` = '" . $result_row->user_id . "';";
                                     $this->db_connection->query($sql);
                                     $this->errors[] = $lang['2factorForceRevoke'];
@@ -130,7 +132,11 @@ 
                                 $_SESSION['user_id'] = $result_row->user_id;
                                 $_SESSION['steamsignon'] = false;
                                 $_SESSION['permissions'] = json_decode($result_row->permissions, true);
-                                if (isset($result_row->items))$_SESSION['items'] = $result_row->items; else $_SESSION['items'] = $settings['items'];
+                                if (isset($result_row->items)) {
+                                    $_SESSION['items'] = $result_row->items;
+                                } else {
+                                    $_SESSION['items'] = $settings['items'];
+                                }
                                 if (isset($_POST['lang'])) {
                                     setcookie('lang', $_POST['lang'], time() + (3600 * 24 * 30));
                                     $_SESSION['lang'] = $_POST['lang'];

Indentation +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@
 <?php
 require_once("gfunctions.php");
 /**
-     * Class login
-     * handles the user's login and logout process
-     */
+ * Class login
+ * handles the user's login and logout process
+ */
 class Login
 {
     /**

Spacing +6 added lines, -6 removed lines

@@ -89,7 +89,7 @@ 
                 // username field)
                 $sql = "SELECT user_name, user_email, user_level, user_profile, permissions, user_password_hash, user_id, playerid, twoFactor, token
                         FROM users
-                        WHERE user_name = '" . $user_name . "' OR user_email = '" . $user_name . "';";
+                        WHERE user_name = '" . $user_name."' OR user_email = '".$user_name."';";
                 $result_of_login_check = $this->db_connection->query($sql);
 
                 // if this user exists
@@ -108,7 +108,7 @@ 
                                 $_SESSION['2factor'] = 0;
                                 if (!empty($result_row->twoFactor)) {
                                     if ($settings['2factor']) $_SESSION['2factor'] = 1; else {
-                                    $sql = "UPDATE `users` SET `backup`=NULL,`twoFactor`=NULL WHERE `userid` = '" . $result_row->user_id . "';";
+                                    $sql = "UPDATE `users` SET `backup`=NULL,`twoFactor`=NULL WHERE `userid` = '".$result_row->user_id."';";
                                     $this->db_connection->query($sql);
                                     $this->errors[] = $lang['2factorForceRevoke'];
                                     }
@@ -138,7 +138,7 @@ 
                                 $_SESSION['user_login_status'] = 1;
 
                                 multiDB();
-                                logAction($_SESSION['user_name'], 'Successful Login (' . $_SERVER['REMOTE_ADDR'] . ')', 2);
+                                logAction($_SESSION['user_name'], 'Successful Login ('.$_SERVER['REMOTE_ADDR'].')', 2);
                             /*} else {
                                 if (isset($verify->message)) {
                                     $this->errors[] = $verify->message;
@@ -148,15 +148,15 @@ 
                             }*/
                         } else {
                             $this->errors[] = "User is banned.";
-                            logAction($_POST['user_name'], 'Login Failed - Banned User (' . $_SERVER['REMOTE_ADDR'] . ')', 3);
+                            logAction($_POST['user_name'], 'Login Failed - Banned User ('.$_SERVER['REMOTE_ADDR'].')', 3);
                         }
                     } else {
                         $this->errors[] = "Wrong password. Try again.";
-                        logAction($_POST['user_name'], 'Login Failed - Wrong Password (' . $_SERVER['REMOTE_ADDR'] . ')', 3);
+                        logAction($_POST['user_name'], 'Login Failed - Wrong Password ('.$_SERVER['REMOTE_ADDR'].')', 3);
                     }
                 } else {
                     $this->errors[] = "This user does not exist.";
-                    logAction($_POST['user_name'], 'Login Failed - Wrong Username (' . $_SERVER['REMOTE_ADDR'] . ')', 3);
+                    logAction($_POST['user_name'], 'Login Failed - Wrong Username ('.$_SERVER['REMOTE_ADDR'].')', 3);
                 }
             } else {
                 $this->errors[] = "Database connection problem.";

views/life/editVeh.php

Braces +3 added lines, -1 removed lines

@@ -323,4 +323,6 @@
             </div>
         </div>
     </div>
-<?php } else echo "<h1>" . errorMessage(32, $lang) . "</h1>";
+<?php } else {
+    echo "<h1>" . errorMessage(32, $lang) . "</h1>";
+}

Spacing +53 added lines, -53 removed lines

@@ -12,35 +12,35 @@ 
             switch ($_POST["editType"]) {
                 case "veh_inv":
                     $vehInv = $_POST["vehInv"];
-                    $sql = "UPDATE `vehicles` SET `inventory`='" . $vehInv . "' WHERE `vehicles`.`id` = '" . $vehID . "'";
+                    $sql = "UPDATE `vehicles` SET `inventory`='".$vehInv."' WHERE `vehicles`.`id` = '".$vehID."'";
                     $result_of_query = $db_link->query($sql);
-                    message($lang['vehicle'] . ' ' . $lang['edited']);
-                    $sql = "SELECT `pid`,`classname` FROM `vehicles` WHERE `id` ='" . $vehID . "';";
+                    message($lang['vehicle'].' '.$lang['edited']);
+                    $sql = "SELECT `pid`,`classname` FROM `vehicles` WHERE `id` ='".$vehID."';";
                     $result_of_query = $db_link->query($sql);
                     $vehTemp = $result_of_query->fetch_object();
-                    logAction($_SESSION['user_name'], $lang['edited'] . ' a ' . carName($vehTemp->classname) . ' (' . $vehID . ') ' . $lang['inventory'] . ' belonging to '.  nameID($vehTemp->pid, $db_link), 1);
+                    logAction($_SESSION['user_name'], $lang['edited'].' a '.carName($vehTemp->classname).' ('.$vehID.') '.$lang['inventory'].' belonging to '.nameID($vehTemp->pid, $db_link), 1);
                     break;
 
                 case "veh_store":
-                    $sql = "UPDATE `vehicles` SET `alive`='1',`active`='0' WHERE `vehicles`.`id` = '" . $vehID . "'";
+                    $sql = "UPDATE `vehicles` SET `alive`='1',`active`='0' WHERE `vehicles`.`id` = '".$vehID."'";
                     $result_of_query = $db_link->query($sql);
-                    message($lang['vehicle'] . ' stored');
-                    $sql = "SELECT `pid`,`classname` FROM `vehicles` WHERE `id` ='" . $vehID . "';";
+                    message($lang['vehicle'].' stored');
+                    $sql = "SELECT `pid`,`classname` FROM `vehicles` WHERE `id` ='".$vehID."';";
                     $result_of_query = $db_link->query($sql);
                     $vehTemp = $result_of_query->fetch_object();
-                    logAction($_SESSION['user_name'], $lang['stored'] . ' ' . nameID($vehTemp->pid, $db_link) . ' ' . carName($vehTemp->classname) . '(' . $vehID . ')', 1);
+                    logAction($_SESSION['user_name'], $lang['stored'].' '.nameID($vehTemp->pid, $db_link).' '.carName($vehTemp->classname).'('.$vehID.')', 1);
 
                     break;
 
                 case "veh_del":
-                    $sql = "SELECT `pid`, `classname`  FROM `vehicles` WHERE `id` ='" . $vehID . "';";
+                    $sql = "SELECT `pid`, `classname`  FROM `vehicles` WHERE `id` ='".$vehID."';";
                     $result_of_query = $db_link->query($sql);
                     $vehTemp = $result_of_query->fetch_object();
-                    logAction($_SESSION['user_name'], $lang['deleted'] . ' ' . nameID($vehTemp->pid, $db_link) . ' ' . carName($vehTemp->classname) . '(' . $vehID . ')', 2);
+                    logAction($_SESSION['user_name'], $lang['deleted'].' '.nameID($vehTemp->pid, $db_link).' '.carName($vehTemp->classname).'('.$vehID.')', 2);
 
-                    $sql = "DELETE FROM `vehicles` WHERE `vehicles`.`id` = '" . $vehID . "'";
+                    $sql = "DELETE FROM `vehicles` WHERE `vehicles`.`id` = '".$vehID."'";
                     $result_of_query = $db_link->query($sql);
-                    message($lang['vehicle'] . ' ' . $lang['deleted']);
+                    message($lang['vehicle'].' '.$lang['deleted']);
                     break;
 
                 case "veh_edit":
@@ -49,15 +49,15 @@ 
                     $vehCol = $_POST["vehCol"];
                     $vehType = $_POST["vehType"];
 
-                    $sql = "UPDATE `vehicles` SET `side`='" . $vehSide . "',`type`='" . $vehType . "',`color`='" . $vehCol . "' WHERE `vehicles`.`id` = '" . $vehID . "'";
+                    $sql = "UPDATE `vehicles` SET `side`='".$vehSide."',`type`='".$vehType."',`color`='".$vehCol."' WHERE `vehicles`.`id` = '".$vehID."'";
                     $result_of_query = $db_link->query($sql);
 
-                    message($lang['vehicle'] . ' ' . $lang['edited']);
+                    message($lang['vehicle'].' '.$lang['edited']);
 
-                    $sql = "SELECT `pid`, `classname` FROM `vehicles` WHERE `id` ='" . $vehID . "';";
+                    $sql = "SELECT `pid`, `classname` FROM `vehicles` WHERE `id` ='".$vehID."';";
                     $result_of_query = $db_link->query($sql);
                     $vehTemp = $result_of_query->fetch_object();
-                    logAction($_SESSION['user_name'], $lang['edited'] . ' ' . nameID($vehTemp->pid, $db_link) . ' ' . carName($vehTemp->classname) . '(' . $vehID . ')', 1);
+                    logAction($_SESSION['user_name'], $lang['edited'].' '.nameID($vehTemp->pid, $db_link).' '.carName($vehTemp->classname).'('.$vehID.')', 1);
                     break;
             }
         } else {
@@ -66,7 +66,7 @@ 
     }
 }
 
-$sql = "SELECT * FROM `vehicles` WHERE `id` ='" . $vehID . "';";
+$sql = "SELECT * FROM `vehicles` WHERE `id` ='".$vehID."';";
 $result_of_query = $db_link->query($sql);
 if ($result_of_query->num_rows > 0) {
     $veh = $result_of_query->fetch_object();
@@ -75,27 +75,27 @@ 
     <div class="panel panel-default">
         <div class="panel-heading">
             <h2 class="panel-title"><i
-                    class="fa fa-child fa-fw"></i><?php echo nameID($veh->pid, $db_link) . "'s " . carName($veh->classname); ?>
+                    class="fa fa-child fa-fw"></i><?php echo nameID($veh->pid, $db_link)."'s ".carName($veh->classname); ?>
             </h2>
         </div>
         <div class="panel-body">
             <?php $carPic = getPic($veh->classname);
-            echo '<center><img src="' . $settings['url'] . 'assets/img/cars/' . $carPic . '.jpg" class="img-responsive" alt="' . $veh->classname . '">'; ?>
+            echo '<center><img src="'.$settings['url'].'assets/img/cars/'.$carPic.'.jpg" class="img-responsive" alt="'.$veh->classname.'">'; ?>
             <?php
-            echo "<h4>" . $lang['owner'] . ": <a href='" . $settings['url'] . "editPlayer/" . uID($veh->pid, $db_link) . "'>" . nameID($veh->pid, $db_link) . "</a></h4>";
-            echo "<h4>" . $lang['class'] . ": " . carName($veh->classname) . "</h4>";
-            echo "<h4>" . $lang['plate'] . ": " . $veh->plate . "</h4>";
+            echo "<h4>".$lang['owner'].": <a href='".$settings['url']."editPlayer/".uID($veh->pid, $db_link)."'>".nameID($veh->pid, $db_link)."</a></h4>";
+            echo "<h4>".$lang['class'].": ".carName($veh->classname)."</h4>";
+            echo "<h4>".$lang['plate'].": ".$veh->plate."</h4>";
 
             if ($veh->alive == false) {
-                echo "<h4><span class='label label-danger'>" . $lang["not"] . " " . $lang["alive"] . "</span></h4>";
+                echo "<h4><span class='label label-danger'>".$lang["not"]." ".$lang["alive"]."</span></h4>";
             } else {
-                echo "<h4><span class='label label-success'>" . $lang["alive"] . "</span></h4> ";
+                echo "<h4><span class='label label-success'>".$lang["alive"]."</span></h4> ";
             }
 
             if ($veh->active == false) {
-                echo " <h4><span class='label label-danger'>" . $lang["not"] . " " . $lang["active"] . "</span></h4>";
+                echo " <h4><span class='label label-danger'>".$lang["not"]." ".$lang["active"]."</span></h4>";
             } else {
-                echo " <h4><span class='label label-success'>" . $lang["active"] . "</span></h4>";
+                echo " <h4><span class='label label-success'>".$lang["active"]."</span></h4>";
             }
             if ($_SESSION['permissions']['edit']['vehicles']) {
                 echo '
@@ -125,7 +125,7 @@ 
             case 'civ':
                 ?>
                 <span class="fa fa-3x fa-car"></span>
-                <h4> <?php echo $lang['side'] . ": " . $lang['civ']; ?> </h4>
+                <h4> <?php echo $lang['side'].": ".$lang['civ']; ?> </h4>
                 <?php
                 break;
             case 'cop':
@@ -133,7 +133,7 @@ 
                 <div class="col-md-2 col-sm-2 col-md-offset-1 box0">
                     <div class="box1">
                         <span class="fa fa-3x fa-taxi"></span>
-                        <h4> <?php echo $lang['side'] . ": " . $lang['police']; ?> </h4>
+                        <h4> <?php echo $lang['side'].": ".$lang['police']; ?> </h4>
                     </div>
                 </div>
                 <?php
@@ -141,7 +141,7 @@ 
             case 'med':
                 ?>
                 <span class="fa fa-3x fa-ambulance"></span>
-                <h4> <?php echo $lang['side'] . ": " . $lang['medic']; ?> </h4>
+                <h4> <?php echo $lang['side'].": ".$lang['medic']; ?> </h4>
                 <?php
                 break;
         }
@@ -151,15 +151,15 @@ 
         switch ($veh->type) {
             case 'Car':
                 echo "<span class='fa fa-3x fa-car'></span>";
-                echo "<h4>" . $lang['type'] . ": " . $lang['car'] . "</h4>";
+                echo "<h4>".$lang['type'].": ".$lang['car']."</h4>";
                 break;
             case 'Air':
                 echo "<span class='fa fa-3x fa-fighter-jet'></span>";
-                echo "<h4>" . $lang['type'] . ": " . $lang['air'] . "</h4>";
+                echo "<h4>".$lang['type'].": ".$lang['air']."</h4>";
                 break;
             case 'Ship':
                 echo "<span class='fa fa-3x fa-ship'></span>";
-                echo "<h4>" . $lang['type'] . ": " . $lang['ship'] . "</h4>";
+                echo "<h4>".$lang['type'].": ".$lang['ship']."</h4>";
                 break;
         }
         echo '</div>
@@ -169,13 +169,13 @@ 
 
         <div class="panel panel-default" style="float:left; width:100%; margin:0 auto;">
             <div class="panel-body">
-                <h4 style="centred"><?php echo $lang['vehicle'] . " " . $lang['inventory']; ?> </h4>
+                <h4 style="centred"><?php echo $lang['vehicle']." ".$lang['inventory']; ?> </h4>
                 <?php
                 $inv = str_replace(']"', "", str_replace('"[', "", $veh->inventory));
                 if (empty($inv)) {
                     $inv = 'Empty';
                 }
-                echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='civ_gear' name='civ_gear'>" . $inv . "</textarea>";
+                echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='civ_gear' name='civ_gear'>".$inv."</textarea>";
                 ?>
                 <br>
                 <a data-toggle="modal" href="#edit_veh_inv" class="btn btn-primary btn-xs" style="float: right;">
@@ -192,10 +192,10 @@ 
             <div class="modal-content">
                 <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['vehicle'] . " " . $lang['inventory']; ?>
+                    <h4 class="modal-title"><span class="glyphicon glyphicon-pencil"></span><?php echo " ".$lang['edit']." ".$lang['vehicle']." ".$lang['inventory']; ?>
                     </h4>
                 </div>
-                <?php  echo '<form method="post" action="' . $settings['url'] . 'editVeh/' . $vehID . '">' ?>
+                <?php  echo '<form method="post" action="'.$settings['url'].'editVeh/'.$vehID.'">' ?>
                         <?php echo formtoken::getField() ?>
                         <div class="modal-body">
                             <div class="form-group">
@@ -221,10 +221,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['delete'] . " " . $lang['vehicle']; ?>
+                            class="glyphicon glyphicon-pencil"></span><?php echo " ".$lang['delete']." ".$lang['vehicle']; ?>
                     </h4>
                 </div>
-                <?php  echo '<form method="post" action="' . $settings['url'] . 'editVeh/' . $vehID . '">' ?>
+                <?php  echo '<form method="post" action="'.$settings['url'].'editVeh/'.$vehID.'">' ?>
                     <?php echo formtoken::getField() ?>
                     <div class="modal-body">
                         <div class="form-group">
@@ -251,10 +251,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['store'] . " " . $lang['vehicle']; ?>
+                            class="glyphicon glyphicon-pencil"></span><?php echo " ".$lang['store']." ".$lang['vehicle']; ?>
                     </h4>
                 </div>
-                <?php  echo '<form method="post" action="' . $settings['url'] . 'editVeh/' . $vehID . '">' ?>
+                <?php  echo '<form method="post" action="'.$settings['url'].'editVeh/'.$vehID.'">' ?>
                     <?php echo formtoken::getField() ?>
                     <div class="modal-body">
                         <div class="form-group">
@@ -282,7 +282,7 @@ 
                     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                     <h4 class="modal-title"><span class="glyphicon glyphicon-pencil"></span> Edit Player</h4>
                 </div>
-                <?php  echo '<form method="post" action="' . $settings['url'] . 'editVeh/' . $vehID . '">' ?>
+                <?php  echo '<form method="post" action="'.$settings['url'].'editVeh/'.$vehID.'">' ?>
                 <?php echo formtoken::getField() ?>
                     <div class="modal-body">
                         <div class="form-group">
@@ -291,21 +291,21 @@ 
                             <div class="row">
                                 <center>
                                     <?php
-                                    echo "<h4>" . $lang['class'] . ":   <input id='vehClass' name='vehClass' type='text' value='" . $veh->classname . "' readonly></td><br/>";
-                                    echo "<h4>" . $lang['plate'] . ":    <input id='vehPlate' name='vehPlate' type='number' value='" . $veh->plate . "'readonly></td><br/>";
-                                    echo "<h4>" . $lang['side'] . ":   ";
+                                    echo "<h4>".$lang['class'].":   <input id='vehClass' name='vehClass' type='text' value='".$veh->classname."' readonly></td><br/>";
+                                    echo "<h4>".$lang['plate'].":    <input id='vehPlate' name='vehPlate' type='number' value='".$veh->plate."'readonly></td><br/>";
+                                    echo "<h4>".$lang['side'].":   ";
                                     echo "<select id='vehSide' name='vehSide'>";
-                                    echo '<option value="civ"' . select('civ', $veh->side) . '>' . $lang['civ'] . '</option>';
-                                    echo '<option value="cop"' . select('cop', $veh->side) . '>' . $lang['cop'] . '</option>';
-                                    echo '<option value="med"' . select('med', $veh->side) . '>' . $lang['medic'] . '</option>';
+                                    echo '<option value="civ"'.select('civ', $veh->side).'>'.$lang['civ'].'</option>';
+                                    echo '<option value="cop"'.select('cop', $veh->side).'>'.$lang['cop'].'</option>';
+                                    echo '<option value="med"'.select('med', $veh->side).'>'.$lang['medic'].'</option>';
                                     echo "</select>";
-                                    echo "<h4>" . $lang['type'] . ":   ";
+                                    echo "<h4>".$lang['type'].":   ";
                                     echo "<select id='vehType' name='vehType'>";
-                                    echo '<option value="Car"' . select('Car', $veh->type) . '>' . $lang['car'] . '</option>';
-                                    echo '<option value="Air"' . select('Air', $veh->type) . '>' . $lang['air'] . '</option>';
-                                    echo '<option value="Ship"' . select('Ship', $veh->type) . '>' . $lang['ship'] . '</option>';
+                                    echo '<option value="Car"'.select('Car', $veh->type).'>'.$lang['car'].'</option>';
+                                    echo '<option value="Air"'.select('Air', $veh->type).'>'.$lang['air'].'</option>';
+                                    echo '<option value="Ship"'.select('Ship', $veh->type).'>'.$lang['ship'].'</option>';
                                     echo "</select>";
-                                    echo "<h4>" . $lang['colour'] . ":   <input id='vehCol' name='vehCol' type='number' value='" . $veh->color . "'></td><br/>";
+                                    echo "<h4>".$lang['colour'].":   <input id='vehCol' name='vehCol' type='number' value='".$veh->color."'></td><br/>";
                                     echo "</center>";
                                     ?>
                                 </center>
@@ -320,4 +320,4 @@ 
             </div>
         </div>
     </div>
-<?php } else echo "<h1>" . errorMessage(32, $lang) . "</h1>";
+<?php } else echo "<h1>".errorMessage(32, $lang)."</h1>";

classes/password.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
-     * A Compatibility library with PHP 5.5's simplified password hashing API.
-     *
-     * @author Anthony Ferrara <ircmaxell@php.net>
-     * @license http://www.opensource.org/licenses/mit-license.html MIT License
-     * @copyright 2012 The Authors
-     */
+ * A Compatibility library with PHP 5.5's simplified password hashing API.
+ *
+ * @author Anthony Ferrara <ircmaxell@php.net>
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @copyright 2012 The Authors
+ */
 
 if (!defined('PASSWORD_DEFAULT')) {
 

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
             return null;
         }
         if (!is_int($algo)) {
-            trigger_error("password_hash() expects parameter 2 to be long, " . gettype($algo) . " given", E_USER_WARNING);
+            trigger_error("password_hash() expects parameter 2 to be long, ".gettype($algo)." given", E_USER_WARNING);
             return null;
         }
         switch ($algo) {
@@ -122,7 +122,7 @@ 
         }
         $salt = substr($salt, 0, $required_salt_len);
 
-        $hash = $hash_format . $salt;
+        $hash = $hash_format.$salt;
 
         $ret = crypt($password, $hash);
 

views/life/vehicles.php

Braces +9 added lines, -3 removed lines

@@ -10,13 +10,17 @@ 
     $sql = "SELECT `id` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid WHERE `pid` LIKE '" . $search . "' OR `classname` LIKE '%" . $search . "%' OR `name` LIKE '%" . $search . "%' OR `plate` 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;
+    if ($pageNum > $total_records) {
+        $pageNum = $total_records;
+    }
     $sql = "SELECT vehicles.id,vehicles.pid,vehicles.classname,vehicles.active,vehicles.type,vehicles.plate,vehicles.alive,vehicles.active,players.name FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid WHERE `pid` LIKE '" . $search . "' OR `vehicles.classname` LIKE '%" . $search . "%' OR `name` LIKE '%" . $search . "%' OR `vehicles.plate` LIKE '" . $search . "' OR `inventory` LIKE '%" . $search . "%' OR `name` LIKE '%" . $search . "%' " . $max . " ;";
 } else {
     $sql = "SELECT `id` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid;";
     $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 vehicles.id,vehicles.pid,vehicles.classname,vehicles.active,vehicles.type,vehicles.plate,vehicles.alive,vehicles.active,players.name FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid " . $max . " ;";
 }
 $result_of_query = $db_link->query($sql);
@@ -77,4 +81,6 @@ 
     </table>
 </div>
 <?php
-} else echo errorMessage(32, $lang);
+} else {
+    echo errorMessage(32, $lang);
+}

Spacing +13 added lines, -13 removed lines

@@ -2,22 +2,22 @@ 
 $db_link = serverConnect();
 require_once("config/carNames.php");
 
-$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);
+    logAction($_SESSION['user_name'], $lang['searched'].' ('.$search.') '.$lang['in'].' '.$lang['vehicles'], 1);
 
-    $sql = "SELECT `id` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid WHERE `pid` LIKE '" . $search . "' OR `classname` LIKE '%" . $search . "%' OR `name` LIKE '%" . $search . "%' OR `plate` LIKE '" . $search . "' OR `inventory` LIKE '%" . $search . "%' OR `name` LIKE '%" . $search . "%';";
+    $sql = "SELECT `id` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid WHERE `pid` LIKE '".$search."' OR `classname` LIKE '%".$search."%' OR `name` LIKE '%".$search."%' OR `plate` 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 vehicles.id,vehicles.pid,vehicles.classname,vehicles.active,vehicles.type,vehicles.plate,vehicles.alive,vehicles.active,players.name FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid WHERE `pid` LIKE '" . $search . "' OR vehicles.classname LIKE '%" . $search . "%' OR `name` LIKE '%" . $search . "%' OR vehicles.plate LIKE '" . $search . "' OR `inventory` LIKE '%" . $search . "%' OR `name` LIKE '%" . $search . "%' " . $max . " ;";
+    $sql = "SELECT vehicles.id,vehicles.pid,vehicles.classname,vehicles.active,vehicles.type,vehicles.plate,vehicles.alive,vehicles.active,players.name FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid WHERE `pid` LIKE '".$search."' OR vehicles.classname LIKE '%".$search."%' OR `name` LIKE '%".$search."%' OR vehicles.plate LIKE '".$search."' OR `inventory` LIKE '%".$search."%' OR `name` LIKE '%".$search."%' ".$max." ;";
 } else {
     $sql = "SELECT `id` FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid;";
     $result_of_query = $db_link->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
     if ($pageNum > $total_records) $pageNum = $total_records;
-    $sql = "SELECT vehicles.id,vehicles.pid,vehicles.classname,vehicles.active,vehicles.type,vehicles.plate,vehicles.alive,vehicles.active,players.name FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid " . $max . " ;";
+    $sql = "SELECT vehicles.id,vehicles.pid,vehicles.classname,vehicles.active,vehicles.type,vehicles.plate,vehicles.alive,vehicles.active,players.name FROM `vehicles` INNER JOIN `players` ON vehicles.pid=players.playerid ".$max." ;";
 }
 $result_of_query = $db_link->query($sql);
 if ($result_of_query->num_rows > 0) {  ?>
@@ -48,7 +48,7 @@ 
                 <th class="hidden-xs"><i class="fa fa-car"></i> <?php echo $lang['alive']; ?></th>
                 <th class="hidden-xs"><i class="fa fa-info"></i> <?php echo $lang['active']; ?></th>
                 <?php if ($_SESSION['permissions']['edit']['vehicles']) {
-    echo '<th><i class="fa fa-pencil"></i><span class="hidden-xs"> ' . $lang['edit'] . '</span></th>';
+    echo '<th><i class="fa fa-pencil"></i><span class="hidden-xs"> '.$lang['edit'].'</span></th>';
 }
 ?>
             </tr>
@@ -57,14 +57,14 @@ 
             <?php
             while ($row = mysqli_fetch_assoc($result_of_query)) {
                 echo "<tr>";
-                echo "<td>" . $row["name"] . "</td>";
-                echo "<td>" . carName($row["classname"]) . "</td>";
-                echo "<td class='hidden-xs'> " . carType($row["type"], $lang) . "</td>";
-                echo "<td class='hidden-xs'> " . $row["plate"] . "</td>";
-                echo "<td class='hidden-xs'> " . yesNo($row["alive"], $lang) . "</td>";
-                echo "<td class='hidden-xs'> " . yesNo($row["active"], $lang) . "</td>";
+                echo "<td>".$row["name"]."</td>";
+                echo "<td>".carName($row["classname"])."</td>";
+                echo "<td class='hidden-xs'> ".carType($row["type"], $lang)."</td>";
+                echo "<td class='hidden-xs'> ".$row["plate"]."</td>";
+                echo "<td class='hidden-xs'> ".yesNo($row["alive"], $lang)."</td>";
+                echo "<td class='hidden-xs'> ".yesNo($row["active"], $lang)."</td>";
                 if ($_SESSION['permissions']['edit']['vehicles']) {
-                    echo "<td><a class='btn btn-primary btn-xs' href='" . $settings['url'] . "editVeh/" . $row["id"] . "'>";
+                    echo "<td><a class='btn btn-primary btn-xs' href='".$settings['url']."editVeh/".$row["id"]."'>";
                     echo "<i class='fa fa-pencil'></i></a></td>";
                 }
                 echo "</tr>";

views/life/editPlayer.php

Indentation +11 added lines, -11 removed lines

@@ -151,7 +151,7 @@ 
                 $alias = str_replace('`]"', "", $alias);
 
                 echo '<center><img alt="' . $alias . '" src="' . $settings['url'] . 'assets/img/uniform/' . getPlayerSkin($player->civ_gear, $playerSkins) . '.jpg">';
-                 echo "<h5 style='word-wrap: break-word; '> <a href='http://playerindex.de/check.aspx?id=" . $pGID . "' class='btn btn-xs btn-warning' target='_blank' role='button'>Check Playerindex Ban </a></h5>";
+                    echo "<h5 style='word-wrap: break-word; '> <a href='http://playerindex.de/check.aspx?id=" . $pGID . "' class='btn btn-xs btn-warning' target='_blank' role='button'>Check Playerindex Ban </a></h5>";
                 if ($_SESSION['permissions']['view']['steam'] && $settings['vacTest']) {
                     echo '<div id="vacBan"></div>';
                 }
@@ -442,16 +442,16 @@ 
                                 }
                                 
                                 while ($row = mysqli_fetch_assoc($result_of_query)) {
-					echo "<tr>";
-					echo "<td>" . carName($row["classname"]) . "</td>";
-					echo "<td class='hidden-xs'> " . carType($row["type"], $lang) . "</td>";
-					echo "<td class='hidden-xs'> " . $row["plate"] . "</td>";
-					if ($_SESSION['permissions']['edit']['vehicles']) {
-						echo "<td><a class='btn btn-primary btn-xs' href='" . $settings['url'] . "editVeh/" . $row["id"] . "'>";
-						echo "<i class='fa fa-pencil'></i></a></td>";
-					}
-					echo "</tr>";
-				}
+                    echo "<tr>";
+                    echo "<td>" . carName($row["classname"]) . "</td>";
+                    echo "<td class='hidden-xs'> " . carType($row["type"], $lang) . "</td>";
+                    echo "<td class='hidden-xs'> " . $row["plate"] . "</td>";
+                    if ($_SESSION['permissions']['edit']['vehicles']) {
+                        echo "<td><a class='btn btn-primary btn-xs' href='" . $settings['url'] . "editVeh/" . $row["id"] . "'>";
+                        echo "<i class='fa fa-pencil'></i></a></td>";
+                    }
+                    echo "</tr>";
+                }
 								
                                 echo '</tr></tbody></table>';
                                 echo '<a style="float: right; padding-right:15px;" href="' . $settings['url'] . 'vehicles/' . $player->playerid . '"><h4>' . $lang['more'] . ' <i class="fa fa-arrow-circle-right"></i></h4></a>';

Spacing +137 added lines, -137 removed lines

@@ -1,8 +1,8 @@ 
 <?php
-require_once(realpath($settings['url']) . "config/carNames.php");
-require_once(realpath($settings['url']) . "config/images.php");
-require_once(realpath($settings['url']) . "config/license.php");
-require_once(realpath($settings['url']) . "config/crimes.php");
+require_once(realpath($settings['url'])."config/carNames.php");
+require_once(realpath($settings['url'])."config/images.php");
+require_once(realpath($settings['url'])."config/license.php");
+require_once(realpath($settings['url'])."config/crimes.php");
 
 $db_link = serverConnect();
 
@@ -26,26 +26,26 @@ 
         switch ($_POST["editType"]) {
             case "civ_inv":
                 $civ_gear_value = $_POST["civ_inv_value"];
-                $update = "UPDATE `players` SET civ_gear = '" . $civ_gear_value . "' WHERE `uid` = '" . $uID . "' ";
+                $update = "UPDATE `players` SET civ_gear = '".$civ_gear_value."' WHERE `uid` = '".$uID."' ";
                 $result_of_query = $db_link->query($update);
-                logAction($_SESSION['user_name'], $lang['edited'] . ' ' . nameID($player->playerid, $db_link) . '(' . $player->playerid . ') ' . $lang['civ'] . ' ' . $lang['inventory'], 1);
-                message($lang['edited'] . ' ' . $lang['civ'] . ' ' . $lang['inventory']);
+                logAction($_SESSION['user_name'], $lang['edited'].' '.nameID($player->playerid, $db_link).'('.$player->playerid.') '.$lang['civ'].' '.$lang['inventory'], 1);
+                message($lang['edited'].' '.$lang['civ'].' '.$lang['inventory']);
                 break;
 
             case "cop_inv":
                 $cop_gear_value = $_POST["cop_inv_value"];
-                $update = "UPDATE `players` SET cop_gear = '" . $cop_gear_value . "' WHERE `uid` = '" . $uID . "' ";
+                $update = "UPDATE `players` SET cop_gear = '".$cop_gear_value."' WHERE `uid` = '".$uID."' ";
                 $result_of_query = $db_link->query($update);
-                logAction($_SESSION['user_name'], $lang['edited'] . ' ' . nameID($player->playerid, $db_link) . '(' . $player->playerid . ') ' . $lang['cop'] . ' ' . $lang['inventory'], 1);
-                message($lang['edited'] . ' ' . $lang['cop'] . ' ' . $lang['inventory']);
+                logAction($_SESSION['user_name'], $lang['edited'].' '.nameID($player->playerid, $db_link).'('.$player->playerid.') '.$lang['cop'].' '.$lang['inventory'], 1);
+                message($lang['edited'].' '.$lang['cop'].' '.$lang['inventory']);
                 break;
 
             case "med_inv":
                 $med_gear_value = $_POST["med_inv_value"];
-                $update = "UPDATE `players` SET med_gear = '" . $med_gear_value . "' WHERE `uid` = '" . $uID . "' ";
+                $update = "UPDATE `players` SET med_gear = '".$med_gear_value."' WHERE `uid` = '".$uID."' ";
                 $result_of_query = $db_link->query($update);
-                logAction($_SESSION['user_name'], $lang['edited'] . ' ' . nameID($player->playerid, $db_link) . '(' . $player->playerid . ') ' . $lang['medic'] . ' ' . $lang['inventory'], 1);
-                message($lang['edited'] . ' ' . $lang['medic'] . ' ' . $lang['inventory']);
+                logAction($_SESSION['user_name'], $lang['edited'].' '.nameID($player->playerid, $db_link).'('.$player->playerid.') '.$lang['medic'].' '.$lang['inventory'], 1);
+                message($lang['edited'].' '.$lang['medic'].' '.$lang['inventory']);
                 break;
 
             case "player_edit":
@@ -56,21 +56,21 @@ 
                     $adminlevel = clean(intval($_POST["player_adminlvl"]), 'int');
                     $cash = clean(intval($_POST["player_cash"]), 'int');
                     $bankacc = clean(intval($_POST["player_bank"]), 'int');
-                    $sql = "SELECT * FROM `players` WHERE `uid` = '" . $uID . "'";
+                    $sql = "SELECT * FROM `players` WHERE `uid` = '".$uID."'";
                     $result = $db_link->query($sql);
                     if ($result->num_rows > 0) {
                         $player = $result->fetch_object();
 
-                        if ($coplevel != $player->coplevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cop'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->coplevel . ") " . $lang['to'] . " (" . $coplevel . ")", 2);
-                        if ($mediclevel != $player->mediclevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['medic'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->mediclevel . ") " . $lang['to'] . " (" . $mediclevel . ")", 2);
-                        if ($donorlevel != $player->$settings['donorFormat']) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['donator'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->$settings['donorFormat'] . ") " . $lang['to'] . " (" . $donorlevel . ")", 2);
-                        if ($adminlevel != $player->adminlevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['admin'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->adminlevel . ") " . $lang['to'] . " (" . $adminlevel . ")", 2);
-                        if ($cash != $player->cash) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cash'] . " " . $lang['from'] . " (" . $player->cash . ") " . $lang['to'] . " (" . $cash . ")", 2);
-                        if ($bankacc != $player->bankacc) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['bank'] . " " . $lang['from'] . " (" . $player->bankacc . ") " . $lang['to'] . " (" . $bankacc . ")", 2);
+                        if ($coplevel != $player->coplevel) logAction($_SESSION['user_name'], $lang['edited']." ".nameID($player->playerid, $db_link)."(".$player->playerid.") ".$lang['cop']." ".$lang['level']." ".$lang['from']." (".$player->coplevel.") ".$lang['to']." (".$coplevel.")", 2);
+                        if ($mediclevel != $player->mediclevel) logAction($_SESSION['user_name'], $lang['edited']." ".nameID($player->playerid, $db_link)."(".$player->playerid.") ".$lang['medic']." ".$lang['level']." ".$lang['from']." (".$player->mediclevel.") ".$lang['to']." (".$mediclevel.")", 2);
+                        if ($donorlevel != $player->$settings['donorFormat']) logAction($_SESSION['user_name'], $lang['edited']." ".nameID($player->playerid, $db_link)."(".$player->playerid.") ".$lang['donator']." ".$lang['level']." ".$lang['from']." (".$player->$settings['donorFormat'].") ".$lang['to']." (".$donorlevel.")", 2);
+                        if ($adminlevel != $player->adminlevel) logAction($_SESSION['user_name'], $lang['edited']." ".nameID($player->playerid, $db_link)."(".$player->playerid.") ".$lang['admin']." ".$lang['level']." ".$lang['from']." (".$player->adminlevel.") ".$lang['to']." (".$adminlevel.")", 2);
+                        if ($cash != $player->cash) logAction($_SESSION['user_name'], $lang['edited']." ".nameID($player->playerid, $db_link)."(".$player->playerid.") ".$lang['cash']." ".$lang['from']." (".$player->cash.") ".$lang['to']." (".$cash.")", 2);
+                        if ($bankacc != $player->bankacc) logAction($_SESSION['user_name'], $lang['edited']." ".nameID($player->playerid, $db_link)."(".$player->playerid.") ".$lang['bank']." ".$lang['from']." (".$player->bankacc.") ".$lang['to']." (".$bankacc.")", 2);
 
-                        $update = "UPDATE `players` SET coplevel = '" . $coplevel . "', mediclevel = '" . $mediclevel . "', ".$settings['donorFormat']."= '" . $donorlevel . "', adminlevel = '" . $adminlevel . "', cash = '" . $cash . "', bankacc = '" . $bankacc . "' WHERE `uid` = '" . $uID . "' ";
+                        $update = "UPDATE `players` SET coplevel = '".$coplevel."', mediclevel = '".$mediclevel."', ".$settings['donorFormat']."= '".$donorlevel."', adminlevel = '".$adminlevel."', cash = '".$cash."', bankacc = '".$bankacc."' WHERE `uid` = '".$uID."' ";
                         $result_of_query = $db_link->query($update);
-                        message($lang['edited'] . ' ' . nameID($player->playerid, $db_link));
+                        message($lang['edited'].' '.nameID($player->playerid, $db_link));
                     } else {
                         message("ERROR");
                     }
@@ -80,44 +80,44 @@ 
                     $cash = intval($_POST["player_cash"]);
                     $bankacc = intval($_POST["player_bank"]);
                     $donorlevel = isset($_POST['player_donlvl']) ? intval($_POST['player_donlvl']) : null;
-                    $sql = "SELECT * FROM `players` WHERE `uid` = '" . $uID . "'";
+                    $sql = "SELECT * FROM `players` WHERE `uid` = '".$uID."'";
                     $result = $db_link->query($sql);
                     if ($result->num_rows > 0) {
                         $player = $result->fetch_object();
                         if (is_null($donorlevel)) {
                             $donorlevel = $player->$settings['donorFormat'];
                         }
-                        if ($coplevel != $player->coplevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cop'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->coplevel . ") " . $lang['to'] . " (" . $coplevel . ")", 2);
-                        if ($mediclevel != $player->mediclevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['medic'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->mediclevel . ") " . $lang['to'] . " (" . $mediclevel . ")", 2);
-                        if ($donorlevel != $player->$settings['donorFormat']) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['donator'] . " " . $lang['level'] . " " . $lang['from'] . " (" .$player->$settings['donorFormat'] . ") " . $lang['to'] . " (" . $donorlevel . ")", 2);
-                        if ($cash != $player->cash) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cash'] . " " . $lang['from'] . " (" . $player->cash . ") " . $lang['to'] . " (" . $cash . ")", 2);
-                        if ($bankacc != $player->bankacc) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['bank'] . " " . $lang['from'] . " (" . $player->bankacc . ") " . $lang['to'] . " (" . $bankacc . ")", 2);
+                        if ($coplevel != $player->coplevel) logAction($_SESSION['user_name'], $lang['edited']." ".nameID($player->playerid, $db_link)."(".$player->playerid.") ".$lang['cop']." ".$lang['level']." ".$lang['from']." (".$player->coplevel.") ".$lang['to']." (".$coplevel.")", 2);
+                        if ($mediclevel != $player->mediclevel) logAction($_SESSION['user_name'], $lang['edited']." ".nameID($player->playerid, $db_link)."(".$player->playerid.") ".$lang['medic']." ".$lang['level']." ".$lang['from']." (".$player->mediclevel.") ".$lang['to']." (".$mediclevel.")", 2);
+                        if ($donorlevel != $player->$settings['donorFormat']) logAction($_SESSION['user_name'], $lang['edited']." ".nameID($player->playerid, $db_link)."(".$player->playerid.") ".$lang['donator']." ".$lang['level']." ".$lang['from']." (".$player->$settings['donorFormat'].") ".$lang['to']." (".$donorlevel.")", 2);
+                        if ($cash != $player->cash) logAction($_SESSION['user_name'], $lang['edited']." ".nameID($player->playerid, $db_link)."(".$player->playerid.") ".$lang['cash']." ".$lang['from']." (".$player->cash.") ".$lang['to']." (".$cash.")", 2);
+                        if ($bankacc != $player->bankacc) logAction($_SESSION['user_name'], $lang['edited']." ".nameID($player->playerid, $db_link)."(".$player->playerid.") ".$lang['bank']." ".$lang['from']." (".$player->bankacc.") ".$lang['to']." (".$bankacc.")", 2);
 
-                        $update = "UPDATE `players` SET coplevel = '" . $coplevel . "', mediclevel = '" . $mediclevel . "', ".$settings['donorFormat']."= '" . $donorlevel . "', cash = '" . $cash . "', bankacc = '" . $bankacc . "' WHERE `uid` = '" . $uID . "' ";
+                        $update = "UPDATE `players` SET coplevel = '".$coplevel."', mediclevel = '".$mediclevel."', ".$settings['donorFormat']."= '".$donorlevel."', cash = '".$cash."', bankacc = '".$bankacc."' WHERE `uid` = '".$uID."' ";
                         $result_of_query = $db_link->query($update);
-                        logAction($_SESSION['user_name'], $lang['edited'] . ' ' . nameID($player->playerid, $db_link) . '(' . $player->playerid . ') ' . $lang['levels'], 2);
-                        message($lang['edited'] . ' ' . nameID($player->playerid, $db_link));
+                        logAction($_SESSION['user_name'], $lang['edited'].' '.nameID($player->playerid, $db_link).'('.$player->playerid.') '.$lang['levels'], 2);
+                        message($lang['edited'].' '.nameID($player->playerid, $db_link));
                     } else {
                         message("ERROR");
                     }
                 } elseif ($_SESSION['user_level'] >= 2) {
                     $coplevel = intval($_POST["player_coplvl"]);
                     $mediclevel = intval($_POST["player_medlvl"]);
-                    if ($coplevel != $player->coplevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cop'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->coplevel . ") " . $lang['to'] . " (" . $coplevel . ")", 2);
-                    if ($mediclevel != $player->mediclevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['medic'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->mediclevel . ") " . $lang['to'] . " (" . $mediclevel . ")", 2);
+                    if ($coplevel != $player->coplevel) logAction($_SESSION['user_name'], $lang['edited']." ".nameID($player->playerid, $db_link)."(".$player->playerid.") ".$lang['cop']." ".$lang['level']." ".$lang['from']." (".$player->coplevel.") ".$lang['to']." (".$coplevel.")", 2);
+                    if ($mediclevel != $player->mediclevel) logAction($_SESSION['user_name'], $lang['edited']." ".nameID($player->playerid, $db_link)."(".$player->playerid.") ".$lang['medic']." ".$lang['level']." ".$lang['from']." (".$player->mediclevel.") ".$lang['to']." (".$mediclevel.")", 2);
 
-                    $update = "UPDATE `players` SET coplevel = '" . $coplevel . "', mediclevel = '" . $mediclevel . "' WHERE `uid` = '" . $uID . "' ";
+                    $update = "UPDATE `players` SET coplevel = '".$coplevel."', mediclevel = '".$mediclevel."' WHERE `uid` = '".$uID."' ";
                     $result_of_query = $db_link->query($update);
-                    logAction($_SESSION['user_name'], $lang['edited'] . ' ' . nameID($player->playerid, $db_link) . '(' . $player->playerid . ') ' . $lang['levels'], 2);
-                    message($lang['edited'] . ' ' . nameID($player->playerid, $db_link));
+                    logAction($_SESSION['user_name'], $lang['edited'].' '.nameID($player->playerid, $db_link).'('.$player->playerid.') '.$lang['levels'], 2);
+                    message($lang['edited'].' '.nameID($player->playerid, $db_link));
                 }
                 break;
             case "add_note":
                 $note_text = $_POST["note_text"];
-                $update = "INSERT INTO `notes` (`uid`, `staff_name`, `note_text`, `note_updated`) VALUES ('" . $uID . "', '" . $_SESSION['user_name'] . "', '" . $note_text . "', CURRENT_TIMESTAMP); ";
+                $update = "INSERT INTO `notes` (`uid`, `staff_name`, `note_text`, `note_updated`) VALUES ('".$uID."', '".$_SESSION['user_name']."', '".$note_text."', CURRENT_TIMESTAMP); ";
                 $result_of_query = $db_link->query($update);
-                logAction($_SESSION['user_name'], $lang['edited'] . ' ' . nameID($player->playerid, $db_link) . '(' . $player->playerid . ') ' . $lang['notes'], 1);
-                message($lang['edited'] . ' ' . $lang['notes']);
+                logAction($_SESSION['user_name'], $lang['edited'].' '.nameID($player->playerid, $db_link).'('.$player->playerid.') '.$lang['notes'], 1);
+                message($lang['edited'].' '.$lang['notes']);
                 break;
         }
     } else {
@@ -125,7 +125,7 @@ 
     }
     }
 
-$sql = "SELECT * FROM `players` WHERE `uid` = '" . $uID . "'";
+$sql = "SELECT * FROM `players` WHERE `uid` = '".$uID."'";
 $result = $db_link->query($sql);
 if ($result->num_rows > 0) {
     $player = $result->fetch_object();
@@ -136,7 +136,7 @@ 
         $temp .= chr($pGID & 0xFF);
         $pGID >>= 8;
     }
-    $pGID = md5('BE' . $temp);
+    $pGID = md5('BE'.$temp);
 ?>
 <div class="col-md-3" style="float:left;  padding-top:20px;">
     <div class="panel panel-default">
@@ -149,8 +149,8 @@ 
                 $alias = str_replace('"[`', "", $player->aliases);
                 $alias = str_replace('`]"', "", $alias);
 
-                echo '<center><img alt="' . $alias . '" src="' . $settings['url'] . 'assets/img/uniform/' . getPlayerSkin($player->civ_gear, $playerSkins) . '.jpg">';
-                 echo "<h5 style='word-wrap: break-word; '> <a href='http://playerindex.de/check.aspx?id=" . $pGID . "' class='btn btn-xs btn-warning' target='_blank' role='button'>Check Playerindex Ban </a></h5>";
+                echo '<center><img alt="'.$alias.'" src="'.$settings['url'].'assets/img/uniform/'.getPlayerSkin($player->civ_gear, $playerSkins).'.jpg">';
+                 echo "<h5 style='word-wrap: break-word; '> <a href='http://playerindex.de/check.aspx?id=".$pGID."' class='btn btn-xs btn-warning' target='_blank' role='button'>Check Playerindex Ban </a></h5>";
                 if ($_SESSION['permissions']['view']['steam'] && $settings['vacTest']) {
                     echo '<div id="vacBan"></div>';
                 }
@@ -161,41 +161,41 @@ 
                     }
                     echo '</div>';
                 }
-                echo "<h4>" . $lang['aliases'] . ": " . $alias . "</h4>";
-                echo "<h4>" . $lang['uid'] . ": " . $player->uid . "</h4>";
-                echo "<h4>" . $lang['playerID'] . ": " . $player->playerid . "</h4>";
-                echo "<h4 style='word-wrap: break-word;'>" . $lang['GUID'] . ": " . $pGID . "</h4>";
+                echo "<h4>".$lang['aliases'].": ".$alias."</h4>";
+                echo "<h4>".$lang['uid'].": ".$player->uid."</h4>";
+                echo "<h4>".$lang['playerID'].": ".$player->playerid."</h4>";
+                echo "<h4 style='word-wrap: break-word;'>".$lang['GUID'].": ".$pGID."</h4>";
             ?>
             <i class="fa fa-2x fa-money"></i>
-            <h4><?php echo $lang['cash'] . ": " . $player->cash; ?> </h4>
+            <h4><?php echo $lang['cash'].": ".$player->cash; ?> </h4>
             <i class="fa fa-2x fa-bank"></i>
-            <h4> <?php echo $lang['bank'] . ": " . $player->bankacc; ?> </h4>
+            <h4> <?php echo $lang['bank'].": ".$player->bankacc; ?> </h4>
             <?php
                 if ($player->arrested == 0) {
-                    echo "<h4><button type='button' id='arrested' class='arrest btn btn-xs btn-success'>" . $lang["not"] . " " . $lang["arrested"] . "</button></h4>";
+                    echo "<h4><button type='button' id='arrested' class='arrest btn btn-xs btn-success'>".$lang["not"]." ".$lang["arrested"]."</button></h4>";
                 } else {
-                    echo "<h4><button type='button' id='arrested' class='arrest btn btn-xs btn-theme01'>" . $lang["arrested"] . "</button></h4>";
+                    echo "<h4><button type='button' id='arrested' class='arrest btn btn-xs btn-theme01'>".$lang["arrested"]."</button></h4>";
                 }
 
                 if ($player->blacklist == 0) {
-                    echo "<h4><button type='button' id='blacklist' class='arrest btn btn-xs btn-success'>" . $lang["not"] . " " . $lang["blacklisted"] . "</button></h4>";
+                    echo "<h4><button type='button' id='blacklist' class='arrest btn btn-xs btn-success'>".$lang["not"]." ".$lang["blacklisted"]."</button></h4>";
                 } else {
-                    echo "<h4><button type='button' id='blacklist' class='arrest btn btn-xs btn-theme01'>" . $lang["blacklisted"] . "</button></h4>";
+                    echo "<h4><button type='button' id='blacklist' class='arrest btn btn-xs btn-theme01'>".$lang["blacklisted"]."</button></h4>";
                 }
 
                 if ($settings['wanted'] && ($_SESSION['permissions']['view']['wanted'] || $player->playerid == $_SESSION['playerid'])) {
-                    $sql = "SELECT `active` FROM `wanted` WHERE `wantedID` = '" . $player->playerid . "'";
+                    $sql = "SELECT `active` FROM `wanted` WHERE `wantedID` = '".$player->playerid."'";
                     $result_of_query = $db_link->query($sql);
                     if ($result_of_query->num_rows > 0) {
                         while ($row = mysqli_fetch_assoc($result_of_query)) {
                             if ($row["active"] == 1) {
-                                echo "<h4><a href='" . $settings['url'] . "editwanted/" . $player->playerid . "' class='label label-danger'>" . $lang["wanted"] . "</span></h4>";
+                                echo "<h4><a href='".$settings['url']."editwanted/".$player->playerid."' class='label label-danger'>".$lang["wanted"]."</span></h4>";
                             } else {
-                                echo "<h4><span class='label label-success'>" . $lang["not"] . " " . $lang["wanted"] . "</span></h4>";
+                                echo "<h4><span class='label label-success'>".$lang["not"]." ".$lang["wanted"]."</span></h4>";
                             }
                         }
                     } else {
-                        echo "<h4><span class='label label-success'>" . $lang["not"] . " " . $lang["wanted"] . "</span></h4>";
+                        echo "<h4><span class='label label-success'>".$lang["not"]." ".$lang["wanted"]."</span></h4>";
                     }
                 }
 
@@ -216,31 +216,31 @@ 
         <div class="col-md-2 col-sm-2 col-md-offset-1 box0">
             <div class="box1">
                 <span class="fa fa-3x fa-taxi"></span>
-                <h3> <?php echo $lang['police'] . ": " . $player->coplevel; ?> </h3>
+                <h3> <?php echo $lang['police'].": ".$player->coplevel; ?> </h3>
             </div>
         </div>
         <div class="col-md-2 col-sm-2 box0">
             <div class="box1">
                 <span class="fa fa-3x fa-ambulance"></span>
-                <h3> <?php echo $lang['medic'] . ": " . $player->mediclevel; ?> </h3>
+                <h3> <?php echo $lang['medic'].": ".$player->mediclevel; ?> </h3>
             </div>
         </div>
         <div class="col-md-2 col-sm-2 box0">
             <div class="box1">
                 <span class="fa fa-3x fa-usd"></span>
-                <h3> <?php echo $lang['donator'] . ": " . $player->$settings['donorFormat']; ?> </h3>
+                <h3> <?php echo $lang['donator'].": ".$player->$settings['donorFormat']; ?> </h3>
             </div>
         </div>
         <div class="col-md-2 col-sm-2 box0">
             <div class="box1">
                 <span class="fa fa-3x fa-group"></span>
-                <h3> <?php echo $lang['admin'] . ": " . $player->adminlevel; ?> </h3>
+                <h3> <?php echo $lang['admin'].": ".$player->adminlevel; ?> </h3>
             </div>
         </div>
         <?php
         if ($_SESSION['permissions']['view']['steam'] || $player->playerid == $_SESSION['playerid']) {
             echo '<div class="col-md-2 col-sm-2 box0">';
-            echo '<a href="http://steamcommunity.com/profiles/' . $player->playerid . '"';
+            echo '<a href="http://steamcommunity.com/profiles/'.$player->playerid.'"';
             echo 'target="_blank">';
             echo '<div class="box1">';
             echo '<span class="fa fa-3x fa-steam"></span>';
@@ -270,16 +270,16 @@ 
             </li>
             <?php
             if ($_SESSION['permissions']['edit']['houses']) {
-                echo '<li><a href="#house" data-toggle="tab">' . $lang['houses'] . '</a></li>';
+                echo '<li><a href="#house" data-toggle="tab">'.$lang['houses'].'</a></li>';
             }
             if ($_SESSION['permissions']['edit']['vehicles']) {
-                echo '<li><a href="#veh" data-toggle="tab">' . $lang['vehicles'] . '</a></li>';
+                echo '<li><a href="#veh" data-toggle="tab">'.$lang['vehicles'].'</a></li>';
             }
             if ($_SESSION['permissions']['edit']['notes']) {
                 echo '<li><a href="#notes" data-toggle="tab"> Notes</a></li>';
             }
             if ($_SESSION['permissions']['view']['wanted'] && $settings['wanted']) {
-                echo '<li><a href="#wanted" data-toggle="tab">' . $lang['wanted'] . '</a></li>';
+                echo '<li><a href="#wanted" data-toggle="tab">'.$lang['wanted'].'</a></li>';
             }
             ?>
         </ul>
@@ -289,55 +289,55 @@ 
                     <div class="tab-pane fade in active well" id="civ_lic">
                         <?php
                             if ($player->civ_licenses !== '"[]"' && $player->civ_licenses !== '') {
-                                echo '<h4 style="centred">' . $lang['civil'] . ' ' . $lang['licenses'] . '</h4>';
+                                echo '<h4 style="centred">'.$lang['civil'].' '.$lang['licenses'].'</h4>';
                                 $return = stripArray($player->civ_licenses, 0);
                                 foreach ($return as $value) {
                                     if (strpos($value, "1") == TRUE) {
                                         $name = before(',', $value);
-                                        echo "<button type='button' id=" . $name . " class='license btn btn-xs btn-success' style='margin-bottom: 3px;'>" . licName($name, $license) . "</button> ";
+                                        echo "<button type='button' id=".$name." class='license btn btn-xs btn-success' style='margin-bottom: 3px;'>".licName($name, $license)."</button> ";
                                     } else {
                                         $name = before(',', $value);
-                                        echo "<button type='button' id=" . $name . " class='license btn btn-xs btn-theme01' style='margin-bottom: 3px;'>" . licName($name, $license) . "</button> ";
+                                        echo "<button type='button' id=".$name." class='license btn btn-xs btn-theme01' style='margin-bottom: 3px;'>".licName($name, $license)."</button> ";
                                     }
                                 }
                             } else {
-                                echo '<h4>' . errorMessage(371, $lang) . '</h4>';
+                                echo '<h4>'.errorMessage(371, $lang).'</h4>';
                             }?>
                     </div>
                     <div class="tab-pane well fade" id="medic_lic">
                         <?php
                             if ($player->med_licenses !== '"[]"' && $player->med_licenses !== '') {
-                                echo '<h4 style="centred">' . $lang['medic'] . ' ' . $lang['licenses'] . '</h4>';
+                                echo '<h4 style="centred">'.$lang['medic'].' '.$lang['licenses'].'</h4>';
                                 $return = stripArray($player->med_licenses, 0);
                                 foreach ($return as $value) {
                                     if (strpos($value, "1") == TRUE) {
                                         $name = before(',', $value);
-                                        echo "<button type='button' id=" . $name . " class='license btn btn-xs btn-success' style='margin-bottom: 3px;'>" . licName($name, $license) . "</button> ";
+                                        echo "<button type='button' id=".$name." class='license btn btn-xs btn-success' style='margin-bottom: 3px;'>".licName($name, $license)."</button> ";
                                     } else {
                                         $name = before(',', $value);
-                                        echo "<button type='button' id=" . $name . " class='license btn btn-xs btn-theme01' style='margin-bottom: 3px;'>" . licName($name, $license) . "</button> ";
+                                        echo "<button type='button' id=".$name." class='license btn btn-xs btn-theme01' style='margin-bottom: 3px;'>".licName($name, $license)."</button> ";
                                     }
                                 }
                             } else {
-                                echo '<h4>' . errorMessage(372, $lang) . '</h4>';
+                                echo '<h4>'.errorMessage(372, $lang).'</h4>';
                             } ?>
                     </div>
                     <div class="tab-pane well fade" id="police_lic">
                         <?php
                             if ($player->cop_licenses !== '"[]"' && $player->cop_licenses !== '') {
                                 $return = stripArray($player->cop_licenses, 0);
-                                echo '<h4 style="centred">' . $lang['cop'] . ' ' . $lang['licenses'] . '</h4>';
+                                echo '<h4 style="centred">'.$lang['cop'].' '.$lang['licenses'].'</h4>';
                                 foreach ($return as $value) {
                                     if (strpos($value, "1") == TRUE) {
                                         $name = before(',', $value);
-                                        echo "<button type='button' id=" . $name . " class='license btn btn-xs btn-success' style='margin-bottom: 3px;'>" . licName($name, $license) . "</button> ";
+                                        echo "<button type='button' id=".$name." class='license btn btn-xs btn-success' style='margin-bottom: 3px;'>".licName($name, $license)."</button> ";
                                     } else {
                                         $name = before(',', $value);
-                                        echo "<button type='button' id=" . $name . " class='license btn btn-xs btn-theme01' style='margin-bottom: 3px;'>" . licName($name, $license) . "</button> ";
+                                        echo "<button type='button' id=".$name." class='license btn btn-xs btn-theme01' style='margin-bottom: 3px;'>".licName($name, $license)."</button> ";
                                     }
                                 }
                             } else {
-                                echo '<h4>' . errorMessage(373, $lang) . '</h4>';
+                                echo '<h4>'.errorMessage(373, $lang).'</h4>';
                             }
                         ?>
                     </div>
@@ -345,41 +345,41 @@ 
                     <div class="tab-pane fade well" id="civ_inv">
                         <?php
                         if ($player->civ_gear !== '"[]"' && $player->civ_gear !== '') {
-                            echo '<h4 style="centred">' . $lang['civil'] . ' ' . $lang['gear'] . '</h4>';
-                            echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='civ_gear' name='civ_gear'>" . $player->civ_gear . "</textarea><br>";
+                            echo '<h4 style="centred">'.$lang['civil'].' '.$lang['gear'].'</h4>';
+                            echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='civ_gear' name='civ_gear'>".$player->civ_gear."</textarea><br>";
 
                             if ($_SESSION['permissions']['edit']['inventory']) {
                                 echo '<a data-toggle="modal" href="#edit_civ_inv" class="btn btn-primary btn-xs" style="float: right;">';
                                 echo '<i class="fa fa-pencil"></i></a>';
                             }
                         } else {
-                            echo '<h4>' . errorMessage(381, $lang) . '</h4>';
+                            echo '<h4>'.errorMessage(381, $lang).'</h4>';
                         } ?>
                     </div>
                     <div class="tab-pane fade well" id="police_inv">
                         <?php
                         if ($player->cop_gear !== '"[]"' && $player->cop_gear !== '') {
-                            echo '<h4 style="centred">' . $lang['cop'] . ' ' . $lang['gear'] . '</h4>';
-                            echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='cop_gear' name='cop_gear'>" . $player->cop_gear . "</textarea><br>";
+                            echo '<h4 style="centred">'.$lang['cop'].' '.$lang['gear'].'</h4>';
+                            echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='cop_gear' name='cop_gear'>".$player->cop_gear."</textarea><br>";
                             if ($_SESSION['permissions']['edit']['inventory']) {
                                 echo '<a data-toggle="modal" href="#edit_cop_inv" class="btn btn-primary btn-xs" style="float: right;">';
                                 echo '<i class="fa fa-pencil"></i></a>';
                             }
                         } else {
-                            echo '<h4>' . errorMessage(383, $lang) . '</h4>';
+                            echo '<h4>'.errorMessage(383, $lang).'</h4>';
                         } ?>
                     </div>
                     <div class="tab-pane fade well" id="medic_inv">
                         <?php
                         if ($player->med_gear !== '"[]"' && $player->med_gear !== '') {
-                            echo '<h4 style="centred">' . $lang['medic'] . ' ' . $lang['gear'] . '</h4>';
-                            echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='med_gear' name='med_gear'>" . $player->med_gear . "</textarea><br>";
+                            echo '<h4 style="centred">'.$lang['medic'].' '.$lang['gear'].'</h4>';
+                            echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='med_gear' name='med_gear'>".$player->med_gear."</textarea><br>";
                             if ($_SESSION['permissions']['edit']['inventory']) {
                                 echo '<a data-toggle="modal" href="#edit_med_inv" class="btn btn-primary btn-xs" style="float: right;">';
                                 echo '<i class="fa fa-pencil"></i></a>';
                             }
                         } else {
-                            echo '<h4>' . errorMessage(382, $lang) . '</h4>';
+                            echo '<h4>'.errorMessage(382, $lang).'</h4>';
                         } ?>
                     </div>
                 <?php }
@@ -387,7 +387,7 @@ 
                     <div class="tab-pane fade" id="house">
                         <div class="table-responsive">
                             <?php
-                            $sql = "SELECT `pos`,`id` FROM `houses` WHERE `pid` = '" . $player->playerid . "' ORDER BY `id` DESC LIMIT 8";
+                            $sql = "SELECT `pos`,`id` FROM `houses` WHERE `pid` = '".$player->playerid."' ORDER BY `id` DESC LIMIT 8";
                             $result_of_query = $db_link->query($sql);
                             if ($result_of_query->num_rows > 0) {
                                 ?>
@@ -402,60 +402,60 @@ 
                                     <?php
                                     while ($row = mysqli_fetch_assoc($result_of_query)) {
                                         echo "<tr>";
-                                        echo "<td>" . substr($row["pos"], 1, -1) . "</td>";
-                                        echo "<td><a class='btn btn-primary btn-xs' href='" . $settings['url'] . "editHouse/" . $row["id"] . "'>";
+                                        echo "<td>".substr($row["pos"], 1, -1)."</td>";
+                                        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>";
                                     } ?>
                                     </tbody>
                                 </table>
-                                <?php echo '<a style="float: right;" href="' . $settings['url'] . 'houses/' . $player->playerid . '"><h4>' . $lang['more'] . ' <i class="fa fa-arrow-circle-right"></i></h4></a>';
-                            } else echo '<h4>' . errorMessage(31, $lang) . '</h4>'; ?>
+                                <?php echo '<a style="float: right;" href="'.$settings['url'].'houses/'.$player->playerid.'"><h4>'.$lang['more'].' <i class="fa fa-arrow-circle-right"></i></h4></a>';
+                            } else echo '<h4>'.errorMessage(31, $lang).'</h4>'; ?>
                         </div>
                     </div>
                 <?php } if ($_SESSION['permissions']['view']['vehicles'] || $player->playerid == $_SESSION['playerid']) { ?>
                     <div class="tab-pane fade" id="veh">
                         <div class="table-responsive">
                         <?php
-                            $sql = "SELECT `classname`,`type`,`id`,`plate` FROM `vehicles` WHERE `pid` = '" . $player->playerid . "' ORDER BY `id` DESC LIMIT 8";
+                            $sql = "SELECT `classname`,`type`,`id`,`plate` FROM `vehicles` WHERE `pid` = '".$player->playerid."' ORDER BY `id` DESC LIMIT 8";
                             $result_of_query = $db_link->query($sql);
                             if ($result_of_query->num_rows > 0) {
                                 $veh = $result_of_query->fetch_object();
                                 echo '<table class="table table-bordered table-hover table-striped" style="margin-bottom: 0px;">';
                                 echo '<thead><tr>';
-                                echo '<th>' . $lang['class'] . '</th>';
-                                echo '<th class="hidden-xs">' . $lang['type'] . '</th>';
-                                echo '<th class="hidden-xs">' . $lang['plate'] . '</th>';
+                                echo '<th>'.$lang['class'].'</th>';
+                                echo '<th class="hidden-xs">'.$lang['type'].'</th>';
+                                echo '<th class="hidden-xs">'.$lang['plate'].'</th>';
                                 if ($_SESSION['permissions']['edit']['vehicles']) {
-                                    echo "<th>" . $lang['edit'] . "</th>";
+                                    echo "<th>".$lang['edit']."</th>";
                                 }
                                 echo '</tr></thead><tbody';
                                 echo '<tr>';
-                                echo '<td>' . carName($veh->classname) . '</td>';
-                                echo '<td class="hidden-xs">' . carType($veh->type, $lang) . '</td>';
-                                echo '<td class="hidden-xs">' . $veh->plate . '</td>';
+                                echo '<td>'.carName($veh->classname).'</td>';
+                                echo '<td class="hidden-xs">'.carType($veh->type, $lang).'</td>';
+                                echo '<td class="hidden-xs">'.$veh->plate.'</td>';
 
                                 if ($_SESSION['permissions']['edit']['vehicles']) {
-                                    echo "<td><a class='btn btn-primary btn-xs' href='" . $settings['url'] . "editVeh/" . $veh->id . "'>";
+                                    echo "<td><a class='btn btn-primary btn-xs' href='".$settings['url']."editVeh/".$veh->id."'>";
                                     echo "<i class='fa fa-pencil'></i></a></td>";
                                 }
 
                                 while ($row = mysqli_fetch_assoc($result_of_query)) {
 					echo "<tr>";
-					echo "<td>" . carName($row["classname"]) . "</td>";
-					echo "<td class='hidden-xs'> " . carType($row["type"], $lang) . "</td>";
-					echo "<td class='hidden-xs'> " . $row["plate"] . "</td>";
+					echo "<td>".carName($row["classname"])."</td>";
+					echo "<td class='hidden-xs'> ".carType($row["type"], $lang)."</td>";
+					echo "<td class='hidden-xs'> ".$row["plate"]."</td>";
 					if ($_SESSION['permissions']['edit']['vehicles']) {
-						echo "<td><a class='btn btn-primary btn-xs' href='" . $settings['url'] . "editVeh/" . $row["id"] . "'>";
+						echo "<td><a class='btn btn-primary btn-xs' href='".$settings['url']."editVeh/".$row["id"]."'>";
 						echo "<i class='fa fa-pencil'></i></a></td>";
 					}
 					echo "</tr>";
 				}
 
                                 echo '</tr></tbody></table>';
-                                echo '<a style="float: right; padding-right:15px;" href="' . $settings['url'] . 'vehicles/' . $player->playerid . '"><h4>' . $lang['more'] . ' <i class="fa fa-arrow-circle-right"></i></h4></a>';
+                                echo '<a style="float: right; padding-right:15px;" href="'.$settings['url'].'vehicles/'.$player->playerid.'"><h4>'.$lang['more'].' <i class="fa fa-arrow-circle-right"></i></h4></a>';
 
-                            } else echo '<h4>' . errorMessage(32, $lang) . '</h4>';
+                            } else echo '<h4>'.errorMessage(32, $lang).'</h4>';
                         ?>
                         </div>
                     </div>
@@ -464,7 +464,7 @@ 
                     <div class="tab-pane fade" id="notes">
                         <div class="table-responsive">
                             <?php
-                                $sql = 'SELECT * FROM `notes` WHERE `uid` = "' . $uID . '" ORDER BY `note_updated` DESC LIMIT 10';
+                                $sql = 'SELECT * FROM `notes` WHERE `uid` = "'.$uID.'" ORDER BY `note_updated` DESC LIMIT 10';
                                 $result_of_query = $db_link->query($sql);
                                 if ($result_of_query->num_rows > 0) {
                                     ?>
@@ -479,8 +479,8 @@ 
                                     <?php
                                     while ($row = mysqli_fetch_assoc($result_of_query)) {
                                         echo "<tr>";
-                                        echo "<td>" . $row["staff_name"] . "</td>";
-                                        echo "<td>" . $row["note_text"] . "</td>";
+                                        echo "<td>".$row["staff_name"]."</td>";
+                                        echo "<td>".$row["note_text"]."</td>";
                                         echo "</tr>";
                                     };
                                     ?>
@@ -492,7 +492,7 @@ 
                                                     <i class="fa fa-file-o"></i></a>';
                                     }
                                     } else {
-                                        echo '<h1>' . $lang['noNotes'] . '</h1>';
+                                        echo '<h1>'.$lang['noNotes'].'</h1>';
                                         if ($_SESSION['permissions']['edit']['notes']) {
                                                                                     echo '<a data-toggle="modal" href="#add_note" class="btn btn-primary btn-xs" style="float: right; margin-right:5px; margin-bottom:5px;">
                                                     <i class="fa fa-file-o"></i></a>';
@@ -505,22 +505,22 @@ 
                     <div class="tab-pane fade well" id="wanted">
                         <div class="table-responsive">
                         <?php
-                            $sql = "SELECT `wantedCrimes` FROM `wanted` WHERE `wantedID`='" . $player->playerid . "'";
+                            $sql = "SELECT `wantedCrimes` FROM `wanted` WHERE `wantedID`='".$player->playerid."'";
                             $result_of_query = $db_link->query($sql);
                             if ($result_of_query->num_rows > 0) {
-                                echo "<h3>" . $lang['crimes'] . "</h3>";
+                                echo "<h3>".$lang['crimes']."</h3>";
                                 while ($row = mysqli_fetch_assoc($result_of_query)) {
                                     if ($row['wantedCrimes'] !== "[]") {
                                         $return = stripArray($row['wantedCrimes'], 3);
                                         foreach ($return as $value) {
-                                            echo "<button type='button' id=" . $value . " class='wanted btn btn-xs btn-theme01' style='margin-bottom: 3px;'>" . crimeName($value) . "</button> ";
+                                            echo "<button type='button' id=".$value." class='wanted btn btn-xs btn-theme01' style='margin-bottom: 3px;'>".crimeName($value)."</button> ";
                                         }
                                     } else {
-                                        echo "<h3>" . errorMessage(34, $lang) . "</h3>";
+                                        echo "<h3>".errorMessage(34, $lang)."</h3>";
 
                                     }
                                 }
-                            } else echo "<h3>" . errorMessage(34, $lang) . "</h3>";
+                            } else echo "<h3>".errorMessage(34, $lang)."</h3>";
                         ?>
 
                         </div>
@@ -538,11 +538,11 @@ 
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                 <h4 class="modal-title"><i class="fa fa-pencil"></i>
-                    <?php echo $lang['edit'] . " " . $lang['civ'] . " " . $lang['inventory']; ?>
+                    <?php echo $lang['edit']." ".$lang['civ']." ".$lang['inventory']; ?>
                 </h4>
             </div>
             <?php if ($_SESSION['permissions']['edit']['inventory']) { ?>
-                <form method="post" action="<?php echo $settings['url'] . 'editPlayer/' . $uID; ?>"
+                <form method="post" action="<?php echo $settings['url'].'editPlayer/'.$uID; ?>"
                 <?php echo formtoken::getField() ?>
                       role="form">
                     <div class="modal-body">
@@ -571,11 +571,11 @@ 
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                 <h4 class="modal-title"><i class="fa fa-pencil"></i>
-                    <?php echo $lang['edit'] . " " . $lang['medic'] . " " . $lang['inventory']; ?>
+                    <?php echo $lang['edit']." ".$lang['medic']." ".$lang['inventory']; ?>
                 </h4>
             </div>
             <?php if ($_SESSION['permissions']['edit']['inventory']) { ?>
-                <form method="post" action="<?php echo $settings['url'] . 'editPlayer/' . $uID; ?>"
+                <form method="post" action="<?php echo $settings['url'].'editPlayer/'.$uID; ?>"
                 <?php echo formtoken::getField() ?>
                       role="form">
                     <div class="modal-body">
@@ -604,11 +604,11 @@ 
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                 <h4 class="modal-title"><i class="fa fa-pencil"></i>
-                    <?php echo $lang['edit'] . " " . $lang['police'] . " " . $lang['inventory']; ?>
+                    <?php echo $lang['edit']." ".$lang['police']." ".$lang['inventory']; ?>
                 </h4>
             </div>
             <?php if ($_SESSION['permissions']['edit']['inventory']) { ?>
-                <form method="post" action="<?php echo $settings['url'] . 'editPlayer/' . $uID; ?>"
+                <form method="post" action="<?php echo $settings['url'].'editPlayer/'.$uID; ?>"
                       role="form">
                     <?php echo formtoken::getField() ?>
                     <div class="modal-body">
@@ -637,11 +637,11 @@ 
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                 <h4 class="modal-title"><i class="fa fa-pencil"></i>
-                    <?php echo $lang['new'] . " " . $lang['note']; ?>
+                    <?php echo $lang['new']." ".$lang['note']; ?>
                 </h4>
             </div>
             <?php if ($_SESSION['permissions']['edit']['notes']) { ?>
-                <form method="post" action="<?php echo $settings['url'] . 'editPlayer/' . $uID; ?>" role="form">
+                <form method="post" action="<?php echo $settings['url'].'editPlayer/'.$uID; ?>" role="form">
                     <div class="modal-body">
                         <?php echo formtoken::getField() ?>
                         <div class="form-group">
@@ -670,11 +670,11 @@ 
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                 <h4 class="modal-title"><i class="fa fa-pencil"></i>
-                    <?php echo $lang['edit'] . " " . $lang['player']; ?>
+                    <?php echo $lang['edit']." ".$lang['player']; ?>
                 </h4>
             </div>
             <?php if ($_SESSION['permissions']['edit']['player']) { ?>
-                <form method="post" action="<?php echo $settings['url'] . 'editPlayer/' . $uID; ?>" role="form">
+                <form method="post" action="<?php echo $settings['url'].'editPlayer/'.$uID; ?>" role="form">
                     <div class="modal-body">
                         <?php echo formtoken::getField() ?>
                         <div class="form-group">
@@ -683,42 +683,42 @@ 
                             <div class="row">
                                 <center>
                                     <?php if ($_SESSION['permissions']['edit']['bank']) {
-                                        echo "<h4>" . $lang['cash'] . ":    <input id='player_cash' name='player_cash' type='number' value='" . $player->cash . "'>";
-                                        echo "<h4>" . $lang['bank'] . ":    <input id='player_bank' name='player_bank' type='number' value='" . $player->bankacc . "'>";
+                                        echo "<h4>".$lang['cash'].":    <input id='player_cash' name='player_cash' type='number' value='".$player->cash."'>";
+                                        echo "<h4>".$lang['bank'].":    <input id='player_bank' name='player_bank' type='number' value='".$player->bankacc."'>";
                                     }?>
                                     <?php if ($_SESSION['permissions']['edit']['ranks']) {
-                                        echo "<h4>" . $lang['cop'] . ": ";
+                                        echo "<h4>".$lang['cop'].": ";
                                         echo "<select id='player_coplvl' name='player_coplvl'>";
                                         for ($lvl = 0;
                                                 $lvl <= $settings['maxLevels']['cop'];
                                                 $lvl++) {
-                                            echo '<option value="' . $lvl . '"' . select($lvl, $player->coplevel) . '>' . $lvl . '</option>';
+                                            echo '<option value="'.$lvl.'"'.select($lvl, $player->coplevel).'>'.$lvl.'</option>';
                                         }
                                         echo "</select>";
-                                        echo "<h4>" . $lang['medic'] . ": ";
+                                        echo "<h4>".$lang['medic'].": ";
                                         echo "<select id='player_medlvl' name='player_medlvl'>";
                                         for ($lvl = 0;
                                                 $lvl <= $settings['maxLevels']['medic'];
                                                 $lvl++) {
-                                            echo '<option value="' . $lvl . '"' . select($lvl, $player->mediclevel) . '>' . $lvl . '</option>';
+                                            echo '<option value="'.$lvl.'"'.select($lvl, $player->mediclevel).'>'.$lvl.'</option>';
                                         }
                                         echo "</select>";
 
                                         if ($_SESSION['permissions']['edit']['ignLVL']) {
-                                            echo "<h4>" . $lang['admin'] . ": ";
+                                            echo "<h4>".$lang['admin'].": ";
                                             echo "<select id='player_adminlvl' name='player_adminlvl'>";
                                             for ($lvl = 0;
                                                     $lvl <= $settings['maxLevels']['admin'];
                                                     $lvl++) {
-                                                echo '<option value="' . $lvl . '"' . select($lvl, $player->adminlevel) . '>' . $lvl . '</option>';
+                                                echo '<option value="'.$lvl.'"'.select($lvl, $player->adminlevel).'>'.$lvl.'</option>';
                                             }
                                             echo "</select>";
-                                            echo "<h4>" . $lang['donator'] . ": ";
+                                            echo "<h4>".$lang['donator'].": ";
                                             echo "<select id='player_donlvl' name='player_donlvl'>";
                                             for ($lvl = 0;
                                                     $lvl <= $settings['maxLevels']['donator'];
                                                     $lvl++) {
-                                                echo '<option value="' . $lvl . '"' . select($lvl, $player->$settings['donorFormat']) . '>' . $lvl . '</option>';
+                                                echo '<option value="'.$lvl.'"'.select($lvl, $player->$settings['donorFormat']).'>'.$lvl.'</option>';
                                             }
                                             echo "</select>";
                                         }
@@ -732,7 +732,7 @@ 
                         <button class="btn btn-primary" type="submit"><?php echo $lang['subChange']; ?></button>
                     </div>
                 </form>
-            <?php } else "<h1>" . errorMessage(5, $lang) . "/<h1>"; ?>
+            <?php } else "<h1>".errorMessage(5, $lang)."/<h1>"; ?>
         </div>
     </div>
 </div>
@@ -778,4 +778,4 @@ 
 });
 </script>
 
-<?php } else echo "<h1>" . errorMessage(36, $lang) . "</h1>";
\ No newline at end of file
+<?php } else echo "<h1>".errorMessage(36, $lang)."</h1>";
\ No newline at end of file

Braces +72 added lines, -22 removed lines

@@ -61,12 +61,24 @@ 
                     if ($result->num_rows > 0) {
                         $player = $result->fetch_object();
 
-                        if ($coplevel != $player->coplevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cop'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->coplevel . ") " . $lang['to'] . " (" . $coplevel . ")", 2);
-                        if ($mediclevel != $player->mediclevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['medic'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->mediclevel . ") " . $lang['to'] . " (" . $mediclevel . ")", 2);
-                        if ($donorlevel != $player->$settings['donorFormat']) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['donator'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->$settings['donorFormat'] . ") " . $lang['to'] . " (" . $donorlevel . ")", 2);
-                        if ($adminlevel != $player->adminlevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['admin'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->adminlevel . ") " . $lang['to'] . " (" . $adminlevel . ")", 2);
-                        if ($cash != $player->cash) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cash'] . " " . $lang['from'] . " (" . $player->cash . ") " . $lang['to'] . " (" . $cash . ")", 2);
-                        if ($bankacc != $player->bankacc) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['bank'] . " " . $lang['from'] . " (" . $player->bankacc . ") " . $lang['to'] . " (" . $bankacc . ")", 2);
+                        if ($coplevel != $player->coplevel) {
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cop'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->coplevel . ") " . $lang['to'] . " (" . $coplevel . ")", 2);
+                        }
+                        if ($mediclevel != $player->mediclevel) {
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['medic'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->mediclevel . ") " . $lang['to'] . " (" . $mediclevel . ")", 2);
+                        }
+                        if ($donorlevel != $player->$settings['donorFormat']) {
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['donator'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->$settings['donorFormat'] . ") " . $lang['to'] . " (" . $donorlevel . ")", 2);
+                        }
+                        if ($adminlevel != $player->adminlevel) {
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['admin'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->adminlevel . ") " . $lang['to'] . " (" . $adminlevel . ")", 2);
+                        }
+                        if ($cash != $player->cash) {
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cash'] . " " . $lang['from'] . " (" . $player->cash . ") " . $lang['to'] . " (" . $cash . ")", 2);
+                        }
+                        if ($bankacc != $player->bankacc) {
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['bank'] . " " . $lang['from'] . " (" . $player->bankacc . ") " . $lang['to'] . " (" . $bankacc . ")", 2);
+                        }
 
                         $update = "UPDATE `players` SET coplevel = '" . $coplevel . "', mediclevel = '" . $mediclevel . "', ".$settings['donorFormat']."= '" . $donorlevel . "', adminlevel = '" . $adminlevel . "', cash = '" . $cash . "', bankacc = '" . $bankacc . "' WHERE `uid` = '" . $uID . "' ";
                         $result_of_query = $db_link->query($update);
@@ -87,11 +99,21 @@ 
                         if (is_null($donorlevel)) {
                             $donorlevel = $player->$settings['donorFormat'];
                         }
-                        if ($coplevel != $player->coplevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cop'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->coplevel . ") " . $lang['to'] . " (" . $coplevel . ")", 2);
-                        if ($mediclevel != $player->mediclevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['medic'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->mediclevel . ") " . $lang['to'] . " (" . $mediclevel . ")", 2);
-                        if ($donorlevel != $player->$settings['donorFormat']) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['donator'] . " " . $lang['level'] . " " . $lang['from'] . " (" .$player->$settings['donorFormat'] . ") " . $lang['to'] . " (" . $donorlevel . ")", 2);
-                        if ($cash != $player->cash) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cash'] . " " . $lang['from'] . " (" . $player->cash . ") " . $lang['to'] . " (" . $cash . ")", 2);
-                        if ($bankacc != $player->bankacc) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['bank'] . " " . $lang['from'] . " (" . $player->bankacc . ") " . $lang['to'] . " (" . $bankacc . ")", 2);
+                        if ($coplevel != $player->coplevel) {
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cop'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->coplevel . ") " . $lang['to'] . " (" . $coplevel . ")", 2);
+                        }
+                        if ($mediclevel != $player->mediclevel) {
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['medic'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->mediclevel . ") " . $lang['to'] . " (" . $mediclevel . ")", 2);
+                        }
+                        if ($donorlevel != $player->$settings['donorFormat']) {
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['donator'] . " " . $lang['level'] . " " . $lang['from'] . " (" .$player->$settings['donorFormat'] . ") " . $lang['to'] . " (" . $donorlevel . ")", 2);
+                        }
+                        if ($cash != $player->cash) {
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cash'] . " " . $lang['from'] . " (" . $player->cash . ") " . $lang['to'] . " (" . $cash . ")", 2);
+                        }
+                        if ($bankacc != $player->bankacc) {
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['bank'] . " " . $lang['from'] . " (" . $player->bankacc . ") " . $lang['to'] . " (" . $bankacc . ")", 2);
+                        }
 
                         $update = "UPDATE `players` SET coplevel = '" . $coplevel . "', mediclevel = '" . $mediclevel . "', ".$settings['donorFormat']."= '" . $donorlevel . "', cash = '" . $cash . "', bankacc = '" . $bankacc . "' WHERE `uid` = '" . $uID . "' ";
                         $result_of_query = $db_link->query($update);
@@ -103,8 +125,12 @@ 
                 } elseif ($_SESSION['user_level'] >= 2) {
                     $coplevel = intval($_POST["player_coplvl"]);
                     $mediclevel = intval($_POST["player_medlvl"]);
-                    if ($coplevel != $player->coplevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cop'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->coplevel . ") " . $lang['to'] . " (" . $coplevel . ")", 2);
-                    if ($mediclevel != $player->mediclevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['medic'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->mediclevel . ") " . $lang['to'] . " (" . $mediclevel . ")", 2);
+                    if ($coplevel != $player->coplevel) {
+                        logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cop'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->coplevel . ") " . $lang['to'] . " (" . $coplevel . ")", 2);
+                    }
+                    if ($mediclevel != $player->mediclevel) {
+                        logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['medic'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->mediclevel . ") " . $lang['to'] . " (" . $mediclevel . ")", 2);
+                    }
 
                     $update = "UPDATE `players` SET coplevel = '" . $coplevel . "', mediclevel = '" . $mediclevel . "' WHERE `uid` = '" . $uID . "' ";
                     $result_of_query = $db_link->query($update);
@@ -410,7 +436,10 @@ 
                                     </tbody>
                                 </table>
                                 <?php echo '<a style="float: right;" href="' . $settings['url'] . 'houses/' . $player->playerid . '"><h4>' . $lang['more'] . ' <i class="fa fa-arrow-circle-right"></i></h4></a>';
-                            } else echo '<h4>' . errorMessage(31, $lang) . '</h4>'; ?>
+                            } else {
+                                echo '<h4>' . errorMessage(31, $lang) . '</h4>';
+                            }
+                            ?>
                         </div>
                     </div>
                 <?php } if ($_SESSION['permissions']['view']['vehicles'] || $player->playerid == $_SESSION['playerid']) { ?>
@@ -455,7 +484,9 @@ 
                                 echo '</tr></tbody></table>';
                                 echo '<a style="float: right; padding-right:15px;" href="' . $settings['url'] . 'vehicles/' . $player->playerid . '"><h4>' . $lang['more'] . ' <i class="fa fa-arrow-circle-right"></i></h4></a>';
 
-                            } else echo '<h4>' . errorMessage(32, $lang) . '</h4>';
+                            } else {
+                                echo '<h4>' . errorMessage(32, $lang) . '</h4>';
+                            }
                         ?>
                         </div>
                     </div>
@@ -520,7 +551,9 @@ 
 
                                     }
                                 }
-                            } else echo "<h3>" . errorMessage(34, $lang) . "</h3>";
+                            } else {
+                                echo "<h3>" . errorMessage(34, $lang) . "</h3>";
+                            }
                         ?>
 
                         </div>
@@ -560,7 +593,10 @@ 
                         <button class="btn btn-primary" type="submit"><?php echo $lang['subChange']; ?></button>
                     </div>
                 </form>
-            <?php } else errorMessage(5, $lang); ?>
+            <?php } else {
+    errorMessage(5, $lang);
+}
+?>
         </div>
     </div>
 </div>
@@ -593,7 +629,10 @@ 
                         <button class="btn btn-primary" type="submit"><?php echo $lang['subChange']; ?></button>
                     </div>
                 </form>
-            <?php } else errorMessage(5, $lang); ?>
+            <?php } else {
+    errorMessage(5, $lang);
+}
+?>
         </div>
     </div>
 </div>
@@ -626,7 +665,10 @@ 
                         <button class="btn btn-primary" type="submit"><?php echo $lang['subChange']; ?></button>
                     </div>
                 </form>
-            <?php } else errorMessage(5, $lang); ?>
+            <?php } else {
+    errorMessage(5, $lang);
+}
+?>
         </div>
     </div>
 </div>
@@ -659,7 +701,10 @@ 
                         <button class="btn btn-primary" type="submit"><?php echo $lang['subChange']; ?></button>
                     </div>
                 </form>
-            <?php } else errorMessage(5, $lang); ?>
+            <?php } else {
+    errorMessage(5, $lang);
+}
+?>
         </div>
     </div>
 </div>
@@ -732,7 +777,10 @@ 
                         <button class="btn btn-primary" type="submit"><?php echo $lang['subChange']; ?></button>
                     </div>
                 </form>
-            <?php } else "<h1>" . errorMessage(5, $lang) . "/<h1>"; ?>
+            <?php } else {
+    "<h1>" . errorMessage(5, $lang) . "/<h1>";
+}
+?>
         </div>
     </div>
 </div>
@@ -778,4 +826,6 @@ 
 });
 </script>
 
-<?php } else echo "<h1>" . errorMessage(36, $lang) . "</h1>";
\ No newline at end of file
+<?php } else {
+    echo "<h1>" . errorMessage(36, $lang) . "</h1>";
+}

views/life/players.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 +21 added lines, -21 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 . "';";
+    $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;
-    $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);
+    $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;
-    $sql = "SELECT `playerid`,`name`,`bankacc`,`cash`,`coplevel`,`mediclevel`,`adminlevel`,`uid` FROM `players` " . $max . " ;";
+    $sql = "SELECT `playerid`,`name`,`bankacc`,`cash`,`coplevel`,`mediclevel`,`adminlevel`,`uid` FROM `players` ".$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);
@@ -57,9 +57,9 @@ 
                     <th class="hidden-xs"><i class="fa fa-ambulance"></i> <?php echo $lang['medic']; ?></th>
                     <th class="hidden-xs"><i class="fa fa-cogs"></i> <?php echo $lang['admin']; ?></th>
                     <?php if ($_SESSION['permissions']['edit']['player']) {
-                            echo '<th class="hidden-xs"><i class="fa fa-pencil"></i> ' . $lang['edit'] . '</th>';
+                            echo '<th class="hidden-xs"><i class="fa fa-pencil"></i> '.$lang['edit'].'</th>';
                         } else {
-                            echo '<th class="hidden-xs"><i class="fa fa-eye"></i>' . $lang['view'] . '</th>';
+                            echo '<th class="hidden-xs"><i class="fa fa-eye"></i>'.$lang['view'].'</th>';
                         }
                     if ($_SESSION['permissions']['view']['steam'] && $steamPlayers > 0) {
                         echo '<th class="hidden-xs"><i class="fa fa-fw fa-steam"></i> Steam</th>';
@@ -71,30 +71,30 @@ 
                 while ($row = mysqli_fetch_assoc($result_of_query)) {
                     $playersID = $row["playerid"];
                     echo "<tr>";
-                    echo "<td>" . $row["name"] . "</td>";
-                    echo "<td>" . $playersID . "</td>";
-                    echo "<td class='hidden-xs'>" . $row["cash"] . "</td>";
-                    echo "<td class='hidden-xs'>" . $row["bankacc"] . "</td>";
-                    echo "<td class='hidden-xs'>" . $row["coplevel"] . "</td>";
-                    echo "<td class='hidden-xs'>" . $row["mediclevel"] . "</td>";
-                    echo "<td class='hidden-xs'>" . $row["adminlevel"] . "</td>";
+                    echo "<td>".$row["name"]."</td>";
+                    echo "<td>".$playersID."</td>";
+                    echo "<td class='hidden-xs'>".$row["cash"]."</td>";
+                    echo "<td class='hidden-xs'>".$row["bankacc"]."</td>";
+                    echo "<td class='hidden-xs'>".$row["coplevel"]."</td>";
+                    echo "<td class='hidden-xs'>".$row["mediclevel"]."</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>"; }
                             }
                         }
@@ -107,4 +107,4 @@ 
                 ?>
         </div>
 <?php
-} else echo '<h3>' . errorMessage(36, $lang) . '</h3>';
+} else echo '<h3>'.errorMessage(36, $lang).'</h3>';