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

Merge pull request #263 from alliedmodders/admins-trans

Browse Source 
Update admins.inc with methodmaps, newdecls (r=dvander, asherkin).
This commit is contained in:
Nicholas Hastings 2015-03-05 14:32:15 -05:00
commit 6f8ffd55a7
12 changed files with 493 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/logic/AdminCache.cpp
View File

@ -982,7 +982,6 @@ void AdminCache::DumpAdminCache(AdminCachePart part, bool rebuild)
{ {
List<IAdminListener *>::iterator iter; List<IAdminListener *>::iterator iter;
IAdminListener *pListener; IAdminListener *pListener;
cell_t result;
if (part == AdminCache_Overrides) if (part == AdminCache_Overrides)
{ {
@ -996,7 +995,7 @@ void AdminCache::DumpAdminCache(AdminCachePart part, bool rebuild)
pListener->OnRebuildOverrideCache(); pListener->OnRebuildOverrideCache();
} }
m_pCacheFwd->PushCell(part); m_pCacheFwd->PushCell(part);
m_pCacheFwd->Execute(&result); m_pCacheFwd->Execute();
} }
} else if (part == AdminCache_Groups || part == AdminCache_Admins) { } else if (part == AdminCache_Groups || part == AdminCache_Admins) {
if (part == AdminCache_Groups) if (part == AdminCache_Groups)
@ -1010,7 +1009,7 @@ void AdminCache::DumpAdminCache(AdminCachePart part, bool rebuild)
pListener->OnRebuildGroupCache(); pListener->OnRebuildGroupCache();
} }
m_pCacheFwd->PushCell(part); m_pCacheFwd->PushCell(part);
m_pCacheFwd->Execute(&result); m_pCacheFwd->Execute();
} }
} }
InvalidateAdminCache(true); InvalidateAdminCache(true);
@ -1022,7 +1021,7 @@ void AdminCache::DumpAdminCache(AdminCachePart part, bool rebuild)
pListener->OnRebuildAdminCache((part == AdminCache_Groups)); pListener->OnRebuildAdminCache((part == AdminCache_Groups));
} }
m_pCacheFwd->PushCell(AdminCache_Admins); m_pCacheFwd->PushCell(AdminCache_Admins);
m_pCacheFwd->Execute(&result); m_pCacheFwd->Execute();
playerhelpers->RecheckAnyAdmins(); playerhelpers->RecheckAnyAdmins();
} }
} }

23
core/logic/smn_admin.cpp
View File

@ -585,6 +585,29 @@ REGISTER_NATIVES(adminNatives)
{"SetAdmGroupImmunityLevel",SetAdmGroupImmunityLevel}, {"SetAdmGroupImmunityLevel",SetAdmGroupImmunityLevel},
{"GetAdminImmunityLevel", GetAdminImmunityLevel}, {"GetAdminImmunityLevel", GetAdminImmunityLevel},
{"SetAdminImmunityLevel", SetAdminImmunityLevel}, {"SetAdminImmunityLevel", SetAdminImmunityLevel},
{"AdminId.GetUsername", GetAdminUsername},
{"AdminId.BindIdentity", BindAdminIdentity},
{"AdminId.SetFlag", SetAdminFlag},
{"AdminId.HasFlag", GetAdminFlag},
{"AdminId.GetFlags", GetAdminFlags},
{"AdminId.InheritGroup", AdminInheritGroup},
{"AdminId.GetGroup", GetAdminGroup},
{"AdminId.SetPassword", SetAdminPassword},
{"AdminId.GetPassword", GetAdminPassword},
{"AdminId.CanTarget", CanAdminTarget},
{"AdminId.GroupCount.get", GetAdminGroupCount},
{"AdminId.ImmunityLevel.get", GetAdminImmunityLevel},
{"AdminId.ImmunityLevel.set", SetAdminImmunityLevel},
{"GroupId.HasFlag", GetAdmGroupAddFlag},
{"GroupId.SetFlag", SetAdmGroupAddFlag},
{"GroupId.GetFlags", GetAdmGroupAddFlags},
{"GroupId.GetGroupImmunity", GetAdmGroupImmuneFrom},
{"GroupId.AddGroupImmunity", SetAdmGroupImmuneFrom},
{"GroupId.GetCommandOverride", GetAdmGroupCmdOverride},
{"GroupId.AddCommandOverride", AddAdmGroupCmdOverride},
{"GroupId.GroupImmunitiesCount.get", GetAdmGroupImmuneCount},
{"GroupId.ImmunityLevel.get", GetAdmGroupImmunityLevel},
{"GroupId.ImmunityLevel.set", SetAdmGroupImmunityLevel},
/* -------------------------------------------------- */ /* -------------------------------------------------- */
{NULL, NULL}, {NULL, NULL},
}; };

20
plugins/admin-flatfile/admin-flatfile.sp
View File

