Cyberbyte-Studios / CyberWorks

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

classes/googleAuth.php

Indentation +7 added lines, -7 removed lines

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

Spacing +3 added lines, -3 removed lines

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

views/core/editStaff.php

Indentation +16 added lines, -16 removed lines

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

Braces +18 added lines, -6 removed lines

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

Spacing +44 added lines, -44 removed lines

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

views/core/staff.php

Indentation +2 added lines, -2 removed lines

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

Spacing +13 added lines, -13 removed lines

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

Braces +9 added lines, -3 removed lines

@@ -5,14 +5,18 @@ 
     $sql = "SELECT * FROM `users` WHERE `user_name` LIKE '%" . $search . "%' OR `user_email` LIKE '" . $search . "' OR `user_id` LIKE '" . $search . "' OR `playerid` LIKE '%" . $search . "%';";
     $result_of_query = $db_connection->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
-    if ($pageNum > $total_records) $pageNum = $total_records;
+    if ($pageNum > $total_records) {
+        $pageNum = $total_records;
+    }
     $sql = "SELECT * FROM `users` WHERE `user_name` LIKE '%" . $search . "%' OR `user_email` LIKE '" . $search . "' OR `user_id` LIKE '" . $search . "' OR `playerid` LIKE '%" . $search . "%'" . $max . " ;";
     logAction($_SESSION['user_name'], $lang['searched'] . ' (' . $search . ') ' . $lang['in'] . ' ' . $lang['users'], 1);
 } else {
     $sql = "SELECT `user_name` FROM `users`;";
     $result_of_query = $db_connection->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
-    if ($pageNum > $total_records) $pageNum = $total_records;
+    if ($pageNum > $total_records) {
+        $pageNum = $total_records;
+    }
     $sql = "SELECT * FROM `users` ORDER BY `user_level` DESC " . $max . " ;";
 }
 $result_of_query = $db_connection->query($sql);
@@ -72,4 +76,6 @@ 
             ?>
     </div>
     <?php
-} else echo '<h3>' . errorMessage(36, $lang) . '</h3>';
\ No newline at end of file
+} else {
+    echo '<h3>' . errorMessage(36, $lang) . '</h3>';
+}

views/life/editGang.php

Spacing +29 added lines, -29 removed lines

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