From 2ad557024e68f1084e66ecd27a4ed398a81b106e Mon Sep 17 00:00:00 2001 From: Borja Ferrer Date: Tue, 13 Sep 2005 01:00:19 +0000 Subject: [PATCH] more cleanups --- plugins/admin.sma | 709 ++++++++++++++++++++++++++-------------------- 1 file changed, 409 insertions(+), 300 deletions(-) diff --git a/plugins/admin.sma b/plugins/admin.sma index 533be2b2..2fe29ef4 100755 --- a/plugins/admin.sma +++ b/plugins/admin.sma @@ -60,56 +60,56 @@ new g_cmdLoopback[16] public plugin_init() { #if defined USING_SQL - register_plugin("Admin Base (SQL)",AMXX_VERSION_STR,"AMXX Dev Team") + register_plugin("Admin Base (SQL)", AMXX_VERSION_STR, "AMXX Dev Team") #else - register_plugin("Admin Base",AMXX_VERSION_STR,"AMXX Dev Team") + register_plugin("Admin Base", AMXX_VERSION_STR, "AMXX Dev Team") #endif - register_dictionary("admin.txt") - register_dictionary("common.txt") - register_cvar("amx_mode","1") - register_cvar("amx_password_field","_pw") - register_cvar("amx_default_access","") + register_dictionary("admin.txt") + register_dictionary("common.txt") + register_cvar("amx_mode", "1") + register_cvar("amx_password_field", "_pw") + register_cvar("amx_default_access", "") - register_cvar("amx_vote_ratio","0.02") - register_cvar("amx_vote_time","10") - register_cvar("amx_vote_answers","1") - register_cvar("amx_vote_delay","60") - register_cvar("amx_last_voting","0") - register_cvar("amx_show_activity","2") - register_cvar("amx_votekick_ratio","0.40") - register_cvar("amx_voteban_ratio","0.40") - register_cvar("amx_votemap_ratio","0.40") + register_cvar("amx_vote_ratio", "0.02") + register_cvar("amx_vote_time", "10") + register_cvar("amx_vote_answers", "1") + register_cvar("amx_vote_delay", "60") + register_cvar("amx_last_voting", "0") + register_cvar("amx_show_activity", "2") + register_cvar("amx_votekick_ratio", "0.40") + register_cvar("amx_voteban_ratio", "0.40") + register_cvar("amx_votemap_ratio", "0.40") - set_cvar_float("amx_last_voting",0.0) + set_cvar_float("amx_last_voting", 0.0) #if defined USING_SQL - register_srvcmd("amx_sqladmins","adminSql") - register_cvar("amx_sql_table","admins") + register_srvcmd("amx_sqladmins", "adminSql") + register_cvar("amx_sql_table", "admins") #endif - register_cvar("amx_sql_host","127.0.0.1") - register_cvar("amx_sql_user","root") - register_cvar("amx_sql_pass","") - register_cvar("amx_sql_db","amx") + register_cvar("amx_sql_host", "127.0.0.1") + register_cvar("amx_sql_user", "root") + register_cvar("amx_sql_pass", "") + register_cvar("amx_sql_db", "amx") - register_concmd("amx_reloadadmins", "cmdReload", ADMIN_CFG) - register_concmd("amx_addadmin", "addadminfn", ADMIN_CFG, " [password] [authtype] - automatically add specified player as an admin to users.ini") + register_concmd("amx_reloadadmins", "cmdReload", ADMIN_CFG) + register_concmd("amx_addadmin", "addadminfn", ADMIN_CFG, " [password] [authtype] - automatically add specified player as an admin to users.ini") - format( g_cmdLoopback, 15, "amxauth%c%c%c%c" , - random_num('A','Z') , random_num('A','Z') ,random_num('A','Z'),random_num('A','Z') ) + format(g_cmdLoopback, 15, "amxauth%c%c%c%c", random_num('A', 'Z'), random_num('A', 'Z'), random_num('A', 'Z'), random_num('A', 'Z')) - register_clcmd( g_cmdLoopback, "ackSignal" ) + register_clcmd(g_cmdLoopback, "ackSignal") - 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[64] - get_configsdir(configsDir, 63) - server_cmd("exec %s/amxx.cfg", configsDir) // Execute main configuration file - server_cmd("exec %s/sql.cfg", configsDir) + new configsDir[64] + get_configsdir(configsDir, 63) + + server_cmd("exec %s/amxx.cfg", configsDir) // Execute main configuration file + server_cmd("exec %s/sql.cfg", configsDir) #if defined USING_SQL - server_cmd("amx_sqladmins") + server_cmd("amx_sqladmins") #else - format(configsDir, 63, "%s/users.ini", configsDir) - loadSettings(configsDir) // Load admins accounts + format(configsDir, 63, "%s/users.ini", configsDir) + loadSettings(configsDir) // Load admins accounts #endif } @@ -124,23 +124,28 @@ public addadminfn(id, level, cid) { new t_arg[16] read_argv(4, t_arg, 15) - 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")) { idtype = ADMIN_STEAM - } else if (equali(t_arg,"ip")) { + } + else if (equali(t_arg, "ip")) + { idtype = ADMIN_IPADDR - } else if (equali(t_arg,"name") || equali(t_arg,"nick")) { + } + else if (equali(t_arg, "name") || equali(t_arg, "nick")) + { idtype = ADMIN_NAME } else { - console_print(id, "[%s] Unknown idtype ^"%s^", use one of: steamid,ip,name", PLUGINNAME, t_arg) + console_print(id, "[%s] Unknown idtype ^"%s^", use one of: steamid, ip, name", PLUGINNAME, t_arg) return PLUGIN_HANDLED } } new arg[33] read_argv(1, arg, 32) - new player = -1 + if (idtype & ADMIN_STEAM) { if (containi(arg, "STEAM_0:") == -1) @@ -148,25 +153,34 @@ public addadminfn(id, level, cid) idtype |= ADMIN_LOOKUP player = cmd_target(id, arg, 10) } - } else if (idtype & ADMIN_NAME) { + } + else if (idtype & ADMIN_NAME) + { player = cmd_target(id, arg, 10) + if (player) idtype |= ADMIN_LOOKUP - } else if (idtype & ADMIN_IPADDR) { + } + else if (idtype & ADMIN_IPADDR) + { new len = strlen(arg) new dots, chars - for (new i=0; i 3) break + if (++dots > 3) break + chars = 0 } else { chars++ } + if (dots != 3 || !chars || chars > 3) { idtype |= ADMIN_LOOKUP @@ -194,9 +208,13 @@ public addadminfn(id, level, cid) if (idtype & ADMIN_STEAM) { get_user_authid(player, auth, 32) - } else if (idtype & ADMIN_IPADDR) { + } + else if (idtype & ADMIN_IPADDR) + { get_user_ip(player, auth, 32) - } else if (idtype & ADMIN_NAME) { + } + else if (idtype & ADMIN_NAME) + { get_user_name(player, auth, 32) } } else { @@ -204,10 +222,12 @@ public addadminfn(id, level, cid) } new type[16], len + if (idtype & ADMIN_STEAM) len += format(type[len], 15-len, "c") else if (idtype & ADMIN_IPADDR) len += format(type[len], 15-len, "d") + if (strlen(password) > 0) len += format(type[len], 15-len, "a") else @@ -230,6 +250,7 @@ AddAdmin(id, auth[], accessflags[], password[], flags[]) { #if defined USING_SQL new host[64], user[32], pass[32], db[128], table[32], error[128], dbType[7] + dbi_type(dbType, 6) get_cvar_string("amx_sql_host", host, 63) get_cvar_string("amx_sql_user", user, 31) @@ -238,341 +259,429 @@ AddAdmin(id, auth[], accessflags[], password[], flags[]) get_cvar_string("amx_sql_table", table, 31) new Sql:sql = dbi_connect(host, user, pass, db, error, 127) - if (sql <= SQL_FAILED) { + + if (sql <= SQL_FAILED) + { server_print("[AMXX] %L", LANG_SERVER, "SQL_CANT_CON", error) //backup to users.ini #endif - // Make sure that the users.ini file exists. - new configsDir[64] - get_configsdir(configsDir, 63) - format(configsDir, 63, "%s/users.ini", configsDir) + // Make sure that the users.ini file exists. + new configsDir[64] + get_configsdir(configsDir, 63) + format(configsDir, 63, "%s/users.ini", configsDir) - if (!file_exists(configsDir)) { - console_print(id, "[%s] File ^"%s^" doesn't exist.", PLUGINNAME, configsDir) - return - } - - // Make sure steamid isn't already in file. - new line = 0, textline[256], len - const SIZE = 63 - new line_steamid[SIZE + 1], line_password[SIZE + 1], line_accessflags[SIZE + 1], line_flags[SIZE + 1], parsedParams - // - while ((line = read_file(configsDir, line, textline, 255, len))) { - if (len == 0 || equal(textline, ";", 1)) - continue // comment line - - parsedParams = parse(textline, line_steamid, SIZE, line_password, SIZE, line_accessflags, SIZE, line_flags, SIZE) - if (parsedParams != 4) - continue // Send warning/error? - if (containi(line_flags, flags) != -1 && equal(line_steamid, auth)) { - console_print(id, "[%s] %s already exists!", PLUGINNAME, auth) + if (!file_exists(configsDir)) + { + console_print(id, "[%s] File ^"%s^" doesn't exist.", PLUGINNAME, configsDir) return } - } - // If we came here, steamid doesn't exist in users.ini. Add it. - new linetoadd[512] - format(linetoadd, 511, "^"%s^" ^"%s^" ^"%s^" ^"%s^"", auth, password, accessflags, flags) - console_print(id, "Adding:^n%s", linetoadd) + // Make sure steamid isn't already in file. + new line = 0, textline[256], len + const SIZE = 63 + new line_steamid[SIZE + 1], line_password[SIZE + 1], line_accessflags[SIZE + 1], line_flags[SIZE + 1], parsedParams + + // + while ((line = read_file(configsDir, line, textline, 255, len))) + { + if (len == 0 || equal(textline, ";", 1)) + continue // comment line - if (!write_file(configsDir, linetoadd)) - console_print(id, "[%s] Failed writing to %s!", PLUGINNAME, configsDir) -#if defined USING_SQL + parsedParams = parse(textline, line_steamid, SIZE, line_password, SIZE, line_accessflags, SIZE, line_flags, SIZE) + + if (parsedParams != 4) + continue // Send warning/error? + + if (containi(line_flags, flags) != -1 && equal(line_steamid, auth)) + { + console_print(id, "[%s] %s already exists!", PLUGINNAME, auth) + return + } } + + // If we came here, steamid doesn't exist in users.ini. Add it. + new linetoadd[512] + + format(linetoadd, 511, "^"%s^" ^"%s^" ^"%s^" ^"%s^"", auth, password, accessflags, flags) + console_print(id, "Adding:^n%s", linetoadd) + + if (!write_file(configsDir, linetoadd)) + console_print(id, "[%s] Failed writing to %s!", PLUGINNAME, configsDir) +#if defined USING_SQL + } new Result:Res = dbi_query(sql, "SELECT * FROM `%s` WHERE (`auth` = '%s')", table, auth) - if (Res == RESULT_FAILED) { - dbi_error(sql,error,127) + if (Res == RESULT_FAILED) + { + dbi_error(sql, error, 127) server_print("[AMXX] %L", LANG_SERVER, "SQL_CANT_LOAD_ADMINS", error) console_print(id, "[AMXX] %L", LANG_SERVER, "SQL_CANT_LOAD_ADMINS", error) dbi_close(sql) + return } - else if (Res > RESULT_NONE) { + else if (Res > RESULT_NONE) + { console_print(id, "[%s] %s already exists!", PLUGINNAME, auth) dbi_free_result(Res) dbi_close(sql) + return } console_print(id, "Adding to database:^n^"%s^" ^"%s^" ^"%s^" ^"%s^"", auth, password, accessflags, flags) + dbi_query(sql, "REPLACE INTO `%s` (`auth`, `password`, `access`, `flags`) VALUES ('%s', '%s', '%s', '%s')", table, auth, password, accessflags, flags) dbi_close(sql) #endif } -public plugin_cfg() { - new configFile[64],curMap[32] - get_configsdir(configFile,31) - get_mapname(curMap,31) - new len = format(configFile,63,"%s/maps/%s.cfg",configFile,curMap) - if ( file_exists(configFile) ) - set_task(6.1,"delayed_load",0,configFile,len+1) +public plugin_cfg() +{ + new configFile[64], curMap[32] + + get_configsdir(configFile, 31) + get_mapname(curMap, 31) + + new len = format(configFile, 63, "%s/maps/%s.cfg", configFile, curMap) + + if (file_exists(configFile)) + set_task(6.1, "delayed_load", 0, configFile, len+1) } public delayed_load(configFile[]) { - server_cmd("exec %s",configFile) + server_cmd("exec %s", configFile) } -loadSettings(szFilename[]) { - if (!file_exists(szFilename)) return 0 +loadSettings(szFilename[]) +{ + if (!file_exists(szFilename)) + return 0 - new szText[256], szFlags[32], szAccess[32] - new a, pos = 0 + new szText[256], szFlags[32], szAccess[32] + new a, pos = 0 - while ( g_aNum < MAX_ADMINS && read_file(szFilename,pos++,szText,255,a) ) - { - if ( szText[0] == ';' ) continue + while (g_aNum < MAX_ADMINS && read_file(szFilename, pos++, szText, 255, a)) + { + if (szText[0] == ';') + continue - if ( parse(szText, g_aName[ g_aNum ] ,31, g_aPassword[ g_aNum ], 31, szAccess,31,szFlags,31 ) < 2 ) - continue + if (parse(szText, g_aName[g_aNum], 31, g_aPassword[g_aNum], 31, szAccess, 31, szFlags, 31) < 2) + continue - g_aAccess[ g_aNum ] = read_flags(szAccess) - g_aFlags[ g_aNum ] = read_flags( szFlags ) - ++g_aNum - } - if (g_aNum == 1) - server_print("[AMXX] %L", LANG_SERVER, "LOADED_ADMIN" ) - else - server_print("[AMXX] %L", LANG_SERVER, "LOADED_ADMINS", g_aNum ) + g_aAccess[g_aNum] = read_flags(szAccess) + g_aFlags[g_aNum] = read_flags(szFlags) + ++g_aNum + } + + if (g_aNum == 1) + server_print("[AMXX] %L", LANG_SERVER, "LOADED_ADMIN") + else + server_print("[AMXX] %L", LANG_SERVER, "LOADED_ADMINS", g_aNum) - return 1 + return 1 } #if defined USING_SQL -public adminSql() { - new host[64],user[32],pass[32],db[128],table[32],error[128],dbType[7] - dbi_type(dbType, 6) - get_cvar_string("amx_sql_host",host,63) - get_cvar_string("amx_sql_user",user,31) - get_cvar_string("amx_sql_pass",pass,31) - get_cvar_string("amx_sql_db", db, 127) - get_cvar_string("amx_sql_table",table,31) +public adminSql() +{ + new host[64], user[32], pass[32], db[128], table[32], error[128], dbType[7] + + dbi_type(dbType, 6) + + get_cvar_string("amx_sql_host", host, 63) + get_cvar_string("amx_sql_user", user, 31) + get_cvar_string("amx_sql_pass", pass, 31) + get_cvar_string("amx_sql_db", db, 127) + get_cvar_string("amx_sql_table", table, 31) - new Sql:sql = dbi_connect(host,user,pass,db,error,127) - if (sql <= SQL_FAILED) { - server_print("[AMXX] %L",LANG_SERVER,"SQL_CANT_CON",error) - //backup to users.ini + new Sql:sql = dbi_connect(host, user, pass, db, error, 127) + + if (sql <= SQL_FAILED) + { + server_print("[AMXX] %L", LANG_SERVER, "SQL_CANT_CON", error) + + //backup to users.ini + new configsDir[64] + + get_configsdir(configsDir, 63) + format(configsDir, 63, "%s/users.ini", configsDir) + loadSettings(configsDir) // Load admins accounts - new configsDir[64] - get_configsdir(configsDir, 63) - format(configsDir, 63, "%s/users.ini", configsDir) - loadSettings(configsDir) // Load admins accounts + return PLUGIN_HANDLED + } - return PLUGIN_HANDLED - } + new Result:Res + + if (equali(dbType, "sqlite")) + { + if (!sqlite_table_exists(sql, table)) + { + dbi_query(sql, "CREATE TABLE %s ( auth TEXT NOT NULL DEFAULT '', password TEXT NOT NULL DEFAULT '', access TEXT NOT NULL DEFAULT '', flags TEXT NOT NULL DEFAULT '' )", table) + } - new Result:Res - if (equali(dbType,"sqlite")) { - if (!sqlite_table_exists(sql,table)) { - dbi_query(sql,"CREATE TABLE %s ( auth TEXT NOT NULL DEFAULT '', password TEXT NOT NULL DEFAULT '', access TEXT NOT NULL DEFAULT '', flags TEXT NOT NULL DEFAULT '' )",table) - } + Res = dbi_query(sql, "SELECT auth, password, access, flags FROM %s",table) + } else { + dbi_query(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) + Res = dbi_query(sql,"SELECT `auth`,`password`,`access`,`flags` FROM `%s`", table) + } - Res = dbi_query(sql,"SELECT auth, password, access, flags FROM %s",table) - } - else { - dbi_query(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) - Res = dbi_query(sql,"SELECT `auth`,`password`,`access`,`flags` FROM `%s`",table) - } + if (Res == RESULT_FAILED) + { + dbi_error(sql, error, 127) + server_print("[AMXX] %L", LANG_SERVER, "SQL_CANT_LOAD_ADMINS", error) + dbi_free_result(Res) + dbi_close(sql) + + return PLUGIN_HANDLED + } + else if (Res == RESULT_NONE) + { + server_print("[AMXX] %L", LANG_SERVER, "NO_ADMINS") + dbi_free_result(Res) + dbi_close(sql) + + return PLUGIN_HANDLED + } - if (Res == RESULT_FAILED) { - dbi_error(sql,error,127) - server_print("[AMXX] %L",LANG_SERVER,"SQL_CANT_LOAD_ADMINS",error) - dbi_free_result(Res) - dbi_close(sql) - return PLUGIN_HANDLED - } - else if (Res == RESULT_NONE) { - server_print("[AMXX] %L",LANG_SERVER,"NO_ADMINS") - dbi_free_result(Res) - dbi_close(sql) - return PLUGIN_HANDLED - } + new szFlags[32], szAccess[32] + + g_aNum = 0 + + while (dbi_nextrow(Res) > 0) + { + dbi_result(Res, "auth", g_aName[g_aNum], 31) + dbi_result(Res, "password", g_aPassword[g_aNum], 31) + dbi_result(Res, "access", szAccess, 31) + dbi_result(Res, "flags", szFlags, 31) - new szFlags[32],szAccess[32] - g_aNum = 0 - while( dbi_nextrow(Res) > 0 ) { - dbi_result(Res, "auth", g_aName[g_aNum], 31) - dbi_result(Res, "password", g_aPassword[g_aNum], 31) - dbi_result(Res, "access", szAccess, 31) - dbi_result(Res, "flags", szFlags, 31) + g_aAccess[g_aNum] = read_flags(szAccess) - g_aAccess[ g_aNum ] = read_flags( szAccess ) + g_aFlags[g_aNum] = read_flags(szFlags) + ++g_aNum + } - g_aFlags[ g_aNum ] = read_flags( szFlags ) - ++g_aNum - } - - if (g_aNum == 1) - server_print("[AMXX] %L", LANG_SERVER, "SQL_LOADED_ADMIN" ) - else - server_print("[AMXX] %L", LANG_SERVER, "SQL_LOADED_ADMINS", g_aNum ) - dbi_free_result(Res) - dbi_close(sql) - return PLUGIN_HANDLED + if (g_aNum == 1) + server_print("[AMXX] %L", LANG_SERVER, "SQL_LOADED_ADMIN") + else + server_print("[AMXX] %L", LANG_SERVER, "SQL_LOADED_ADMINS", g_aNum) + + dbi_free_result(Res) + dbi_close(sql) + + return PLUGIN_HANDLED } #endif -public cmdReload(id,level,cid) { - if (!cmd_access(id,level,cid,1)) - return PLUGIN_HANDLED +public cmdReload(id, level, cid) +{ + if (!cmd_access(id, level, cid, 1)) + return PLUGIN_HANDLED + + //strip original flags (patch submitted by mrhunt) + remove_user_flags(0, read_flags("z")) - //strip original flags (patch submitted by mrhunt) - remove_user_flags(0,read_flags("z")) #if !defined USING_SQL - new filename[128] - get_configsdir(filename,127) - format(filename,63,"%s/users.ini", filename) + new filename[128] + + get_configsdir(filename, 127) + format(filename, 63, "%s/users.ini", filename) - g_aNum = 0 - loadSettings(filename) // Re-Load admins accounts + g_aNum = 0 + loadSettings(filename) // Re-Load admins accounts - if (id != 0) { - if (g_aNum == 1) - console_print(id,"[AMXX] %L", LANG_SERVER, "LOADED_ADMIN" ) - else - console_print(id,"[AMXX] %L", LANG_SERVER, "LOADED_ADMINS", g_aNum ) - } + if (id != 0) + { + if (g_aNum == 1) + console_print(id, "[AMXX] %L", LANG_SERVER, "LOADED_ADMIN") + else + console_print(id, "[AMXX] %L", LANG_SERVER, "LOADED_ADMINS", g_aNum) + } #else - g_aNum = 0 - adminSql() + g_aNum = 0 + adminSql() - if (id != 0) { - if (g_aNum == 1) - console_print(id,"[AMXX] %L", LANG_SERVER, "SQL_LOADED_ADMIN" ) - else - console_print(id,"[AMXX] %L", LANG_SERVER, "SQL_LOADED_ADMINS", g_aNum ) - } + if (id != 0) + { + if (g_aNum == 1) + console_print(id, "[AMXX] %L", LANG_SERVER, "SQL_LOADED_ADMIN") + else + console_print(id, "[AMXX] %L", LANG_SERVER, "SQL_LOADED_ADMINS", g_aNum) + } #endif - return PLUGIN_HANDLED + return PLUGIN_HANDLED } -getAccess(id,name[],authid[],ip[], password[]) { - new index = -1 - new result = 0 - for (new i = 0; i < g_aNum; ++i) { - if (g_aFlags[i] & FLAG_AUTHID) { - if (equal(authid,g_aName[i])) { - index = i - break - } - } - else if (g_aFlags[i] & FLAG_IP) { - new c = strlen( g_aName[i] ) - if ( g_aName[i][ c - 1 ] == '.' ) { /* check if this is not a xxx.xxx. format */ - if ( equal( g_aName[i] , ip , c ) ) { - index = i - break - } - } /* in other case an IP must just match */ - else if ( equal(ip,g_aName[i]) ){ - index = i - break - } - } - else { - if (g_aFlags[i] & FLAG_TAG) { - if (contain(name,g_aName[i])!=-1){ - index = i - break - } - } - else if (equal(name,g_aName[i])) { - index = i - break - } - } - } - if (index != -1) { - if (g_aFlags[index] & FLAG_NOPASS){ - result |= 8 - new sflags[32] - get_flags(g_aAccess[index],sflags,31) - set_user_flags(id,g_aAccess[index]) - log_amx("Login: ^"%s<%d><%s><>^" became an admin (account ^"%s^") (access ^"%s^") (address ^"%s^")", - name,get_user_userid(id),authid,g_aName[index] ,sflags,ip) - } - else if (equal(password,g_aPassword[index])) { - result |= 12 - set_user_flags(id,g_aAccess[index]) - new sflags[32] - get_flags(g_aAccess[index],sflags,31) - log_amx("Login: ^"%s<%d><%s><>^" became an admin (account ^"%s^") (access ^"%s^") (address ^"%s^")", - name,get_user_userid(id),authid,g_aName[index] ,sflags,ip) - } - else { - result |= 1 - if (g_aFlags[index] & FLAG_KICK){ - result |= 2 - log_amx("Login: ^"%s<%d><%s><>^" kicked due to invalid password (account ^"%s^") (address ^"%s^")", - name,get_user_userid(id),authid,g_aName[index],ip) - } - } - } - else if (get_cvar_float("amx_mode")==2.0) { - result |= 2 - } - else { - new defaccess[32] - get_cvar_string("amx_default_access",defaccess,31) - if (!strlen(defaccess)) - copy(defaccess, 32, "z") - new idefaccess = read_flags(defaccess) - if (idefaccess) { - result |= 8 - set_user_flags(id,idefaccess) - } - } +getAccess(id, name[], authid[], ip[], password[]) +{ + new index = -1 + new result = 0 + + for (new i = 0; i < g_aNum; ++i) + { + if (g_aFlags[i] & FLAG_AUTHID) + { + if (equal(authid, g_aName[i])) + { + index = i + break + } + } + else if (g_aFlags[i] & FLAG_IP) + { + new c = strlen(g_aName[i]) + + if (g_aName[i][c - 1] == '.') /* check if this is not a xxx.xxx. format */ + { + if (equal(g_aName[i], ip, c)) + { + index = i + break + } + } /* in other case an IP must just match */ + else if (equal(ip, g_aName[i])) + { + index = i + break + } + } else { + if (g_aFlags[i] & FLAG_TAG) + { + if (contain(name, g_aName[i]) != -1) + { + index = i + break + } + } + else if (equal(name, g_aName[i])) + { + index = i + break + } + } + } - return result + if (index != -1) + { + if (g_aFlags[index] & FLAG_NOPASS) + { + result |= 8 + new sflags[32] + + get_flags(g_aAccess[index], sflags, 31) + set_user_flags(id, g_aAccess[index]) + + log_amx("Login: ^"%s<%d><%s><>^" became an admin (account ^"%s^") (access ^"%s^") (address ^"%s^")", name, get_user_userid(id), authid, g_aName[index], sflags, ip) + } + else if (equal(password, g_aPassword[index])) + { + result |= 12 + set_user_flags(id, g_aAccess[index]) + + new sflags[32] + get_flags(g_aAccess[index], sflags, 31) + + log_amx("Login: ^"%s<%d><%s><>^" became an admin (account ^"%s^") (access ^"%s^") (address ^"%s^")", name, get_user_userid(id), authid, g_aName[index], sflags, ip) + } else { + result |= 1 + + if (g_aFlags[index] & FLAG_KICK) + { + result |= 2 + log_amx("Login: ^"%s<%d><%s><>^" kicked due to invalid password (account ^"%s^") (address ^"%s^")", name, get_user_userid(id), authid, g_aName[index], ip) + } + } + } + else if (get_cvar_float("amx_mode") == 2.0) + { + result |= 2 + } else { + new defaccess[32] + + get_cvar_string("amx_default_access", defaccess, 31) + + if (!strlen(defaccess)) + copy(defaccess, 32, "z") + + new idefaccess = read_flags(defaccess) + + if (idefaccess) + { + result |= 8 + set_user_flags(id, idefaccess) + } + } + + return result } -accessUser( id, name[] = "" ) { - remove_user_flags(id) - new userip[32],userauthid[32],password[32],passfield[32],username[32] - get_user_ip(id,userip,31,1) - get_user_authid(id,userauthid,31) - if ( name[0] ) copy( username , 31, name) - else get_user_name(id,username,31 ) - get_cvar_string("amx_password_field",passfield,31) - get_user_info(id,passfield,password,31) - new result = getAccess(id,username,userauthid,userip,password) - if (result & 1) client_cmd(id,"echo ^"* %L^"",id,"INV_PAS") - if (result & 2) { - client_cmd(id,g_cmdLoopback) - return PLUGIN_HANDLED - } - if (result & 4) client_cmd(id,"echo ^"* %L^"",id,"PAS_ACC") - if (result & 8) client_cmd(id,"echo ^"* %L^"",id,"PRIV_SET") - return PLUGIN_CONTINUE +accessUser(id, name[] = "") +{ + remove_user_flags(id) + + new userip[32], userauthid[32], password[32], passfield[32], username[32] + + get_user_ip(id, userip, 31, 1) + get_user_authid(id, userauthid, 31) + + if (name[0]) + copy(username, 31, name) + else + get_user_name(id, username, 31) + + get_cvar_string("amx_password_field", passfield, 31) + get_user_info(id, passfield, password, 31) + + new result = getAccess(id, username, userauthid, userip, password) + + if (result & 1) + client_cmd(id, "echo ^"* %L^"", id, "INV_PAS") + + if (result & 2) + { + client_cmd(id, g_cmdLoopback) + return PLUGIN_HANDLED + } + + if (result & 4) + client_cmd(id, "echo ^"* %L^"", id, "PAS_ACC") + + if (result & 8) + client_cmd(id, "echo ^"* %L^"", id, "PRIV_SET") + + return PLUGIN_CONTINUE } -public client_infochanged(id) { - if ( !is_user_connected(id) || !get_cvar_num("amx_mode") ) - return PLUGIN_CONTINUE +public client_infochanged(id) +{ + if (!is_user_connected(id) || !get_cvar_num("amx_mode")) + return PLUGIN_CONTINUE - new newname[32], oldname[32] - get_user_name(id,oldname,31) - get_user_info(id,"name",newname,31) + new newname[32], oldname[32] + + get_user_name(id, oldname, 31) + get_user_info(id, "name", newname, 31) - if ( !equal(newname,oldname) ) - accessUser( id, newname ) + if (!equal(newname, oldname)) + accessUser(id, newname) - return PLUGIN_CONTINUE + return PLUGIN_CONTINUE } -public ackSignal(id) { - server_cmd("kick #%d ^"%L^"", get_user_userid(id), id, "NO_ENTRY" ) +public ackSignal(id) +{ + server_cmd("kick #%d ^"%L^"", get_user_userid(id), id, "NO_ENTRY") } public client_authorized(id) - return get_cvar_num( "amx_mode" ) ? accessUser( id ) : PLUGIN_CONTINUE + return get_cvar_num("amx_mode") ? accessUser(id) : PLUGIN_CONTINUE public client_putinserver(id) { if (!is_dedicated_server() && id == 1) return get_cvar_num("amx_mode") ? accessUser(id) : PLUGIN_CONTINUE + return PLUGIN_CONTINUE }