$subop = $_REQUEST["subop"];
$quiet = $_REQUEST["quiet"];
+ $mode = $_REQUEST["mode"];
if ($subop == "massSubscribe") {
- $ids = split(",", db_escape_string($_GET["ids"]));
+ $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 "<div class=\"infoBoxContents\">";
- $browser_search = db_escape_string($_GET["search"]);
+ $browser_search = db_escape_string($_REQUEST["search"]);
//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'>
- <input id=\"feed_browser_search\" size=\"20\" type=\"search\"
+ <img style='display : none'
+ id='feed_browser_spinner' src='images/indicator_white.gif'>
+ <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;
} else {
$is_selected = "";
}
+
+ $linked_title = truncate_string(htmlspecialchars($tmp_line["title"]), 40);
+
printf("<option $is_selected value='%d'>%s</option>",
- $tmp_line["id"], $tmp_line["title"]);
+ $tmp_line["id"], $linked_title);
}
print "</select>";
$auth_login = htmlspecialchars(db_fetch_result($result, 0, "auth_login"));
- print __('Login:') . " ";
+ print "<table>";
+
+ print "<tr><td>" . __('Login:') . "</td><td>";
+
print "<input size=\"20\" onkeypress=\"return filterCR(event, feedEditSave)\"
name=\"auth_login\" value=\"$auth_login\">";
- print " " . __("Password:") . " ";
+ print "</tr><tr><td>" . __("Password:") . "</td><td>";
$auth_pass = htmlspecialchars(db_fetch_result($result, 0, "auth_pass"));
onkeypress=\"return filterCR(event, feedEditSave)\"
value=\"$auth_pass\">";
+ print "</td></tr></table>";
+
print "</div>";
print "<div class=\"dlgSec\">".__("Options")."</div>";
print "<div class=\"dlgSecCont\">";
}
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"));
+ $include_in_digest = sql_bool_to_bool(db_fetch_result($result, 0, "include_in_digest"));
- if ($hidden) {
+ if ($include_in_digest) {
$checked = "checked";
} else {
$checked = "";
}
- print "<br/><input type=\"checkbox\" id=\"hidden\" name=\"hidden\"
- $checked> <label for=\"hidden\">".__('Hide from my feed list')."</label>";
+ print "<br/><input type=\"checkbox\" id=\"include_in_digest\"
+ name=\"include_in_digest\"
+ $checked> <label for=\"include_in_digest\">".__('Include in e-mail digest')."</label>";
- $include_in_digest = sql_bool_to_bool(db_fetch_result($result, 0, "include_in_digest"));
- if ($include_in_digest) {
+ $always_display_enclosures = sql_bool_to_bool(db_fetch_result($result, 0, "always_display_enclosures"));
+
+ if ($always_display_enclosures) {
$checked = "checked";
} else {
$checked = "";
}
- print "<br/><input type=\"checkbox\" id=\"include_in_digest\"
- name=\"include_in_digest\"
- $checked> <label for=\"include_in_digest\">".__('Include in e-mail digest')."</label>";
+ print "<br/><input type=\"checkbox\" id=\"always_display_enclosures\"
+ name=\"always_display_enclosures\"
+ $checked> <label for=\"always_display_enclosures\">".__('Always display image attachments')."</label>";
+
$cache_images = sql_bool_to_bool(db_fetch_result($result, 0, "cache_images"));
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>";
print " "; batch_edit_cbox("include_in_digest", "include_in_digest_l");
+ print "<br/><input disabled type=\"checkbox\" id=\"always_display_enclosures\"
+ name=\"always_display_enclosures\"
+ $checked> <label id=\"always_display_enclosures_l\" class='insensitive' for=\"always_display_enclosures\">".__('Always display image attachments')."</label>";
+
+ print " "; batch_edit_cbox("always_display_enclosures", "always_display_enclosures_l");
+
print "<br/><input disabled type=\"checkbox\" id=\"cache_images\"
name=\"cache_images\"
$checked> <label class='insensitive' id=\"cache_images_l\"
$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(
db_escape_string($_POST["cache_images"]));
$update_method = (int) db_escape_string($_POST["update_method"]);
+ $always_display_enclosures = checkbox_to_sql_bool(
+ db_escape_string($_POST["always_display_enclosures"]));
+
if (get_pref($link, 'ENABLE_FEED_CATS')) {
if ($cat_id && $cat_id != 0) {
$category_qpart = "cat_id = '$cat_id',";
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,
update_method = '$update_method'
WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]);
$qpart = "private = '$private'";
break;
- case "hidden":
- $qpart = "hidden = '$hidden'";
- break;
-
case "include_in_digest":
$qpart = "include_in_digest = '$include_in_digest'";
break;
+ case "always_display_enclosures":
+ $qpart = "always_display_enclosures = '$always_display_enclosures'";
+ break;
+
case "cache_images":
$qpart = "cache_images = '$cache_images'";
break;
if ($subop == "remove") {
- $ids = split(",", db_escape_string($_GET["ids"]));
+ $ids = split(",", db_escape_string($_REQUEST["ids"]));
foreach ($ids as $id) {
-
- if ($id > 0) {
-
- db_query($link, "DELETE FROM ttrss_feeds
- WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
-
- $icons_dir = ICONS_DIR;
-
- if (file_exists($icons_dir . "/$id.ico")) {
- unlink($icons_dir . "/$id.ico");
- }
- } else {
- label_remove($link, -11-$id, $_SESSION["uid"]);
- }
+ remove_feed($link, $id, $_SESSION["uid"]);
}
}
if ($subop == "clear") {
- $id = db_escape_string($_GET["id"]);
+ $id = db_escape_string($_REQUEST["id"]);
clear_feed_articles($link, $id);
}
if ($subop == "rescore") {
- $ids = split(",", db_escape_string($_GET["ids"]));
+ $ids = split(",", db_escape_string($_REQUEST["ids"]));
foreach ($ids as $id) {
if (!WEB_DEMO_MODE) {
- $ids = split(",", db_escape_string($_GET["ids"]));
+ $ids = split(",", db_escape_string($_REQUEST["ids"]));
- $cat_id = db_escape_string($_GET["cat_id"]);
+ $cat_id = db_escape_string($_REQUEST["cat_id"]);
if ($cat_id == 0) {
$cat_id_qpart = 'NULL';
if ($action == "save") {
$cat_title = db_escape_string(trim($_REQUEST["value"]));
- $cat_id = db_escape_string($_GET["cid"]);
+ $cat_id = db_escape_string($_REQUEST["cid"]);
db_query($link, "BEGIN");
if (!WEB_DEMO_MODE) {
- $feed_cat = db_escape_string(trim($_GET["cat"]));
+ $feed_cat = db_escape_string(trim($_REQUEST["cat"]));
$result = db_query($link,
"SELECT id FROM ttrss_feed_categories
if ($action == "remove") {
- if (!WEB_DEMO_MODE) {
-
- $ids = split(",", db_escape_string($_GET["ids"]));
-
- foreach ($ids as $id) {
-
- db_query($link, "BEGIN");
-
- $result = db_query($link,
- "SELECT count(id) as num_feeds FROM ttrss_feeds
- WHERE cat_id = '$id'");
-
- $num_feeds = db_fetch_result($result, 0, "num_feeds");
+ $ids = split(",", db_escape_string($_REQUEST["ids"]));
- if ($num_feeds == 0) {
- db_query($link, "DELETE FROM ttrss_feed_categories
- WHERE id = '$id' AND owner_uid = " . $_SESSION["uid"]);
- } else {
-
- print format_warning(__("Unable to delete non empty feed categories."));
-
- }
-
- db_query($link, "COMMIT");
- }
+ foreach ($ids as $id) {
+ remove_feed_category($link, $id, $_SESSION["uid"]);
}
}
__('Some feeds have update errors (click for details)')."</a>");
}
- $feed_search = db_escape_string($_GET["search"]);
+ $feed_search = db_escape_string($_REQUEST["search"]);
- if (array_key_exists("search", $_GET)) {
+ if (array_key_exists("search", $_REQUEST)) {
$_SESSION["prefs_feed_search"] = $feed_search;
} else {
$feed_search = $_SESSION["prefs_feed_search"];
</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 (get_pref($link, 'ENABLE_FEED_CATS')) {
+
+ print "<input onclick=\"javascript:editFeedCats()\"
+ type=\"submit\"
+ class=\"button\" value=\"".__('Edit categories')."\"> ";
+ }
- if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) {
+ 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=\"".__('Top 25')."\">";
- }
+ onclick=\"javascript:browseFeeds()\" value=\"".__('More feeds')."\">";
+ } */
- $feeds_sort = db_escape_string($_GET["sort"]);
+ $feeds_sort = db_escape_string($_REQUEST["sort"]);
if (!$feeds_sort || $feeds_sort == "undefined") {
$feeds_sort = $_SESSION["pref_sort_feeds"];
$_SESSION["pref_sort_feeds"] = $feeds_sort;
if ($feed_search) {
- $search_qpart = "(UPPER(F1.title) LIKE UPPER('%$feed_search%') OR
- UPPER(F1.feed_url) LIKE UPPER('%$feed_search%')) AND";
+
+ $feed_search = split(" ", $feed_search);
+ $tokens = array();
+
+ foreach ($feed_search as $token) {
+
+ $token = trim($token);
+
+ array_push($tokens, "(UPPER(F1.title) LIKE UPPER('%$token%') OR
+ UPPER(C1.title) LIKE UPPER('%$token%') OR
+ UPPER(F1.feed_url) LIKE UPPER('%$token%'))");
+ }
+
+ $search_qpart = "(" . join($tokens, " AND ") . ") AND ";
+
} else {
$search_qpart = "";
}
$show_last_article_checked = "";
$show_last_article_qpart = "";
- if ($_GET["slat"] == "true") {
+ if ($_REQUEST["slat"] == "true") {
$show_last_article_info = true;
$show_last_article_checked = "checked";
$show_last_article_qpart = ", (SELECT ".SUBSTRING_FOR_DATE."(MAX(updated),1,16) FROM ttrss_user_entries,
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>";
$parent_title = $line["parent_title"];
if ($parent_title) {
- $parent_title = "<span class='groupPrompt'>(linked to
- $parent_title)</span>";
+ $linked_to = sprintf(__("(linked to %s)"), $parent_title);
+ $parent_title = "<span class='groupPrompt'>$linked_to</span>";
}
print "<td $onclick>" . "$edit_title $parent_title" . "</td>";
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>
- <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>";
- }
+ print "</div>"; */
- print "
- <option value=\"facClear\"> ".__('Clear feed data')."</option>
- <option value=\"facRescore\"> ".__('Rescore articles')."</option>
- <option value=\"facUnsubscribe\"> ".__('Unsubscribe')."</option>";
+ } else {
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
+ print "<p>";
- print "<option disabled>--------</option>
- <option style=\"color : #5050aa\" disabled>".__('Other:')."</option>
- <option value=\"facEditCats\"> ".__('Edit categories')."
- </option>";
- }
+ if (!$feed_search) {
+ print_warning(__("You don't have any subscribed feeds."));
+ } else {
+ print_warning(__('No matching feeds found.'));
+ }
+ print "</p>";
- print "</select>";
}
print "<h3>".__('OPML')."</h3>
}
- 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";
- print "<li class='$class' id=\"FBROW-".$details["id"]."\">$check_box".
- "$feed_icon " . $details["title"] .
- " <span class='subscribers'>($subscribers)</span></li>";
+ }
- ++$feedctr;
+ ++$feedctr;
}
if ($feedctr == 0) {
git.wh0rd.org / tt-rss.git / blobdiff