GitHub/amxmodx
2
0
Fork 0
mirror of https://github.com/alliedmodders/amxmodx.git synced 2025-01-26 13:48:03 +03:00
Code Issues Projects Releases Wiki Activity

Update admin.sma

Browse Source 
we free, memory ;)
This commit is contained in:
pepepepito0147 2023-07-06 08:29:44 -04:00 committed by GitHub
parent b84fe70b61
commit edf2e7ba2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 280 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

278
plugins/admin.sma
View File

@ -20,9 +20,9 @@
#include <sqlx> #include <sqlx>
#endif #endif
//new Vector:AdminList; //new Vector:AdminList
new AdminCount; new AdminCount
new PLUGINNAME[] = "AMX Mod X" new PLUGINNAME[] = "AMX Mod X"
@ -34,12 +34,12 @@ new const g_users_ini[] = "users.ini"
#define ADMIN_IPADDR (1<<3) #define ADMIN_IPADDR (1<<3)
#define ADMIN_NAME (1<<4) #define ADMIN_NAME (1<<4)
new bool:g_CaseSensitiveName[MAX_PLAYERS + 1]; new bool:g_CaseSensitiveName[MAX_PLAYERS + 1]
// pcvars // pcvars
new amx_mode; new amx_mode
new amx_password_field; new amx_password_field
new amx_default_access; new amx_default_access
public plugin_init() public plugin_init()
{ {
@ -50,6 +50,7 @@ public plugin_init()
#endif #endif
register_dictionary("admin.txt") register_dictionary("admin.txt")
register_dictionary("common.txt") register_dictionary("common.txt")
amx_mode = register_cvar("amx_mode", "1", FCVAR_PROTECTED) amx_mode = register_cvar("amx_mode", "1", FCVAR_PROTECTED)
amx_password_field = register_cvar("amx_password_field", "_pw", FCVAR_PROTECTED) amx_password_field = register_cvar("amx_password_field", "_pw", FCVAR_PROTECTED)
amx_default_access = register_cvar("amx_default_access", "", FCVAR_PROTECTED) amx_default_access = register_cvar("amx_default_access", "", FCVAR_PROTECTED)
@ -83,25 +84,28 @@ public plugin_init()
remove_user_flags(0, read_flags("z")) // Remove 'user' flag from server rights remove_user_flags(0, read_flags("z")) // Remove 'user' flag from server rights
new configsDir[MAX_RESOURCE_PATH_LENGTH] new configsDir[MAX_RESOURCE_PATH_LENGTH]
get_configsdir(configsDir, charsmax(configsDir)) get_configsdir(configsDir, charsmax(configsDir))
server_cmd("exec %s/sql.cfg", configsDir) server_cmd("exec %s/sql.cfg", configsDir)
// Create a vector of 5 cells to store the info. // Create a vector of 5 cells to store the info.
//AdminList=vector_create(5); //AdminList=vector_create(5)
#if defined USING_SQL #if defined USING_SQL
server_cmd("amx_sqladmins") server_cmd("amx_sqladmins")
#else #else
formatex(configsDir, charsmax(configsDir), "%s/%s", configsDir, g_users_ini) formatex(configsDir, charsmax(configsDir), "%s/%s", configsDir, g_users_ini)
loadSettings(configsDir) // Load admins accounts loadSettings(configsDir) // Load admins accounts
#endif #endif
} }
public client_connect(id) public client_connect(id)
{ {
g_CaseSensitiveName[id] = false; g_CaseSensitiveName[id] = false
} }
public addadminfn(id, level, cid) public addadminfn(id, level, cid)
{ {
if( !cmd_access(id, level, cid, 3) ) if( !cmd_access(id, level, cid, 3) )
@ -111,7 +115,8 @@ public addadminfn(id, level, cid)
if(read_argc() >= 5) if(read_argc() >= 5)
{ {
static t_arg[MAX_PLAYERS] new t_arg[MAX_PLAYERS]
read_argv(4, t_arg, charsmax(t_arg)) read_argv(4, t_arg, charsmax(t_arg))
if(equali(t_arg, "steam") || equali(t_arg, "steamid") || equali(t_arg, "auth")) if(equali(t_arg, "steam") || equali(t_arg, "steamid") || equali(t_arg, "auth"))
@ -128,14 +133,19 @@ public addadminfn(id, level, cid)
if(equali(t_arg, "name")) if(equali(t_arg, "name"))
idtype |= ADMIN_LOOKUP idtype |= ADMIN_LOOKUP
} else { }
else
{
engclient_print(id, engprint_console, "[%s] Unknown id type ^"%s^", use one of: steamid, ip, name", PLUGINNAME, t_arg) engclient_print(id, engprint_console, "[%s] Unknown id type ^"%s^", use one of: steamid, ip, name", PLUGINNAME, t_arg)
return PLUGIN_HANDLED return PLUGIN_HANDLED
} }
} }
static arg[MAX_PLAYERS] new arg[MAX_PLAYERS]
read_argv(1, arg, charsmax(arg)) read_argv(1, arg, charsmax(arg))
new player = -1 new player = -1
if(idtype & ADMIN_STEAM) if(idtype & ADMIN_STEAM)
@ -143,23 +153,34 @@ public addadminfn(id, level, cid)
if(containi(arg, "STEAM_0:") == -1) if(containi(arg, "STEAM_0:") == -1)
{ {
idtype |= ADMIN_LOOKUP idtype |= ADMIN_LOOKUP
player = cmd_target(id, arg, CMDTARGET_ALLOW_SELF | CMDTARGET_NO_BOTS) player = cmd_target(id, arg, CMDTARGET_ALLOW_SELF | CMDTARGET_NO_BOTS)
} else { }
static _steamid[MAX_AUTHID_LENGTH] else
{
static _players[MAX_PLAYERS], _num, _pv static _players[MAX_PLAYERS], _num, _pv
new _steamid[MAX_AUTHID_LENGTH]
get_players(_players, _num) get_players(_players, _num)
for(new _i = 0; _i < _num; _i++) for(new _i = 0; _i < _num; _i++)
{ {
_pv = _players[_i] _pv = _players[_i]
get_user_authid(_pv, _steamid, charsmax(_steamid)) get_user_authid(_pv, _steamid, charsmax(_steamid))
if( !_steamid[0] ) if( !_steamid[0] )
continue continue
if(equal(_steamid, arg)) if(equal(_steamid, arg))
{ {
player = _pv player = _pv
break break
} }
} }
if(player < 1) if(player < 1)
{ {
idtype &= ~ADMIN_LOOKUP idtype &= ~ADMIN_LOOKUP
@ -178,7 +199,8 @@ public addadminfn(id, level, cid)
else if(idtype & ADMIN_IPADDR) else if(idtype & ADMIN_IPADDR)
{ {
new len = strlen(arg) new len = strlen(arg)
static dots, chars
new dots, chars
for(new i = 0; i < len; i++) for(new i = 0; i < len; i++)
{ {
@ -191,13 +213,16 @@ public addadminfn(id, level, cid)
break break
chars = 0 chars = 0
} else { }
else
{
chars++ chars++
} }
if(dots != 3 || !chars || chars > 3) if(dots != 3 || !chars || chars > 3)
{ {
idtype |= ADMIN_LOOKUP idtype |= ADMIN_LOOKUP
player = find_player("dh", arg) player = find_player("dh", arg)
} }
} }
@ -206,22 +231,29 @@ public addadminfn(id, level, cid)
if(idtype & ADMIN_LOOKUP && !player) if(idtype & ADMIN_LOOKUP && !player)
{ {
engclient_print(id, engprint_console, "%L", id, "CL_NOT_FOUND") engclient_print(id, engprint_console, "%L", id, "CL_NOT_FOUND")
return PLUGIN_HANDLED return PLUGIN_HANDLED
} }
static flags[MAX_PLAYERS] new flags[MAX_PLAYERS]
read_argv(2, flags, charsmax(flags)) read_argv(2, flags, charsmax(flags))
static password[MAX_PLAYERS] new password[MAX_PLAYERS]
if (read_argc() >= 4) {
if(read_argc() >= 4)
{
read_argv(3, password, charsmax(password)) read_argv(3, password, charsmax(password))
} }
static auth[MAX_AUTHID_LENGTH] new auth[MAX_AUTHID_LENGTH]
static Comment[MAX_NAME_LENGTH]; // name of player to pass to comment field
new Comment[MAX_NAME_LENGTH] // name of player to pass to comment field
if(idtype & ADMIN_LOOKUP) if(idtype & ADMIN_LOOKUP)
{ {
get_user_name(player, Comment, charsmax(Comment)) get_user_name(player, Comment, charsmax(Comment))
if(idtype & ADMIN_STEAM) if(idtype & ADMIN_STEAM)
{ {
get_user_authid(player, auth, charsmax(auth)) get_user_authid(player, auth, charsmax(auth))
@ -234,11 +266,13 @@ public addadminfn(id, level, cid)
{ {
get_user_name(player, auth, charsmax(auth)) get_user_name(player, auth, charsmax(auth))
} }
} else { }
else
{
copy(auth, charsmax(auth), arg) copy(auth, charsmax(auth), arg)
} }
static type[MAX_PLAYERS / 2], len new type[MAX_PLAYERS / 2], len
if(idtype & ADMIN_STEAM) if(idtype & ADMIN_STEAM)
len += formatex(type[len], charsmax(type) - len, "c") len += formatex(type[len], charsmax(type) - len, "c")
@ -251,12 +285,15 @@ public addadminfn(id, level, cid)
len += formatex(type[len], charsmax(type) - len, "e") len += formatex(type[len], charsmax(type) - len, "e")
AddAdmin(id, auth, flags, password, type, Comment) AddAdmin(id, auth, flags, password, type, Comment)
cmdReload(id, ADMIN_CFG, 0) cmdReload(id, ADMIN_CFG, 0)
if(player > 0) if(player > 0)
{ {
static name[MAX_NAME_LENGTH] new name[MAX_NAME_LENGTH]
get_user_info(player, "name", name, charsmax(name)) get_user_info(player, "name", name, charsmax(name))
accessUser(player, name) accessUser(player, name)
} }
@ -266,9 +303,10 @@ public addadminfn(id, level, cid)
AddAdmin(id, auth[], accessflags[], password[], flags[], comment[]="") AddAdmin(id, auth[], accessflags[], password[], flags[], comment[]="")
{ {
#if defined USING_SQL #if defined USING_SQL
static error[MAX_RESOURCE_PATH_LENGTH * 2], errno new error[MAX_RESOURCE_PATH_LENGTH * 2], errno
new Handle:info = SQL_MakeStdTuple() new Handle:info = SQL_MakeStdTuple()
new Handle:sql = SQL_Connect(info, errno, error, charsmax(error)) new Handle:sql = SQL_Connect(info, errno, error, charsmax(error))
if(sql == Empty_Handle) if(sql == Empty_Handle)
@ -277,20 +315,23 @@ AddAdmin(id, auth[], accessflags[], password[], flags[], comment[]="")
//backup to users.ini //backup to users.ini
#endif #endif
// Make sure that the users.ini file exists. // Make sure that the users.ini file exists.
static configsDir[MAX_RESOURCE_PATH_LENGTH] new configsDir[MAX_RESOURCE_PATH_LENGTH]
get_configsdir(configsDir, charsmax(configsDir)) get_configsdir(configsDir, charsmax(configsDir))
formatex(configsDir, charsmax(configsDir), "%s/%s", configsDir, g_users_ini) formatex(configsDir, charsmax(configsDir), "%s/%s", configsDir, g_users_ini)
if( !file_exists(configsDir) ) if( !file_exists(configsDir) )
{ {
engclient_print(id, engprint_console, "[%s] File ^"%s^" doesn't exist.", PLUGINNAME, configsDir) engclient_print(id, engprint_console, "[%s] File ^"%s^" doesn't exist.", PLUGINNAME, configsDir)
return return
} }
// Make sure steamid isn't already in file. // Make sure steamid isn't already in file.
static line = 0, textline[MAX_USER_INFO_LENGTH], len new line = 0, textline[MAX_USER_INFO_LENGTH], len
static line_steamid[MAX_RESOURCE_PATH_LENGTH], line_password[MAX_RESOURCE_PATH_LENGTH], line_accessflags[MAX_RESOURCE_PATH_LENGTH], line_flags[MAX_RESOURCE_PATH_LENGTH], parsedParams new line_steamid[MAX_RESOURCE_PATH_LENGTH], line_password[MAX_RESOURCE_PATH_LENGTH], line_accessflags[MAX_RESOURCE_PATH_LENGTH], line_flags[MAX_RESOURCE_PATH_LENGTH], parsedParams
// <name|ip|steamid> <password> <access flags> <account flags> // <name|ip|steamid> <password> <access flags> <account flags>
while((line = read_file(configsDir, line, textline, charsmax(textline), len))) while((line = read_file(configsDir, line, textline, charsmax(textline), len)))
@ -306,12 +347,13 @@ AddAdmin(id, auth[], accessflags[], password[], flags[], comment[]="")
if(containi(line_flags, flags) != -1 && equal(line_steamid, auth)) if(containi(line_flags, flags) != -1 && equal(line_steamid, auth))
{ {
engclient_print(id, engprint_console, "[%s] %s already exists!", PLUGINNAME, auth) engclient_print(id, engprint_console, "[%s] %s already exists!", PLUGINNAME, auth)
return return
} }
} }
// If we came here, steamid doesn't exist in users.ini. Add it. // If we came here, steamid doesn't exist in users.ini. Add it.
static linetoadd[MAX_MENU_LENGTH] new linetoadd[MAX_MENU_LENGTH]
if(comment[0] == 0) if(comment[0] == 0)
{ {
@ -319,8 +361,9 @@ AddAdmin(id, auth[], accessflags[], password[], flags[], comment[]="")
} }
else else
{ {
formatex(linetoadd, charsmax(linetoadd), "^r^n^"%s^" ^"%s^" ^"%s^" ^"%s^" ; %s", auth, password, accessflags, flags, comment) formatex(linetoadd, charsmax(linetoadd), "^r^n^"%s^" ^"%s^" ^"%s^" ^"%s^" %s", auth, password, accessflags, flags, comment)
} }
engclient_print(id, engprint_console, "Adding:^n%s", linetoadd) engclient_print(id, engprint_console, "Adding:^n%s", linetoadd)
if( !write_file(configsDir, linetoadd) ) if( !write_file(configsDir, linetoadd) )
@ -328,7 +371,7 @@ AddAdmin(id, auth[], accessflags[], password[], flags[], comment[]="")
#if defined USING_SQL #if defined USING_SQL
} }
static table[MAX_PLAYERS] new table[MAX_PLAYERS]
get_cvar_string("amx_sql_table", table, charsmax(table)) get_cvar_string("amx_sql_table", table, charsmax(table))
@ -337,11 +380,17 @@ AddAdmin(id, auth[], accessflags[], password[], flags[], comment[]="")
if( !SQL_Execute(query) ) if( !SQL_Execute(query) )
{ {
SQL_QueryError(query, error, charsmax(error)) SQL_QueryError(query, error, charsmax(error))
server_print("[AMXX] %L", LANG_SERVER, "SQL_CANT_LOAD_ADMINS", error) server_print("[AMXX] %L", LANG_SERVER, "SQL_CANT_LOAD_ADMINS", error)
engclient_print(id, engprint_console, "[AMXX] %L", LANG_SERVER, "SQL_CANT_LOAD_ADMINS", error) engclient_print(id, engprint_console, "[AMXX] %L", LANG_SERVER, "SQL_CANT_LOAD_ADMINS", error)
} else if (SQL_NumResults(query)) { }
else if(SQL_NumResults(query))
{
engclient_print(id, engprint_console, "[%s] %s already exists!", PLUGINNAME, auth) engclient_print(id, engprint_console, "[%s] %s already exists!", PLUGINNAME, auth)
} else { }
else
{
engclient_print(id, engprint_console, "Adding to database:^n^"%s^" ^"%s^" ^"%s^" ^"%s^"", auth, password, accessflags, flags) engclient_print(id, engprint_console, "Adding to database:^n^"%s^" ^"%s^" ^"%s^" ^"%s^"", auth, password, accessflags, flags)
SQL_QueryAndIgnore(sql, "REPLACE INTO `%s` (`auth`, `password`, `access`, `flags`) VALUES ('%s', '%s', '%s', '%s')", table, auth, password, accessflags, flags) SQL_QueryAndIgnore(sql, "REPLACE INTO `%s` (`auth`, `password`, `access`, `flags`) VALUES ('%s', '%s', '%s', '%s')", table, auth, password, accessflags, flags)
@ -356,63 +405,64 @@ AddAdmin(id, auth[], accessflags[], password[], flags[], comment[]="")
loadSettings(szFilename[]) loadSettings(szFilename[])
{ {
static File; File=fopen(szFilename,"r"); new File = fopen(szFilename, "r")
if(File) if(File)
{ {
static Text[MAX_MENU_LENGTH]; new Text[MAX_MENU_LENGTH]
static Flags[MAX_PLAYERS]; new Flags[MAX_PLAYERS]
static Access[MAX_PLAYERS] new Access[MAX_PLAYERS]
static AuthData[MAX_AUTHID_LENGTH]; new AuthData[MAX_AUTHID_LENGTH]
static Password[MAX_PLAYERS]; new Password[MAX_PLAYERS]
while(fgets(File, Text, charsmax(Text))) while(fgets(File, Text, charsmax(Text)))
{ {
trim(Text); trim(Text)
// comment // comment
if(Text[0] == ';') if(Text[0] == ';')
{ {
continue; continue
} }
Flags[0]=0; Flags[0] = 0
Access[0]=0; Access[0] = 0
AuthData[0]=0; AuthData[0] = 0
Password[0]=0; Password[0] = 0
// not enough parameters // not enough parameters
if(parse(Text, AuthData, charsmax(AuthData), Password, charsmax(Password), Access, charsmax(Access), Flags, charsmax(Flags)) < 2) if(parse(Text, AuthData, charsmax(AuthData), Password, charsmax(Password), Access, charsmax(Access), Flags, charsmax(Flags)) < 2)
{ {
continue; continue
} }
admins_push(AuthData,Password,read_flags(Access),read_flags(Flags)); admins_push(AuthData, Password, read_flags(Access), read_flags(Flags))
AdminCount++; AdminCount++
} }
fclose(File); fclose(File)
} }
if(AdminCount == 1) if(AdminCount == 1)
{ {
server_print("[AMXX] %L", LANG_SERVER, "LOADED_ADMIN"); server_print("[AMXX] %L", LANG_SERVER, "LOADED_ADMIN")
} }
else else
{ {
server_print("[AMXX] %L", LANG_SERVER, "LOADED_ADMINS", AdminCount); server_print("[AMXX] %L", LANG_SERVER, "LOADED_ADMINS", AdminCount)
} }
return 1; return 1
} }
#if defined USING_SQL #if defined USING_SQL
public adminSql() public adminSql()
{ {
static table[MAX_PLAYERS], error[MAX_RESOURCE_PATH_LENGTH * 2], type[12], errno new table[MAX_PLAYERS], error[MAX_RESOURCE_PATH_LENGTH * 2], type[12], errno
new Handle:info = SQL_MakeStdTuple() new Handle:info = SQL_MakeStdTuple()
new Handle:sql = SQL_Connect(info, errno, error, charsmax(error)) new Handle:sql = SQL_Connect(info, errno, error, charsmax(error))
get_cvar_string("amx_sql_table", table, charsmax(table)) get_cvar_string("amx_sql_table", table, charsmax(table))
@ -424,10 +474,12 @@ public adminSql()
server_print("[AMXX] %L", LANG_SERVER, "SQL_CANT_CON", error) server_print("[AMXX] %L", LANG_SERVER, "SQL_CANT_CON", error)
//backup to users.ini //backup to users.ini
static configsDir[MAX_RESOURCE_PATH_LENGTH] new configsDir[MAX_RESOURCE_PATH_LENGTH]
get_configsdir(configsDir, charsmax(configsDir)) get_configsdir(configsDir, charsmax(configsDir))
formatex(configsDir, charsmax(configsDir), "%s/%s", configsDir, g_users_ini) formatex(configsDir, charsmax(configsDir), "%s/%s", configsDir, g_users_ini)
loadSettings(configsDir) // Load admins accounts loadSettings(configsDir) // Load admins accounts
return PLUGIN_HANDLED return PLUGIN_HANDLED
@ -443,19 +495,26 @@ public adminSql()
} }
query = SQL_PrepareQuery(sql, "SELECT auth, password, access, flags FROM %s", table) query = SQL_PrepareQuery(sql, "SELECT auth, password, access, flags FROM %s", table)
} else { }
else
{
SQL_QueryAndIgnore(sql, "CREATE TABLE IF NOT EXISTS `%s` ( `auth` VARCHAR( 32 ) NOT NULL, `password` VARCHAR( 32 ) NOT NULL, `access` VARCHAR( 32 ) NOT NULL, `flags` VARCHAR( 32 ) NOT NULL ) COMMENT = 'AMX Mod X Admins'", table) SQL_QueryAndIgnore(sql, "CREATE TABLE IF NOT EXISTS `%s` ( `auth` VARCHAR( 32 ) NOT NULL, `password` VARCHAR( 32 ) NOT NULL, `access` VARCHAR( 32 ) NOT NULL, `flags` VARCHAR( 32 ) NOT NULL ) COMMENT = 'AMX Mod X Admins'", table)
query = SQL_PrepareQuery(sql,"SELECT `auth`,`password`,`access`,`flags` FROM `%s`", table) query = SQL_PrepareQuery(sql,"SELECT `auth`,`password`,`access`,`flags` FROM `%s`", table)
} }
if( !SQL_Execute(query) ) if( !SQL_Execute(query) )
{ {
SQL_QueryError(query, error, charsmax(error)) SQL_QueryError(query, error, charsmax(error))
server_print("[AMXX] %L", LANG_SERVER, "SQL_CANT_LOAD_ADMINS", error)
} else if (!SQL_NumResults(query)) {
server_print("[AMXX] %L", LANG_SERVER, "NO_ADMINS")
} else {
server_print("[AMXX] %L", LANG_SERVER, "SQL_CANT_LOAD_ADMINS", error)
}
else if( !SQL_NumResults(query) )
{
server_print("[AMXX] %L", LANG_SERVER, "NO_ADMINS")
}
else
{
AdminCount = 0 AdminCount = 0
/** do this incase people change the query order and forget to modify below */ /** do this incase people change the query order and forget to modify below */
@ -464,21 +523,22 @@ public adminSql()
new qcolAccess = SQL_FieldNameToNum(query, "access") new qcolAccess = SQL_FieldNameToNum(query, "access")
new qcolFlags = SQL_FieldNameToNum(query, "flags") new qcolFlags = SQL_FieldNameToNum(query, "flags")
static AuthData[MAX_AUTHID_LENGTH]; new AuthData[MAX_AUTHID_LENGTH]
static Password[MAX_PLAYERS]; new Password[MAX_PLAYERS]
static Access[MAX_PLAYERS]; new Access[MAX_PLAYERS]
static Flags[MAX_PLAYERS]; new Flags[MAX_PLAYERS]
while(SQL_MoreResults(query)) while(SQL_MoreResults(query))
{ {
SQL_ReadResult(query, qcolAuth, AuthData, charsmax(AuthData)); SQL_ReadResult(query, qcolAuth, AuthData, charsmax(AuthData))
SQL_ReadResult(query, qcolPass, Password, charsmax(Password)); SQL_ReadResult(query, qcolPass, Password, charsmax(Password))
SQL_ReadResult(query, qcolAccess, Access, charsmax(Access)); SQL_ReadResult(query, qcolAccess, Access, charsmax(Access))
SQL_ReadResult(query, qcolFlags, Flags, charsmax(Flags)); SQL_ReadResult(query, qcolFlags, Flags, charsmax(Flags))
admins_push(AuthData,Password,read_flags(Access),read_flags(Flags)); admins_push(AuthData, Password, read_flags(Access), read_flags(Flags))
++AdminCount
++AdminCount;
SQL_NextRow(query) SQL_NextRow(query)
} }
@ -508,30 +568,33 @@ public cmdReload(id, level, cid)
//strip original flags (patch submitted by mrhunt) //strip original flags (patch submitted by mrhunt)
remove_user_flags(0, read_flags("z")) remove_user_flags(0, read_flags("z"))
admins_flush(); admins_flush()
#if !defined USING_SQL #if !defined USING_SQL
static filename[MAX_RESOURCE_PATH_LENGTH * 2] new configsDir[MAX_RESOURCE_PATH_LENGTH]
get_configsdir(filename, charsmax(filename)) get_configsdir(configsDir, charsmax(configsDir))
formatex(filename, charsmax(filename), "%s/%s", filename, g_users_ini)
AdminCount = 0; formatex(configsDir, charsmax(configsDir), "%s/%s", configsDir, g_users_ini)
loadSettings(filename); // Re-Load admins accounts
AdminCount = 0
loadSettings(configsDir) // Re-Load admins accounts
if(id != 0) if(id != 0)
{ {
if(AdminCount == 1) if(AdminCount == 1)
{ {
engclient_print(id, engprint_console, "[AMXX] %L", LANG_SERVER, "LOADED_ADMIN"); engclient_print(id, engprint_console, "[AMXX] %L", LANG_SERVER, "LOADED_ADMIN")
} }
else else
{ {
engclient_print(id, engprint_console, "[AMXX] %L", LANG_SERVER, "LOADED_ADMINS", AdminCount); engclient_print(id, engprint_console, "[AMXX] %L", LANG_SERVER, "LOADED_ADMINS", AdminCount)
} }
} }
#else #else
AdminCount = 0 AdminCount = 0
adminSql() adminSql()
if(id != 0) if(id != 0)
@ -544,12 +607,17 @@ public cmdReload(id, level, cid)
#endif #endif
static players[MAX_PLAYERS], num, pv static players[MAX_PLAYERS], num, pv
static name[MAX_NAME_LENGTH]
new name[MAX_NAME_LENGTH]
get_players(players, num) get_players(players, num)
for(new i = 0; i < num; i++) for(new i = 0; i < num; i++)
{ {
pv = players[i] pv = players[i]
get_user_name(pv, name, charsmax(name)) get_user_name(pv, name, charsmax(name))
accessUser(pv, name) accessUser(pv, name)
} }
@ -561,25 +629,28 @@ getAccess(id, name[], authid[], ip[], password[])
new index = -1 new index = -1
new result = 0 new result = 0
static Count; static Count
static Flags; static Flags
static Access; static Access
static AuthData[MAX_AUTHID_LENGTH]; static AuthData[MAX_AUTHID_LENGTH]
static Password[MAX_PLAYERS]; static Password[MAX_PLAYERS]
g_CaseSensitiveName[id] = false; g_CaseSensitiveName[id] = false
Count = admins_num()
Count=admins_num();
for(new i = 0; i < Count; ++i) for(new i = 0; i < Count; ++i)
{ {
Flags=admins_lookup(i,AdminProp_Flags); Flags = admins_lookup(i, AdminProp_Flags)
admins_lookup(i,AdminProp_Auth,AuthData,charsmax(AuthData));
admins_lookup(i, AdminProp_Auth, AuthData, charsmax(AuthData))
if(Flags & FLAG_AUTHID) if(Flags & FLAG_AUTHID)
{ {
if(equal(authid, AuthData)) if(equal(authid, AuthData))
{ {
index = i index = i
break break
} }
} }
@ -592,12 +663,14 @@ getAccess(id, name[], authid[], ip[], password[])
if(equal(AuthData, ip, c)) if(equal(AuthData, ip, c))
{ {
index = i index = i
break break
} }
} /* in other case an IP must just match */ } /* in other case an IP must just match */
else if(equal(ip, AuthData)) else if(equal(ip, AuthData))
{ {
index = i index = i
break break
} }
} }
@ -610,14 +683,18 @@ getAccess(id, name[], authid[], ip[], password[])
if(contain(name, AuthData) != -1) if(contain(name, AuthData) != -1)
{ {
index = i index = i
g_CaseSensitiveName[id] = true g_CaseSensitiveName[id] = true
break break
} }
} }
else if(equal(name, AuthData)) else if(equal(name, AuthData))
{ {
index = i index = i
g_CaseSensitiveName[id] = true g_CaseSensitiveName[id] = true
break break
} }
} }
@ -628,12 +705,14 @@ getAccess(id, name[], authid[], ip[], password[])
if(containi(name, AuthData) != -1) if(containi(name, AuthData) != -1)
{ {
index = i index = i
break break
} }
} }
else if(equali(name, AuthData)) else if(equali(name, AuthData))
{ {
index = i index = i
break break
} }
} }
@ -642,29 +721,32 @@ getAccess(id, name[], authid[], ip[], password[])
if(index != -1) if(index != -1)
{ {
Access=admins_lookup(index,AdminProp_Access); Access = admins_lookup(index, AdminProp_Access)
if(Flags & FLAG_NOPASS) if(Flags & FLAG_NOPASS)
{ {
result |= 8 result |= 8
static sflags[MAX_PLAYERS]
new sflags[MAX_PLAYERS]
get_flags(Access, sflags, charsmax(sflags)) get_flags(Access, sflags, charsmax(sflags))
set_user_flags(id, Access) set_user_flags(id, Access)
log_amx("Login: ^"%s<%d><%s><>^" became an admin (account ^"%s^") (access ^"%s^") (address ^"%s^")", name, get_user_userid(id), authid, AuthData, sflags, ip) log_amx("Login: ^"%s<%d><%s><>^" became an admin (account ^"%s^") (access ^"%s^") (address ^"%s^")", name, get_user_userid(id), authid, AuthData, sflags, ip)
} }
else else
{ {
admins_lookup(index, AdminProp_Password, Password, charsmax(Password))
admins_lookup(index,AdminProp_Password,Password,charsmax(Password));
if(equal(password, Password)) if(equal(password, Password))
{ {
result |= 12 result |= 12
set_user_flags(id, Access) set_user_flags(id, Access)
static sflags[MAX_PLAYERS] new sflags[MAX_PLAYERS]
get_flags(Access, sflags, charsmax(sflags)) get_flags(Access, sflags, charsmax(sflags))
log_amx("Login: ^"%s<%d><%s><>^" became an admin (account ^"%s^") (access ^"%s^") (address ^"%s^")", name, get_user_userid(id), authid, AuthData, sflags, ip) log_amx("Login: ^"%s<%d><%s><>^" became an admin (account ^"%s^") (access ^"%s^") (address ^"%s^")", name, get_user_userid(id), authid, AuthData, sflags, ip)
@ -676,6 +758,7 @@ getAccess(id, name[], authid[], ip[], password[])
if(Flags & FLAG_KICK) if(Flags & FLAG_KICK)
{ {
result |= 2 result |= 2
log_amx("Login: ^"%s<%d><%s><>^" kicked due to invalid password (account ^"%s^") (address ^"%s^")", name, get_user_userid(id), authid, AuthData, ip) log_amx("Login: ^"%s<%d><%s><>^" kicked due to invalid password (account ^"%s^") (address ^"%s^")", name, get_user_userid(id), authid, AuthData, ip)
} }
} }
@ -687,7 +770,7 @@ getAccess(id, name[], authid[], ip[], password[])
} }
else else
{ {
static defaccess[MAX_PLAYERS] new defaccess[MAX_PLAYERS]
get_pcvar_string(amx_default_access, defaccess, charsmax(defaccess)) get_pcvar_string(amx_default_access, defaccess, charsmax(defaccess))
@ -701,6 +784,7 @@ getAccess(id, name[], authid[], ip[], password[])
if(idefaccess) if(idefaccess)
{ {
result |= 8 result |= 8
set_user_flags(id, idefaccess) set_user_flags(id, idefaccess)
} }
} }
@ -712,9 +796,10 @@ accessUser(id, name[] = "")
{ {
remove_user_flags(id) remove_user_flags(id)
static userip[MAX_IP_LENGTH], userauthid[MAX_AUTHID_LENGTH], password[MAX_PLAYERS], passfield[MAX_PLAYERS], username[MAX_NAME_LENGTH] new userip[MAX_IP_LENGTH], userauthid[MAX_AUTHID_LENGTH], password[MAX_PLAYERS], passfield[MAX_PLAYERS], username[MAX_NAME_LENGTH]
get_user_ip(id, userip, charsmax(userip), 1) get_user_ip(id, userip, charsmax(userip), 1)
get_user_authid(id, userauthid, charsmax(userauthid)) get_user_authid(id, userauthid, charsmax(userauthid))
if(name[0]) if(name[0])
@ -727,6 +812,7 @@ accessUser(id, name[] = "")
} }
get_pcvar_string(amx_password_field, passfield, charsmax(passfield)) get_pcvar_string(amx_password_field, passfield, charsmax(passfield))
get_user_info(id, passfield, password, charsmax(password)) get_user_info(id, passfield, password, charsmax(password))
new result = getAccess(id, username, userauthid, userip, password) new result = getAccess(id, username, userauthid, userip, password)
@ -739,6 +825,7 @@ accessUser(id, name[] = "")
if(result & 2) if(result & 2)
{ {
server_cmd("kick #%d ^"%L^"", get_user_userid(id), id, "NO_ENTRY") server_cmd("kick #%d ^"%L^"", get_user_userid(id), id, "NO_ENTRY")
return PLUGIN_HANDLED return PLUGIN_HANDLED
} }
@ -762,7 +849,7 @@ public client_infochanged(id)
return PLUGIN_CONTINUE return PLUGIN_CONTINUE
} }
static newname[MAX_NAME_LENGTH], oldname[MAX_NAME_LENGTH] new newname[MAX_NAME_LENGTH], oldname[MAX_NAME_LENGTH]
get_user_name(id, oldname, charsmax(oldname)) get_user_name(id, oldname, charsmax(oldname))
get_user_info(id, "name", newname, charsmax(newname)) get_user_info(id, "name", newname, charsmax(newname))
@ -781,6 +868,7 @@ public client_infochanged(id)
accessUser(id, newname) accessUser(id, newname)
} }
} }
return PLUGIN_CONTINUE return PLUGIN_CONTINUE
} }