UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed amb1929 - Banning via console should now work properly

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%402533
This commit is contained in:
Matt Schubert 2008-09-12 20:36:53 +00:00
parent 2c107e3601
commit d707ea0de5
1 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
plugins/basebans/ban.sp
View File

@ -10,7 +10,7 @@
* This program is free software; you can redistribute it and/or modify it under * This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License, version 3.0, as published by the * the terms of the GNU General Public License, version 3.0, as published by the
* Free Software Foundation. * Free Software Foundation.
* *
* This program is distributed in the hope that it will be useful, but WITHOUT * This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
@ -30,17 +30,25 @@
* *
* Version: $Id$ * Version: $Id$
*/ */
PrepareBan(client, target, time, const String:reason[]) PrepareBan(client, target, time, const String:reason[])
{ {
new originalTarget = GetClientOfUserId(g_BanTargetUserId[client]); new originalTarget = GetClientOfUserId(g_BanTargetUserId[client]);
if (originalTarget != target) if (originalTarget != target)
{ {
PrintToChat(client, "[SM] %t", "Player no longer available"); if (client == 0)
return; {
PrintToServer("[SM] %t", "Player no longer available");
}
else
{
PrintToChat(client, "[SM] %t", "Player no longer available");
}
return;
} }
decl String:authid[64], String:name[32]; decl String:authid[64], String:name[32];
GetClientAuthString(target, authid, sizeof(authid)); GetClientAuthString(target, authid, sizeof(authid));
GetClientName(target, name, sizeof(name)); GetClientName(target, name, sizeof(name));
@ -77,26 +85,26 @@ PrepareBan(client, target, time, const String:reason[])
DisplayBanTargetMenu(client) DisplayBanTargetMenu(client)
{ {
new Handle:menu = CreateMenu(MenuHandler_BanPlayerList); new Handle:menu = CreateMenu(MenuHandler_BanPlayerList);
decl String:title[100]; decl String:title[100];
Format(title, sizeof(title), "%T:", "Ban player", client); Format(title, sizeof(title), "%T:", "Ban player", client);
SetMenuTitle(menu, title); SetMenuTitle(menu, title);
SetMenuExitBackButton(menu, true); SetMenuExitBackButton(menu, true);
AddTargetsToMenu2(menu, client, COMMAND_FILTER_NO_BOTS|COMMAND_FILTER_CONNECTED); AddTargetsToMenu2(menu, client, COMMAND_FILTER_NO_BOTS|COMMAND_FILTER_CONNECTED);
DisplayMenu(menu, client, MENU_TIME_FOREVER); DisplayMenu(menu, client, MENU_TIME_FOREVER);
} }
DisplayBanTimeMenu(client) DisplayBanTimeMenu(client)
{ {
new Handle:menu = CreateMenu(MenuHandler_BanTimeList); new Handle:menu = CreateMenu(MenuHandler_BanTimeList);
decl String:title[100]; decl String:title[100];
Format(title, sizeof(title), "%T:", "Ban player", client); Format(title, sizeof(title), "%T:", "Ban player", client);
SetMenuTitle(menu, title); SetMenuTitle(menu, title);
SetMenuExitBackButton(menu, true); SetMenuExitBackButton(menu, true);
AddMenuItem(menu, "0", "Permanent"); AddMenuItem(menu, "0", "Permanent");
AddMenuItem(menu, "10", "10 Minutes"); AddMenuItem(menu, "10", "10 Minutes");
AddMenuItem(menu, "30", "30 Minutes"); AddMenuItem(menu, "30", "30 Minutes");
@ -104,21 +112,21 @@ DisplayBanTimeMenu(client)
AddMenuItem(menu, "240", "4 Hours"); AddMenuItem(menu, "240", "4 Hours");
AddMenuItem(menu, "1440", "1 Day"); AddMenuItem(menu, "1440", "1 Day");
AddMenuItem(menu, "10080", "1 Week"); AddMenuItem(menu, "10080", "1 Week");
DisplayMenu(menu, client, MENU_TIME_FOREVER); DisplayMenu(menu, client, MENU_TIME_FOREVER);
} }
DisplayBanReasonMenu(client) DisplayBanReasonMenu(client)
{ {
new Handle:menu = CreateMenu(MenuHandler_BanReasonList); new Handle:menu = CreateMenu(MenuHandler_BanReasonList);
decl String:title[100]; decl String:title[100];
Format(title, sizeof(title), "%T:", "Ban reason", client); Format(title, sizeof(title), "%T:", "Ban reason", client);
SetMenuTitle(menu, title); SetMenuTitle(menu, title);
SetMenuExitBackButton(menu, true); SetMenuExitBackButton(menu, true);
/* :TODO: we should either remove this or make it configurable */ /* :TODO: we should either remove this or make it configurable */
AddMenuItem(menu, "Abusive", "Abusive"); AddMenuItem(menu, "Abusive", "Abusive");
AddMenuItem(menu, "Racism", "Racism"); AddMenuItem(menu, "Racism", "Racism");
AddMenuItem(menu, "General cheating/exploits", "General cheating/exploits"); AddMenuItem(menu, "General cheating/exploits", "General cheating/exploits");
@ -132,11 +140,11 @@ DisplayBanReasonMenu(client)
AddMenuItem(menu, "Unacceptable Spray", "Unacceptable Spray"); AddMenuItem(menu, "Unacceptable Spray", "Unacceptable Spray");
AddMenuItem(menu, "Breaking Server Rules", "Breaking Server Rules"); AddMenuItem(menu, "Breaking Server Rules", "Breaking Server Rules");
AddMenuItem(menu, "Other", "Other"); AddMenuItem(menu, "Other", "Other");
DisplayMenu(menu, client, MENU_TIME_FOREVER); DisplayMenu(menu, client, MENU_TIME_FOREVER);
} }
public AdminMenu_Ban(Handle:topmenu, public AdminMenu_Ban(Handle:topmenu,
TopMenuAction:action, TopMenuAction:action,
TopMenuObject:object_id, TopMenuObject:object_id,
param, param,
@ -169,9 +177,9 @@ public MenuHandler_BanReasonList(Handle:menu, MenuAction:action, param1, param2)
else if (action == MenuAction_Select) else if (action == MenuAction_Select)
{ {
decl String:info[64]; decl String:info[64];
GetMenuItem(menu, param2, info, sizeof(info)); GetMenuItem(menu, param2, info, sizeof(info));
PrepareBan(param1, g_BanTarget[param1], g_BanTime[param1], info); PrepareBan(param1, g_BanTarget[param1], g_BanTime[param1], info);
} }
} }
@ -193,7 +201,7 @@ public MenuHandler_BanPlayerList(Handle:menu, MenuAction:action, param1, param2)
{ {
decl String:info[32], String:name[32]; decl String:info[32], String:name[32];
new userid, target; new userid, target;
GetMenuItem(menu, param2, info, sizeof(info), _, name, sizeof(name)); GetMenuItem(menu, param2, info, sizeof(info), _, name, sizeof(name));
userid = StringToInt(info); userid = StringToInt(info);
@ -230,10 +238,10 @@ public MenuHandler_BanTimeList(Handle:menu, MenuAction:action, param1, param2)
else if (action == MenuAction_Select) else if (action == MenuAction_Select)
{ {
decl String:info[32]; decl String:info[32];
GetMenuItem(menu, param2, info, sizeof(info)); GetMenuItem(menu, param2, info, sizeof(info));
g_BanTime[param1] = StringToInt(info); g_BanTime[param1] = StringToInt(info);
DisplayBanReasonMenu(param1); DisplayBanReasonMenu(param1);
} }
} }
@ -246,12 +254,12 @@ public Action:Command_Ban(client, args)
ReplyToCommand(client, "[SM] Usage: sm_ban <#userid|name> <minutes|0> [reason]"); ReplyToCommand(client, "[SM] Usage: sm_ban <#userid|name> <minutes|0> [reason]");
return Plugin_Handled; return Plugin_Handled;
} }
decl len, next_len; decl len, next_len;
decl String:Arguments[256]; decl String:Arguments[256];
GetCmdArgString(Arguments, sizeof(Arguments)); GetCmdArgString(Arguments, sizeof(Arguments));
decl String:arg[65]; decl String:arg[65];
len = BreakString(Arguments, arg, sizeof(arg)); len = BreakString(Arguments, arg, sizeof(arg));
new target = FindTarget(client, arg, true); new target = FindTarget(client, arg, true);
@ -273,6 +281,8 @@ public Action:Command_Ban(client, args)
new time = StringToInt(s_time); new time = StringToInt(s_time);
g_BanTargetUserId[client] = GetClientUserId(target);
PrepareBan(client, target, time, Arguments[len]); PrepareBan(client, target, time, Arguments[len]);
return Plugin_Handled; return Plugin_Handled;