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

Fixed some report bugs

Browse Source 
+Added the report type 23, which indicates a defence during festive days
+Festive reports in the alliance no longer duplicates
+Festive reports in the village view no longer duplicates
+Fixed a bug that didn't permit to read an allied report

General:
-Removed the possibility to view an inexistent village
+Some minor improovements
This commit is contained in:
iopietro
2018-04-21 17:28:20 +02:00
parent 65f7ad1721
commit 996f011666
9 changed files with 92 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Templates/Notice/22.tpl
+4 -4
View File
@@ -3,13 +3,13 @@ $dataarray = explode(",",$message->readingNotice['data']);
$colspan = (isset($dataarray[14]) && $dataarray[14] > 0) ? 11 : 10;
if($dataarray[15] == 1){
$message1 = "".$database->getUserField($dataarray[0],"username",0)." visited ".$database->getUserField($dataarray[2],"username",0)."'s troops";
$message1 = "".$database->getUserField($dataarray[0], "username", 0)." visited ".$database->getUserField($dataarray[2],"username",0)."'s troops";
}else if($dataarray[15] == 2){
$message1 = "".$database->getUserField($dataarray[0],"username",0)." wishes you Merry Christmas";
$message1 = "".$database->getUserField($dataarray[0], "username", 0)." wishes you Merry Christmas";
}else if($dataarray[15] == 3){
$message1 = "".$database->getUserField($dataarray[0],"username",0)." wishes you Happy New Year";
$message1 = "".$database->getUserField($dataarray[0], "username", 0)." wishes you Happy New Year";
}else{
$message1 = "".$database->getUserField($dataarray[0],"username",0)." wishes you Happy Easter";
$message1 = "".$database->getUserField($dataarray[0], "username", 0)." wishes you Happy Easter";
}
?>
<table cellpadding="1" cellspacing="1" id="report_surround">
Templates/Notice/all.tpl
+3 -2
View File
@@ -69,10 +69,11 @@ $noticeClass = array("Scout Report","Won as attacker without losses","Won as att
echo "<tr><td class=\"sel\"><input class=\"check\" type=\"checkbox\" name=\"n".$name."\" value=\"".$message->noticearray[$i-1]['id']."\" /></td>
<td class=\"sub\">";
$type = (isset($_GET['t']) && $_GET['t'] == 5)? $message->noticearray[$i-1]['archive'] : $message->noticearray[$i-1]['ntype'];
if($type==15 or $type==16 or $type==17){
if($type == 23) $type = 22;
if($type >= 15 && $type <= 17){
$type = $type-11;
echo "<img src=\"img/x.gif\" class=\"iReport iReport$type\" alt=\"".$noticeClass[$type]."\" title=\"".$noticeClass[$type]."\" />";
}else if($type==18 or $type==19 or $type==20 or $type==21 or $type==22){
}else if($type >= 18 && $type <= 22){
echo "<img src=\"gpack/travian_default/img/scouts/$type.gif\" alt=\"".$noticeClass[$type]."\" title=\"".$noticeClass[$type]."\" />";
}else{
echo "<img src=\"img/x.gif\" class=\"iReport iReport$type\" alt=\"".$noticeClass[$type]."\" title=\"".$noticeClass[$type]."\" />";