Code smell.

This commit is contained in:
Ivor Barhansky
2022-12-17 01:20:43 +02:00
parent b1f578f4b0
commit 0398425205
45 changed files with 875 additions and 851 deletions
+104 -48
View File
@@ -15,86 +15,142 @@ if (isset($_POST)) {
<tr>
<th id="main">Основное
<tr>
<td><input name="name" placeholder="Название">
<td><label>
<input name="name" placeholder="Название">
</label>
<tr>
<td><input name="image" placeholder="Картинка">
<td><label>
<input name="image" placeholder="Картинка">
</label>
<tr>
<td><select name="shop">
<option value="0" selected disabled>Тип магазина</option>
<option value="1">Обычный</option>
<option value="2">Цветной</option>
</select>
<td><label>
<select name="shop">
<option value="0" selected disabled>Тип магазина</option>
<option value="1">Обычный</option>
<option value="2">Цветной</option>
</select>
</label>
<tr>
<td><input name=count placeholder="Количество (шт.)" disabled>
<td><label>
<input name=count placeholder="Количество (шт.)" disabled>
</label>
<tr>
<td><select name="item_type">
<option value="0" selected disabled>Тип предмета</option>
<option value="1">Шлем</option>
<option value="2">Броня</option>
<option value="3">Поножи</option>
<option value="4">Сапоги</option>
<option value="5">Перчатки</option>
<option value="6">Оружие</option>
<option value="7">Щит</option>
<option value="8">Пояс</option>
<option value="9">Кольцо</option>
<option value="10">Амулет</option>
<option value="20">Расходник</option>
<option value="50">Всё остальное</option>
<option value="100">Хлам</option>
</select>
<td><label>
<select name="item_type">
<option value="0" selected disabled>Тип предмета</option>
<option value="1">Шлем</option>
<option value="2">Броня</option>
<option value="3">Поножи</option>
<option value="4">Сапоги</option>
<option value="5">Перчатки</option>
<option value="6">Оружие</option>
<option value="7">Щит</option>
<option value="8">Пояс</option>
<option value="9">Кольцо</option>
<option value="10">Амулет</option>
<option value="20">Расходник</option>
<option value="50">Всё остальное</option>
<option value="100">Хлам</option>
</select>
</label>
<tr>
<td><input name=weight placeholder="Масса">
<td><label>
<input name=weight placeholder="Масса">
</label>
<tr>
<td><input name=durability placeholder="Макс. износ">
<td><label>
<input name=durability placeholder="Макс. износ">
</label>
<tr>
<td><input name=price placeholder="Цена (кр.)" disabled>
<td><label>
<input name=price placeholder="Цена (кр.)" disabled>
</label>
<tr>
<th id="needs">Требования
<tr>
<td><input name=need_level placeholder="Уровень">
<td><label>
<input name=need_level placeholder="Уровень">
</label>
<tr>
<td><input name=need_strength placeholder="Сила">
<td><label>
<input name=need_strength placeholder="Сила">
</label>
<tr>
<td><input name=need_dexterity placeholder="Ловкость">
<td><label>
<input name=need_dexterity placeholder="Ловкость">
</label>
<tr>
<td><input name=need_intuition placeholder="Интуиция">
<td><label>
<input name=need_intuition placeholder="Интуиция">
</label>
<tr>
<td><input name=need_endurance placeholder="Выносливость">
<td><label>
<input name=need_endurance placeholder="Выносливость">
</label>
<tr>
<td><input name=need_intelligence placeholder="Интеллект">
<td><label>
<input name=need_intelligence placeholder="Интеллект">
</label>
<tr>
<td><input name=need_wisdom placeholder="Мудрость">
<td><label>
<input name=need_wisdom placeholder="Мудрость">
</label>
<tr>
<th id="adds">Характеристики
<tr>
<td><input name=minu placeholder="Мин.урон">
<td><label>
<input name=minu placeholder="Мин.урон">
</label>
<tr>
<td><input name=maxu placeholder="Макс.урон">
<td><label>
<input name=maxu placeholder="Макс.урон">
</label>
<tr>
<td><input name=add_strength placeholder="Сила">
<td><label>
<input name=add_strength placeholder="Сила">
</label>
<tr>
<td><input name=add_dexterity placeholder="Ловкость">
<td><label>
<input name=add_dexterity placeholder="Ловкость">
</label>
<tr>
<td><input name=add_intuition placeholder="Интуиция">
<td><label>
<input name=add_intuition placeholder="Интуиция">
</label>
<tr>
<td><input name=add_endurance placeholder="Выносливость">
<td><label>
<input name=add_endurance placeholder="Выносливость">
</label>
<tr>
<td><input name=add_intelligence placeholder="Интеллект">
<td><label>
<input name=add_intelligence placeholder="Интеллект">
</label>
<tr>
<td><input name=add_wisdom placeholder="Мудрость">
<td><label>
<input name=add_wisdom placeholder="Мудрость">
</label>
<tr>
<td><input name=add_accuracy placeholder="Точность">
<td><label>
<input name=add_accuracy placeholder="Точность">
</label>
<tr>
<td><input name=add_evasion placeholder="Уворот">
<td><label>
<input name=add_evasion placeholder="Уворот">
</label>
<tr>
<td><input name=add_criticals placeholder="Крит">
<td><label>
<input name=add_criticals placeholder="Крит">
</label>
<tr>
<td><input name=add_min_physical_damage placeholder="Мин.удар">
<td><label>
<input name=add_min_physical_damage placeholder="Мин.удар">
</label>
<tr>
<td><input name=add_min_physical_damage placeholder="Макс.удар">
<td><label>
<input name=add_min_physical_damage placeholder="Макс.удар">
</label>
</table>
<INPUT TYPE="submit" value="Добавить">
</div>
</form>
</form>
+1 -1
View File
@@ -123,4 +123,4 @@ Template::header('ᐰdminка');
</form>
<span class="legend">Невидимки</span><br>
<div class="abils" style="width: fit-content; font-weight: bold;"><?= AUser::getInvisiblesList() ?></div>
<div class="abils" style="width: fit-content; font-weight: bold;"><?= AUser::getInvisiblesList() ?></div>
+18 -15
View File
@@ -20,6 +20,7 @@ $player = $_POST['player'] ?? null;
$undress_char = $_POST['undress_char'] ?? null;
$end = $_POST['end'] ?? null;
$del = $_POST['del'] ?? null;
$inv = [];
if ($player) {
$row = Db::getInstance()->ofetch('select id, login from users where id = ? or login = ?', [$player, $player]);
@@ -35,10 +36,10 @@ if ($end) {
unset($_SESSION['player_name']);
}
if (isset($_SESSION['player_id'])) {
$inv = db::c()->query('SELECT item_id, name, image FROM inventory WHERE owner = ?i ORDER BY id DESC', $_SESSION['player_id']);
$inv = Db::getInstance()->fetchAll('SELECT item_id, name, image FROM inventory WHERE owner_id = ? ORDER BY item_id DESC', $_SESSION['player_id']);
}
if ($del) {
$itemdel = db::c()->query('SELECT item_type, dressed_slot FROM inventory WHERE id=?i', $del)->fetch_assoc();
$itemdel = Db::getInstance()->fetch('SELECT item_type, dressed_slot FROM inventory WHERE item_id = ?', $del);
if ($itemdel['dressed_slot'] == 1) {
$item = new DressedItems($del);
$item->undressItem($itemdel['item_type']);
@@ -47,34 +48,36 @@ if ($del) {
$item->undressItem(7);
}
}
Db::getInstance()->execute('delete from inventory where id = ?', $del);
Db::getInstance()->execute('delete from inventory where item_id = ?', $del);
}
Template::header('ᐰdminка инвентаря');
?>
<h1>Администрирование инвентаря <?php if (isset($_SESSION['player_name'])) echo $_SESSION['player_name']; ?></h1>
<h1>Администрирование инвентаря <?php if (isset($_SESSION['player_name'])) { echo $_SESSION['player_name']; } ?></h1>
<table class='adm'>
<tr>
<th>ID</th>
<th>Название</th>
<th>Количество</th>
<th>Картинка</th>
<th></th>
<th scope="col">ID</th>
<th scope="col">Название</th>
<th scope="col">Количество</th>
<th scope="col">Картинка</th>
<th scope="col"></th>
</tr>
<?php if (empty($_SESSION['player_id'])): ?>
<tr>
<th colspan="5">
<th scope="col" colspan="5">
<form method="post">
<input placeholder="Логин или ID" name="player">
<label>
<input placeholder="Логин или ID" name="player">
</label>
<input type="submit">
</form>
</th>
</tr>
<?php else: while ($row = $inv->fetch_assoc()): ?>
<?php else: foreach ($inv as $row): ?>
<tr>
<td><?= $row['id'] ?></td>
<td><?= $row['name'] ?></td>
<td><?= $row['koll'] ?></td>
<td><img src='/i/sh/<?= $row['img'] ?>'></td>
<td><img src='/i/sh/<?= $row['img'] ?>' alt=""></td>
<td>
<form method='post'>
<input name='del' type='hidden' value='<?= $row['id'] ?>'>
@@ -82,7 +85,7 @@ Template::header('ᐰdminка инвентаря');
</form>
</td>
</tr>
<?php endwhile; ?>
<?php endforeach; ?>
<th colspan='6'>
<form method='post'>
<input name='undress_char' type='submit' value='Стриптиз'>
@@ -92,4 +95,4 @@ Template::header('ᐰdminка инвентаря');
</form>
</th>
<?php endif; ?>
</table>
</table>
-73
View File
@@ -1,73 +0,0 @@
<?php
include "config.php";
//$user = mysql_fetch_array(mysql_query("SELECT * FROM `users` WHERE `id` = '2106' LIMIT 1;"));
//include "functions.php";
//$komp_users = mysql_query("SELECT * FROM `users`,`online` WHERE `users`.`id`=`online`.`id` AND `online`.`date` >= ".(time()-60).";");
$komp_users = mysql_query("SELECT * FROM `users`;");
while($ku=mysql_fetch_array($komp_users))
{
$kompl_raw=mysql_query("SELECT * FROM inventory where owner=".$ku['id']." AND dressed=1");
$items_on_user=array();
$set_id_wear=array();
$kompl_har=0;
while ($kompl=mysql_fetch_array($kompl_raw))
{
$items_on_user[]=$kompl['prototype'];
}
$sets_raw=mysql_query("SELECT * FROM item_sets;");
while ($set_items=mysql_fetch_array($sets_raw))
{
$kompl_full=1;
$in_set=explode(',',$set_items['prot_id']);
foreach($in_set as $tmp_set)
if (!in_array($tmp_set,$items_on_user))
{$kompl_full=0;}
if ($kompl_full==1) $set_id_wear[]=$set_items['set_id'];
}
foreach($set_id_wear as $s)
{
$items_raw=mysql_fetch_array(mysql_query("SELECT * FROM item_sets where set_id='{$s}' limit 1;"));
$kompl_har+=$items_raw['gsila'];
$kompl_har+=$items_raw['glovk'];
$kompl_har+=$items_raw['gintel'];
$kompl_har+=$items_raw['ginta'];
}
if(!$kompl_har) $kompl_har=0;
$explim=0;
foreach(array_keys(EXPTABLE) as $k)
{
if($k>=$ku['exp'])
{
$explim=$k;
break;
}
}
$sum_stat=15;
foreach(array_keys(EXPTABLE) as $k)
{
if($k==$explim)
break;
else
{
$sum_stat+=EXPTABLE[$k][0];
$sum_stat+=EXPTABLE[$k][2];
}
}
$res=mysql_fetch_array(
mysql_query("SELECT IFNULL( (SUM( gsila ) + SUM( glovk ) + SUM( ginta ) + SUM( gintel )) , 0)+ {$kompl_har} + {$sum_stat}
FROM `inventory` WHERE `owner` = '{$ku['id']}' AND `dressed` = 1;"));
$res2=mysql_fetch_array(mysql_query("SELECT `sila`+`lovk`+`intel`+`inta`+`vinos`+`mudra`+`stats` FROM `users` WHERE `id`={$ku['id']};"));
if($res[0]!=$res2[0])
echo("<br/>".$kompl_har." _ ID=".$ku['id']."[".$ku['exp']."] : All=".$res2[0]."/norm=".$res[0]);
}