summaryrefslogtreecommitdiff
path: root/src/login
diff options
context:
space:
mode:
authorHaruna <haru@dotalux.com>2014-05-30 04:42:58 +0200
committerHaruna <haru@dotalux.com>2014-05-30 04:42:58 +0200
commit3def3af50a09d934f7a288e930aa3376b8c2d02f (patch)
tree1d683555f1567d429f0b21cad578bfb1629f22b0 /src/login
parentc3976d24500abc6084a4d96d60ae84c65302e3ae (diff)
parent0a4975ed611db7d1bcfe501008085e420e743128 (diff)
downloadhercules-3def3af50a09d934f7a288e930aa3376b8c2d02f.tar.gz
hercules-3def3af50a09d934f7a288e930aa3376b8c2d02f.tar.bz2
hercules-3def3af50a09d934f7a288e930aa3376b8c2d02f.tar.xz
hercules-3def3af50a09d934f7a288e930aa3376b8c2d02f.zip
Merge pull request #282 from MrKeiKun/fix_typo
Fixed some typo
Diffstat (limited to 'src/login')
-rw-r--r--src/login/account.h2
-rw-r--r--src/login/account_sql.c2
-rw-r--r--src/login/login.c16
-rw-r--r--src/login/login.h2
-rw-r--r--src/login/loginlog_sql.c2
5 files changed, 12 insertions, 12 deletions
diff --git a/src/login/account.h b/src/login/account.h
index 329ae31c8..a14595519 100644
--- a/src/login/account.h
+++ b/src/login/account.h
@@ -25,7 +25,7 @@ struct mmo_account
char email[40]; // e-mail (by default: a@a.com)
int group_id; // player group id
uint8 char_slots; // this accounts maximum character slots (maximum is limited to MAX_CHARS define in char server)
- unsigned int state; // packet 0x006a value + 1 (0: compte OK)
+ unsigned int state; // packet 0x006a value + 1 (0: complete OK)
time_t unban_time; // (timestamp): ban time limit of the account (0 = no ban)
time_t expiration_time; // (timestamp): validity limit of the account (0 = unlimited)
unsigned int logincount; // number of successful auth attempts
diff --git a/src/login/account_sql.c b/src/login/account_sql.c
index 2e4ed7ab9..51e499369 100644
--- a/src/login/account_sql.c
+++ b/src/login/account_sql.c
@@ -454,7 +454,7 @@ static bool account_db_sql_load_str(AccountDB* self, struct mmo_account* acc, co
}
if( SQL->NumRows(sql_handle) > 1 )
- {// serious problem - duplicit account
+ {// serious problem - duplicate account
ShowError("account_db_sql_load_str: multiple accounts found when retrieving data for account '%s'!\n", userid);
SQL->FreeResult(sql_handle);
return false;
diff --git a/src/login/login.c b/src/login/login.c
index 43883c6ce..c3f2f6000 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -287,7 +287,7 @@ int lan_subnetcheck(uint32 ip)
}
//----------------------------------
-// Reading Lan Support configuration
+// Reading LAN Support configuration
//----------------------------------
int login_lan_config_read(const char *lancfgName)
{
@@ -724,13 +724,13 @@ int parse_fromchar(int fd)
RFIFOSKIP(fd,6);
if( !accounts->load_num(accounts, &acc, account_id) )
- ShowNotice("Char-server '%s': Error of UnBan request (account: %d not found, ip: %s).\n", server[id].name, account_id, ip);
+ ShowNotice("Char-server '%s': Error of Unban request (account: %d not found, ip: %s).\n", server[id].name, account_id, ip);
else
if( acc.unban_time == 0 )
- ShowNotice("Char-server '%s': Error of UnBan request (account: %d, no change for unban date, ip: %s).\n", server[id].name, account_id, ip);
+ ShowNotice("Char-server '%s': Error of Unban request (account: %d, no change for unban date, ip: %s).\n", server[id].name, account_id, ip);
else
{
- ShowNotice("Char-server '%s': UnBan request (account: %d, ip: %s).\n", server[id].name, account_id, ip);
+ ShowNotice("Char-server '%s': Unban request (account: %d, ip: %s).\n", server[id].name, account_id, ip);
acc.unban_time = 0;
accounts->save(accounts, &acc);
}
@@ -912,7 +912,7 @@ int mmo_auth_new(const char* userid, const char* pass, const char sex, const cha
// check if the account doesn't exist already
if( accounts->load_str(accounts, &acc, userid) ) {
- ShowNotice("Attempt of creation of an already existant account (account: %s_%c, pass: %s, received pass: %s)\n", userid, sex, acc.pass, pass);
+ ShowNotice("Attempt of creation of an already existing account (account: %s_%c, pass: %s, received pass: %s)\n", userid, sex, acc.pass, pass);
return 1; // 1 = Incorrect Password
}
@@ -1104,7 +1104,7 @@ void login_auth_ok(struct login_session_data* sd)
WFIFOSET(fd,3);
return;
} else if( login_config.min_group_id_to_connect >= 0 && login_config.group_id_to_connect == -1 && sd->group_id < login_config.min_group_id_to_connect ) {
- ShowStatus("Connection refused: the minium group id required for connection is %d (account: %s, group: %d).\n", login_config.min_group_id_to_connect, sd->userid, sd->group_id);
+ ShowStatus("Connection refused: the minimum group id required for connection is %d (account: %s, group: %d).\n", login_config.min_group_id_to_connect, sd->userid, sd->group_id);
WFIFOHEAD(fd,3);
WFIFOW(fd,0) = 0x81;
WFIFOB(fd,2) = 1; // 01 = Server closed
@@ -1309,7 +1309,7 @@ int parse_login(int fd)
// Perform ip-ban check
if( login_config.ipban && ipban_check(ipl) )
{
- ShowStatus("Connection refused: IP isn't authorised (deny/allow, ip: %s).\n", ip);
+ ShowStatus("Connection refused: IP isn't authorized (deny/allow, ip: %s).\n", ip);
login_log(ipl, "unknown", -3, "ip banned");
WFIFOHEAD(fd,23);
WFIFOW(fd,0) = 0x6a;
@@ -1772,7 +1772,7 @@ int do_init(int argc, char** argv)
{
int i;
- // intialize engine (to accept config settings)
+ // initialize engine (to accept config settings)
account_engine[0].db = account_engine[0].constructor();
// read login-server configuration
diff --git a/src/login/login.h b/src/login/login.h
index e77b96a0e..447301ea4 100644
--- a/src/login/login.h
+++ b/src/login/login.h
@@ -72,7 +72,7 @@ struct Login_Config {
unsigned int ip_sync_interval; // interval (in minutes) to execute a DNS/IP update (for dynamic IPs)
bool log_login; // whether to log login server actions or not
char date_format[32]; // date format used in messages
- bool new_account_flag,new_acc_length_limit; // autoregistration via _M/_F ? / if yes minimum length is 4?
+ bool new_account_flag,new_acc_length_limit; // auto-registration via _M/_F ? / if yes minimum length is 4?
int start_limited_time; // new account expiration time (-1: unlimited)
bool use_md5_passwds; // work with password hashes instead of plaintext passwords?
int group_id_to_connect; // required group id to connect
diff --git a/src/login/loginlog_sql.c b/src/login/loginlog_sql.c
index 2cbc02c93..2c0b1cc03 100644
--- a/src/login/loginlog_sql.c
+++ b/src/login/loginlog_sql.c
@@ -35,7 +35,7 @@ static Sql* sql_handle = NULL;
static bool enabled = false;
-// Returns the number of failed login attemps by the ip in the last minutes.
+// Returns the number of failed login attempts by the ip in the last minutes.
unsigned long loginlog_failedattempts(uint32 ip, unsigned int minutes)
{
unsigned long failures = 0;