@@ -13,9 +13,15 @@ discard block |
||
| 13 | 13 | if ($total_pages > 5) { |
| 14 | 14 | $start = $pageNum - 2; |
| 15 | 15 | $end = $pageNum + 2; |
| 16 | - if ($pageNum < 4) $start = 1; |
|
| 17 | - if ($pageNum < 2) $end += 1; |
|
| 18 | - if ($pageNum < 3) $end += 1; |
|
| 16 | + if ($pageNum < 4) { |
|
| 17 | + $start = 1; |
|
| 18 | + } |
|
| 19 | + if ($pageNum < 2) { |
|
| 20 | + $end += 1; |
|
| 21 | + } |
|
| 22 | + if ($pageNum < 3) { |
|
| 23 | + $end += 1; |
|
| 24 | + } |
|
| 19 | 25 | |
| 20 | 26 | if ($pageNum > $total_pages - 2) {$start -= 1; $end -= 1; } |
| 21 | 27 | if ($pageNum > $total_pages - 1) {$start -= 1; $end -= 1; } |
@@ -26,7 +32,9 @@ discard block |
||
| 26 | 32 | |
| 27 | 33 | for ($i = $start; $i <= $end; $i++) { |
| 28 | 34 | echo '<li'; |
| 29 | - if ($i == $pageNum) echo ' class="active"'; |
|
| 35 | + if ($i == $pageNum) { |
|
| 36 | + echo ' class="active"'; |
|
| 37 | + } |
|
| 30 | 38 | echo '><a href="?page=' . $i . '">' . $i . '</a></li>'; |
| 31 | 39 | }; ?> |
| 32 | 40 | |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | <?php if (!isset($_SESSION['profile_link'])) { |
| 27 | 27 | if (isset($_SESSION['user_email']) && $settings['gravatar']) { |
| 28 | 28 | echo '<a href="' . $settings['url'] . 'profile">'; |
| 29 | - echo '<img src="' . get_gravatar($_SESSION['user_email'],64,'retro') . '" class="img-circle" width="60" height="60"></a></p>'; |
|
| 29 | + echo '<img src="' . get_gravatar($_SESSION['user_email'], 64, 'retro') . '" class="img-circle" width="60" height="60"></a></p>'; |
|
| 30 | 30 | } else { |
| 31 | 31 | echo '<a href="' . $settings['url'] . 'profile">'; |
| 32 | 32 | echo '<img src="' . $settings['url'] . 'assets/img/profile/' . $_SESSION['user_profile'] . '.jpg"'; |
@@ -52,9 +52,9 @@ discard block |
||
| 52 | 52 | </li> |
| 53 | 53 | |
| 54 | 54 | <?php |
| 55 | - if(isset($_SESSION['server_type'])) |
|
| 55 | + if (isset($_SESSION['server_type'])) |
|
| 56 | 56 | { |
| 57 | - switch($_SESSION['server_type']) |
|
| 57 | + switch ($_SESSION['server_type']) |
|
| 58 | 58 | { |
| 59 | 59 | case 'life': |
| 60 | 60 | include("views/life/nav.php"); |
@@ -62,8 +62,8 @@ discard block |
||
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | foreach ($settings['plugins'] as &$plugin) { |
| 65 | - if (file_exists("plugins/". $plugin. "/nav.php")) { |
|
| 66 | - include("plugins/". $plugin."/nav.php"); |
|
| 65 | + if (file_exists("plugins/" . $plugin . "/nav.php")) { |
|
| 66 | + include("plugins/" . $plugin . "/nav.php"); |
|
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | 69 | |
@@ -40,7 +40,9 @@ |
||
| 40 | 40 | ?> |
| 41 | 41 | <h5 class="centered"> |
| 42 | 42 | <?php |
| 43 | - if ($_SESSION['steamsignon']) echo '<i class="fa fa-steam-square"></i>'; |
|
| 43 | + if ($_SESSION['steamsignon']) { |
|
| 44 | + echo '<i class="fa fa-steam-square"></i>'; |
|
| 45 | + } |
|
| 44 | 46 | echo $_SESSION['user_name']; ?> |
| 45 | 47 | </h5> |
| 46 | 48 | |
@@ -77,7 +77,10 @@ |
||
| 77 | 77 | </div> |
| 78 | 78 | </div> |
| 79 | 79 | <script async src="<?php echo $settings['url'] ?>assets/js/main.min.js"></script> |
| 80 | -<?php if (isset($_SESSION['forum_lang'])) echo '<script async type="text/javascript" src="' . $settings["url"] . 'assets/js/language/' . $_SESSION['forum_lang'] . '.js"></script>'; ?> |
|
| 80 | +<?php if (isset($_SESSION['forum_lang'])) { |
|
| 81 | + echo '<script async type="text/javascript" src="' . $settings["url"] . 'assets/js/language/' . $_SESSION['forum_lang'] . '.js"></script>'; |
|
| 82 | +} |
|
| 83 | +?> |
|
| 81 | 84 | <script> |
| 82 | 85 | function searchpage() { |
| 83 | 86 | sn = document.getElementById('searchText').value; |
@@ -15,9 +15,9 @@ |
||
| 15 | 15 | <select style="margin-right:15px;" onchange="if (this.value) window.location.href='?items='+this.value" id='items' class="form-control" name='items'> |
| 16 | 16 | <?php |
| 17 | 17 | foreach ($settings['item'] as $item) { |
| 18 | - echo '<option value="'.$item.'"'; |
|
| 18 | + echo '<option value="' . $item . '"'; |
|
| 19 | 19 | if ($item == $_SESSION['items']) echo ' selected'; |
| 20 | - echo '>'.$item.'</option>'; |
|
| 20 | + echo '>' . $item . '</option>'; |
|
| 21 | 21 | } |
| 22 | 22 | ?> |
| 23 | 23 | </select> |
@@ -9,14 +9,18 @@ |
||
| 9 | 9 | <div class="form-inline pull-right-md"> |
| 10 | 10 | <form name='rows' method="post" action="<?php echo $settings['url'] . $currentPage ?>"> |
| 11 | 11 | |
| 12 | - <input id='searchText' class="form-control" type='text' name='searchText' placeholder="<?php if (isset($search)) echo $search ?>"> |
|
| 12 | + <input id='searchText' class="form-control" type='text' name='searchText' placeholder="<?php if (isset($search)) { |
|
| 13 | + echo $search ?>"> |
|
| 13 | 14 | <input style='margin-right: 10px;' class='btn btn-primary' type='button' name='search' onclick='searchpage();' value='<?php echo $lang['search'] ?>'> |
| 14 | 15 | </form> |
| 15 | 16 | <select style="margin-right:15px;" onchange="if (this.value) window.location.href='?items='+this.value" id='items' class="form-control" name='items'> |
| 16 | 17 | <?php |
| 17 | 18 | foreach ($settings['item'] as $item) { |
| 18 | 19 | echo '<option value="'.$item.'"'; |
| 19 | - if ($item == $_SESSION['items']) echo ' selected'; |
|
| 20 | +} |
|
| 21 | + if ($item == $_SESSION['items']) { |
|
| 22 | + echo ' selected'; |
|
| 23 | + } |
|
| 20 | 24 | echo '>'.$item.'</option>'; |
| 21 | 25 | } |
| 22 | 26 | ?> |
@@ -2,7 +2,7 @@ |
||
| 2 | 2 | $db_link = serverConnect(); |
| 3 | 3 | |
| 4 | 4 | if ($db_link->connect_error) { |
| 5 | - echo '<h1>'.$lang['dbError'].'</h1>'; |
|
| 5 | + echo '<h1>' . $lang['dbError'] . '</h1>'; |
|
| 6 | 6 | unset($_SESSION['server_type']); |
| 7 | 7 | unset($_SESSION['dbid']); |
| 8 | 8 | } else { |
@@ -16,7 +16,10 @@ |
||
| 16 | 16 | </h1> |
| 17 | 17 | </div> |
| 18 | 18 | </div> |
| 19 | - <?php if (isset($_SESSION['update'])) echo '<div class="alert alert-info" role="alert">' . $land['updateMessage'] . ' (' . $_SESSION['message']->version . ') <a href="https://github.com/Cyberbyte-Studios/CyberWorks/releases">Download Section</a</div>'; ?> |
|
| 19 | + <?php if (isset($_SESSION['update'])) { |
|
| 20 | + echo '<div class="alert alert-info" role="alert">' . $land['updateMessage'] . ' (' . $_SESSION['message']->version . ') <a href="https://github.com/Cyberbyte-Studios/CyberWorks/releases">Download Section</a</div>'; |
|
| 21 | +} |
|
| 22 | +?> |
|
| 20 | 23 | <div class="row"> |
| 21 | 24 | <div class="col-lg-4"> |
| 22 | 25 | <div class="content-panel"> |
@@ -16,20 +16,26 @@ discard block |
||
| 16 | 16 | $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 . "%' ;"; |
| 17 | 17 | $result_of_query = $db_link->query($sql); |
| 18 | 18 | $total_records = mysqli_num_rows($result_of_query); |
| 19 | - if ($pageNum > $total_records) $pageNum = $total_records; |
|
| 19 | + if ($pageNum > $total_records) { |
|
| 20 | + $pageNum = $total_records; |
|
| 21 | + } |
|
| 20 | 22 | $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 . " ;"; |
| 21 | 23 | } else { |
| 22 | 24 | $sql = "SELECT `id` FROM `gangs` WHERE `name` LIKE '%" . $search . "%' OR `id` = '" . $search . "' OR `owner` LIKE '" . $search . "' OR `members` LIKE '%" . $search . "%' ;"; |
| 23 | 25 | $result_of_query = $db_link->query($sql); |
| 24 | 26 | $total_records = mysqli_num_rows($result_of_query); |
| 25 | - if ($pageNum > $total_records) $pageNum = $total_records; |
|
| 27 | + if ($pageNum > $total_records) { |
|
| 28 | + $pageNum = $total_records; |
|
| 29 | + } |
|
| 26 | 30 | $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 . " ;"; |
| 27 | 31 | } |
| 28 | 32 | } else { |
| 29 | 33 | $sql = "SELECT `id` FROM `gangs`;"; |
| 30 | 34 | $result_of_query = $db_link->query($sql); |
| 31 | 35 | $total_records = mysqli_num_rows($result_of_query); |
| 32 | - if ($pageNum > $total_records) $pageNum = $total_records; |
|
| 36 | + if ($pageNum > $total_records) { |
|
| 37 | + $pageNum = $total_records; |
|
| 38 | + } |
|
| 33 | 39 | $sql = "SELECT `id`,`name`,`owner`,`bank`,`members`,`maxmembers`,`active` FROM `gangs` " . $max . " ;"; |
| 34 | 40 | } |
| 35 | 41 | $result_of_query = $db_link->query($sql); |
@@ -100,4 +106,6 @@ discard block |
||
| 100 | 106 | </div> |
| 101 | 107 | |
| 102 | 108 | <?php |
| 103 | -} else echo errorMessage(3, $lang); |
|
| 104 | 109 | \ No newline at end of file |
| 110 | +} else { |
|
| 111 | + echo errorMessage(3, $lang); |
|
| 112 | +} |
|
@@ -89,7 +89,8 @@ discard block |
||
| 89 | 89 | </div> |
| 90 | 90 | <div class="col-md-3 pull-right"> |
| 91 | 91 | <form style="float:right;" name='search'> |
| 92 | - <input id='searchText' type='text' name='searchText' placeholder="<?php if (isset($search)) echo $search ?>"> |
|
| 92 | + <input id='searchText' type='text' name='searchText' placeholder="<?php if (isset($search)) { |
|
| 93 | + echo $search ?>"> |
|
| 93 | 94 | <input class='btn btn-sm btn-primary' type='button' name='search' |
| 94 | 95 | onclick='searchpage();' value='<?php echo $lang['search'] ?>'> |
| 95 | 96 | </form> |
@@ -99,7 +100,9 @@ discard block |
||
| 99 | 100 | <table class="table table-striped table-advance table-hover"> |
| 100 | 101 | <thead> |
| 101 | 102 | <tr> |
| 102 | - <th><i class="fa fa-eye"></i> <?php echo $lang['owner']; ?></th> |
|
| 103 | + <th><i class="fa fa-eye"></i> <?php echo $lang['owner']; |
|
| 104 | +} |
|
| 105 | +?></th> |
|
| 103 | 106 | <th><i class="fa fa-car"></i> <?php echo $lang['class']; ?></th> |
| 104 | 107 | <th class="hidden-xs"><i class="fa fa-car"></i> <?php echo $lang['type']; ?></th> |
| 105 | 108 | <th class="hidden-xs"><i class="fa fa-car"></i> <?php echo $lang['plate']; ?></th> |
@@ -68,4 +68,6 @@ |
||
| 68 | 68 | </div> |
| 69 | 69 | </div> |
| 70 | 70 | <?php |
| 71 | -} else echo errorMessage(3, $lang); |
|
| 72 | 71 | \ No newline at end of file |
| 72 | +} else { |
|
| 73 | + echo errorMessage(3, $lang); |
|
| 74 | +} |
|
@@ -87,7 +87,7 @@ |
||
| 87 | 87 | if (!$db_connection->connect_errno) { |
| 88 | 88 | if ($login->isUserLoggedIn() == true) { |
| 89 | 89 | |
| 90 | - if ($_SESSION['multiDB'] && isset($_POST['dbid']) && isset($_POST['type'])) { |
|
| 90 | + if ($_SESSION['multiDB'] && isset($_POST['dbid']) && isset($_POST['type'])) { |
|
| 91 | 91 | $_SESSION['server_type'] = $_POST['type']; |
| 92 | 92 | $_SESSION['dbid'] = $_POST['dbid']; |
| 93 | 93 | } |
@@ -101,7 +101,7 @@ |
||
| 101 | 101 | $_SESSION['formtoken'][1] = time(); |
| 102 | 102 | |
| 103 | 103 | if (isset($_GET['items'])) { |
| 104 | - if (in_array($_GET['items'],$settings['item'])) { |
|
| 104 | + if (in_array($_GET['items'], $settings['item'])) { |
|
| 105 | 105 | $sql = "UPDATE `users` SET `items` = " . $_GET['items'] . " WHERE `user_id` = '" . $_SESSION['user_id'] . "' "; |
| 106 | 106 | $db_connection->query($sql); |
| 107 | 107 | $_SESSION['items'] = intval($_GET['items']); |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | logAction($_SESSION['user_name'], $lang['visited'] . " '" . $currentPage . "'", 1); |
| 240 | 240 | $page = "views/life/admins.php"; |
| 241 | 241 | } |
| 242 | - } elseif ($currentPage == 'police') { |
|
| 242 | + } elseif ($currentPage == 'police') { |
|
| 243 | 243 | if ($_SESSION['permissions']['view']['player']) { |
| 244 | 244 | if ($query) { |
| 245 | 245 | $search = $url['path'][$settings['base'] + 1]; |
@@ -522,15 +522,20 @@ discard block |
||
| 522 | 522 | if ($settings['2factor']) { |
| 523 | 523 | if ($_SESSION['2factor'] == 0) { |
| 524 | 524 | if ($settings['force2factor'] == 'steam') { |
| 525 | - if (!$_SESSION['steamsignon']) $_SESSION['2factor'] == 5; |
|
| 526 | - } elseif ($settings['force2factor'] == 'all') $_SESSION['2factor'] == 5; |
|
| 525 | + if (!$_SESSION['steamsignon']) { |
|
| 526 | + $_SESSION['2factor'] == 5; |
|
| 527 | + } |
|
| 528 | + } elseif ($settings['force2factor'] == 'all') { |
|
| 529 | + $_SESSION['2factor'] == 5; |
|
| 530 | + } |
|
| 527 | 531 | $page = 'views/core/2factor.php'; |
| 528 | 532 | } elseif ($_SESSION['2factor'] == 1 || $_SESSION['2factor'] == 3) { |
| 529 | 533 | if (isset($_POST['code'])) { |
| 530 | 534 | $sql = "SELECT `twoFactor` FROM `users` WHERE `user_id` = '" . $_SESSION['user_id'] . "';"; |
| 531 | 535 | $user = $db_connection->query($sql)->fetch_object(); |
| 532 | - if ($gauth->verifyCode($user->twoFactor, $_POST['code'])) $_SESSION['2factor'] = 2; |
|
| 533 | - else { |
|
| 536 | + if ($gauth->verifyCode($user->twoFactor, $_POST['code'])) { |
|
| 537 | + $_SESSION['2factor'] = 2; |
|
| 538 | + } else { |
|
| 534 | 539 | $sql = "SELECT `backup` FROM `users` WHERE `user_id` = '" . $_SESSION['user_id'] . "';"; |
| 535 | 540 | $user = $db_connection->query($sql)->fetch_object(); |
| 536 | 541 | if ($user->backup == $_POST['code']) { |
@@ -540,7 +545,9 @@ discard block |
||
| 540 | 545 | $page = 'views/core/2factor.php'; |
| 541 | 546 | } |
| 542 | 547 | } |
| 543 | - } else $page = 'views/core/2factor.php'; |
|
| 548 | + } else { |
|
| 549 | + $page = 'views/core/2factor.php'; |
|
| 550 | + } |
|
| 544 | 551 | } |
| 545 | 552 | } |
| 546 | 553 | |