$subop = $_REQUEST["subop"];
$quiet = $_REQUEST["quiet"];
+ $mode = $_REQUEST["mode"];
if ($subop == "massSubscribe") {
$ids = split(",", db_escape_string($_REQUEST["ids"]));
$subscribed = array();
foreach ($ids as $id) {
- $result = db_query($link, "SELECT feed_url,title FROM ttrss_feeds
- WHERE id = '$id'");
+ if ($mode == 1) {
+ $result = db_query($link, "SELECT feed_url,title FROM ttrss_feeds
+ WHERE id = '$id'");
+ } else if ($mode == 2) {
+ $result = db_query($link, "SELECT * FROM ttrss_archived_feeds
+ WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
+ $orig_id = db_escape_string(db_fetch_result($result, 0, "id"));
+ $site_url = db_escape_string(db_fetch_result($result, 0, "site_url"));
+ }
+
$feed_url = db_escape_string(db_fetch_result($result, 0, "feed_url"));
$title = db_escape_string(db_fetch_result($result, 0, "title"));
-
+
$title_orig = db_fetch_result($result, 0, "title");
-
+
$result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
- feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
-
+ feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
+
if (db_num_rows($result) == 0) {
- $result = db_query($link,
- "INSERT INTO ttrss_feeds (owner_uid,feed_url,title,cat_id)
- VALUES ('".$_SESSION["uid"]."', '$feed_url', '$title', NULL)");
-
+ if ($mode == 1) {
+ $result = db_query($link,
+ "INSERT INTO ttrss_feeds (owner_uid,feed_url,title,cat_id)
+ VALUES ('".$_SESSION["uid"]."', '$feed_url', '$title', NULL)");
+ } else if ($mode == 2) {
+ $result = db_query($link,
+ "INSERT INTO ttrss_feeds (id,owner_uid,feed_url,title,cat_id,site_url)
+ VALUES ('$orig_id','".$_SESSION["uid"]."', '$feed_url', '$title', NULL, '$site_url')");
+ }
array_push($subscribed, $title_orig);
}
}
//print "<p>".__("Showing top 25 registered feeds, sorted by popularity:")."</p>";
+ print "<form onsubmit='return false;' display='inline' name='feed_browser' id='feed_browser'>";
+
print "
<div style='float : right'>
<img style='display : none'
id='feed_browser_spinner' src='images/indicator_white.gif'>
- <input id=\"feed_browser_search\" size=\"20\" type=\"search\"
+ <input name=\"search\" size=\"20\" type=\"search\"
onfocus=\"javascript:disableHotkeys();\"
onblur=\"javascript:enableHotkeys();\"
onchange=\"javascript:updateFeedBrowser()\" value=\"$browser_search\">
onclick=\"javascript:updateFeedBrowser()\" value=\"".__('Search')."\">
</div>";
- print __('Top')." <select id=\"feed_browser_limit\">";
+ print " <select name=\"mode\" onchange=\"updateFeedBrowser()\">
+ <option value='1'>" . __('Popular feeds') . "</option>
+ <option value='2'>" . __('Feed archive') . "</option>
+ </select> ";
+
+ print __("limit:");
+
+ print " <select name=\"limit\">";
foreach (array(25, 50, 100, 200) as $l) {
$issel = ($l == $limit) ? "selected" : "";
print "<option $issel>$l</option>";
}
- print "</select>
+ print "</select> ";
+
+ print "
<input type=\"submit\" class=\"button\"
onclick=\"updateFeedBrowser()\" value=\"".__('Show')."\">";
$owner_uid = $_SESSION["uid"];
print "<ul class='browseFeedList' id='browseFeedList'>";
- $subscribe_btn_disabled = print_feed_browser($link, $search, 25) == 0 ? "disabled" : "";
+ print_feed_browser($link, $search, 25);
print "</ul>";
print "<div align='center'>
- <input type=\"submit\" class=\"button\" id=\"feed_browser_subscribe\"
- $subscribe_btn_disabled
- onclick=\"feedBrowserSubscribe()\" value=\"".__('Subscribe')."\">
- <input type='submit' class='button'
- onclick=\"closeInfoBox()\" value=\"".__('Cancel')."\"></div>";
+ <button onclick=\"feedBrowserSubscribe()\">".__('Subscribe')."</button>
+ <button onclick=\"closeInfoBox()\" >".__('Cancel')."</button></div>";
print "</div>";
return;
}
print "<input type=\"checkbox\" name=\"private\" id=\"private\"
- $checked> <label for=\"private\">".__('Hide from "Other Feeds"')."</label>";
+ $checked> <label for=\"private\">".__('Hide from Popular feeds')."</label>";
$rtl_content = sql_bool_to_bool(db_fetch_result($result, 0, "rtl_content"));
print "<br/><input type=\"checkbox\" id=\"rtl_content\" name=\"rtl_content\"
$checked> <label for=\"rtl_content\">".__('Right-to-left content')."</label>";
- $hidden = sql_bool_to_bool(db_fetch_result($result, 0, "hidden"));
-
- if ($hidden) {
- $checked = "checked";
- } else {
- $checked = "";
- }
-
- print "<br/><input type=\"checkbox\" id=\"hidden\" name=\"hidden\"
- $checked> <label for=\"hidden\">".__('Hide from my feed list')."</label>";
-
$include_in_digest = sql_bool_to_bool(db_fetch_result($result, 0, "include_in_digest"));
if ($include_in_digest) {
print "<div class='dlgButtons'>
<div style=\"float : left\">
- <input type='submit' class='button'
- onclick='return unsubscribeFeed($feed_id, \"$title\")' value=\"".__('Unsubscribe')."\">
+ <button onclick='return unsubscribeFeed($feed_id, \"$title\")'>".
+ __('Unsubscribe')."</button>
</div>
- <input type=\"submit\" class=\"button\"
- onclick=\"return feedEditSave()\" value=\"".__('Save')."\">
- <input type='submit' class='button'
- onclick=\"return feedEditCancel()\" value=\"".__('Cancel')."\">
+ <button onclick=\"return feedEditSave()\">".__('Save')."</button>
+ <button onclick=\"return feedEditCancel()\">".__('Cancel')."</button>
</div>";
return;
print "<div style=\"line-height : 100%\">";
print "<input disabled type=\"checkbox\" name=\"private\" id=\"private\"
- $checked> <label id=\"private_l\" class='insensitive' for=\"private\">".__('Hide from "Other Feeds"')."</label>";
+ $checked> <label id=\"private_l\" class='insensitive' for=\"private\">".__('Hide from Popular feeds')."</label>";
print " "; batch_edit_cbox("private", "private_l");
print " "; batch_edit_cbox("rtl_content", "rtl_content_l");
- print "<br/><input disabled type=\"checkbox\" id=\"hidden\" name=\"hidden\"
- $checked> <label class='insensitive' id=\"hidden_l\" for=\"hidden\">".__('Hide from my feed list')."</label>";
-
- print " "; batch_edit_cbox("hidden", "hidden_l");
-
print "<br/><input disabled type=\"checkbox\" id=\"include_in_digest\"
name=\"include_in_digest\"
$checked> <label id=\"include_in_digest_l\" class='insensitive' for=\"include_in_digest\">".__('Include in e-mail digest')."</label>";
$parent_feed = db_escape_string($_POST["parent_feed"]);
$private = checkbox_to_sql_bool(db_escape_string($_POST["private"]));
$rtl_content = checkbox_to_sql_bool(db_escape_string($_POST["rtl_content"]));
- $hidden = checkbox_to_sql_bool(db_escape_string($_POST["hidden"]));
$include_in_digest = checkbox_to_sql_bool(
db_escape_string($_POST["include_in_digest"]));
$cache_images = checkbox_to_sql_bool(
auth_pass = '$auth_pass',
private = $private,
rtl_content = $rtl_content,
- hidden = $hidden,
$cache_images_qpart
include_in_digest = $include_in_digest,
always_display_enclosures = $always_display_enclosures,
$qpart = "private = '$private'";
break;
- case "hidden":
- $qpart = "hidden = '$hidden'";
- break;
-
case "include_in_digest":
$qpart = "include_in_digest = '$include_in_digest'";
break;
</div>";
print "<input onclick=\"javascript:displayDlg('quickAddFeed')\"
- type=\"submit\" id=\"subscribe_to_feed_btn\"
- class=\"button\" value=\"".__('Subscribe to feed')."\">";
+ type=\"submit\"
+ class=\"button\" value=\"".__('Subscribe to feed')."\"> ";
+
+ print "<input onclick=\"javascript:editSelectedFeed()\"
+ type=\"submit\"
+ class=\"button\" value=\"".__('Edit feeds')."\"> ";
- if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) {
+ if (get_pref($link, 'ENABLE_FEED_CATS')) {
+
+ print "<input onclick=\"javascript:editFeedCats()\"
+ type=\"submit\"
+ class=\"button\" value=\"".__('Edit categories')."\"> ";
+ }
+
+ print "<input onclick=\"javascript:removeSelectedFeeds()\"
+ type=\"submit\"
+ class=\"button\" value=\"".__('Unsubscribe')."\"> ";
+
+/* print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\">
+ <option value=\"facDefault\" selected>".__('Other actions...')."</option>";
+
+ if (FORCE_ARTICLE_PURGE == 0) {
+ print
+ "<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 "</select>"; */
+
+/* if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) {
print " <input type=\"submit\" class=\"button\"
id=\"top25_feeds_btn\"
- onclick=\"javascript:browseFeeds()\" value=\"".__('More Feeds')."\">";
- }
+ onclick=\"javascript:browseFeeds()\" value=\"".__('More feeds')."\">";
+ } */
$feeds_sort = db_escape_string($_REQUEST["sort"]);
F1.cat_id,
F2.title AS parent_title,
C1.title AS category,
- F1.hidden,
F1.include_in_digest
$show_last_article_qpart
FROM
$edit_title = htmlspecialchars($line["title"]);
$edit_cat = htmlspecialchars($line["category"]);
- $hidden = sql_bool_to_bool($line["hidden"]);
-
$last_error = $line["last_error"];
if (!$edit_cat) $edit_cat = __("Uncategorized");
print "<td $onclick class='feedIcon'>$feed_icon</td>";
}
- if ($hidden) {
- $edit_title = "<span class=\"insensitive\">$edit_title ".
- __('(Hidden)')."</span>";
- $last_updated = "<span class=\"insensitive\">$last_updated</span>";
- $last_article = "<span class=\"insensitive\">$last_article</span>";
- }
-
if ($last_error) {
$edit_title = "<span class=\"feed_error\">$edit_title</span>";
$last_updated = "<span class=\"feed_error\">$last_updated</span>";
print "<p>";
-
print "<div id=\"feedOpToolbar\">";
+
/* print "<div id=\"feedOpToolbar\">";
if (get_pref($link, 'ENABLE_FEED_CATS')) {
__('Recategorize')."\">";
}
- print "</div>";
-
- print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\">
- <option value=\"facDefault\" selected>".__('Actions...')."</option>
- <optgroup label=\"".__('Selection:')."\">
- <option value=\"facEdit\">".__('Edit')."</option>";
-
- if (FORCE_ARTICLE_PURGE == 0) {
- print
- "<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>";
+ print "</div>"; */
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
-
- print "<optgroup label=\"".__('Other:')."\">
- <option value=\"facEditCats\">".__('Edit categories')."
- </option>
- </optgroup>";
-
- }
-
- print "</select>";
} else {
print "<p>";
}
- function print_feed_browser($link, $search, $limit) {
+ function print_feed_browser($link, $search, $limit, $mode = 1) {
$owner_uid = $_SESSION["uid"];
$search_qpart = "";
}
- $result = db_query($link, "SELECT feed_url, subscribers FROM
- ttrss_feedbrowser_cache WHERE (SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
- WHERE tf.feed_url = ttrss_feedbrowser_cache.feed_url
- AND owner_uid = '$owner_uid') $search_qpart
- ORDER BY subscribers DESC LIMIT $limit");
+ if ($mode == 1) {
+ $result = db_query($link, "SELECT feed_url, subscribers FROM
+ ttrss_feedbrowser_cache WHERE (SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
+ WHERE tf.feed_url = ttrss_feedbrowser_cache.feed_url
+ AND owner_uid = '$owner_uid') $search_qpart
+ ORDER BY subscribers DESC LIMIT $limit");
+ } else if ($mode == 2) {
+ $result = db_query($link, "SELECT * FROM
+ ttrss_archived_feeds WHERE
+ (SELECT COUNT(*) FROM ttrss_feeds
+ WHERE ttrss_feeds.feed_url = ttrss_archived_feeds.feed_url AND
+ owner_uid = '$owner_uid') = 0 AND
+ owner_uid = '$owner_uid' $search_qpart
+ ORDER BY id DESC LIMIT $limit");
+ }
$feedctr = 0;
while ($line = db_fetch_assoc($result)) {
- $feed_url = $line["feed_url"];
- $subscribers = $line["subscribers"];
- $det_result = db_query($link, "SELECT site_url,title,id
- FROM ttrss_feeds WHERE feed_url = '$feed_url' LIMIT 1");
+ if ($mode == 1) {
- $details = db_fetch_assoc($det_result);
-
- $icon_file = ICONS_DIR . "/" . $details["id"] . ".ico";
+ $feed_url = $line["feed_url"];
+ $subscribers = $line["subscribers"];
+
+ $det_result = db_query($link, "SELECT site_url,title,id
+ FROM ttrss_feeds WHERE feed_url = '$feed_url' LIMIT 1");
+
+ $details = db_fetch_assoc($det_result);
+
+ $icon_file = ICONS_DIR . "/" . $details["id"] . ".ico";
+
+ if (file_exists($icon_file) && filesize($icon_file) > 0) {
+ $feed_icon = "<img class=\"tinyFeedIcon\" src=\"" . ICONS_URL .
+ "/".$details["id"].".ico\">";
+ } else {
+ $feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
+ }
+
+ $check_box = "<input onclick='toggleSelectListRow(this)' class='feedBrowseCB'
+ type=\"checkbox\" id=\"FBCHK-" . $details["id"] . "\">";
+
+ $class = ($feedctr % 2) ? "even" : "odd";
+
+ if ($details["site_url"]) {
+ $site_url = "<a target=\"_blank\" href=\"".$details["site_url"]."\">
+ <img style='border-width : 0px' src='images/www.png' alt='www'></a>";
+ } else {
+ $site_url = "";
+ }
+
+ print "<li class='$class' id=\"FBROW-".$details["id"]."\">$check_box".
+ "$feed_icon " . $details["title"] .
+ " <span class='subscribers'>($subscribers)</span>
+ $site_url
+ </li>";
+
+ } else if ($mode == 2) {
+ $feed_url = $line["feed_url"];
- if (file_exists($icon_file) && filesize($icon_file) > 0) {
- $feed_icon = "<img class=\"tinyFeedIcon\" src=\"" . ICONS_URL .
- "/".$details["id"].".ico\">";
- } else {
- $feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
- }
+ $icon_file = ICONS_DIR . "/" . $line["id"] . ".ico";
+
+ if (file_exists($icon_file) && filesize($icon_file) > 0) {
+ $feed_icon = "<img class=\"tinyFeedIcon\" src=\"" . ICONS_URL .
+ "/".$line["id"].".ico\">";
+ } else {
+ $feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
+ }
- $check_box = "<input onclick='toggleSelectListRow(this)' class='feedBrowseCB'
- type=\"checkbox\" id=\"FBCHK-" . $details["id"] . "\">";
+ $check_box = "<input onclick='toggleSelectListRow(this)' class='feedBrowseCB'
+ type=\"checkbox\" id=\"FBCHK-" . $line["id"] . "\">";
+
+ $class = ($feedctr % 2) ? "even" : "odd";
+
+ if ($line["site_url"]) {
+ $site_url = "<a target=\"_blank\" href=\"".$line["site_url"]."\">
+ <img style='border-width : 0px' src='images/www.png' alt='www'></a>";
+ } else {
+ $site_url = "";
+ }
+
+ print "<li class='$class' id=\"FBROW-".$line["id"]."\">$check_box".
+ "$feed_icon " . $line["title"] . $site_url . "</li>";
- $class = ($feedctr % 2) ? "even" : "odd";
- if ($details["site_url"]) {
- $site_url = "<a target=\"_blank\" href=\"".$details["site_url"]."\">
- <img style='border-width : 0px' src='images/www.png' alt='www'></a>";
- } else {
- $site_url = "";
}
- print "<li class='$class' id=\"FBROW-".$details["id"]."\">$check_box".
- "$feed_icon " . $details["title"] .
- " <span class='subscribers'>($subscribers)</span>
- $site_url
- </li>";
-
- ++$feedctr;
+ ++$feedctr;
}
if ($feedctr == 0) {
git.wh0rd.org / tt-rss.git / blobdiff