Cyberbyte-Studios / CyberWorks

gfunctions.php

Doc Comments +3 added lines

@@ -286,6 +286,9 @@
     return substr(str_shuffle('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'), 0, $length);
 }
 
+/**
+ * @param integer $type
+ */
 function stripArray($input, $type)
 {
     switch ($type) {

Spacing +17 added lines, -17 removed lines

@@ -174,12 +174,12 @@ 
     echo "<br><div class='row'><div class='col-lg-12'>";
     echo "<div class='alert alert-danger alert-dismissable'>";
     echo "<button type='button' class='close' data-dismiss='alert' aria-hidden='true'>&times;</button>";
-    echo "<i class='fa fa-info-circle'></i> " . $text . "</div></div></div>";
+    echo "<i class='fa fa-info-circle'></i> ".$text."</div></div></div>";
 }
 
 function error($errno, $errstr, $errfile, $errline)
 {
-    echo '<h4><b>PHP ERROR ' . $errno . '</b> ' . $errstr . ' - ' . $errfile . ':' . $errline . '</h4>';
+    echo '<h4><b>PHP ERROR '.$errno.'</b> '.$errstr.' - '.$errfile.':'.$errline.'</h4>';
 }
 
 /**
@@ -226,19 +226,19 @@ 
         case 37:
             return $lang['noLic']; //No License
         case 371:
-            return $lang['no'] . ' ' . $lang['civil'] . ' ' . $lang['licenses']; //No Civillian Licenses
+            return $lang['no'].' '.$lang['civil'].' '.$lang['licenses']; //No Civillian Licenses
         case 372:
-            return $lang['no'] . ' ' . $lang['medic'] . ' ' . $lang['licenses']; //No Medic Licenses
+            return $lang['no'].' '.$lang['medic'].' '.$lang['licenses']; //No Medic Licenses
         case 373:
-            return $lang['no'] . ' ' . $lang['police'] . ' ' . $lang['licenses']; //No Police Licenses
+            return $lang['no'].' '.$lang['police'].' '.$lang['licenses']; //No Police Licenses
         case 38:
-            return $lang['no'] . ' ' . $lang['gear']; //No License
+            return $lang['no'].' '.$lang['gear']; //No License
         case 381:
-            return $lang['no'] . ' ' . $lang['civil'] . ' ' . $lang['gear']; //No Civillian Licenses
+            return $lang['no'].' '.$lang['civil'].' '.$lang['gear']; //No Civillian Licenses
         case 382:
-            return $lang['no'] . ' ' . $lang['medic'] . ' ' . $lang['gear']; //No Medic Licenses
+            return $lang['no'].' '.$lang['medic'].' '.$lang['gear']; //No Medic Licenses
         case 383:
-            return $lang['no'] . ' ' . $lang['police'] . ' ' . $lang['gear']; //No Police Licenses
+            return $lang['no'].' '.$lang['police'].' '.$lang['gear']; //No Police Licenses
     }
 }
 
@@ -247,7 +247,7 @@ 
     $max = ceil($length / 40);
     $random = '';
     for ($i = 0; $i < $max; $i++) {
-        $random .= sha1(microtime(true) . mt_rand(10000, 90000));
+        $random .= sha1(microtime(true).mt_rand(10000, 90000));
     }
     return substr($random, 0, $length);
 }
@@ -256,7 +256,7 @@ 
 {
     $settings = require('config/settings.php');
     if (!empty($settings['steamAPI'])) {
-        $api = "http://api.steampowered.com/ISteamUser/GetPlayerBans/v1/?key=" . $settings['steamAPI'] . "&steamids=" . $PID;
+        $api = "http://api.steampowered.com/ISteamUser/GetPlayerBans/v1/?key=".$settings['steamAPI']."&steamids=".$PID;
         $bans = json_decode(file_get_contents($api), true);
         if ($bans['players']['0']['VACBanned']) {
             return '<h4><span class="label label-danger" style="margin-left:3px; line-height:2;">VAC BANNED</span></h4>';
@@ -356,14 +356,14 @@ 
     }
 }
 
-function getGravatar($email, $s = 80, $d = 'mm', $r = 'x', $img = false, $atts = array() ) {
+function getGravatar($email, $s = 80, $d = 'mm', $r = 'x', $img = false, $atts = array()) {
     $url = 'https://www.gravatar.com/avatar/';
-    $url .= md5( strtolower( trim( $email ) ) );
+    $url .= md5(strtolower(trim($email)));
     $url .= "?s=$s&d=$d&r=$r";
-    if ( $img ) {
-        $url = '<img src="' . $url . '"';
-        foreach ( $atts as $key => $val )
-            $url .= ' ' . $key . '="' . $val . '"';
+    if ($img) {
+        $url = '<img src="'.$url.'"';
+        foreach ($atts as $key => $val)
+            $url .= ' '.$key.'="'.$val.'"';
         $url .= ' />';
     }
     return $url;

Braces +3 added lines, -2 removed lines

@@ -362,8 +362,9 @@
     $url .= "?s=$s&d=$d&r=$r";
     if ( $img ) {
         $url = '<img src="' . $url . '"';
-        foreach ( $atts as $key => $val )
-            $url .= ' ' . $key . '="' . $val . '"';
+        foreach ( $atts as $key => $val ) {
+                    $url .= ' ' . $key . '="' . $val . '"';
+        }
         $url .= ' />';
     }
     return $url;

index.php

Spacing +58 added lines, -58 removed lines

@@ -37,8 +37,8 @@ 
     }
 
     foreach ($settings['plugins'] as &$plugin) {
-        if (file_exists("plugins/" . $plugin . "/lang/lang.php")) {
-            include("plugins/" . $plugin . "/lang/lang.php");
+        if (file_exists("plugins/".$plugin."/lang/lang.php")) {
+            include("plugins/".$plugin."/lang/lang.php");
         }
     }
 
@@ -81,9 +81,9 @@ 
 
     $key = 0;
     foreach ($settings['plugins'] as &$plugin) {
-        if (file_exists("plugins/" . $plugin . "/plugin.json")) {
-            if (file_exists("plugins/" . $plugin . "/init.php")) {
-                include("plugins/" . $plugin . "/init.php");
+        if (file_exists("plugins/".$plugin."/plugin.json")) {
+            if (file_exists("plugins/".$plugin."/init.php")) {
+                include("plugins/".$plugin."/init.php");
             }
         } else {
             if (array_count_values($settings['plugins']) <= 1) {
@@ -112,8 +112,8 @@ 
             $_SESSION['formtoken'][1] = time();
 
             if (isset($_GET['items'])) {
-                if (in_array($_GET['items'],$settings['item'])) {
-                    $sql = "UPDATE `users` SET `items` = " . $_GET['items'] . " WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
+                if (in_array($_GET['items'], $settings['item'])) {
+                    $sql = "UPDATE `users` SET `items` = ".$_GET['items']." WHERE `user_id` = '".$_SESSION['user_id']."';";
                     $db_connection->query($sql);
                     $_SESSION['items'] = intval($_GET['items']);
                 }
@@ -163,12 +163,12 @@ 
                                 if ($query) {
                                     $search = $url['path'][$settings['base'] + 1];
                                 }
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
                                 $page = "views/life/messages.php";
                             } else {
                                 $err = errorMessage(5, $lang);
                                 $page = "views/templates/error.php";
-                                logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'messages'", 3);
+                                logAction($_SESSION['user_name'], $lang['failedAccess']." 'messages'", 3);
                             }
                         }
 
@@ -177,19 +177,19 @@ 
                             if ($query) {
                                 $search = $url['path'][$settings['base'] + 1];
                             }
-                            logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
+                            logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
                             $page = "views/life/players.php";
                         } else {
                             $err = errorMessage(5, $lang);
                             $page = "views/templates/error.php";
-                            logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'players'", 3);
+                            logAction($_SESSION['user_name'], $lang['failedAccess']." 'players'", 3);
                         }
 
                     } elseif ($currentPage == 'editplayer') {
                         if ($_SESSION['permissions']['edit']['player']) {
                             if ($query) {
                                 $uID = $url['path'][$settings['base'] + 1];
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
                                 $page = "views/life/editPlayer.php";
                             } else {
                                 $err = errorMessage(8, $lang);
@@ -205,19 +205,19 @@ 
                             if ($query) {
                                 $search = $url['path'][$settings['base'] + 1];
                             }
-                            logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
+                            logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
                             $page = "views/life/vehicles.php";
                         } else {
                             $err = errorMessage(5, $lang);
                             $page = "views/templates/error.php";
-                            logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'vehicles'", 3);
+                            logAction($_SESSION['user_name'], $lang['failedAccess']." 'vehicles'", 3);
                         }
 
                     } elseif ($currentPage == 'editveh') {
                         if ($_SESSION['permissions']['edit']['vehicles']) {
                             if ($query) {
                                 $vehID = $url['path'][$settings['base'] + 1];
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
                                 $page = "views/life/editVeh.php";
                             } else {
                                 $err = errorMessage(8, $lang);
@@ -226,7 +226,7 @@ 
                         } else {
                             $err = errorMessage(5, $lang);
                             $page = "views/templates/error.php";
-                            logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'editVeh'", 3);
+                            logAction($_SESSION['user_name'], $lang['failedAccess']." 'editVeh'", 3);
                         }
 
                     } elseif ($currentPage == 'medic') {
@@ -234,7 +234,7 @@ 
                             if ($query) {
                                 $search = $url['path'][$settings['base'] + 1];
                             }
-                            logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
+                            logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
                             $page = "views/life/medics.php";
                         }
                     } elseif ($currentPage == 'admins') {
@@ -242,7 +242,7 @@ 
                             if ($query) {
                                 $search = $url['path'][$settings['base'] + 1];
                             }
-                            logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
+                            logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
                             $page = "views/life/admins.php";
                         }
                     }  elseif ($currentPage == 'police') {
@@ -250,12 +250,12 @@ 
                             if ($query) {
                                 $search = $url['path'][$settings['base'] + 1];
                             }
-                            logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
+                            logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
                             $page = "views/life/police.php";
                         } else {
                             $err = errorMessage(5, $lang);
                             $page = "views/templates/error.php";
-                            logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'houses'", 3);
+                            logAction($_SESSION['user_name'], $lang['failedAccess']." 'houses'", 3);
                         }
 
                     } elseif ($currentPage == 'houses') {
@@ -263,19 +263,19 @@ 
                             if ($query) {
                                 $search = $url['path'][$settings['base'] + 1];
                             }
-                            logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
+                            logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
                             $page = "views/life/houses.php";
                         } else {
                             $err = errorMessage(5, $lang);
                             $page = "views/templates/error.php";
-                            logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'houses'", 3);
+                            logAction($_SESSION['user_name'], $lang['failedAccess']." 'houses'", 3);
                         }
 
                     } elseif ($currentPage == 'edithouse') {
                         if ($_SESSION['permissions']['edit']['houses']) {
                             if ($query) {
                                 $hID = $url['path'][$settings['base'] + 1];
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
                                 $page = "views/life/editHouse.php";
                             } else {
                                 $err = errorMessage(8, $lang);
@@ -284,7 +284,7 @@ 
                         } else {
                             $err = errorMessage(5, $lang);
                             $page = "views/templates/error.php";
-                            logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'editHouse'", 3);
+                            logAction($_SESSION['user_name'], $lang['failedAccess']." 'editHouse'", 3);
                         }
 
                     } elseif ($currentPage == 'gangs') {
@@ -292,19 +292,19 @@ 
                             if ($query) {
                                 $search = $url['path'][$settings['base'] + 1];
                             }
-                            logAction($_SESSION['user_name'], $lang['visited'] . " 'gangs'", 1);
+                            logAction($_SESSION['user_name'], $lang['visited']." 'gangs'", 1);
                             $page = "views/life/gangs.php";
                         } else {
                             $err = errorMessage(5, $lang);
                             $page = "views/templates/error.php";
-                            logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'gangs'", 3);
+                            logAction($_SESSION['user_name'], $lang['failedAccess']." 'gangs'", 3);
                         }
 
                     } elseif ($currentPage == 'editgang') {
                         if ($_SESSION['permissions']['edit']['gangs']) {
                             if ($query) {
                                 $gID = $url['path'][$settings['base'] + 1];
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
                                 $page = "views/life/editGang.php";
                             } else {
                                 $err = errorMessage(8, $lang);
@@ -313,7 +313,7 @@ 
                         } else {
                             $err = errorMessage(5, $lang);
                             $page = "views/templates/error.php";
-                            logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'editGang'", 3);
+                            logAction($_SESSION['user_name'], $lang['failedAccess']." 'editGang'", 3);
                         }
 
                     } elseif ($currentPage == 'wanted') {
@@ -321,19 +321,19 @@ 
                             if ($query) {
                                 $search = $url['path'][$settings['base'] + 1];
                             }
-                            logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
+                            logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
                             $page = "views/life/wanted.php";
                         } else {
                             $err = errorMessage(5, $lang);
                             $page = "views/templates/error.php";
-                            logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'wanted'", 3);
+                            logAction($_SESSION['user_name'], $lang['failedAccess']." 'wanted'", 3);
                         }
 
                     } elseif ($currentPage == 'editwanted') {
                         if ($_SESSION['permissions']['edit']['wanted']) {
                             if ($query) {
                                 $wantedID = $url['path'][$settings['base'] + 1];
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
                                 $page = "views/life/editWanted.php";
                             } else {
                                 $err = errorMessage(8, $lang);
@@ -342,7 +342,7 @@ 
                         } else {
                             $err = errorMessage(5, $lang);
                             $page = "views/templates/error.php";
-                            logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'editWanted'", 3);
+                            logAction($_SESSION['user_name'], $lang['failedAccess']." 'editWanted'", 3);
                         }
                     }
 
@@ -354,7 +354,7 @@ 
                     } elseif ($currentPage == 'editveh') {
                         if ($query) {
                             $vehID = $url['path'][$settings['base'] + 1];
-                            logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
+                            logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
                             $page = "views/steam/life/editVeh.php";
                         } else {
                             $err = errorMessage(8, $lang);
@@ -363,7 +363,7 @@ 
                     } elseif ($currentPage == 'edithouse') {
                         if ($query) {
                             $hID = $url['path'][$settings['base'] + 1];
-                            logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
+                            logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 1);
                             $page = "views/steam/life/editHouse.php";
                         } else {
                             $err = errorMessage(8, $lang);
@@ -374,7 +374,7 @@ 
             }
             if ($currentPage == 'newdb' || $currentPage == 'newserver' || $currentPage == 'settings' || $currentPage == 'editstaff' || $currentPage == 'staff' || $currentPage == 'pluginstore' || $currentPage == 'newuser' || $currentPage == 'logs') {
                 if (isset($_POST['passTest'])) {
-                    $sql = "SELECT user_password_hash FROM users WHERE user_id = '" . $_SESSION['user_id'] . "';";
+                    $sql = "SELECT user_password_hash FROM users WHERE user_id = '".$_SESSION['user_id']."';";
                     $pass = $db_connection->query($sql)->fetch_object()->user_password_hash;
                     if (password_verify($_POST['passTest'], $pass)) {
                         $_SESSION['sudo'] = time();
@@ -387,38 +387,38 @@ 
                     } else {
                         if ($currentPage == 'newdb') {
                             if ($_SESSION['permissions']['super_admin']) {
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 2);
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 2);
                                 $page = "views/core/newDB.php";
                             } else {
                                 $err = errorMessage(5, $lang);
                                 $page = "views/templates/error.php";
-                                logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'newDB'", 3);
+                                logAction($_SESSION['user_name'], $lang['failedAccess']." 'newDB'", 3);
                             }
                         } elseif ($currentPage == 'newserver') {
                             if ($_SESSION['permissions']['super_admin']) {
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 2);
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 2);
                                 $page = "views/core/newServer.php";
                             } else {
                                 $err = errorMessage(5, $lang);
                                 $page = "views/templates/error.php";
-                                logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'newServer'", 3);
+                                logAction($_SESSION['user_name'], $lang['failedAccess']." 'newServer'", 3);
                             }
 
                         } elseif ($currentPage == 'settings') {
                             if ($_SESSION['permissions']['super_admin']) {
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 2);
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 2);
                                 $page = "views/core/settings.php";
                             } else {
                                 $err = errorMessage(5, $lang);
                                 $page = "views/templates/error.php";
-                                logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'settings'", 3);
+                                logAction($_SESSION['user_name'], $lang['failedAccess']." 'settings'", 3);
                             }
 
                         } elseif ($currentPage == 'editstaff') {
                             if ($_SESSION['permissions']['edit']['staff']) {
                                 if ($query) {
                                     $uId = $url['path'][$settings['base'] + 1];
-                                    logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 2);
+                                    logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 2);
                                     $page = "views/core/editStaff.php";
                                 } else {
                                     $err = errorMessage(8, $lang);
@@ -426,38 +426,38 @@ 
                                 }
                             } else {
                                 $err = errorMessage(5, $lang); $page = "views/templates/error.php";
-                                logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'editStaff'", 3);
+                                logAction($_SESSION['user_name'], $lang['failedAccess']." 'editStaff'", 3);
                             }
                         } elseif ($currentPage == 'staff') {
                             if ($_SESSION['permissions']['view']['staff']) {
                                 if ($query) {
                                     $search = $url['path'][$settings['base'] + 1];
                                 }
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 2);
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 2);
                                 $page = "views/core/staff.php";
                             } else {
                                 $err = errorMessage(5, $lang); $page = "views/templates/error.php";
-                                logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'staff'", 3);
+                                logAction($_SESSION['user_name'], $lang['failedAccess']." 'staff'", 3);
                             }
 
                         } elseif ($currentPage == 'pluginstore') {
                             if ($_SESSION['permissions']['super_admin']) {
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 2);
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 2);
                                 $page = "views/core/pluginstore.php";
                             } else {
                                 $err = errorMessage(5, $lang); $page = "views/templates/error.php";
-                                logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'pluginstore'", 3);
+                                logAction($_SESSION['user_name'], $lang['failedAccess']." 'pluginstore'", 3);
                             }
 
                         } elseif ($currentPage == 'newuser') {
                             if ($_SESSION['permissions']['edit']['staff']) {
                                 require_once("classes/registration.php");
                                 $registration = new Registration();
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 2);
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 2);
                                 $page = "views/core/newUser.php";
                             } else {
                                 $err = errorMessage(5, $lang); $page = "views/templates/error.php";
-                                logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'newUser'", 3);
+                                logAction($_SESSION['user_name'], $lang['failedAccess']." 'newUser'", 3);
                             }
 
                         } elseif ($currentPage == 'logs' && $settings['logging']) {
@@ -465,11 +465,11 @@ 
                                 if ($query) {
                                     $search = $url['path'][$settings['base'] + 1];
                                 }
-                                logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 2);
+                                logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 2);
                                 $page = "views/core/logs.php";
                             } else {
                                 $err = errorMessage(5, $lang); $page = "views/templates/error.php";
-                                logAction($_SESSION['user_name'], $lang['failedAccess'] . " 'noPerm'", 3);
+                                logAction($_SESSION['user_name'], $lang['failedAccess']." 'noPerm'", 3);
                             }
                         }
                     }
@@ -479,7 +479,7 @@ 
                 if ($_SESSION['permissions']['view']['curplayer']) {
                     if ($query) {
                         $sid = $url['path'][$settings['base'] + 1];
-                        logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 2);
+                        logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 2);
                         $page = "views/core/curPlayers.php";
                     } else {
                         $err = errorMessage(8, $lang);
@@ -488,21 +488,21 @@ 
                 }
             } elseif ($currentPage == 'servers') {
                 if ($_SESSION['permissions']['super_admin']) {
-                    logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 2);
+                    logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 2);
                     $page = "views/core/servers.php";
                 }
             } elseif ($currentPage == 'editserver') {
                 if ($_SESSION['permissions']['super_admin']) {
                     if ($query) {
                         $id = $url['path'][$settings['base'] + 1];
-                        logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 2);
+                        logAction($_SESSION['user_name'], $lang['visited']." '".$currentPage."'", 2);
                         $page = "views/core/editServer.php";
                     } else {$err = errorMessage(8, $lang); $page = "views/templates/error.php"; }
                 } else {$err = errorMessage(5, $lang); $page = "views/templates/error.php"; }
             }
             foreach ($settings['plugins'] as &$plugin) {
-                if (file_exists("plugins/" . $plugin . "/pageRules.php")) {
-                    include("plugins/" . $plugin . "/pageRules.php");
+                if (file_exists("plugins/".$plugin."/pageRules.php")) {
+                    include("plugins/".$plugin."/pageRules.php");
                 }
             }
 
@@ -533,11 +533,11 @@ 
                     $page = 'views/core/2factor.php';
                 } elseif ($_SESSION['2factor'] == 1 || $_SESSION['2factor'] == 3) {
                 if (isset($_POST['code'])) {
-                    $sql = "SELECT `twoFactor` FROM `users` WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
+                    $sql = "SELECT `twoFactor` FROM `users` WHERE `user_id` = '".$_SESSION['user_id']."';";
                     $user = $db_connection->query($sql)->fetch_object();
                     if ($gauth->verifyCode($user->twoFactor, $_POST['code'])) $_SESSION['2factor'] = 2;
                     else {
-                    $sql = "SELECT `backup` FROM `users` WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
+                    $sql = "SELECT `backup` FROM `users` WHERE `user_id` = '".$_SESSION['user_id']."';";
                     $user = $db_connection->query($sql)->fetch_object();
                     if ($user->backup == $_POST['code']) {
                         $_SESSION['2factor'] = 2;

views/core/profile.php

Spacing +15 added lines, -15 removed lines

@@ -5,7 +5,7 @@ 
         $user_pic = $_POST['user_pic'];
         $pId = $_POST['player_id'];
         $_SESSION['user_profile'] = $user_pic;
-        $sql = "UPDATE `users` SET `user_email`= '" . $email . "',`playerid`= '" . $pId . "', `user_profile`= '" . $user_pic . "'WHERE `user_id` = '" . $_SESSION['user_id'] . "' ";
+        $sql = "UPDATE `users` SET `user_email`= '".$email."',`playerid`= '".$pId."', `user_profile`= '".$user_pic."'WHERE `user_id` = '".$_SESSION['user_id']."' ";
         $result_of_query = $db_connection->query($sql);
     } else {
         message($lang['expired']);
@@ -13,10 +13,10 @@ 
 }
 if (isset($_POST['user_password'])) {
     if (formtoken::validateToken($_POST)) {
-        $sql = "SELECT `user_password_hash` FROM `users` WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
+        $sql = "SELECT `user_password_hash` FROM `users` WHERE `user_id` = '".$_SESSION['user_id']."';";
         $result = $db_connection->query($sql)->fetch_object();
-        if ($_POST['user_password'] == $_POST['user_password_again'] && password_verify($_POST['current_password'],$result->user_password_hash)) {
-            $sql = "UPDATE `users` SET `user_password_hash`= '" . password_hash($_POST['user_password'], PASSWORD_DEFAULT) . "' WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
+        if ($_POST['user_password'] == $_POST['user_password_again'] && password_verify($_POST['current_password'], $result->user_password_hash)) {
+            $sql = "UPDATE `users` SET `user_password_hash`= '".password_hash($_POST['user_password'], PASSWORD_DEFAULT)."' WHERE `user_id` = '".$_SESSION['user_id']."';";
             $result_of_query = $db_connection->query($sql);
             message($lang['passChanged']);
         }
@@ -25,7 +25,7 @@ 
     }
 }
 
-$sql = "SELECT * FROM `users` WHERE `user_name` ='" . $_SESSION['user_name'] . "';";
+$sql = "SELECT * FROM `users` WHERE `user_name` ='".$_SESSION['user_name']."';";
 $profile = $db_connection->query($sql)->fetch_object();
 ?>
 <div class="row">
@@ -44,14 +44,14 @@ 
     <div class="panel-body">
         <div class="row">
             <div  style="padding-top:4%;" class="col-md-3 col-lg-3 " align="center">
-                <?php if(!isset($_SESSION['profile_link'])) {
-                    if(isset($_SESSION['user_email']) && $settings['gravatar']) { ?>
-                        <a href="<?php echo $settings['url'] . 'profile' ?>"> <img alt="User Pic" src="<?php getGravatar($_SESSION['user_email'],64,'retro')  ?>" class="img-circle img-responsive"></a>
+                <?php if (!isset($_SESSION['profile_link'])) {
+                    if (isset($_SESSION['user_email']) && $settings['gravatar']) { ?>
+                        <a href="<?php echo $settings['url'].'profile' ?>"> <img alt="User Pic" src="<?php getGravatar($_SESSION['user_email'], 64, 'retro')  ?>" class="img-circle img-responsive"></a>
                     <?php } else {?>
-                        <a href="<?php echo $settings['url'] . 'profile' ?>"> <img alt="User Pic" src="<?php echo $settings['url'] . 'assets/img/profile/' . $_SESSION['user_profile'] . '.jpg' ?>" class="img-circle img-responsive"></a>
+                        <a href="<?php echo $settings['url'].'profile' ?>"> <img alt="User Pic" src="<?php echo $settings['url'].'assets/img/profile/'.$_SESSION['user_profile'].'.jpg' ?>" class="img-circle img-responsive"></a>
                     <?php } ?>
                 <?php } else { ?>
-                    <img alt="User Pic" src="<?php echo $settings['url'] . 'assets/img/profile/' . $_SESSION['user_profile'] . '.jpg' ?>" class="img-circle img-responsive">
+                    <img alt="User Pic" src="<?php echo $settings['url'].'assets/img/profile/'.$_SESSION['user_profile'].'.jpg' ?>" class="img-circle img-responsive">
                 <?php } ?>
             </div>
 
@@ -60,7 +60,7 @@ 
                     <tbody>
                     <tr>
                         <td><?php echo $lang['rank'] ?>:</td>
-                        <td><?php echo $settings['ranks'][$profile->user_level] . " (" . $profile->user_level . ")" ?></td>
+                        <td><?php echo $settings['ranks'][$profile->user_level]." (".$profile->user_level.")" ?></td>
                     </tr>
                     <form method="post" action="profile" name="profileEdit" id="profileEdit">
                         <?php echo formtoken::getField(); ?>
@@ -78,26 +78,26 @@ 
                                 <select id='user_pic' name='user_pic' class='form-control'>";
                                     <?php
                                     for ($icon = 1; $icon < 6; $icon++) {
-                                        echo '<option value="' . $icon . '" ' . select($icon, $profile->user_profile) . '>' . $settings['names'][$icon] . '</option>';
+                                        echo '<option value="'.$icon.'" '.select($icon, $profile->user_profile).'>'.$settings['names'][$icon].'</option>';
                                     }
                                     ?>
                                 </select>
                             </td>
                         </tr>
                         <tr>
-                            <td><?php echo $lang['current'] . " " . $lang['password'] ?></td>
+                            <td><?php echo $lang['current']." ".$lang['password'] ?></td>
                             <td>
                                 <input type="password" id="current_password" name="current_password" class="form-control" autocorrect="off" autocapitalize="off" autocomplete="off">
                             </td>
                         </tr>
                         <tr>
-                            <td><?php echo "New " . $lang['password'] ?></td>
+                            <td><?php echo "New ".$lang['password'] ?></td>
                             <td>
                                 <input type="password" id="user_password" name="user_password" class="form-control" autocorrect="off" autocapitalize="off" autocomplete="off">
                             </td>
                         </tr>
                         <tr>
-                            <td><?php echo $lang['repeat'] . " New " . $lang['password'] ?></td>
+                            <td><?php echo $lang['repeat']." New ".$lang['password'] ?></td>
                             <td>
                                 <input type="password" id="user_password_again" name="user_password_again" autocorrect="off" class="form-control" autocapitalize="off" autocomplete="off">
                             </td>

views/templates/template.php

Spacing +16 added lines, -16 removed lines

@@ -21,16 +21,16 @@ 
             <p class="centered">
                 <?php if (!isset($_SESSION['profile_link'])) {
                     if (isset($_SESSION['user_email']) && $settings['gravatar']) {
-                        echo '<a href="' . $settings['url'] . 'profile">';
-                        echo '<img src="' . getGravatar($_SESSION['user_email'],64,'retro') . '" class="img-circle" width="60" height="60"></a></p>';
+                        echo '<a href="'.$settings['url'].'profile">';
+                        echo '<img src="'.getGravatar($_SESSION['user_email'], 64, 'retro').'" class="img-circle" width="60" height="60"></a></p>';
                     } else {
-                        echo '<a href="' . $settings['url'] . 'profile">';
-                        echo '<img src="' . $settings['url'] . 'assets/img/profile/' . $_SESSION['user_profile'] . '.jpg"';
+                        echo '<a href="'.$settings['url'].'profile">';
+                        echo '<img src="'.$settings['url'].'assets/img/profile/'.$_SESSION['user_profile'].'.jpg"';
                         echo 'class="img-circle" width="60" height="60"></a></p>';
                     }
                 } else {
-                    echo '<a href="' . $_SESSION['profile_link'] . '" target="_blank">';
-                    echo '<img src="' . $_SESSION['user_profile'] . '"';
+                    echo '<a href="'.$_SESSION['profile_link'].'" target="_blank">';
+                    echo '<img src="'.$_SESSION['user_profile'].'"';
                     echo 'class="img-circle" width="64" height="64"></a></p>';
                 }
                 ?>
@@ -48,9 +48,9 @@ 
             </li>
 
 			<?php
-                if(isset($_SESSION['server_type']))
+                if (isset($_SESSION['server_type']))
                 {
-                    switch($_SESSION['server_type'])
+                    switch ($_SESSION['server_type'])
                     {
                         case 'life':
                             include("views/life/nav.php");
@@ -58,8 +58,8 @@ 
                 }
 
                 foreach ($settings['plugins'] as &$plugin) {
-                    if (file_exists("plugins/". $plugin. "/nav.php")) {
-                        include("plugins/". $plugin."/nav.php");
+                    if (file_exists("plugins/".$plugin."/nav.php")) {
+                        include("plugins/".$plugin."/nav.php");
                     }
                 }
 
@@ -135,19 +135,19 @@ 
                         <li>
                             <a href="<?php echo $settings['url'] ?>newDB">
                                 <i class="fa fa-fw fa-plus"></i>
-                                <span><?php echo $lang['new'] . ' ' . $lang['database'] ?></span>
+                                <span><?php echo $lang['new'].' '.$lang['database'] ?></span>
                             </a>
                         </li>
                         <li>
                             <a href="<?php echo $settings['url'] ?>newServer">
                                 <i class="fa fa-fw fa-plus"></i>
-                                <span><?php echo $lang['new'] . ' ' . $lang['server'] ?></span>
+                                <span><?php echo $lang['new'].' '.$lang['server'] ?></span>
                             </a>
                         </li>
                         <li>
                             <a href="<?php echo $settings['url'] ?>servers">
                                 <i class="fa fa-fw fa-cogs"></i>
-                                <span><?php echo $lang['edit'] . ' ' . $lang['databases'] ?></span>
+                                <span><?php echo $lang['edit'].' '.$lang['databases'] ?></span>
                             </a>
                         </li>
                         <li>
@@ -170,7 +170,7 @@ 
             <li>
                 <a data-toggle="modal" href="#changeDB">
                     <i class="fa fa-fw fa-cogs"></i>
-                    <span><?php echo $lang['database'] . 's' ?></span>
+                    <span><?php echo $lang['database'].'s' ?></span>
                 </a>
             </li>
             <?php } ?>
@@ -189,10 +189,10 @@ 
     <section class="wrapper">
         <?php
         if (isset($error)) {
-            echo '<div style="margin-top: 120px;" class="alert alert-danger animated infinite bounce" role="alert">' . $error . '</div>';
+            echo '<div style="margin-top: 120px;" class="alert alert-danger animated infinite bounce" role="alert">'.$error.'</div>';
         }
         if (isset($message)) {
-            echo '<div style="margin-top: 120px;" class="alert alert-info animated infinite bounce" role="alert">' . $message . '</div>';
+            echo '<div style="margin-top: 120px;" class="alert alert-info animated infinite bounce" role="alert">'.$message.'</div>';
         }
         if (isset($page)) {
             include($page);

views/life/gangs.php

Spacing +21 added lines, -21 removed lines

@@ -1,11 +1,11 @@ 
 <?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['gangs'], 1);
-    $sql = "SELECT $playerIdColumn as playerid FROM `players` WHERE `name` LIKE '%" . $search . "%' ";
+    logAction($_SESSION['user_name'], $lang['searched'].' ('.$search.') '.$lang['in'].' '.$lang['gangs'], 1);
+    $sql = "SELECT $playerIdColumn as playerid FROM `players` WHERE `name` LIKE '%".$search."%' ";
     $result_of_query = $db_link->query($sql);
     if ($result_of_query->num_rows > 0) {
         while ($row = mysqli_fetch_row($result_of_query)) {
@@ -13,24 +13,24 @@ 
         }
         $samepID = array_reduce($samepID, 'array_merge', array());
         $samepID = implode(',', $samepID);
-        $sql = "SELECT `id`,`name`,`owner`,`bank`,`members`,`maxmembers`,`active` FROM `gangs` WHERE `owner` IN ( " . $samepID . " ) OR `name` LIKE '%" . $search . "%' OR `id` = '" . $search . "' OR `owner` LIKE '" . $search . "' OR `members` LIKE '%" . $search . "%' ;";
+        $sql = "SELECT `id`,`name`,`owner`,`bank`,`members`,`maxmembers`,`active` FROM `gangs` WHERE `owner` IN ( ".$samepID." ) OR `name` LIKE '%".$search."%' OR `id` = '".$search."' OR `owner` LIKE '".$search."' OR `members` LIKE '%".$search."%' ;";
         $result_of_query = $db_link->query($sql);
         $total_records = mysqli_num_rows($result_of_query);
         if ($pageNum > $total_records) $pageNum = $total_records;
-        $sql = "SELECT `id`,`name`,`owner`,`bank`,`members`,`maxmembers`,`active` FROM `gangs` WHERE `owner` IN ( " . $samepID . " ) OR `name` LIKE '%" . $search . "%' OR `id` = '" . $search . "' OR `owner` LIKE '" . $search . "' OR `members` LIKE '%" . $search . "%' " . $max . " ;";
+        $sql = "SELECT `id`,`name`,`owner`,`bank`,`members`,`maxmembers`,`active` FROM `gangs` WHERE `owner` IN ( ".$samepID." ) OR `name` LIKE '%".$search."%' OR `id` = '".$search."' OR `owner` LIKE '".$search."' OR `members` LIKE '%".$search."%' ".$max." ;";
     } else {
-        $sql = "SELECT `id` FROM `gangs` WHERE `name` LIKE '%" . $search . "%'  OR `id` = '" . $search . "' OR `owner` LIKE '" . $search . "' OR `members` LIKE '%" . $search . "%' ;";
+        $sql = "SELECT `id` FROM `gangs` WHERE `name` LIKE '%".$search."%'  OR `id` = '".$search."' OR `owner` LIKE '".$search."' OR `members` LIKE '%".$search."%' ;";
         $result_of_query = $db_link->query($sql);
         $total_records = mysqli_num_rows($result_of_query);
         if ($pageNum > $total_records) $pageNum = $total_records;
-        $sql = "SELECT `id`,`name`,`owner`,`bank`,`members`,`maxmembers`,`active` FROM `gangs` WHERE `name` LIKE '%" . $search . "%' OR `id` = '" . $search . "' OR `owner` LIKE '" . $search . "' OR `members` LIKE '%" . $search . "%' " . $max . " ;";
+        $sql = "SELECT `id`,`name`,`owner`,`bank`,`members`,`maxmembers`,`active` FROM `gangs` WHERE `name` LIKE '%".$search."%' OR `id` = '".$search."' OR `owner` LIKE '".$search."' OR `members` LIKE '%".$search."%' ".$max." ;";
     }
 } else {
     $sql = "SELECT `id` FROM `gangs`;";
     $result_of_query = $db_link->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
     if ($pageNum > $total_records) $pageNum = $total_records;
-    $sql = "SELECT `id`,`name`,`owner`,`bank`,`members`,`maxmembers`,`active` FROM `gangs` " . $max . " ;";
+    $sql = "SELECT `id`,`name`,`owner`,`bank`,`members`,`maxmembers`,`active` FROM `gangs` ".$max." ;";
 }
 $result_of_query = $db_link->query($sql);
 if ($result_of_query->num_rows > 0) {
@@ -52,18 +52,18 @@ 
         <thead>
         <tr>
             <th class="hidden-xs"><i class="fa fa-eye"></i> <?php echo $lang['id']; ?></th>
-            <th><i class="fa fa-user"></i> <?php echo $lang['gang'] . " " . $lang['name']; ?></th>
+            <th><i class="fa fa-user"></i> <?php echo $lang['gang']." ".$lang['name']; ?></th>
             <th class="hidden-xs"><i class="fa fa-user"></i> <?php echo $lang['owner']; ?></th>
             <th class="hidden-xs"><i class="fa fa-bank"></i> <?php echo $lang['bank']; ?></th>
             <?php if ($_SESSION['permissions']['edit']['gangs']) {
-                echo '<th class="hidden-xs"><i class="fa fa-user"></i> ' . $lang['members'] . '</th>';
+                echo '<th class="hidden-xs"><i class="fa fa-user"></i> '.$lang['members'].'</th>';
             } else {
-                echo '<th><i class="fa fa-user"></i> ' . $lang['members'] . '</th>';
+                echo '<th><i class="fa fa-user"></i> '.$lang['members'].'</th>';
             }?>
             <th class="hidden-xs"><i class="fa fa-user"></i> <?php echo $lang['maxMembers']; ?></th>
             <th class="hidden-xs"><i class="fa fa-user"></i> <?php echo $lang['active']; ?></th>
             <?php if ($_SESSION['permissions']['edit']['gangs']) {
-                echo '<th><i class="fa fa-pencil"></i>' . $lang['edit'] . '</th>';
+                echo '<th><i class="fa fa-pencil"></i>'.$lang['edit'].'</th>';
             }
             ?>
         </tr>
@@ -72,21 +72,21 @@ 
         <?php
         while ($row = mysqli_fetch_assoc($result_of_query)) {
             echo "<tr>";
-            echo "<td class='hidden-xs'>" . $row["id"] . "</td>";
-            echo "<td>" . $row["name"] . "</td>";
-            echo "<td class='hidden-xs'>" . nameID($row["owner"], $db_link) . "</td>";
-            echo "<td class='hidden-xs'>" . $row["bank"] . "</td>";
+            echo "<td class='hidden-xs'>".$row["id"]."</td>";
+            echo "<td>".$row["name"]."</td>";
+            echo "<td class='hidden-xs'>".nameID($row["owner"], $db_link)."</td>";
+            echo "<td class='hidden-xs'>".$row["bank"]."</td>";
             $members = substr_count($row['members'], ",");
             $members++;
             if ($_SESSION['permissions']['edit']['gangs']) {
-                echo "<td class='hidden-xs'>" . $members . "</td>";
+                echo "<td class='hidden-xs'>".$members."</td>";
             } else {
-                echo "<td>" . $members . "</td>";
+                echo "<td>".$members."</td>";
             }
-            echo "<td class='hidden-xs'>" . $row["maxmembers"] . "</td>";
-            echo "<td class='hidden-xs'>" . yesNo($row["active"], $lang) . "</td>";
+            echo "<td class='hidden-xs'>".$row["maxmembers"]."</td>";
+            echo "<td class='hidden-xs'>".yesNo($row["active"], $lang)."</td>";
             if ($_SESSION['permissions']['edit']['gangs']) {
-                echo "<td><a class='btn btn-primary btn-xs' href='" . $settings['url'] . "editGang/" . $row["id"] . "'>";
+                echo "<td><a class='btn btn-primary btn-xs' href='".$settings['url']."editGang/".$row["id"]."'>";
                 echo "<i class='fa fa-pencil'></i></a></td>";
             }
             echo "</tr>";

views/life/police.php

Spacing +14 added lines, -14 removed lines

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

views/life/notes.php

Spacing +22 added lines, -22 removed lines

@@ -9,10 +9,10 @@ 
     $page = 1;
 }
 
-$max = 'LIMIT ' . ($page - 1) * $_SESSION['items'] . ',' . $_SESSION['items'];
+$max = 'LIMIT '.($page - 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 $playerIdColumn FROM `players` WHERE `name` LIKE '%$search%' ";
     $result_of_query = $db_link->query($sql);
     if ($result_of_query->num_rows > 0) {
@@ -20,10 +20,10 @@ 
             $samepID[] = $row;
         }
         $samepID = array_reduce($samepID, 'array_merge', array());
-        $sql = "SELECT * FROM `vehicles` WHERE `pid` LIKE '$search' OR `classname` LIKE '%$search%' OR `pid` IN (" . implode(',', $samepID) . ") OR `plate` LIKE '$search' OR `inventory` LIKE '%$search%';";
+        $sql = "SELECT * FROM `vehicles` WHERE `pid` LIKE '$search' OR `classname` LIKE '%$search%' OR `pid` IN (".implode(',', $samepID).") OR `plate` LIKE '$search' OR `inventory` LIKE '%$search%';";
         $result_of_query = $db_link->query($sql);
         $total_records = mysqli_num_rows($result_of_query);
-        $sql = "SELECT * FROM `vehicles` WHERE `pid` LIKE '$search' OR `classname` LIKE '%$search%' OR `pid` IN (" . implode(',', $samepID) . ") OR `plate` LIKE '$search' OR `inventory` LIKE '%$search %' $max;";
+        $sql = "SELECT * FROM `vehicles` WHERE `pid` LIKE '$search' OR `classname` LIKE '%$search%' OR `pid` IN (".implode(',', $samepID).") OR `plate` LIKE '$search' OR `inventory` LIKE '%$search %' $max;";
     } else {
         $sql = "SELECT * FROM `vehicles` WHERE `pid` LIKE '$search' OR `classname` LIKE '%$search%' OR `plate` LIKE '$search' OR `inventory` LIKE '%$search%';";
         $result_of_query = $db_link->query($sql);
@@ -40,7 +40,7 @@ 
     <div class="col-lg-12">
         <h1 class="page-header">
             <?php echo $lang['vehicles']; ?>
-            <small><?php echo " " . $lang['overview']; ?></small>
+            <small><?php echo " ".$lang['overview']; ?></small>
         </h1>
     </div>
 </div>
@@ -50,7 +50,7 @@ 
     <div class="content-panel">
         <h4>
             <i class="fa fa-car"></i>
-            <?php echo " " . $lang['vehicles']; ?>
+            <?php echo " ".$lang['vehicles']; ?>
             <div class="col-md-2 pull-right">
                 <form style="float:right;" name='rows' method="post" action="<?php echo $settings['url'] ?>vehicles">
                     <select id='items' name='items'>
@@ -106,7 +106,7 @@ 
                 <th class="hidden-xs"><i class="fa fa-car"></i> <?php echo $lang['alive']; ?></th>
                 <th class="hidden-xs"><i class="fa fa-info"></i> <?php echo $lang['active']; ?></th>
                 <?php if ($_SESSION['user_level'] >= $_SESSION['permission']['edit']['playet']) {
-    echo '<th><i class="fa fa-pencil"></i><div class="hidden-xs"> ' . $lang['edit'] . '</div></th>';
+    echo '<th><i class="fa fa-pencil"></i><div class="hidden-xs"> '.$lang['edit'].'</div></th>';
 }
 ?>
             </tr>
@@ -115,14 +115,14 @@ 
             <?php
             while ($row = mysqli_fetch_assoc($result_of_query)) {
                 echo "<tr>";
-                echo "<td>" . nameID($row["pid"]) . "</td>";
-                echo "<td>" . carName($row["classname"]) . "</td>";
-                echo "<td class='hidden-xs'>" . carType($row["type"], $lang) . "</td>";
-                echo "<td class='hidden-xs'>" . $row["plate"] . "</td>";
-                echo "<td class='hidden-xs'>" . yesNo($row["alive"], $lang) . "</td>";
-                echo "<td class='hidden-xs'>" . yesNo($row["active"], $lang) . "</td>";
+                echo "<td>".nameID($row["pid"])."</td>";
+                echo "<td>".carName($row["classname"])."</td>";
+                echo "<td class='hidden-xs'>".carType($row["type"], $lang)."</td>";
+                echo "<td class='hidden-xs'>".$row["plate"]."</td>";
+                echo "<td class='hidden-xs'>".yesNo($row["alive"], $lang)."</td>";
+                echo "<td class='hidden-xs'>".yesNo($row["active"], $lang)."</td>";
                 if ($_SESSION['user_level'] >= P_EDIT_VEHICLES) {
-                    echo "<td><a class='btn btn-primary btn-xs' href='" . $settings['url'] . "editVeh/" . $row["id"] . "'>";
+                    echo "<td><a class='btn btn-primary btn-xs' href='".$settings['url']."editVeh/".$row["id"]."'>";
                     echo "<i class='fa fa-pencil'></i></a></td>";
                 }
                 echo "</tr>";
@@ -134,24 +134,24 @@ 
                 $total_pages = ceil($total_records / $_SESSION['items']);
                 if ($total_pages > 1) {
 
-                    echo "<center><a class='btn btn-primary' href='" . $settings['url'] . "vehicles/" . $search . "?page=1'>" . $lang['first'] . "</a> ";
+                    echo "<center><a class='btn btn-primary' href='".$settings['url']."vehicles/".$search."?page=1'>".$lang['first']."</a> ";
                     ?>
                     <div class="btn-group">
                         <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
-                            <?php echo $lang['page'] . " " ?><span class="caret"></span>
+                            <?php echo $lang['page']." " ?><span class="caret"></span>
                         </button>
 
                         <ul class="dropdown-menu scrollable-menu" role="menu">
                             <?php
                             for ($i = 1; $i <= $total_pages; $i++) {
                                 ?>
-                                <li><?php echo "<a href='" . $settings['url'] . "vehicles/" . $search . "?page=" . $i . "'>" . $i . "</a> "; ?></li>
+                                <li><?php echo "<a href='".$settings['url']."vehicles/".$search."?page=".$i."'>".$i."</a> "; ?></li>
                             <?php }; ?>
                         </ul>
                     </div>
 
                     <?php
-                    echo "<a class='btn btn-primary' href='" . $settings['url'] . "vehicles/" . $search . "?page=" . $total_pages . "'>" . $lang['last'] . "</a></center>";
+                    echo "<a class='btn btn-primary' href='".$settings['url']."vehicles/".$search."?page=".$total_pages."'>".$lang['last']."</a></center>";
                 }
             } else {
                 $sql = "SELECT `id` FROM `vehicles`;";
@@ -159,24 +159,24 @@ 
                 $total_records = mysqli_num_rows($result_of_query);
                 $total_pages = ceil($total_records / $_SESSION['items']);
                 if ($total_pages > 1) {
-                    echo "<center><a class='btn btn-primary' href='" . $settings['url'] . "vehicles?page=1'>" . $lang['first'] . "</a> ";
+                    echo "<center><a class='btn btn-primary' href='".$settings['url']."vehicles?page=1'>".$lang['first']."</a> ";
                     ?>
                     <div class="btn-group">
                         <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
-                            <?php echo $lang['page'] . " " ?><span class="caret"></span>
+                            <?php echo $lang['page']." " ?><span class="caret"></span>
                         </button>
 
                         <ul class="dropdown-menu scrollable-menu" role="menu">
                             <?php
                             for ($i = 1; $i <= $total_pages; $i++) {
                                 ?>
-                                <li><?php echo "<a href='" . $settings['url'] . "vehicles?page=" . $i . "'>" . $i . "</a> "; ?></li>
+                                <li><?php echo "<a href='".$settings['url']."vehicles?page=".$i."'>".$i."</a> "; ?></li>
                             <?php }; ?>
                         </ul>
                     </div>
 
                     <?php
-                    echo "<a class='btn btn-primary' href='" . $settings['url'] . "vehicles?page=$total_pages'>" . $lang['last'] . "</a></center>";
+                    echo "<a class='btn btn-primary' href='".$settings['url']."vehicles?page=$total_pages'>".$lang['last']."</a></center>";
                 }
             }
             ?>

views/life/houses.php

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

views/life/vehicles.php

Spacing +10 added lines, -10 removed lines

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