Cyberbyte-Studios / CyberWorks

hooks/rcon_players.php

Braces +4 added lines, -3 removed lines

@@ -18,7 +18,9 @@ 
             $array = preg_split('/$\R?^/m', $out);
             $playersr = array();
 
-            if ($array[0] == '(0 players in total')  $array = array();
+            if ($array[0] == '(0 players in total') {
+                $array = array();
+            }
 
             for ($i = 0; $i < count($array); $i++)
             {
@@ -27,8 +29,7 @@ 
 
             echo json_encode($playersr);
 
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             echo $e->getMessage( );
             var_dump($e);

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 if (isset($_GET['sid'])) {
     $sid = clean($_GET['sid'], "int");
     $db_connection = masterConnect();
-    $sql = "SELECT `sq_ip`,`sq_port`,`rcon_pass` FROM `servers` WHERE `use_sq` = 1 AND `sid` = " . $sid . ";";
+    $sql = "SELECT `sq_ip`,`sq_port`,`rcon_pass` FROM `servers` WHERE `use_sq` = 1 AND `sid` = ".$sid.";";
     $result_of_query = $db_connection->query($sql);
     if ($result_of_query->num_rows == 1) {
         $server = $result_of_query->fetch_object();

hooks/rcon_command.php

Braces +1 added lines, -2 removed lines

@@ -20,8 +20,7 @@
             try
             {
                 $answer = rcon(decrypt($server->sq_ip), decrypt($server->sq_port), decrypt($server->rcon_pass), $cmd);
-            }
-            catch (Exception $e)
+            } catch (Exception $e)
             {
                 echo $e->getMessage( );
             }

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
         $rid = clean($_POST['id'], "int");
         $cmd = clean($_POST['command'], "string");
 
-        $sql = "SELECT * FROM `servers` WHERE `use_sq` = 1 AND `sid` = " . $sid . ";";
+        $sql = "SELECT * FROM `servers` WHERE `use_sq` = 1 AND `sid` = ".$sid.";";
         $result_of_query = $db_connection->query($sql);
         if ($result_of_query->num_rows == 1) {
             $server = $result_of_query->fetch_object();

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);
 

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/editHouse.php

Braces +4 added lines, -1 removed lines

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

Spacing +32 added lines, -32 removed lines

@@ -6,37 +6,37 @@ 
     switch ($_POST["editType"]) {
         case "house_inv":
             $hInv = $_POST["hInv"];
-            $sql = "UPDATE `houses` SET `inventory`='" . $hInv . "' WHERE `houses`.`id` = '" . $hID . "'";
+            $sql = "UPDATE `houses` SET `inventory`='".$hInv."' WHERE `houses`.`id` = '".$hID."'";
             $db_link->query($sql);
-            message($lang['house'] . ' ' . $lang['updated']);
+            message($lang['house'].' '.$lang['updated']);
             break;
 
         case "house_cont":
             $hCont = $_POST["hCont"];
-            $sql = "UPDATE `houses` SET `containers`='" . $hCont . "' WHERE `houses`.`id` = '" . $hID . "'";
+            $sql = "UPDATE `houses` SET `containers`='".$hCont."' WHERE `houses`.`id` = '".$hID."'";
             $db_link->query($sql);
-            message($lang['house'] . ' ' . $lang['updated']);
+            message($lang['house'].' '.$lang['updated']);
             break;
 
         case "house_del":
-            $sql = "DELETE FROM `houses` WHERE `houses`.`id` = '" . $hID . "'";
+            $sql = "DELETE FROM `houses` WHERE `houses`.`id` = '".$hID."'";
             $db_link->query($sql);
-            header("location: " . $settings['url'] . "houses");
+            header("location: ".$settings['url']."houses");
             break;
 
         case "house_details":
             $hPos = $_POST["hPos"];
             $hOwn = $_POST["hOwn"];
             $hOwned = $_POST["hOwned"];
-            $sql = "UPDATE `houses` SET `pid`='" . $hOwn . "',`pos`='" . $hPos . "',`owned`='" . $hOwned . "' WHERE `id` = '" . $hID . "'";
+            $sql = "UPDATE `houses` SET `pid`='".$hOwn."',`pos`='".$hPos."',`owned`='".$hOwned."' WHERE `id` = '".$hID."'";
             $db_link->query($sql);
-            message($lang['house'] . ' ' . $lang['updated']);
+            message($lang['house'].' '.$lang['updated']);
             break;
         }
     }
 }
 
