lopar/battles
0
0
Fork 0
Code Issues 21 Pull Requests Releases Wiki Activity

Рефакторинг, очистка, работа над ошибками, связанными с базой, отказ от глобальной переменной $user во многих файлах.

Browse Source 
Singleton в некоторых местах вместо решения #42.
Новые шаги для решения #16 и #52.
Closes #42.
Closes #32.
Closes #31.
This commit is contained in:
Igor Barkov (iwork)
2022-01-27 01:15:33 +02:00
parent b1ba212c8c
commit 3502904656
82 changed files with 1575 additions and 2015 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buy_klan.php
+9 -9
View File
@@ -1,11 +1,11 @@
<?php
use Battles\Bank;
use Battles\Database\DBPDO;
use Battles\Database\Db;
use Battles\User;
require_once "functions.php";
if (!User::$current->getClan() || User::$current->getBattle()) {
if (!User::getInstance()->getClan() || User::getInstance()->getBattle()) {
exit();
}
const PRICES = [
@@ -26,10 +26,10 @@ const PRICES = [
'unclone' => 25,
];
$check_owner = DBPDO::$db->ofetch('select short_name from clans where owner_id = ?', User::$current->getId());
$check_bonuses = DBPDO::$db->ofetch('select 1 from clan_bonuses where short_name = ?', User::$current->getClan());
$check_owner = Db::getInstance()->execute('select short_name from clans where owner_id = ?', User::getInstance()->getId())->fetchColumn();
$check_bonuses = Db::getInstance()->execute('select count(*) from clan_bonuses where short_name = ?', User::getInstance()->getClan())->fetchColumn();
if (User::$current->getClan() !== $check_owner->short_name) {
if (User::getInstance()->getClan() !== $check_owner) {
exit('Запрещено: Вы не глава клана.');
}
if (!$check_bonuses) {
@@ -38,14 +38,14 @@ if (!$check_bonuses) {
function buy_bonus($name): bool
{
global $prices;
$bank = new Bank(User::$current->getId());
$bank = new Bank(User::getInstance()->getId());
if ($bank->getMoney() <= PRICES[$name]) {
return false;
}
$query = sprintf('update clan_bonuses set %s = %s + 1 where short_name = ?', $name, $name);
DBPDO::$db->execute($query, User::$current->getClan());
$bank->setMoney($bank->getMoney() - $prices[$name]);
Db::getInstance()->execute($query, User::getInstance()->getClan());
$bank->setMoney($bank->getMoney() - PRICES[$name]);
return true;
}