$quiet = $_REQUEST["quiet"];
$mode = $_REQUEST["mode"];
- if ($subop == "massSubscribe") {
+/* if ($subop == "massSubscribe") {
$ids = split(",", db_escape_string($_REQUEST["ids"]));
$subscribed = array();
print format_notice($msg);
}
- }
- if ($subop == "browse") {
+ return;
+ } */
+
+/* if ($subop == "browse") {
print "<div id=\"infoBoxTitle\">".__('Feed Browser')."</div>";
print "</div>";
return;
- }
+ } */
if ($subop == "editfeed") {
$feed_id = db_escape_string($_REQUEST["id"]);
}
if ($subop == "add") {
-
- if (!WEB_DEMO_MODE) {
- $feed_url = db_escape_string(trim($_REQUEST["feed_url"]));
- $cat_id = db_escape_string($_REQUEST["cat_id"]);
- $p_from = db_escape_string($_REQUEST["from"]);
-
- /* only read authentication information from POST */
-
- $auth_login = db_escape_string(trim($_POST["auth_login"]));
- $auth_pass = db_escape_string(trim($_POST["auth_pass"]));
-
- if ($p_from != 'tt-rss') {
- print "<html>
- <head>
- <title>Tiny Tiny RSS</title>
- <link rel=\"stylesheet\" type=\"text/css\" href=\"utility.css\">
- </head>
- <body>
- <img class=\"floatingLogo\" src=\"images/ttrss_logo.png\"
- alt=\"Tiny Tiny RSS\"/>
- <h1>Subscribe to feed...</h1>";
- }
+ $feed_url = db_escape_string(trim($_REQUEST["feed_url"]));
+ $cat_id = db_escape_string($_REQUEST["cat_id"]);
+ $p_from = db_escape_string($_REQUEST["from"]);
- if (subscribe_to_feed($link, $feed_url, $cat_id, $auth_login, $auth_pass)) {
- print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url));
- } else {
- print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
- }
+ /* only read authentication information from POST */
- if ($p_from != 'tt-rss') {
- $tt_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'tt-rss.php', $_SERVER["REQUEST_URI"]);
+ $auth_login = db_escape_string(trim($_POST["auth_login"]));
+ $auth_pass = db_escape_string(trim($_POST["auth_pass"]));
+ if ($p_from != 'tt-rss') {
+ print "<html>
+ <head>
+ <title>Tiny Tiny RSS</title>
+ <link rel=\"stylesheet\" type=\"text/css\" href=\"utility.css\">
+ </head>
+ <body>
+ <img class=\"floatingLogo\" src=\"images/ttrss_logo.png\"
+ alt=\"Tiny Tiny RSS\"/>
+ <h1>Subscribe to feed...</h1>";
+ }
- $tp_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'prefs.php', $_SERVER["REQUEST_URI"]);
+ $rc = subscribe_to_feed($link, $feed_url, $cat_id, $auth_login, $auth_pass);
+
+ switch ($rc) {
+ case 1:
+ print_notice(T_sprintf("Subscribed to <b>%s</b>.", $feed_url));
+ break;
+ case 2:
+ print_error(T_sprintf("Could not subscribe to <b>%s</b>.", $feed_url));
+ break;
+ case 0:
+ print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
+ break;
+ }
- $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
- feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
+ if ($p_from != 'tt-rss') {
+ $tt_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'tt-rss.php', $_SERVER["REQUEST_URI"]);
- $feed_id = db_fetch_result($result, 0, "id");
- print "<p>";
+ $tp_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'prefs.php', $_SERVER["REQUEST_URI"]);
- if ($feed_id) {
- print "<form method=\"GET\" style='display: inline'
- action=\"$tp_uri\">
- <input type=\"hidden\" name=\"tab\" value=\"feedConfig\">
- <input type=\"hidden\" name=\"subop\" value=\"editFeed\">
- <input type=\"hidden\" name=\"subopparam\" value=\"$feed_id\">
- <input type=\"submit\" value=\"".__("Edit subscription options")."\">
- </form>";
- }
+ $result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
+ feed_url = '$feed_url' AND owner_uid = " . $_SESSION["uid"]);
+
+ $feed_id = db_fetch_result($result, 0, "id");
- print "<form style='display: inline' method=\"GET\" action=\"$tt_uri\">
- <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
- </form></p>";
+ print "<p>";
- print "</body></html>";
- return;
+ if ($feed_id) {
+ print "<form method=\"GET\" style='display: inline'
+ action=\"$tp_uri\">
+ <input type=\"hidden\" name=\"tab\" value=\"feedConfig\">
+ <input type=\"hidden\" name=\"subop\" value=\"editFeed\">
+ <input type=\"hidden\" name=\"subopparam\" value=\"$feed_id\">
+ <input type=\"submit\" value=\"".__("Edit subscription options")."\">
+ </form>";
}
+ print "<form style='display: inline' method=\"GET\" action=\"$tt_uri\">
+ <input type=\"submit\" value=\"".__("Return to Tiny Tiny RSS")."\">
+ </form></p>";
+
+ print "</body></html>";
+ return;
}
}
}
}
- print "<div class=\"prefGenericAddBox\">
+ print "<div>
<input id=\"fadd_cat\"
onkeypress=\"return filterCR(event, addFeedCat)\"
- onkeyup=\"toggleSubmitNotEmpty(this, 'catadd_submit_btn')\"
- onchange=\"toggleSubmitNotEmpty(this, 'catadd_submit_btn')\"
- size=\"40\">
- <input
- type=\"submit\" class=\"button\" disabled=\"true\" id=\"catadd_submit_btn\"
- onclick=\"javascript:addFeedCat()\" value=\"".__('Create category')."\"></div>";
+ size=\"40\">
+ <button onclick=\"javascript:addFeedCat()\">".
+ __('Create category')."</button></div>";
$result = db_query($link, "SELECT title,id FROM ttrss_feed_categories
WHERE owner_uid = ".$_SESSION["uid"]."
if (db_num_rows($result) != 0) {
- print "<table width=\"100%\" class=\"prefFeedCatList\"
- cellspacing=\"0\">";
-
- print "<tr><td class=\"selectPrompt\" colspan=\"8\">
- ".__('Select:')."
+ print __('Select:')."
<a href=\"javascript:selectPrefRows('fcat', true)\">".__('All')."</a>,
- <a href=\"javascript:selectPrefRows('fcat', false)\">".__('None')."</a>
- </td></tr>";
-
- print "</table>";
+ <a href=\"javascript:selectPrefRows('fcat', false)\">".__('None')."</a>";
print "<div class=\"prefFeedCatHolder\">";
print "<p>".__('No feed categories defined.')."</p>";
}
- print "<div style='float : right'>
- <input type='submit' class='button'
- onclick=\"selectTab('feedConfig')\" value=\"".__('Close this window')."\"></div>";
+ print "<div class='dlgButtons'>
+ <div style='float : left'>
+ <button onclick=\"return removeSelectedFeedCats()\">".
+ __('Remove')."</button>
+ </div>";
- print "<div id=\"catOpToolbar\">";
-
- print "
- <input type=\"submit\" class=\"button\" disabled=\"true\"
- onclick=\"return removeSelectedFeedCats()\" value=\"".__('Remove')."\">";
-
- print "</div>";
+ print "<button onclick=\"selectTab('feedConfig')\">".
+ __('Close this window')."</button></div>";
print "</div>";
print "<p>";
-/* print "<div id=\"feedOpToolbar\">";
-
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
-
- print __('Selection:') . " ";
-
- print_feed_cat_select($link, "sfeed_set_fcat", "", "disabled");
-
- print " <input type=\"submit\" class=\"button\" disabled=\"true\"
- onclick=\"javascript:categorizeSelectedFeeds()\" value=\"".
- __('Recategorize')."\">";
- }
-
- print "</div>"; */
-
} else {
print "<p>";
print "<h3>" . __("Firefox Integration") . "</h3>";
- print "<p>" . __('This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below.');
- print "</p><p> <a class='visibleLinkB' href='javascript:window.navigator.registerContentHandler(" .
+ print "<p>" . __('This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below.') . "</p>";
+
+ print "<p";
+
+ print "<button onclick='window.navigator.registerContentHandler(" .
"\"application/vnd.mozilla.maybe.feed\", " .
"\"" . add_feed_url() . "\", " . " \"Tiny Tiny RSS\")'>" .
- __('Click here to register this site as a feed reader.') . "</a></p>";
+ __('Click here to register this site as a feed reader.') .
+ "</button>";
+ print "</p>";
print "<h3>".__("Published articles")."</h3>";
print "<p>".__('Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below.')."</p>";
- $url_path = article_publish_url($link);
-
- print "<p><a class=\"visibleLinkB\" id=\"pubGenAddress\" target=\"_blank\" href=\"$url_path\">".__("Link to published articles feed.")."</a></p>";
+ print "<button onclick=\"return displayDlg('pubUrl')\">".
+ __('Display URL')."</button> ";
- print "<button onclick=\"return pubRegenKey()\">".
- __('Generate another link')."</button>";
}
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
+ $result = db_query($link, "SELECT *,
+ (SELECT COUNT(*) FROM ttrss_user_entries WHERE
+ orig_feed_id = ttrss_archived_feeds.id) AS articles_archived
+ 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
if ($mode == 1) {
- $feed_url = $line["feed_url"];
+ $feed_url = htmlspecialchars($line["feed_url"]);
$subscribers = $line["subscribers"];
$det_result = db_query($link, "SELECT site_url,title,id
$feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
}
- $check_box = "<input onclick='toggleSelectListRow(this)' class='feedBrowseCB'
+ $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"]."\">
+ $site_url = "<a target=\"_blank\" href=\"".
+ htmlspecialchars($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"] .
+ print "<li title=\"".htmlspecialchars($details["site_url"])."\"
+ class='$class' id=\"FBROW-".$details["id"]."\">$check_box".
+ "$feed_icon " . htmlspecialchars($details["title"]) .
" <span class='subscribers'>($subscribers)</span>
- $site_url
- </li>";
+ $site_url</li>";
} else if ($mode == 2) {
- $feed_url = $line["feed_url"];
+ $feed_url = htmlspecialchars($line["feed_url"]);
+ $site_url = htmlspecialchars($line["site_url"]);
+ $title = htmlspecialchars($line["title"]);
$icon_file = ICONS_DIR . "/" . $line["id"] . ".ico";
type=\"checkbox\" id=\"FBCHK-" . $line["id"] . "\">";
$class = ($feedctr % 2) ? "even" : "odd";
-
+
+ if ($line['articles_archived'] > 0) {
+ $archived = sprintf(__("%d archived articles"), $line['articles_archived']);
+ $archived = " <span class='subscribers'>($archived)</span>";
+ } else {
+ $archived = '';
+ }
+
if ($line["site_url"]) {
- $site_url = "<a target=\"_blank\" href=\"".$line["site_url"]."\">
+ $site_url = "<a target=\"_blank\" href=\"$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>";
+ print "<li title='".$line['site_url']."' class='$class'
+ id=\"FBROW-".$line["id"]."\">".
+ $check_box . "$feed_icon " . $title . $archived . $site_url . "</li>";
}
return $feedctr;
}
+
?>
git.wh0rd.org / tt-rss.git / blobdiff