diff --git a/admin/pages/accounts.php b/admin/pages/accounts.php
index 35543b0a..2d9c1bbd 100644
--- a/admin/pages/accounts.php
+++ b/admin/pages/accounts.php
@@ -26,8 +26,6 @@ if (setting('core.account_country'))
$nameOrNumberColumn = getAccountIdentityColumn();
$hasSecretColumn = $db->hasColumn('accounts', 'secret');
-$hasCoinsColumn = $db->hasColumn('accounts', 'coins');
-
$hasPointsColumn = $db->hasColumn('accounts', 'premium_points');
$hasTypeColumn = $db->hasColumn('accounts', 'type');
$hasGroupColumn = $db->hasColumn('accounts', 'group_id');
@@ -138,7 +136,7 @@ else if (isset($_REQUEST['search'])) {
$errors['email'] = Validator::getLastError();
// tibia coins
- if ($hasCoinsColumn) {
+ if (HAS_ACCOUNT_COINS) {
$t_coins = $_POST['t_coins'];
verify_number($t_coins, 'Tibia coins', 12);
}
@@ -197,7 +195,7 @@ else if (isset($_REQUEST['search'])) {
$account->setCustomField('key', $key);
$account->setEMail($email);
- if ($hasCoinsColumn) {
+ if (HAS_ACCOUNT_COINS) {
$account->setCustomField('coins', $t_coins);
}
@@ -406,7 +404,7 @@ else if (isset($_REQUEST['search'])) {
getEMail() . '">Send Mail)' : ''); ?>
-
+
diff --git a/admin/pages/mass_account.php b/admin/pages/mass_account.php
index 46c9bc9d..6b1ccb46 100644
--- a/admin/pages/mass_account.php
+++ b/admin/pages/mass_account.php
@@ -18,7 +18,6 @@ $title = 'Mass Account Actions';
csrfProtect();
-$hasCoinsColumn = $db->hasColumn('accounts', 'coins');
$hasPointsColumn = $db->hasColumn('accounts', 'premium_points');
$freePremium = $config['lua']['freePremium'];
@@ -40,9 +39,7 @@ function admin_give_points($points)
function admin_give_coins($coins)
{
- global $hasCoinsColumn;
-
- if (!$hasCoinsColumn) {
+ if (!HAS_ACCOUNT_COINS) {
displayMessage('Coins not supported.');
return;
}
@@ -167,19 +164,19 @@ if (!empty(ACTION) && isRequestMethod('post')) {
}
else {
$twig->display('admin.tools.account.html.twig', array(
- 'hasCoinsColumn' => $hasCoinsColumn,
+ 'hasCoinsColumn' => HAS_ACCOUNT_COINS,
'hasPointsColumn' => $hasPointsColumn,
'freePremium' => $freePremium,
));
}
function displayMessage($message, $success = false) {
- global $twig, $hasCoinsColumn, $hasPointsColumn, $freePremium;
+ global $twig, $hasPointsColumn, $freePremium;
$success ? success($message): error($message);
$twig->display('admin.tools.account.html.twig', array(
- 'hasCoinsColumn' => $hasCoinsColumn,
+ 'hasCoinsColumn' => HAS_ACCOUNT_COINS,
'hasPointsColumn' => $hasPointsColumn,
'freePremium' => $freePremium,
));
diff --git a/admin/pages/modules/coins.php b/admin/pages/modules/coins.php
index 939ee16c..66ce0186 100644
--- a/admin/pages/modules/coins.php
+++ b/admin/pages/modules/coins.php
@@ -6,7 +6,7 @@ defined('MYAAC') or die('Direct access not allowed!');
$coins = 0;
-if ($db->hasColumn('accounts', 'coins')) {
+if (HAS_ACCOUNT_COINS) {
$whatToGet = ['id', 'coins'];
if (USE_ACCOUNT_NAME) {
$whatToGet[] = 'name';
diff --git a/system/init.php b/system/init.php
index b0c36c48..57c299ba 100644
--- a/system/init.php
+++ b/system/init.php
@@ -148,6 +148,7 @@ define('USE_ACCOUNT_NAME', $db->hasColumn('accounts', 'name'));
define('USE_ACCOUNT_NUMBER', $db->hasColumn('accounts', 'number'));
define('USE_ACCOUNT_SALT', $db->hasColumn('accounts', 'salt'));
+define('HAS_ACCOUNT_COINS', $db->hasColumn('accounts', 'coins'));
define('HAS_ACCOUNT_COINS_TRANSFERABLE', $db->hasColumn('accounts', 'coins_transferable'));
define('HAS_ACCOUNT_TRANSFERABLE_COINS', $db->hasColumn('accounts', 'transferable_coins'));
const ACCOUNT_COINS_TRANSFERABLE_COLUMN = (HAS_ACCOUNT_COINS_TRANSFERABLE ? 'coins_transferable' : 'transferable_coins');
diff --git a/system/pages/account/create.php b/system/pages/account/create.php
index 8967c8e1..15f2b8b5 100644
--- a/system/pages/account/create.php
+++ b/system/pages/account/create.php
@@ -227,7 +227,7 @@ if($save)
}
$accountDefaultCoins = setting('core.account_coins');
- if($db->hasColumn('accounts', 'coins') && $accountDefaultCoins > 0) {
+ if(HAS_ACCOUNT_COINS && $accountDefaultCoins > 0) {
$new_account->setCustomField('coins', $accountDefaultCoins);
}
diff --git a/system/settings.php b/system/settings.php
index e0f1fdb6..c39c706a 100644
--- a/system/settings.php
+++ b/system/settings.php
@@ -694,7 +694,7 @@ Sent by MyAAC,
'name' => 'Default Account Coins',
'type' => 'number',
'desc' => 'Default coins on new account',
- 'hidden' => ($db && !$db->hasColumn('accounts', 'coins')),
+ 'hidden' => ($db && !HAS_ACCOUNT_COINS),
'default' => 0,
],
'account_coins_transferable' => [
@@ -1595,7 +1595,7 @@ Sent by MyAAC,
'callbacks' => [
'beforeSave' => function($key, $value, &$errorMessage) {
global $db;
- if ($value == 'coins' && !$db->hasColumn('accounts', 'coins')) {
+ if ($value == 'coins' && !HAS_ACCOUNT_COINS) {
$errorMessage = "Shop: Donate Column: Cannot set column to coins, because it doesn't exist in database.";
return false;
}