General fixes

+Completely coded "Players report" in the admin panel, now you can see
any report you want
+Added "Players message", you can now see every message of any player
+Fully coded "IMG/Reports" section, it now works properly
+Fully CSSed reports, they'll now look like in game
+Centered the whole admin panel (because we're in 2018, lul)
This commit is contained in:
iopietro
2018-06-09 19:02:00 +02:00
parent 2e55a7ee61
commit 3504c98bea
51 changed files with 196 additions and 9270 deletions
+13 -5
View File
@@ -3,27 +3,35 @@ $dataarray = explode(",",$message->readingNotice['data']);
$colspan = (isset($dataarray[178]) && $dataarray[178] > 0) ? 11 : 10;
$spy = !empty($dataarray[177]) && !empty($dataarray[176]) && empty($dataarray[195]);
if(!isset($isAdmin)){
$mapUrl = "karte.php?d=";
$playerUrl = "spieler.php?uid=";
}elseif($isAdmin){
$mapUrl = "admin.php?p=village&did=";
$playerUrl = "admin.php?p=player&uid=";
}
//Attacker
if ($database->getUserField($dataarray[0], 'username', 0) != "[?]") {
$user_url="<a href=\"spieler.php?uid=".$database->getUserField($dataarray[0], 'id', 0)."\">".$database->getUserField($dataarray[0], 'username', 0)."</a>";
$user_url="<a href=\"".$playerUrl.$database->getUserField($dataarray[0], 'id', 0)."\">".$database->getUserField($dataarray[0], 'username', 0)."</a>";
}
else $user_url="<font color=\"grey\"><b>[?]</b></font>";
if($database->getVillageField($dataarray[1], 'name') != "[?]") {
$from_url="<a href=\"karte.php?d=".$dataarray[1]."&c=".$generator->getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1], 'name')."</a>";
$from_url="<a href=\"".$mapUrl.$dataarray[1]."&c=".$generator->getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1], 'name')."</a>";
}else $from_url="<font color=\"grey\"><b>[?]</b></font>";
//defender
if ($database->getUserField($dataarray[28], 'username', 0) != "[?]") {
$defuser_url="<a href=\"spieler.php?uid=".$database->getUserField($dataarray[28], 'id', 0)."\">".$database->getUserField($dataarray[28], 'username', 0)."</a>";
$defuser_url="<a href=\"".$playerUrl.$database->getUserField($dataarray[28], 'id', 0)."\">".$database->getUserField($dataarray[28], 'username', 0)."</a>";
}
else $defuser_url="<font color=\"grey\"><b>[?]</b></font>";
if($database->isVillageOases($dataarray[29])){
$deffrom_url="<a href=\"karte.php?d=".$dataarray[29]."&c=".$generator->getMapCheck($dataarray[29])."\">".$dataarray[30]."</a>";
$deffrom_url="<a href=\"".$mapUrl.$dataarray[29]."&c=".$generator->getMapCheck($dataarray[29])."\">".$dataarray[30]."</a>";
}elseif($database->getVillageField($dataarray[29],'name') != "[?]") {
$deffrom_url="<a href=\"karte.php?d=".$dataarray[29]."&c=".$generator->getMapCheck($dataarray[29])."\">".$database->getVillageField($dataarray[29], 'name')."</a>";
$deffrom_url="<a href=\"".$mapUrl.$dataarray[29]."&c=".$generator->getMapCheck($dataarray[29])."\">".$database->getVillageField($dataarray[29], 'name')."</a>";
}
else $deffrom_url="<font color=\"grey\"><b>[?]</b></font>";
+11 -2
View File
@@ -1,12 +1,21 @@
<?php
$dataarray = explode(",",$message->readingNotice['data']);
if(!isset($isAdmin)){
$mapUrl = "karte.php?d=";
$playerUrl = "spieler.php?uid=";
}elseif($isAdmin){
$mapUrl = "admin.php?p=village&did=";
$playerUrl = "admin.php?p=player&uid=";
}
if ($database->getUserField($dataarray[0],'username',0) != "[?]") {
$user_url = "<a href=\"spieler.php?uid=".$database->getUserField($dataarray[0],'id',0)."\">".$database->getUserField($dataarray[0],'username',0)."</a>";
$user_url = "<a href=\"".$playerUrl.$database->getUserField($dataarray[0],'id',0)."\">".$database->getUserField($dataarray[0],'username',0)."</a>";
}
else $user_url = "<font color=\"grey\"><b>[?]</b></font>";
if($database->getVillageField($dataarray[1],'name') != "[?]") {
$from_url = "<a href=\"karte.php?d=".$dataarray[1]."&c=".$generator->getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1],'name')."</a>";
$from_url = "<a href=\"".$mapUrl.$dataarray[1]."&c=".$generator->getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1],'name')."</a>";
}
else $from_url = "<font color=\"grey\"><b>[?]</b></font>";
?>
+11 -2
View File
@@ -1,14 +1,23 @@
<?php
//reinforcement is underattack
$dataarray = explode(",",$message->readingNotice['data']);
if(!isset($isAdmin)){
$mapUrl = "karte.php?d=";
$playerUrl = "spieler.php?uid=";
}elseif($isAdmin){
$mapUrl = "admin.php?p=village&did=";
$playerUrl = "admin.php?p=player&uid=";
}
$colspan = (isset($dataarray[24]) && $dataarray[24] > 0) ? 11 : 10;
if ($database->getUserField($dataarray[0], 'username', 0) != "[?]") {
$user_url = "<a href=\"spieler.php?uid=".$database->getUserField($dataarray[0], 'id', 0)."\">".$database->getUserField($dataarray[0], 'username', 0)."</a>";
$user_url = "<a href=\"".$playerUrl.$database->getUserField($dataarray[0], 'id', 0)."\">".$database->getUserField($dataarray[0], 'username', 0)."</a>";
}
else $user_url = "<font color=\"grey\"><b>[?]</b></font>";
if($database->getVillageField($dataarray[26], 'name') != "[?]") {
$from_url = "<a href=\"karte.php?d=".$dataarray[26]."&c=".$generator->getMapCheck($dataarray[26])."\">".$database->getVillageField($dataarray[26], 'name')."</a>";
$from_url = "<a href=\"".$mapUrl.$dataarray[26]."&c=".$generator->getMapCheck($dataarray[26])."\">".$database->getVillageField($dataarray[26], 'name')."</a>";
}
else $from_url = "<font color=\"grey\"><b>[?]</b></font>";
?>
+13 -5
View File
@@ -9,28 +9,36 @@ $dataarray = explode(",",$message->readingNotice['data']);
$colspan = (isset($dataarray[184]) && $dataarray[184] > 0) ? 11 : 10;
$colspan2 = 10;
if(!isset($isAdmin)){
$mapUrl = "karte.php?d=";
$playerUrl = "spieler.php?uid=";
}elseif($isAdmin){
$mapUrl = "admin.php?p=village&did=";
$playerUrl = "admin.php?p=player&uid=";
}
//Attacker
if ($database->getUserField($dataarray[0], 'username', 0) != "[?]") {
$user_url="<a href=\"spieler.php?uid=".$database->getUserField($dataarray[0], 'id', 0)."\">".$database->getUserField($dataarray[0], 'username', 0)."</a>";
$user_url="<a href=\"".$playerUrl.$database->getUserField($dataarray[0], 'id', 0)."\">".$database->getUserField($dataarray[0], 'username', 0)."</a>";
}
else $user_url="<font color=\"grey\"><b>[?]</b></font>";
if($database->getVillageField($dataarray[1],'name') != "[?]") {
$from_url="<a href=\"karte.php?d=".$dataarray[1]."&c=".$generator->getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1], 'name')."</a>";
$from_url="<a href=\"".$mapUrl.$dataarray[1]."&c=".$generator->getMapCheck($dataarray[1])."\">".$database->getVillageField($dataarray[1], 'name')."</a>";
}
else $from_url="<font color=\"grey\"><b>[?]</b></font>";
//defender
if ($database->getUserField($dataarray[28], 'username', 0) != "[?]") {
$defuser_url="<a href=\"spieler.php?uid=".$database->getUserField($dataarray[28], 'id', 0)."\">".$database->getUserField($dataarray[28], 'username', 0)."</a>";
$defuser_url="<a href=\"".$playerUrl.$database->getUserField($dataarray[28], 'id', 0)."\">".$database->getUserField($dataarray[28], 'username', 0)."</a>";
}
else $defuser_url="<font color=\"grey\"><b>[?]</b></font>";
if($database->isVillageOases($dataarray[29])){
$deffrom_url="<a href=\"karte.php?d=".$dataarray[29]."&c=".$generator->getMapCheck($dataarray[29])."\">".$dataarray[30]."</a>";
$deffrom_url="<a href=\"".$mapUrl.$dataarray[29]."&c=".$generator->getMapCheck($dataarray[29])."\">".$dataarray[30]."</a>";
}elseif($database->getVillageField($dataarray[29], 'name') != "[?]") {
$deffrom_url="<a href=\"karte.php?d=".$dataarray[29]."&c=".$generator->getMapCheck($dataarray[29])."\">".$database->getVillageField($dataarray[29], 'name')."</a>";
$deffrom_url="<a href=\"".$mapUrl.$dataarray[29]."&c=".$generator->getMapCheck($dataarray[29])."\">".$database->getVillageField($dataarray[29], 'name')."</a>";
}
else $deffrom_url="<font color=\"grey\"><b>[?]</b></font>";
?>
+10 -2
View File
@@ -2,13 +2,21 @@
$dataarray = explode(",",$message->readingNotice['data']);
$colspan = (!empty($dataarray[13]) && $dataarray[13] > 0) ? 11 : 10;
if(!isset($isAdmin)){
$mapUrl = "karte.php?d=";
$playerUrl = "spieler.php?uid=";
}elseif($isAdmin){
$mapUrl = "admin.php?p=village&did=";
$playerUrl = "admin.php?p=player&uid=";
}
if ($database->getUserField($dataarray[1], 'username', 0) != "[?]" || $dataarray[1] == 0) {
$user_url="<a href=\"spieler.php?uid=".$database->getUserField($dataarray[1], "id", 0)."\">".($dataarray[1] == 0 ? "taskmaster" : $database->getUserField($dataarray[1], 'username', 0))."</a>";
$user_url="<a href=\"".$playerUrl.$database->getUserField($dataarray[1], "id", 0)."\">".($dataarray[1] == 0 ? "taskmaster" : $database->getUserField($dataarray[1], 'username', 0))."</a>";
}
else $user_url="<font color=\"grey\"><b>[?]</b></font>";
if($database->getVillageField($dataarray[0],'name') != "[?]" || $dataarray[0] == 0) {
$from_url=($dataarray[0] == 0)? "village of the elders" : "<a href=\"karte.php?d=".$dataarray[0]."&c=".$generator->getMapCheck($dataarray[0])."\">".$database->getVillageField($dataarray[0], 'name')."</a>";
$from_url=($dataarray[0] == 0)? "village of the elders" : "<a href=\"".$mapUrl.$dataarray[0]."&c=".$generator->getMapCheck($dataarray[0])."\">".$database->getVillageField($dataarray[0], 'name')."</a>";
}
else $from_url="<font color=\"grey\"><b>[?]</b></font>";
?>
+1 -1
View File
@@ -69,7 +69,7 @@ for($i = (1 + $s); $i <= (10 + $s); $i++){
$type = (isset($_GET['t']) && $_GET['t'] == 5) ? $message->noticearray[$i - 1]['archive'] : $message->noticearray[$i - 1]['ntype'];
if($type == 23) $type = 22;
if($type >= 15 && $type <= 17){
$type = $type - 11;
$type -= 11;
echo "<img src=\"img/x.gif\" class=\"iReport iReport$type\" alt=\"" . $noticeClass[$type] . "\" title=\"" . $noticeClass[$type] . "\" />";
}else if($type >= 18 && $type <= 22){
echo "<img src=\"gpack/travian_default/img/scouts/$type.gif\" alt=\"" . $noticeClass[$type] . "\" title=\"" . $noticeClass[$type] . "\" />";