mirror of
https://github.com/slawkens/myaac.git
synced 2025-05-02 20:29:20 +02:00
Merge branch 'develop' into feature/csrf
This commit is contained in:
slawkens
commit
8e3a71b36b
@ -331,8 +331,8 @@ else if (isset($_REQUEST['search'])) {
|
||||
<div class="col-12 col-sm-12 col-lg-6">
|
||||
<label for="group">Account Type:</label>
|
||||
<select name="group" id="group" class="form-control">
|
||||
<?php foreach ($acc_type as $id => $a_type): ?>
|
||||
<option value="<?php echo($id); ?>" <?php echo($acc_group == ($id) ? 'selected' : ''); ?>><?php echo $a_type; ?></option>
|
||||
<?php foreach ($acc_type as $_id => $a_type): ?>
|
||||
<option value="<?php echo($_id); ?>" <?php echo($acc_group == ($_id) ? 'selected' : ''); ?>><?php echo $a_type; ?></option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
@ -342,8 +342,8 @@ else if (isset($_REQUEST['search'])) {
|
||||
<div class="col-12 col-sm-12 col-lg-6">
|
||||
<label for="group">Account Type:</label>
|
||||
<select name="group" id="group" class="form-control">
|
||||
<?php foreach ($groups->getGroups() as $id => $group): ?>
|
||||
<option value="<?php echo $id; ?>" <?php echo($acc_group == $id ? 'selected' : ''); ?>><?php echo $group->getName(); ?></option>
|
||||
<?php foreach ($groups->getGroups() as $_id => $group): ?>
|
||||
<option value="<?php echo $_id; ?>" <?php echo($acc_group == $_id ? 'selected' : ''); ?>><?php echo $group->getName(); ?></option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
@ -351,8 +351,8 @@ else if (isset($_REQUEST['search'])) {
|
||||
<div class="col-12 col-sm-12 col-lg-6">
|
||||
<label for="web_flags">Website Access:</label>
|
||||
<select name="web_flags" id="web_flags" class="form-control">
|
||||
<?php foreach ($web_acc as $id => $a_type): ?>
|
||||
<option value="<?php echo($id); ?>" <?php echo($account->getWebFlags() == ($id) ? 'selected' : ''); ?>><?php echo $a_type; ?></option>
|
||||
<?php foreach ($web_acc as $_id => $a_type): ?>
|
||||
<option value="<?php echo($_id); ?>" <?php echo($account->getWebFlags() == ($_id) ? 'selected' : ''); ?>><?php echo $a_type; ?></option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
@ -407,8 +407,8 @@ else if (isset($_REQUEST['search'])) {
|
||||
<div class="col-12 col-sm-12 col-lg-4">
|
||||
<label for="rl_country">Country:</label>
|
||||
<select name="rl_country" id="rl_country" class="form-control">
|
||||
<?php foreach ($countries as $id => $a_type): ?>
|
||||
<option value="<?php echo($id); ?>" <?php echo($account->getCountry() == ($id) ? 'selected' : ''); ?>><?php echo $a_type; ?></option>
|
||||
<?php foreach ($countries as $_id => $a_type): ?>
|
||||
<option value="<?php echo($_id); ?>" <?php echo($account->getCountry() == ($_id) ? 'selected' : ''); ?>><?php echo $a_type; ?></option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
@ -586,9 +586,9 @@ else if (isset($_REQUEST['search'])) {
|
||||
<div class="col-6 col-lg-12">
|
||||
<form action="<?php echo $admin_base; ?>" method="post">
|
||||
<?php csrf(); ?>
|
||||
<label for="name">Account Name:</label>
|
||||
<label for="search">Account Name:</label>
|
||||
<div class="input-group input-group-sm">
|
||||
<input type="text" class="form-control" name="search" value="<?php echo $search_account; ?>" maxlength="32" size="32">
|
||||
<input type="text" class="form-control" id="search" name="search" value="<?= escapeHtml($search_account); ?>" maxlength="32" size="32">
|
||||
<span class="input-group-append"><button type="submit" class="btn btn-info btn-flat">Search</button></span>
|
||||
</div>
|
||||
</form>
|
||||
@ -596,9 +596,9 @@ else if (isset($_REQUEST['search'])) {
|
||||
<div class="col-6 col-lg-12">
|
||||
<form action="<?php echo $admin_base; ?>" method="post">
|
||||
<?php csrf(); ?>
|
||||
<label for="name">Account ID:</label>
|
||||
<label for="id">Account ID:</label>
|
||||
<div class="input-group input-group-sm">
|
||||
<input type="text" class="form-control" name="id" value="" maxlength="32" size="32">
|
||||
<input type="text" class="form-control" id="id" name="id" value="<?= $id; ?>" maxlength="32" size="32">
|
||||
<span class="input-group-append"><button type="submit" class="btn btn-info btn-flat">Search</button></span>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
@ -394,8 +394,8 @@ else if (isset($_REQUEST['search'])) {
|
||||
<div class="col-12 col-sm-12 col-lg-6">
|
||||
<label for="group">Group:</label>
|
||||
<select name="group" id="group" class="form-control custom-select">
|
||||
<?php foreach ($groups->getGroups() as $id => $group): ?>
|
||||
<option value="<?php echo $id; ?>" <?php echo($player->getGroup()->getId() == $id ? 'selected' : ''); ?>><?php echo $group->getName(); ?></option>
|
||||
<?php foreach ($groups->getGroups() as $_id => $group): ?>
|
||||
<option value="<?php echo $_id; ?>" <?php echo($player->getGroup()->getId() == $_id ? 'selected' : ''); ?>><?php echo $group->getName(); ?></option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
@ -403,8 +403,8 @@ else if (isset($_REQUEST['search'])) {
|
||||
<label for="vocation">Vocation</label>
|
||||
<select name="vocation" id="vocation" class="form-control custom-select">
|
||||
<?php
|
||||
foreach ($config['vocations'] as $id => $name) {
|
||||
echo '<option value=' . $id . ($id == $player->getVocation() ? ' selected' : '') . '>' . $name . '</option>';
|
||||
foreach ($config['vocations'] as $_id => $name) {
|
||||
echo '<option value=' . $_id . ($_id == $player->getVocation() ? ' selected' : '') . '>' . $name . '</option>';
|
||||
}
|
||||
?>
|
||||
</select>
|
||||
@ -414,8 +414,8 @@ else if (isset($_REQUEST['search'])) {
|
||||
<div class="col-12 col-sm-12 col-lg-6">
|
||||
<label for="sex">Sex:</label>
|
||||
<select name="sex" id="sex" class="form-control custom-select">>
|
||||
<?php foreach ($config['genders'] as $id => $sex): ?>
|
||||
<option value="<?php echo $id; ?>" <?php echo($player->getSex() == $id ? 'selected' : ''); ?>><?php echo strtolower($sex); ?></option>
|
||||
<?php foreach ($config['genders'] as $_id => $sex): ?>
|
||||
<option value="<?php echo $_id; ?>" <?php echo($player->getSex() == $_id ? 'selected' : ''); ?>><?php echo strtolower($sex); ?></option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
@ -428,8 +428,8 @@ else if (isset($_REQUEST['search'])) {
|
||||
$configTowns[$player->getTownId()] = 'Unknown Town';
|
||||
}
|
||||
|
||||
foreach ($configTowns as $id => $town): ?>
|
||||
<option value="<?php echo $id; ?>" <?php echo($player->getTownId() == $id ? 'selected' : ''); ?>><?php echo $town; ?></option>
|
||||
foreach ($configTowns as $_id => $town): ?>
|
||||
<option value="<?php echo $_id; ?>" <?php echo($player->getTownId() == $_id ? 'selected' : ''); ?>><?php echo $town; ?></option>
|
||||
<?php endforeach; ?>
|
||||
</select>
|
||||
</div>
|
||||
@ -440,8 +440,8 @@ else if (isset($_REQUEST['search'])) {
|
||||
<select name="skull" id="skull" class="form-control custom-select">
|
||||
<?php
|
||||
|
||||
foreach ($skull_type as $id => $s_name) {
|
||||
echo '<option value=' . $id . ($id == $player->getSkull() ? ' selected' : '') . '>' . $s_name . '</option>';
|
||||
foreach ($skull_type as $_id => $s_name) {
|
||||
echo '<option value=' . $_id . ($_id == $player->getSkull() ? ' selected' : '') . '>' . $s_name . '</option>';
|
||||
}
|
||||
?>
|
||||
</select>
|
||||
@ -558,16 +558,16 @@ else if (isset($_REQUEST['search'])) {
|
||||
</div>
|
||||
<div class="tab-pane fade" id="tabs-skills">
|
||||
<?php
|
||||
foreach ($skills as $id => $info) {
|
||||
foreach ($skills as $_id => $info) {
|
||||
?>
|
||||
<div class="form-group row">
|
||||
<div class="col-12 col-sm-12 col-lg-6">
|
||||
<?php echo '<label for="skills[' . $id . ']" class="control-label">' . $info[0] . '</label>
|
||||
<input type="text" class="form-control" id="skills[' . $id . ']" name="skills[' . $id . ']" maxlength="10" autocomplete="off" value="' . $player->getSkill($id) . '"/>'; ?>
|
||||
<?php echo '<label for="skills[' . $_id . ']" class="control-label">' . $info[0] . '</label>
|
||||
<input type="text" class="form-control" id="skills[' . $_id . ']" name="skills[' . $_id . ']" maxlength="10" autocomplete="off" value="' . $player->getSkill($_id) . '"/>'; ?>
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-lg-6">
|
||||
<?php echo '<label for="skills_tries[' . $id . ']" class="control-label">' . $info[0] . ' tries</label>
|
||||
<input type="text" class="form-control" id="skills_tries[' . $id . ']" name="skills_tries[' . $id . ']" maxlength="10" autocomplete="off" value="' . $player->getSkillTries($id) . '"/>'; ?>
|
||||
<?php echo '<label for="skills_tries[' . $_id . ']" class="control-label">' . $info[0] . ' tries</label>
|
||||
<input type="text" class="form-control" id="skills_tries[' . $_id . ']" name="skills_tries[' . $_id . ']" maxlength="10" autocomplete="off" value="' . $player->getSkillTries($_id) . '"/>'; ?>
|
||||
</div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
@ -626,7 +626,7 @@ else if (isset($_REQUEST['search'])) {
|
||||
if ($outfitlist) { ?>
|
||||
<select name="look_type" id="look_type" class="form-control custom-select">
|
||||
<?php
|
||||
foreach ($outfitlist as $id => $outfit) {
|
||||
foreach ($outfitlist as $_id => $outfit) {
|
||||
if ($outfit['enabled'] == 'yes') ;
|
||||
echo '<option value=' . $outfit['id'] . ($outfit['id'] == $player->getLookType() ? ' selected' : '') . '>' . $outfit['name'] . ' - ' . ($outfit['type'] == 1 ? 'Male' : 'Female') . '</option>';
|
||||
}
|
||||
@ -642,8 +642,8 @@ else if (isset($_REQUEST['search'])) {
|
||||
<select name="look_addons" id="look_addons" class="form-control custom-select">
|
||||
<?php
|
||||
$addon_type = array("None", "First", "Second", "Both");
|
||||
foreach ($addon_type as $id => $s_name) {
|
||||
echo '<option value=' . $id . ($id == $player->getLookAddons() ? ' selected' : '') . '>' . $s_name . '</option>';
|
||||
foreach ($addon_type as $_id => $s_name) {
|
||||
echo '<option value=' . $_id . ($_id == $player->getLookAddons() ? ' selected' : '') . '>' . $s_name . '</option>';
|
||||
}
|
||||
?>
|
||||
</select>
|
||||
@ -708,7 +708,7 @@ else if (isset($_REQUEST['search'])) {
|
||||
<div class="form-group row">
|
||||
<div class="col-12">
|
||||
<label for="comment" class="control-label">Comment:</label>
|
||||
<textarea class="form-control" name="comment" rows="10" cols="50" wrap="virtual"><?php echo $player->getCustomField("comment"); ?></textarea>
|
||||
<textarea class="form-control" id="comment" name="comment" rows="10" cols="50" wrap="virtual"><?php echo $player->getCustomField("comment"); ?></textarea>
|
||||
<small>[max. length: 2000 chars, 50 lines (ENTERs)]</small>
|
||||
</div>
|
||||
</div>
|
||||
@ -845,7 +845,7 @@ else if (isset($_REQUEST['search'])) {
|
||||
|
||||
<?php if($hasLookAddons): ?>
|
||||
const $addonvalue = $('#look_addons');
|
||||
$('#look_addons').on('change', () => {
|
||||
$addonvalue.on('change', () => {
|
||||
updateOutfit();
|
||||
});
|
||||
<?php endif; ?>
|
||||
@ -875,9 +875,9 @@ else if (isset($_REQUEST['search'])) {
|
||||
<div class="col-6 col-lg-12">
|
||||
<form action="<?php echo $player_base; ?>" method="post">
|
||||
<?php csrf(); ?>
|
||||
<label for="name">Player Name:</label>
|
||||
<label for="search">Player Name:</label>
|
||||
<div class="input-group input-group-sm">
|
||||
<input type="text" class="form-control" name="search" value="<?php echo $search_player; ?>" maxlength="32" size="32">
|
||||
<input type="text" class="form-control" id="search" name="search" value="<?= escapeHtml($search_player); ?>" maxlength="32" size="32">
|
||||
<span class="input-group-append"><button type="submit" class="btn btn-info btn-flat">Search</button></span>
|
||||
</div>
|
||||
</form>
|
||||
@ -885,9 +885,9 @@ else if (isset($_REQUEST['search'])) {
|
||||
<div class="col-6 col-lg-12">
|
||||
<form action="<?php echo $player_base; ?>" method="post">
|
||||
<?php csrf(); ?>
|
||||
<label for="name">Player ID:</label>
|
||||
<label for="id">Player ID:</label>
|
||||
<div class="input-group input-group-sm">
|
||||
<input type="text" class="form-control" name="id" value="" maxlength="32" size="32">
|
||||
<input type="text" class="form-control" id="id" name="id" value="<?= $id; ?>" maxlength="32" size="32">
|
||||
<span class="input-group-append"><button type="submit" class="btn btn-info btn-flat">Search</button></span>
|
||||
</div>
|
||||
</form>
|
||||
@ -898,7 +898,7 @@ else if (isset($_REQUEST['search'])) {
|
||||
</div>
|
||||
|
||||
<script>
|
||||
$(document).ready(function () {
|
||||
$(function () {
|
||||
$('.player_datatable').DataTable({
|
||||
"order": [[0, "asc"]]
|
||||
});
|
||||
|
||||
@ -28,7 +28,7 @@ if(isset($config['boxes']))
|
||||
<?php
|
||||
if(PAGE !== 'news') {
|
||||
if(isset($_REQUEST['subtopic'])) {
|
||||
$tmp = $_REQUEST['subtopic'];
|
||||
$tmp = escapeHtml($_REQUEST['subtopic']);
|
||||
if($tmp === 'accountmanagement') {
|
||||
$tmp = 'accountmanage';
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user