From 3d3c29ff8e7a189088506870ed33399d45ef53d2 Mon Sep 17 00:00:00 2001
From: Shadow <cata7007@gmail.com>
Date: Thu, 28 Nov 2013 07:39:28 +0200
Subject: [PATCH] Update 3.tpl

---
 Templates/Notice/3.tpl | 222 +++++++++++++++++++----------------------
 1 file changed, 104 insertions(+), 118 deletions(-)

diff --git a/Templates/Notice/3.tpl b/Templates/Notice/3.tpl
index 3196a3c1..ef669c4c 100644
--- a/Templates/Notice/3.tpl
+++ b/Templates/Notice/3.tpl
@@ -9,23 +9,23 @@ if(isset($dataarray[151]) and $dataarray[151]!=0){$colspan="11";}else{$colspan="
 $colspan2 = 10;
 ?>
 <table cellpadding="1" cellspacing="1" id="report_surround">
-			<thead>
-				<tr>
-					<th>Subject:</th>
-					<th><?php echo $message->readingNotice['topic']; ?></th>
-				</tr>
+            <thead>
+                <tr>
+                    <th>Subject:</th>
+                    <th><?php echo $message->readingNotice['topic']; ?></th>
+                </tr>
  
-				<tr>
-					<?php
+                <tr>
+                    <?php
                 $date = $generator->procMtime($message->readingNotice['time']); ?>
-					<td class="sent">Sent:</td>
-					<td>on <?php echo $date[0]."<span> at ".$date[1]; ?></span> <span>hour</span></td>
-				</tr>
-			</thead>
-			<tbody>
-				<tr><td colspan="2" class="empty"></td></tr>
-				<tr><td colspan="2" class="report_content">
-		<table cellpadding="1" cellspacing="1" id="attacker"><thead>
+                    <td class="sent">Sent:</td>
+                    <td>on <?php echo $date[0]."<span> at ".$date[1]; ?></span> <span>hour</span></td>
+                </tr>
+            </thead>
+            <tbody>
+                <tr><td colspan="2" class="empty"></td></tr>
+                <tr><td colspan="2" class="report_content">
+        <table cellpadding="1" cellspacing="1" id="attacker"><thead>
 <tr>
 <td class="role">Attacker</td>
 <td colspan="<?php echo $colspan; ?>"><a href="spieler.php?uid=<?php echo $database->getUserField($dataarray[0],"id",0); ?>"><?php echo $database->getUserField($dataarray[0],"username",0); ?></a> from the village <a href="karte.php?d=<?php echo $dataarray[1]."&amp;c=".$generator->getMapCheck($dataarray[1]); ?>"><?php echo $database->getVillageField($dataarray[1],"name"); ?></a></td>
@@ -38,30 +38,30 @@ $colspan2 = 10;
 $tribe = $dataarray[2];
 $start = ($tribe-1)*10+1;
 for($i=$start;$i<=($start+9);$i++) {
-	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+    echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
 }
 if(isset($dataarray[151]) and $dataarray[151]!=0){
-	echo "<td><img src=\"img/x.gif\" class=\"unit uhero\" title=\"Hero\" alt=\"Hero\" /></td>";
+    echo "<td><img src=\"img/x.gif\" class=\"unit uhero\" title=\"Hero\" alt=\"Hero\" /></td>";
 }
 echo "</tr><tr><th>Troops</th>";
 for($i=3;$i<=12;$i++) {
-	if($dataarray[$i] == 0) {
-    	echo "<td class=\"none\">0</td>";
+    if($dataarray[$i] == 0) {
+        echo "<td class=\"none\">0</td>";
     }
     else {
-    	echo "<td>".$dataarray[$i]."</td>";
+        echo "<td>".$dataarray[$i]."</td>";
     }
 }
 if(isset($dataarray[151]) and $dataarray[151]!=0){
-	echo "<td>$dataarray[151]</td>";
+    echo "<td>$dataarray[151]</td>";
 }
 echo "<tr><th>Casualties</th>";
 for($i=13;$i<=22;$i++) {
-	if($dataarray[$i] == 0) {
-    	echo "<td class=\"none\">0</td>";
+    if($dataarray[$i] == 0) {
+        echo "<td class=\"none\">0</td>";
     }
     else {
-    	echo "<td>".$dataarray[$i]."</td>";
+        echo "<td>".$dataarray[$i]."</td>";
     }
 }
 if(isset($dataarray[151]) and $dataarray[151]!=0){
@@ -117,47 +117,33 @@ if(isset($dataarray[171]) && $dataarray[171] !=''){ //troop not return
     <?php echo $dataarray[171]; ?>
     </td></tr></tbody>
 <?php }?>
-if ($dataarray[172]!='' and $dataarray[173]!=''){ //hero
-?>
-    <tbody class="goods"><tr><th>Information</th><td colspan="<?php echo $colspan; ?>">
-    <img class="unit u<?php echo $dataarray[172]; ?>" src="img/x.gif" alt="Hero" title="Hero" />
-    <?php echo $dataarray[173]; ?>
-    </td></tr></tbody>
-<?php }
-if(isset($dataarray[171]) && $dataarray[171] !=''){ //troop not return
-?>    
-    <tbody class="goods"><tr><th>Information</th><td colspan="<?php echo $colspan; ?>">
-    <?php echo $dataarray[171]; ?>
-    </td></tr></tbody>
-<?php }?>
 </td></tr></tbody>
-
 </table>
-	
+    
 <?php
 $targettribe=$dataarray['31'];
 
 
 if ($dataarray[31]=='1'){
-$start=1; ?>	
-	<table cellpadding="1" cellspacing="1" class="defender">
-	<thead>
-	<tr>
-	<td class="role">Defender</th>
-	<td colspan="<?php echo $colspan2; ?>"><?php if($targettribe=='1'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
-	</tr></thead>
-	<tbody class="units">
-	<tr>
-	<td>&nbsp;</td>
-	
-	
-	<?php
+$start=1; ?>    
+    <table cellpadding="1" cellspacing="1" class="defender">
+    <thead>
+    <tr>
+    <td class="role">Defender</th>
+    <td colspan="<?php echo $colspan2; ?>"><?php if($targettribe=='1'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+    </tr></thead>
+    <tbody class="units">
+    <tr>
+    <td>&nbsp;</td>
+    
+    
+    <?php
 for($i=$start;$i<=($start+9);$i++) {
-	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+    echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
 }
 echo "</tr><tr><th>Troops</th>";
 for($i=35;$i<=44;$i++) {
-	if($dataarray[$i] == "?") {
+    if($dataarray[$i] == "?") {
         echo "<td class=\"none\">?</td>";
     }
     else {
@@ -166,7 +152,7 @@ for($i=35;$i<=44;$i++) {
 }
 echo "<tr><th>Casualties</th>";
 for($i=45;$i<=54;$i++) {
-	if($dataarray[$i] == "?") {
+    if($dataarray[$i] == "?") {
         echo "<td class=\"none\">?</td>";
     }
     else {
@@ -178,25 +164,25 @@ for($i=45;$i<=54;$i++) {
 
 <?php } 
 if ($dataarray[31]=='2'){ 
-$start=11;?>	
-	<table cellpadding="1" cellspacing="1" class="defender">
-	<thead>
-	<tr>
-	<td class="role">Defender</th>
-	<td colspan="<?php echo $colspan2; ?>"><?php if($targettribe=='2'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
-	</tr></thead>
-	<tbody class="units">
-	<tr>
-	<td>&nbsp;</td>
-	
-	
+$start=11;?>    
+    <table cellpadding="1" cellspacing="1" class="defender">
+    <thead>
+    <tr>
+    <td class="role">Defender</th>
+    <td colspan="<?php echo $colspan2; ?>"><?php if($targettribe=='2'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+    </tr></thead>
+    <tbody class="units">
+    <tr>
+    <td>&nbsp;</td>
+    
+    
 <?php
 for($i=$start;$i<=($start+9);$i++) {
-	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+    echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
 }
 echo "</tr><tr><th>Troops</th>";
 for($i=56;$i<=65;$i++) {
-	if($dataarray[$i] == "?") {
+    if($dataarray[$i] == "?") {
         echo "<td class=\"none\">?</td>";
     }
     else {
@@ -205,7 +191,7 @@ for($i=56;$i<=65;$i++) {
 }
 echo "<tr><th>Casualties</th>";
 for($i=66;$i<=75;$i++) {
-	if($dataarray[$i] == "?") {
+    if($dataarray[$i] == "?") {
         echo "<td class=\"none\">?</td>";
     }
     else {
@@ -216,25 +202,25 @@ for($i=66;$i<=75;$i++) {
 </tr></tbody></table>
 <?php } ?>
 <?php  if ($dataarray[31]=='3'){
-$start=21; ?>	
-	<table cellpadding="1" cellspacing="1" class="defender">
-	<thead>
-	<tr>
-	<td class="role">Defender</th>
-	<td colspan="<?php echo $colspan2; ?>"><?php if($targettribe=='3'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
-	</tr></thead>
-	<tbody class="units">
-	<tr>
-	<td>&nbsp;</td>
-	
-	
-	<?php
+$start=21; ?>    
+    <table cellpadding="1" cellspacing="1" class="defender">
+    <thead>
+    <tr>
+    <td class="role">Defender</th>
+    <td colspan="<?php echo $colspan2; ?>"><?php if($targettribe=='3'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+    </tr></thead>
+    <tbody class="units">
+    <tr>
+    <td>&nbsp;</td>
+    
+    
+    <?php
 for($i=$start;$i<=($start+9);$i++) {
-	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+    echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
 }
 echo "</tr><tr><th>Troops</th>";
 for($i=77;$i<=86;$i++) {
-	if($dataarray[$i] == "?") {
+    if($dataarray[$i] == "?") {
         echo "<td class=\"none\">?</td>";
     }
     else {
@@ -243,7 +229,7 @@ for($i=77;$i<=86;$i++) {
 }
 echo "<tr><th>Casualties</th>";
 for($i=87;$i<=96;$i++) {
-	if($dataarray[$i] == "?") {
+    if($dataarray[$i] == "?") {
         echo "<td class=\"none\">?</td>";
     }
     else {
@@ -255,25 +241,25 @@ for($i=87;$i<=96;$i++) {
 
 <?php } ?>
 <?php  if ($dataarray[31]=='4'){ 
-$start=31; ?>	
-	<table cellpadding="1" cellspacing="1" class="defender">
-	<thead>
-	<tr>
-	<td class="role">Defender</th>
-	<td colspan="<?php echo $colspan2; ?>"><?php if($targettribe=='4'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
-	</tr></thead>
-	<tbody class="units">
-	<tr>
-	<td>&nbsp;</td>
-	
-	
-	<?php
+$start=31; ?>    
+    <table cellpadding="1" cellspacing="1" class="defender">
+    <thead>
+    <tr>
+    <td class="role">Defender</th>
+    <td colspan="<?php echo $colspan2; ?>"><?php if($targettribe=='4'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+    </tr></thead>
+    <tbody class="units">
+    <tr>
+    <td>&nbsp;</td>
+    
+    
+    <?php
 for($i=$start;$i<=($start+9);$i++) {
-	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+    echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
 }
 echo "</tr><tr><th>Troops</th>";
 for($i=98;$i<=107;$i++) {
-	if($dataarray[$i] == "?") {
+    if($dataarray[$i] == "?") {
         echo "<td class=\"none\">?</td>";
     }
     else {
@@ -282,7 +268,7 @@ for($i=98;$i<=107;$i++) {
 }
 echo "<tr><th>Casualties</th>";
 for($i=108;$i<=117;$i++) {
-	if($dataarray[$i] == "?") {
+    if($dataarray[$i] == "?") {
         echo "<td class=\"none\">?</td>";
     }
     else {
@@ -294,25 +280,25 @@ for($i=108;$i<=117;$i++) {
 
 <?php } ?>
 <?php  if ($dataarray[31]=='5'){
-$start=41; ?>	
-	<table cellpadding="1" cellspacing="1" class="defender">
-	<thead>
-	<tr>
-	<td class="role">Defender</th>
-	<td colspan="<?php echo $colspan2; ?>"><?php if($targettribe=='5'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
-	</tr></thead>
-	<tbody class="units">
-	<tr>
-	<td>&nbsp;</td>
-	
-	
-	<?php
+$start=41; ?>    
+    <table cellpadding="1" cellspacing="1" class="defender">
+    <thead>
+    <tr>
+    <td class="role">Defender</th>
+    <td colspan="<?php echo $colspan2; ?>"><?php if($targettribe=='5'){ echo'<a href="spieler.php?uid='.$database->getUserField($dataarray[28],"id",0).'">'.$database->getUserField($dataarray[28],"username",0).'</a> from the village <a href="karte.php?d='.$dataarray[29].'&amp;c='.$generator->getMapCheck($dataarray[29]).'">'.stripslashes($dataarray[30]).'</a>'; } else { echo"Reinforcement"; } ?></td>
+    </tr></thead>
+    <tbody class="units">
+    <tr>
+    <td>&nbsp;</td>
+    
+    
+    <?php
 for($i=$start;$i<=($start+9);$i++) {
-	echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
+    echo "<td><img src=\"img/x.gif\" class=\"unit u$i\" title=\"".$technology->getUnitName($i)."\" alt=\"".$technology->getUnitName($i)."\" /></td>";
 }
 echo "</tr><tr><th>Troops</th>";
 for($i=119;$i<=128;$i++) {
-	if($dataarray[$i] == "?") {
+    if($dataarray[$i] == "?") {
         echo "<td class=\"none\">?</td>";
     }
     else {
@@ -321,7 +307,7 @@ for($i=119;$i<=128;$i++) {
 }
 echo "<tr><th>Casualties</th>";
 for($i=129;$i<=138;$i++) {
-	if($dataarray[$i] == "?") {
+    if($dataarray[$i] == "?") {
         echo "<td class=\"none\">?</td>";
     }
     else {