From dc2c9fb07defb97d06b26f466af68ef910ab57f8 Mon Sep 17 00:00:00 2001 From: AnturK Date: Sun, 10 Sep 2017 00:12:52 +0200 Subject: [PATCH 1/4] Fixes admin topics --- code/modules/admin/topic.dm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index f7b0f8b6ff..fc52c79de1 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1,3 +1,19 @@ +<<<<<<< HEAD +======= +/datum/admins/proc/CheckAdminHref(href, href_list) + var/auth = href_list["admin_token"] + . = auth && (auth == href_token || auth == GLOB.href_token) + if(.) + return + var/msg = !auth ? "no" : "a bad" + message_admins("[key_name_admin(usr)] clicked an href with [msg] authorization key!") + if(config.debug_admin_hrefs) + message_admins("Debug mode enabled, call not blocked. Please ask your coders to review this round's logs.") + log_world("UAH: [href]") + return TRUE + log_admin_private("[key_name(usr)] clicked an href with [msg] authorization key! [href]") + +>>>>>>> 1204251... Fixes admin topics (#30554) /datum/admins/Topic(href, href_list) ..() From b89fa8ab15d5946c625697cf42a4b28863b9c3c5 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sun, 10 Sep 2017 15:54:31 -0500 Subject: [PATCH 2/4] Update topic.dm --- code/modules/admin/topic.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index fc52c79de1..88e3fb8e16 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= /datum/admins/proc/CheckAdminHref(href, href_list) var/auth = href_list["admin_token"] . = auth && (auth == href_token || auth == GLOB.href_token) @@ -12,8 +10,7 @@ log_world("UAH: [href]") return TRUE log_admin_private("[key_name(usr)] clicked an href with [msg] authorization key! [href]") - ->>>>>>> 1204251... Fixes admin topics (#30554) + /datum/admins/Topic(href, href_list) ..() From b8f2fe00e58d982210e0968f72cb4077391d82c3 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 12 Sep 2017 02:31:25 -0500 Subject: [PATCH 3/4] Update topic.dm --- code/modules/admin/topic.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 8487e58810..b714ef1ff9 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -9,10 +9,10 @@ message_admins("Debug mode enabled, call not blocked. Please ask your coders to review this round's logs.") log_world("UAH: [href]") return TRUE -log_admin_private("[key_name(usr)] clicked an href with [msg] authorization key! [href]") + log_admin_private("[key_name(usr)] clicked an href with [msg] authorization key! [href]") /datum/admins/Topic(href, href_list) - ..() +..() if(usr.client != src.owner || !check_rights(0)) message_admins("[usr.key] has attempted to override the admin panel!") From 4fdc313486c2a9e082c37453d75a027bb152f3d1 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 12 Sep 2017 02:36:28 -0500 Subject: [PATCH 4/4] Update topic.dm --- code/modules/admin/topic.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index b714ef1ff9..887ce20882 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -12,7 +12,7 @@ log_admin_private("[key_name(usr)] clicked an href with [msg] authorization key! [href]") /datum/admins/Topic(href, href_list) -..() + ..() if(usr.client != src.owner || !check_rights(0)) message_admins("[usr.key] has attempted to override the admin panel!")