From e202a7e525fab2e0adf9c11ad470a18e8ffc7c8c Mon Sep 17 00:00:00 2001 From: Shadow Date: Wed, 12 Mar 2014 09:06:46 +0200 Subject: [PATCH] update --- GameEngine/Account.php | 8 ++++++++ Templates/Build/17.tpl | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/GameEngine/Account.php b/GameEngine/Account.php index e13b1159..08a05d29 100644 --- a/GameEngine/Account.php +++ b/GameEngine/Account.php @@ -186,6 +186,11 @@ class Account { if($database->getUserField($_POST['user'],"act",1) != "") { $form->addError("activate",$_POST['user']); } + // Vacation mode by Shadow + if($database->getUserField($_POST['user'],"vac_mode",1) == 1 && $database->getUserField($_POST['user'],"vac_time",1) > time()) { + $form->addError("vacation","Vacation mode is still enabled"); + } + // Vacation mode by Shadow if($form->returnErrors() > 0) { $_SESSION['errorarray'] = $form->getErrors(); $_SESSION['valuearray'] = $_POST; @@ -194,6 +199,9 @@ class Account { } else { $userid = $database->getUserArray($_POST['user'], 0); + // Vacation mode by Shadow + $database->removevacationmode($userid['id']); + // Vacation mode by Shadow if($database->login($_POST['user'],$_POST['pw'])){ $database->UpdateOnline("login" ,$_POST['user'],time(),$userid['id']); }else if($database->sitterLogin($_POST['user'],$_POST['pw'])){ diff --git a/Templates/Build/17.tpl b/Templates/Build/17.tpl index a360dffb..96e89bd5 100644 --- a/Templates/Build/17.tpl +++ b/Templates/Build/17.tpl @@ -26,7 +26,6 @@ else if($_POST['dname']!=""){ if($checkexist){ $villageOwner = $database->getVillageField($getwref,'owner'); $userAccess = $database->getUserField($villageOwner,'access',0); -} // Function vacation mode by Shadow $userVacation = $database->getUserField($villageOwner,'vac_mode',0); }