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

add ttrss_feeds.mark_unread_on_update, bump schema, cleanup ttrss_prefs

Browse Source
This commit is contained in:
Andrew Dolgov
2011-03-29 11:54:44 +04:00
parent 46a8bd444d
commit 9382ca847f
8 changed files with 79 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
modules/pref-feeds.php
View File

@@ -450,6 +450,18 @@
__('Cache images locally (SimplePie only)')."</label>";
}
$mark_unread_on_update = sql_bool_to_bool(db_fetch_result($result, 0, "mark_unread_on_update"));
if ($mark_unread_on_update) {
$checked = "checked";
} else {
$checked = "";
}
print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"mark_unread_on_update\"
name=\"mark_unread_on_update\"
$checked>&nbsp;<label for=\"mark_unread_on_update\">".__('Mark updated articles as unread')."</label>";
# print "</div>";
print "</div>";
@@ -621,6 +633,13 @@
print "&nbsp;"; batch_edit_cbox("cache_images", "cache_images_l");
}
print "<br/><input disabled=\"1\" type=\"checkbox\" id=\"mark_unread_on_update\"
name=\"mark_unread_on_update\"
dojoType=\"dijit.form.CheckBox\">&nbsp;<label id=\"mark_unread_on_update_l\" class='insensitive' for=\"mark_unread_on_update\">".__('Mark updated articles as unread')."</label>";
print "&nbsp;"; batch_edit_cbox("mark_unread_on_update", "mark_unread_on_update_l");
print "</div>";
print "<div class='dlgButtons'>
@@ -657,6 +676,9 @@
$always_display_enclosures = checkbox_to_sql_bool(
db_escape_string($_POST["always_display_enclosures"]));
$mark_unread_on_update = checkbox_to_sql_bool(
db_escape_string($_POST["mark_unread_on_update"]));
if (get_pref($link, 'ENABLE_FEED_CATS')) {
if ($cat_id && $cat_id != 0) {
$category_qpart = "cat_id = '$cat_id',";
@@ -690,6 +712,7 @@
$cache_images_qpart
include_in_digest = $include_in_digest,
always_display_enclosures = $always_display_enclosures,
mark_unread_on_update = $mark_unread_on_update,
update_method = '$update_method'
WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]);
@@ -745,6 +768,10 @@
$qpart = "always_display_enclosures = '$always_display_enclosures'";
break;
case "mark_unread_on_update":
$qpart = "mark_unread_on_update = '$mark_unread_on_update'";
break;
case "cache_images":
$qpart = "cache_images = '$cache_images'";
break;

12
modules/pref-prefs.php
View File

@@ -5,17 +5,13 @@
$subop = $_REQUEST["subop"];
$prefs_blacklist = array("HIDE_FEEDLIST", "SYNC_COUNTERS", "ENABLE_LABELS",
"ENABLE_SEARCH_TOOLBAR", "HIDE_READ_FEEDS", "ENABLE_FEED_ICONS",
"ENABLE_OFFLINE_READING", "EXTENDED_FEEDLIST", "FEEDS_SORT_BY_UNREAD",
"OPEN_LINKS_IN_NEW_WINDOW", "USER_STYLESHEET_URL", "ENABLE_FLASH_PLAYER",
"HEADLINES_SMART_DATE");
$prefs_blacklist = array("HIDE_READ_FEEDS", "FEEDS_SORT_BY_UNREAD",
"USER_STYLESHEET_URL");
$profile_blacklist = array("ALLOW_DUPLICATE_POSTS", "PURGE_OLD_DAYS",
"PURGE_UNREAD_ARTICLES", "DIGEST_ENABLE", "DIGEST_CATCHUP",
"BLACKLISTED_TAGS", "ENABLE_FEED_ICONS", "ENABLE_API_ACCESS",
"UPDATE_POST_ON_CHECKSUM_CHANGE", "DEFAULT_UPDATE_INTERVAL",
"MARK_UNREAD_ON_UPDATE", "USER_TIMEZONE", "SORT_HEADLINES_BY_FEED_DATE",
"BLACKLISTED_TAGS", "ENABLE_API_ACCESS", "UPDATE_POST_ON_CHECKSUM_CHANGE",
"DEFAULT_UPDATE_INTERVAL", "USER_TIMEZONE", "SORT_HEADLINES_BY_FEED_DATE",
"SSL_CERT_SERIAL");
if (FORCE_ARTICLE_PURGE != 0) {