public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-01-03 07:49:15 +00:00
Code Issues Releases Wiki Activity

remove db_unescape_string() hack

Browse Source
This commit is contained in:
Andrew Dolgov
2007-05-19 15:09:16 +01:00
parent 83fe113a39
commit 474390311f
4 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/pref-feeds.php
View File

@@ -101,7 +101,7 @@
$class = ($feedctr % 2) ? "even" : "odd";
print "<li class='$class' id=\"FBROW-".$details["id"]."\">$check_box".
"$feed_icon " . db_unescape_string($details["title"]) .
"$feed_icon " . $details["title"] .
"&nbsp;<span class='subscribers'>($subscribers)</span></li>";
++$feedctr;
@@ -130,8 +130,8 @@
"SELECT * FROM ttrss_feeds WHERE id = '$feed_id' AND
owner_uid = " . $_SESSION["uid"]);
$title = htmlspecialchars(db_unescape_string(db_fetch_result($result,
0, "title")));
$title = htmlspecialchars(db_fetch_result($result,
0, "title"));
$icon_file = ICONS_DIR . "/$feed_id.ico";
@@ -159,8 +159,8 @@
name=\"title\" value=\"$title\"></td></tr>";
$feed_url = db_fetch_result($result, 0, "feed_url");
$feed_url = htmlspecialchars(db_unescape_string(db_fetch_result($result,
0, "feed_url")));
$feed_url = htmlspecialchars(db_fetch_result($result,
0, "feed_url"));
print "<tr><td>".__('Feed URL:')."</td>";
print "<td><input class=\"iedit\" onkeypress=\"return filterCR(event, feedEditSave)\"
@@ -259,13 +259,13 @@
print "</td>";
$auth_login = escape_for_form(db_fetch_result($result, 0, "auth_login"));
$auth_login = htmlspecialchars(db_fetch_result($result, 0, "auth_login"));
print "<tr><td>".__('Login:')."</td>";
print "<td><input class=\"iedit\" onkeypress=\"return filterCR(event, feedEditSave)\"
name=\"auth_login\" value=\"$auth_login\"></td></tr>";
$auth_pass = escape_for_form(db_fetch_result($result, 0, "auth_pass"));
$auth_pass = htmlspecialchars(db_fetch_result($result, 0, "auth_pass"));
print "<tr><td>".__('Password:')."</td>";
print "<td><input class=\"iedit\" type=\"password\" name=\"auth_pass\"
@@ -652,7 +652,7 @@
print "<tr class=\"$class\" $this_row_id>";
$edit_title = htmlspecialchars(db_unescape_string($line["title"]));
$edit_title = htmlspecialchars($line["title"]);
if (!$edit_cat_id || $action != "edit") {
@@ -880,8 +880,8 @@
$feed_id = $line["id"];
$cat_id = $line["cat_id"];
$edit_title = htmlspecialchars(db_unescape_string($line["title"]));
$edit_cat = htmlspecialchars(db_unescape_string($line["category"]));
$edit_title = htmlspecialchars($line["title"]);
$edit_cat = htmlspecialchars($line["category"]);
$hidden = sql_bool_to_bool($line["hidden"]);

6
modules/pref-filters.php
View File

@@ -10,7 +10,7 @@
$result = db_query($link,
"SELECT * FROM ttrss_filters WHERE id = '$filter_id' AND owner_uid = " . $_SESSION["uid"]);
$reg_exp = htmlspecialchars(db_unescape_string(db_fetch_result($result, 0, "reg_exp")));
$reg_exp = htmlspecialchars(db_fetch_result($result, 0, "reg_exp"));
$filter_type = db_fetch_result($result, 0, "filter_type");
$feed_id = db_fetch_result($result, 0, "feed_id");
$action_id = db_fetch_result($result, 0, "action_id");
@@ -285,11 +285,11 @@
print "<tr class=\"$class\" $this_row_id>";
$line["reg_exp"] = htmlspecialchars(db_unescape_string($line["reg_exp"]));
$line["reg_exp"] = htmlspecialchars($line["reg_exp"]);
if (!$line["feed_title"]) $line["feed_title"] = __("All feeds");
$line["feed_title"] = htmlspecialchars(db_unescape_string($line["feed_title"]));
$line["feed_title"] = htmlspecialchars($line["feed_title"]);
print "<td align='center'><input onclick='toggleSelectPrefRow(this, \"filter\");'
type=\"checkbox\" id=\"FICHK-".$line["id"]."\"></td>";

14
modules/pref-labels.php
View File

@@ -21,8 +21,8 @@
$line = db_fetch_assoc($result);
$sql_exp = htmlspecialchars(db_unescape_string($line["sql_exp"]));
$description = htmlspecialchars(db_unescape_string($line["description"]));
$sql_exp = htmlspecialchars($line["sql_exp"]);
$description = htmlspecialchars($line["description"]);
print "<div id=\"infoBoxTitle\">Label editor</div>";
print "<div class=\"infoBoxContents\">";
@@ -78,8 +78,9 @@
if ($subop == "test") {
$expr = db_unescape_string(trim($_GET["expr"]));
$descr = db_unescape_string(trim($_GET["descr"]));
// no escaping here on purpose
$expr = trim($_GET["expr"]);
$descr = db_escape_string(trim($_GET["descr"]));
if (!$expr) {
print "<div>Error: SQL expression is blank.</div>";
@@ -260,9 +261,8 @@
print "<tr class=\"$class\" $this_row_id>";
$line["sql_exp"] = htmlspecialchars(db_unescape_string($line["sql_exp"]));
$line["description"] = htmlspecialchars(
db_unescape_string($line["description"]));
$line["sql_exp"] = htmlspecialchars($line["sql_exp"]);
$line["description"] = htmlspecialchars($line["description"]);
if (!$line["description"]) $line["description"] = "[No caption]";