diff options
| -rw-r--r-- | functions.js | 8 | ||||
| -rw-r--r-- | modules/popup-dialog.php | 21 | ||||
| -rw-r--r-- | modules/pref-feeds.php | 7 | ||||
| -rw-r--r-- | modules/pref-filters.php | 12 | ||||
| -rw-r--r-- | modules/pref-labels.php | 28 |
5 files changed, 52 insertions, 24 deletions
diff --git a/functions.js b/functions.js index 72011568e..7442daa67 100644 --- a/functions.js +++ b/functions.js @@ -1343,7 +1343,9 @@ function infobox_submit_callback() { } } catch (e) { } -// notify_info(xmlhttp.responseText); + if (xmlhttp.responseText) { + notify_info(xmlhttp.responseText); + } } } @@ -1364,7 +1366,7 @@ function infobox_callback() { } } -function qaddFilter() { +function addFilter() { if (!xmlhttp_ready(xmlhttp)) { printLockingError(); @@ -1400,7 +1402,7 @@ function isValidURL(s) { return s.match("http://") != null || s.match("https://") != null || s.match("feed://") != null; } -function qafAdd() { +function qaddFeed() { if (!xmlhttp_ready(xmlhttp)) { printLockingError(); diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php index 6ac80be74..8fe1ac4b3 100644 --- a/modules/popup-dialog.php +++ b/modules/popup-dialog.php @@ -36,6 +36,7 @@ print "</div>"; + return; } if ($id == "quickAddFeed") { @@ -52,7 +53,7 @@ print "<table width='100%'> <tr><td>Feed URL:</td><td> <input class=\"iedit\" onblur=\"javascript:enableHotkeys()\" - onkeypress=\"return filterCR(event, qafAdd)\" + onkeypress=\"return filterCR(event, qaddFeed)\" onkeyup=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\" onchange=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\" onfocus=\"javascript:disableHotkeys()\" name=\"feed_url\"></td></tr>"; @@ -69,10 +70,12 @@ print "<div align='right'> <input class=\"button\" id=\"fadd_submit_btn\" disabled=\"true\" - type=\"submit\" onclick=\"return qafAdd()\" value=\"".__('Subscribe')."\"> + type=\"submit\" onclick=\"return qaddFeed()\" value=\"".__('Subscribe')."\"> <input class=\"button\" type=\"submit\" onclick=\"return closeInfoBox()\" value=\"".__('Cancel')."\"></div>"; + + return; } if ($id == "search") { @@ -153,6 +156,8 @@ print "</div>"; + return; + } if ($id == "quickAddLabel") { @@ -200,6 +205,8 @@ print "<input class=\"button\" type=\"submit\" onclick=\"return labelEditCancel()\" value=\"".__('Cancel')."\">"; + + return; } if ($id == "quickAddFilter") { @@ -279,7 +286,7 @@ print "<input type=\"submit\" id=\"infobox_submit\" - class=\"button\" onclick=\"return qaddFilter()\" + class=\"button\" onclick=\"return addFilter()\" disabled=\"true\" value=\"".__('Create')."\"> "; print "<input class=\"button\" @@ -290,6 +297,7 @@ // print "</td></tr></table>"; + return; } if ($id == "feedUpdateErrors") { @@ -379,8 +387,13 @@ print "</div>"; + return; } - print "</div>"; + print "<div id='infoBoxTitle'>Internal Error</div> + <div id='infoBoxContents'> + <p>Unknown dialog <b>$id</b></p> + </div></div>"; + } ?> diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index 5a5d0f0e7..57a224eb9 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -750,9 +750,8 @@ <input type=\"submit\" class=\"button\" onclick=\"javascript:updateFeedList()\" value=\"".__('Search')."\"> </div>"; - - print "<div class=\"prefGenericAddBox\"> - <input id=\"fadd_link\" + + print "<input id=\"fadd_link\" onkeyup=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\" onchange=\"toggleSubmitNotEmpty(this, 'fadd_submit_btn')\" size=\"40\"> @@ -765,8 +764,6 @@ onclick=\"javascript:browseFeeds()\" value=\"".__('Top 25')."\">"; } - print "</div>"; - $feeds_sort = db_escape_string($_GET["sort"]); if (!$feeds_sort || $feeds_sort == "undefined") { diff --git a/modules/pref-filters.php b/modules/pref-filters.php index 1403464b1..57432955a 100644 --- a/modules/pref-filters.php +++ b/modules/pref-filters.php @@ -149,7 +149,11 @@ inverse = $inverse, action_param = '$action_param' WHERE id = '$filter_id' AND owner_uid = " . $_SESSION["uid"]); - + + if (db_affected_rows($link, $result) != 0) { + print_notice(T_sprintf("Saved filter <b>%s</b>", htmlspecialchars($reg_exp))); + } + } if ($subop == "remove") { @@ -186,7 +190,11 @@ ('$regexp', '$filter_type','".$_SESSION["uid"]."', $feed_id, '$action_id', '$action_param', $inverse)"); - print_notice(T_sprintf("Created filter <b>%s</b>", htmlspecialchars($regexp))); + if (db_affected_rows($link, $result) != 0) { + print T_sprintf("Created filter <b>%s</b>", htmlspecialchars($regexp)); + } + + return; } if ($quiet) return; diff --git a/modules/pref-labels.php b/modules/pref-labels.php index ccd669fc2..c07d6132f 100644 --- a/modules/pref-labels.php +++ b/modules/pref-labels.php @@ -153,6 +153,11 @@ sql_exp = '$sql_exp', description = '$descr' WHERE id = '$label_id'"); + + if (db_affected_rows($link, $result) != 0) { + print_notice(T_sprintf("Saved label <b>%s</b>", htmlspecialchars($descr))); + } + } if ($subop == "remove") { @@ -169,19 +174,22 @@ } if ($subop == "add") { - - if (!WEB_DEMO_MODE) { - // no escaping is done here on purpose - $sql_exp = trim($_GET["sql_exp"]); - $description = db_escape_string($_GET["description"]); + // no escaping is done here on purpose + $sql_exp = trim($_GET["sql_exp"]); + $description = db_escape_string($_GET["description"]); - if (!$sql_exp || !$description) return; + if (!$sql_exp || !$description) return; - $result = db_query($link, - "INSERT INTO ttrss_labels (sql_exp,description,owner_uid) - VALUES ('$sql_exp', '$description', '".$_SESSION["uid"]."')"); - } + $result = db_query($link, + "INSERT INTO ttrss_labels (sql_exp,description,owner_uid) + VALUES ('$sql_exp', '$description', '".$_SESSION["uid"]."')"); + + if (db_affected_rows($link, $result) != 0) { + print T_sprintf("Created label <b>%s</b>", htmlspecialchars($description)); + } + + return; } $sort = db_escape_string($_GET["sort"]); |