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

Refactor + BugFix

Browse Source 
1. Fix a bug in Admin Panel that you can edit by yourself your rank, now you cannot edit your rank anymore.

2. Now Alliance Leader can edit his own Position

3. Fix negative value on Demolition Building, now in database at lvl is appear new level not -1

4. Refactor Ajax map, now all is alligned (Ajax folder and Map folder)

5. Fix bug from Palace (when change capital now Automation recount population automaticaly on old capital and new capital)
This commit is contained in:
novgorodschi catalin
2026-05-18 09:18:35 +03:00
parent 2bce101a27
commit 55e6dd60b5
96 changed files with 6176 additions and 6763 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Templates/Build/17_1.tpl
+149 -142
View File
@@ -1,146 +1,153 @@
<?php
if(isset($_GET['u'])) {
$u = $_GET['u'];
}
else {
$u=0;
}
?>
// 17_1.tpl - MARKETPLACE / OFFERS
global $database, $session, $village, $market, $generator, $id;
<div id="build" class="gid17"><a href="#" onClick="return Popup(17,4);" class="build_logo">
<img class="building g17" src="img/x.gif" alt="Marketplace" title="<?php echo MARKETPLACE;?>" />
</a>
<h1><?php echo MARKETPLACE;?> <span class="level"><?php echo LEVEL;?> <?php echo $village->resarray['f'.$id]; ?></span></h1>
<p class="build_desc"><?php echo MARKETPLACE_DESC;?>
</p>
<?php include("17_menu.tpl");
if($session->plus) {
$u = isset($_GET['u']) ? max(0, (int)$_GET['u']) : 0;
$s = isset($_GET['s']) ? (int)$_GET['s'] : 0;
$b = isset($_GET['b']) ? (int)$_GET['b'] : 0;
$v = isset($_GET['v']) ? $_GET['v'] : '';
$resIcon = [
1 => ['class' => 'r1', 'name' => LUMBER],
2 => ['class' => 'r2', 'name' => CLAY],
3 => ['class' => 'r3', 'name' => IRON],
4 => ['class' => 'r4', 'name' => CROP],
];
?>
<table id="search_select" class="buy_select" cellpadding="1" cellspacing="1">
<thead><tr>
<td colspan="4"><?php echo I_AN_SEARCHING;?></td>
</tr></thead>
<tbody><tr>
<td <?php if(isset($_GET['s']) && $_GET['s'] == 1) echo "class=\"hl\""; ?>><a href="build.php?id=<?php echo $id; ?>&t=1&s=1<?php if(isset($_GET['v'])) echo "&v=".$_GET['v']; if(isset($_GET['b'])) echo "&b=".$_GET['b']; ?>"><img class="r1" src="img/x.gif" alt="Lumber" title="<?php echo LUMBER;?>" /></a></td>
<td <?php if(isset($_GET['s']) && $_GET['s'] == 2) echo "class=\"hl\""; ?>><a href="build.php?id=<?php echo $id; ?>&t=1&s=2<?php if(isset($_GET['v'])) echo "&v=".$_GET['v']; if(isset($_GET['b'])) echo "&b=".$_GET['b']; ?>"><img class="r2" src="img/x.gif" alt="Clay" title="<?php echo CLAY;?>" /></a></td>
<td <?php if(isset($_GET['s']) && $_GET['s'] == 3) echo "class=\"hl\""; ?>><a href="build.php?id=<?php echo $id; ?>&t=1&s=3<?php if(isset($_GET['v'])) echo "&v=".$_GET['v']; if(isset($_GET['b'])) echo "&b=".$_GET['b']; ?>"><img class="r3" src="img/x.gif" alt="Iron" title="<?php echo IRON;?>" /></a></td>
<td <?php if(isset($_GET['s']) && $_GET['s'] == 4) echo "class=\"hl\""; ?>><a href="build.php?id=<?php echo $id; ?>&t=1&s=4<?php if(isset($_GET['v'])) echo "&v=".$_GET['v']; if(isset($_GET['b'])) echo "&b=".$_GET['b']; ?>"><img class="r4" src="img/x.gif" alt="Crop" title="<?php echo CROP;?>" /></a></td></tr></tbody>
</table><table id="ratio_select" class="buy_select" cellpadding="1" cellspacing="1">
<tbody>
<tr><td <?php if(isset($_GET['v'])) echo "class=\"hl\""; ?>><a href="build.php?id=<?php echo $id; ?>&t=1&v=1:1<?php if(isset($_GET['s'])) echo "&s=".$_GET['s']; if(isset($_GET['b'])) echo "&b=".$_GET['b']; ?>">1:1</a></td>
</tr><tr><td <?php if(!isset($_GET['v'])) echo "class=\"hl\""; ?>><a href="build.php?id=<?php echo $id; ?>&t=1<?php if(isset($_GET['s'])) echo "&s=".$_GET['s']; if(isset($_GET['b'])) echo "&b=".$_GET['b']; ?>">1:x</a></td>
</tr>
</tbody>
</table>
<table id="bid_select" class="buy_select" cellpadding="1" cellspacing="1">
<thead><tr>
<td colspan="4"><?php echo I_AN_OFFERING;?></td>
</tr></thead>
<tbody><tr>
<td <?php if(isset($_GET['b']) && $_GET['b'] == 1) echo "class=\"hl\""; ?>><a href="build.php?id=<?php echo $id; ?>&t=1&b=1<?php if(isset($_GET['v'])) echo "&v=".$_GET['v']; if(isset($_GET['s'])) echo "&s=".$_GET['s']; ?>"><img class="r1" src="img/x.gif" alt="Lumber" title="<?php echo LUMBER;?>" /></a></td>
<td <?php if(isset($_GET['b']) && $_GET['b'] == 2) echo "class=\"hl\""; ?>><a href="build.php?id=<?php echo $id; ?>&t=1&b=2<?php if(isset($_GET['v'])) echo "&v=".$_GET['v']; if(isset($_GET['s'])) echo "&s=".$_GET['s']; ?>"><img class="r2" src="img/x.gif" alt="Clay" title="<?php echo CLAY;?>" /></a></td>
<td <?php if(isset($_GET['b']) && $_GET['b'] == 3) echo "class=\"hl\""; ?>><a href="build.php?id=<?php echo $id; ?>&t=1&b=3<?php if(isset($_GET['v'])) echo "&v=".$_GET['v']; if(isset($_GET['s'])) echo "&s=".$_GET['s']; ?>"><img class="r3" src="img/x.gif" alt="Iron" title="<?php echo IRON;?>" /></a></td>
<td <?php if(isset($_GET['b']) && $_GET['b'] == 4) echo "class=\"hl\""; ?>><a href="build.php?id=<?php echo $id; ?>&t=1&b=4<?php if(isset($_GET['v'])) echo "&v=".$_GET['v']; if(isset($_GET['s'])) echo "&s=".$_GET['s']; ?>"><img class="r4" src="img/x.gif" alt="Crop" title="<?php echo CROP;?>" /></a></td></tr></tbody>
</table>
<?php
}
?>
<div class="clear"></div><table id="range" cellpadding="1" cellspacing="1">
<?php
if(isset($_GET['e1']))
{
echo "<p class=\"error2\">".NOT_ENOUGH_RESOURCES."</p>";
}
elseif(isset($_GET['e2']))
{
echo "<p class=\"error2\">".INVALID_OFFER."</p>";
}
elseif(isset($_GET['e3']))
{
echo "<p class=\"error2\">".NOT_ENOUGH_MERCHANTS."</p>";
}
?>
<thead><tr>
<th colspan="5"><a name="h2"></a><?php echo OFFERS_MARKETPLACE;?></th>
</tr>
<tr>
<td><?php echo OFFERED_TO_ME;?></td>
<td><?php echo WANTED_TO_ME;?></td>
<td><?php echo PLAYER;?></td>
<td><?php echo DURATION;?></td>
<td><?php echo ACTION;?></td>
</tr></thead>
<tbody>
<?php
if(count($market->onsale) > 0) {
for($i=0+$u;$i<=40+$u;$i++) {
if(isset($market->onsale[$i])) {
echo "<tr><td class=\"val\">";
$reqMerc = 1;
if($market->onsale[$i]['wamt'] > $market->maxcarry) {
$reqMerc = round($market->onsale[$i]['wamt']/$market->maxcarry);
if($market->onsale[$i]['wamt'] > $market->maxcarry*$reqMerc) {
$reqMerc += 1;
}
}
switch($market->onsale[$i]['gtype']) {
case 1: echo "<img src=\"img/x.gif\" class=\"r1\" alt=\"Wood\" title=\"".LUMBER."\" />"; break;
case 2: echo "<img src=\"img/x.gif\" class=\"r2\" alt=\"Clay\" title=\"".CLAY."\" />"; break;
case 3: echo "<img src=\"img/x.gif\" class=\"r3\" alt=\"Iron\" title=\"".IRON."\" />"; break;
case 4: echo "<img src=\"img/x.gif\" class=\"r4\" alt=\"Crop\" title=\"".CROP."\" />"; break;
}
echo $market->onsale[$i]['gamt'];
echo "</td> <td class=\"val\">";
switch($market->onsale[$i]['wtype']) {
case 1: echo "<img src=\"img/x.gif\" class=\"r1\" alt=\"Wood\" title=\"".LUMBER."\" />"; break;
case 2: echo "<img src=\"img/x.gif\" class=\"r2\" alt=\"Clay\" title=\"".CLAY."\" />"; break;
case 3: echo "<img src=\"img/x.gif\" class=\"r3\" alt=\"Iron\" title=\"".IRON."\" />"; break;
case 4: echo "<img src=\"img/x.gif\" class=\"r4\" alt=\"Crop\" title=\"".CROP."\" />"; break;
}
echo $market->onsale[$i]['wamt'];
echo "</td><td class=\"pla\" title=\"".$database->getVillageField($market->onsale[$i]['vref'],"name")."\">";
echo "<a href=\"karte.php?d=".$market->onsale[$i]['vref']."&c=".$generator->getMapCheck($market->onsale[$i]['vref'])."\">".$database->getUserField($database->getVillageField($market->onsale[$i]['vref'],"owner"),"username",0)."</a></td>";
echo "<td class=\"dur\">".$generator->getTimeFormat($market->onsale[$i]['duration'])."</td>";
if(($market->onsale[$i]['wtype'] == 1 && $village->awood <= $market->onsale[$i]['wamt']) ||($market->onsale[$i]['wtype'] == 2 && $village->aclay <= $market->onsale[$i]['wamt']) ||($market->onsale[$i]['wtype'] == 3 && $village->airon <= $market->onsale[$i]['wamt']) ||($market->onsale[$i]['wtype'] == 4 && $village->acrop <= $market->onsale[$i]['wamt'])) {
echo "<td class=\"act none\">".NOT_ENOUGH_RESOURCES."</td></tr>";
}
else if($reqMerc > $market->merchantAvail()) {
echo "<td class=\"act none\">".NOT_ENOUGH_MERCHANTS."</td></tr>";
}
else if($session->access != BANNED){
echo "<td class=\"act\"><a href=\"build.php?id=$id&t=1&a=".$session->mchecker."&g=".$market->onsale[$i]['id']."\">Accept offer</a></td>";
}else{
echo "<td class=\"act\"><a href=\"banned.php\">".ACCEP_OFFER."</a></td>";
}
echo"</tr>";
}
}
}
else {
echo "<tr><td class=\"none\" colspan=\"5\">".NO_AVAILABLE_OFFERS."</td></tr>";
}
?>
</tbody><tfoot><tr><td colspan="5">
<span class="none">
<?php
if(!isset($_GET['u']) && count($market->onsale) < 40) {
echo "<span class=\"none\"><b>&laquo;</b></span><span class=\"none\"><b>&raquo;</b></span>";
}
else if (!isset($_GET['u']) && count($market->onsale) > 40) {
echo "<span class=\"none\"><b>&laquo;</b></span><a href=\"build.php?id=<?php echo $id; ?>&t=1&u=40\">&raquo;</a>";
}
else if(isset($_GET['u']) && count($market->onsale) > $_GET['u']) {
if(count($market->onsale) > ($_GET['u']+40) && $_GET['u']-40 < count($market->onsale) && $_GET['u'] != 0) {
echo "<a href=\"build.php?id=<?php echo $id; ?>&t=1&u=".($_GET['u']-40)."\">&laquo;</a><a href=\"build.php?id=<?php echo $id; ?>&t=1&u=".($_GET['u']+40)."\">&raquo;</a>";
}
else if(count($market->onsale) > $_GET['u']+40) {
echo "<span class=\"none\"><b>&laquo;</b></span><a href=\"build.php?id=<?php echo $id; ?>&t=1&u=".($_GET['u']+40)."\">&raquo;</a>";
}
else {
echo "<a href=\"build.php?id=<?php echo $id; ?>&t=1&u=".($_GET['u']-40)."\">&laquo;</a><span class=\"none\"><b>&raquo;</b></span>";
<div id="build" class="gid17">
<a href="#" onClick="return Popup(17,4);" class="build_logo">
<img class="building g17" src="img/x.gif" alt="Marketplace" title="<?php echo MARKETPLACE;?>" />
</a>
<h1><?php echo MARKETPLACE;?> <span class="level"><?php echo LEVEL;?> <?php echo (int)$village->resarray['f'.$id];?></span></h1>
<p class="build_desc"><?php echo MARKETPLACE_DESC;?></p>
<?php include("17_menu.tpl");?>
<?php if ($session->plus):?>
<table id="search_select" class="buy_select" cellpadding="1" cellspacing="1">
<thead><tr><td colspan="4"><?php echo I_AN_SEARCHING;?></td></tr></thead>
<tbody><tr>
<?php for ($i = 1; $i <= 4; $i++):?>
<td <?php if ($s === $i) echo 'class="hl"';?>>
<a href="build.php?id=<?php echo (int)$id;?>&t=1&s=<?php echo $i;?><?php if($v) echo '&v='.urlencode($v);?><?php if($b) echo '&b='.$b;?>">
<img class="<?php echo $resIcon[$i]['class'];?>" src="img/x.gif" alt="<?php echo $resIcon[$i]['name'];?>" title="<?php echo $resIcon[$i]['name'];?>" />
</a>
</td>
<?php endfor;?>
</tr></tbody>
</table>
<table id="ratio_select" class="buy_select" cellpadding="1" cellspacing="1">
<tbody>
<tr><td <?php if($v) echo 'class="hl"';?>><a href="build.php?id=<?php echo (int)$id;?>&t=1&v=1:1<?php if($s) echo '&s='.$s;?><?php if($b) echo '&b='.$b;?>">1:1</a></td></tr>
<tr><td <?php if(!$v) echo 'class="hl"';?>><a href="build.php?id=<?php echo (int)$id;?>&t=1<?php if($s) echo '&s='.$s;?><?php if($b) echo '&b='.$b;?>">1:x</a></td></tr>
</tbody>
</table>
<table id="bid_select" class="buy_select" cellpadding="1" cellspacing="1">
<thead><tr><td colspan="4"><?php echo I_AN_OFFERING;?></td></tr></thead>
<tbody><tr>
<?php for ($i = 1; $i <= 4; $i++):?>
<td <?php if ($b === $i) echo 'class="hl"';?>>
<a href="build.php?id=<?php echo (int)$id;?>&t=1&b=<?php echo $i;?><?php if($v) echo '&v='.urlencode($v);?><?php if($s) echo '&s='.$s;?>">
<img class="<?php echo $resIcon[$i]['class'];?>" src="img/x.gif" alt="<?php echo $resIcon[$i]['name'];?>" title="<?php echo $resIcon[$i]['name'];?>" />
</a>
</td>
<?php endfor;?>
</tr></tbody>
</table>
<?php endif;?>
<div class="clear"></div>
<?php
// erori
if (isset($_GET['e1'])) echo '<p class="error2">'.NOT_ENOUGH_RESOURCES.'</p>';
elseif (isset($_GET['e2'])) echo '<p class="error2">'.INVALID_OFFER.'</p>';
elseif (isset($_GET['e3'])) echo '<p class="error2">'.NOT_ENOUGH_MERCHANTS.'</p>';
?>
<table id="range" cellpadding="1" cellspacing="1">
<thead>
<tr><th colspan="5"><a name="h2"></a><?php echo OFFERS_MARKETPLACE;?></th></tr>
<tr>
<td><?php echo OFFERED_TO_ME;?></td>
<td><?php echo WANTED_TO_ME;?></td>
<td><?php echo PLAYER;?></td>
<td><?php echo DURATION;?></td>
<td><?php echo ACTION;?></td>
</tr>
</thead>
<tbody>
<?php
$offers = $market->onsale;
$totalOffers = count($offers);
if ($totalOffers > 0) {
$end = min($u + 40, $totalOffers);
for ($i = $u; $i < $end; $i++) {
if (!isset($offers[$i])) continue;
$offer = $offers[$i];
$reqMerc = max(1, (int)ceil($offer['wamt'] / $market->maxcarry));
$vref = (int)$offer['vref'];
$owner = (int)$database->getVillageField($vref, "owner");
$username = htmlspecialchars($database->getUserField($owner, "username", 0));
$villagename = htmlspecialchars($database->getVillageField($vref, "name"));
$hasRes = true;
switch ($offer['wtype']) {
case 1: $hasRes = $village->awood > $offer['wamt']; break;
case 2: $hasRes = $village->aclay > $offer['wamt']; break;
case 3: $hasRes = $village->airon > $offer['wamt']; break;
case 4: $hasRes = $village->acrop > $offer['wamt']; break;
}
?>
<tr>
<td class="val">
<img src="img/x.gif" class="<?php echo $resIcon[$offer['gtype']]['class'];?>" alt="<?php echo $resIcon[$offer['gtype']]['name'];?>" title="<?php echo $resIcon[$offer['gtype']]['name'];?>" />
<?php echo (int)$offer['gamt'];?>
</td>
<td class="val">
<img src="img/x.gif" class="<?php echo $resIcon[$offer['wtype']]['class'];?>" alt="<?php echo $resIcon[$offer['wtype']]['name'];?>" title="<?php echo $resIcon[$offer['wtype']]['name'];?>" />
<?php echo (int)$offer['wamt'];?>
</td>
<td class="pla" title="<?php echo $villagename;?>">
<a href="karte.php?d=<?php echo $vref;?>&c=<?php echo $generator->getMapCheck($vref);?>"><?php echo $username;?></a>
</td>
<td class="dur"><?php echo $generator->getTimeFormat($offer['duration']);?></td>
<?php if (!$hasRes):?>
<td class="act none"><?php echo NOT_ENOUGH_RESOURCES;?></td>
<?php elseif ($reqMerc > $market->merchantAvail()):?>
<td class="act none"><?php echo NOT_ENOUGH_MERCHANTS;?></td>
<?php elseif ($session->access != BANNED):?>
<td class="act"><a href="build.php?id=<?php echo (int)$id;?>&t=1&a=<?php echo $session->mchecker;?>&g=<?php echo (int)$offer['id'];?>">Accept offer</a></td>
<?php else:?>
<td class="act"><a href="banned.php"><?php echo ACCEP_OFFER;?></a></td>
<?php endif;?>
</tr>
<?php
}
} else {
echo '<tr><td class="none" colspan="5">'.NO_AVAILABLE_OFFERS.'</td></tr>';
}
}
?>
</td></tr>
</table></div>
?>
</tbody>
<tfoot>
<tr>
<td colspan="5">
<?php
$prev = $u - 40;
$next = $u + 40;
if ($u == 0) echo '<span class="none"><b>&laquo;</b></span>';
else echo '<a href="build.php?id='.(int)$id.'&t=1&u='.$prev.'">&laquo;</a>';
if ($next >= $totalOffers) echo '<span class="none"><b>&raquo;</b></span>';
else echo '<a href="build.php?id='.(int)$id.'&t=1&u='.$next.'">&raquo;</a>';
?>
</td>
</tr>
</tfoot>
</table>
</div>