xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-07-22 20:46:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/evader1337/TravianZ into evader1337-master

Browse Source 
# Conflicts:
#	GameEngine/Database/db_MYSQL.php
#	Templates/Build/avaliable.tpl
#	Templates/Message/inbox.tpl
This commit is contained in:
Martin Ambrus
2017-08-28 14:18:24 +02:00
parent 1a4005cd67 cdfee7780b
commit 9261a4a4b2
93 changed files with 5041 additions and 9207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Templates/Message/inbox.tpl
+5 -5
View File
@@ -1,6 +1,6 @@
x<div id="content" class="messages">
<h1>Messages</h1>
<?php
<?php
include("menu.tpl");
?>
<form method="post" action="nachrichten.php" name="msg" ><table cellpadding="1" cellspacing="1" id="overview">
@@ -11,8 +11,8 @@ x<div id="content" class="messages">
<th class="sent">Sent</th>
</tr></thead><tfoot><tr><th>
<?php
$MyGold = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE `id`='".$session->uid."'") or die(mysql_error());
$golds = mysql_fetch_array($MyGold);
$MyGold = mysqli_query($GLOBALS['link'],"SELECT * FROM ".TB_PREFIX."users WHERE `id`='".$session->uid."'") or die(mysqli_error());
$golds = mysqli_fetch_array($MyGold);
$date2=strtotime("NOW");
if ($golds['plus'] <= $date2) { ?>
<?php } else { ?>
@@ -23,7 +23,7 @@ x<div id="content" class="messages">
<input name="delmsg" value="delete" type="image" id="btn_delete" class="dynamic_img" src="img/x.gif" alt="delete" />
<?php if($session->plus) { echo "<input name=\"archive\" value=\"Archive\" type=\"image\" id=\"btn_archiv\" class=\"dynamic_img\" src=\"img/x.gif\" alt=\"Archive\" />"; } ?>
<input name="ft" value="m3" type="hidden" />
</th><th class="navi"><?php
</th><th class="navi"><?php
if(!isset($_GET['s']) && count($message->inbox1) < 10) {
echo "&laquo;&raquo;";
}
@@ -47,7 +47,7 @@ x<div id="content" class="messages">
background-color:orange;
}
</style>
<?php
<?php
if(isset($_GET['s'])) {
$s = $_GET['s'];
}
Templates/Message/sent.tpl
+2 -2
View File
@@ -22,8 +22,8 @@
<th>Recipient</th>
<th class="sent"><a href="nachrichten.php?t=2&s=0&amp;t=2&amp;o=1">Sent</a></th>
</tr></thead><tfoot><tr><th><?php
$MyGold = mysql_query("SELECT * FROM ".TB_PREFIX."users WHERE `id`='".$session->uid."'") or die(mysql_error());
$golds = mysql_fetch_array($MyGold);
$MyGold = mysqli_query($GLOBALS['link'],"SELECT * FROM ".TB_PREFIX."users WHERE `id`='".$session->uid."'") or die(mysqli_error());
$golds = mysqli_fetch_array($MyGold);
$date2=strtotime("NOW");
if ($golds['plus'] <= $date2) { ?>
<?php } else { ?>