valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

amend previous to fix actual underlying problem (double escaping)

This commit is contained in:
Andrew Dolgov 2021-02-16 15:36:40 +03:00
parent 4f4e57bb26
commit 627af2c236
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
classes/pref/filters.php
View File

@ -388,11 +388,9 @@ class Pref_Filters extends Handler_Protected {
if (!$line["inverse"]) unset($line["inverse"]); if (!$line["inverse"]) unset($line["inverse"]);
unset($line["match_on"]); unset($line["match_on"]);
$data = htmlspecialchars((string)json_encode($line));
print "<li><input dojoType='dijit.form.CheckBox' type='checkbox' onclick='Lists.onRowChecked(this)'> print "<li><input dojoType='dijit.form.CheckBox' type='checkbox' onclick='Lists.onRowChecked(this)'>
<span onclick='App.dialogOf(this).editRule(this)'>".$this->_get_rule_name($line)."</span>". <span onclick='App.dialogOf(this).editRule(this)'>".$this->_get_rule_name($line)."</span>".
\Controls\hidden_tag("rule[]", $data)."</li>"; \Controls\hidden_tag("rule[]", (string)json_encode($line))."</li>";
} }
} }
@ -430,11 +428,9 @@ class Pref_Filters extends Handler_Protected {
unset($line["filter_id"]); unset($line["filter_id"]);
unset($line["id"]); unset($line["id"]);
$data = htmlspecialchars((string)json_encode($line));
print "<li><input dojoType='dijit.form.CheckBox' type='checkbox' onclick='Lists.onRowChecked(this)'> print "<li><input dojoType='dijit.form.CheckBox' type='checkbox' onclick='Lists.onRowChecked(this)'>
<span onclick='App.dialogOf(this).editAction(this)'>".$this->_get_action_name($line)."</span>". <span onclick='App.dialogOf(this).editAction(this)'>".$this->_get_action_name($line)."</span>".
\Controls\hidden_tag("action[]", $data)."</li>"; \Controls\hidden_tag("action[]", (string)json_encode($line))."</li>";
} }
} }

2
include/controls.php
View File

@ -61,7 +61,7 @@
function hidden_tag(string $name, string $value) { function hidden_tag(string $name, string $value) {
return "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" return "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\"
name=\"".htmlspecialchars($name)."\" value=\"$value\">"; name=\"".htmlspecialchars($name)."\" value=\"".htmlspecialchars($value)."\">";
} }
function checkbox_tag(string $name, bool $checked = false, string $value = "", string $attributes = "", string $id = "") { function checkbox_tag(string $name, bool $checked = false, string $value = "", string $attributes = "", string $id = "") {