Merge remote-tracking branch 'origin/master'

This commit is contained in:
Martin Ambrus
2017-11-15 20:21:23 +01:00
2 changed files with 12 additions and 2 deletions
+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;
?>
?>