Cyberbyte-Studios / CyberWorks

views/life/houses.php

Braces +3 added lines, -1 removed lines

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

views/life/editPlayer.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
                         if ($coplevel <> $player->coplevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cop'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->coplevel . ") " . $lang['to'] . " (" . $coplevel . ")", 2);
                         if ($mediclevel <> $player->mediclevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['medic'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->mediclevel . ") " . $lang['to'] . " (" . $mediclevel . ")", 2);
                         if ($donatorlvl <> $player->donatorlvl) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['donator'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->donatorlvl . ") " . $lang['to'] . " (" . $donatorlvl . ")", 2);
-                        if ($adminlevel <> $player->adminlevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['admin'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->adminlevel. ") " . $lang['to'] . " ('" . $adminlevel . ")", 2);
+                        if ($adminlevel <> $player->adminlevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['admin'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->adminlevel . ") " . $lang['to'] . " ('" . $adminlevel . ")", 2);
                         if ($cash <> $player->cash) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cash'] . " " . $lang['from'] . " '" . $player->cash . "' " . $lang['to'] . " (" . $cash . "''", 2);
                         if ($bankacc <> $player->bankacc) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['bank'] . " " . $lang['from'] . " '" . $player->bankacc . "' " . $lang['to'] . " (" . $bankacc . "''", 2);
                         if ($arrested <> $player->arrested) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['bank'] . " " . $lang['from'] . " '" . $player->cash . "' " . $lang['to'] . " (" . $cash . "''", 2);

Braces +70 added lines, -21 removed lines

@@ -64,14 +64,31 @@ 
                     if ($result->num_rows > 0) {
                         $player = $result->fetch_object();
 
-                        if ($coplevel <> $player->coplevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cop'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->coplevel . ") " . $lang['to'] . " (" . $coplevel . ")", 2);
-                        if ($mediclevel <> $player->mediclevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['medic'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->mediclevel . ") " . $lang['to'] . " (" . $mediclevel . ")", 2);
-                        if ($donatorlvl <> $player->donatorlvl) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['donator'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->donatorlvl . ") " . $lang['to'] . " (" . $donatorlvl . ")", 2);
-                        if ($adminlevel <> $player->adminlevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['admin'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->adminlevel. ") " . $lang['to'] . " ('" . $adminlevel . ")", 2);
-                        if ($cash <> $player->cash) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cash'] . " " . $lang['from'] . " '" . $player->cash . "' " . $lang['to'] . " (" . $cash . "''", 2);
-                        if ($bankacc <> $player->bankacc) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['bank'] . " " . $lang['from'] . " '" . $player->bankacc . "' " . $lang['to'] . " (" . $bankacc . "''", 2);
-                        if ($arrested <> $player->arrested) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['bank'] . " " . $lang['from'] . " '" . $player->cash . "' " . $lang['to'] . " (" . $cash . "''", 2);
-                        if ($blacklist <> $player->blacklist) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['bank'] . " " . $lang['from'] . " '" . $player->cash . "' " . $lang['to'] . " (" . $cash . "''", 2); //todo:finish
+                        if ($coplevel <> $player->coplevel) {
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cop'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->coplevel . ") " . $lang['to'] . " (" . $coplevel . ")", 2);
+                        }
+                        if ($mediclevel <> $player->mediclevel) {
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['medic'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->mediclevel . ") " . $lang['to'] . " (" . $mediclevel . ")", 2);
+                        }
+                        if ($donatorlvl <> $player->donatorlvl) {
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['donator'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->donatorlvl . ") " . $lang['to'] . " (" . $donatorlvl . ")", 2);
+                        }
+                        if ($adminlevel <> $player->adminlevel) {
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['admin'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->adminlevel. ") " . $lang['to'] . " ('" . $adminlevel . ")", 2);
+                        }
+                        if ($cash <> $player->cash) {
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cash'] . " " . $lang['from'] . " '" . $player->cash . "' " . $lang['to'] . " (" . $cash . "''", 2);
+                        }
+                        if ($bankacc <> $player->bankacc) {
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['bank'] . " " . $lang['from'] . " '" . $player->bankacc . "' " . $lang['to'] . " (" . $bankacc . "''", 2);
+                        }
+                        if ($arrested <> $player->arrested) {
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['bank'] . " " . $lang['from'] . " '" . $player->cash . "' " . $lang['to'] . " (" . $cash . "''", 2);
+                        }
+                        if ($blacklist <> $player->blacklist) {
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['bank'] . " " . $lang['from'] . " '" . $player->cash . "' " . $lang['to'] . " (" . $cash . "''", 2);
+                        }
+                        //todo:finish
 
 
                         $update = "UPDATE `players` SET coplevel = '" . $coplevel . "', mediclevel = '" . $mediclevel . "', donatorlvl = '" . $donatorlvl . "', adminlevel = '" . $adminlevel . "', cash = '" . $cash . "', bankacc = '" . $bankacc . "', arrested = '" . $arrested . "', blacklist = '" . $blacklist . "' WHERE `uid` = '" . $uID . "' ";
