diff options
author | Andrew Dolgov <[email protected]> | 2006-10-01 08:00:04 +0100 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2006-10-01 08:00:04 +0100 |
commit | c91c224952dae21939c8d6d13fb692328e9f65c2 (patch) | |
tree | db528483d2f35d78763a4da6172bb3de478211b3 /backend.php | |
parent | 6e6504bc029415d347712da5a0ca4ed39e394cf3 (diff) |
drop option ENABLE_SEARCH_TOOLBAR, use some more callbacks in filterCR
Diffstat (limited to 'backend.php')
-rw-r--r-- | backend.php | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/backend.php b/backend.php index c63b981c2..74a22e23c 100644 --- a/backend.php +++ b/backend.php @@ -1020,7 +1020,7 @@ print "<table width='100%'>"; print "<tr><td>Title:</td>"; - print "<td><input class=\"iedit\" onkeypress=\"return filterCR(event)\" + print "<td><input class=\"iedit\" onkeypress=\"return filterCR(event, feedEditSave)\" name=\"title\" value=\"$title\"></td></tr>"; $feed_url = db_fetch_result($result, 0, "feed_url"); @@ -1028,7 +1028,7 @@ 0, "feed_url"))); print "<tr><td>Feed URL:</td>"; - print "<td><input class=\"iedit\" onkeypress=\"return filterCR(event)\" + print "<td><input class=\"iedit\" onkeypress=\"return filterCR(event, feedEditSave)\" name=\"feed_url\" value=\"$feed_url\"></td></tr>"; if (get_pref($link, 'ENABLE_FEED_CATS')) { @@ -1127,14 +1127,14 @@ $auth_login = escape_for_form(db_fetch_result($result, 0, "auth_login")); print "<tr><td>Login:</td>"; - print "<td><input class=\"iedit\" onkeypress=\"return filterCR(event)\" + 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")); print "<tr><td>Password:</td>"; print "<td><input class=\"iedit\" type=\"password\" name=\"auth_pass\" - onkeypress=\"return filterCR(event)\" + onkeypress=\"return filterCR(event, feedEditSave)\" value=\"$auth_pass\"></td></tr>"; $private = sql_bool_to_bool(db_fetch_result($result, 0, "private")); @@ -1856,7 +1856,7 @@ print "<table width='100%'>"; print "<tr><td>Match:</td> - <td><input onkeypress=\"return filterCR(event)\" + <td><input onkeypress=\"return filterCR(event, filterEditSave)\" onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\" name=\"reg_exp\" class=\"iedit\" value=\"$reg_exp\">"; @@ -1964,6 +1964,8 @@ $feed_id = db_escape_string($_GET["feed_id"]); $action_id = db_escape_string($_GET["action_id"]); + if (!$regexp) return; + if (!$feed_id) { $feed_id = 'NULL'; } else { @@ -2163,7 +2165,7 @@ print "<table width='100%'>"; print "<tr><td>Caption:</td> - <td><input onkeypress=\"return filterCR(event)\" + <td><input onkeypress=\"return filterCR(event, labelEditSave)\" onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\" name=\"description\" class=\"iedit\" value=\"$description\">"; @@ -2301,7 +2303,9 @@ // no escaping is done here on purpose $sql_exp = trim($_GET["sql_exp"]); $description = db_escape_string($_GET["description"]); - + + if (!$sql_exp || !$description) return; + $result = db_query($link, "INSERT INTO ttrss_labels (sql_exp,description,owner_uid) VALUES ('$sql_exp', '$description', '".$_SESSION["uid"]."')"); @@ -2472,7 +2476,7 @@ print "<table width='100%'> <tr><td>Feed URL:</td><td> <input class=\"iedit\" onblur=\"javascript:enableHotkeys()\" - onkeypress=\"return filterCR(event)\" + onkeypress=\"return filterCR(event, qafAdd)\" onkeyup=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\" onfocus=\"javascript:disableHotkeys()\" name=\"feed_url\"></td></tr>"; @@ -2585,7 +2589,7 @@ print "<table width='100%'>"; print "<tr><td>Caption:</td> - <td><input onkeypress=\"return filterCR(event)\" + <td><input onkeypress=\"return filterCR(event, addLabel)\" onkeyup=\"toggleSubmitNotEmpty(this, 'infobox_submit')\" name=\"description\" class=\"iedit\">"; |