From 135f8fa24f4a5dff293408de40a2f6435d5689a6 Mon Sep 17 00:00:00 2001 From: Shadow <1140613+Shadowss@users.noreply.github.com> Date: Thu, 21 Jun 2018 15:24:14 +0300 Subject: [PATCH] Little mistake in market +fix vacation in market. +for the moment is a problem in database (not register vacation in database) --- Templates/Build/17.tpl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Templates/Build/17.tpl b/Templates/Build/17.tpl index f77d9201..0ff76ad7 100644 --- a/Templates/Build/17.tpl +++ b/Templates/Build/17.tpl @@ -31,11 +31,12 @@ else if(!empty($_POST['dname'])){ if(isset($checkexist) && $checkexist){ $villageOwner = $database->getVillageField($getwref,'owner'); $userAccess = $database->getUserField($villageOwner,'access',0); +$userVacation = $database->getUserField($villageOwner,'vac_mode',0); $userID = $database->getUserField($villageOwner,'id',0); } $maxcarry = $market->maxcarry; $maxcarry *= $market->merchantAvail(); -if(isset($_POST['ft'])=='check' && (($_POST['send3'] > 1 && $_POST['send3'] <= 3 && $session->goldclub) || $_POST['send3'] == 1) && $getwref != $village->wid && $allres!=0 && $allres <= $maxcarry && ($_POST['x']!="" && $_POST['y']!="" or $_POST['dname']!="") && $checkexist && ($userAccess == 2 || $userAccess == MULTIHUNTER || (ADMIN_ALLOW_INCOMING_RAIDS && $userAccess == ADMIN))){ +if(isset($_POST['ft'])=='check' && (($_POST['send3'] > 1 && $_POST['send3'] <= 3 && $session->goldclub) || $_POST['send3'] == 1) && $getwref != $village->wid && $allres!=0 && $allres <= $maxcarry && ($_POST['x']!="" && $_POST['y']!="" or $_POST['dname']!="") && $checkexist && ($userAccess == 2 || $userAccess == MULTIHUNTER || (ADMIN_ALLOW_INCOMING_RAIDS && $userAccess == ADMIN)) && $userVacation == 0){ ?>
@@ -226,6 +227,8 @@ if(isset($_POST['ft'])=='check'){ $error = ''.BANNED_CANNOT_SEND_RESOURCES.'.'; }elseif($_POST['r1']==0 && $_POST['r2']==0 && $_POST['r3']==0 && $_POST['r4']==0){ $error = ''.RESOURCES_NO_SELECTED.'.'; + }elseif($userVacation == '1') { + $error = 'Player is on vacation mode. You cannot send resources to him.'; }elseif(!$_POST['x'] && !$_POST['y'] && !$_POST['dname']){ $error = ''.ENTER_COORDINATES.'.'; }elseif($allres > $maxcarry){