cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 03:51:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Character preferences / records html decoding (#17796)

Browse Source 
Character preferences / records are now decoded correctly for the
computer UI and character preference.

Known issues, that already existed before this PR: Security incident
reports cannot be imported (nothing appears), charges and details of an
incident do not show up on the PDA application


![image](https://github.com/Aurorastation/Aurora.3/assets/65877598/86817f80-9026-49d7-92c7-57ebbffdf60c)
This commit is contained in:
Fluffy
2024-04-15 08:43:52 +00:00
committed by GitHub
parent b6f650366b
commit 417be39b6a
4 changed files with 64 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preference_setup/general/06_flavor.dm
+2 -2
View File
@@ -124,7 +124,7 @@
"<a href='?src=\ref[src];flavor_text=open'>Set Flavor Text</a><br/>",
"<a href='?src=\ref[src];flavour_text_robot=open'>Set Robot Flavor Text</a><br/>",
"<br>",
"Signature: <font face='[pref.signfont ? pref.signfont : "Verdana"]'>[pref.signature]</font><br/>",
"Signature: <font face='[pref.signfont ? pref.signfont : "Verdana"]'>[html_decode(pref.signature)]</font><br/>",
"<a href='?src=\ref[src];edit_signature=text'>Edit Text</a> | ",
"<a href='?src=\ref[src];edit_signature=font'>Edit Font</a> | ",
"<a href='?src=\ref[src];edit_signature=help'>Help</a> | ",
@@ -164,7 +164,7 @@
else if (href_list["edit_signature"])
switch (href_list["edit_signature"])
if ("text")
var/new_sign = tgui_input_text(usr, "Please input the new character signature.", "New Signature", html2pencode(pref.signature))
var/new_sign = tgui_input_text(usr, "Please input the new character signature.", "New Signature", html2pencode(html_decode(pref.signature)), encode = FALSE)
if (!new_sign)
to_chat(usr, SPAN_NOTICE("Cancelled."))
if (pref.signature)
code/modules/modular_computers/file_system/programs/generic/records.dm
+3 -3
View File
@@ -137,14 +137,14 @@
"sex" = R.sex,
"age" = R.age,
"fingerprint" = R.fingerprint,
"has_notes" = R.notes,
"has_notes" = html_decode(R.notes),
"physical_status" = R.physical_status,
"mental_status" = R.mental_status,
"species" = R.species,
"citizenship" = R.citizenship,
"religion" = R.religion,
"employer" = R.employer,
"notes" = R.notes,
"notes" = html_decode(R.notes),
"blood" = R.medical ? R.medical.blood_type : null,
"dna" = R.medical ? R.medical.blood_dna : null,
"ccia_notes" = R.ccia_record,
@@ -171,7 +171,7 @@
excluded += "security"
if(!(records_type & RECORD_MEDICAL))
excluded += "medical"
var/returned = active.Listify(1, excluded, data["active"])
var/returned = active.Listify(1, excluded, data["active"], decode_html = TRUE)
if(returned)
data["active"] = returned
else