if ($subop == "getfeedtree") {
+ $search = $_SESSION["prefs_feed_search"];
+
+ if ($search) $search_qpart = " AND LOWER(title) LIKE LOWER('%$search%')";
+
$root = array();
$root['id'] = 'root';
$root['name'] = __('Feeds');
$result = db_query($link, "SELECT id, title FROM ttrss_feed_categories
WHERE owner_uid = " . $_SESSION["uid"] . " ORDER BY order_id, title");
-
+
while ($line = db_fetch_assoc($result)) {
$cat = array();
$cat['id'] = 'CAT:' . $line['id'];
$cat['bare_id'] = $feed_id;
$cat['name'] = $line['title'];
$cat['items'] = array();
+ $cat['checkbox'] = false;
$cat['type'] = 'category';
-
+
$feed_result = db_query($link, "SELECT id, title, last_error,
".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
FROM ttrss_feeds
WHERE cat_id = '".$line['id']."' AND owner_uid = ".$_SESSION["uid"].
- " ORDER BY order_id, title");
-
+ "$search_qpart ORDER BY order_id, title");
+
while ($feed_line = db_fetch_assoc($feed_result)) {
$feed = array();
$feed['id'] = 'FEED:' . $feed_line['id'];
$feed['checkbox'] = false;
$feed['error'] = $feed_line['last_error'];
$feed['icon'] = getFeedIcon($feed_line['id']);
- $feed['param'] = make_local_datetime($link,
+ $feed['param'] = make_local_datetime($link,
$feed_line['last_updated'], true);
array_push($cat['items'], $feed);
}
-
- array_push($root['items'], $cat);
+
+ $cat['param'] = T_sprintf('(%d feeds)', count($cat['items']));
+
+ if (count($cat['items']) > 0)
+ array_push($root['items'], $cat);
+
+ $root['param'] += count($cat['items']);
}
-
+
/* Uncategorized is a special case */
-
+
$cat = array();
$cat['id'] = 'CAT:0';
$cat['bare_id'] = 0;
$cat['name'] = __("Uncategorized");
$cat['items'] = array();
$cat['type'] = 'category';
+ $cat['checkbox'] = false;
$feed_result = db_query($link, "SELECT id, title,last_error,
".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
FROM ttrss_feeds
WHERE cat_id IS NULL AND owner_uid = ".$_SESSION["uid"].
- " ORDER BY order_id, title");
-
+ "$search_qpart ORDER BY order_id, title");
+
while ($feed_line = db_fetch_assoc($feed_result)) {
$feed = array();
$feed['id'] = 'FEED:' . $feed_line['id'];
$feed['checkbox'] = false;
$feed['error'] = $feed_line['last_error'];
$feed['icon'] = getFeedIcon($feed_line['id']);
- $feed['param'] = make_local_datetime($link,
+ $feed['param'] = make_local_datetime($link,
$feed_line['last_updated'], true);
array_push($cat['items'], $feed);
}
-
- array_push($root['items'], $cat);
+
+ $cat['param'] = T_sprintf('(%d feeds)', count($cat['items']));
+
+ if (count($cat['items']) > 0)
+ array_push($root['items'], $cat);
+
+ $root['param'] += count($cat['items']);
+ $root['param'] = T_sprintf('(%d feeds)', $root['param']);
+
} else {
$feed_result = db_query($link, "SELECT id, title, last_error,
".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
FROM ttrss_feeds
WHERE owner_uid = ".$_SESSION["uid"].
- " ORDER BY order_id, title");
-
+ "$search_qpart ORDER BY order_id, title");
+
while ($feed_line = db_fetch_assoc($feed_result)) {
$feed = array();
$feed['id'] = 'FEED:' . $feed_line['id'];
$feed['checkbox'] = false;
$feed['error'] = $feed_line['last_error'];
$feed['icon'] = getFeedIcon($feed_line['id']);
- $feed['param'] = make_local_datetime($link,
+ $feed['param'] = make_local_datetime($link,
$feed_line['last_updated'], true);
array_push($root['items'], $feed);
}
+
+ $root['param'] = T_sprintf('(%d feeds)', count($root['items']));
+
}
$fl = array();
}
if ($subop == "catsortreset") {
- db_query($link, "UPDATE ttrss_feed_categories
+ db_query($link, "UPDATE ttrss_feed_categories
SET order_id = 0 WHERE owner_uid = " . $_SESSION["uid"]);
return;
- }
+ }
if ($subop == "feedsortreset") {
- db_query($link, "UPDATE ttrss_feeds
+ db_query($link, "UPDATE ttrss_feeds
SET order_id = 0 WHERE owner_uid = " . $_SESSION["uid"]);
return;
- }
+ }
if ($subop == "savefeedorder") {
# if ($_POST['payload']) {
# file_put_contents("/tmp/blahblah.txt", $_POST['payload']);
-# $data = json_decode($_POST['payload'], true);
+# $data = json_decode($_POST['payload'], true);
# } else {
# $data = json_decode(file_get_contents("/tmp/blahblah.txt"), true);
# }
++$cat_order_id;
if ($bare_id > 0) {
- db_query($link, "UPDATE ttrss_feed_categories
+ db_query($link, "UPDATE ttrss_feed_categories
SET order_id = '$cat_order_id' WHERE id = '$bare_id' AND
owner_uid = " . $_SESSION["uid"]);
}
$id = $feed['_reference'];
$feed_id = substr($id, strpos($id, ':')+1);
- if ($bare_id != 0)
+ if ($bare_id != 0)
$cat_query = "cat_id = '$bare_id'";
else
$cat_query = "cat_id = NULL";
$cat_query
WHERE id = '$feed_id' AND
owner_uid = " . $_SESSION["uid"]);
-
+
++$feed_order_id;
- }
+ }
}
}
}
return;
}
- if ($subop == "removeicon") {
+ if ($subop == "removeicon") {
$feed_id = db_escape_string($_REQUEST["feed_id"]);
$result = db_query($link, "SELECT id FROM ttrss_feeds
if (is_file($icon_file) && $feed_id) {
if (filesize($icon_file) < 20000) {
-
+
$result = db_query($link, "SELECT id FROM ttrss_feeds
WHERE id = '$feed_id' AND owner_uid = ". $_SESSION["uid"]);
$feed_id = db_escape_string($_REQUEST["id"]);
- $result = db_query($link,
+ $result = db_query($link,
"SELECT * FROM ttrss_feeds WHERE id = '$feed_id' AND
owner_uid = " . $_SESSION["uid"]);
regExp='^(http|https)://.*' style=\"width : 20em\"
name=\"feed_url\" value=\"$feed_url\">";
+ $last_error = db_fetch_result($result, 0, "last_error");
+
+ if ($last_error) {
+ print " <span title=\"".htmlspecialchars($last_error)."\"
+ class=\"feed_error\">(error)</span>";
+
+ }
+
/* Category */
if (get_pref($link, 'ENABLE_FEED_CATS')) {
print __('Place in category:') . " ";
- print_feed_cat_select($link, "cat_id", $cat_id,
+ print_feed_cat_select($link, "cat_id", $cat_id,
'dojoType="dijit.form.Select"');
}
$update_interval = db_fetch_result($result, 0, "update_interval");
- print_select_hash("update_interval", $update_interval, $update_intervals,
+ print_select_hash("update_interval", $update_interval, $update_intervals,
'dojoType="dijit.form.Select"');
/* Update method */
- $update_method = db_fetch_result($result, 0, "update_method",
+ $update_method = db_fetch_result($result, 0, "update_method",
'dojoType="dijit.form.Select"');
print " " . __('using') . " ";
print_select_hash("update_method", $update_method, $update_methods,
- 'dojoType="dijit.form.Select"');
+ 'dojoType="dijit.form.Select"');
$purge_interval = db_fetch_result($result, 0, "purge_interval");
- if (FORCE_ARTICLE_PURGE == 0) {
/* Purge intl */
- print "<hr/>";
-
- print __('Article purging:') . " ";
-
- print_select_hash("purge_interval", $purge_interval, $purge_intervals,
- 'dojoType="dijit.form.Select"');
-
- } else {
- print "<input style=\"display : none\" name='purge_interval'
- dojoType=\"dijit.form.TextBox\" value='$purge_interval'>";
+ print "<hr/>";
+ print __('Article purging:') . " ";
- }
+ print_select_hash("purge_interval", $purge_interval, $purge_intervals,
+ 'dojoType="dijit.form.Select" ' .
+ ((FORCE_ARTICLE_PURGE == 0) ? "" : 'disabled="1"'));
print "</div>";
print "<div class=\"dlgSec\">".__("Authentication")."</div>";
$auth_pass = htmlspecialchars(db_fetch_result($result, 0, "auth_pass"));
- print "<input dojoType=\"dijit.form.TextBox\" type=\"password\" name=\"auth_pass\"
+ print "<input dojoType=\"dijit.form.TextBox\" type=\"password\" name=\"auth_pass\"
placeHolder=\"".__("Password")."\"
value=\"$auth_pass\">";
$checked = "";
}
- print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"private\" id=\"private\"
+ print "<input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" name=\"private\" id=\"private\"
$checked> <label for=\"private\">".__('Hide from Popular feeds')."</label>";
$rtl_content = sql_bool_to_bool(db_fetch_result($result, 0, "rtl_content"));
$checked = "";
}
- print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"include_in_digest\"
+ print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"include_in_digest\"
name=\"include_in_digest\"
$checked> <label for=\"include_in_digest\">".__('Include in e-mail digest')."</label>";
$checked = "";
}
- print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"always_display_enclosures\"
+ print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"always_display_enclosures\"
name=\"always_display_enclosures\"
$checked> <label for=\"always_display_enclosures\">".__('Always display image attachments')."</label>";
$checked = "";
}
- print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"cache_images\"
+ if (SIMPLEPIE_CACHE_IMAGES) {
+ print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"cache_images\"
name=\"cache_images\"
$checked> <label for=\"cache_images\">".
__('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> <label for=\"mark_unread_on_update\">".__('Mark updated articles as unread')."</label>";
+
+ $update_on_checksum_change = sql_bool_to_bool(db_fetch_result($result, 0, "update_on_checksum_change"));
+
+ if ($update_on_checksum_change) {
+ $checked = "checked";
+ } else {
+ $checked = "";
+ }
+
+ print "<hr/><input dojoType=\"dijit.form.CheckBox\" type=\"checkbox\" id=\"update_on_checksum_change\"
+ name=\"update_on_checksum_change\"
+ $checked> <label for=\"update_on_checksum_change\">".__('Mark posts as updated on content change')."</label>";
# print "</div>";
print "</div>";
style=\"width: 400px; height: 100px; display: none;\"></iframe>";
print "<form style='display : block' target=\"icon_upload_iframe\"
- enctype=\"multipart/form-data\" method=\"POST\"
+ enctype=\"multipart/form-data\" method=\"POST\"
action=\"backend.php\">
<input id=\"icon_file\" size=\"10\" name=\"icon_file\" type=\"file\">
<input type=\"hidden\" name=\"op\" value=\"pref-feeds\">
print "<div class='dlgButtons'>
<div style=\"float : left\">
<button dojoType=\"dijit.form.Button\" onclick='return unsubscribeFeed($feed_id, \"$title\")'>".
- __('Unsubscribe')."</button>
- </div>
- <button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('feedEditDlg').execute()\">".__('Save')."</button>
+ __('Unsubscribe')."</button>";
+
+ if (PUBSUBHUBBUB_ENABLED) {
+ $pubsub_state = db_fetch_result($result, 0, "pubsub_state");
+ $pubsub_btn_disabled = ($pubsub_state == 2) ? "" : "disabled=\"1\"";
+
+ print "<button dojoType=\"dijit.form.Button\" id=\"pubsubReset_Btn\" $pubsub_btn_disabled
+ onclick='return resetPubSub($feed_id, \"$title\")'>".__('Resubscribe to push updates').
+ "</button>";
+ }
+
+ print "</div>";
+
+ print "<div dojoType=\"dijit.Tooltip\" connectId=\"pubsubReset_Btn\" position=\"below\">".
+ __('Resets PubSubHubbub subscription status for push-enabled feeds.')."</div>";
+
+ print "<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('feedEditDlg').execute()\">".__('Save')."</button>
<button dojoType=\"dijit.form.Button\" onclick=\"return dijit.byId('feedEditDlg').hide()\">".__('Cancel')."</button>
</div>";
/* Title */
- print "<input dojoType=\"dijit.form.ValidationTextBox\"
+ print "<input dojoType=\"dijit.form.ValidationTextBox\"
disabled=\"1\" style=\"font-size : 16px; width : 20em;\" required=\"1\"
name=\"title\" value=\"$title\">";
print __('Place in category:') . " ";
- print_feed_cat_select($link, "cat_id", $cat_id,
+ print_feed_cat_select($link, "cat_id", $cat_id,
'disabled="1" dojoType="dijit.form.Select"');
batch_edit_cbox("cat_id");
/* Update Interval */
- print_select_hash("update_interval", $update_interval, $update_intervals,
+ print_select_hash("update_interval", $update_interval, $update_intervals,
'disabled="1" dojoType="dijit.form.Select"');
batch_edit_cbox("update_interval");
/* Update method */
print " " . __('using') . " ";
- print_select_hash("update_method", $update_method, $update_methods,
- 'disabled="1" dojoType="dijit.form.Select"');
+ print_select_hash("update_method", $update_method, $update_methods,
+ 'disabled="1" dojoType="dijit.form.Select"');
batch_edit_cbox("update_method");
/* Purge intl */
print "<div class=\"dlgSec\">".__("Authentication")."</div>";
print "<div class=\"dlgSecCont\">";
- print "<input dojoType=\"dijit.form.TextBox\"
+ print "<input dojoType=\"dijit.form.TextBox\"
placeHolder=\"".__("Login")."\" disabled=\"1\"
name=\"auth_login\" value=\"$auth_login\">";
batch_edit_cbox("auth_login");
- print "<br/><input dojoType=\"dijit.form.TextBox\" type=\"password\" name=\"auth_pass\"
+ print "<br/><input dojoType=\"dijit.form.TextBox\" type=\"password\" name=\"auth_pass\"
placeHolder=\"".__("Password")."\" disabled=\"1\"
value=\"$auth_pass\">";
print "<div class=\"dlgSec\">".__("Options")."</div>";
print "<div class=\"dlgSecCont\">";
- print "<input disabled=\"1\" type=\"checkbox\" name=\"private\" id=\"private\"
+ print "<input disabled=\"1\" type=\"checkbox\" name=\"private\" id=\"private\"
dojoType=\"dijit.form.CheckBox\"> <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=\"1\" type=\"checkbox\" id=\"include_in_digest\"
- name=\"include_in_digest\"
+ print "<br/><input disabled=\"1\" type=\"checkbox\" id=\"include_in_digest\"
+ name=\"include_in_digest\"
dojoType=\"dijit.form.CheckBox\"> <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=\"1\" type=\"checkbox\" id=\"always_display_enclosures\"
- name=\"always_display_enclosures\"
+ print "<br/><input disabled=\"1\" type=\"checkbox\" id=\"always_display_enclosures\"
+ name=\"always_display_enclosures\"
dojoType=\"dijit.form.CheckBox\"> <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=\"1\" type=\"checkbox\" id=\"cache_images\"
- name=\"cache_images\"
- dojoType=\"dijit.form.CheckBox\"> <label class='insensitive' id=\"cache_images_l\"
+ if (SIMPLEPIE_CACHE_IMAGES) {
+ print "<br/><input disabled=\"1\" type=\"checkbox\" id=\"cache_images\"
+ name=\"cache_images\"
+ dojoType=\"dijit.form.CheckBox\"> <label class='insensitive' id=\"cache_images_l\"
for=\"cache_images\">".
__('Cache images locally')."</label>";
- print " "; batch_edit_cbox("cache_images", "cache_images_l");
+ print " "; 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\"> <label id=\"mark_unread_on_update_l\" class='insensitive' for=\"mark_unread_on_update\">".__('Mark updated articles as unread')."</label>";
+
+ print " "; batch_edit_cbox("mark_unread_on_update", "mark_unread_on_update_l");
+
+ print "<br/><input disabled=\"1\" type=\"checkbox\" id=\"update_on_checksum_change\"
+ name=\"update_on_checksum_change\"
+ dojoType=\"dijit.form.CheckBox\"> <label id=\"update_on_checksum_change_l\" class='insensitive' for=\"update_on_checksum_change\">".__('Mark posts as updated on content change')."</label>";
+
+ print " "; batch_edit_cbox("update_on_checksum_change", "update_on_checksum_change_l");
print "</div>";
print "<div class='dlgButtons'>
- <button dojoType=\"dijit.form.Button\"
+ <button dojoType=\"dijit.form.Button\"
onclick=\"return dijit.byId('feedEditDlg').execute()\">".
__('Save')."</button>
<button dojoType=\"dijit.form.Button\"
onclick=\"return dijit.byId('feedEditDlg').hide()\">".
__('Cancel')."</button>
</div>";
-
+
return;
}
$feed_title = db_escape_string(trim($_POST["title"]));
$feed_link = db_escape_string(trim($_POST["feed_url"]));
- $upd_intl = db_escape_string($_POST["update_interval"]);
- $purge_intl = db_escape_string($_POST["purge_interval"]);
- $feed_id = db_escape_string($_POST["id"]); /* editSave */
+ $upd_intl = (int) db_escape_string($_POST["update_interval"]);
+ $purge_intl = (int) db_escape_string($_POST["purge_interval"]);
+ $feed_id = (int) db_escape_string($_POST["id"]); /* editSave */
$feed_ids = db_escape_string($_POST["ids"]); /* batchEditSave */
- $cat_id = db_escape_string($_POST["cat_id"]);
+ $cat_id = (int) db_escape_string($_POST["cat_id"]);
$auth_login = db_escape_string(trim($_POST["auth_login"]));
$auth_pass = db_escape_string(trim($_POST["auth_pass"]));
$private = checkbox_to_sql_bool(db_escape_string($_POST["private"]));
$always_display_enclosures = checkbox_to_sql_bool(
db_escape_string($_POST["always_display_enclosures"]));
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
+ $mark_unread_on_update = checkbox_to_sql_bool(
+ db_escape_string($_POST["mark_unread_on_update"]));
+
+ $update_on_checksum_change = checkbox_to_sql_bool(
+ db_escape_string($_POST["update_on_checksum_change"]));
+
+ if (get_pref($link, 'ENABLE_FEED_CATS')) {
if ($cat_id && $cat_id != 0) {
$category_qpart = "cat_id = '$cat_id',";
$category_qpart_nocomma = "cat_id = '$cat_id'";
if ($subop == "editSave") {
- $result = db_query($link, "UPDATE ttrss_feeds SET
+ $result = db_query($link, "UPDATE ttrss_feeds SET
$category_qpart
title = '$feed_title', feed_url = '$feed_link',
update_interval = '$upd_intl',
$cache_images_qpart
include_in_digest = $include_in_digest,
always_display_enclosures = $always_display_enclosures,
+ mark_unread_on_update = $mark_unread_on_update,
+ update_on_checksum_change = $update_on_checksum_change,
update_method = '$update_method'
WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]);
$qpart = "";
switch ($k) {
- case "title":
+ case "title":
$qpart = "title = '$feed_title'";
break;
$qpart = "always_display_enclosures = '$always_display_enclosures'";
break;
+ case "mark_unread_on_update":
+ $qpart = "mark_unread_on_update = '$mark_unread_on_update'";
+ break;
+
+ case "update_on_checksum_change":
+ $qpart = "update_on_checksum_change = '$update_on_checksum_change'";
+ break;
+
case "cache_images":
$qpart = "cache_images = '$cache_images'";
break;
return;
}
+ if ($subop == "resetPubSub") {
+
+ $ids = db_escape_string($_REQUEST["ids"]);
+
+ db_query($link, "UPDATE ttrss_feeds SET pubsub_state = 0 WHERE id IN ($ids)
+ AND owner_uid = " . $_SESSION["uid"]);
+
+ return;
+ }
+
if ($subop == "remove") {
$ids = split(",", db_escape_string($_REQUEST["ids"]));
$filters = load_filters($link, $id, $_SESSION["uid"], 6);
- $result = db_query($link, "SELECT
+ $result = db_query($link, "SELECT
title, content, link, ref_id, author,".
SUBSTRING_FOR_DATE."(updated, 1, 19) AS updated
FROM
- ttrss_user_entries, ttrss_entries
- WHERE ref_id = id AND feed_id = '$id' AND
+ ttrss_user_entries, ttrss_entries
+ WHERE ref_id = id AND feed_id = '$id' AND
owner_uid = " .$_SESSION['uid']."
");
$tags = get_article_tags($link, $line["ref_id"]);
- $article_filters = get_article_filters($filters, $line['title'],
- $line['content'], $line['link'], strtotime($line['updated']),
+ $article_filters = get_article_filters($filters, $line['title'],
+ $line['content'], $line['link'], strtotime($line['updated']),
$line['author'], $tags);
-
+
$new_score = calculate_article_score($article_filters);
if (!$scores[$new_score]) $scores[$new_score] = array();
foreach (array_keys($scores) as $s) {
if ($s > 1000) {
- db_query($link, "UPDATE ttrss_user_entries SET score = '$s',
+ db_query($link, "UPDATE ttrss_user_entries SET score = '$s',
marked = true WHERE
ref_id IN (" . join(',', $scores[$s]) . ")");
} else if ($s < -500) {
- db_query($link, "UPDATE ttrss_user_entries SET score = '$s',
+ db_query($link, "UPDATE ttrss_user_entries SET score = '$s',
unread = false WHERE
ref_id IN (" . join(',', $scores[$s]) . ")");
} else {
if ($subop == "rescoreAll") {
- $result = db_query($link,
+ $result = db_query($link,
"SELECT id FROM ttrss_feeds WHERE owner_uid = " . $_SESSION['uid']);
while ($feed_line = db_fetch_assoc($result)) {
$filters = load_filters($link, $id, $_SESSION["uid"], 6);
- $tmp_result = db_query($link, "SELECT
+ $tmp_result = db_query($link, "SELECT
title, content, link, ref_id, author,".
SUBSTRING_FOR_DATE."(updated, 1, 19) AS updated
FROM
- ttrss_user_entries, ttrss_entries
- WHERE ref_id = id AND feed_id = '$id' AND
+ ttrss_user_entries, ttrss_entries
+ WHERE ref_id = id AND feed_id = '$id' AND
owner_uid = " .$_SESSION['uid']."
");
$tags = get_article_tags($link, $line["ref_id"]);
- $article_filters = get_article_filters($filters, $line['title'],
- $line['content'], $line['link'], strtotime($line['updated']),
+ $article_filters = get_article_filters($filters, $line['title'],
+ $line['content'], $line['link'], strtotime($line['updated']),
$line['author'], $tags);
$new_score = calculate_article_score($article_filters);
foreach (array_keys($scores) as $s) {
if ($s > 1000) {
- db_query($link, "UPDATE ttrss_user_entries SET score = '$s',
+ db_query($link, "UPDATE ttrss_user_entries SET score = '$s',
marked = true WHERE
ref_id IN (" . join(',', $scores[$s]) . ")");
} else {
$auth_pass = db_escape_string(trim($_POST["auth_pass"]));
if ($p_from != 'tt-rss') {
+ header("Content-Type: text/html");
print "<html>
<head>
<title>Tiny Tiny RSS</title>
</head>
<body>
<img class=\"floatingLogo\" src=\"images/ttrss_logo.png\"
- alt=\"Tiny Tiny RSS\"/>
+ alt=\"Tiny Tiny RSS\"/>
<h1>Subscribe to feed...</h1>";
}
$rc = subscribe_to_feed($link, $feed_url, $cat_id, $auth_login, $auth_pass);
switch ($rc) {
- case 1:
+ 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 3:
+ print_error(T_sprintf("No feeds found in <b>%s</b>.", $feed_url));
+ break;
case 0:
print_warning(T_sprintf("Already subscribed to <b>%s</b>.", $feed_url));
break;
+ case 4:
+ print_notice("Multiple feed URLs found.");
+
+ $feed_urls = get_feeds_from_html($feed_url);
+ break;
case 5:
print_error(T_sprintf("Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL.", $feed_url));
break;
}
if ($p_from != 'tt-rss') {
- if (!isset($_SERVER['HTTPS'])) $_SERVER['HTTPS'] = 'off';
- $tt_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'tt-rss.php', $_SERVER["REQUEST_URI"]);
+ if ($feed_urls) {
+
+ print "<form action=\"backend.php\">";
+ print "<input type=\"hidden\" name=\"op\" value=\"pref-feeds\">";
+ print "<input type=\"hidden\" name=\"quiet\" value=\"1\">";
+ print "<input type=\"hidden\" name=\"subop\" value=\"add\">";
+
+ print "<select name=\"feed_url\">";
- $tp_uri = ($_SERVER['HTTPS'] != "on" ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'] . preg_replace('/backend\.php.*$/', 'prefs.php', $_SERVER["REQUEST_URI"]);
+ foreach ($feed_urls as $url => $name) {
+ $url = htmlspecialchars($url);
+ $name = htmlspecialchars($name);
+
+ print "<option value=\"$url\">$name</option>";
+ }
+
+ print "<input type=\"submit\" value=\"".__("Subscribe to selected feed").
+ "\">";
+
+ print "</form>";
+ }
+
+ $tp_uri = get_self_url_prefix() . "/prefs.php";
+ $tt_uri = get_self_url_prefix();
if ($rc <= 2){
$result = db_query($link, "SELECT id FROM ttrss_feeds WHERE
print "<p>";
if ($feed_id) {
- print "<form method=\"GET\" style='display: inline'
+ print "<form method=\"GET\" style='display: inline'
action=\"$tp_uri\">
<input type=\"hidden\" name=\"tab\" value=\"feedConfig\">
<input type=\"hidden\" name=\"subop\" value=\"editFeed\">
db_query($link, "BEGIN");
foreach ($ids as $id) {
-
+
db_query($link, "UPDATE ttrss_feeds SET cat_id = $cat_id_qpart
WHERE id = '$id'
AND owner_uid = " . $_SESSION["uid"]);
if (db_num_rows($result) == 1) {
$old_title = db_fetch_result($result, 0, "title");
-
+
if ($cat_title != "") {
$result = db_query($link, "UPDATE ttrss_feed_categories SET
- title = '$cat_title' WHERE id = '$cat_id' AND
+ title = '$cat_title' WHERE id = '$cat_id' AND
owner_uid = ".$_SESSION["uid"]);
print $cat_title;
}
if ($action == "remove") {
-
+
$ids = split(",", db_escape_string($_REQUEST["ids"]));
-
+
foreach ($ids as $id) {
remove_feed_category($link, $id, $_SESSION["uid"]);
}
<input dojoType=\"dijit.form.ValidationTextBox\" required=\"1\" name=\"newcat\">
<button dojoType=\"dijit.form.Button\" onclick=\"dijit.byId('feedCatEditDlg').addCategory()\">".
__('Create category')."</button></div>";
-
+
$result = db_query($link, "SELECT title,id FROM ttrss_feed_categories
WHERE owner_uid = ".$_SESSION["uid"]."
ORDER BY title");
# print "<form id=\"feed_cat_edit_form\" onsubmit=\"return false\">";
- print "<table width=\"100%\" class=\"prefFeedCatList\"
+ print "<table width=\"100%\" class=\"prefFeedCatList\"
cellspacing=\"0\" id=\"prefFeedCatList\">";
-
+
$lnum = 0;
-
+
while ($line = db_fetch_assoc($result)) {
-
+
$class = ($lnum % 2) ? "even" : "odd";
-
+
$cat_id = $line["id"];
$this_row_id = "id=\"FCATR-$cat_id\"";
-
+
print "<tr class=\"\" $this_row_id>";
-
+
$edit_title = htmlspecialchars($line["title"]);
-
- print "<td width='5%' align='center'><input
- onclick='toggleSelectRow2(this);' dojoType=\"dijit.form.CheckBox\"
+
+ print "<td width='5%' align='center'><input
+ onclick='toggleSelectRow2(this);' dojoType=\"dijit.form.CheckBox\"
type=\"checkbox\"></td>";
-
+
print "<td>";
-
-# print "<span id=\"FCATT-$cat_id\">" .
-# $edit_title . "</span>";
- print "<span dojoType=\"dijit.InlineEditBox\"
+# print "<span id=\"FCATT-$cat_id\">" .
+# $edit_title . "</span>";
+
+ print "<span dojoType=\"dijit.InlineEditBox\"
width=\"300px\" autoSave=\"false\"
- cat-id=\"$cat_id\">" . $edit_title .
+ cat-id=\"$cat_id\">" . $edit_title .
"<script type=\"dojo/method\" event=\"onChange\" args=\"item\">
var elem = this;
dojo.xhrPost({
elem.attr('value', response);
updateFeedList();
}
- });
+ });
</script>
</span>";
print "</td></tr>";
-
+
++$lnum;
}
-
+
print "</table>";
# print "</form>";
print "<div dojoType=\"dijit.layout.AccordionContainer\" region=\"center\">";
print "<div id=\"pref-feeds-feeds\" dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Feeds')."\">";
+ /* print "<div dojoType=\"dijit.layout.BorderContainer\">";
+ print "<
+ print "</div>"; */
+
$result = db_query($link, "SELECT COUNT(id) AS num_errors
FROM ttrss_feeds WHERE last_error != '' AND owner_uid = ".$_SESSION["uid"]);
if ($num_errors > 0) {
$error_button = "<button dojoType=\"dijit.form.Button\"
- onclick=\"showFeedsWithErrors\" id=\"errorButton\">" .
+ onclick=\"showFeedsWithErrors()\" id=\"errorButton\">" .
__("Feeds with errors") . "</button>";
// print format_notice("<a href=\"javascript:showFeedsWithErrors()\">".
// __('Some feeds have update errors (click for details)')."</a>");
}
+ if (DB_TYPE == "pgsql") {
+ $interval_qpart = "NOW() - INTERVAL '3 months'";
+ } else {
+ $interval_qpart = "DATE_SUB(NOW(), INTERVAL 3 MONTH)";
+ }
+
+ $result = db_query($link, "SELECT COUNT(*) AS num_inactive FROM ttrss_feeds WHERE
+ (SELECT MAX(updated) FROM ttrss_entries, ttrss_user_entries WHERE
+ ttrss_entries.id = ref_id AND
+ ttrss_user_entries.feed_id = ttrss_feeds.id) < $interval_qpart AND
+ ttrss_feeds.owner_uid = ".$_SESSION["uid"]);
+
+ $num_inactive = db_fetch_result($result, 0, "num_inactive");
+
+ if ($num_inactive > 0) {
+ $inactive_button = "<button dojoType=\"dijit.form.Button\"
+ onclick=\"showInactiveFeeds()\">" .
+ __("Inactive feeds") . "</button>";
+ }
+
$feed_search = db_escape_string($_REQUEST["search"]);
if (array_key_exists("search", $_REQUEST)) {
$feed_search = $_SESSION["prefs_feed_search"];
}
- print "<div dojoType=\"dijit.Toolbar\">";
+ print '<div dojoType="dijit.layout.BorderContainer" gutters="false">';
+
+ print "<div region='top' dojoType=\"dijit.Toolbar\">"; #toolbar
+
+ print "<div style='float : right; padding-right : 4px;'>
+ <input dojoType=\"dijit.form.TextBox\" id=\"feed_search\" size=\"20\" type=\"search\"
+ value=\"$feed_search\">
+ <button dojoType=\"dijit.form.Button\" onclick=\"updateFeedList()\">".
+ __('Search')."</button>
+ </div>";
print "<div dojoType=\"dijit.form.DropDownButton\">".
"<span>" . __('Select')."</span>";
print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
- print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(true)\"
+ print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(true)\"
dojoType=\"dijit.MenuItem\">".__('All')."</div>";
- print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(false)\"
+ print "<div onclick=\"dijit.byId('feedTree').model.setAllChecked(false)\"
dojoType=\"dijit.MenuItem\">".__('None')."</div>";
print "</div></div>";
print "<div dojoType=\"dijit.form.DropDownButton\">".
"<span>" . __('Feeds')."</span>";
print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
- print "<div onclick=\"quickAddFeed()\"
+ print "<div onclick=\"quickAddFeed()\"
dojoType=\"dijit.MenuItem\">".__('Subscribe to feed')."</div>";
- print "<div onclick=\"editSelectedFeed()\"
+ print "<div onclick=\"editSelectedFeed()\"
dojoType=\"dijit.MenuItem\">".__('Edit selected feeds')."</div>";
- print "<div onclick=\"resetFeedOrder()\"
+ print "<div onclick=\"resetFeedOrder()\"
dojoType=\"dijit.MenuItem\">".__('Reset sort order')."</div>";
print "</div></div>";
print "<div dojoType=\"dijit.form.DropDownButton\">".
"<span>" . __('Categories')."</span>";
print "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
- print "<div onclick=\"editFeedCats()\"
+ print "<div onclick=\"editFeedCats()\"
dojoType=\"dijit.MenuItem\">".__('Edit categories')."</div>";
- print "<div onclick=\"resetCatOrder()\"
+ print "<div onclick=\"resetCatOrder()\"
dojoType=\"dijit.MenuItem\">".__('Reset sort order')."</div>";
print "</div></div>";
}
print $error_button;
+ print $inactive_button;
print "<button dojoType=\"dijit.form.Button\" onclick=\"removeSelectedFeeds()\">"
.__('Unsubscribe')."</button dojoType=\"dijit.form.Button\"> ";
print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\">
<option value=\"facDefault\" selected>".__('More actions...')."</option>";
-
+
if (FORCE_ARTICLE_PURGE == 0) {
- print
+ print
"<option value=\"facPurge\">".__('Manual purge')."</option>";
}
-
+
print "
<option value=\"facClear\">".__('Clear feed data')."</option>
<option value=\"facRescore\">".__('Rescore articles')."</option>";
-
+
print "</select>";
}
print "</div>"; # toolbar
+ //print '</div>';
+ print '<div dojoType="dijit.layout.ContentPane" region="center">';
+
print "<div id=\"feedlistLoading\">
<img src='images/indicator_tiny.gif'>".
__("Loading, please wait...")."</div>";
- print "<div dojoType=\"fox.PrefFeedStore\" jsId=\"feedStore\"
+ print "<div dojoType=\"fox.PrefFeedStore\" jsId=\"feedStore\"
url=\"backend.php?op=pref-feeds&subop=getfeedtree\">
</div>
<div dojoType=\"lib.CheckBoxStoreModel\" jsId=\"feedModel\" store=\"feedStore\"
query=\"{id:'root'}\" rootId=\"root\" rootLabel=\"Feeds\"
childrenAttrs=\"items\" checkboxStrict=\"false\" checkboxAll=\"false\">
</div>
- <div dojoType=\"fox.PrefFeedTree\" id=\"feedTree\"
- dndController=\"dijit.tree.dndSource\"
+ <div dojoType=\"fox.PrefFeedTree\" id=\"feedTree\"
+ dndController=\"dijit.tree.dndSource\"
betweenThreshold=\"5\"
model=\"feedModel\" openOnClick=\"false\">
<script type=\"dojo/method\" event=\"onClick\" args=\"item\">
editFeed(bare_id);
} else if (id.match('CAT:')) {
editCat(bare_id, item);
- }
+ }
</script>
<script type=\"dojo/method\" event=\"onLoad\" args=\"item\">
Element.hide(\"feedlistLoading\");
".__('<b>Hint:</b> you can drag feeds and categories around.')."
</div>";
+ print '</div>';
+ print '</div>';
+
print "</div>"; # feeds pane
print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('OPML')."\">";
- print "<p>" . __("Using OPML you can export and import your feeds and Tiny Tiny RSS settings.");
+ print "<p>" . __("Using OPML you can export and import your feeds and Tiny Tiny RSS settings.") . " ";
- print "<div class=\"insensitive\">" . __("Note: Only main settings profile can be migrated using OPML.") . "</div>";
+ print "<span class=\"insensitive\">" . __("Note: Only main settings profile can be migrated using OPML.") . "</span>";
print "</p>";
- print "<iframe id=\"upload_iframe\"
+ print "<h3>" . __("Import") . "</h3>";
+
+ print "<br/><iframe id=\"upload_iframe\"
name=\"upload_iframe\" onload=\"opmlImportComplete(this)\"
style=\"width: 400px; height: 100px; display: none;\"></iframe>";
- print "<form style='display : block' target=\"upload_iframe\"
- enctype=\"multipart/form-data\" method=\"POST\"
+ print "<form name=\"opml_form\" style='display : block' target=\"upload_iframe\"
+ enctype=\"multipart/form-data\" method=\"POST\"
action=\"backend.php\">
<input id=\"opml_file\" name=\"opml_file\" type=\"file\">
<input type=\"hidden\" name=\"op\" value=\"dlg\">
<input type=\"hidden\" name=\"id\" value=\"importOpml\">
- <button dojoType=\"dijit.form.Button\" onclick=\"return opmlImport();\"
- type=\"submit\">".__('Import')."</button>
- <button dojoType=\"dijit.form.Button\" onclick=\"gotoExportOpml()\">".__('Export OPML')."</button>
- </form>";
+ <button dojoType=\"dijit.form.Button\" onclick=\"return opmlImport();\" type=\"submit\">" .
+ __('Import') . "</button>";
+
+ print "<h3>" . __("Export") . "</h3>";
+
+ print "<p>" . __('Filename:') .
+ " <input type=\"text\" id=\"filename\" value=\"TinyTinyRSS.opml\" /> " .
+ __('Include settings') . "<input type=\"checkbox\" id=\"settings\" CHECKED />" .
+
+ "<button dojoType=\"dijit.form.Button\"
+ onclick=\"gotoExportOpml(document.opml_form.filename.value, document.opml_form.settings.checked)\" >" .
+ __('Export') . "</button></p></form>";
+
+ print "<h3>" . __("Publish") . "</h3>";
- print "<p>".__('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.');
+ print "<p>".__('Your OPML can be published publicly and can be subscribed by anyone who knows the URL below.') . " ";
- print "<div class=\"insensitive\">" . __("Note: Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") . "</div>" . "</p>";
+ print "<span class=\"insensitive\">" . __("Note: Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds.") . "</span>" . "</p>";
print "<button dojoType=\"dijit.form.Button\" onclick=\"return displayDlg('pubOPMLUrl')\">".
__('Display URL')."</button> ";
if (strpos($_SERVER['HTTP_USER_AGENT'], "Firefox") !== false) {
print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Firefox integration')."\">";
-
+
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.') .
+ __('Click here to register this site as a feed reader.') .
"</button>";
print "</p>";
}
print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Subscribing using bookmarklet')."\">";
-
+
print "<p>" . __("Drag the link below to your browser toolbar, open the feed you're interested in in your browser and click on the link to subscribe to it.") . "</p>";
$bm_subscribe_url = str_replace('%s', '', add_feed_url());
print "</div>"; #pane
- print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Published articles and generated feeds')."\">";
+ print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Published & shared articles and generated feeds')."\">";
+
+ print "<h3>" . __("Published articles and generated feeds") . "</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>";
- $rss_url = '-2::' . htmlspecialchars(get_self_url_prefix() .
- "/backend.php?op=rss&id=-2&view-mode=all_articles");;
+ $rss_url = '-2::' . htmlspecialchars(get_self_url_prefix() .
+ "/public.php?op=rss&id=-2&view-mode=all_articles");;
print "<button dojoType=\"dijit.form.Button\" onclick=\"return displayDlg('generatedFeed', '$rss_url')\">".
__('Display URL')."</button> ";
-
+
print "<button dojoType=\"dijit.form.Button\" onclick=\"return clearFeedAccessKeys()\">".
__('Clear all generated URLs')."</button> ";
+ print "<h3>" . __("Articles shared by URL") . "</h3>";
+
+ print "<p>" . __("You can disable all articles shared by unique URLs here.") . "</p>";
+
+ print "<button dojoType=\"dijit.form.Button\" onclick=\"return clearArticleAccessKeys()\">".
+ __('Unshare all articles')."</button> ";
+
print "</div>"; #pane
if (defined('CONSUMER_KEY') && CONSUMER_KEY != '') {
print "<div id=\"pref-feeds-twitter\" dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Twitter')."\">";
-
+
$result = db_query($link, "SELECT COUNT(*) AS cid FROM ttrss_users
WHERE twitter_oauth IS NOT NULL AND twitter_oauth != '' AND
id = " . $_SESSION['uid']);
-
+
$is_registered = db_fetch_result($result, 0, "cid") != 0;
-
+
if (!$is_registered) {
print_notice(__('Before you can update your Twitter feeds, you must register this instance of Tiny Tiny RSS with Twitter.com.'));
} else {
print_notice(__('You have been successfully registered with Twitter.com and should be able to access your Twitter feeds.'));
}
-
+
print "<button dojoType=\"dijit.form.Button\" onclick=\"window.location.href = 'twitter.php?op=register'\">".
__("Register with Twitter.com")."</button>";
-
+
print " ";
-
- print "<button dojoType=\"dijit.form.Button\"
+
+ print "<button dojoType=\"dijit.form.Button\"
onclick=\"return clearTwitterCredentials()\">".
__("Clear stored credentials")."</button>";
-
+
print "</div>"; # pane
}
$rv = '';
if ($search) {
- $search_qpart = "AND (UPPER(feed_url) LIKE UPPER('%$search%') OR
+ $search_qpart = "AND (UPPER(feed_url) LIKE UPPER('%$search%') OR
UPPER(title) LIKE UPPER('%$search%'))";
} else {
$search_qpart = "";
}
if ($mode == 1) {
- $result = db_query($link, "SELECT feed_url, subscribers FROM
+ /* $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");
+ AND owner_uid = '$owner_uid') $search_qpart
+ ORDER BY subscribers DESC LIMIT $limit"); */
+
+ $result = db_query($link, "SELECT feed_url, site_url, title, SUM(subscribers) AS subscribers FROM
+ (SELECT feed_url, site_url, title, subscribers FROM ttrss_feedbrowser_cache UNION ALL
+ SELECT feed_url, site_url, title, subscribers FROM ttrss_linked_feeds) AS qqq
+ WHERE
+ (SELECT COUNT(id) = 0 FROM ttrss_feeds AS tf
+ WHERE tf.feed_url = qqq.feed_url
+ AND owner_uid = '$owner_uid') $search_qpart
+ GROUP BY feed_url, site_url, title ORDER BY subscribers DESC LIMIT $limit");
+
} else if ($mode == 2) {
$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
+ (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
+ 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)) {
if ($mode == 1) {
- $feed_url = $line["feed_url"];
+ $feed_url = htmlspecialchars($line["feed_url"]);
+ $site_url = htmlspecialchars($line["site_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 style=\"vertical-align : middle\" class=\"tinyFeedIcon\" src=\"" . ICONS_URL .
- "/".$details["id"].".ico\">";
- } else {
- $feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
- }
-
- $check_box = "<input onclick='toggleSelectListRow2(this)'
+ $check_box = "<input onclick='toggleSelectListRow2(this)'
dojoType=\"dijit.form.CheckBox\"
type=\"checkbox\" \">";
-
+
$class = ($feedctr % 2) ? "even" : "odd";
-
- $feed_url = htmlspecialchars($line["feed_url"]);
- if ($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 = "";
- }
+ $site_url = "<a target=\"_blank\"
+ href=\"$site_url\">
+ <span class=\"fb_feedTitle\">".
+ htmlspecialchars($line["title"])."</span></a>";
+
+ $feed_url = "<a target=\"_blank\" class=\"fb_feedUrl\"
+ href=\"$feed_url\"><img src='images/feed-icon-12x12.png'
+ style='vertical-align : middle'></a>";
- $feed_url = "<a target=\"_blank\" href=\"$feed_url\"><img
- style='border-width : 0px; vertical-align : middle'
- src='images/feed-icon-12x12.png'></a>";
+ $rv .= "<li>$check_box $feed_url $site_url".
+ " <span class='subscribers'>($subscribers)</span></li>";
- $rv .= "<li title=\"".htmlspecialchars($details["site_url"])."\"
- id=\"FBROW-".$details["id"]."\">$check_box".
- "$feed_icon $feed_url " . htmlspecialchars($details["title"]) .
- " <span class='subscribers'>($subscribers)</span>
- $site_url</li>";
-
} else if ($mode == 2) {
$feed_url = htmlspecialchars($line["feed_url"]);
- $site_url = htmlspecialchars($line["site_url"]);
+ $site_url = htmlspecialchars($line["site_url"]);
$title = htmlspecialchars($line["title"]);
- $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='toggleSelectListRow2(this)' dojoType=\"dijit.form.CheckBox\"
type=\"checkbox\">";
-
+
$class = ($feedctr % 2) ? "even" : "odd";
if ($line['articles_archived'] > 0) {
$archived = '';
}
- if ($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 = "";
- }
-
- $feed_url = "<a target=\"_blank\" href=\"$feed_url\"><img
- style='border-width : 0px; vertical-align : middle'
- src='images/feed-icon-12x12.png'></a>";
+ $site_url = "<a target=\"_blank\"
+ href=\"$site_url\">
+ <span class=\"fb_feedTitle\">".
+ htmlspecialchars($line["title"])."</span></a>";
- $rv .= "<li title='".$line['site_url']."' class='$class'
- id=\"FBROW-".$line["id"]."\">".
- $check_box . "$feed_icon $feed_url " . $title .
- $archived . $site_url . "</li>";
+ $feed_url = "<a target=\"_blank\" class=\"fb_feedUrl\"
+ href=\"$feed_url\"><img src='images/feed-icon-12x12.png'
+ style='vertical-align : middle'></a>";
+ $rv .= "<li id=\"FBROW-".$line["id"]."\">".
+ "$check_box $feed_url $site_url $archived</li>";
}
++$feedctr;
git.wh0rd.org / tt-rss.git / blobdiff