cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-09 23:21:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

perminant solution to the whitelist, whitelist/panic is now handled on the database.

Browse Source
This commit is contained in:
quotefox
2019-11-22 14:00:04 +00:00
parent 0e829e799e
commit c8169d289f
3 changed files with 41 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/panicbunker.dm
+20 -28
View File
@@ -1,6 +1,3 @@
#define PANICFILE "[global.config.directory]/whitelist.txt"
/client/proc/panicbunker()
set category = "Server"
set name = "Toggle Panic Bunker"
@@ -22,16 +19,31 @@
/client/proc/addbunkerbypass(ckeytobypass as text)
set category = "Special Verbs"
set name = "Whitelist"
set desc = "Allows a given ckey to connect despite the panic bunker for a given round."
set desc = "Adds a given ckey onto the whitelist to bypass the panic bunker."
if(!CONFIG_GET(flag/sql_enabled))
to_chat(usr, "<span class='adminnotice'>The Database is not enabled!</span>")
return
GLOB.bunker_passthrough |= ckey(ckeytobypass)
log_admin("[key_name(usr)] has added [ckeytobypass] to the bunker bypass list.")
message_admins("[key_name_admin(usr)] has added [ckeytobypass] to the bunker bypass list.")
send2irc("Panic Bunker", "[key_name(usr)] has added [ckeytobypass] to the bunker bypass list.")
save_paniclist()
log_admin("[key_name(usr)] has added [ckeytobypass] to the whitelist.")
message_admins("[key_name_admin(usr)] has added [ckeytobypass] to the whitelist.")
send2irc("Panic Bunker", "[key_name(usr)] has added [ckeytobypass] to the whitelist.")
//Hyperstation13 change Adds to a whitelist on the database table "whitelist", so players can join at a later date!
var/sql_ckey = sanitizeSQL(ckeytobypass)
var/datum/DBQuery/query_client_in_db = SSdbcore.NewQuery("SELECT 1 FROM [format_table_name("whitelist")] WHERE ckey = '[sql_ckey]'")
if(!query_client_in_db.Execute())
qdel(query_client_in_db)
return
if(!query_client_in_db.NextRow())
//add to database!
var/datum/DBQuery/query_add_player_whitelist = SSdbcore.NewQuery("INSERT INTO [format_table_name("whitelist")] (`ckey`) VALUES ('[sql_ckey]')")
if(!query_add_player_whitelist.Execute())
qdel(query_client_in_db)
qdel(query_add_player_whitelist)
return
/client/proc/revokebunkerbypass(ckeytobypass as text)
set category = "Special Verbs"
@@ -45,23 +57,3 @@
log_admin("[key_name(usr)] has removed [ckeytobypass] from the current round's bunker bypass list.")
message_admins("[key_name_admin(usr)] has removed [ckeytobypass] from the current round's bunker bypass list.")
send2irc("Panic Bunker", "[key_name(usr)] has removed [ckeytobypass] from the current round's bunker bypass list.")
save_paniclist()
//Hyperchange, we altered the panic bunker into a whitelist. So it will load whitelist.txt and treat it as a bypass to the panic bunker.
/proc/load_paniclist()
GLOB.bunker_passthrough = list()
for(var/line in world.file2list(PANICFILE))
if(!line)
continue
if(findtextEx(line,"#",1,2))
continue
GLOB.bunker_passthrough += ckey(line)
if(!GLOB.bunker_passthrough.len)
GLOB.bunker_passthrough = null
/proc/save_paniclist()
var/namelist = list2text(GLOB.bunker_passthrough, ",")
var/paniclist = PANICFILE
paniclist << namelist
code/modules/client/client_procs.dm
+19 -13
View File
@@ -500,19 +500,25 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
return
if(!query_client_in_db.NextRow())
if (CONFIG_GET(flag/panic_bunker) && !holder && !GLOB.deadmins[ckey] && !(ckey in GLOB.bunker_passthrough))
log_access("Failed Login: [key] - New account attempting to connect during panic bunker")
message_admins("<span class='adminnotice'>Failed Login: [key] - New account attempting to connect without being whitelisted!</span>")
to_chat(src, "<span class='notice'>You must first join the Discord to verify your account before joining this server.<br>To do so, read the rules here http://hyperstation13.com/rules and post a request in the #whitelist-application under the \"Main server\" category in the Discord server linked here: <a href='https://discordapp.com/invite/PCtX2fH'>https://discordapp.com/invite/PCtX2fH</a></span>") //CIT CHANGE - makes the panic bunker disconnect message point to the discord
var/list/connectiontopic_a = params2list(connectiontopic)
var/list/panic_addr = CONFIG_GET(string/panic_server_address)
if(panic_addr && !connectiontopic_a["redirect"])
var/panic_name = CONFIG_GET(string/panic_server_name)
to_chat(src, "<span class='notice'>Sending you to [panic_name ? panic_name : panic_addr].</span>")
winset(src, null, "command=.options")
src << link("[panic_addr]?redirect=1")
qdel(query_client_in_db)
qdel(src)
return
var/datum/DBQuery/query_client_in_db_whitelist = SSdbcore.NewQuery("SELECT 1 FROM [format_table_name("whitelist")] WHERE ckey = '[sql_ckey]'")
if(!query_client_in_db_whitelist.Execute())
qdel(query_client_in_db_whitelist)
return
if(!query_client_in_db_whitelist.NextRow()) //they are not on the whitelist OR have played before! on the database!
log_access("Failed Login: [key] - New account attempting to connect during panic bunker")
message_admins("<span class='adminnotice'>Failed Login: [key] - New account attempting to connect without being whitelisted!</span>")
to_chat(src, "<span class='notice'>You must first join the Discord to verify your account before joining this server.<br>To do so, read the rules here http://hyperstation13.com/rules and post a request in the #whitelist-application under the \"Main server\" category in the Discord server linked here: <a href='https://discordapp.com/invite/PCtX2fH'>https://discordapp.com/invite/PCtX2fH</a></span>") //CIT CHANGE - makes the panic bunker disconnect message point to the discord
var/list/connectiontopic_a = params2list(connectiontopic)
var/list/panic_addr = CONFIG_GET(string/panic_server_address)
if(panic_addr && !connectiontopic_a["redirect"])
var/panic_name = CONFIG_GET(string/panic_server_name)
to_chat(src, "<span class='notice'>Sending you to [panic_name ? panic_name : panic_addr].</span>")
winset(src, null, "command=.options")
src << link("[panic_addr]?redirect=1")
qdel(query_client_in_db)
qdel(src)
return
new_player = 1
account_join_date = sanitizeSQL(findJoinDate())