new-combats/game
3
0
Fork 0
Code Issues 23 Pull Requests Releases Wiki Activity

Убрано дублирование классов. Helpers уехали из Core. Классы во внешних директориях переехали к остальным.

Browse Source
This commit is contained in:
Ivor Barhansky
2023-08-14 18:15:05 +03:00
parent 81a8161d32
commit 0d2b4aba63
114 changed files with 12919 additions and 13151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_incl_data/class/Clan/ItemStorage.php
+7 -7
View File
@@ -2,8 +2,8 @@
namespace Clan;
use Core\ConversionHelper;
use Core\Db;
use Helper\Conversion;
use User;
use User\ItemsModel;
@@ -23,10 +23,10 @@ class ItemStorage
return $this->error;
}
$col = User::start()->itemsX(($itemId));
$idata = ConversionHelper::dataStringToArray($item['data']);
$idata = Conversion::dataStringToArray($item['data']);
if (!isset($idata['toclan'])) {
$idata['toclan'] = $user['clan'] . '#' . $user['id'];
$item['data'] = ConversionHelper::arrayToDataString($idata);
$item['data'] = Conversion::arrayToDataString($idata);
User::start()->addDelo(
2,
$user['id'],
@@ -58,7 +58,7 @@ class ItemStorage
if (empty($item['inslot']) || !empty($item['gift'])) {
$this->error = 'Предмет не найден.';
}
$idata = ConversionHelper::dataStringToArray($item['data']);
$idata = Conversion::dataStringToArray($item['data']);
if (
!empty($idata['frompisher']) ||
!empty($idata['sudba']) ||
@@ -117,7 +117,7 @@ class ItemStorage
);
$res = mysql_fetch_array(mysql_query('SELECT * FROM `clan` WHERE `id` = "' . $cl . '" LIMIT 1'));
if (isset($itm_['id'])) {
$po = ConversionHelper::dataStringToArray($itm_['data']);
$po = Conversion::dataStringToArray($itm_['data']);
if (isset($po['toclan'])) {
$cls = explode('#', $po['toclan']);
$cls = $cls[1];
@@ -144,7 +144,7 @@ class ItemStorage
'SELECT * FROM `items_users` WHERE (`uid` = "-21' . $user['clan'] . '" OR `data` LIKE "%toclan=' . $user['clan'] . '#%")'
);
while ($pl = mysql_fetch_array($itms)) {
$po = ConversionHelper::dataStringToArray($pl['data']);
$po = Conversion::dataStringToArray($pl['data']);
if (isset($po['toclan'])) {
$cls = explode('#', $po['toclan']);
$cls = $cls[1];
@@ -156,7 +156,7 @@ class ItemStorage
}
}
unset($po['toclan']);
$pl['data'] = ConversionHelper::arrayToDataString($po);
$pl['data'] = Conversion::arrayToDataString($po);
$col = $this->itemsX(((int)$pl['id']));
$it_n = mysql_fetch_array(
mysql_query('SELECT `name` FROM `items_main` WHERE `id` = "' . $pl['item_id'] . '"')