Merge remote-tracking branch 'origin/master'

GameEngine/Market.php

@@ -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");

Templates/Profile/menu.tpl

@@ -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) {
  ?>