Рефакторинг, очистка, работа над ошибками, связанными с базой, отказ от глобальной переменной $user во многих файлах.
Singleton в некоторых местах вместо решения #42. Новые шаги для решения #16 и #52. Closes #42. Closes #32. Closes #31.
This commit is contained in:
+4
-4
@@ -1,9 +1,9 @@
|
||||
<?php
|
||||
|
||||
use Battles\Template;
|
||||
use Battles\Template, Battles\User;
|
||||
|
||||
require_once('functions.php');
|
||||
if ($user->getRoom() == 51) {
|
||||
if (User::getInstance()->getRoom() == 51) {
|
||||
header('location: city.php');
|
||||
exit;
|
||||
}
|
||||
@@ -26,8 +26,8 @@ $map_user = loadmap_cell();
|
||||
|
||||
if ($_GET['exit_forest'] == 'true') {
|
||||
if ($forest['room']) {
|
||||
#db::c()->query('DELETE FROM `forest_bots` WHERE `user` = ?i AND `group` = ?i', $user['id'], $forest['id']);
|
||||
#db::c()->query('DELETE FROM `forest_items` WHERE `user` = ?i AND `group` = ?i', $user['id'], $forest['id']);
|
||||
#getInstance::c()->query('DELETE FROM `forest_bots` WHERE `user` = ?i AND `group` = ?i', $user['id'], $forest['id']);
|
||||
#getInstance::c()->query('DELETE FROM `forest_items` WHERE `user` = ?i AND `group` = ?i', $user['id'], $forest['id']);
|
||||
db::c()->query('UPDATE `users`,`online` SET `users`.`room` = 51, `online`.`room` = 51 WHERE `online`.`id` = `users`.`id` AND `online`.`id` = ?i', $user['id']);
|
||||
db::c()->query('DELETE FROM `forest` WHERE `user` = ?i', $user['id']);
|
||||
unset($forest);
|
||||
|
||||
Reference in New Issue
Block a user