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

Merge branch 'master' of https://github.com/Shadowss/TravianZ

Browse Source 
Conflicts:
	Admin/admin.php
This commit is contained in:
Shadow
2014-01-31 08:20:42 +02:00
parent 15182ecb3d c9cc7c1f0a
commit 31faf6f924
20 changed files with 724 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Templates/Map/vilview.tpl
+16
View File
@@ -1,5 +1,21 @@
<div id="content" class="map">
<?php
#################################################################################
## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ##
## --------------------------------------------------------------------------- ##
## Project: TravianZ ##
## Version: 01.09.2013 ##
## Filename vilview.php ##
## Developed by: Advocaite , yi12345 , Shadow ##
## Fixed by: Shadow - Tribe Names , correct view resource ##
## License: TravianZ Project ##
## Copyright: TravianZ (c) 2010-2013. All rights reserved. ##
## URLs: http://travian.shadowss.ro ##
## Source code: http://github.com/Shadowss/TravianZ-by-Shadow/ ##
## ##
#################################################################################
$basearray = $database->getMInfo($_GET['d']);
$uinfo = $database->getVillage($basearray['id']);
$oasis1 = mysql_query('SELECT * FROM `' . TB_PREFIX . 'odata` WHERE `wref` = ' . mysql_real_escape_string($_GET['d']));
Templates/Notice/19.tpl
+2 -1
View File
@@ -5,6 +5,7 @@
## TRAVIANZ ##
############################################################
$dataarray = explode(",",$message->readingNotice['data']);
$colspan="10";
$colspan2="10";
//attacker
if ($database->getUserField($dataarray[0],'username',0)!="??") {
@@ -298,4 +299,4 @@ for($i=129;$i<=138;$i++) {
</tr></tbody></table>
<?php } ?>
</td></tr></tbody></table>
</td></tr></tbody></table>
Templates/Ranking/alliance_attack.tpl
+2 -2
View File
@@ -42,7 +42,7 @@ $search = $_SESSION['search'];
echo "<tr><td class=\"ra \" >";
}
echo $i.".</td><td class=\"al \" ><a href=\"allianz.php?aid=".$ranking[$i]['id']."\">".$ranking[$i]['tag']."</a></td><td class=\"pla \" >";
echo $ranking[$i]['players']."</td><td class=\"po \">".$ranking[$i]['totalap']."</td></tr>";
echo $ranking[$i]['players']."</td><td class=\"po \">".$ranking[$i]['Aap']."</td></tr>";
}
}
}
@@ -54,4 +54,4 @@ $search = $_SESSION['search'];
</table>
<?php
include("ranksearch.tpl");
?>
?>
Templates/Ranking/alliance_defend.tpl
+2 -2
View File
@@ -42,7 +42,7 @@ $search = $_SESSION['search'];
echo "<tr><td class=\"ra \" >";
}
echo $i.".</td><td class=\"al \" ><a href=\"allianz.php?aid=".$ranking[$i]['id']."\">".$ranking[$i]['tag']."</a></td><td class=\"pla \" >";
echo $ranking[$i]['players']."</td><td class=\"po \">".$ranking[$i]['totaldp']."</td></tr>";
echo $ranking[$i]['players']."</td><td class=\"po \">".$ranking[$i]['Adp']."</td></tr>";
}
}
}
@@ -54,4 +54,4 @@ $search = $_SESSION['search'];
</table>
<?php
include("ranksearch.tpl");
?>
?>
Templates/menu.tpl
+8 -6
View File
@@ -45,10 +45,12 @@ div.c1 {text-align: center}
echo "<a href=\"sysmsg.php\">".SYSTEM_MESSAGE."</a>";
echo "<a href=\"create_account.php\">Create Natars</a>";
} ?> <a href="logout.php"><?php echo LOGOUT;?></a></p>
<a href="rules.php"><b><?php echo GAME_RULES;?></b></a>
<p><a href="plus.php?id=3">Travian <b><span class="plus_g">P</span><span class="plus_o">l</span><span class="plus_g">u</span><span class="plus_o">s</span></b></a>
<a href="support.php"><b><?php echo SUPPORT;?></b></a>
<p>
<a href="plus.php?id=3"><?php echo SERVER_NAME; ?> <b><span class="plus_g">P</span><span class="plus_o">l</span><span class="plus_g">u</span><span class="plus_o">s</span></b></a>
</p>
<p>
<a href="rules.php"><b><?php echo GAME_RULES;?></b></a>
<a href="support.php"><b><?php echo SUPPORT;?></b></a>
<br></p>
<?php
$timestamp = $database->isDeleting($session->uid);
@@ -69,13 +71,13 @@ div.c1 {text-align: center}
?>
<div id="content" class="village1">
<h1>Announcement</h1>
<h1><?php echo ANNOUNCEMENT; ?></h1>
</br>
<h3>Hi <?php echo $session->username; ?>,</h3>
<?php include("Templates/text.tpl"); ?>
<div class="c1">
</br>
<h3><a href="dorf1.php?ok">&raquo; Go to my village</a></h3>
<h3><a href="dorf1.php?ok">&raquo; <?php echo GO2MY_VILLAGE; ?></a></h3>
</div>
</div>