Removed admin_sql, merged with admin
This commit is contained in:
David Anderson
parent
d17945c087
commit
0d07a13dbe
|
|
@ -32,8 +32,13 @@
|
|||
* version.
|
||||
*/
|
||||
|
||||
//#define USING_SQL 1
|
||||
|
||||
#include <amxmodx>
|
||||
#include <amxmisc>
|
||||
#if defined USING_SQL
|
||||
#include <dbi>
|
||||
#endif
|
||||
|
||||
#define MAX_ADMINS 64
|
||||
|
||||
|
|
@ -48,7 +53,11 @@ new g_cmdLoopback[16]
|
|||
|
||||
public plugin_init()
|
||||
{
|
||||
register_plugin("Admin Base","0.16","AMXX Dev Team")
|
||||
#if defined USING_SQL
|
||||
register_plugin("Admin Base","0.20","AMXX Dev Team")
|
||||
#else
|
||||
register_plugin("Admin Base(SQL)", "0.20", "AMXX Dev Team")
|
||||
#endif
|
||||
register_cvar("amx_mode","1")
|
||||
register_cvar("amx_password_field","_pw")
|
||||
register_cvar("amx_default_access","")
|
||||
|
|
@ -59,8 +68,20 @@ public plugin_init()
|
|||
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)
|
||||
|
||||
#if defined USING_SQL
|
||||
register_srvcmd("amx_sqladmins","adminSql")
|
||||
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")
|
||||
#endif
|
||||
|
||||
register_concmd("amx_reloadadmins","cmdReload",ADMIN_ADMIN)
|
||||
|
||||
#if !defined NO_STEAM
|
||||
|
|
@ -75,10 +96,15 @@ public plugin_init()
|
|||
new configsDir[64]
|
||||
get_configsdir(configsDir, 63)
|
||||
server_cmd("exec %s/amxx.cfg", configsDir) // Execute main configuration file
|
||||
#if defined USING_SQL
|
||||
server_cmd("exec %s/sql.cfg;amx_sqladmins")
|
||||
#else
|
||||
format(configsDir, 63, "%s/users.ini", configsDir)
|
||||
loadSettings(configsDir) // Load admins accounts
|
||||
#endif
|
||||
}
|
||||
|
||||
#if !defined USING_SQL
|
||||
loadSettings(szFilename[])
|
||||
{
|
||||
if (!file_exists(szFilename)) return 0
|
||||
|
|
@ -103,18 +129,76 @@ loadSettings(szFilename[])
|
|||
server_print("[AMXX] Loaded %d admin%s from file",g_aNum, (g_aNum == 1) ? "" : "s" )
|
||||
return 1
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined USING_SQL
|
||||
public adminSql() {
|
||||
new host[64],user[32],pass[32],db[32],error[128]
|
||||
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,31)
|
||||
|
||||
new sql = dbi_connect(host,user,pass,db,error,127)
|
||||
if(sql < 1){
|
||||
server_print("[AMXX] SQL error: can't connect: '%s'",error)
|
||||
return PLUGIN_HANDLED
|
||||
}
|
||||
|
||||
dbi_query(sql,"CREATE TABLE IF NOT EXISTS admins ( auth varchar(32) NOT NULL default '', password varchar(32) NOT NULL default '', access varchar(32) NOT NULL default '', flags varchar(32) NOT NULL default '' )")
|
||||
|
||||
new Result = dbi_query(sql,"SELECT auth,password,access,flags FROM admins")
|
||||
|
||||
if(Result < 0) {
|
||||
dbi_error(sql,error,127)
|
||||
server_print("[AMXX] SQL error: can't load admins: '%s'",error)
|
||||
return PLUGIN_HANDLED
|
||||
} else if (Result == 0) {
|
||||
server_print("[AMXX] No admins found.")
|
||||
}
|
||||
|
||||
new szFlags[32],szAccess[32]
|
||||
g_aNum = 0
|
||||
while( dbi_nextrow(sql) > 0 )
|
||||
{
|
||||
dbi_field(Result, 1, g_aName[ g_aNum ] ,31)
|
||||
dbi_field(Result, 2, g_aPassword[ g_aNum ] ,31)
|
||||
dbi_field(Result, 3, szAccess,31)
|
||||
dbi_field(Result, 4, szFlags,31)
|
||||
|
||||
if ( (containi(szAccess,"z")==-1) && (containi(szAccess,"y")==-1) )
|
||||
szAccess[strlen(szAccess)] = 'y'
|
||||
|
||||
g_aAccess[ g_aNum ] = read_flags( szAccess )
|
||||
if (!(g_aAccess[g_aNum] & ADMIN_USER) && !(g_aAccess[g_aNum] & ADMIN_ADMIN))
|
||||
g_aAccess[g_aNum] |= ADMIN_ADMIN
|
||||
|
||||
g_aFlags[ g_aNum ] = read_flags( szFlags )
|
||||
++g_aNum
|
||||
}
|
||||
|
||||
server_print("[AMXX] Loaded %d admin%s from database",g_aNum, (g_aNum == 1) ? "" : "s" )
|
||||
dbi_free_result(Result)
|
||||
dbi_close(sql)
|
||||
return PLUGIN_HANDLED
|
||||
}
|
||||
#endif
|
||||
|
||||
public cmdReload(id,level,cid)
|
||||
{
|
||||
if (!cmd_access(id,level,cid,1))
|
||||
return PLUGIN_HANDLED
|
||||
|
||||
#if !defined USING_SQL
|
||||
new filename[128]
|
||||
get_configsdir(filename,127)
|
||||
format(filename,63,"%s/users.ini", filename)
|
||||
|
||||
g_aNum = 0
|
||||
loadSettings(filename) // Re-Load admins accounts
|
||||
#else
|
||||
adminSql()
|
||||
#endif
|
||||
|
||||
return PLUGIN_HANDLED
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,280 +0,0 @@
|
|||
/* AMX Mod X
|
||||
* Admin Base for SQL Plugin
|
||||
*
|
||||
* by the AMX Mod X Development Team
|
||||
* originally developed by OLO
|
||||
*
|
||||
* This file is part of AMX Mod X.
|
||||
*
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at
|
||||
* your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software Foundation,
|
||||
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
* In addition, as a special exception, the author gives permission to
|
||||
* link the code of this program with the Half-Life Game Engine ("HL
|
||||
* Engine") and Modified Game Libraries ("MODs") developed by Valve,
|
||||
* L.L.C ("Valve"). You must obey the GNU General Public License in all
|
||||
* respects for all of the code used other than the HL Engine and MODs
|
||||
* from Valve. If you modify this file, you may extend this exception
|
||||
* to your version of the file, but you are not obligated to do so. If
|
||||
* you do not wish to do so, delete this exception statement from your
|
||||
* version.
|
||||
*/
|
||||
|
||||
#include <amxmodx>
|
||||
#include <amxmisc>
|
||||
#include <dbi>
|
||||
|
||||
#define MAX_ADMINS 64
|
||||
|
||||
new g_aPassword[MAX_ADMINS][32]
|
||||
new g_aName[MAX_ADMINS][32]
|
||||
new g_aFlags[MAX_ADMINS]
|
||||
new g_aAccess[MAX_ADMINS]
|
||||
new g_aNum
|
||||
#if !defined NO_STEAM
|
||||
new g_cmdLoopback[16]
|
||||
#endif
|
||||
|
||||
public plugin_init()
|
||||
{
|
||||
register_plugin("Admin Base(SQL)","0.2","AMXX Dev Team")
|
||||
|
||||
register_cvar("amx_mode","1")
|
||||
register_cvar("amx_password_field","_pw")
|
||||
register_cvar("amx_default_access","")
|
||||
register_srvcmd("amx_sqladmins","adminSql")
|
||||
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_vote_ratio","0.02")
|
||||
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_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")
|
||||
set_cvar_float("amx_last_voting",0.0)
|
||||
|
||||
register_concmd("amx_reloadadmins","cmdReload",ADMIN_ADMIN)
|
||||
|
||||
#if !defined NO_STEAM
|
||||
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" )
|
||||
#endif
|
||||
|
||||
remove_user_flags(0,read_flags("z")) // remove 'user' flag from server rights
|
||||
|
||||
new configsDir[128]
|
||||
get_configsdir(configsDir, 127)
|
||||
server_cmd("exec %s/amxx.cfg", configsDir) // Execute main configuration file
|
||||
server_cmd("exec %s/sql.cfg;amx_sqladmins", configsDir)
|
||||
}
|
||||
|
||||
public adminSql() {
|
||||
new host[64],user[32],pass[32],db[32],error[128]
|
||||
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,31)
|
||||
|
||||
new sql = dbi_connect(host,user,pass,db,error,127)
|
||||
if(sql < 1){
|
||||
server_print("[AMXX] SQL error: can't connect: '%s'",error)
|
||||
return PLUGIN_HANDLED
|
||||
}
|
||||
|
||||
dbi_query(sql,"CREATE TABLE IF NOT EXISTS admins ( auth varchar(32) NOT NULL default '', password varchar(32) NOT NULL default '', access varchar(32) NOT NULL default '', flags varchar(32) NOT NULL default '' )")
|
||||
|
||||
new Result = dbi_query(sql,"SELECT auth,password,access,flags FROM admins")
|
||||
|
||||
if(Result < 0) {
|
||||
dbi_error(sql,error,127)
|
||||
server_print("[AMXX] SQL error: can't load admins: '%s'",error)
|
||||
return PLUGIN_HANDLED
|
||||
} else if (Result == 0) {
|
||||
server_print("[AMXX] No admins found.")
|
||||
}
|
||||
|
||||
new szFlags[32],szAccess[32]
|
||||
g_aNum = 0
|
||||
while( dbi_nextrow(sql) > 0 )
|
||||
{
|
||||
dbi_field(Result, 1, g_aName[ g_aNum ] ,31)
|
||||
dbi_field(Result, 2, g_aPassword[ g_aNum ] ,31)
|
||||
dbi_field(Result, 3, szAccess,31)
|
||||
dbi_field(Result, 4, szFlags,31)
|
||||
|
||||
if ( (containi(szAccess,"z")==-1) && (containi(szAccess,"y")==-1) )
|
||||
szAccess[strlen(szAccess)] = 'y'
|
||||
|
||||
g_aAccess[ g_aNum ] = read_flags( szAccess )
|
||||
if (!(g_aAccess[g_aNum] & ADMIN_USER) && !(g_aAccess[g_aNum] & ADMIN_ADMIN))
|
||||
g_aAccess[g_aNum] |= ADMIN_ADMIN
|
||||
|
||||
g_aFlags[ g_aNum ] = read_flags( szFlags )
|
||||
++g_aNum
|
||||
}
|
||||
|
||||
server_print("[AMXX] Loaded %d admin%s from database",g_aNum, (g_aNum == 1) ? "" : "s" )
|
||||
dbi_free_result(Result)
|
||||
dbi_close(sql)
|
||||
return PLUGIN_HANDLED
|
||||
}
|
||||
|
||||
public cmdReload(id,level,cid)
|
||||
{
|
||||
if (!cmd_access(id,level,cid,1))
|
||||
return PLUGIN_HANDLED
|
||||
|
||||
adminSql() // Re-Load admins accounts
|
||||
|
||||
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 (!defaccess[0])
|
||||
defaccess[0] = '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 ^"* Invalid Password!^"")
|
||||
if (result & 2) {
|
||||
#if !defined NO_STEAM
|
||||
client_cmd(id,g_cmdLoopback)
|
||||
#else
|
||||
client_cmd(id,"echo ^"* You have no entry to the server...^";disconnect")
|
||||
#endif
|
||||
return PLUGIN_HANDLED
|
||||
}
|
||||
if (result & 4) client_cmd(id,"echo ^"* Password accepted^"")
|
||||
if (result & 8) client_cmd(id,"echo ^"* Privileges set^"")
|
||||
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)
|
||||
|
||||
if ( !equal(newname,oldname) )
|
||||
accessUser( id , newname )
|
||||
|
||||
return PLUGIN_CONTINUE
|
||||
}
|
||||
|
||||
#if !defined NO_STEAM
|
||||
|
||||
public ackSignal(id)
|
||||
server_cmd("kick #%d ^"You have no entry to the server...^"", get_user_userid(id) )
|
||||
|
||||
public client_authorized(id)
|
||||
#else
|
||||
public client_connect(id)
|
||||
#endif
|
||||
return get_cvar_num( "amx_mode" ) ? accessUser( id ) : PLUGIN_CONTINUE
|
||||
Loading…
Reference in New Issue
Block a user