cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Added +BAN permission checks to DB_Ban

Browse Source 
- Uncommented a piece of code in IsBanned() that was only commented for testing purposes. Admins now once again ignore any bans to their name, except for daemon bans.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5036 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz
2012-11-11 07:32:13 +00:00
parent 8e52e8cbdf
commit 5182bb69ae
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
code/modules/admin/DB ban/functions.dm
View File

@@ -1,5 +1,10 @@
datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = -1, var/reason, var/job = "", var/rounds = 0, var/banckey = null) datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration = -1, var/reason, var/job = "", var/rounds = 0, var/banckey = null)
if(!check_rights(R_BAN))
usr << "\red You do not have permission to do this!"
return
establish_db_connection() establish_db_connection()
if(!dbcon.IsConnected()) if(!dbcon.IsConnected())
return return
@@ -82,6 +87,10 @@ datum/admins/proc/DB_ban_record(var/bantype, var/mob/banned_mob, var/duration =
datum/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "") datum/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "")
if(!check_rights(R_BAN))
usr << "\red You do not have permission to do this!"
return
var/bantype_str var/bantype_str
if(bantype) if(bantype)
var/bantype_pass = 0 var/bantype_pass = 0
@@ -144,6 +153,10 @@ datum/admins/proc/DB_ban_unban(var/ckey, var/bantype, var/job = "")
datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null) datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null)
if(!check_rights(R_BAN))
usr << "\red You do not have permission to do this!"
return
if(!isnum(banid) || !istext(param)) if(!isnum(banid) || !istext(param))
usr << "Cancelled" usr << "Cancelled"
return return
@@ -202,6 +215,10 @@ datum/admins/proc/DB_ban_edit(var/banid = null, var/param = null)
datum/admins/proc/DB_ban_unban_by_id(var/id) datum/admins/proc/DB_ban_unban_by_id(var/id)
if(!check_rights(R_BAN))
usr << "\red You do not have permission to do this!"
return
var/sql = "SELECT ckey FROM erro_ban WHERE id = [id]" var/sql = "SELECT ckey FROM erro_ban WHERE id = [id]"
establish_db_connection() establish_db_connection()
@@ -254,9 +271,9 @@ datum/admins/proc/DB_ban_unban_by_id(var/id)
if(!usr.client) if(!usr.client)
return return
//if(check_rights(R_BAN)) if(!check_rights(R_BAN))
// usr << "\red You do not have permission to do this!" usr << "\red You do not have permission to do this!"
// return return
establish_db_connection() establish_db_connection()
if(!dbcon.IsConnected()) if(!dbcon.IsConnected())

4
code/modules/admin/IsBanned.dm
View File

@@ -1,7 +1,7 @@
//Blocks an attempt to connect before even creating our client datum thing. //Blocks an attempt to connect before even creating our client datum thing.
world/IsBanned(key,address,computer_id) world/IsBanned(key,address,computer_id)
//if(ckey(key) in admin_datums) if(ckey(key) in admin_datums)
// return ..() return ..()
if(config.ban_legacy_system) if(config.ban_legacy_system)