Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-04-27 01:39:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fix othire compatibility

Browse Source 
Fix when there is no account name, just accoun tid
Fix when group and secret column does not exist
Fix save premium days on TFS 1.2
Remove lastlogin - should not be possible to change
This commit is contained in:
slawkens 2019-04-15 23:24:44 +02:00
parent 296e99772a
commit 5ad82a305e
1 changed files with 48 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
system/pages/admin/accounts.php
View File

@ -37,6 +37,7 @@ function verify_number($number, $name, $max_length)
echo_error($name . ' cannot be longer than ' . $max_length . ' digits.'); echo_error($name . ' cannot be longer than ' . $max_length . ' digits.');
} }
$hasSecretColumn = $db->hasColumn('accounts', 'secret');
$hasCoinsColumn = $db->hasColumn('accounts', 'coins'); $hasCoinsColumn = $db->hasColumn('accounts', 'coins');
$hasPointsColumn = $db->hasColumn('accounts', 'premium_points'); $hasPointsColumn = $db->hasColumn('accounts', 'premium_points');
$hasTypeColumn = $db->hasColumn('accounts', 'type'); $hasTypeColumn = $db->hasColumn('accounts', 'type');
@ -89,29 +90,38 @@ if ($id > 0) {
$account = new OTS_Account(); $account = new OTS_Account();
$account->load($id); $account->load($id);
if (isset($account) && $account->isLoaded() && isset($_POST['save'])) {// we want to save if (isset($account, $_POST['save']) && $account->isLoaded()) {// we want to save
$error = false; $error = false;
$name = $_POST['name'];
$_error = ''; $_error = '';
$account_db = new OTS_Account(); $account_db = new OTS_Account();
$account_db->find($name); if(USE_ACCOUNT_NAME) {
if ($account_db->isLoaded() && $account->getName() != $name) $name = $_POST['name'];
echo_error('This name is already used. Please choose another name!');
$account_db->find($name);
if ($account_db->isLoaded() && $account->getName() != $name)
echo_error('This name is already used. Please choose another name!');
}
$account_db->load($id); $account_db->load($id);
if (!$account_db->isLoaded()) if (!$account_db->isLoaded())
echo_error('Account with this id doesn\'t exist.'); echo_error('Account with this id doesn\'t exist.');
//type/group //type/group
$group = $_POST['group']; if($hasTypeColumn || $hasGroupColumn) {
$group = $_POST['group'];
}
$password = ((!empty($_POST["pass"]) ? $_POST['pass'] : null)); $password = ((!empty($_POST["pass"]) ? $_POST['pass'] : null));
if (!Validator::password($password)) { if (!Validator::password($password)) {
$errors['password'] = Validator::getLastError(); $errors['password'] = Validator::getLastError();
} }
//secret //secret
$secret = $_POST['secret']; if($hasSecretColumn) {
$secret = $_POST['secret'];
}
//key //key
$key = $_POST['key']; $key = $_POST['key'];
$email = $_POST['email']; $email = $_POST['email'];
@ -124,7 +134,7 @@ if ($id > 0) {
verify_number($t_coins, 'Tibia coins', 12); verify_number($t_coins, 'Tibia coins', 12);
} }
// prem days // prem days
$p_days = $_POST['p_days']; $p_days = (int)$_POST['p_days'];
verify_number($p_days, 'Prem days', 11); verify_number($p_days, 'Prem days', 11);
//prem points //prem points
@ -147,16 +157,14 @@ if ($id > 0) {
$created = $_POST['created']; $created = $_POST['created'];
verify_number($created, 'Created', 11); verify_number($created, 'Created', 11);
//last login
$lastlogin = $_POST['lastlogin'];
verify_number($lastlogin, 'Last login', 11);
//web last login //web last login
$web_lastlogin = $_POST['web_lastlogin']; $web_lastlogin = $_POST['web_lastlogin'];
verify_number($web_lastlogin, 'Web Last logout', 11); verify_number($web_lastlogin, 'Web Last logout', 11);
if (!$error) { if (!$error) {
$account->setName($name); if(USE_ACCOUNT_NAME) {
$account->setName($name);
}
if ($hasTypeColumn) { if ($hasTypeColumn) {
$account->setCustomField('type', $group); $account->setCustomField('type', $group);
@ -164,13 +172,24 @@ if ($id > 0) {
$account->setCustomField('group_id', $group); $account->setCustomField('group_id', $group);
} }
$account->setCustomField('secret', $secret); if($hasSecretColumn) {
$account->setCustomField('secret', $secret);
}
$account->setCustomField('key', $key); $account->setCustomField('key', $key);
$account->setEMail($email); $account->setEMail($email);
if ($hasCoinsColumn) { if ($hasCoinsColumn) {
$account->setCustomField('coins', $t_coins); $account->setCustomField('coins', $t_coins);
} }
$lastDay = 0;
if($p_days != 0 && $p_days != PHP_INT_MAX ) {
$lastDay = time();
} else if ($lastDay != 0) {
$lastDay = 0;
}
$account->setPremDays($p_days); $account->setPremDays($p_days);
$account->setLastLogin($lastDay);
if ($hasPointsColumn) { if ($hasPointsColumn) {
$account->setCustomField('premium_points', $p_points); $account->setCustomField('premium_points', $p_points);
} }
@ -178,7 +197,6 @@ if ($id > 0) {
$account->setLocation($rl_loca); $account->setLocation($rl_loca);
$account->setCountry($rl_country); $account->setCountry($rl_country);
$account->setCustomField('created', $created); $account->setCustomField('created', $created);
$account->setLastLogin($lastlogin);
$account->setWebFlags($web_flags); $account->setWebFlags($web_flags);
$account->setCustomField('web_lastlogin', $web_lastlogin); $account->setCustomField('web_lastlogin', $web_lastlogin);
@ -203,14 +221,19 @@ if ($id > 0) {
} }
} }
$search_name = '';
$search_account = ''; $search_account = '';
if (isset($_REQUEST['search_name'])) if (isset($_REQUEST['search_name']))
$search_name = $_REQUEST['search_name']; $search_account = $_REQUEST['search_name'];
else if (isset($_REQUEST['search_account'])) else if (isset($_REQUEST['search_account']))
$search_account = $_REQUEST['search_account']; $search_account = $_REQUEST['search_account'];
else if ($id > 0 && isset($account) && $account->isLoaded()) else if ($id > 0 && isset($account) && $account->isLoaded()) {
$search_name = $account->getName(); if(USE_ACCOUNT_NAME) {
$search_account = $account->getName();
}
else {
$search_account = $account->getId();
}
}
?> ?>
<div class="row"> <div class="row">
@ -222,12 +245,14 @@ else if ($id > 0 && isset($account) && $account->isLoaded())
<div class="box box-primary"> <div class="box box-primary">
<div class="box-body"> <div class="box-body">
<div class="row"> <div class="row">
<?php if(USE_ACCOUNT_NAME): ?>
<div class="col-xs-4"> <div class="col-xs-4">
<label for="name" class="control-label">Account Name:</label> <label for="name" class="control-label">Account Name:</label>
<input type="text" class="form-control" id="name" name="name" <input type="text" class="form-control" id="name" name="name"
autocomplete="off" style="cursor: auto;" autocomplete="off" style="cursor: auto;"
value="<?php echo $account->getName(); ?>"/> value="<?php echo $account->getName(); ?>"/>
</div> </div>
<?php endif; ?>
<div class="col-xs-5"> <div class="col-xs-5">
<label for="c_pass" class="control-label">Password: (check to change)</label> <label for="c_pass" class="control-label">Password: (check to change)</label>
<div class="input-group"> <div class="input-group">
@ -287,12 +312,14 @@ else if ($id > 0 && isset($account) && $account->isLoaded())
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<?php if($hasSecretColumn): ?>
<div class="col-xs-6"> <div class="col-xs-6">
<label for="secret" class="control-label">Secret:</label> <label for="secret" class="control-label">Secret:</label>
<input type="text" class="form-control" id="secret" name="secret" <input type="text" class="form-control" id="secret" name="secret"
autocomplete="off" style="cursor: auto;" size="8" maxlength="11" autocomplete="off" style="cursor: auto;" size="8" maxlength="11"
value="<?php echo $account->getCustomField('secret'); ?>"/> value="<?php echo $account->getCustomField('secret'); ?>"/>
</div> </div>
<?php endif; ?>
<div class="col-xs-6"> <div class="col-xs-6">
<label for="key" class="control-label">Key:</label> <label for="key" class="control-label">Key:</label>
<input type="text" class="form-control" id="key" name="key" <input type="text" class="form-control" id="key" name="key"
@ -359,12 +386,6 @@ else if ($id > 0 && isset($account) && $account->isLoaded())
autocomplete="off" maxlength="20" autocomplete="off" maxlength="20"
value="<?php echo $account->getCustomField('created'); ?>"/> value="<?php echo $account->getCustomField('created'); ?>"/>
</div> </div>
<div class="col-xs-4">
<label for="lastlogin" class="control-label">Last Login:</label>
<input type="text" class="form-control" id="lastlogin" name="lastlogin"
autocomplete="off" maxlength="20"
value="<?php echo $account->getLastLogin(); ?>"/>
</div>
<div class="col-xs-4"> <div class="col-xs-4">
<label for="web_lastlogin" class="control-label">Web Last Login:</label> <label for="web_lastlogin" class="control-label">Web Last Login:</label>
<input type="text" class="form-control" id="web_lastlogin" name="web_lastlogin" <input type="text" class="form-control" id="web_lastlogin" name="web_lastlogin"
@ -399,7 +420,7 @@ else if ($id > 0 && isset($account) && $account->isLoaded())
<div class="box-body"> <div class="box-body">
<form action="<?php echo $base; ?>" method="post"> <form action="<?php echo $base; ?>" method="post">
<div class="input-group input-group-sm"> <div class="input-group input-group-sm">
<input type="text" class="form-control" name="search_name" value="<?php echo $search_name; ?>" <input type="text" class="form-control" name="search_name" value="<?php echo $search_account; ?>"
maxlength="32" size="32"> maxlength="32" size="32">
<span class="input-group-btn"> <span class="input-group-btn">
<button type="submit" type="button" class="btn btn-info btn-flat">Search</button> <button type="submit" type="button" class="btn btn-info btn-flat">Search</button>
@ -451,7 +472,6 @@ else if ($id > 0 && isset($account) && $account->isLoaded())
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$('#lastlogin').datetimepicker({format: 'unixtime'});
$('#lastlogout').datetimepicker({format: 'unixtime'}); $('#lastlogout').datetimepicker({format: 'unixtime'});
$('#created').datetimepicker({format: 'unixtime'}); $('#created').datetimepicker({format: 'unixtime'});
$('#web_lastlogin').datetimepicker({format: 'unixtime'}); $('#web_lastlogin').datetimepicker({format: 'unixtime'});
@ -461,4 +481,4 @@ else if ($id > 0 && isset($account) && $account->isLoaded())
$('input[name=pass]')[0].value = ''; $('input[name=pass]')[0].value = '';
}).change(); }).change();
}); });
</script> </script>