Committing for Giacom

-Fix for Issue 555 and Issue 571, so special characters on paper and in announcements don't get converted to html

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3868 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
sieve32@gmail.com
2012-06-19 03:15:55 +00:00
parent 834b9f98d1
commit af9c38a375
3 changed files with 12 additions and 3 deletions

View File

@@ -98,7 +98,7 @@
if("announce")
if(src.authenticated==2)
if(message_cooldown) return
var/input = copytext(sanitize(input(usr, "Please choose a message to announce to the station crew.", "What?", "")),1,MAX_MESSAGE_LEN)
var/input = copytext(strip_html_simple(input(usr, "Please choose a message to announce to the station crew.", "What?", "")),1,MAX_MESSAGE_LEN)
if(!input || !(usr in view(1,src)))
return
captain_announce(input)//This should really tell who is, IE HoP, CE, HoS, RD, Captain

View File

@@ -149,7 +149,7 @@
updateinfolinks()
/obj/item/weapon/paper/proc/parsepencode(var/t, var/obj/item/weapon/pen/P, mob/user as mob, var/iscrayon = 0)
t = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
// t = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
t = dd_replacetext(t, "\[center\]", "<center>")
t = dd_replacetext(t, "\[/center\]", "</center>")
@@ -184,7 +184,7 @@
t = "<font face=\"[crayonfont]\" color=[P.colour]><b>[t]</b></font>"
t = dd_replacetext(t, "#", "") // Junk converted to nothing!
// t = dd_replacetext(t, "#", "") // Junk converted to nothing!
//Count the fields
var/laststart = 1