-$sql = "SELECT * FROM `houses` WHERE `id` ='" . $hID . "';";
+$sql = "SELECT * FROM `houses` WHERE `id` ='".$hID."';";
 $result_of_query = $db_link->query($sql);
 if ($result_of_query->num_rows > 0) {
     $house = $result_of_query->fetch_object();
@@ -45,15 +45,15 @@ 
     <div class="panel panel-default">
         <div class="panel-heading">
             <h2 class="panel-title"><i
-                    class="fa fa-child fa-fw"></i><?php echo nameID($house->pid, $db_link) . "'s " . $lang['house']; ?>
+                    class="fa fa-child fa-fw"></i><?php echo nameID($house->pid, $db_link)."'s ".$lang['house']; ?>
             </h2>
         </div>
         <div class="panel-body">
             <?php
-            echo '<center><img class="img-responsive" src="' . $settings['url'] . 'assets/img/house/1.jpg"/>';
+            echo '<center><img class="img-responsive" src="'.$settings['url'].'assets/img/house/1.jpg"/>';
 
-            echo "<h4>" . $lang['owner'] . ": <a href='" . $settings['url'] . "editPlayer/" . uID($house->pid, $db_link) . "'>" . nameID($house->pid, $db_link) . "</a></h4>";
-            echo "<h4>" . $lang['position'] . ": " . $house->pos . "</h4>";
+            echo "<h4>".$lang['owner'].": <a href='".$settings['url']."editPlayer/".uID($house->pid, $db_link)."'>".nameID($house->pid, $db_link)."</a></h4>";
+            echo "<h4>".$lang['position'].": ".$house->pos."</h4>";
 
             if ($_SESSION['permissions']['edit']['houses']) {
                 echo '
@@ -76,15 +76,15 @@ 
     <?php
     echo '<div class="panel panel-default" style="float:left; width:100%; margin:0 auto;">';
     echo '<ul id="myTab" class="nav nav-tabs">';
-    echo '<li><a href="#house_inv" data-toggle="tab">' . $lang['inventory'] . '</a></li>';
-    echo '<li><a href="#house_cont" data-toggle="tab">' . $lang['containers'] . '</a></li>';
+    echo '<li><a href="#house_inv" data-toggle="tab">'.$lang['inventory'].'</a></li>';
+    echo '<li><a href="#house_cont" data-toggle="tab">'.$lang['containers'].'</a></li>';
     echo '</ul>';
     ?>
     <div id="myTabContent" class="tab-content">
         <div class="tab-pane fade active in well" id="house_inv">
-            <h4 style="centred"><?php echo $lang['house'] . " " . $lang['inventory']; ?> </h4>
+            <h4 style="centred"><?php echo $lang['house']." ".$lang['inventory']; ?> </h4>
             <?php
-                echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='civ_gear' name='civ_gear'>" . $house->inventory . "</textarea>";
+                echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='civ_gear' name='civ_gear'>".$house->inventory."</textarea>";
             ?>
             <br>
             <?php if ($_SESSION['permissions']['edit']['houses']) { ?>
@@ -95,9 +95,9 @@ 
             <br>
         </div>
         <div class="tab-pane fade well" id="house_cont">
-            <h4 style="centred"><?php echo $lang['house'] . " " . $lang['containers']; ?> </h4>
+            <h4 style="centred"><?php echo $lang['house']." ".$lang['containers']; ?> </h4>
             <?php
-                echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='house_cont' name='house_cont'>" . $house->containers . "</textarea>";
+                echo "<textarea class='form-control' readonly rows='5' style='width: 100%' id='house_cont' name='house_cont'>".$house->containers."</textarea>";
             ?>
             <br>
             <?php if ($_SESSION['permissions']['edit']['houses']) { ?>
@@ -116,10 +116,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['house'] . " " . $lang['inventory'] ?>
+                <h4 class="modal-title"><span class="glyphicon glyphicon-pencil"></span><?php echo $lang['edit']." ".$lang['house']." ".$lang['inventory'] ?>
                 </h4>
             </div>
-                <form method="post" action="<?php echo $settings['url'] . "editHouse/" . $hID ?>" role="form">
+                <form method="post" action="<?php echo $settings['url']."editHouse/".$hID ?>" role="form">
                     <div class="modal-body">
                         <div class="form-group">
                             <input type="hidden" name="editType" value="house_inv"/>
@@ -146,10 +146,10 @@ 
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                 <h4 class="modal-title">
                     <span
-                        class="glyphicon glyphicon-pencil"></span> <?php echo $lang['edit'] . " " . $lang['house'] . " " . $lang['containers'] ?>
+                        class="glyphicon glyphicon-pencil"></span> <?php echo $lang['edit']." ".$lang['house']." ".$lang['containers'] ?>
                 </h4>
             </div>
-                <form method="post" action="<?php echo $settings['url'] . "editHouse/" . $hID ?>" role="form">
+                <form method="post" action="<?php echo $settings['url']."editHouse/".$hID ?>" role="form">
                     <div class="modal-body">
                         <div class="form-group">
                             <input type="hidden" name="editType" value="house_cont"/>
@@ -173,10 +173,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['delete'] . " " . $lang['house'] ?>
+                <h4 class="modal-title"><span class="glyphicon glyphicon-pencil"></span> <?php echo $lang['delete']." ".$lang['house'] ?>
                 </h4>
             </div>
-            <form method="post" action="<?php echo $settings['url'] . "editHouse/" . $hID ?>" role="form">
+            <form method="post" action="<?php echo $settings['url']."editHouse/".$hID ?>" role="form">
                 <div class="modal-body">
                     <div class="form-group">
                         <input type="hidden" name="editType" value="house_del"/>
@@ -201,10 +201,10 @@ 
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
                 <h4 class="modal-title">
-                    <span class="glyphicon glyphicon-pencil"></span> <?php echo $lang['edit'] . " " . $lang['house'] ?>
+                    <span class="glyphicon glyphicon-pencil"></span> <?php echo $lang['edit']." ".$lang['house'] ?>
                 </h4>
             </div>
-                <form method="post" action="<?php echo $settings['url'] . "editHouse/" . $hID ?>" role="form">
+                <form method="post" action="<?php echo $settings['url']."editHouse/".$hID ?>" role="form">
                     <div class="modal-body">
                         <div class="form-group">
                             <input type="hidden" name="editType" value="house_details"/>
@@ -212,12 +212,12 @@ 
                             <div class="row">
                                 <center>
                                     <?php
-                                    echo "<h4>" . $lang['owner'] . ": <input id='hOwn' name='hOwn' type='text' value='" . $house->pid . "'></td><br/>";
-                                    echo "<h4>" . $lang['position'] . ": <input id='hPos' name='hPos' type='text' value='" . $house->pos . "'readonly></td><br/>";
-                                    echo "<h4>" . $lang['owned'] . ":  ";
+                                    echo "<h4>".$lang['owner'].": <input id='hOwn' name='hOwn' type='text' value='".$house->pid."'></td><br/>";
+                                    echo "<h4>".$lang['position'].": <input id='hPos' name='hPos' type='text' value='".$house->pos."'readonly></td><br/>";
+                                    echo "<h4>".$lang['owned'].":  ";
                                     echo "<select id='hOwned' name='hOwned'>";
-                                    echo '<option value="0"' . select('0', $house->owned) . '>' . $lang['no'] . '</option>';
-                                    echo '<option value="1"' . select('1', $house->owned) . '>' . $lang['yes'] . '</option>';
+                                    echo '<option value="0"'.select('0', $house->owned).'>'.$lang['no'].'</option>';
+                                    echo '<option value="1"'.select('1', $house->owned).'>'.$lang['yes'].'</option>';
                                     echo "</select>";
                                     echo "</center>";
                                     ?>

views/life/houses.php

Braces +3 added lines, -1 removed lines

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

Spacing +7 added lines, -7 removed lines

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