xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-08-28 14:17:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

General fixes

Browse Source 
+Fixed a bug that showed deleted artifacts in the treasury
This commit is contained in:
iopietro
2018-06-22 12:57:05 +02:00
parent 10de3dd1b3
commit c4d6d70128
4 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Database.php
+9 -9
View File
@@ -7033,7 +7033,7 @@ References: User ID/Message ID, Mode
SUM(IF(size = '1' AND vref = $vid, 1, 0)) small, SUM(IF(size = '1' AND vref = $vid, 1, 0)) small,
SUM(IF(size = '2', 1, 0)) great, SUM(IF(size = '2', 1, 0)) great,
SUM(IF(size = '3', 1, 0)) `unique` SUM(IF(size = '3', 1, 0)) `unique`
FROM " . TB_PREFIX . "artefacts WHERE owner = ".(int) $uid." AND active = 1 AND (type = $kind OR kind = $kind)"; FROM " . TB_PREFIX . "artefacts WHERE owner = ".$uid." AND active = 1 AND (type = $kind OR kind = $kind) AND del = 0";
$result = mysqli_query($this->dblink, $q); $result = mysqli_query($this->dblink, $q);
return $this->mysqli_fetch_all($result)[0]; return $this->mysqli_fetch_all($result)[0];
} }
@@ -7251,7 +7251,7 @@ References: User ID/Message ID, Mode
FROM FROM
".TB_PREFIX."artefacts ".TB_PREFIX."artefacts
WHERE WHERE
owner = ".$uid." AND type = 11 AND active = 1"; owner = ".$uid." AND type = 11 AND active = 1 AND del = 0";
}else{ }else{
$q = "SELECT $q = "SELECT
Count(*) as Total Count(*) as Total
@@ -7260,7 +7260,7 @@ References: User ID/Message ID, Mode
INNER JOIN ".TB_PREFIX."users AS users INNER JOIN ".TB_PREFIX."users AS users
ON users.id != ".$uid." AND users.alliance = ".$alliance." AND artefacts.owner = users.id AND artefacts.type = 11 ON users.id != ".$uid." AND users.alliance = ".$alliance." AND artefacts.owner = users.id AND artefacts.type = 11
WHERE WHERE
users.id > 4 AND artefacts.active = 1"; users.id > 4 AND artefacts.active = 1 AND artefacts.del = 0";
} }
$result = mysqli_fetch_array(mysqli_query($this->dblink, $q), MYSQLI_ASSOC); $result = mysqli_fetch_array(mysqli_query($this->dblink, $q), MYSQLI_ASSOC);
@@ -7336,7 +7336,7 @@ References: User ID/Message ID, Mode
return (isset($cachedValue[$type.$size]) ? $cachedValue[$type.$size] : []); return (isset($cachedValue[$type.$size]) ? $cachedValue[$type.$size] : []);
} }
$q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE owner = $id "; $q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE owner = $id AND del = 0";
$result = $this->mysqli_fetch_all(mysqli_query($this->dblink,$q)); $result = $this->mysqli_fetch_all(mysqli_query($this->dblink,$q));
// cache all types and return the requested one // cache all types and return the requested one
@@ -7366,7 +7366,7 @@ References: User ID/Message ID, Mode
return (isset($cachedValue[$size.$type]) ? $cachedValue[$size.$type] : []); return (isset($cachedValue[$size.$type]) ? $cachedValue[$size.$type] : []);
} }
$q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE ".(!$mode ? 'owner' : 'vref')." = $id AND active = 1"; $q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE ".(!$mode ? 'owner' : 'vref')." = $id AND active = 1 AND del = 0";
$result = $this->mysqli_fetch_all(mysqli_query($this->dblink,$q)); $result = $this->mysqli_fetch_all(mysqli_query($this->dblink,$q));
// cache all types and return the requested one // cache all types and return the requested one
@@ -7411,7 +7411,7 @@ References: User ID/Message ID, Mode
return $cachedData[$vref]; return $cachedData[$vref];
} }
$q = "SELECT Count(*) as Total FROM " . TB_PREFIX . "artefacts WHERE vref = $vref"; $q = "SELECT Count(*) as Total FROM " . TB_PREFIX . "artefacts WHERE vref = $vref AND del = 0";
$result = mysqli_fetch_array(mysqli_query($this->dblink, $q), MYSQLI_ASSOC); $result = mysqli_fetch_array(mysqli_query($this->dblink, $q), MYSQLI_ASSOC);
$cachedData[$vref] = $result['Total']; $cachedData[$vref] = $result['Total'];
@@ -7517,7 +7517,7 @@ References: User ID/Message ID, Mode
SUM(IF(size = '1', 1, 0)) small, SUM(IF(size = '1', 1, 0)) small,
SUM(IF(size = '2', 1, 0)) great, SUM(IF(size = '2', 1, 0)) great,
SUM(IF(size = '3', 1, 0)) `unique` SUM(IF(size = '3', 1, 0)) `unique`
FROM " . TB_PREFIX . "artefacts WHERE owner = ".(int) $uid.($mode ? " AND active = 1" : ""); FROM " . TB_PREFIX . "artefacts WHERE owner = ".(int) $uid.($mode ? " AND active = 1 AND del = 0" : "");
$result = mysqli_query($this->dblink, $q); $result = mysqli_query($this->dblink, $q);
return $this->mysqli_fetch_all($result)[0]; return $this->mysqli_fetch_all($result)[0];
} }
@@ -7548,7 +7548,7 @@ References: User ID/Message ID, Mode
function getNewestArtifactBySize($id, $size){ function getNewestArtifactBySize($id, $size){
list($id, $size) = $this->escape_input((int) $id, (int) $size); list($id, $size) = $this->escape_input((int) $id, (int) $size);
$q = "SELECT * FROM ".TB_PREFIX."artefacts WHERE active = 1 AND owner = $id AND size = $size ORDER BY conquered DESC LIMIT 1"; $q = "SELECT * FROM ".TB_PREFIX."artefacts WHERE active = 1 AND owner = $id AND size = $size AND del = 0 ORDER BY conquered DESC LIMIT 1";
$result = mysqli_query($this->dblink, $q); $result = mysqli_query($this->dblink, $q);
return mysqli_fetch_array($result); return mysqli_fetch_array($result);
} }
@@ -7606,7 +7606,7 @@ References: User ID/Message ID, Mode
function getArtefactDetails($id) { function getArtefactDetails($id) {
list($id) = $this->escape_input((int) $id); list($id) = $this->escape_input((int) $id);
$q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE id = " . $id . " LIMIT 1"; $q = "SELECT * FROM " . TB_PREFIX . "artefacts WHERE id = ".$id." AND del = 0 LIMIT 1";
$result = mysqli_query($this->dblink,$q); $result = mysqli_query($this->dblink,$q);
return mysqli_fetch_array($result); return mysqli_fetch_array($result);
} }
Templates/Build/27_1.tpl
+20 -20
View File
@@ -21,22 +21,22 @@ $coor = $database->getCoor($wref);
<tbody> <tbody>
<?php <?php
if (count($artefact1)==0){ if (empty($artefact1)) echo '<tr><td colspan="4" class="none">'.ANY_ARTIFACTS.'</td></tr>';
echo '<tr><td colspan="4" class="none">'.ANY_ARTIFACTS.'</td></tr>'; else
} else { {
foreach($artefact1 as $artefact){ foreach($artefact1 as $artefact){
$coor2 = $database->getCoor($artefact['vref']); $coor2 = $database->getCoor($artefact['vref']);
if($artefact['size'] == 1 && $artefact['type'] != 11){ if($artefact['size'] == 1 && $artefact['type'] != 11){
$reqlvl = 10; $reqlvl = 10;
$effect = "village"; $effect = "village";
}else{ }else{
if($artefact['type'] != 11){ if($artefact['type'] != 11){
$reqlvl = 20; $reqlvl = 20;
}else{ }else{
$reqlvl = 10; $reqlvl = 10;
} }
$effect = "account"; $effect = "account";
} }
echo '<tr><td class="icon"><img class="artefact_icon_' . $artefact['type'] . '" src="img/x.gif"></td>'; echo '<tr><td class="icon"><img class="artefact_icon_' . $artefact['type'] . '" src="img/x.gif"></td>';
echo '<td class="nam"> echo '<td class="nam">
<a href="build.php?id=' . $id . '&show='.$artefact['id'].'">' . $artefact['name'] . '</a> <span class="bon">' . $artefact['effect'] . '</span> <a href="build.php?id=' . $id . '&show='.$artefact['id'].'">' . $artefact['name'] . '</a> <span class="bon">' . $artefact['effect'] . '</span>
@@ -46,8 +46,8 @@ Treasury <b>' . $reqlvl . '</b>, Effect <b>' . $effect . '</b>
</td>'; </td>';
echo '<td class="pla"><a href="karte.php?d=' . $artefact['vref'] . '&c=' . $generator->getMapCheck($artefact['vref']) . '">' . $database->getVillageField($artefact['vref'], "name") . '</a></td>'; echo '<td class="pla"><a href="karte.php?d=' . $artefact['vref'] . '&c=' . $generator->getMapCheck($artefact['vref']) . '">' . $database->getVillageField($artefact['vref'], "name") . '</a></td>';
echo '<td class="dist">' . date("d.m.Y H:i", $artefact['conquered']) . '</td></tr>'; echo '<td class="dist">' . date("d.m.Y H:i", $artefact['conquered']) . '</td></tr>';
}
} }
}
?> ?>
</tbody> </tbody>
@@ -72,13 +72,13 @@ Treasury <b>' . $reqlvl . '</b>, Effect <b>' . $effect . '</b>
<tbody> <tbody>
<?php <?php
$count = mysqli_fetch_array(mysqli_query($database->dblink,"SELECT Count(*) as Total FROM " . TB_PREFIX . "artefacts"), MYSQLI_ASSOC); $count = mysqli_fetch_array(mysqli_query($database->dblink,"SELECT Count(*) as Total FROM " . TB_PREFIX . "artefacts WHERE del = 0"), MYSQLI_ASSOC);
$count = $count['Total']; $count = $count['Total'];
if($count == 0) echo '<td colspan="4" class="none">'.NO_ARTIFACTS_AREA.'</td>'; if($count == 0) echo '<td colspan="4" class="none">'.NO_ARTIFACTS_AREA.'</td>';
else else
{ {
$arts = mysqli_query($database->dblink,"SELECT type, vref, id, name, size, owner, effect FROM " . TB_PREFIX . "artefacts"); $arts = mysqli_query($database->dblink,"SELECT type, vref, id, name, size, owner, effect FROM " . TB_PREFIX . "artefacts WHERE del = 0");
$rows = array(); $rows = [];
while($row = mysqli_fetch_array($arts)) { while($row = mysqli_fetch_array($arts)) {
$query = mysqli_query($database->dblink,'SELECT x, y FROM `' . TB_PREFIX . 'wdata` WHERE `id` = ' . (int) $row['vref']); $query = mysqli_query($database->dblink,'SELECT x, y FROM `' . TB_PREFIX . 'wdata` WHERE `id` = ' . (int) $row['vref']);
$coor2 = mysqli_fetch_assoc($query); $coor2 = mysqli_fetch_assoc($query);
Templates/Build/27_2.tpl
+11 -11
View File
@@ -30,14 +30,14 @@
</thead> </thead>
<tbody> <tbody>
<?php <?php
//TODO: Merge this in a unique foreach
$count = mysqli_fetch_array(mysqli_query($database->dblink,"SELECT Count(*) as Total FROM " . TB_PREFIX . "artefacts"), MYSQLI_ASSOC); $count = mysqli_fetch_array(mysqli_query($database->dblink,"SELECT Count(*) as Total FROM " . TB_PREFIX . "artefacts WHERE del = 0"), MYSQLI_ASSOC);
$count = $count['Total']; $count = $count['Total'];
if($count == 0) echo '<td colspan="4" class="none">'.NO_ARTIFACTS.'</td>'; if($count == 0) echo '<td colspan="4" class="none">'.NO_ARTIFACTS.'</td>';
else else
{ {
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 1"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 1 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
@@ -55,7 +55,7 @@
<?php <?php
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 2"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 2 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
@@ -73,7 +73,7 @@
<?php <?php
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 3"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 3 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
@@ -91,7 +91,7 @@
<?php <?php
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 4"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 4 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
@@ -108,7 +108,7 @@
<?php <?php
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 5"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 5 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
@@ -125,7 +125,7 @@
<?php <?php
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 6"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 6 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
@@ -142,7 +142,7 @@
<?php <?php
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 7"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 7 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
@@ -159,7 +159,7 @@
<?php <?php
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 8"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 1 AND type = 8 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
@@ -173,7 +173,7 @@
?> ?>
<tr><td colspan="4"></td></tr> <tr><td colspan="4"></td></tr>
<?php <?php
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE type = 11"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE type = 11 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
Templates/Build/27_3.tpl
+17 -17
View File
@@ -31,13 +31,13 @@
<tbody> <tbody>
<?php <?php
$count = mysqli_fetch_array(mysqli_query($database->dblink,"SELECT Count(*) as Total FROM " . TB_PREFIX . "artefacts"), MYSQLI_ASSOC); $count = mysqli_fetch_array(mysqli_query($database->dblink,"SELECT Count(*) as Total FROM " . TB_PREFIX . "artefacts WHERE del = 0"), MYSQLI_ASSOC);
$count = $count['Total']; $count = $count['Total'];
if($count == 0) { if($count == 0) {
echo '<td colspan="4" class="none">'.NO_ARTIFACTS.'</td>'; echo '<td colspan="4" class="none">'.NO_ARTIFACTS.'</td>';
} else { } else {
//TODO: Merge this in a unique foreach
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 1"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 1 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
@@ -51,7 +51,7 @@
unset($artefact); unset($artefact);
unset($row); unset($row);
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 1"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 1 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
@@ -71,7 +71,7 @@
unset($artefact); unset($artefact);
unset($row); unset($row);
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 2"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 2 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
@@ -85,7 +85,7 @@
unset($artefact); unset($artefact);
unset($row); unset($row);
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 2"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 2 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
@@ -105,7 +105,7 @@
unset($artefact); unset($artefact);
unset($row); unset($row);
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 3"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 3 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
@@ -119,7 +119,7 @@
unset($artefact); unset($artefact);
unset($row); unset($row);
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 3"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 3 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
@@ -139,7 +139,7 @@
unset($artefact); unset($artefact);
unset($row); unset($row);
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 4"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 4 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
@@ -153,7 +153,7 @@
unset($artefact); unset($artefact);
unset($row); unset($row);
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 4"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 4 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
@@ -172,7 +172,7 @@
unset($artefact); unset($artefact);
unset($row); unset($row);
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 5"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 5 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
@@ -186,7 +186,7 @@
unset($artefact); unset($artefact);
unset($row); unset($row);
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 5"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 5 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
@@ -205,7 +205,7 @@
unset($artefact); unset($artefact);
unset($row); unset($row);
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 6"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 6 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
@@ -219,7 +219,7 @@
unset($artefact); unset($artefact);
unset($row); unset($row);
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 6"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 6 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
@@ -238,7 +238,7 @@
unset($artefact); unset($artefact);
unset($row); unset($row);
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 7"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 2 AND type = 7 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
@@ -252,7 +252,7 @@
unset($artefact); unset($artefact);
unset($row); unset($row);
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 7"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 7 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';
@@ -271,7 +271,7 @@
unset($artefact); unset($artefact);
unset($row); unset($row);
$artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 8"); $artefact = mysqli_query($database->dblink,"SELECT type, id, name, effect, vref, owner FROM `" . TB_PREFIX . "artefacts` WHERE size = 3 AND type = 8 AND del = 0");
while($row = mysqli_fetch_array($artefact)) { while($row = mysqli_fetch_array($artefact)) {
echo '<tr>'; echo '<tr>';
echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>'; echo '<td class="icon"><img class="artefact_icon_' . $row['type'] . '" src="img/x.gif" alt="" title=""></td>';