From 20cacd30de9b7b5b25847d2086162a718cf7413a Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Mon, 14 Jan 2013 23:44:16 +1000 Subject: [PATCH] sanitize renaming id cards via computer and agent cards Signed-off-by: Cael_Aislinn --- code/game/machinery/computer/card.dm | 6 +++++- code/game/objects/items/weapons/cards_ids.dm | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 773d4897c71..fc422d6d874 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -253,7 +253,11 @@ var/t2 = modify //var/t1 = input(usr, "What name?", "ID computer", null) as text if ((authenticated && modify == t2 && (in_range(src, usr) || (istype(usr, /mob/living/silicon))) && istype(loc, /turf))) - modify.registered_name = href_list["reg"] + var/temp_name = reject_bad_name(href_list["reg"]) + if(temp_name) + modify.registered_name = temp_name + else + src.visible_message("[src] buzzes rudely.") if ("mode") mode = text2num(href_list["mode_target"]) if ("print") diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index 9117e3f63d0..0ebd8ed7a02 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -132,8 +132,8 @@ /obj/item/weapon/card/id/syndicate/attack_self(mob/user as mob) if(!src.registered_name) //Stop giving the players unsanitized unputs! You are giving ways for players to intentionally crash clients! -Nodrak - var t = copytext(sanitize(input(user, "What name would you like to put on this card?", "Agent card name", ishuman(user) ? user.real_name : user.name)),1,26) - if(!t || t == "Unknown" || t == "floor" || t == "wall" || t == "r-wall" || t == "") //Same as mob/new_player/prefrences.dm + var t = reject_bad_name(input(user, "What name would you like to put on this card?", "Agent card name", ishuman(user) ? user.real_name : user.name)) + if(!t) //Same as mob/new_player/prefrences.dm alert("Invalid name.") return src.registered_name = t