diff --git a/GameEngine/Account.php b/GameEngine/Account.php index f003d0dc..45c9548e 100755 --- a/GameEngine/Account.php +++ b/GameEngine/Account.php @@ -154,7 +154,7 @@ class Account { } private function Activate() { - if(START_DATE < date('m/d/Y') or START_DATE == date('m/d/Y') && START_TIME <= date('H:i')) + if(START_DATE < date('d.m.Y') or START_DATE == date('d.m.Y') && START_TIME <= date('H:i')) { global $database; $q = "SELECT act, username, password, email, tribe, location FROM ".TB_PREFIX."activate where act = '".$database->escape($_POST['id'])."'"; diff --git a/GameEngine/Automation.php b/GameEngine/Automation.php index 053ec1bb..54f78cd4 100755 --- a/GameEngine/Automation.php +++ b/GameEngine/Automation.php @@ -4574,7 +4574,7 @@ class Automation { $result = mysqli_query($database->dblink,$q); if($result) { $row = mysqli_fetch_assoc($result); - $stime = strtotime(START_DATE) - strtotime(date('m/d/Y')) + strtotime(START_TIME); + $stime = strtotime(START_DATE) - strtotime(date('d.m.Y')) + strtotime(START_TIME); if($row['lastgavemedal'] == 0 && $stime < time()){ $newtime = strtotime('next monday'); $q = "UPDATE ".TB_PREFIX."config SET lastgavemedal = ".(int) $newtime; diff --git a/GameEngine/Database.php b/GameEngine/Database.php index 7d0de786..d9e67c78 100755 --- a/GameEngine/Database.php +++ b/GameEngine/Database.php @@ -733,7 +733,7 @@ class MYSQLi_DB implements IDbConnection { list($username, $password, $email, $tribe, $act) = $this->escape_input($username, $password, $email, $tribe, $act); $time = time(); - $stime = strtotime(START_DATE) - strtotime(date('m/d/Y')) + strtotime(START_TIME); + $stime = strtotime(START_DATE) - strtotime(date('d.m.Y')) + strtotime(START_TIME); if($stime > $time) $time = $stime; $timep = $time + PROTECTION; $time = time(); diff --git a/install/templates/config.tpl b/install/templates/config.tpl index 0e8653bf..c3720c41 100644 --- a/install/templates/config.tpl +++ b/install/templates/config.tpl @@ -618,7 +618,7 @@ echo "
Error creating constant.php - +
Start Date:
Start Time: