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

Fixed a bug in the alliance

Browse Source 
+Usernames and alliances of attacked players are now shown in the
"attacker" and "defender" filter while peace is active
+Some clean-up
This commit is contained in:
iopietro
2018-04-16 00:02:13 +02:00
parent 8dd8fc2364
commit 2d573a915c
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Templates/Alliance/attacks.tpl
+3 -3
View File
@@ -9,11 +9,11 @@ include("alli_menu.tpl");
<h4 class="chartHeadline">Military events</h4>
<div id="submenu">
<a href="allianz.php?s=3&f=32">
<img src="img/x.gif" class="btn_def" alt="Defender" title="Defender" />
<img src="img/x.gif" class="<?php echo $_GET['f'] == 32 ? "active btn_def" : "btn_def";?>" alt="Defender" title="Defender" />
</a>
<a href="allianz.php?s=3&f=31">
<img src="img/x.gif" class="btn_off" alt="Attacker" title="Attacker" />
<img src="img/x.gif" class="<?php echo $_GET['f'] == 31 ? "active btn_off" : "btn_off";?>" alt="Attacker" title="Attacker" />
</a>
</div>
<?php
@@ -83,7 +83,7 @@ if($ntype==4 || $ntype==5 || $ntype==6 || $ntype==7){
}else if($ntype==1 or $ntype==2 or $ntype==3 or $ntype==18 or $ntype==19){
$getUserAlly = $database->getUserField($type != 22 ? $dataarray[28] : $dataarray[2], "alliance", 0);
}else{
$getUserAlly = $database->getUserField($dataarray[0], "alliance", 0);
$getUserAlly = $database->getUserField($type != 22 ? $dataarray[28] : $dataarray[2], "alliance", 0);
}
$getAllyName = $database->getAllianceName($getUserAlly);