From 2d573a915c1ba33cf9db5a3bbdefb29f1b5c0dd0 Mon Sep 17 00:00:00 2001
From: iopietro <iopietro@hotmail.it>
Date: Mon, 16 Apr 2018 00:02:13 +0200
Subject: [PATCH] Fixed a bug in the alliance

+Usernames and alliances of attacked players are now shown in the
"attacker" and "defender" filter while peace is active
+Some clean-up
---
 Templates/Alliance/attack-attacker.tpl | 8 +++-----
 Templates/Alliance/attack-defender.tpl | 8 +++-----
 Templates/Alliance/attacks.tpl         | 6 +++---
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/Templates/Alliance/attack-attacker.tpl b/Templates/Alliance/attack-attacker.tpl
index ac4d7515..7bd5e5b8 100644
--- a/Templates/Alliance/attack-attacker.tpl
+++ b/Templates/Alliance/attack-attacker.tpl
@@ -1,7 +1,5 @@
 <?php
-$prefix = "".TB_PREFIX."ndata";
-$limit = "ntype!=0 AND ntype!=4 AND ntype!=5 AND ntype!=6 AND ntype!=7 AND ntype!=8 AND ntype!=9 AND ntype!=10 AND ntype!=11 AND ntype!=12 AND ntype!=13 AND ntype!=14 AND ntype!=15 AND ntype!=16 AND ntype!=17 AND ntype!=20 AND ntype!=21";
-$sql = mysqli_query($database->dblink,"SELECT * FROM $prefix WHERE ally = ".(int) $session->alliance." AND $limit ORDER BY time DESC LIMIT 20");
+$sql = mysqli_query($database->dblink,"SELECT * FROM ".TB_PREFIX."ndata WHERE ally = ".(int) $session->alliance." AND (ntype != 0 AND ntype < 4 OR ntype > 17 AND ntype != 20 AND ntype != 21) ORDER BY time DESC LIMIT 20");
 $query = mysqli_num_rows($sql);
 $outputList = '';
 $name = 1;
@@ -41,8 +39,8 @@ if($ntype==4 || $ntype==5 || $ntype==6 || $ntype==7){
     $outputList .= $database->getUserField($dataarray[0], "username", 0);
        
     $outputList .= $nn;
-    $outputList .= $database->getUserField($dataarray[28], "username", 0);
-    $getUserAlly = $database->getUserField($dataarray[28], "alliance", 0);
+    $outputList .= $database->getUserField($type != 22 ? $dataarray[28] : $dataarray[2], "username", 0);
+    $getUserAlly = $database->getUserField($type != 22 ? $dataarray[28] : $dataarray[2], "alliance", 0);
     $getAllyName = $database->getAllianceName($getUserAlly);
     
     if($getUserAlly==$session->alliance || !$getUserAlly){
diff --git a/Templates/Alliance/attack-defender.tpl b/Templates/Alliance/attack-defender.tpl
index fc5d53ef..4cb5e1c7 100644
--- a/Templates/Alliance/attack-defender.tpl
+++ b/Templates/Alliance/attack-defender.tpl
@@ -1,7 +1,5 @@
 <?php
-$prefix = "".TB_PREFIX."ndata";
-$limit = "ntype!=1 AND ntype!=2 AND ntype!=3 AND ntype!=8 AND ntype!=9 AND ntype!=10 AND ntype!=11 AND ntype!=12 AND ntype!=13 AND ntype!=14 AND ntype!=15 AND ntype!=16 AND ntype!=17 AND ntype!=18 AND ntype!=19";
-$sql = mysqli_query($database->dblink,"SELECT * FROM $prefix WHERE ally = ".(int) $session->alliance." AND $limit ORDER BY time DESC LIMIT 20");
+$sql = mysqli_query($database->dblink,"SELECT * FROM ".TB_PREFIX."ndata WHERE ally = ".(int) $session->alliance." AND (ntype < 1 OR ntype > 3 AND ntype < 8 OR ntype > 19)  ORDER BY time DESC LIMIT 20");
 $query = mysqli_num_rows($sql);
 $outputList = '';
 $name = 1;
@@ -42,8 +40,8 @@ if($ntype==4 || $ntype==5 || $ntype==6 || $ntype==7){
     $outputList .= $database->getUserField($dataarray[0], "username", 0);
        
     $outputList .= $nn;
-    $outputList .= $database->getUserField($dataarray[28], "username", 0);
-    $getUserAlly = $database->getUserField($dataarray[0], "alliance", 0);
+    $outputList .= $database->getUserField($type != 22 ? $dataarray[28] : $dataarray[2], "username", 0);
+    $getUserAlly = $database->getUserField($type != 22 ? $dataarray[28] : $dataarray[2], "alliance", 0);
     $getAllyName = $database->getAllianceName($getUserAlly);
     
     if($getUserAlly==$session->alliance || !$getUserAlly){
diff --git a/Templates/Alliance/attacks.tpl b/Templates/Alliance/attacks.tpl
index 03d33bfe..81ab7700 100644
--- a/Templates/Alliance/attacks.tpl
+++ b/Templates/Alliance/attacks.tpl
@@ -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);