xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-07-25 14:06:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: OOP code movements started :)

Browse Source
This commit is contained in:
Martin Ambrus
2017-10-25 13:38:38 +02:00
parent ab461e5945
commit 30d3b9c4fa
20 changed files with 484 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Templates/Alliance/invite.tpl
+1 -1
View File
@@ -43,7 +43,7 @@ if (count($allianceInvitations) == 0) {
echo "</tr>";
} else {
foreach($allianceInvitations as $invit) {
$invited = $database->getUserField($invit['uid'],username,0);
$invited = $database->getUserField($invit['uid'],'username',0);
echo "<tr>";
echo "<td class=abo><a href=\"?o=4&s=5&d=".$invit['id']."\"><img src=\"gpack/travian_default/img/a/del.gif\" width=\"12\" height=\"12\" alt=\"Del\"></a></td>";
echo "<td><a href=spieler.php?uid=".$invit['uid'].">".$invited."</td>";
Templates/Ranking/overview.tpl
+1 -1
View File
@@ -42,7 +42,7 @@ $search = $_SESSION['search'];
echo "<tr><td class=\"ra \" >";
}
echo $i.".</td><td class=\"pla \" >";
if($ranking[$i]['access'] > 2){
if(isset($ranking[$i]['access']) && $ranking[$i]['access'] > 2){
echo"<u><a href=\"spieler.php?uid=".$ranking[$i]['userid']."\">".$ranking[$i]['username']."</a></u>";
} else {
echo"<a href=\"spieler.php?uid=".$ranking[$i]['userid']."\">".$ranking[$i]['username']."</a>";
Templates/dorf3/3.tpl
+1 -1
View File
@@ -69,7 +69,7 @@ foreach($varray as $vil){
$prod_iron += $prod_iron /100 * $bid7[$foundry]['attri'];
}
if ($grainmill >= 1 || $bakery >= 1) {
$prod_crop += $prod_crop /100 * ($bid8[$grainmill]['attri'] + $bid9[$bakery]['attri']);
$prod_crop += $prod_crop /100 * ((isset($bid8[$grainmill]['attri']) ? $bid8[$grainmill]['attri'] : 0) + (isset($bid9[$bakery]['attri']) ? $bid9[$bakery]['attri'] : 0));
}
$oasisowned = $database->getOasis($vid);
//more oasis logic required
Templates/multivillage.tpl
+7 -2
View File
@@ -9,7 +9,12 @@
## ##
#################################################################################
if(count($session->villages) > 1){?>
if (!isset($id)) {
$id = '';
}
if(count($session->villages) > 1){
?>
<table id="vlist" cellpadding="1" cellspacing="1">
<thead><tr><td colspan="3"><a href="dorf3.php" accesskey="9"><?php echo MULTI_V_HEADER; ?>:</a></td></tr></thead>
<tbody><?php
@@ -112,7 +117,7 @@ else if(isset($_GET['t']) && isset($_GET['id'])) {
for($i=1;$i<=count($session->villages);++$i){echo'
<tr>
<td class="dot '.(($_SESSION['wid'] == $returnVillageArray[$i-1]['wref'] ) ? 'hl':'').'">●</td>
<td class="link"><a href="?newdid='.$returnVillageArray[$i-1]['wref'].(($id>=19) ? "&id=".$id : "&id=".$_GET['id']).'">'.$returnVillageArray[$i-1]['name'].'</a></td>
<td class="link"><a href="?newdid='.$returnVillageArray[$i-1]['wref'].(($id>=19) ? "&id=".$id : (!empty($_GET['id']) ? "&id=".$_GET['id'] : '')).'">'.$returnVillageArray[$i-1]['name'].'</a></td>
<td class="aligned_coords"><div class="cox">('.$returnVillageArray[$i-1]['x'].'</div><div class="pi">|</div><div class="coy">'.$returnVillageArray[$i-1]['y'].')</div></td></tr>';
}}?>
</tbody>