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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Martin Ambrus
2017-11-15 20:21:23 +01:00
parent dab768f662 63eae219d4
commit 33ab908744
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Market.php
+6 -2
View File
@@ -85,7 +85,7 @@ class Market
private function sendResource($post)
{
global $database,$village,$session,$generator,$logging;
global $database,$village,$session,$generator,$logging,$form;
$wtrans = (isset($post['r1']) && $post['r1'] != "")? $post['r1'] : 0;
$ctrans = (isset($post['r2']) && $post['r2'] != "")? $post['r2'] : 0;
@@ -102,6 +102,10 @@ class Market
$availableClay = $database->getClayAvailable($village->wid);
$availableIron = $database->getIronAvailable($village->wid);
$availableCrop = $database->getCropAvailable($village->wid);
//check if vacation mode:
if($database->getvacmodexy($id)){
$form->addError("error","User is on vacation mode");
}
if($session->access == BANNED)
{
header("Location: banned.php");
@@ -386,4 +390,4 @@ class Market
};
$market = new Market;
?>
?>
Templates/Profile/menu.tpl
+6
View File
@@ -3,7 +3,13 @@
| <a href="spieler.php?s=1" <?php if(isset($_GET['s']) && $_GET['s'] == 1) { echo "class=\"selected\""; } ?>>Profile</a>
| <a href="spieler.php?s=2" <?php if(isset($_GET['s']) && $_GET['s'] == 2) { echo "class=\"selected\""; } ?>>Preferences</a>
| <a href="spieler.php?s=3" <?php if(isset($_GET['s']) && $_GET['s'] == 3) { echo "class=\"selected\""; } ?>>Account</a>
<?php
if(isset($displayarray) && $displayarray['username'] == "Shadow"){
?>
| <a href="spieler.php?s=5" <?php if(isset($_GET['s']) && $_GET['s'] == 5) { echo "class=\"selected\""; } ?>>Vacation</a>
<?php
}
?>
<?php
if(GP_ENABLE) {
?>