diff --git a/tools/validate.php b/tools/validate.php index 0eb76e0c..b3546aad 100644 --- a/tools/validate.php +++ b/tools/validate.php @@ -23,32 +23,36 @@ if(isset($_GET['account'])) { $account = $_GET['account']; if(USE_ACCOUNT_NAME) { - if(!Validator::accountName($account)) + if(!Validator::accountName($account)) { error_(Validator::getLastError()); + } } - else if(!Validator::accountId($account)) + else if(!Validator::accountId($account)) { error_(Validator::getLastError()); + } $_account = new OTS_Account(); - if(USE_ACCOUNT_NAME || USE_ACCOUNT_NUMBER) + if(USE_ACCOUNT_NAME || USE_ACCOUNT_NUMBER) { $_account->find($account); - else + } else { $_account->load($account); + } $accountNameOrNumber = (USE_ACCOUNT_NAME ? ' name' : 'number'); - if($_account->isLoaded()) + if($_account->isLoaded()) { error_("Account with this $accountNameOrNumber already exist."); + } success_("Good account $accountNameOrNumber ($account)."); } else if(isset($_GET['email'])) { $email = $_GET['email']; - if(!Validator::email($email)) + if(!Validator::email($email)) { error_(Validator::getLastError()); + } - if(setting('core.account_mail_unique')) - { + if(setting('core.account_mail_unique')) { if(Account::where('email', '=', $email)->exists()) error_('Account with this e-mail already exist.'); } @@ -62,11 +66,13 @@ else if(isset($_GET['name'])) $name = strtolower(stripslashes($name)); } - if(!Validator::characterName($name)) + if(!Validator::characterName($name)) { error_(Validator::getLastError()); + } - if(!admin() && !Validator::newCharacterName($name)) + if(!admin() && !Validator::newCharacterName($name)) { error_(Validator::getLastError()); + } $createCharacter = new CreateCharacter(); if (!$createCharacter->checkName($name, $errors)) { @@ -83,16 +89,19 @@ else if(isset($_GET['password']) && isset($_GET['password_confirm'])) { error_('Please enter the password for your new account.'); } - if(!Validator::password($password)) + if(!Validator::password($password)) { error_(Validator::getLastError()); + } - if($password != $password_confirm) + if($password != $password_confirm) { error_('Passwords are not the same.'); + } success_(1); } -else +else { error_('Error: no input specified.'); +} /** * Output message & exit.