jackz/sourcemod-plugins
1
0
Fork 0
mirror of https://github.com/Jackzmc/sourcemod-plugins.git synced 2025-05-05 19:53:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix race condition, other issues

Browse source
This commit is contained in:
Jackzie 2024-11-26 16:17:00 -06:00
parent 3ffe0540ac
commit a010498b29
2 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
plugins/adminpanel.smx
View file

Binary file not shown.

25
scripting/adminpanel.sp
View file

@ -203,7 +203,7 @@ void SetupUserInDB(int client) {
g_db.Format(query, sizeof(query), "INSERT INTO panel_user " g_db.Format(query, sizeof(query), "INSERT INTO panel_user "
..."(account_id,last_join_time,last_ip,last_country,last_region)" ..."(account_id,last_join_time,last_ip,last_country,last_region)"
..."VALUES ('%s',%d,'%s','%s','%s')" ..."VALUES ('%s',%d,'%s','%s','%s')"
..."ON DUPLICATE KEY UPDATE last_join_time=%d,last_ip='%s',last_country='%s',last_region='%s');", ..."ON DUPLICATE KEY UPDATE last_join_time=%d,last_ip='%s',last_country='%s',last_region='%s';",
steamidCache[client][10], // strip STEAM_#:#:##### returning only ending ####### steamidCache[client][10], // strip STEAM_#:#:##### returning only ending #######
// insert: // insert:
time, time,
@ -216,10 +216,19 @@ void SetupUserInDB(int client) {
country, country,
region region
); );
g_db.Query(DBCT_Insert, query); g_db.Query(DBCT_PanelUser, query, GetClientUserId(client));
}
}
g_db.Format(query, sizeof(query), "SELECT name FROM panel_user_names WHERE account_id = '%s' ORDER BY name_update_time DESC LIMIT 1", steamidCache[client][10]); // strip STEAM_#:#:##### returning only ending ####### void DBCT_PanelUser(Database db, DBResultSet results, const char[] error, int userId) {
g_db.Query(DBCT_CheckUserName, query, GetClientUserId(client)); if(db == null || results == null) {
LogError("DBCT_Insert returned error: %s", error);
}
int client = GetClientOfUserId(userId);
if(client > 0) {
char query[128];
g_db.Format(query, sizeof(query), "SELECT name FROM panel_user_names WHERE account_id = '%s' ORDER BY name_update_time DESC LIMIT 1", steamidCache[client][10]); // strip STEAM_#:#:##### returning only ending #######
g_db.Query(DBCT_CheckUserName, query, userId);
} }
} }
@ -236,10 +245,13 @@ void DBCT_CheckUserName(Database db, DBResultSet results, const char[] error, in
int client = GetClientOfUserId(userId); int client = GetClientOfUserId(userId);
if(client == 0) return; // Client left, ignore if(client == 0) return; // Client left, ignore
char prevName[64];
// Insert new name if we have none, or prev differs // Insert new name if we have none, or prev differs
bool insertNewName = true; bool insertNewName = true;
if(results.FetchRow()) { if(results.FetchRow()) {
if(nameCache[client][0] == '\0') {
LogError("DBCT_CheckUserName user %N(#%d) missing namecache", client, userId);
}
char prevName[64];
results.FetchString(0, prevName, sizeof(prevName)); results.FetchString(0, prevName, sizeof(prevName));
if(StrEqual(prevName, nameCache[client])) { if(StrEqual(prevName, nameCache[client])) {
insertNewName = false; insertNewName = false;
@ -247,8 +259,9 @@ void DBCT_CheckUserName(Database db, DBResultSet results, const char[] error, in
} }
if(insertNewName) { if(insertNewName) {
PrintToServer("[AdminPanel] Updating/Inserting name '%s' for %s", nameCache[client], steamidCache[client]);
char query[255]; char query[255];
g_db.Format(query, sizeof(query), "INSERT INTO panel_user_names (accountId,name,name_update_time) VALUES ('%s','%s',%d)", steamidCache[client][10], nameCache[client][10], GetTime()); g_db.Format(query, sizeof(query), "INSERT INTO panel_user_names (account_id,name,name_update_time) VALUES ('%s','%s',%d)", steamidCache[client][10], nameCache[client], GetTime());
g_db.Query(DBCT_Insert, query); g_db.Query(DBCT_Insert, query);
} }
} }