Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverted the login table changes from r12464

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12561 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2008-04-11 07:45:26 +00:00
parent e889fc9d62
commit 65ea169212
6 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog-Trunk.txt
View File

@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2008/04/11
* Reverted the `login` table changes from r12464 [ultramage]
* Finished most of the quest log code, still bits here and there
- but it's ready for testing. (r12558) [Kevin]
2008/04/10

4
sql-files/main.sql
View File

@ -427,10 +427,10 @@ CREATE TABLE `login` (
`email` varchar(39) NOT NULL default '',
`level` tinyint(3) NOT NULL default '0',
`error_message` smallint(11) unsigned NOT NULL default '0',
`expiration_time` int(11) unsigned NOT NULL default '0',
`connect_until` int(11) unsigned NOT NULL default '0',
`last_ip` varchar(100) NOT NULL default '',
`memo` smallint(11) unsigned NOT NULL default '0',
`unban_time` int(11) unsigned NOT NULL default '0',
`ban_until` int(11) unsigned NOT NULL default '0',
`state` int(11) unsigned NOT NULL default '0',
PRIMARY KEY (`account_id`),
KEY `name` (`userid`)

2
sql-files/upgrade_svn12278.sql
View File

@ -1 +1 @@
DELETE FROM `mail` WHERE `status` > 2;
DELETE FROM `mail` WHERE `status` > 2;

50
sql-files/upgrade_svn12294.sql
View File

@ -1,26 +1,26 @@
--
-- Table structure for table `auction`
--
DROP TABLE IF EXISTS `auction`;
CREATE TABLE `auction` (
`auction_id` bigint(20) unsigned NOT NULL auto_increment,
`seller_id` int(11) unsigned NOT NULL default '0',
`seller_name` varchar(30) NOT NULL default '',
`buyer_id` int(11) unsigned NOT NULL default '0',
`buyer_name` varchar(30) NOT NULL default '',
`price` int(11) unsigned NOT NULL default '0',
`buynow` int(11) unsigned NOT NULL default '0',
`hours` smallint(6) NOT NULL default '0',
`timestamp` int(11) unsigned NOT NULL default '0',
`nameid` int(11) unsigned NOT NULL default '0',
`item_name` varchar(50) NOT NULL default '',
`type` smallint(6) NOT NULL default '0',
`refine` tinyint(3) unsigned NOT NULL default '0',
`attribute` tinyint(4) unsigned NOT NULL default '0',
`card0` smallint(11) NOT NULL default '0',
`card1` smallint(11) NOT NULL default '0',
`card2` smallint(11) NOT NULL default '0',
`card3` smallint(11) NOT NULL default '0',
PRIMARY KEY (`auction_id`)
--
-- Table structure for table `auction`
--
DROP TABLE IF EXISTS `auction`;
CREATE TABLE `auction` (
`auction_id` bigint(20) unsigned NOT NULL auto_increment,
`seller_id` int(11) unsigned NOT NULL default '0',
`seller_name` varchar(30) NOT NULL default '',
`buyer_id` int(11) unsigned NOT NULL default '0',
`buyer_name` varchar(30) NOT NULL default '',
`price` int(11) unsigned NOT NULL default '0',
`buynow` int(11) unsigned NOT NULL default '0',
`hours` smallint(6) NOT NULL default '0',
`timestamp` int(11) unsigned NOT NULL default '0',
`nameid` int(11) unsigned NOT NULL default '0',
`item_name` varchar(50) NOT NULL default '',
`type` smallint(6) NOT NULL default '0',
`refine` tinyint(3) unsigned NOT NULL default '0',
`attribute` tinyint(4) unsigned NOT NULL default '0',
`card0` smallint(11) NOT NULL default '0',
`card1` smallint(11) NOT NULL default '0',
`card2` smallint(11) NOT NULL default '0',
`card3` smallint(11) NOT NULL default '0',
PRIMARY KEY (`auction_id`)
) ENGINE=MyISAM;

2
sql-files/upgrade_svn12561.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE `login` CHANGE `expiration_time` `connect_until` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0';
ALTER TABLE `login` CHANGE `unban_time` `ban_until` INT( 11 ) UNSIGNED NOT NULL DEFAULT '0';

18
src/login_sql/login.c
View File

@ -422,7 +422,7 @@ int mmo_auth_new(struct mmo_account* account)
// insert new entry into db
//TODO: error checking
stmt = SqlStmt_Malloc(sql_handle);
SqlStmt_Prepare(stmt, "INSERT INTO `%s` (`%s`, `%s`, `sex`, `email`, `expiration_time`) VALUES (?, ?, '%c', 'a@a.com', '%d')", login_db, login_db_userid, login_db_user_pass, account->sex, expiration_time);
SqlStmt_Prepare(stmt, "INSERT INTO `%s` (`%s`, `%s`, `sex`, `email`, `connect_until`) VALUES (?, ?, '%c', 'a@a.com', '%d')", login_db, login_db_userid, login_db_user_pass, account->sex, expiration_time);
SqlStmt_BindParam(stmt, 0, SQLDT_STRING, account->userid, strnlen(account->userid, NAME_LENGTH));
if( login_config.use_md5_passwds )
{
@ -524,7 +524,7 @@ int mmo_auth(struct login_session_data* sd)
// retrieve login entry for the specified username
if( SQL_ERROR == Sql_Query(sql_handle,
"SELECT `%s`,`%s`,`lastlogin`,`sex`,`expiration_time`,`unban_time`,`state`,`%s` FROM `%s` WHERE `%s`= %s '%s'",
"SELECT `%s`,`%s`,`lastlogin`,`sex`,`connect_until`,`ban_until`,`state`,`%s` FROM `%s` WHERE `%s`= %s '%s'",
login_db_account_id, login_db_user_pass, login_db_level,
login_db, login_db_userid, (login_config.case_sensitive ? "BINARY" : ""), esc_userid) )
Sql_ShowDebug(sql_handle);
@ -583,7 +583,7 @@ int mmo_auth(struct login_session_data* sd)
if( sd->sex != 'S' && sd->account_id < START_ACCOUNT_NUM )
ShowWarning("Account %s has account id %d! Account IDs must be over %d to work properly!\n", sd->userid, sd->account_id, START_ACCOUNT_NUM);
if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `lastlogin` = NOW(), `logincount`=`logincount`+1, `last_ip`='%s', `unban_time`='0', `state`='0' WHERE `%s` = '%d'",
if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `lastlogin` = NOW(), `logincount`=`logincount`+1, `last_ip`='%s', `ban_until`='0', `state`='0' WHERE `%s` = '%d'",
login_db, ip, login_db_account_id, sd->account_id) )
Sql_ShowDebug(sql_handle);
@ -689,7 +689,7 @@ int parse_fromchar(int fd)
idb_remove(auth_db, account_id);
// retrieve email and account expiration time
if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `email`,`expiration_time` FROM `%s` WHERE `%s`='%d'", login_db, login_db_account_id, account_id) )
if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `email`,`connect_until` FROM `%s` WHERE `%s`='%d'", login_db, login_db_account_id, account_id) )
Sql_ShowDebug(sql_handle);
if( SQL_SUCCESS == Sql_NextRow(sql_handle) )
{
@ -765,7 +765,7 @@ int parse_fromchar(int fd)
int account_id = RFIFOL(fd,2);
RFIFOSKIP(fd,6);
if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `email`,`expiration_time` FROM `%s` WHERE `%s`='%d'", login_db, login_db_account_id, account_id) )
if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `email`,`connect_until` FROM `%s` WHERE `%s`='%d'", login_db, login_db_account_id, account_id) )
Sql_ShowDebug(sql_handle);
else if( SQL_SUCCESS == Sql_NextRow(sql_handle) )
{
@ -928,7 +928,7 @@ int parse_fromchar(int fd)
charif_sendallwos(-1, buf, 11);
}
ShowNotice("Account: %d Banned until: %lu\n", account_id, (unsigned long)timestamp);
if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `unban_time` = '%lu' WHERE `%s` = '%d'", login_db, (unsigned long)timestamp, login_db_account_id, account_id) )
if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `ban_until` = '%lu' WHERE `%s` = '%d'", login_db, (unsigned long)timestamp, login_db_account_id, account_id) )
Sql_ShowDebug(sql_handle);
}
}
@ -1019,11 +1019,11 @@ int parse_fromchar(int fd)
int account_id = RFIFOL(fd,2);
RFIFOSKIP(fd,6);
if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `unban_time` FROM `%s` WHERE `%s` = '%d'", login_db, login_db_account_id, account_id) )
if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `ban_until` FROM `%s` WHERE `%s` = '%d'", login_db, login_db_account_id, account_id) )
Sql_ShowDebug(sql_handle);
else if( Sql_NumRows(sql_handle) > 0 )
{// Found a match
if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `unban_time` = '0' WHERE `%s` = '%d'", login_db, login_db_account_id, account_id) )
if( SQL_ERROR == Sql_Query(sql_handle, "UPDATE `%s` SET `ban_until` = '0' WHERE `%s` = '%d'", login_db, login_db_account_id, account_id) )
Sql_ShowDebug(sql_handle);
}
}
@ -1375,7 +1375,7 @@ void login_auth_failed(struct login_session_data* sd, int result)
memset(WFIFOP(fd,3), '\0', 20);
else
{// 6 = Your are Prohibited to log in until %s
if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `unban_time` FROM `%s` WHERE `%s` = %s '%s'", login_db, login_db_userid, (login_config.case_sensitive ? "BINARY" : ""), esc_userid) )
if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `ban_until` FROM `%s` WHERE `%s` = %s '%s'", login_db, login_db_userid, (login_config.case_sensitive ? "BINARY" : ""), esc_userid) )
Sql_ShowDebug(sql_handle);
else if( SQL_SUCCESS == Sql_NextRow(sql_handle) )
{