cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1825 from Markolie/admins

Browse Source 
Readmin fix, antag age update
This commit is contained in:
Fox-McCloud
2015-08-22 16:03:42 -04:00
parent 89b34aae2c e2246d40c5
commit 76d1493601
2 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin_verbs.dm
+29 -11
View File
@@ -595,8 +595,8 @@ var/list/admin_verbs_mentor = list(
continue
else
if(!dbcon.IsConnected())
message_admins("Warning, mysql database is not connected.")
src << "Warning, mysql database is not connected."
message_admins("Warning, MySQL database is not connected.")
src << "Warning, MYSQL database is not connected."
return
var/sql_ckey = sanitizeSQL(ckey)
var/DBQuery/query = dbcon.NewQuery("SELECT rank FROM [format_table_name("admin")] WHERE ckey = '[sql_ckey]'")
@@ -604,16 +604,34 @@ var/list/admin_verbs_mentor = list(
while(query.NextRow())
rank = ckeyEx(query.item[1])
if(!D)
if(admin_ranks[rank] == null)
var/error_extra = ""
if(!config.admin_legacy_system)
error_extra = " Check mysql DB connection."
error("Error while re-adminning [src], admin rank ([rank]) does not exist.[error_extra]")
src << "Error while re-adminning, admin rank ([rank]) does not exist.[error_extra]"
return
D = new(rank,admin_ranks[rank],ckey)
if(config.admin_legacy_system)
if(admin_ranks[rank] == null)
error("Error while re-adminning [src], admin rank ([rank]) does not exist.")
src << "Error while re-adminning, admin rank ([rank]) does not exist."
return
D = new(rank, admin_ranks[rank], ckey)
else
var/sql_ckey = sanitizeSQL(ckey)
var/DBQuery/query = dbcon.NewQuery("SELECT ckey, rank, flags FROM [format_table_name("admin")] WHERE ckey = '[sql_ckey]'")
query.Execute()
while(query.NextRow())
var/admin_ckey = query.item[1]
var/admin_rank = query.item[2]
var/flags = query.item[3]
if(!admin_ckey)
src << "Error while re-adminning, ckey [admin_ckey] was not found in the admin database."
return
if(admin_rank == "Removed") //This person was de-adminned. They are only in the admin list for archive purposes.
src << "Error while re-adminning, ckey [admin_ckey] is not an admin."
return
if(istext(flags))
flags = text2num(flags)
D = new(admin_rank, flags, ckey)
var/client/C = directory[ckey]
D.associate(C)
D.associate(C)
message_admins("[key_name_admin(usr)] re-adminned themselves.")
log_admin("[key_name(usr)] re-adminned themselves.")
deadmins -= ckey