pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 18:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[UCS] Database class name change (#2742)

Browse Source
This commit is contained in:
Chris Miles 2023-01-15 14:16:23 -06:00 committed by GitHub
parent e1c1d55ca5
commit 7aa25f17f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 26 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ucs/chatchannel.cpp
View File

@ -25,7 +25,7 @@
#include <cstdlib> #include <cstdlib>
#include <algorithm> #include <algorithm>
extern Database database; extern UCSDatabase database;
extern uint32 ChatMessagesSent; extern uint32 ChatMessagesSent;
void ServerToClient45SayLink(std::string& clientSayLink, const std::string& serverSayLink); void ServerToClient45SayLink(std::string& clientSayLink, const std::string& serverSayLink);

2
ucs/clientlist.cpp
View File

@ -34,7 +34,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include <cstdlib> #include <cstdlib>
#include <algorithm> #include <algorithm>
extern Database database; extern UCSDatabase database;
extern std::string WorldShortName; extern std::string WorldShortName;
extern std::string GetMailPrefix(); extern std::string GetMailPrefix();
extern ChatChannelList *ChannelList; extern ChatChannelList *ChannelList;

85
ucs/database.cpp
View File

@ -55,56 +55,7 @@ extern std::string GetMailPrefix();
extern ChatChannelList *ChannelList; extern ChatChannelList *ChannelList;
extern uint32 MailMessagesSent; extern uint32 MailMessagesSent;
Database::Database() void UCSDatabase::GetAccountStatus(Client *client)
{
DBInitVars();
}
/*
Establish a connection to a mysql database with the supplied parameters
*/
Database::Database(const char *host, const char *user, const char *passwd, const char *database, uint32 port)
{
DBInitVars();
Connect(host, user, passwd, database, port);
}
bool Database::Connect(const char *host, const char *user, const char *passwd, const char *database, uint32 port)
{
uint32 errnum = 0;
char errbuf[MYSQL_ERRMSG_SIZE];
if (!Open(host, user, passwd, database, port, &errnum, errbuf)) {
LogError("Failed to connect to database: Error: {}", errbuf);
HandleMysqlError(errnum);
return false;
}
else {
LogInfo("Using database [{}] at [{}]:[{}]", database, host, port);
return true;
}
}
void Database::DBInitVars()
{
}
void Database::HandleMysqlError(uint32 errnum)
{
}
/*
Close the connection to the database
*/
Database::~Database()
{
}
void Database::GetAccountStatus(Client *client)
{ {
std::string query = StringFormat( std::string query = StringFormat(
@ -144,7 +95,7 @@ void Database::GetAccountStatus(Client *client)
); );
} }
int Database::FindAccount(const char *characterName, Client *client) int UCSDatabase::FindAccount(const char *characterName, Client *client)
{ {
LogInfo("FindAccount for character [{}]", characterName); LogInfo("FindAccount for character [{}]", characterName);
@ -188,7 +139,7 @@ int Database::FindAccount(const char *characterName, Client *client)
return accountID; return accountID;
} }
bool Database::VerifyMailKey(std::string characterName, int IPAddress, std::string MailKey) bool UCSDatabase::VerifyMailKey(std::string characterName, int IPAddress, std::string MailKey)
{ {
std::string query = StringFormat( std::string query = StringFormat(
@ -221,7 +172,7 @@ bool Database::VerifyMailKey(std::string characterName, int IPAddress, std::stri
return !strcmp(row[0], combinedKey); return !strcmp(row[0], combinedKey);
} }
int Database::FindCharacter(const char *characterName) int UCSDatabase::FindCharacter(const char *characterName)
{ {
char *safeCharName = RemoveApostrophes(characterName); char *safeCharName = RemoveApostrophes(characterName);
std::string query = StringFormat( std::string query = StringFormat(
@ -248,7 +199,7 @@ int Database::FindCharacter(const char *characterName)
return characterID; return characterID;
} }
bool Database::GetVariable(const char *varname, char *varvalue, uint16 varvalue_len) bool UCSDatabase::GetVariable(const char *varname, char *varvalue, uint16 varvalue_len)
{ {
std::string query = StringFormat("SELECT `value` FROM `variables` WHERE `varname` = '%s'", varname); std::string query = StringFormat("SELECT `value` FROM `variables` WHERE `varname` = '%s'", varname);
@ -268,7 +219,7 @@ bool Database::GetVariable(const char *varname, char *varvalue, uint16 varvalue_
return true; return true;
} }
bool Database::LoadChatChannels() bool UCSDatabase::LoadChatChannels()
{ {
LogInfo("Loading chat channels from the database"); LogInfo("Loading chat channels from the database");
@ -290,9 +241,9 @@ bool Database::LoadChatChannels()
return true; return true;
} }
void Database::SetChannelPassword(std::string channelName, std::string password) void UCSDatabase::SetChannelPassword(std::string channelName, std::string password)
{ {
LogInfo("Database::SetChannelPassword([{}], [{}])", channelName.c_str(), password.c_str()); LogInfo("UCSDatabase::SetChannelPassword([{}], [{}])", channelName.c_str(), password.c_str());
std::string query = StringFormat( std::string query = StringFormat(
"UPDATE `chatchannels` SET `password` = '%s' WHERE `name` = '%s'", "UPDATE `chatchannels` SET `password` = '%s' WHERE `name` = '%s'",
@ -300,9 +251,9 @@ void Database::SetChannelPassword(std::string channelName, std::string password)
QueryDatabase(query); QueryDatabase(query);
} }
void Database::SetChannelOwner(std::string channelName, std::string owner) void UCSDatabase::SetChannelOwner(std::string channelName, std::string owner)
{ {
LogInfo("Database::SetChannelOwner([{}], [{}])", channelName.c_str(), owner.c_str()); LogInfo("UCSDatabase::SetChannelOwner([{}], [{}])", channelName.c_str(), owner.c_str());
std::string query = StringFormat( std::string query = StringFormat(
"UPDATE `chatchannels` SET `owner` = '%s' WHERE `name` = '%s'", "UPDATE `chatchannels` SET `owner` = '%s' WHERE `name` = '%s'",
@ -313,7 +264,7 @@ void Database::SetChannelOwner(std::string channelName, std::string owner)
QueryDatabase(query); QueryDatabase(query);
} }
void Database::SendHeaders(Client *client) void UCSDatabase::SendHeaders(Client *client)
{ {
int unknownField2 = 25015275; int unknownField2 = 25015275;
@ -405,7 +356,7 @@ void Database::SendHeaders(Client *client)
} }
void Database::SendBody(Client *client, int messageNumber) void UCSDatabase::SendBody(Client *client, int messageNumber)
{ {
int characterID = FindCharacter(client->MailBoxName().c_str()); int characterID = FindCharacter(client->MailBoxName().c_str());
@ -460,7 +411,7 @@ void Database::SendBody(Client *client, int messageNumber)
safe_delete(outapp); safe_delete(outapp);
} }
bool Database::SendMail( bool UCSDatabase::SendMail(
std::string recipient, std::string recipient,
std::string from, std::string from,
std::string subject, std::string subject,
@ -533,7 +484,7 @@ bool Database::SendMail(
return true; return true;
} }
void Database::SetMessageStatus(int messageNumber, int status) void UCSDatabase::SetMessageStatus(int messageNumber, int status)
{ {
LogInfo("SetMessageStatus [{}] [{}]", messageNumber, status); LogInfo("SetMessageStatus [{}] [{}]", messageNumber, status);
@ -548,7 +499,7 @@ void Database::SetMessageStatus(int messageNumber, int status)
QueryDatabase(query); QueryDatabase(query);
} }
void Database::ExpireMail() void UCSDatabase::ExpireMail()
{ {
LogInfo("Expiring mail"); LogInfo("Expiring mail");
@ -606,7 +557,7 @@ void Database::ExpireMail()
} }
} }
void Database::AddFriendOrIgnore(int charID, int type, std::string name) void UCSDatabase::AddFriendOrIgnore(int charID, int type, std::string name)
{ {
std::string query = StringFormat( std::string query = StringFormat(
"INSERT INTO `friends` (`charid`, `type`, `name`) " "INSERT INTO `friends` (`charid`, `type`, `name`) "
@ -628,7 +579,7 @@ void Database::AddFriendOrIgnore(int charID, int type, std::string name)
} }
} }
void Database::RemoveFriendOrIgnore(int charID, int type, std::string name) void UCSDatabase::RemoveFriendOrIgnore(int charID, int type, std::string name)
{ {
std::string query = StringFormat( std::string query = StringFormat(
"DELETE FROM `friends` WHERE `charid` = %i AND `type` = %i AND `name` = '%s'", "DELETE FROM `friends` WHERE `charid` = %i AND `type` = %i AND `name` = '%s'",
@ -649,7 +600,7 @@ void Database::RemoveFriendOrIgnore(int charID, int type, std::string name)
} }
} }
void Database::GetFriendsAndIgnore(int charID, std::vector<std::string> &friends, std::vector<std::string> &ignorees) void UCSDatabase::GetFriendsAndIgnore(int charID, std::vector<std::string> &friends, std::vector<std::string> &ignorees)
{ {
std::string query = StringFormat("select `type`, `name` FROM `friends` WHERE `charid`=%i", charID); std::string query = StringFormat("select `type`, `name` FROM `friends` WHERE `charid`=%i", charID);

9
ucs/database.h
View File

@ -25,7 +25,7 @@
#include "../common/global_define.h" #include "../common/global_define.h"
#include "../common/types.h" #include "../common/types.h"
#include "../common/dbcore.h" #include "../common/database.h"
#include "../common/linked_list.h" #include "../common/linked_list.h"
#include "clientlist.h" #include "clientlist.h"
#include <string> #include <string>
@ -35,13 +35,8 @@
//atoi is not uint32 or uint32 safe!!!! //atoi is not uint32 or uint32 safe!!!!
#define atoul(str) strtoul(str, nullptr, 10) #define atoul(str) strtoul(str, nullptr, 10)
class Database : public DBcore { class UCSDatabase : public Database {
public: public:
Database();
Database(const char* host, const char* user, const char* passwd, const char* database,uint32 port);
bool Connect(const char* host, const char* user, const char* passwd, const char* database,uint32 port);
~Database();
int FindAccount(const char *CharacterName, Client *c); int FindAccount(const char *CharacterName, Client *c);
int FindCharacter(const char *CharacterName); int FindCharacter(const char *CharacterName);
bool VerifyMailKey(std::string CharacterName, int IPAddress, std::string MailKey); bool VerifyMailKey(std::string CharacterName, int IPAddress, std::string MailKey);

4
ucs/ucs.cpp
View File

@ -39,14 +39,16 @@
#include "../common/net/servertalk_client_connection.h" #include "../common/net/servertalk_client_connection.h"
#include "../common/discord_manager.h" #include "../common/discord_manager.h"
#include "../common/path_manager.h" #include "../common/path_manager.h"
#include "../common/zone_store.h"
ChatChannelList *ChannelList; ChatChannelList *ChannelList;
Clientlist *g_Clientlist; Clientlist *g_Clientlist;
EQEmuLogSys LogSys; EQEmuLogSys LogSys;
Database database; UCSDatabase database;
WorldServer *worldserver = nullptr; WorldServer *worldserver = nullptr;
DiscordManager discord_manager; DiscordManager discord_manager;
PathManager path; PathManager path;
ZoneStore zone_store;
const ucsconfig *Config; const ucsconfig *Config;

2
ucs/worldserver.cpp
View File

@ -39,7 +39,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
extern WorldServer worldserver; extern WorldServer worldserver;
extern Clientlist *g_Clientlist; extern Clientlist *g_Clientlist;
extern const ucsconfig *Config; extern const ucsconfig *Config;
extern Database database; extern UCSDatabase database;
extern DiscordManager discord_manager; extern DiscordManager discord_manager;
void ProcessMailTo(Client *c, std::string from, std::string subject, std::string message); void ProcessMailTo(Client *c, std::string from, std::string subject, std::string message);