@@ -92,10 +109,18 @@ 
                     $result = $db_link->query($sql);
                     if ($result->num_rows > 0) {
                         $player = $result->fetch_object();
-                        if ($coplevel <> $player->coplevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cop'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->coplevel . ") " . $lang['to'] . " (" . $coplevel . ")", 2);
-                        if ($mediclevel <> $player->mediclevel) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['medic'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->mediclevel . ") " . $lang['to'] . " (" . $mediclevel . ")", 2);
-                        if ($donatorlvl <> $player->donatorlvl) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['donator'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->donatorlvl . ") " . $lang['to'] . " (" . $donatorlvl . ")", 2);
-                        if ($cash <> $player->cash) logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cash'] . " " . $lang['from'] . " '" . $player->cash . "' " . $lang['to'] . " (" . $cash . "''", 2);
+                        if ($coplevel <> $player->coplevel) {
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cop'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->coplevel . ") " . $lang['to'] . " (" . $coplevel . ")", 2);
+                        }
+                        if ($mediclevel <> $player->mediclevel) {
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['medic'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->mediclevel . ") " . $lang['to'] . " (" . $mediclevel . ")", 2);
+                        }
+                        if ($donatorlvl <> $player->donatorlvl) {
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['donator'] . " " . $lang['level'] . " " . $lang['from'] . " (" . $player->donatorlvl . ") " . $lang['to'] . " (" . $donatorlvl . ")", 2);
+                        }
+                        if ($cash <> $player->cash) {
+                            logAction($_SESSION['user_name'], $lang['edited'] . " " . nameID($player->playerid, $db_link) . "(" . $player->playerid . ") " . $lang['cash'] . " " . $lang['from'] . " '" . $player->cash . "' " . $lang['to'] . " (" . $cash . "''", 2);
+                        }
 
                         $update = "UPDATE `players` SET coplevel = '" . $coplevel . "', mediclevel = '" . $mediclevel . "', donatorlvl = '" . $donatorlvl . "', cash = '" . $cash . "', bankacc = '" . $bankacc . "', arrested = '" . $arrested . "' WHERE `uid` = '" . $uID . "' ";
                         $result_of_query = $db_link->query($update);
@@ -410,7 +435,10 @@ 
                                     </tbody>
                                 </table>
                                 <?php echo '<a style="float: right;" href="' . $settings['url'] . 'houses/' . $player->playerid . '"><h4>' . $lang['more'] . ' <i class="fa fa-arrow-circle-right"></i></h4></a>';
-                            } else echo '<h4>' . errorMessage(31, $lang) . '</h4>'; ?>
+                            } else {
+                                echo '<h4>' . errorMessage(31, $lang) . '</h4>';
+                            }
+                            ?>
                         </div>
                     </div>
                 <?php } if ($_SESSION['permissions']['view']['vehicles'] || $player->playerid == $_SESSION['playerid']) { ?>
@@ -442,7 +470,9 @@ 
                                 echo '</tr></tbody></table>';
                                 echo '<a style="float: right; padding-right:15px;" href="' . $settings['url'] . 'vehicles/' . $player->playerid . '"><h4>' . $lang['more'] . ' <i class="fa fa-arrow-circle-right"></i></h4></a>';
 
-                            } else echo '<h4>' . errorMessage(32, $lang) . '</h4>';
+                            } else {
+                                echo '<h4>' . errorMessage(32, $lang) . '</h4>';
+                            }
                         ?>
                         </div>
                     </div>
@@ -507,7 +537,9 @@ 
 
                                     }
                                 }
-                            } else echo "<h3>" . errorMessage(34, $lang) . "</h3>";
+                            } else {
+                                echo "<h3>" . errorMessage(34, $lang) . "</h3>";
+                            }
                         ?>
 
                         </div>
@@ -547,7 +579,10 @@ 
                         <button class="btn btn-primary" type="submit"><?php echo $lang['subChange']; ?></button>
                     </div>
                 </form>
-            <?php } else errorMessage(5, $lang); ?>
+            <?php } else {
+    errorMessage(5, $lang);
+}
+?>
         </div>
     </div>
 </div>
