diff --git a/code/modules/admin/admin_fax_panel.dm b/code/modules/admin/admin_fax_panel.dm
index 73c99f84df1..e4126d89c5d 100644
--- a/code/modules/admin/admin_fax_panel.dm
+++ b/code/modules/admin/admin_fax_panel.dm
@@ -10,7 +10,7 @@
var/datum/fax_panel_interface/ui = new(usr)
ui.ui_interact(usr)
-
+
/// Admin Fax Panel. Tool for sending fax messages faster.
/datum/fax_panel_interface
/// All faxes in from machinery list()
@@ -30,14 +30,14 @@
//Get all faxes, and save them to our list.
for(var/obj/machinery/fax/fax in GLOB.machines)
available_faxes += WEAKREF(fax)
-
+
//Get all stamps
for(var/stamp in subtypesof(/obj/item/stamp))
var/obj/item/stamp/real_stamp = new stamp()
if(!istype(real_stamp, /obj/item/stamp/chameleon) && !istype(real_stamp, /obj/item/stamp/mod))
var/stamp_detail = real_stamp.get_writing_implement_details()
stamp_list += list(list(real_stamp.name, real_stamp.icon_state, stamp_detail["stamp_class"]))
-
+
//Give our paper special status, to read everywhere.
fax_paper.request_state = TRUE
@@ -74,12 +74,12 @@
for(var/stamp in stamp_list)
data["stamps"] += list(stamp[1]) // send only names.
-
+
for(var/datum/weakref/weakrefed_fax as anything in available_faxes)
var/obj/machinery/fax/another_fax = weakrefed_fax.resolve()
if(another_fax && istype(another_fax))
data["faxes"] += list(another_fax.fax_name)
-
+
return data
/datum/fax_panel_interface/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
@@ -88,12 +88,12 @@
if(!check_rights(R_ADMIN))
return
-
+
var/obj/machinery/fax/action_fax
if(params["faxName"])
- action_fax = get_fax_by_name(params["faxName"])
-
+ action_fax = get_fax_by_name(params["faxName"])
+
switch(action)
if("follow")
@@ -101,20 +101,20 @@
usr.client?.admin_ghost()
usr.client?.admin_follow(action_fax)
-
+
if("preview") // see saved variant
if(!fax_paper)
return
fax_paper.ui_interact(usr)
-
+
if("save") // save paper
if(params["paperName"])
default_paper_name = params["paperName"]
if(params["fromWho"])
sending_fax_name = params["fromWho"]
-
+
fax_paper.clear_paper()
- var/stamp
+ var/stamp
var/stamp_class
for(var/needed_stamp in stamp_list)
@@ -122,24 +122,24 @@
stamp = needed_stamp[2]
stamp_class = needed_stamp[3]
break
-
+
fax_paper.name = "paper — [default_paper_name]"
- fax_paper.add_raw_text(params["rawText"])
+ fax_paper.add_raw_text(params["rawText"], advanced_html = TRUE)
if(stamp)
fax_paper.add_stamp(stamp_class, params["stampX"], params["stampY"], params["stampAngle"], stamp)
-
- fax_paper.update_static_data(usr) // OK, it's work, and update UI.
-
+
+ fax_paper.update_static_data(usr) // OK, it's work, and update UI.
+
if("send")
//copy
var/obj/item/paper/our_fax = fax_paper.copy(/obj/item/paper)
our_fax.name = fax_paper.name
//send
action_fax.receive(our_fax, sending_fax_name)
- message_admins("[key_name_admin(usr)] has send custom fax message to [action_fax.name][ADMIN_FLW(action_fax)][ADMIN_SHOW_PAPER(fax_paper)].")
- log_admin("[key_name(usr)] has send custom fax message to [action_fax.name]")
-
+ message_admins("[key_name_admin(usr)] has sent a custom fax message to [action_fax.name][ADMIN_FLW(action_fax)][ADMIN_SHOW_PAPER(fax_paper)].")
+ log_admin("[key_name(usr)] has sent a custom fax message to [action_fax.name]")
+
if("createPaper")
var/obj/item/paper/our_paper = fax_paper.copy(/obj/item/paper, usr.loc)
our_paper.name = fax_paper.name
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 0b20dfc8723..ec5430f9b1b 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -161,13 +161,15 @@
* * font - The font to use.
* * color - The font color to use.
* * bold - Whether this text should be rendered completely bold.
+ * * advanced_html - Boolean that is true when the writer has R_FUN permission, which sanitizes less HTML (such as images) from the new paper_input
*/
-/obj/item/paper/proc/add_raw_text(text, font, color, bold)
+/obj/item/paper/proc/add_raw_text(text, font, color, bold, advanced_html)
var/new_input_datum = new /datum/paper_input(
text,
font,
color,
bold,
+ advanced_html,
)
input_field_count += get_input_field_count(text)
@@ -585,7 +587,7 @@
// Safe to assume there are writing implement details as user.can_write(...) fails with an invalid writing implement.
var/writing_implement_data = holding.get_writing_implement_details()
- add_raw_text(paper_input, writing_implement_data["font"], writing_implement_data["color"], writing_implement_data["use_bold"])
+ add_raw_text(paper_input, writing_implement_data["font"], writing_implement_data["color"], writing_implement_data["use_bold"], check_rights_for(user?.client, R_FUN))
log_paper("[key_name(user)] wrote to [name]: \"[paper_input]\"")
to_chat(user, "You have added to your paper masterpiece!");
@@ -672,15 +674,18 @@
var/colour = ""
/// Whether to render the font bold or not.
var/bold = FALSE
+ /// Whether the creator of this input field has the R_FUN permission, thus allowing less sanitization
+ var/advanced_html = FALSE
-/datum/paper_input/New(_raw_text, _font, _colour, _bold)
+/datum/paper_input/New(_raw_text, _font, _colour, _bold, _advanced_html)
raw_text = _raw_text
font = _font
colour = _colour
bold = _bold
+ advanced_html = _advanced_html
/datum/paper_input/proc/make_copy()
- return new /datum/paper_input(raw_text, font, colour, bold);
+ return new /datum/paper_input(raw_text, font, colour, bold, advanced_html)
/datum/paper_input/proc/to_list()
return list(
@@ -688,6 +693,7 @@
font = font,
color = colour,
bold = bold,
+ advanced_html = advanced_html,
)
/// A single instance of a saved stamp on paper.
diff --git a/tgui/packages/tgui/interfaces/AdminFax.js b/tgui/packages/tgui/interfaces/AdminFax.js
index ea7d410bb11..e91130baf39 100644
--- a/tgui/packages/tgui/interfaces/AdminFax.js
+++ b/tgui/packages/tgui/interfaces/AdminFax.js
@@ -199,7 +199,7 @@ export const FaxMainPanel = (props, context) => {
faxName: fax,
})
}>
- Send fax
+ Send