diff --git a/GameEngine/Account.php b/GameEngine/Account.php index 85a09ebd..e498ee17 100755 --- a/GameEngine/Account.php +++ b/GameEngine/Account.php @@ -75,6 +75,9 @@ class Account { else if(USRNM_SPECIAL && preg_match("/[:,\\. \\n\\r\\t\\s\\<\\>]+/", $_POST['name'])) { $form->addError("name",USRNM_CHAR); } + else if(strtolower($_POST['name']) == 'natars') { + $form->addError("name",USRNM_TAKEN); + } else if(User::exists($database,$_POST['name'])) { $form->addError("name",USRNM_TAKEN); } diff --git a/install/include/accounts.php b/install/include/accounts.php index 4cc36e58..cba5e7fa 100644 --- a/install/include/accounts.php +++ b/install/include/accounts.php @@ -5,6 +5,12 @@ exit; } + // don't allow creating Natars user + if (!empty($_POST['aname']) && strtolower($_POST['aname']) == 'natars') { + header("Location: ../index.php?s=4&err=2"); + exit; + } + // don't let SQL time out when 30-500 seconds (depending on php.ini) is not enough @set_time_limit(0); diff --git a/install/templates/accounts.tpl b/install/templates/accounts.tpl index 1494c322..ca4e99e7 100644 --- a/install/templates/accounts.tpl +++ b/install/templates/accounts.tpl @@ -3,15 +3,15 @@ ## -= YOU MAY NOT REMOVE OR CHANGE THIS NOTICE =- ## ## --------------------------------------------------------------------------- ## ## Project: TravianZ ## -## Version: 22.06.2015 ## +## Version: 22.06.2015 ## ## Filename multihunter.tpl ## -## Developed by: Mr.php , Advocaite , brainiacX , yi12345 , Shadow , ronix ## +## Developed by: Mr.php , Advocaite , brainiacX , yi12345 , Shadow , ronix ## ## Fixed by: Shadow - STARVATION , HERO FIXED COMPL. ## ## Fixed by: InCube - double troops ## ## License: TravianZ Project ## ## Copyright: TravianZ (c) 2010-2015. All rights reserved. ## ## URLs: http://travian.shadowss.ro ## -## Source code: https://github.com/Shadowss/TravianZ ## +## Source code: https://github.com/Shadowss/TravianZ ## ## ## ################################################################################# @@ -19,6 +19,10 @@ if(isset($_GET['err']) && $_GET['err'] == 1) { echo "


At least MultiHunter & Support password are required in this form.


"; } +if(isset($_GET['err']) && $_GET['err'] == 2) { + echo "


Natars is a reserved username for an in-game NPC tribe. Please choose a different admin username.


"; +} + ?>
@@ -60,7 +64,7 @@ if(isset($_GET['err']) && $_GET['err'] == 1) { Admin tribe: