diff options
Diffstat (limited to 'modules')
-rw-r--r-- | modules/backend-rpc.php | 29 | ||||
-rw-r--r-- | modules/pref-feeds.php | 31 |
2 files changed, 16 insertions, 44 deletions
diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php index 8b22bf850..afcd82d3f 100644 --- a/modules/backend-rpc.php +++ b/modules/backend-rpc.php @@ -87,9 +87,8 @@ } if ($subop == "publ") { - $pub = $_REQUEST["pub"]; - $id = db_escape_string($_REQUEST["id"]); - $note = trim(strip_tags(db_escape_string($_REQUEST["note"]))); + $pub = $_GET["pub"]; + $id = db_escape_string($_GET["id"]); if ($pub == "1") { $pub = "true"; @@ -97,36 +96,18 @@ $pub = "false"; } - if ($note != 'undefined') { - $note_qpart = "note = '$note',"; - } - // FIXME this needs collision testing - $result = db_query($link, "UPDATE ttrss_user_entries SET - $note_qpart - published = $pub + $result = db_query($link, "UPDATE ttrss_user_entries SET published = $pub WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]); - - print "<rpc-reply>"; - - print "<counters>"; + print "<rpc-reply><counters>"; getGlobalCounters($link); getLabelCounters($link); if (get_pref($link, 'ENABLE_FEED_CATS')) { getCategoryCounters($link); } - print "</counters>"; - - if ($note != 'undefined') { - $note_size = strlen($note); - print "<note id=\"$id\" size=\"$note_size\">"; - print "<![CDATA[" . format_article_note($id, $note) . "]]>"; - print "</note>"; - } - - print "</rpc-reply>"; + print "</counters></rpc-reply>"; return; } diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index 36a0e4d32..fae1fbe2f 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -702,12 +702,8 @@ if (file_exists($icons_dir . "/$id.ico")) { unlink($icons_dir . "/$id.ico"); } - - ccache_remove($link, $id, $_SESSION["uid"]); - } else { label_remove($link, -11-$id, $_SESSION["uid"]); - ccache_remove($link, -11-$id, $_SESSION["uid"]); } } } @@ -996,9 +992,6 @@ if ($num_feeds == 0) { db_query($link, "DELETE FROM ttrss_feed_categories WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]); - - ccache_remove($link, $id, $_SESSION["uid"], true); - } else { print format_warning(__("Unable to delete non empty feed categories.")); @@ -1376,28 +1369,26 @@ print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\"> <option value=\"facDefault\" selected>".__('Actions...')."</option> - <optgroup label=\"".__('Selection:')."\"> - <option value=\"facEdit\">".__('Edit')."</option>"; + <option disabled>--------</option> + <option style=\"color : #5050aa\" disabled>".__('Selection:')."</option> + <option value=\"facEdit\"> ".__('Edit')."</option>"; if (FORCE_ARTICLE_PURGE == 0) { print - "<option value=\"facPurge\">".__('Manual purge')."</option>"; + "<option value=\"facPurge\"> ".__('Manual purge')."</option>"; } print " - <option value=\"facClear\">".__('Clear feed data')."</option> - <option value=\"facRescore\">".__('Rescore articles')."</option> - <option value=\"facUnsubscribe\">".__('Unsubscribe')."</option>"; - - print "</optgroup>"; + <option value=\"facClear\"> ".__('Clear feed data')."</option> + <option value=\"facRescore\"> ".__('Rescore articles')."</option> + <option value=\"facUnsubscribe\"> ".__('Unsubscribe')."</option>"; if (get_pref($link, 'ENABLE_FEED_CATS')) { - print "<optgroup label=\"".__('Other:')."\"> - <option value=\"facEditCats\">".__('Edit categories')." - </option> - </optgroup>"; - + print "<option disabled>--------</option> + <option style=\"color : #5050aa\" disabled>".__('Other:')."</option> + <option value=\"facEditCats\"> ".__('Edit categories')." + </option>"; } print "</select>"; |