@@ -580,7 +615,10 @@ 
                         <button class="btn btn-primary" type="submit"><?php echo $lang['subChange']; ?></button>
                     </div>
                 </form>
-            <?php } else errorMessage(5, $lang); ?>
+            <?php } else {
+    errorMessage(5, $lang);
+}
+?>
         </div>
     </div>
 </div>
@@ -613,7 +651,10 @@ 
                         <button class="btn btn-primary" type="submit"><?php echo $lang['subChange']; ?></button>
                     </div>
                 </form>
-            <?php } else errorMessage(5, $lang); ?>
+            <?php } else {
+    errorMessage(5, $lang);
+}
+?>
         </div>
     </div>
 </div>
@@ -646,7 +687,10 @@ 
                         <button class="btn btn-primary" type="submit"><?php echo $lang['subChange']; ?></button>
                     </div>
                 </form>
-            <?php } else errorMessage(5, $lang); ?>
+            <?php } else {
+    errorMessage(5, $lang);
+}
+?>
         </div>
     </div>
 </div>
@@ -759,9 +803,14 @@ 
                     <?php }?>
                 });
                 </script>
-            <?php } else "<h1>" . errorMessage(5, $lang) . "/<h1>"; ?>
+            <?php } else {
+    "<h1>" . errorMessage(5, $lang) . "/<h1>";
+}
+?>
         </div>
     </div>
 </div>
 
-<?php } else echo "<h1>" . errorMessage(36, $lang) . "</h1>";
\ No newline at end of file
+<?php } else {
+    echo "<h1>" . errorMessage(36, $lang) . "</h1>";
+}

views/life/editVeh.php

Braces +3 added lines, -1 removed lines

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

views/life/medics.php

Spacing +2 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
 						</ul>
 					</div>
 					<?php
-                    echo "<a class='btn btn-primary' href='" . $settings['url'] . "medic/".$total_pages."'>" . $lang['last'] . "</a></center>";
+                    echo "<a class='btn btn-primary' href='" . $settings['url'] . "medic/" . $total_pages . "'>" . $lang['last'] . "</a></center>";
                 } ?>
                 <br>
                 </tbody>
@@ -79,5 +79,5 @@ 
         </div>
     </div>
 <?php } else {
-    echo '<h1>'.errorMessage(36,$lang).'</h1>';
+    echo '<h1>' . errorMessage(36, $lang) . '</h1>';
 }

views/life/notes.php

Braces +5 added lines, -2 removed lines

@@ -89,7 +89,8 @@ 
             </div>
             <div class="col-md-3 pull-right">
                 <form style="float:right;" name='search'>
-                    <input id='searchText' type='text' name='searchText' placeholder="<?php if (isset($search)) echo $search ?>">
+                    <input id='searchText' type='text' name='searchText' placeholder="<?php if (isset($search)) {
+    echo $search ?>">
                     <input class='btn btn-sm btn-primary' type='button' name='search'
                            onclick='searchpage();' value='<?php echo $lang['search'] ?>'>
                 </form>
@@ -99,7 +100,9 @@ 
         <table class="table table-striped table-advance table-hover">
             <thead>
             <tr>
-                <th><i class="fa fa-eye"></i> <?php echo $lang['owner']; ?></th>
+                <th><i class="fa fa-eye"></i> <?php echo $lang['owner'];
+}
+?></th>
                 <th><i class="fa fa-car"></i> <?php echo $lang['class']; ?></th>
                 <th class="hidden-xs"><i class="fa fa-car"></i> <?php echo $lang['type']; ?></th>
                 <th class="hidden-xs"><i class="fa fa-car"></i> <?php echo $lang['plate']; ?></th>

views/life/police.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 						</div>
 
 						<?php
-                        echo "<a class='btn btn-primary' href='" . $settings['url'] . "police/".$total_pages."'>" . $lang['last'] . "</a></center>";
+                        echo "<a class='btn btn-primary' href='" . $settings['url'] . "police/" . $total_pages . "'>" . $lang['last'] . "</a></center>";
                     }
                     ?>
                     <br>

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

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'];
             }

Spacing +1 added lines, -1 removed lines

@@ -101,7 +101,7 @@
             $_SESSION['formtoken'][1] = time();
 
             if (isset($_GET['items'])) {
-                if (in_array($_GET['items'],$settings['item'])) {
+                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']);

Braces +12 added lines, -5 removed lines

@@ -514,15 +514,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']) {
@@ -532,7 +537,9 @@ 
                         $page = 'views/core/2factor.php';
                     }
                     }
-                } else $page = 'views/core/2factor.php';
+                } else {
+                    $page = 'views/core/2factor.php';
+                }
                 }
             }
 

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