Skip to content

Commit

Permalink
Update to DZ 55
Browse files Browse the repository at this point in the history 
- Fix memory leak
- Improve linux srcd with the lowercase mapname loading
- Clamp e/un/ban reason to 64 chars (limit of the DB) otherwise open the reason menu if a valid client who performed the cmd else set default reason if console
  • Loading branch information
@Rushaway @maxime1907
Rushaway authored and maxime1907 committed Apr 26, 2024
1 parent 024099b commit bf72dd7
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 27 deletions.
72 changes: 48 additions & 24 deletions addons/sourcemod/scripting/entwatch/module_eban.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,15 @@ int g_iDBStatus = 0, // 0 - Def., 1 - Reconnect, 2 - Unknown Driver, 3 - Create
g_iAdminBanLong,
g_iMaxBanTime;
char g_sDefaultBanReason[64],
g_sDefaultUnBanReason[64];
stock void EWM_Eban_OnPluginStart()
{
g_hCvar_Default_BanTime = CreateConVar("entwatch_bantime", "0", "Default ban time (0-43200)", _, true, 0.0, true, 43200.0);
g_hCvar_Default_BanReason = CreateConVar("entwatch_banreason", "Item misuse", "Default ban reason.", _);
g_hCvar_Default_BanReason = CreateConVar("entwatch_banreason", "Item misuse", "Default ban reason. (64 characters MAX)", _);
g_hCvar_Admin_BanLong = CreateConVar("entwatch_ban_long", "720", "Maximum time in minutes that an admin is able to eban.", _, true, 1.0);
g_hCvar_Default_UnBanReason = CreateConVar("entwatch_unbanreason", "Giving another chance", "Default Unban reason.", _);
g_hCvar_Default_UnBanReason = CreateConVar("entwatch_unbanreason", "Giving another chance", "Default Unban reason. (64 characters MAX)", _);
g_hCvar_Keep_Expired_Bans = CreateConVar("entwatch_keep_expired_ban", "1", "Enable/Disable keep expired bans.", _, true, 0.0, true, 1.0);
g_hCvar_Use_Reason_Menu = CreateConVar("entwatch_use_reason_menu", "0", "Enable/Disable menu if the admin has not indicated a reason", _, true, 0.0, true, 1.0);
g_hCvar_MaxBanTime = CreateConVar("entwatch_max_bantime", "0", "Maximum ban time allowed via console command (0 = disabled)", _, true, 0.0);
Expand All @@ -43,6 +46,8 @@ stock void EWM_Eban_OnPluginStart()
HookConVarChange(g_hCvar_Use_Reason_Menu, Cvar_EBAN_Changed);
HookConVarChange(g_hCvar_MaxBanTime, Cvar_EBAN_Changed);
HookConVarChange(g_hCvar_DropOnEBan, Cvar_EBAN_Changed);
HookConVarChange(g_hCvar_Default_BanReason, Cvar_EBAN_Changed);
HookConVarChange(g_hCvar_Default_UnBanReason, Cvar_EBAN_Changed);
//Initialize values
g_iDefaultBanTime = GetConVarInt(g_hCvar_Default_BanTime);
Expand All @@ -51,6 +56,8 @@ stock void EWM_Eban_OnPluginStart()
g_bUseReasonMenu = GetConVarBool(g_hCvar_Use_Reason_Menu);
g_iMaxBanTime = GetConVarInt(g_hCvar_MaxBanTime);
g_bDropItemOnEBan = GetConVarBool(g_hCvar_DropOnEBan);
GetConVarString(g_hCvar_Default_BanReason, g_sDefaultBanReason, sizeof(g_sDefaultBanReason));
GetConVarString(g_hCvar_Default_UnBanReason, g_sDefaultUnBanReason, sizeof(g_sDefaultUnBanReason));
RegConsoleCmd("sm_status", EWM_Eban_Command_Status);
Expand Down Expand Up @@ -95,6 +102,10 @@ void Cvar_EBAN_Changed(ConVar convar, const char[] oldValue, const char[] newVal
g_iMaxBanTime = GetConVarInt(convar);
else if(convar==g_hCvar_DropOnEBan)
g_bDropItemOnEBan = GetConVarBool(convar);
else if(convar==g_hCvar_Default_BanReason)
GetConVarString(convar, g_sDefaultBanReason, sizeof(g_sDefaultBanReason));
else if(convar==g_hCvar_Default_UnBanReason)
GetConVarString(convar, g_sDefaultUnBanReason, sizeof(g_sDefaultUnBanReason));
}
void EWM_Eban_ConnectCallBack(Database hDatabase, const char[] sError, any data)
Expand Down Expand Up @@ -240,7 +251,7 @@ void EWM_Eban_SQLGetEbansNumber_Current(Handle hDatabase, Handle hResults, const
}
// Main function of player e-ban
public void EWM_Eban_BanClient(int iClient, int iAdmin, int iDuration, const char[] sReason)
public void EWM_Eban_BanClient(int iClient, int iAdmin, int iDuration, char[] sReason)
{
if (g_EbanClients[iClient].Banned)
{
Expand All @@ -258,6 +269,16 @@ public void EWM_Eban_BanClient(int iClient, int iAdmin, int iDuration, const cha
return;
}
// Reason is too long to get inserted into the DB - Send reason menu instead
if (strlen(sReason) > 64)
{
if (iAdmin != 0)
{
EWM_Eban_Menu_EBanReason(iAdmin, iClient, iDuration);
return;
} else FormatEx(sReason, 64, g_sDefaultBanReason);
}
if (iBanDuration >= g_iAdminBanLong && !CheckCommandAccess(iAdmin, "sm_eban_long", ADMFLAG_ROOT))
{
CReplyToCommand(iAdmin, "%s%t %s%t", g_SchemeConfig.Color_Tag, "EW_Tag", g_SchemeConfig.Color_Warning, "Not have permission lEBan", g_iAdminBanLong);
Expand Down Expand Up @@ -371,14 +392,23 @@ void EWM_Eban_SQLTCallBackBan(Handle hDatabase, Handle hResults, const char[] sE
}
// Main function of player e-unban
public void EWM_Eban_UnBanClient(int iClient, int iAdmin, const char[] sReason)
public void EWM_Eban_UnBanClient(int iClient, int iAdmin, char[] sReason)
{
if (!g_EbanClients[iClient].Banned)
{
CReplyToCommand(iClient, "%s%t %s%t %s%N %s%t", g_SchemeConfig.Color_Tag, "EW_Tag", g_SchemeConfig.Color_Warning, "Player", g_SchemeConfig.Color_Name, iClient, g_SchemeConfig.Color_Warning, "Is not restricted");
return;
}
if (strlen(sReason) > 64)
{
if (iAdmin != 0)
{
EWM_Eban_Menu_EUnBanReason(iAdmin, iClient);
return;
} else FormatEx(sReason, 64, g_sDefaultUnBanReason);
}
char sAdmin_Name[32];
char sAdmin_SteamID[64];
if (iAdmin != 0)
Expand Down Expand Up @@ -577,34 +607,28 @@ void EWM_Eban_SQLTCallBackOfflineUnban(Handle hDatabase, Handle hResults, const
// E-unban player
Action EWM_Eban_Timer_Checker(Handle timer)
{
if(g_iDBStatus>0)
switch (g_iDBStatus)
{
if(g_iDBStatus == 4)// Success Connect
case 1: // ReConnect
Database.Connect(EWM_Eban_ConnectCallBack, EW_EBAN_ENTWATCH_SECTION);
case 4: // Success Connect
{
int iCurrentTimeStamp = GetTime();
for(int i=1; i<MaxClients+1; i++)
{
if(!IsClientInGame(i)) continue;
if(g_EbanClients[i].Banned)
{
if(g_EbanClients[i].Duration>0)
{
if(iCurrentTimeStamp>g_EbanClients[i].TimeStamp_Issued)
{
//unban
EWM_Eban_UnBanClient(i, 0, "Expired");
}
}
}
if(!g_EbanClients[i].Banned) continue;
if(g_EbanClients[i].Duration < 0) continue;
if(iCurrentTimeStamp > g_EbanClients[i].TimeStamp_Issued)
EWM_Eban_UnBanClient(i, 0, "Expired");
}
EWM_Eban_Offline_Unban(iCurrentTimeStamp);
}else if(g_iDBStatus == 1)// ReConnect every 60 sec
{
Database.Connect(EWM_Eban_ConnectCallBack, EW_EBAN_ENTWATCH_SECTION);
}
}
return Plugin_Continue;
}
Expand Down Expand Up @@ -689,7 +713,7 @@ public Action EWM_Eban_Command_Restrict(int iClient, int iArgs)
} else
{
FormatEx(sReason, sizeof(sReason), Arguments[len]);
if(!sReason[0]) GetConVarString(g_hCvar_Default_BanReason, sReason, sizeof(sReason));
if(!sReason[0]) sReason = g_sDefaultBanReason;
TrimString(sReason);
StripQuotes(sReason);
}
Expand Down Expand Up @@ -743,7 +767,7 @@ public Action EWM_Eban_Command_Unrestrict(int iClient, int iArgs)
} else
{
FormatEx(sReason, sizeof(sReason), Arguments[len]);
if (!sReason[0]) GetConVarString(g_hCvar_Default_UnBanReason, sReason, sizeof(sReason));
if (!sReason[0]) sReason = g_sDefaultUnBanReason;
TrimString(sReason);
StripQuotes(sReason);
EWM_Eban_UnBanClient(iTarget, iClient, sReason);
Expand Down
19 changes: 16 additions & 3 deletions addons/sourcemod/scripting/entwatch_dz.sp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public Plugin myinfo =
name = "EntWatch",
author = "DarkerZ[RUS], AgentWesker, notkoen, sTc2201, maxime1907, Cmer, .Rushaway, Dolly",
description = "Notify players about entity interactions.",
version = "3.DZ.54",
version = "3.DZ.55",
url = "dark-skill.ru"
};

Expand Down Expand Up @@ -605,10 +605,11 @@ void CleanData()
#endif
}

stock void LoadConfig()
stock void LoadConfig(bool bSecondLoad = false)
{
GetCurrentMap(g_sMap, sizeof(g_sMap));
if (g_bLowerMapName) StringToLowerCase(g_sMap);
if (bSecondLoad)
StringToLowerCase(g_sMap);

Handle hKeyValues = CreateKeyValues("entities");
char sBuffer_path[PLATFORM_MAX_PATH * 2], sBuffer_path_override[PLATFORM_MAX_PATH * 2], sBuffer_temp[32];
Expand All @@ -623,6 +624,16 @@ stock void LoadConfig()
FormatEx(sBuffer_path_override, sizeof(sBuffer_path_override), "cfg/sourcemod/entwatch/maps/%s_override.cfg", g_sMap);
}

// No configuration was found with the exact same name in both uppercase and lowercase combinations.
// Attempt to load the configuration using the lowercase version of the map name. (Usefull for linux srcds)
// Dependencies cvar: entwatch_lower_mapname > 0
if (!bSecondLoad && g_bLowerMapName && !FileExists(sBuffer_path_override) && !FileExists(sBuffer_path))
{
LoadConfig(true);
CloseHandle(hKeyValues);
return;
}

// If there is an override config then load it
if(FileExists(sBuffer_path_override))
{
Expand Down Expand Up @@ -787,6 +798,8 @@ stock void LoadConfig()
Call_Finish();
#endif
}

CloseHandle(hKeyValues);
}

stock void LoadScheme()
Expand Down

0 comments on commit bf72dd7

Please sign in to comment.