@ -36,7 +36,7 @@
#include <sourcemod> #include <sourcemod>
public Plugin:myinfo = public Plugin myinfo =
{ {
name = "Admin File Reader", name = "Admin File Reader",
author = "AlliedModders LLC", author = "AlliedModders LLC",
@ -46,18 +46,18 @@ public Plugin:myinfo =
}; };
/** Various parsing globals */ /** Various parsing globals */
new bool:g_LoggedFileName = false; /* Whether or not the file name has been logged */ bool g_LoggedFileName = false; /* Whether or not the file name has been logged */
new g_ErrorCount = 0; /* Current error count */ int g_ErrorCount = 0; /* Current error count */
new g_IgnoreLevel = 0; /* Nested ignored section count, so users can screw up files safely */ int g_IgnoreLevel = 0; /* Nested ignored section count, so users can screw up files safely */
new g_CurrentLine = 0; /* Current line we're on */ int g_CurrentLine = 0; /* Current line we're on */
new String:g_Filename[PLATFORM_MAX_PATH]; /* Used for error messages */ char g_Filename[PLATFORM_MAX_PATH]; /* Used for error messages */
#include "admin-overrides.sp" #include "admin-overrides.sp"
#include "admin-groups.sp" #include "admin-groups.sp"
#include "admin-users.sp" #include "admin-users.sp"
#include "admin-simple.sp" #include "admin-simple.sp"
public OnRebuildAdminCache(AdminCachePart:part) public void OnRebuildAdminCache(AdminCachePart part)
{ {
if (part == AdminCache_Overrides) if (part == AdminCache_Overrides)
{ {
@ -70,9 +70,9 @@ public OnRebuildAdminCache(AdminCachePart:part)
} }
} }
ParseError(const String:format[], any:...) void ParseError(const char[] format, any ...)
{ {
decl String:buffer[512]; char buffer[512];
if (!g_LoggedFileName) if (!g_LoggedFileName)
{ {
@ -87,7 +87,7 @@ ParseError(const String:format[], any:...)
g_ErrorCount++; g_ErrorCount++;
} }
InitGlobalStates() void InitGlobalStates()
{ {
g_ErrorCount = 0; g_ErrorCount = 0;
g_IgnoreLevel = 0; g_IgnoreLevel = 0;

100
plugins/admin-flatfile/admin-groups.sp
View File

@ -31,18 +31,26 @@
* Version: $Id$ * Version: $Id$
*/ */
#define GROUP_STATE_NONE 0 enum GroupState
#define GROUP_STATE_GROUPS 1 {
#define GROUP_STATE_INGROUP 2 GroupState_None,
#define GROUP_STATE_OVERRIDES 3 GroupState_Groups,
#define GROUP_PASS_FIRST 1 GroupState_InGroup,
#define GROUP_PASS_SECOND 2 GroupState_Overrides,
}
enum GroupPass
{
GroupPass_Invalid,
GroupPass_First,
GroupPass_Second,
}
static SMCParser g_hGroupParser; static SMCParser g_hGroupParser;
static GroupId:g_CurGrp = INVALID_GROUP_ID; static GroupId g_CurGrp = INVALID_GROUP_ID;
static g_GroupState = GROUP_STATE_NONE; static GroupState g_GroupState = GroupState_None;
static g_GroupPass = 0; static GroupPass g_GroupPass = GroupPass_Invalid;
static bool:g_NeedReparse = false; static bool g_NeedReparse = false;
public SMCResult ReadGroups_NewSection(SMCParser smc, const char[] name, bool opt_quotes) public SMCResult ReadGroups_NewSection(SMCParser smc, const char[] name, bool opt_quotes)
{ {
@ -52,24 +60,24 @@ public SMCResult ReadGroups_NewSection(SMCParser smc, const char[] name, bool op
return SMCParse_Continue; return SMCParse_Continue;
} }
if (g_GroupState == GROUP_STATE_NONE) if (g_GroupState == GroupState_None)
{ {
if (StrEqual(name, "Groups")) if (StrEqual(name, "Groups"))
{ {
g_GroupState = GROUP_STATE_GROUPS; g_GroupState = GroupState_Groups;
} else { } else {
g_IgnoreLevel++; g_IgnoreLevel++;
} }
} else if (g_GroupState == GROUP_STATE_GROUPS) { } else if (g_GroupState == GroupState_Groups) {
if ((g_CurGrp = CreateAdmGroup(name)) == INVALID_GROUP_ID) if ((g_CurGrp = CreateAdmGroup(name)) == INVALID_GROUP_ID)
{ {
g_CurGrp = FindAdmGroup(name); g_CurGrp = FindAdmGroup(name);
} }
g_GroupState = GROUP_STATE_INGROUP; g_GroupState = GroupState_InGroup;
} else if (g_GroupState == GROUP_STATE_INGROUP) { } else if (g_GroupState == GroupState_InGroup) {
if (StrEqual(name, "Overrides")) if (StrEqual(name, "Overrides"))
{ {
g_GroupState = GROUP_STATE_OVERRIDES; g_GroupState = GroupState_Overrides;
} else { } else {
g_IgnoreLevel++; g_IgnoreLevel++;
} }
@ -91,28 +99,28 @@ public SMCResult ReadGroups_KeyValue(SMCParser smc,
return SMCParse_Continue; return SMCParse_Continue;
} }
new AdminFlag:flag; AdminFlag flag;
if (g_GroupPass == GROUP_PASS_FIRST) if (g_GroupPass == GroupPass_First)
{ {
if (g_GroupState == GROUP_STATE_INGROUP) if (g_GroupState == GroupState_InGroup)
{ {
if (StrEqual(key, "flags")) if (StrEqual(key, "flags"))
{ {
new len = strlen(value); int len = strlen(value);
for (new i=0; i<len; i++) for (int i=0; i<len; i++)
{ {
if (!FindFlagByChar(value[i], flag)) if (!FindFlagByChar(value[i], flag))
{ {
continue; continue;
} }
SetAdmGroupAddFlag(g_CurGrp, flag, true); g_CurGrp.SetFlag(flag, true);
} }
} else if (StrEqual(key, "immunity")) { } else if (StrEqual(key, "immunity")) {
g_NeedReparse = true; g_NeedReparse = true;
} }
} else if (g_GroupState == GROUP_STATE_OVERRIDES) { } else if (g_GroupState == GroupState_Overrides) {
new OverrideRule:rule = Command_Deny; OverrideRule rule = Command_Deny;
if (StrEqual(value, "allow", false)) if (StrEqual(value, "allow", false))
{ {
@ -121,29 +129,29 @@ public SMCResult ReadGroups_KeyValue(SMCParser smc,
if (key[0] == '@') if (key[0] == '@')
{ {
AddAdmGroupCmdOverride(g_CurGrp, key[1], Override_CommandGroup, rule); g_CurGrp.AddCommandOverride(key[1], Override_CommandGroup, rule);
} else { } else {
AddAdmGroupCmdOverride(g_CurGrp, key, Override_Command, rule); g_CurGrp.AddCommandOverride(key, Override_Command, rule);
} }
} }
} else if (g_GroupPass == GROUP_PASS_SECOND } else if (g_GroupPass == GroupPass_Second
&& g_GroupState == GROUP_STATE_INGROUP) { && g_GroupState == GroupState_InGroup) {
/* Check for immunity again, core should handle double inserts */ /* Check for immunity again, core should handle double inserts */
if (StrEqual(key, "immunity")) if (StrEqual(key, "immunity"))
{ {
/* If it's a value we know about, use it */ /* If it's a value we know about, use it */
if (StrEqual(value, "*")) if (StrEqual(value, "*"))
{ {
SetAdmGroupImmunityLevel(g_CurGrp, 2); g_CurGrp.ImmunityLevel = 2;
} else if (StrEqual(value, "$")) { } else if (StrEqual(value, "$")) {
SetAdmGroupImmunityLevel(g_CurGrp, 1); g_CurGrp.ImmunityLevel = 1;
} else { } else {
new level; int level;
if (StringToIntEx(value, level)) if (StringToIntEx(value, level))
{ {
SetAdmGroupImmunityLevel(g_CurGrp, level); g_CurGrp.ImmunityLevel = level;
} else { } else {
new GroupId:id; GroupId id;
if (value[0] == '@') if (value[0] == '@')
{ {
id = FindAdmGroup(value[1]); id = FindAdmGroup(value[1]);
@ -152,7 +160,7 @@ public SMCResult ReadGroups_KeyValue(SMCParser smc,
} }
if (id != INVALID_GROUP_ID) if (id != INVALID_GROUP_ID)
{ {
SetAdmGroupImmuneFrom(g_CurGrp, id); g_CurGrp.AddGroupImmunity(id);
} else { } else {
ParseError("Unable to find group: \"%s\"", value); ParseError("Unable to find group: \"%s\"", value);
} }
@ -173,14 +181,14 @@ public SMCResult ReadGroups_EndSection(SMCParser smc)
return SMCParse_Continue; return SMCParse_Continue;
} }
if (g_GroupState == GROUP_STATE_OVERRIDES) if (g_GroupState == GroupState_Overrides)
{ {
g_GroupState = GROUP_STATE_INGROUP; g_GroupState = GroupState_InGroup;
} else if (g_GroupState == GROUP_STATE_INGROUP) { } else if (g_GroupState == GroupState_InGroup) {
g_GroupState = GROUP_STATE_GROUPS; g_GroupState = GroupState_Groups;
g_CurGrp = INVALID_GROUP_ID; g_CurGrp = INVALID_GROUP_ID;
} else if (g_GroupState == GROUP_STATE_GROUPS) { } else if (g_GroupState == GroupState_Groups) {
g_GroupState = GROUP_STATE_NONE; g_GroupState = GroupState_None;
} }
return SMCParse_Continue; return SMCParse_Continue;
@ -193,7 +201,7 @@ public SMCResult ReadGroups_CurrentLine(SMCParser smc, const char[] line, int li
return SMCParse_Continue; return SMCParse_Continue;
} }
static InitializeGroupParser() static void InitializeGroupParser()
{ {
if (!g_hGroupParser) if (!g_hGroupParser)
{ {
@ -205,11 +213,11 @@ static InitializeGroupParser()
} }
} }
static InternalReadGroups(const String:path[], pass) static void InternalReadGroups(const char[] path, GroupPass pass)
{ {
/* Set states */ /* Set states */
InitGlobalStates(); InitGlobalStates();
g_GroupState = GROUP_STATE_NONE; g_GroupState = GroupState_None;
g_CurGrp = INVALID_GROUP_ID; g_CurGrp = INVALID_GROUP_ID;
g_GroupPass = pass; g_GroupPass = pass;
g_NeedReparse = false; g_NeedReparse = false;
@ -227,16 +235,16 @@ static InternalReadGroups(const String:path[], pass)
} }
} }
ReadGroups() void ReadGroups()
{ {
InitializeGroupParser(); InitializeGroupParser();
BuildPath(Path_SM, g_Filename, sizeof(g_Filename), "configs/admin_groups.cfg"); BuildPath(Path_SM, g_Filename, sizeof(g_Filename), "configs/admin_groups.cfg");
InternalReadGroups(g_Filename, GROUP_PASS_FIRST); InternalReadGroups(g_Filename, GroupPass_First);
if (g_NeedReparse) if (g_NeedReparse)
{ {
InternalReadGroups(g_Filename, GROUP_PASS_SECOND); InternalReadGroups(g_Filename, GroupPass_Second);
} }
} }

45
plugins/admin-flatfile/admin-overrides.sp
View File

@ -32,13 +32,16 @@
* Version: $Id$ * Version: $Id$
*/ */
#define OVERRIDE_STATE_NONE 0 enum OverrideState
#define OVERRIDE_STATE_LEVELS 1 {
#define OVERRIDE_STATE_OVERRIDES 2 OverrideState_None,
OverrideState_Levels,
OverrideState_Overrides,
}
static SMCParser g_hOldOverrideParser; static SMCParser g_hOldOverrideParser;
static SMCParser g_hNewOverrideParser; static SMCParser g_hNewOverrideParser;
static g_OverrideState = OVERRIDE_STATE_NONE; static OverrideState g_OverrideState = OverrideState_None;
public SMCResult ReadOldOverrides_NewSection(SMCParser smc, const char[] name, bool opt_quotes) public SMCResult ReadOldOverrides_NewSection(SMCParser smc, const char[] name, bool opt_quotes)
{ {
@ -48,18 +51,18 @@ public SMCResult ReadOldOverrides_NewSection(SMCParser smc, const char[] name, b
return SMCParse_Continue; return SMCParse_Continue;
} }
if (g_OverrideState == OVERRIDE_STATE_NONE) if (g_OverrideState == OverrideState_None)
{ {
if (StrEqual(name, "Levels")) if (StrEqual(name, "Levels"))
{ {
g_OverrideState = OVERRIDE_STATE_LEVELS; g_OverrideState = OverrideState_Levels;
} else { } else {
g_IgnoreLevel++; g_IgnoreLevel++;
} }
} else if (g_OverrideState == OVERRIDE_STATE_LEVELS) { } else if (g_OverrideState == OverrideState_Levels) {
if (StrEqual(name, "Overrides")) if (StrEqual(name, "Overrides"))
{ {
g_OverrideState = OVERRIDE_STATE_OVERRIDES; g_OverrideState = OverrideState_Overrides;
} else { } else {
g_IgnoreLevel++; g_IgnoreLevel++;
} }
@ -78,11 +81,11 @@ public SMCResult ReadNewOverrides_NewSection(SMCParser smc, const char[] name, b
return SMCParse_Continue; return SMCParse_Continue;
} }
if (g_OverrideState == OVERRIDE_STATE_NONE) if (g_OverrideState == OverrideState_None)
{ {
if (StrEqual(name, "Overrides")) if (StrEqual(name, "Overrides"))
{ {
g_OverrideState = OVERRIDE_STATE_OVERRIDES; g_OverrideState = OverrideState_Overrides;
} else { } else {
g_IgnoreLevel++; g_IgnoreLevel++;
} }
@ -99,7 +102,7 @@ public SMCResult ReadOverrides_KeyValue(SMCParser smc,
bool key_quotes, bool key_quotes,
bool value_quotes) bool value_quotes)
{ {
if (g_OverrideState != OVERRIDE_STATE_OVERRIDES || g_IgnoreLevel) if (g_OverrideState != OverrideState_Overrides || g_IgnoreLevel)
{ {
return SMCParse_Continue; return SMCParse_Continue;
} }
@ -125,12 +128,12 @@ public SMCResult ReadOldOverrides_EndSection(SMCParser smc)
return SMCParse_Continue; return SMCParse_Continue;
} }
if (g_OverrideState == OVERRIDE_STATE_LEVELS) if (g_OverrideState == OverrideState_Levels)
{ {
g_OverrideState = OVERRIDE_STATE_NONE; g_OverrideState = OverrideState_None;
} else if (g_OverrideState == OVERRIDE_STATE_OVERRIDES) { } else if (g_OverrideState == OverrideState_Overrides) {
/* We're totally done parsing */ /* We're totally done parsing */
g_OverrideState = OVERRIDE_STATE_LEVELS; g_OverrideState = OverrideState_Levels;
return SMCParse_Halt; return SMCParse_Halt;
} }
@ -146,9 +149,9 @@ public SMCResult ReadNewOverrides_EndSection(SMCParser smc)
return SMCParse_Continue; return SMCParse_Continue;
} }
if (g_OverrideState == OVERRIDE_STATE_OVERRIDES) if (g_OverrideState == OverrideState_Overrides)
{ {
g_OverrideState = OVERRIDE_STATE_NONE; g_OverrideState = OverrideState_None;
} }
return SMCParse_Continue; return SMCParse_Continue;
@ -161,7 +164,7 @@ public SMCResult ReadOverrides_CurrentLine(SMCParser smc, const char[] line, int
return SMCParse_Continue; return SMCParse_Continue;
} }
static InitializeOverrideParsers() static void InitializeOverrideParsers()
{ {
if (!g_hOldOverrideParser) if (!g_hOldOverrideParser)
{ {
@ -181,13 +184,13 @@ static InitializeOverrideParsers()
} }
} }
InternalReadOverrides(SMCParser parser, const char[] file) void InternalReadOverrides(SMCParser parser, const char[] file)
{ {
BuildPath(Path_SM, g_Filename, sizeof(g_Filename), file); BuildPath(Path_SM, g_Filename, sizeof(g_Filename), file);
/* Set states */ /* Set states */
InitGlobalStates(); InitGlobalStates();
g_OverrideState = OVERRIDE_STATE_NONE; g_OverrideState = OverrideState_None;
SMCError err = parser.ParseFile(g_Filename); SMCError err = parser.ParseFile(g_Filename);
if (err != SMCError_Okay) if (err != SMCError_Okay)
@ -202,7 +205,7 @@ InternalReadOverrides(SMCParser parser, const char[] file)
} }
} }
ReadOverrides() void ReadOverrides()
{ {
InitializeOverrideParsers(); InitializeOverrideParsers();
InternalReadOverrides(g_hOldOverrideParser, "configs/admin_levels.cfg"); InternalReadOverrides(g_hOldOverrideParser, "configs/admin_levels.cfg");

48
plugins/admin-flatfile/admin-simple.sp
View File

@ -31,7 +31,7 @@
* Version: $Id$ * Version: $Id$
*/ */
public ReadSimpleUsers() public void ReadSimpleUsers()
{ {
BuildPath(Path_SM, g_Filename, sizeof(g_Filename), "configs/admins_simple.ini"); BuildPath(Path_SM, g_Filename, sizeof(g_Filename), "configs/admins_simple.ini");
@ -90,7 +90,7 @@ public ReadSimpleUsers()
DecodeAuthMethod(const String:auth[], String:method[32], &offset) void DecodeAuthMethod(const char[] auth, char method[32], int &offset)
{ {
if ((StrContains(auth, "STEAM_") == 0) || (strncmp("0:", auth, 2) == 0) || (strncmp("1:", auth, 2) == 0)) if ((StrContains(auth, "STEAM_") == 0) || (strncmp("0:", auth, 2) == 0) || (strncmp("1:", auth, 2) == 0))
{ {
@ -119,13 +119,13 @@ DecodeAuthMethod(const String:auth[], String:method[32], &offset)
} }
} }
ReadAdminLine(const String:line[]) void ReadAdminLine(const char[] line)
{ {
new bool:is_bound; bool is_bound;
new AdminId:admin; AdminId admin;
new String:auth[64]; char auth[64];
decl String:auth_method[32]; char auth_method[32];
new idx, cur_idx, auth_offset; int idx, cur_idx, auth_offset;
if ((cur_idx = BreakString(line, auth, sizeof(auth))) == -1) if ((cur_idx = BreakString(line, auth, sizeof(auth))) == -1)
{ {
@ -148,16 +148,16 @@ ReadAdminLine(const String:line[])
} }
/* Read flags */ /* Read flags */
new String:flags[64]; char flags[64];
cur_idx = BreakString(line[idx], flags, sizeof(flags)); cur_idx = BreakString(line[idx], flags, sizeof(flags));
idx += cur_idx; idx += cur_idx;
/* Read immunity level, if any */ /* Read immunity level, if any */
new level, flag_idx; int level, flag_idx;
if ((flag_idx = StringToIntEx(flags, level)) > 0) if ((flag_idx = StringToIntEx(flags, level)) > 0)
{ {
SetAdminImmunityLevel(admin, level); admin.ImmunityLevel = level;
if (flags[flag_idx] == ':') if (flags[flag_idx] == ':')
{ {
flag_idx++; flag_idx++;
@ -166,41 +166,41 @@ ReadAdminLine(const String:line[])
if (flags[flag_idx] == '@') if (flags[flag_idx] == '@')
{ {
new GroupId:gid = FindAdmGroup(flags[flag_idx + 1]); GroupId gid = FindAdmGroup(flags[flag_idx + 1]);
if (gid == INVALID_GROUP_ID) if (gid == INVALID_GROUP_ID)
{ {
ParseError("Invalid group detected: %s", flags[flag_idx + 1]); ParseError("Invalid group detected: %s", flags[flag_idx + 1]);
return; return;
} }
AdminInheritGroup(admin, gid); admin.InheritGroup(gid);
} }
else else
{ {
new len = strlen(flags[flag_idx]); int len = strlen(flags[flag_idx]);
new bool:is_default = false; bool is_default = false;
for (new i=0; i<len; i++) for (int i=0; i<len; i++)
{ {
if (!level && flags[flag_idx + i] == '$') if (!level && flags[flag_idx + i] == '$')
{ {
SetAdminImmunityLevel(admin, 1); admin.ImmunityLevel = 1;
} else { } else {
new AdminFlag:flag; AdminFlag flag;
if (!FindFlagByChar(flags[flag_idx + i], flag)) if (!FindFlagByChar(flags[flag_idx + i], flag))
{ {
ParseError("Invalid flag detected: %c", flags[flag_idx + i]); ParseError("Invalid flag detected: %c", flags[flag_idx + i]);
continue; continue;
} }
SetAdminFlag(admin, flag, true); admin.SetFlag(flag, true);
} }
} }
if (is_default) if (is_default)
{ {
new GroupId:gid = FindAdmGroup("Default"); GroupId gid = FindAdmGroup("Default");
if (gid != INVALID_GROUP_ID) if (gid != INVALID_GROUP_ID)
{ {
AdminInheritGroup(admin, gid); admin.InheritGroup(gid);
} }
} }
} }
@ -208,15 +208,15 @@ ReadAdminLine(const String:line[])
/* Lastly, is there a password? */ /* Lastly, is there a password? */
if (cur_idx != -1) if (cur_idx != -1)
{ {
decl String:password[64]; char password[64];
BreakString(line[idx], password, sizeof(password)); BreakString(line[idx], password, sizeof(password));
SetAdminPassword(admin, password); admin.SetPassword(password);
} }
/* Now, bind the identity to something */ /* Now, bind the identity to something */
if (!is_bound) if (!is_bound)
{ {
if (!BindAdminIdentity(admin, auth_method, auth[auth_offset])) if (!admin.BindIdentity(auth_method, auth[auth_offset]))
{ {
/* We should never reach here */ /* We should never reach here */
RemoveAdmin(admin); RemoveAdmin(admin);

86
plugins/admin-flatfile/admin-users.sp
View File

@ -31,21 +31,24 @@
* Version: $Id$ * Version: $Id$
*/ */
#define USER_STATE_NONE 0 enum UserState
#define USER_STATE_ADMINS 1 {
#define USER_STATE_INADMIN 2 UserState_None,
UserState_Admins,
UserState_InAdmin,
}
static SMCParser g_hUserParser; static SMCParser g_hUserParser;
static g_UserState = USER_STATE_NONE; static UserState g_UserState = UserState_None;
static String:g_CurAuth[64]; static char g_CurAuth[64];
static String:g_CurIdent[64]; static char g_CurIdent[64];
static String:g_CurName[64]; static char g_CurName[64];
static String:g_CurPass[64]; static char g_CurPass[64];
static Handle:g_GroupArray; static ArrayList g_GroupArray;
static g_CurFlags; static int g_CurFlags;
static g_CurImmunity; static int g_CurImmunity;
public SMCResult:ReadUsers_NewSection(Handle:smc, const String:name[], bool:opt_quotes) public SMCResult ReadUsers_NewSection(SMCParser smc, const char[] name, bool opt_quotes)
{ {
if (g_IgnoreLevel) if (g_IgnoreLevel)
{ {
@ -53,25 +56,25 @@ public SMCResult:ReadUsers_NewSection(Handle:smc, const String:name[], bool:opt_
return SMCParse_Continue; return SMCParse_Continue;
} }
if (g_UserState == USER_STATE_NONE) if (g_UserState == UserState_None)
{ {
if (StrEqual(name, "Admins")) if (StrEqual(name, "Admins"))
{ {
g_UserState = USER_STATE_ADMINS; g_UserState = UserState_Admins;
} }
else else
{ {
g_IgnoreLevel++; g_IgnoreLevel++;
} }
} }
else if (g_UserState == USER_STATE_ADMINS) else if (g_UserState == UserState_Admins)
{ {
g_UserState = USER_STATE_INADMIN; g_UserState = UserState_InAdmin;
strcopy(g_CurName, sizeof(g_CurName), name); strcopy(g_CurName, sizeof(g_CurName), name);
g_CurAuth[0] = '\0'; g_CurAuth[0] = '\0';
g_CurIdent[0] = '\0'; g_CurIdent[0] = '\0';
g_CurPass[0] = '\0'; g_CurPass[0] = '\0';
ClearArray(g_GroupArray); g_GroupArray.Clear();
g_CurFlags = 0; g_CurFlags = 0;
g_CurImmunity = 0; g_CurImmunity = 0;
} }
@ -83,13 +86,13 @@ public SMCResult:ReadUsers_NewSection(Handle:smc, const String:name[], bool:opt_
return SMCParse_Continue; return SMCParse_Continue;
} }
public SMCResult:ReadUsers_KeyValue(Handle:smc, public SMCResult ReadUsers_KeyValue(SMCParser smc,
const String:key[], const char[] key,
const String:value[], const char[] value,
bool:key_quotes, bool key_quotes,
bool:value_quotes) bool value_quotes)
{ {
if (g_UserState != USER_STATE_INADMIN || g_IgnoreLevel) if (g_UserState != UserState_InAdmin || g_IgnoreLevel)
{ {
return SMCParse_Continue; return SMCParse_Continue;
} }
@ -108,20 +111,20 @@ public SMCResult:ReadUsers_KeyValue(Handle:smc,
} }
else if (StrEqual(key, "group")) else if (StrEqual(key, "group"))
{ {
new GroupId:id = FindAdmGroup(value); GroupId id = FindAdmGroup(value);
if (id == INVALID_GROUP_ID) if (id == INVALID_GROUP_ID)
{ {
ParseError("Unknown group \"%s\"", value); ParseError("Unknown group \"%s\"", value);
} }
PushArrayCell(g_GroupArray, id); g_GroupArray.Push(id);
} }
else if (StrEqual(key, "flags")) else if (StrEqual(key, "flags"))
{ {
new len = strlen(value); int len = strlen(value);
new AdminFlag:flag; AdminFlag flag;
for (new i = 0; i < len; i++) for (int i = 0; i < len; i++)
{ {
if (!FindFlagByChar(value[i], flag)) if (!FindFlagByChar(value[i], flag))
{ {
@ -141,7 +144,7 @@ public SMCResult:ReadUsers_KeyValue(Handle:smc,
return SMCParse_Continue; return SMCParse_Continue;
} }
public SMCResult:ReadUsers_EndSection(Handle:smc) public SMCResult ReadUsers_EndSection(SMCParser smc)
{ {
if (g_IgnoreLevel) if (g_IgnoreLevel)
{ {
@ -149,13 +152,14 @@ public SMCResult:ReadUsers_EndSection(Handle:smc)
return SMCParse_Continue; return SMCParse_Continue;
} }
if (g_UserState == USER_STATE_INADMIN) if (g_UserState == UserState_InAdmin)
{ {
/* Dump this user to memory */ /* Dump this user to memory */
if (g_CurIdent[0] != '\0' && g_CurAuth[0] != '\0') if (g_CurIdent[0] != '\0' && g_CurAuth[0] != '\0')
{ {
decl AdminFlag:flags[26]; AdminFlag flags[26];
new AdminId:id, i, num_groups, num_flags; AdminId id;
int i, num_groups, num_flags;
if ((id = FindAdminByIdentity(g_CurAuth, g_CurIdent)) == INVALID_ADMIN_ID) if ((id = FindAdminByIdentity(g_CurAuth, g_CurIdent)) == INVALID_ADMIN_ID)
{ {
@ -168,10 +172,10 @@ public SMCResult:ReadUsers_EndSection(Handle:smc)
} }
} }
num_groups = GetArraySize(g_GroupArray); num_groups = g_GroupArray.Length;
for (i = 0; i < num_groups; i++) for (i = 0; i < num_groups; i++)
{ {
AdminInheritGroup(id, GetArrayCell(g_GroupArray, i)); AdminInheritGroup(id, g_GroupArray.Get(i));
} }
SetAdminPassword(id, g_CurPass); SetAdminPassword(id, g_CurPass);
@ -191,24 +195,24 @@ public SMCResult:ReadUsers_EndSection(Handle:smc)
ParseError("Failed to create admin: did you forget either the auth or identity properties?"); ParseError("Failed to create admin: did you forget either the auth or identity properties?");
} }
g_UserState = USER_STATE_ADMINS; g_UserState = UserState_Admins;
} }
else if (g_UserState == USER_STATE_ADMINS) else if (g_UserState == UserState_Admins)
{ {
g_UserState = USER_STATE_NONE; g_UserState = UserState_None;
} }
return SMCParse_Continue; return SMCParse_Continue;
} }
public SMCResult:ReadUsers_CurrentLine(Handle:smc, const String:line[], lineno) public SMCResult ReadUsers_CurrentLine(SMCParser smc, const char[] line, int lineno)
{ {
g_CurrentLine = lineno; g_CurrentLine = lineno;
return SMCParse_Continue; return SMCParse_Continue;
} }
static InitializeUserParser() static void InitializeUserParser()
{ {
if (!g_hUserParser) if (!g_hUserParser)
{ {
@ -222,7 +226,7 @@ static InitializeUserParser()
} }
} }
ReadUsers() void ReadUsers()
{ {
InitializeUserParser(); InitializeUserParser();
@ -230,7 +234,7 @@ ReadUsers()
/* Set states */ /* Set states */
InitGlobalStates(); InitGlobalStates();
g_UserState = USER_STATE_NONE; g_UserState = UserState_None;
SMCError err = g_hUserParser.ParseFile(g_Filename); SMCError err = g_hUserParser.ParseFile(g_Filename);
if (err != SMCError_Okay) if (err != SMCError_Okay)

58
plugins/admin-sql-prefetch.sp
View File

@ -36,7 +36,7 @@
#include <sourcemod> #include <sourcemod>
public Plugin:myinfo = public Plugin myinfo =
{ {
name = "SQL Admins (Prefetch)", name = "SQL Admins (Prefetch)",
author = "AlliedModders LLC", author = "AlliedModders LLC",
@ -45,7 +45,7 @@ public Plugin:myinfo =
url = "http://www.sourcemod.net/" url = "http://www.sourcemod.net/"
}; };
public OnRebuildAdminCache(AdminCachePart:part) public void OnRebuildAdminCache(AdminCachePart part)
{ {
/* First try to get a database connection */ /* First try to get a database connection */
char error[255]; char error[255];
@ -97,7 +97,7 @@ void FetchUsers(Database db)
char name[80]; char name[80];
int immunity; int immunity;
AdminId adm; AdminId adm;
GroupId gid; GroupId grp;
int id; int id;
/* Keep track of a mapping from admin DB IDs to internal AdminIds to /* Keep track of a mapping from admin DB IDs to internal AdminIds to
@ -120,7 +120,7 @@ void FetchUsers(Database db)
if ((adm = FindAdminByIdentity(authtype, identity)) == INVALID_ADMIN_ID) if ((adm = FindAdminByIdentity(authtype, identity)) == INVALID_ADMIN_ID)
{ {
adm = CreateAdmin(name); adm = CreateAdmin(name);
if (!BindAdminIdentity(adm, authtype, identity)) if (!adm.BindIdentity(authtype, identity))
{ {
LogError("Could not bind prefetched SQL admin (authtype \"%s\") (identity \"%s\")", authtype, identity); LogError("Could not bind prefetched SQL admin (authtype \"%s\") (identity \"%s\")", authtype, identity);
continue; continue;
@ -136,22 +136,22 @@ void FetchUsers(Database db)
/* See if this admin wants a password */ /* See if this admin wants a password */
if (password[0] != '\0') if (password[0] != '\0')
{ {
SetAdminPassword(adm, password); adm.SetPassword(password);
} }
/* Apply each flag */ /* Apply each flag */
int len = strlen(flags); int len = strlen(flags);
AdminFlag flag; AdminFlag flag;
for (new i=0; i<len; i++) for (int i=0; i<len; i++)
{ {
if (!FindFlagByChar(flags[i], flag)) if (!FindFlagByChar(flags[i], flag))
{ {
continue; continue;
} }
SetAdminFlag(adm, flag, true); adm.SetFlag(flag, true);
} }
SetAdminImmunityLevel(adm, immunity); adm.ImmunityLevel = immunity;
} }
delete rs; delete rs;
@ -173,13 +173,13 @@ void FetchUsers(Database db)
if (htAdmins.GetValue(key, adm)) if (htAdmins.GetValue(key, adm))
{ {
if ((gid = FindAdmGroup(group)) == INVALID_GROUP_ID) if ((grp = FindAdmGroup(group)) == INVALID_GROUP_ID)
{ {
/* Group wasn't found, don't bother with it. */ /* Group wasn't found, don't bother with it. */
continue; continue;
} }
AdminInheritGroup(adm, gid); adm.InheritGroup(grp);
} }
} }
@ -187,7 +187,7 @@ void FetchUsers(Database db)
delete htAdmins; delete htAdmins;
} }
FetchGroups(Database db) void FetchGroups(Database db)
{ {
char query[255]; char query[255];
DBResultSet rs; DBResultSet rs;
@ -218,26 +218,26 @@ FetchGroups(Database db)
#endif #endif
/* Find or create the group */ /* Find or create the group */
GroupId gid; GroupId grp;
if ((gid = FindAdmGroup(name)) == INVALID_GROUP_ID) if ((grp = FindAdmGroup(name)) == INVALID_GROUP_ID)
{ {
gid = CreateAdmGroup(name); grp = CreateAdmGroup(name);
} }
/* Add flags from the database to the group */ /* Add flags from the database to the group */
int num_flag_chars = strlen(flags); int num_flag_chars = strlen(flags);
for (new i=0; i<num_flag_chars; i++) for (int i=0; i<num_flag_chars; i++)
{ {
decl AdminFlag:flag; AdminFlag flag;
if (!FindFlagByChar(flags[i], flag)) if (!FindFlagByChar(flags[i], flag))
{ {
continue; continue;
} }
SetAdmGroupAddFlag(gid, flag, true); grp.SetFlag(flag, true);
} }
/* Set the immunity level this group has */ /* Set the immunity level this group has */
SetAdmGroupImmunityLevel(gid, immunity); grp.ImmunityLevel = immunity;
} }
delete rs; delete rs;
@ -245,7 +245,7 @@ FetchGroups(Database db)
/** /**
* Get immunity in a big lump. This is a nasty query but it gets the job done. * Get immunity in a big lump. This is a nasty query but it gets the job done.
*/ */
new len = 0; int len = 0;
len += Format(query[len], sizeof(query)-len, "SELECT g1.name, g2.name FROM sm_group_immunity gi"); len += Format(query[len], sizeof(query)-len, "SELECT g1.name, g2.name FROM sm_group_immunity gi");
len += Format(query[len], sizeof(query)-len, " LEFT JOIN sm_groups g1 ON g1.id = gi.group_id "); len += Format(query[len], sizeof(query)-len, " LEFT JOIN sm_groups g1 ON g1.id = gi.group_id ");
len += Format(query[len], sizeof(query)-len, " LEFT JOIN sm_groups g2 ON g2.id = gi.other_id"); len += Format(query[len], sizeof(query)-len, " LEFT JOIN sm_groups g2 ON g2.id = gi.other_id");
@ -263,20 +263,20 @@ FetchGroups(Database db)
{ {
char group1[80]; char group1[80];
char group2[80]; char group2[80];
GroupId gid1, gid2; GroupId grp, other;
rs.FetchString(0, group1, sizeof(group1)); rs.FetchString(0, group1, sizeof(group1));
rs.FetchString(1, group2, sizeof(group2)); rs.FetchString(1, group2, sizeof(group2));
if (((gid1 = FindAdmGroup(group1)) == INVALID_GROUP_ID) if (((grp = FindAdmGroup(group1)) == INVALID_GROUP_ID)
|| (gid2 = FindAdmGroup(group2)) == INVALID_GROUP_ID) || (other = FindAdmGroup(group2)) == INVALID_GROUP_ID)
{ {
continue; continue;
} }
SetAdmGroupImmuneFrom(gid1, gid2); grp.AddGroupImmunity(other);
#if defined _DEBUG #if defined _DEBUG
PrintToServer("SetAdmGroupImmuneFrom(%d, %d)", gid1, gid2); PrintToServer("SetAdmGroupImmuneFrom(%d, %d)", grp, other);
#endif #endif
} }
@ -306,8 +306,8 @@ FetchGroups(Database db)
rs.FetchString(2, cmd, sizeof(cmd)); rs.FetchString(2, cmd, sizeof(cmd));
rs.FetchString(3, access, sizeof(access)); rs.FetchString(3, access, sizeof(access));
GroupId gid; GroupId grp;
if ((gid = FindAdmGroup(name)) == INVALID_GROUP_ID) if ((grp = FindAdmGroup(name)) == INVALID_GROUP_ID)
{ {
continue; continue;
} }
@ -325,16 +325,16 @@ FetchGroups(Database db)
} }
#if defined _DEBUG #if defined _DEBUG
PrintToServer("AddAdmGroupCmdOverride(%d, %s, %d, %d)", gid, cmd, o_type, o_rule); PrintToServer("AddAdmGroupCmdOverride(%d, %s, %d, %d)", grp, cmd, o_type, o_rule);
#endif #endif
AddAdmGroupCmdOverride(gid, cmd, o_type, o_rule); grp.AddCommandOverride(cmd, o_type, o_rule);
} }
delete rs; delete rs;
} }
FetchOverrides(Database db) void FetchOverrides(Database db)
{ {
char query[255]; char query[255];
DBResultSet rs; DBResultSet rs;

120
plugins/admin-sql-threaded.sp
View File

@ -36,7 +36,7 @@
#include <sourcemod> #include <sourcemod>
public Plugin:myinfo = public Plugin myinfo =
{ {
name = "SQL Admins (Threaded)", name = "SQL Admins (Threaded)",
author = "AlliedModders LLC", author = "AlliedModders LLC",
@ -68,15 +68,15 @@ public Plugin:myinfo =
*/ */
Database hDatabase = null; /** Database connection */ Database hDatabase = null; /** Database connection */
new g_sequence = 0; /** Global unique sequence number */ int g_sequence = 0; /** Global unique sequence number */
new ConnectLock = 0; /** Connect sequence number */ int ConnectLock = 0; /** Connect sequence number */
new RebuildCachePart[3] = {0}; /** Cache part sequence numbers */ int RebuildCachePart[3] = {0}; /** Cache part sequence numbers */
new PlayerSeq[MAXPLAYERS+1]; /** Player-specific sequence numbers */ int PlayerSeq[MAXPLAYERS+1]; /** Player-specific sequence numbers */
new bool:PlayerAuth[MAXPLAYERS+1]; /** Whether a player has been "pre-authed" */ bool PlayerAuth[MAXPLAYERS+1]; /** Whether a player has been "pre-authed" */
//#define _DEBUG //#define _DEBUG
public OnMapEnd() public void OnMapEnd()
{ {
/** /**
* Clean up on map end just so we can start a fresh connection when we need it later. * Clean up on map end just so we can start a fresh connection when we need it later.
@ -84,14 +84,14 @@ public OnMapEnd()
delete hDatabase; delete hDatabase;
} }
public bool:OnClientConnect(client, String:rejectmsg[], maxlen) public bool OnClientConnect(int client, char[] rejectmsg, int maxlen)
{ {
PlayerSeq[client] = 0; PlayerSeq[client] = 0;
PlayerAuth[client] = false; PlayerAuth[client] = false;
return true; return true;
} }
public OnClientDisconnect(client) public void OnClientDisconnect(int client)
{ {
PlayerSeq[client] = 0; PlayerSeq[client] = 0;
PlayerAuth[client] = false; PlayerAuth[client] = false;
@ -128,22 +128,22 @@ public void OnDatabaseConnect(Database db, const char[] error, any data)
/** /**
* See if we need to get any of the cache stuff now. * See if we need to get any of the cache stuff now.
*/ */
new sequence; int sequence;
if ((sequence = RebuildCachePart[_:AdminCache_Overrides]) != 0) if ((sequence = RebuildCachePart[AdminCache_Overrides]) != 0)
{ {
FetchOverrides(hDatabase, sequence); FetchOverrides(hDatabase, sequence);
} }
if ((sequence = RebuildCachePart[_:AdminCache_Groups]) != 0) if ((sequence = RebuildCachePart[AdminCache_Groups]) != 0)
{ {
FetchGroups(hDatabase, sequence); FetchGroups(hDatabase, sequence);
} }
if ((sequence = RebuildCachePart[_:AdminCache_Admins]) != 0) if ((sequence = RebuildCachePart[AdminCache_Admins]) != 0)
{ {
FetchUsersWeCan(hDatabase); FetchUsersWeCan(hDatabase);
} }
} }
RequestDatabaseConnection() void RequestDatabaseConnection()
{ {
ConnectLock = ++g_sequence; ConnectLock = ++g_sequence;
if (SQL_CheckConfig("admins")) if (SQL_CheckConfig("admins"))
@ -154,7 +154,7 @@ RequestDatabaseConnection()
} }
} }
public OnRebuildAdminCache(AdminCachePart part) public void OnRebuildAdminCache(AdminCachePart part)
{ {
/** /**
* Mark this part of the cache as being rebuilt. This is used by the * Mark this part of the cache as being rebuilt. This is used by the
@ -162,7 +162,7 @@ public OnRebuildAdminCache(AdminCachePart part)
* used. * used.
*/ */
int sequence = ++g_sequence; int sequence = ++g_sequence;
RebuildCachePart[_:part] = sequence; RebuildCachePart[part] = sequence;
/** /**
* If we don't have a database connection, we can't do any lookups just yet. * If we don't have a database connection, we can't do any lookups just yet.
@ -189,7 +189,7 @@ public OnRebuildAdminCache(AdminCachePart part)
} }
} }
public Action OnClientPreAdminCheck(client) public Action OnClientPreAdminCheck(int client)
{ {
PlayerAuth[client] = true; PlayerAuth[client] = true;
@ -209,7 +209,7 @@ public Action OnClientPreAdminCheck(client)
* the user's normal connection flow. The database will soon auth the user * the user's normal connection flow. The database will soon auth the user
* normally. * normally.
*/ */
if (RebuildCachePart[_:AdminCache_Admins] != 0) if (RebuildCachePart[AdminCache_Admins] != 0)
{ {
return Plugin_Continue; return Plugin_Continue;
} }
@ -272,22 +272,22 @@ public void OnReceiveUserGroups(Database db, DBResultSet rs, const char[] error,
} }
char name[80]; char name[80];
GroupId gid; GroupId grp;
while (rs.FetchRow()) while (rs.FetchRow())
{ {
rs.FetchString(0, name, sizeof(name)); rs.FetchString(0, name, sizeof(name));
if ((gid = FindAdmGroup(name)) == INVALID_GROUP_ID) if ((grp = FindAdmGroup(name)) == INVALID_GROUP_ID)
{ {
continue; continue;
} }
#if defined _DEBUG #if defined _DEBUG
PrintToServer("Binding user group (%d, %d, %d, %s, %d)", client, sequence, adm, name, gid); PrintToServer("Binding user group (%d, %d, %d, %s, %d)", client, sequence, adm, name, grp);
#endif #endif
AdminInheritGroup(adm, gid); adm.InheritGroup(grp);
} }
/** /**
@ -370,14 +370,14 @@ public void OnReceiveUser(Database db, DBResultSet rs, const char[] error, any d
} }
adm = CreateAdmin(name); adm = CreateAdmin(name);
if (!BindAdminIdentity(adm, authtype, identity)) if (!adm.BindIdentity(authtype, identity))
{ {
LogError("Could not bind prefetched SQL admin (authtype \"%s\") (identity \"%s\")", authtype, identity); LogError("Could not bind prefetched SQL admin (authtype \"%s\") (identity \"%s\")", authtype, identity);
continue; continue;
} }
user_lookup[total_users][0] = id; user_lookup[total_users][0] = id;
user_lookup[total_users][1] = _:adm; user_lookup[total_users][1] = view_as<int>(adm);
user_lookup[total_users][2] = rs.FetchInt(6); user_lookup[total_users][2] = rs.FetchInt(6);
total_users++; total_users++;
@ -388,21 +388,21 @@ public void OnReceiveUser(Database db, DBResultSet rs, const char[] error, any d
/* See if this admin wants a password */ /* See if this admin wants a password */
if (password[0] != '\0') if (password[0] != '\0')
{ {
SetAdminPassword(adm, password); adm.SetPassword(password);
} }
SetAdminImmunityLevel(adm, immunity); adm.ImmunityLevel = immunity;
/* Apply each flag */ /* Apply each flag */
int len = strlen(flags); int len = strlen(flags);
AdminFlag flag; AdminFlag flag;
for (new i=0; i<len; i++) for (int i=0; i<len; i++)
{ {
if (!FindFlagByChar(flags[i], flag)) if (!FindFlagByChar(flags[i], flag))
{ {
continue; continue;
} }
SetAdminFlag(adm, flag, true); adm.SetFlag(flag, true);
} }
} }
@ -415,9 +415,9 @@ public void OnReceiveUser(Database db, DBResultSet rs, const char[] error, any d
id = 0; id = 0;
for (new i=0; i<total_users; i++) for (int i=0; i<total_users; i++)
{ {
if (user_lookup[i][1] == _:adm) if (user_lookup[i][1] == view_as<int>(adm))
{ {
id = user_lookup[i][0]; id = user_lookup[i][0];
group_count = user_lookup[i][2]; group_count = user_lookup[i][2];
@ -449,13 +449,13 @@ public void OnReceiveUser(Database db, DBResultSet rs, const char[] error, any d
pk.Reset(); pk.Reset();
pk.WriteCell(client); pk.WriteCell(client);
pk.WriteCell(sequence); pk.WriteCell(sequence);
pk.WriteCell(_:adm); pk.WriteCell(adm);
pk.WriteString(query); pk.WriteString(query);
db.Query(OnReceiveUserGroups, query, pk, DBPrio_High); db.Query(OnReceiveUserGroups, query, pk, DBPrio_High);
} }
FetchUser(Database db, client) void FetchUser(Database db, int client)
{ {
char name[65]; char name[65];
char safe_name[140]; char safe_name[140];
@ -484,7 +484,7 @@ FetchUser(Database db, client)
* Construct the query using the information the user gave us. * Construct the query using the information the user gave us.
*/ */
char query[512]; char query[512];
new len = 0; int len = 0;
len += Format(query[len], sizeof(query)-len, "SELECT a.id, a.authtype, a.identity, a.password, a.flags, a.name, COUNT(ag.group_id), immunity"); len += Format(query[len], sizeof(query)-len, "SELECT a.id, a.authtype, a.identity, a.password, a.flags, a.name, COUNT(ag.group_id), immunity");
len += Format(query[len], sizeof(query)-len, " FROM sm_admins a LEFT JOIN sm_admins_groups ag ON a.id = ag.admin_id WHERE "); len += Format(query[len], sizeof(query)-len, " FROM sm_admins a LEFT JOIN sm_admins_groups ag ON a.id = ag.admin_id WHERE ");
@ -516,7 +516,7 @@ FetchUser(Database db, client)
db.Query(OnReceiveUser, query, pk, DBPrio_High); db.Query(OnReceiveUser, query, pk, DBPrio_High);
} }
FetchUsersWeCan(Database db) void FetchUsersWeCan(Database db)
{ {
for (int i=1; i<=MaxClients; i++) for (int i=1; i<=MaxClients; i++)
{ {
@ -529,7 +529,7 @@ FetchUsersWeCan(Database db)
/** /**
* This round of updates is done. Go in peace. * This round of updates is done. Go in peace.
*/ */
RebuildCachePart[_:AdminCache_Admins] = 0; RebuildCachePart[AdminCache_Admins] = 0;
} }
@ -542,7 +542,7 @@ public void OnReceiveGroupImmunity(Database db, DBResultSet rs, const char[] err
* Check if this is the latest result request. * Check if this is the latest result request.
*/ */
int sequence = pk.ReadCell(); int sequence = pk.ReadCell();
if (RebuildCachePart[_:AdminCache_Groups] != sequence) if (RebuildCachePart[AdminCache_Groups] != sequence)
{ {
/* Discard everything, since we're out of sequence. */ /* Discard everything, since we're out of sequence. */
delete pk; delete pk;
@ -569,28 +569,28 @@ public void OnReceiveGroupImmunity(Database db, DBResultSet rs, const char[] err
{ {
char group1[80]; char group1[80];
char group2[80]; char group2[80];
GroupId gid1, gid2; GroupId grp, other;
rs.FetchString(0, group1, sizeof(group1)); rs.FetchString(0, group1, sizeof(group1));
rs.FetchString(1, group2, sizeof(group2)); rs.FetchString(1, group2, sizeof(group2));
if (((gid1 = FindAdmGroup(group1)) == INVALID_GROUP_ID) if (((grp = FindAdmGroup(group1)) == INVALID_GROUP_ID)
|| (gid2 = FindAdmGroup(group2)) == INVALID_GROUP_ID) || (other = FindAdmGroup(group2)) == INVALID_GROUP_ID)
{ {
continue; continue;
} }
SetAdmGroupImmuneFrom(gid1, gid2); grp.AddGroupImmunity(other);
#if defined _DEBUG #if defined _DEBUG
PrintToServer("SetAdmGroupImmuneFrom(%d, %d)", gid1, gid2); PrintToServer("SetAdmGroupImmuneFrom(%d, %d)", grp, other);
#endif #endif
} }
/* Clear the sequence so another connect doesn't refetch */ /* Clear the sequence so another connect doesn't refetch */
RebuildCachePart[_:AdminCache_Groups] = 0; RebuildCachePart[AdminCache_Groups] = 0;
} }
public OnReceiveGroupOverrides(Database db, DBResultSet rs, const char[] error, any data) public void OnReceiveGroupOverrides(Database db, DBResultSet rs, const char[] error, any data)
{ {
DataPack pk = view_as<DataPack>(data); DataPack pk = view_as<DataPack>(data);
pk.Reset(); pk.Reset();
@ -599,7 +599,7 @@ public OnReceiveGroupOverrides(Database db, DBResultSet rs, const char[] error,
* Check if this is the latest result request. * Check if this is the latest result request.
*/ */
int sequence = pk.ReadCell(); int sequence = pk.ReadCell();
if (RebuildCachePart[_:AdminCache_Groups] != sequence) if (RebuildCachePart[AdminCache_Groups] != sequence)
{ {
/* Discard everything, since we're out of sequence. */ /* Discard everything, since we're out of sequence. */
delete pk; delete pk;
@ -626,7 +626,7 @@ public OnReceiveGroupOverrides(Database db, DBResultSet rs, const char[] error,
char type[16]; char type[16];
char command[64]; char command[64];
char access[16]; char access[16];
GroupId gid; GroupId grp;
while (rs.FetchRow()) while (rs.FetchRow())
{ {
rs.FetchString(0, name, sizeof(name)); rs.FetchString(0, name, sizeof(name));
@ -635,7 +635,7 @@ public OnReceiveGroupOverrides(Database db, DBResultSet rs, const char[] error,
rs.FetchString(3, access, sizeof(access)); rs.FetchString(3, access, sizeof(access));
/* Find the group. This is actually faster than doing the ID lookup. */ /* Find the group. This is actually faster than doing the ID lookup. */
if ((gid = FindAdmGroup(name)) == INVALID_GROUP_ID) if ((grp = FindAdmGroup(name)) == INVALID_GROUP_ID)
{ {
/* Oh well, just ignore it. */ /* Oh well, just ignore it. */
continue; continue;
@ -654,10 +654,10 @@ public OnReceiveGroupOverrides(Database db, DBResultSet rs, const char[] error,
} }
#if defined _DEBUG #if defined _DEBUG
PrintToServer("AddAdmGroupCmdOverride(%d, %s, %d, %d)", gid, command, o_type, o_rule); PrintToServer("AddAdmGroupCmdOverride(%d, %s, %d, %d)", grp, command, o_type, o_rule);
#endif #endif
AddAdmGroupCmdOverride(gid, command, o_type, o_rule); grp.AddCommandOverride(command, o_type, o_rule);
} }
/** /**
@ -676,7 +676,7 @@ public OnReceiveGroupOverrides(Database db, DBResultSet rs, const char[] error,
db.Query(OnReceiveGroupImmunity, query, pk, DBPrio_High); db.Query(OnReceiveGroupImmunity, query, pk, DBPrio_High);
} }
public OnReceiveGroups(Database db, DBResultSet rs, const char[] error, any data) public void OnReceiveGroups(Database db, DBResultSet rs, const char[] error, any data)
{ {
DataPack pk = view_as<DataPack>(data); DataPack pk = view_as<DataPack>(data);
pk.Reset(); pk.Reset();
@ -685,7 +685,7 @@ public OnReceiveGroups(Database db, DBResultSet rs, const char[] error, any data
* Check if this is the latest result request. * Check if this is the latest result request.
*/ */
int sequence = pk.ReadCell(); int sequence = pk.ReadCell();
if (RebuildCachePart[_:AdminCache_Groups] != sequence) if (RebuildCachePart[AdminCache_Groups] != sequence)
{ {
/* Discard everything, since we're out of sequence. */ /* Discard everything, since we're out of sequence. */
delete pk; delete pk;
@ -722,25 +722,25 @@ public OnReceiveGroups(Database db, DBResultSet rs, const char[] error, any data
#endif #endif
/* Find or create the group */ /* Find or create the group */
GroupId gid; GroupId grp;
if ((gid = FindAdmGroup(name)) == INVALID_GROUP_ID) if ((grp = FindAdmGroup(name)) == INVALID_GROUP_ID)
{ {
gid = CreateAdmGroup(name); grp = CreateAdmGroup(name);
} }
/* Add flags from the database to the group */ /* Add flags from the database to the group */
int num_flag_chars = strlen(flags); int num_flag_chars = strlen(flags);
for (int i=0; i<num_flag_chars; i++) for (int i=0; i<num_flag_chars; i++)
{ {
decl AdminFlag:flag; AdminFlag flag;
if (!FindFlagByChar(flags[i], flag)) if (!FindFlagByChar(flags[i], flag))
{ {
continue; continue;
} }
SetAdmGroupAddFlag(gid, flag, true); grp.SetFlag(flag, true);
} }
SetAdmGroupImmunityLevel(gid, immunity); grp.ImmunityLevel = immunity;
} }
/** /**
@ -758,7 +758,7 @@ public OnReceiveGroups(Database db, DBResultSet rs, const char[] error, any data
db.Query(OnReceiveGroupOverrides, query, pk, DBPrio_High); db.Query(OnReceiveGroupOverrides, query, pk, DBPrio_High);
} }
void FetchGroups(Database db, sequence) void FetchGroups(Database db, int sequence)
{ {
char query[255]; char query[255];
@ -780,7 +780,7 @@ public void OnReceiveOverrides(Database db, DBResultSet rs, const char[] error,
* Check if this is the latest result request. * Check if this is the latest result request.
*/ */
int sequence = pk.ReadCell(); int sequence = pk.ReadCell();
if (RebuildCachePart[_:AdminCache_Overrides] != sequence) if (RebuildCachePart[AdminCache_Overrides] != sequence)
{ {
/* Discard everything, since we're out of sequence. */ /* Discard everything, since we're out of sequence. */
delete pk; delete pk;
@ -829,10 +829,10 @@ public void OnReceiveOverrides(Database db, DBResultSet rs, const char[] error,
} }
/* Clear the sequence so another connect doesn't refetch */ /* Clear the sequence so another connect doesn't refetch */
RebuildCachePart[_:AdminCache_Overrides] = 0; RebuildCachePart[AdminCache_Overrides] = 0;
} }
void FetchOverrides(Database db, sequence) void FetchOverrides(Database db, int sequence)
{ {
char query[255]; char query[255];

32
plugins/adminhelp.sp
View File

@ -37,7 +37,7 @@
#define COMMANDS_PER_PAGE 10 #define COMMANDS_PER_PAGE 10
public Plugin:myinfo = public Plugin myinfo =
{ {
name = "Admin Help", name = "Admin Help",
author = "AlliedModders LLC", author = "AlliedModders LLC",
@ -46,7 +46,7 @@ public Plugin:myinfo =
url = "http://www.sourcemod.net/" url = "http://www.sourcemod.net/"
}; };
public OnPluginStart() public void OnPluginStart()
{ {
LoadTranslations("common.phrases"); LoadTranslations("common.phrases");
LoadTranslations("adminhelp.phrases"); LoadTranslations("adminhelp.phrases");
@ -54,11 +54,11 @@ public OnPluginStart()
RegConsoleCmd("sm_searchcmd", HelpCmd, "Searches SourceMod commands"); RegConsoleCmd("sm_searchcmd", HelpCmd, "Searches SourceMod commands");
} }
public Action:HelpCmd(client, args) public Action HelpCmd(int client, int args)
{ {
decl String:arg[64], String:CmdName[20]; char arg[64], CmdName[20];
new PageNum = 1; int PageNum = 1;
new bool:DoSearch; bool DoSearch;
GetCmdArg(0, CmdName, sizeof(CmdName)); GetCmdArg(0, CmdName, sizeof(CmdName));
@ -76,17 +76,17 @@ public Action:HelpCmd(client, args)
ReplyToCommand(client, "[SM] %t", "See console for output"); ReplyToCommand(client, "[SM] %t", "See console for output");
} }
decl String:Name[64]; char Name[64];
decl String:Desc[255]; char Desc[255];
decl String:NoDesc[128]; char NoDesc[128];
new Flags; int Flags;
new Handle:CmdIter = GetCommandIterator(); Handle CmdIter = GetCommandIterator();
FormatEx(NoDesc, sizeof(NoDesc), "%T", "No description available", client); FormatEx(NoDesc, sizeof(NoDesc), "%T", "No description available", client);
if (DoSearch) if (DoSearch)
{ {
new i = 1; int i = 1;
while (ReadCommandIterator(CmdIter, Name, sizeof(Name), Flags, Desc, sizeof(Desc))) while (ReadCommandIterator(CmdIter, Name, sizeof(Name), Flags, Desc, sizeof(Desc)))
{ {
if ((StrContains(Name, arg, false) != -1) && CheckCommandAccess(client, Name, Flags)) if ((StrContains(Name, arg, false) != -1) && CheckCommandAccess(client, Name, Flags))
@ -105,8 +105,8 @@ public Action:HelpCmd(client, args)
/* Skip the first N commands if we need to */ /* Skip the first N commands if we need to */
if (PageNum > 1) if (PageNum > 1)
{ {
new i; int i;
new EndCmd = (PageNum-1) * COMMANDS_PER_PAGE - 1; int EndCmd = (PageNum-1) * COMMANDS_PER_PAGE - 1;
for (i=0; ReadCommandIterator(CmdIter, Name, sizeof(Name), Flags, Desc, sizeof(Desc)) && i<EndCmd; ) for (i=0; ReadCommandIterator(CmdIter, Name, sizeof(Name), Flags, Desc, sizeof(Desc)) && i<EndCmd; )
{ {
if (CheckCommandAccess(client, Name, Flags)) if (CheckCommandAccess(client, Name, Flags))
@ -124,8 +124,8 @@ public Action:HelpCmd(client, args)
} }
/* Start printing the commands to the client */ /* Start printing the commands to the client */
new i; int i;
new StartCmd = (PageNum-1) * COMMANDS_PER_PAGE; int StartCmd = (PageNum-1) * COMMANDS_PER_PAGE;
for (i=0; ReadCommandIterator(CmdIter, Name, sizeof(Name), Flags, Desc, sizeof(Desc)) && i<COMMANDS_PER_PAGE; ) for (i=0; ReadCommandIterator(CmdIter, Name, sizeof(Name), Flags, Desc, sizeof(Desc)) && i<COMMANDS_PER_PAGE; )
{ {
if (CheckCommandAccess(client, Name, Flags)) if (CheckCommandAccess(client, Name, Flags))

263
plugins/include/admin.inc
View File

@ -168,21 +168,174 @@ enum AdminCachePart
AdminCache_Admins = 2, /**< All admins */ AdminCache_Admins = 2, /**< All admins */
}; };
methodmap AdminId {
// Retrieves an admin's user name as made with CreateAdmin().
//
// @note This function can return UTF-8 strings, and will safely chop UTF-8 strings.
//
// @param name String buffer to store name.
// @param maxlength Maximum size of string buffer.
// @return Number of bytes written.
public native void GetUsername(char[] name, int maxlength);
// Binds an admin to an identity for fast lookup later on. The bind must be unique.
//
// @param authMethod Auth method to use, predefined or from RegisterAuthIdentType().
// @param ident String containing the arbitrary, unique identity.
// @return True on success, false if the auth method was not found,
// ident was already taken, or ident invalid for auth method.
public native bool BindIdentity(const char[] authMethod, const char[] ident);
// Sets whether or not a flag is enabled on an admin.
//
// @param flag Admin flag to use.
// @param enabled True to enable, false to disable.
public native void SetFlag(AdminFlag flag, bool enabled);
// Returns whether or not a flag is enabled on an admin.
//
// @param flag Admin flag to use.
// @param mode Access mode to check.
// @return True if enabled, false otherwise.
public native bool HasFlag(AdminFlag flag, AdmAccessMode mode=Access_Effective);
// Returns the bitstring of access flags on an admin.
//
// @param mode Access mode to use.
// @return A bitstring containing which flags are enabled.
public native int GetFlags(AdmAccessMode mode);
// Adds a group to an admin's inherited group list. Any flags the group has
// will be added to the admin's effective flags.
//
// @param gid GroupId index of the group.
// @return True on success, false on invalid input or duplicate membership.
public native bool InheritGroup(GroupId gid);
// Returns group information from an admin.
//
// @param index Group number to retrieve, from 0 to N-1, where N
// is the value of the GroupCount property.
// @param name Buffer to store the group's name.
// Note: This will safely chop UTF-8 strings.
// @param maxlength Maximum size of the output name buffer.
// @return A GroupId index and a name pointer, or
// INVALID_GROUP_ID and NULL if an error occurred.
public native GroupId GetGroup(int index, const char[] name, int maxlength);
// Sets a password on an admin.
//
// @param password String containing the password.
public native void SetPassword(const char[] password);
// Gets an admin's password.
//
// @param buffer Optional buffer to store the admin's password.
// @param maxlength Maximum size of the output name buffer.
// Note: This will safely chop UTF-8 strings.
// @return True if there was a password set, false otherwise.
public native bool GetPassword(char[] buffer="", maxlength=0);
// Tests whether one admin can target another.
//
// The heuristics for this check are as follows:
// 0. If the targeting AdminId is INVALID_ADMIN_ID, targeting fails.
// 1. If the targeted AdminId is INVALID_ADMIN_ID, targeting succeeds.
// 2. If the targeted AdminId is the same as the targeting AdminId,
// (self) targeting succeeds.
// 3. If the targeting admin is root, targeting succeeds.
// 4. If the targeted admin has access higher (as interpreted by
// (sm_immunity_mode) than the targeting admin, then targeting fails.
// 5. If the targeted admin has specific immunity from the
// targeting admin via group immunities, targeting fails.
// 6. Targeting succeeds.
//
// @param target Target admin (may be INVALID_ADMIN_ID).
// @return True if targetable, false if immune.
public native bool CanTarget(AdminId other);
// The number of groups of which this admin is a member.
property int GroupCount {
public native get();
}
// Immunity level used for targetting.
property int ImmunityLevel {
public native get();
public native set(int level);
}
}
methodmap GroupId {
// Gets whether or not a flag is enabled on a group's flag set.
//
// @param flag Admin flag to retrieve.
// @return True if enabled, false otherwise,
public native bool HasFlag(AdminFlag flag);
// Adds or removes a flag from a group's flag set.
//
// @param flag Admin flag to toggle.
// @param enabled True to set the flag, false to unset/disable.
public native void SetFlag(AdminFlag flag, bool enabled);
// Returns the flag set that is added to users from this group.
//
// @return Bitstring containing the flags enabled.
public native int GetFlags();
// Returns a group that this group is immune to given an index.
//
// @param number Index from 0 to N-1, from GroupImmunitiesCount.
// @return GroupId that this group is immune to, or INVALID_GROUP_ID on failure.
public native GroupId GetGroupImmunity(int index);
// Adds immunity to a specific group.
//
// @param other Group id to receive immunity to.
public native void AddGroupImmunity(GroupId other);
// Retrieves a group-specific command override.
//
// @param name String containing command name (case sensitive).
// @param type Override type (specific command or group).
// @param rule Optional pointer to store allow/deny setting.
// @return True if an override exists, false otherwise.
public native bool GetCommandOverride(const char[] name, OverrideType type, OverrideRule &rule);
// Adds a group-specific override type.
//
// @param name String containing command name (case sensitive).
// @param type Override type (specific command or group).
// @param rule Override allow/deny setting.
public native void AddCommandOverride(const char[] name, OverrideType type, OverrideRule rule);
// Number of specific group immunities
property int GroupImmunitiesCount {
public native get();
}
// Immunity level used for targetting.
property int ImmunityLevel {
public native get();
public native set(int level);
}
}
/** /**
* Called when part of the cache needs to be rebuilt. * Called when part of the cache needs to be rebuilt.
* *
* @param part Part of the admin cache to rebuild. * @param part Part of the admin cache to rebuild.
*/ */
forward OnRebuildAdminCache(AdminCachePart:part); forward void OnRebuildAdminCache(AdminCachePart part);
/** /**
* Tells the admin system to dump a portion of the cache. * Tells the admin system to dump a portion of the cache.
* *
* @param part Part of the cache to dump. Specifying groups also dumps admins. * @param part Part of the cache to dump. Specifying groups also dumps admins.
* @param rebuild If true, the rebuild forwards will fire. * @param rebuild If true, the rebuild forwards will fire.
* @noreturn
*/ */
native DumpAdminCache(AdminCachePart:part, bool:rebuild); native void DumpAdminCache(AdminCachePart part, bool rebuild);
/** /**
* Adds a global command flag override. Any command registered with this name * Adds a global command flag override. Any command registered with this name
@ -191,9 +344,8 @@ native DumpAdminCache(AdminCachePart:part, bool:rebuild);
* @param cmd String containing command name (case sensitive). * @param cmd String containing command name (case sensitive).
* @param type Override type (specific command or group). * @param type Override type (specific command or group).
* @param flags New admin flag. * @param flags New admin flag.
* @noreturn
*/ */
native AddCommandOverride(const String:cmd[], OverrideType:type, flags); native void AddCommandOverride(const char[] cmd, OverrideType type, int flags);
/** /**
* Returns a command override. * Returns a command override.
@ -203,16 +355,15 @@ native AddCommandOverride(const String:cmd[], OverrideType:type, flags);
* @param flags By-reference cell to store the flag (undefined if not found). * @param flags By-reference cell to store the flag (undefined if not found).
* @return True if there is an override, false otherwise. * @return True if there is an override, false otherwise.
*/ */
native bool:GetCommandOverride(const String:cmd[], OverrideType:type, &flags); native bool GetCommandOverride(const char[] cmd, OverrideType type, int &flags);
/** /**
* Unsets a command override. * Unsets a command override.
* *
* @param cmd String containing command name (case sensitive). * @param cmd String containing command name (case sensitive).
* @param type Override type (specific command or group). * @param type Override type (specific command or group).
* @noreturn
*/ */
native UnsetCommandOverride(const String:cmd[], OverrideType:type); native void UnsetCommandOverride(const char[] cmd, OverrideType type);
/** /**
* Adds a new group. Name must be unique. * Adds a new group. Name must be unique.
@ -220,7 +371,7 @@ native UnsetCommandOverride(const String:cmd[], OverrideType:type);
* @param group_name String containing the group name. * @param group_name String containing the group name.
* @return A new group id, INVALID_GROUP_ID if it already exists. * @return A new group id, INVALID_GROUP_ID if it already exists.
*/ */
native GroupId:CreateAdmGroup(const String:group_name[]); native GroupId CreateAdmGroup(const char[] group_name);
/** /**
* Finds a group by name. * Finds a group by name.
@ -228,7 +379,7 @@ native GroupId:CreateAdmGroup(const String:group_name[]);
* @param group_name String containing the group name. * @param group_name String containing the group name.
* @return A group id, or INVALID_GROUP_ID if not found. * @return A group id, or INVALID_GROUP_ID if not found.
*/ */
native GroupId:FindAdmGroup(const String:group_name[]); native GroupId FindAdmGroup(const char[] group_name);
/** /**
* Adds or removes a flag from a group's flag set. * Adds or removes a flag from a group's flag set.
@ -237,9 +388,8 @@ native GroupId:FindAdmGroup(const String:group_name[]);
* @param id Group id. * @param id Group id.
* @param flag Admin flag to toggle. * @param flag Admin flag to toggle.
* @param enabled True to set the flag, false to unset/disable. * @param enabled True to set the flag, false to unset/disable.
* @noreturn
*/ */
native SetAdmGroupAddFlag(GroupId:id, AdminFlag:flag, bool:enabled); native void SetAdmGroupAddFlag(GroupId id, AdminFlag flag, bool enabled);
/** /**
* Gets the set value of an add flag on a group's flag set. * Gets the set value of an add flag on a group's flag set.
@ -249,7 +399,7 @@ native SetAdmGroupAddFlag(GroupId:id, AdminFlag:flag, bool:enabled);
* @param flag Admin flag to retrieve. * @param flag Admin flag to retrieve.
* @return True if enabled, false otherwise, * @return True if enabled, false otherwise,
*/ */
native bool:GetAdmGroupAddFlag(GroupId:id, AdminFlag:flag); native bool GetAdmGroupAddFlag(GroupId id, AdminFlag flag);
/** /**
* Returns the flag set that is added to a user from their group. * Returns the flag set that is added to a user from their group.
@ -258,28 +408,27 @@ native bool:GetAdmGroupAddFlag(GroupId:id, AdminFlag:flag);
* @param id GroupId of the group. * @param id GroupId of the group.
* @return Bitstring containing the flags enabled. * @return Bitstring containing the flags enabled.
*/ */
native GetAdmGroupAddFlags(GroupId:id); native int GetAdmGroupAddFlags(GroupId id);
/** /**
* @deprecated Functionality removed. * @deprecated Functionality removed.
*/ */
#pragma deprecated Use SetAdmGroupImmunityLevel() instead. #pragma deprecated Use SetAdmGroupImmunityLevel() instead.
native SetAdmGroupImmunity(GroupId:id, ImmunityType:type, bool:enabled); native void SetAdmGroupImmunity(GroupId id, ImmunityType type, bool enabled);
/** /**
* @deprecated Functionality removed. * @deprecated Functionality removed.
*/ */
#pragma deprecated Use GetAdmGroupImmunityLevel() instead. #pragma deprecated Use GetAdmGroupImmunityLevel() instead.
native bool:GetAdmGroupImmunity(GroupId:id, ImmunityType:type); native bool GetAdmGroupImmunity(GroupId id, ImmunityType type);
/** /**
* Adds immunity to a specific group. * Adds immunity to a specific group.
* *
* @param id Group id. * @param id Group id.
* @param other_id Group id to receive immunity to. * @param other_id Group id to receive immunity to.
* @noreturn
*/ */
native SetAdmGroupImmuneFrom(GroupId:id, GroupId:other_id); native void SetAdmGroupImmuneFrom(GroupId id, GroupId other_id);
/** /**
* Returns the number of specific group immunities. * Returns the number of specific group immunities.
@ -287,7 +436,7 @@ native SetAdmGroupImmuneFrom(GroupId:id, GroupId:other_id);
* @param id Group id. * @param id Group id.
* @return Number of group immunities. * @return Number of group immunities.
*/ */
native GetAdmGroupImmuneCount(GroupId:id); native int GetAdmGroupImmuneCount(GroupId id);
/** /**
* Returns a group that this group is immune to given an index. * Returns a group that this group is immune to given an index.
@ -296,7 +445,7 @@ native GetAdmGroupImmuneCount(GroupId:id);
* @param number Index from 0 to N-1, from GetAdmGroupImmuneCount(). * @param number Index from 0 to N-1, from GetAdmGroupImmuneCount().
* @return GroupId that this group is immune to, or INVALID_GROUP_ID on failure. * @return GroupId that this group is immune to, or INVALID_GROUP_ID on failure.
*/ */
native GroupId:GetAdmGroupImmuneFrom(GroupId:id, number); native GroupId GetAdmGroupImmuneFrom(GroupId id, int number);
/** /**
* Adds a group-specific override type. * Adds a group-specific override type.
@ -305,9 +454,8 @@ native GroupId:GetAdmGroupImmuneFrom(GroupId:id, number);
* @param name String containing command name (case sensitive). * @param name String containing command name (case sensitive).
* @param type Override type (specific command or group). * @param type Override type (specific command or group).
* @param rule Override allow/deny setting. * @param rule Override allow/deny setting.
* @noreturn
*/ */
native AddAdmGroupCmdOverride(GroupId:id, const String:name[], OverrideType:type, OverrideRule:rule); native void AddAdmGroupCmdOverride(GroupId id, const char[] name, OverrideType type, OverrideRule rule);
/** /**
* Retrieves a group-specific command override. * Retrieves a group-specific command override.
@ -318,16 +466,15 @@ native AddAdmGroupCmdOverride(GroupId:id, const String:name[], OverrideType:type
* @param rule Optional pointer to store allow/deny setting. * @param rule Optional pointer to store allow/deny setting.
* @return True if an override exists, false otherwise. * @return True if an override exists, false otherwise.
*/ */
native bool:GetAdmGroupCmdOverride(GroupId:id, const String:name[], OverrideType:type, &OverrideRule:rule); native bool GetAdmGroupCmdOverride(GroupId id, const char[] name, OverrideType type, OverrideRule &rule);
/** /**
* Registers an authentication identity type. You normally never need to call this except for * Registers an authentication identity type. You normally never need to call this except for
* very specific systems. * very specific systems.
* *
* @param name Codename to use for your authentication type. * @param name Codename to use for your authentication type.
* @noreturn
*/ */
native RegisterAuthIdentType(const String:name[]); native void RegisterAuthIdentType(const char[] name);
/** /**
* Creates a new admin entry in the permissions cache. * Creates a new admin entry in the permissions cache.
@ -335,7 +482,7 @@ native RegisterAuthIdentType(const String:name[]);
* @param name Name for this entry (does not have to be unique). * @param name Name for this entry (does not have to be unique).
* Specify an empty string for an anonymous admin. * Specify an empty string for an anonymous admin.
*/ */
native AdminId:CreateAdmin(const String:name[]=""); native AdminId CreateAdmin(const char[] name="");
/** /**
* Retrieves an admin's user name as made with CreateAdmin(). * Retrieves an admin's user name as made with CreateAdmin().
@ -347,7 +494,7 @@ native AdminId:CreateAdmin(const String:name[]="");
* @param maxlength Maximum size of string buffer. * @param maxlength Maximum size of string buffer.
* @return Number of bytes written. * @return Number of bytes written.
*/ */
native GetAdminUsername(AdminId:id, String:name[], maxlength); native int GetAdminUsername(AdminId id, char[] name, int maxlength);
/** /**
* Binds an admin to an identity for fast lookup later on. The bind must be unique. * Binds an admin to an identity for fast lookup later on. The bind must be unique.
@ -358,7 +505,7 @@ native GetAdminUsername(AdminId:id, String:name[], maxlength);
* @return True on success, false if the auth method was not found, * @return True on success, false if the auth method was not found,
* ident was already taken, or ident invalid for auth method. * ident was already taken, or ident invalid for auth method.
*/ */
native bool:BindAdminIdentity(AdminId:id, const String:auth[], const String:ident[]); native bool BindAdminIdentity(AdminId id, const char[] auth, const char[] ident);
/** /**
* Sets whether or not a flag is enabled on an admin. * Sets whether or not a flag is enabled on an admin.
@ -366,9 +513,8 @@ native bool:BindAdminIdentity(AdminId:id, const String:auth[], const String:iden
* @param id AdminId index of the admin. * @param id AdminId index of the admin.
* @param flag Admin flag to use. * @param flag Admin flag to use.
* @param enabled True to enable, false to disable. * @param enabled True to enable, false to disable.
* @noreturn
*/ */
native SetAdminFlag(AdminId:id, AdminFlag:flag, bool:enabled); native void SetAdminFlag(AdminId id, AdminFlag flag, bool enabled);
/** /**
* Returns whether or not a flag is enabled on an admin. * Returns whether or not a flag is enabled on an admin.
@ -378,7 +524,7 @@ native SetAdminFlag(AdminId:id, AdminFlag:flag, bool:enabled);
* @param mode Access mode to check. * @param mode Access mode to check.
* @return True if enabled, false otherwise. * @return True if enabled, false otherwise.
*/ */
native bool:GetAdminFlag(AdminId:id, AdminFlag:flag, AdmAccessMode:mode=Access_Effective); native bool GetAdminFlag(AdminId id, AdminFlag flag, AdmAccessMode mode=Access_Effective);
/** /**
* Returns the bitstring of access flags on an admin. * Returns the bitstring of access flags on an admin.
@ -387,7 +533,7 @@ native bool:GetAdminFlag(AdminId:id, AdminFlag:flag, AdmAccessMode:mode=Access_E
* @param mode Access mode to use. * @param mode Access mode to use.
* @return A bitstring containing which flags are enabled. * @return A bitstring containing which flags are enabled.
*/ */
native GetAdminFlags(AdminId:id, AdmAccessMode:mode); native int GetAdminFlags(AdminId id, AdmAccessMode mode);
/** /**
* Adds a group to an admin's inherited group list. Any flags the group has * Adds a group to an admin's inherited group list. Any flags the group has
@ -397,7 +543,7 @@ native GetAdminFlags(AdminId:id, AdmAccessMode:mode);
* @param gid GroupId index of the group. * @param gid GroupId index of the group.
* @return True on success, false on invalid input or duplicate membership. * @return True on success, false on invalid input or duplicate membership.
*/ */
native bool:AdminInheritGroup(AdminId:id, GroupId:gid); native bool AdminInheritGroup(AdminId id, GroupId gid);
/** /**
* Returns the number of groups this admin is a member of. * Returns the number of groups this admin is a member of.
@ -405,7 +551,7 @@ native bool:AdminInheritGroup(AdminId:id, GroupId:gid);
* @param id AdminId index of the admin. * @param id AdminId index of the admin.
* @return Number of groups this admin is a member of. * @return Number of groups this admin is a member of.
*/ */
native GetAdminGroupCount(AdminId:id); native int GetAdminGroupCount(AdminId id);
/** /**
* Returns group information from an admin. * Returns group information from an admin.
@ -418,17 +564,16 @@ native GetAdminGroupCount(AdminId:id);
* @param maxlength Maximum size of the output name buffer. * @param maxlength Maximum size of the output name buffer.
* @return A GroupId index and a name pointer, or * @return A GroupId index and a name pointer, or
* INVALID_GROUP_ID and NULL if an error occurred. * INVALID_GROUP_ID and NULL if an error occurred.
*/ */
native GroupId:GetAdminGroup(AdminId:id, index, const String:name[], maxlength); native GroupId GetAdminGroup(AdminId id, int index, const char[] name, int maxlength);
/** /**
* Sets a password on an admin. * Sets a password on an admin.
* *
* @param id AdminId index of the admin. * @param id AdminId index of the admin.
* @param password String containing the password. * @param password String containing the password.
* @noreturn
*/ */
native SetAdminPassword(AdminId:id, const String:password[]); native void SetAdminPassword(AdminId id, const char[] password);
/** /**
* Gets an admin's password. * Gets an admin's password.
@ -439,7 +584,7 @@ native SetAdminPassword(AdminId:id, const String:password[]);
* Note: This will safely chop UTF-8 strings. * Note: This will safely chop UTF-8 strings.
* @return True if there was a password set, false otherwise. * @return True if there was a password set, false otherwise.
*/ */
native bool:GetAdminPassword(AdminId:id, String:buffer[]="", maxlength=0); native bool GetAdminPassword(AdminId id, char buffer[]="", int maxlength=0);
/** /**
* Attempts to find an admin by an auth method and an identity. * Attempts to find an admin by an auth method and an identity.
@ -448,7 +593,7 @@ native bool:GetAdminPassword(AdminId:id, String:buffer[]="", maxlength=0);
* @param identity Identity string to look up. * @param identity Identity string to look up.
* @return An AdminId index if found, INVALID_ADMIN_ID otherwise. * @return An AdminId index if found, INVALID_ADMIN_ID otherwise.
*/ */
native AdminId:FindAdminByIdentity(const String:auth[], const String:identity[]); native AdminId FindAdminByIdentity(const char[] auth, const char[] identity);
/** /**
* Removes an admin entry from the cache. * Removes an admin entry from the cache.
@ -458,7 +603,7 @@ native AdminId:FindAdminByIdentity(const String:auth[], const String:identity[])
* @param id AdminId index to remove/invalidate. * @param id AdminId index to remove/invalidate.
* @return True on success, false otherwise. * @return True on success, false otherwise.
*/ */
native bool:RemoveAdmin(AdminId:id); native bool RemoveAdmin(AdminId id);
/** /**
* Converts a flag bit string to a bit array. * Converts a flag bit string to a bit array.
@ -468,7 +613,7 @@ native bool:RemoveAdmin(AdminId:id);
* @param maxSize Maximum number of flags the array can store. * @param maxSize Maximum number of flags the array can store.
* @return Number of flags written. * @return Number of flags written.
*/ */
native FlagBitsToBitArray(bits, bool:array[], maxSize); native int FlagBitsToBitArray(int bits, bool[] array, int maxSize);
/** /**
* Converts a flag array to a bit string. * Converts a flag array to a bit string.
@ -477,7 +622,7 @@ native FlagBitsToBitArray(bits, bool:array[], maxSize);
* @param maxSize Maximum size of the flag array. * @param maxSize Maximum size of the flag array.
* @return A bit string composed of the array bits. * @return A bit string composed of the array bits.
*/ */
native FlagBitArrayToBits(const bool:array[], maxSize); native int FlagBitArrayToBits(const bool[] array, int maxSize);
/** /**
* Converts an array of flags to bits. * Converts an array of flags to bits.
@ -486,7 +631,7 @@ native FlagBitArrayToBits(const bool:array[], maxSize);
* @param numFlags Number of flags in the array. * @param numFlags Number of flags in the array.
* @return A bit string composed of the array flags. * @return A bit string composed of the array flags.
*/ */
native FlagArrayToBits(const AdminFlag:array[], numFlags); native int FlagArrayToBits(const AdminFlag[] array, int numFlags);
/** /**
* Converts a bit string to an array of flags. * Converts a bit string to an array of flags.
@ -496,7 +641,7 @@ native FlagArrayToBits(const AdminFlag:array[], numFlags);
* @param maxSize Maximum size of the flag array. * @param maxSize Maximum size of the flag array.
* @return Number of flags written. * @return Number of flags written.
*/ */
native FlagBitsToArray(bits, AdminFlag:array[], maxSize); native int FlagBitsToArray(int bits, AdminFlag[] array, int maxSize);
/** /**
* Finds a flag by its string name. * Finds a flag by its string name.
@ -505,7 +650,7 @@ native FlagBitsToArray(bits, AdminFlag:array[], maxSize);
* @param flag Variable to store flag in. * @param flag Variable to store flag in.
* @return True on success, false if not found. * @return True on success, false if not found.
*/ */
native bool:FindFlagByName(const String:name[], &AdminFlag:flag); native bool FindFlagByName(const char[] name, AdminFlag &flag);
/** /**
* Finds a flag by a given character. * Finds a flag by a given character.
@ -514,7 +659,7 @@ native bool:FindFlagByName(const String:name[], &AdminFlag:flag);
* @param flag Variable to store flag in. * @param flag Variable to store flag in.
* @return True on success, false if not found. * @return True on success, false if not found.
*/ */
native bool:FindFlagByChar(c, &AdminFlag:flag); native bool FindFlagByChar(int c, AdminFlag &flag);
/** /**
* Finds a flag char by a gived admin flag. * Finds a flag char by a gived admin flag.
@ -523,7 +668,7 @@ native bool:FindFlagByChar(c, &AdminFlag:flag);
* @param c Variable to store flag char. * @param c Variable to store flag char.
* @return True on success, false if not found. * @return True on success, false if not found.
*/ */
native bool:FindFlagChar(AdminFlag:flag, &c); native bool FindFlagChar(AdminFlag flag, int &c);
/** /**
* Converts a string of flag characters to a bit string. * Converts a string of flag characters to a bit string.
@ -532,7 +677,7 @@ native bool:FindFlagChar(AdminFlag:flag, &c);
* @param numchars Optional variable to store the number of bytes read. * @param numchars Optional variable to store the number of bytes read.
* @return Bit string of ADMFLAG values. * @return Bit string of ADMFLAG values.
*/ */
native ReadFlagString(const String:flags[], &numchars=0); native int ReadFlagString(const char[] flags, int &numchars=0);
/** /**
* Tests whether one admin can target another. * Tests whether one admin can target another.
@ -553,7 +698,7 @@ native ReadFlagString(const String:flags[], &numchars=0);
* @param target Target admin (may be INVALID_ADMIN_ID). * @param target Target admin (may be INVALID_ADMIN_ID).
* @return True if targetable, false if immune. * @return True if targetable, false if immune.
*/ */
native CanAdminTarget(AdminId:admin, AdminId:target); native bool CanAdminTarget(AdminId admin, AdminId target);
/** /**
* Creates an admin auth method. This does not need to be called more than once * Creates an admin auth method. This does not need to be called more than once
@ -562,7 +707,7 @@ native CanAdminTarget(AdminId:admin, AdminId:target);
* @param method Name of the authentication method. * @param method Name of the authentication method.
* @return True on success, false on failure. * @return True on success, false on failure.
*/ */
native bool:CreateAuthMethod(const String:method[]); native bool CreateAuthMethod(const char[] method);
/** /**
* Sets a group's immunity level. * Sets a group's immunity level.
@ -571,7 +716,7 @@ native bool:CreateAuthMethod(const String:method[]);
* @param level Immunity level value. * @param level Immunity level value.
* @return Old immunity level value. * @return Old immunity level value.
*/ */
native SetAdmGroupImmunityLevel(GroupId:gid, level); native int SetAdmGroupImmunityLevel(GroupId gid, int level);
/** /**
* Gets a group's immunity level (defaults to 0). * Gets a group's immunity level (defaults to 0).
@ -579,7 +724,7 @@ native SetAdmGroupImmunityLevel(GroupId:gid, level);
* @param gid Group Id. * @param gid Group Id.
* @return Immunity level value. * @return Immunity level value.
*/ */
native GetAdmGroupImmunityLevel(GroupId:gid); native int GetAdmGroupImmunityLevel(GroupId gid);
/** /**
* Sets an admin's immunity level. * Sets an admin's immunity level.
@ -588,7 +733,7 @@ native GetAdmGroupImmunityLevel(GroupId:gid);
* @param level Immunity level value. * @param level Immunity level value.
* @return Old immunity level value. * @return Old immunity level value.
*/ */
native SetAdminImmunityLevel(AdminId:id, level); native int SetAdminImmunityLevel(AdminId id, int level);
/** /**
* Gets an admin's immunity level. * Gets an admin's immunity level.
@ -596,7 +741,7 @@ native SetAdminImmunityLevel(AdminId:id, level);
* @param id Admin Id. * @param id Admin Id.
* @return Immunity level value. * @return Immunity level value.
*/ */
native GetAdminImmunityLevel(AdminId:id); native int GetAdminImmunityLevel(AdminId id);
/** /**
* Converts a flag to its single bit. * Converts a flag to its single bit.
@ -604,9 +749,9 @@ native GetAdminImmunityLevel(AdminId:id);
* @param flag Flag to convert. * @param flag Flag to convert.
* @return Bit representation of the flag. * @return Bit representation of the flag.
*/ */
stock FlagToBit(AdminFlag:flag) stock int FlagToBit(AdminFlag flag)
{ {
return (1<<_:flag); return (1 << view_as<int>(flag));
} }
/** /**
@ -616,9 +761,9 @@ stock FlagToBit(AdminFlag:flag)
* @param flag Stores the converted flag by reference. * @param flag Stores the converted flag by reference.
* @return True on success, false otherwise. * @return True on success, false otherwise.
*/ */
stock bool:BitToFlag(bit, &AdminFlag:flag) stock bool BitToFlag(int bit, AdminFlag &flag)
{ {
new AdminFlag:array[1]; AdminFlag array[1];
if (FlagBitsToArray(bit, array, 1)) if (FlagBitsToArray(bit, array, 1))
{ {

2
public/IForwardSys.h
View File

@ -171,7 +171,7 @@ namespace SourceMod
* @param filter Do not use. * @param filter Do not use.
* @return Error code, if any. * @return Error code, if any.
*/ */
virtual int Execute(cell_t *result, IForwardFilter *filter=NULL) =0; virtual int Execute(cell_t *result=NULL, IForwardFilter *filter=NULL) =0;
/** /**
* @brief Pushes an array of cells onto the current call. Different rules than ICallable. * @brief Pushes an array of cells onto the current call. Different rules than ICallable.