cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-15 18:23:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] fix wrong table usage for admin syncs (#12401)

Browse Source 
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2026-02-08 17:57:20 -07:00
committed by GitHub
parent 901c9e347b
commit b5bc8fb612
11 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/DB ban/functions.dm
+4 -4
View File
@@ -85,7 +85,7 @@
var/datum/db_query/query_insert = SSdbcore.NewQuery(sql)
query_insert.Execute()
to_chat(usr, span_filter_adminlog("[span_blue("Ban saved to database.")]"))
message_admins("[key_name_admin(usr)] has added a [bantype_str] for [ckey] [(job)?"([job])":""] [(duration > 0)?"([duration] minutes)":""] with the reason: \"[reason]\" to the ban database.",1)
message_admins("[key_name_admin(usr)] has added a [bantype_str] for [ckey] [(job)?"([job])":""] [(duration > 0)?"([duration] minutes)":""] with the reason: \"[reason]\" to the ban database.")
qdel(query_insert)
@@ -196,7 +196,7 @@
var/datum/db_query/update_query = SSdbcore.NewQuery("UPDATE erro_ban SET reason = '[value]', edits = CONCAT(edits,'- [eckey] changed ban reason from <cite><b>\\\"[reason]\\\"</b></cite> to <cite><b>\\\"[value]\\\"</b></cite><BR>') WHERE id = [banid]")
update_query.Execute()
message_admins("[key_name_admin(user)] has edited a ban for [pckey]'s reason from [reason] to [value]",1)
message_admins("[key_name_admin(user)] has edited a ban for [pckey]'s reason from [reason] to [value]")
qdel(update_query)
return
if("duration")
@@ -207,7 +207,7 @@
return
var/datum/db_query/update_query = SSdbcore.NewQuery("UPDATE erro_ban SET duration = [value], edits = CONCAT(edits,'- [eckey] changed ban duration from [duration] to [value]<br>'), expiration_time = DATE_ADD(bantime, INTERVAL [value] MINUTE) WHERE id = [banid]")
message_admins("[key_name_admin(user)] has edited a ban for [pckey]'s duration from [duration] to [value]",1)
message_admins("[key_name_admin(user)] has edited a ban for [pckey]'s duration from [duration] to [value]")
update_query.Execute()
qdel(update_query)
return
@@ -252,7 +252,7 @@
var/unban_computerid = src.owner:computer_id
var/unban_ip = src.owner:address
var/sql_update = "UPDATE erro_ban SET unbanned = 1, unbanned_datetime = Now(), unbanned_ckey = '[unban_ckey]', unbanned_computerid = '[unban_computerid]', unbanned_ip = '[unban_ip]' WHERE id = [id]"
message_admins("[key_name_admin(usr)] has lifted [pckey]'s ban.",1)
message_admins("[key_name_admin(usr)] has lifted [pckey]'s ban.")
var/datum/db_query/query_update = SSdbcore.NewQuery(sql_update)
query_update.Execute()
code/modules/admin/admin_ranks.dm
+1 -1
View File
@@ -391,7 +391,7 @@ GLOBAL_PROTECT(protected_ranks)
var/datum/admins/holder = GLOB.protected_admins[holder_ckey]
sql_admins += list(list("ckey" = holder.target, "rank" = holder.rank_names()))
SSdbcore.MassInsert(format_table_name("admin"), sql_admins, duplicate_key = TRUE)
var/datum/db_query/query_admin_rank_update = SSdbcore.NewQuery("UPDATE [format_table_name("player")] AS p INNER JOIN [format_table_name("admin")] AS a ON p.ckey = a.ckey SET p.lastadminrank = a.rank")
var/datum/db_query/query_admin_rank_update = SSdbcore.NewQuery("UPDATE [format_table_name("erro_player")] AS p INNER JOIN [format_table_name("admin")] AS a ON p.ckey = a.ckey SET p.lastadminrank = a.rank")
query_admin_rank_update.Execute()
qdel(query_admin_rank_update)
code/modules/admin/verbs/adminjump.dm
+14 -10
View File
@@ -15,21 +15,25 @@
tgui_alert_async(usr, "Admin jumping disabled")
return
var/area/A
var/area/target_area
if(areaname)
A = return_sorted_areas()[areaname]
target_area = return_sorted_areas()[areaname]
else
A = return_sorted_areas()[tgui_input_list(usr, "Pick an area:", "Jump to Area", return_sorted_areas())]
target_area = return_sorted_areas()[tgui_input_list(src, "Pick an area:", "Jump to Area", return_sorted_areas())]
if(!A)
if(!target_area)
return
usr.on_mob_jump()
usr.reset_perspective(usr)
usr.forceMove(pick(get_area_turfs(A)))
log_admin("[key_name(usr)] jumped to [A]")
message_admins("[key_name_admin(usr)] jumped to [A]", 1)
mob.on_mob_jump()
mob.reset_perspective(mob)
var/turf/target = pick(get_area_turfs(target_area))
if(!target)
to_chat(src, span_warning("Selected area [target_area] has no turfs!"))
return
mob.forceMove(target)
log_admin("[key_name(src)] jumped to [target_area]")
message_admins("[key_name_admin(src)] jumped to [target_area]")
feedback_add_details("admin_verb","JA") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/client/proc/jumptoturf(var/turf/T in world)
@@ -39,7 +43,7 @@
return
if(CONFIG_GET(flag/allow_admin_jump))
log_admin("[key_name(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]")
message_admins("[key_name_admin(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]", 1)
message_admins("[key_name_admin(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]")
usr.on_mob_jump()
usr.reset_perspective(usr)
usr.forceMove(T)