Cyberbyte-Studios / CyberWorks

views/databases.php

Braces +3 added lines, -1 removed lines

@@ -68,4 +68,6 @@
         </div>
     </div>
 <?php
-} else  echo errorMessage(3, $lang);
\ No newline at end of file
+} else {
+    echo errorMessage(3, $lang);
+}

Spacing +11 added lines, -11 removed lines

@@ -5,16 +5,16 @@ 
     $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['database'], 1);
-    $sql = "SELECT * FROM `db` WHERE `dbid` LIKE '" . $search . "' OR `type` LIKE '%" . $search . "%';"; //todo: name searching
+    logAction($_SESSION['user_name'], $lang['searched'].' ('.$search.') '.$lang['in'].' '.$lang['database'], 1);
+    $sql = "SELECT * FROM `db` WHERE `dbid` LIKE '".$search."' OR `type` LIKE '%".$search."%';"; //todo: name searching
     $result_of_query = $db_connection->query($sql);
     $total_records = mysqli_num_rows($result_of_query);
-    $sql = "SELECT * FROM `db` WHERE `dbid` LIKE '" . $search . "' OR `type` LIKE '%" . $search . "%'" . $max . " ;";
+    $sql = "SELECT * FROM `db` WHERE `dbid` LIKE '".$search."' OR `type` LIKE '%".$search."%'".$max." ;";
 } else {
-    $sql = "SELECT * FROM `db` " . $max . " ;";
+    $sql = "SELECT * FROM `db` ".$max." ;";
 }
 
 $result_of_query = $db_connection->query($sql);
@@ -34,7 +34,7 @@ 
             <table class="table table-striped table-advance table-hover">
                 <h4>
                     <i class="fa fa-sitemap"></i>
-                    <?php echo " " . $lang['wantList']; ?>
+                    <?php echo " ".$lang['wantList']; ?>
 
                 </h4>
                 <hr class="hidden-xs">
@@ -52,11 +52,11 @@ 
                 <?php
                 while ($row = mysqli_fetch_assoc($result_of_query)) {
                     echo "<tr>";
-                    echo "<td class='hidden-xs'>" . $row["wantedID"] . "</td>";
-                    echo "<td>" . $row["wantedName"] . "</td>";
-                    echo "<td class='hidden-xs'>" . $row["wantedBounty"] . "</td>";
-                    echo "<td class='hidden-xs'>" . yesNo($row["active"], $lang) . "</td>";
-                    echo "<td><a class='btn btn-primary btn-xs' href='editWanted/" . $row["wantedID"] . "'>";
+                    echo "<td class='hidden-xs'>".$row["wantedID"]."</td>";
+                    echo "<td>".$row["wantedName"]."</td>";
+                    echo "<td class='hidden-xs'>".$row["wantedBounty"]."</td>";
+                    echo "<td class='hidden-xs'>".yesNo($row["active"], $lang)."</td>";
+                    echo "<td><a class='btn btn-primary btn-xs' href='editWanted/".$row["wantedID"]."'>";
                     echo "<i class='fa fa-pencil'></i></a></td>";
                     echo "</tr>";
                 };

index.php

Indentation +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
     if (!$db_connection->connect_errno) {
         if ($login->isUserLoggedIn() == true) {
 
-           if ($_SESSION['multiDB'] && isset($_POST['dbid']) && isset($_POST['type'])) {
+            if ($_SESSION['multiDB'] && isset($_POST['dbid']) && isset($_POST['type'])) {
                 $_SESSION['server_type'] = $_POST['type'];
                 $_SESSION['dbid'] = $_POST['dbid'];
             }

Braces +13 added lines, -6 removed lines

@@ -239,7 +239,7 @@ 
                             logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1);
                             $page = "views/life/admins.php";
                         }
-                    }  elseif ($currentPage == 'police') {
+                    } elseif ($currentPage == 'police') {
                         if ($_SESSION['permissions']['view']['player']) {
                             if ($query) {
                                 $search = $url['path'][$settings['base'] + 1];
@@ -522,15 +522,20 @@ 
             if ($settings['2factor']) {
                 if ($_SESSION['2factor'] == 0) {
                 if ($settings['force2factor'] == 'steam') {
-                    if (!$_SESSION['steamsignon']) $_SESSION['2factor'] == 5;
-                } elseif ($settings['force2factor'] == 'all') $_SESSION['2factor'] == 5;
+                    if (!$_SESSION['steamsignon']) {
+                        $_SESSION['2factor'] == 5;
+                    }
+                } elseif ($settings['force2factor'] == 'all') {
+                    $_SESSION['2factor'] == 5;
+                }
                     $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'] . "';";
                     $user = $db_connection->query($sql)->fetch_object();
-                    if ($gauth->verifyCode($user->twoFactor, $_POST['code'])) $_SESSION['2factor'] = 2;
-                    else {
+                    if ($gauth->verifyCode($user->twoFactor, $_POST['code'])) {
+                        $_SESSION['2factor'] = 2;
+                    } else {
                     $sql = "SELECT `backup` FROM `users` WHERE `user_id` = '" . $_SESSION['user_id'] . "';";
                     $user = $db_connection->query($sql)->fetch_object();
                     if ($user->backup == $_POST['code']) {
@@ -540,7 +545,9 @@ 
                         $page = 'views/core/2factor.php';
                     }
                     }
-                } else $page = 'views/core/2factor.php';
+                } else {
+                    $page = 'views/core/2factor.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;

hooks/rcon_ban.php

Braces +1 added lines, -2 removed lines

@@ -18,8 +18,7 @@
         {
             $cmd = 'ban ' . $rid . ' ' . $time . ' ' . $reason;
             $answer = rcon(decrypt($server->sq_ip), decrypt($server->sq_port), decrypt($server->rcon_pass), $cmd);
-        }
-        catch (Exception $e)
+        } catch (Exception $e)
         {
             echo $e->getMessage( );
         }

Spacing +2 added lines, -2 removed lines

@@ -10,13 +10,13 @@
     $time = clean($_POST['TIME'], "int");
     $reason = clean($_POST['REASON'], "string");
 
-    $sql = "SELECT * FROM `servers` WHERE `use_sq` = 1 AND `sid` = " . $sid . ";";
+    $sql = "SELECT * FROM `servers` WHERE `use_sq` = 1 AND `sid` = ".$sid.";";
     $result_of_query = $db_connection->query($sql);
     if ($result_of_query->num_rows == 1) {
         $server = $result_of_query->fetch_object();
         try
         {
-            $cmd = 'ban ' . $rid . ' ' . $time . ' ' . $reason;
+            $cmd = 'ban '.$rid.' '.$time.' '.$reason;
             $answer = rcon(decrypt($server->sq_ip), decrypt($server->sq_port), decrypt($server->rcon_pass), $cmd);
         }
         catch (Exception $e)

hooks/rcon_players.php

Braces +4 added lines, -3 removed lines

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

Spacing +1 added lines, -1 removed lines

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

hooks/rcon_command.php

Braces +1 added lines, -2 removed lines

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

Spacing +1 added lines, -1 removed lines

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

validators/pid.php

Braces +11 added lines, -4 removed lines

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

Spacing +1 added lines, -1 removed lines

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

classes/registration.php

Indentation +3 added lines, -3 removed lines

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

Spacing +4 added lines, -4 removed lines

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

views/steam/life/houses.php

Braces +9 added lines, -3 removed lines

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

Spacing +10 added lines, -10 removed lines

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

classes/login.php

Braces +8 added lines, -2 removed lines

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

Indentation +3 added lines, -3 removed lines

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

Spacing +6 added lines, -6 removed lines

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