while ($line = db_fetch_assoc($result)) {
- $feed = $line["title"];
+ $feed = db_unescape_string($line["title"]);
$feed_id = $line["id"];
$subop = $_GET["subop"];
print "<div align='center'>
<input type='submit' class='button'
- onclick=\"closeInfoBox()\" value=\"Cancel\">
+ onclick=\"feedEditCancel()\" value=\"Cancel\">
<input type=\"submit\" class=\"button\"
- onclick=\"javascript:feedEditSave()\" value=\"Save\"></div>";
+ onclick=\"feedEditSave()\" value=\"Save\"></div>";
return;
}
update_interval = '$upd_intl',
purge_interval = '$purge_intl'
WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]);
+ }
+
+ if ($subop == "saveCat") {
+ $cat_title = db_escape_string($_GET["title"]);
+ $cat_id = db_escape_string($_GET["id"]);
+
+ $result = db_query($link, "UPDATE ttrss_feed_categories SET
+ title = '$cat_title' WHERE id = '$cat_id' AND owner_uid = ".$_SESSION["uid"]);
}
$_SESSION["pref_sort_feeds"] = $feeds_sort;
if ($feed_search) {
- $search_qpart = "UPPER(title) LIKE UPPER('%$feed_search%') AND";
+ $search_qpart = "(UPPER(title) LIKE UPPER('%$feed_search%') OR
+ UPPER(feed_url) LIKE UPPER('%$feed_search%')) AND";
} else {
$search_qpart = "";
}
if (!get_pref($link, 'ENABLE_FEED_CATS')) {
print "<tr class=\"title\">
- <td width='1%'> </td>
- <td width='5%' align='center'>Select</td>
+ <td width='5%' align='center'></td>
<td width='30%'><a href=\"javascript:updateFeedList('title')\">Title</a></td>
- <td width='30%'><a href=\"javascript:updateFeedList('feed_url')\">Link</a></td>
+ <td width='30%'><a href=\"javascript:updateFeedList('feed_url')\">Feed</a></td>
<td width='15%'><a href=\"javascript:updateFeedList('update_interval')\">Update Interval</a></td>
<td width='15%'><a href=\"javascript:updateFeedList('purge_interval')\">Purge Days</a></td></tr>";
}
print "<tr><td colspan=\"6\" class=\"feedEditCat\">$edit_cat</td></tr>";
print "<tr class=\"title\">
- <td width='1%'> </td>
- <td width='5%' align='center'>Select</td>
+ <td width='5%' align='center'></td>
<td width='30%'><a href=\"javascript:updateFeedList('title')\">Title</a></td>
- <td width='30%'><a href=\"javascript:updateFeedList('feed_url')\">Link</a></td>
+ <td width='30%'><a href=\"javascript:updateFeedList('feed_url')\">Feed</a></td>
<td width='15%'><a href=\"javascript:updateFeedList('update_interval')\">Update Interval</a></td>
<td width='15%'><a href=\"javascript:updateFeedList('purge_interval')\">Purge Days</a></td></tr>";
$icon_file = ICONS_DIR . "/$feed_id.ico";
if (file_exists($icon_file) && filesize($icon_file) > 0) {
- $feed_icon = "<img width=\"16\" height=\"16\"
- src=\"" . ICONS_URL . "/$feed_id.ico\">";
+ $feed_icon = "<img class=\"tinyFeedIcon\" src=\"" . ICONS_URL . "/$feed_id.ico\">";
} else {
- $feed_icon = " ";
+ $feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
}
- print "<td class='feedIcon'>$feed_icon</td>";
+// print "<td class='feedIcon'>$feed_icon</td>";
print "<td class='feedSelect'><input onclick='toggleSelectRow(this);'
type=\"checkbox\" id=\"FRCHK-".$line["id"]."\"></td>";
$edit_link = truncate_string($edit_link, 60);
print "<td><a href=\"javascript:editFeed($feed_id);\">" .
- $edit_title . "</a></td>";
+ "$feed_icon $edit_title" . "</a></td>";
print "<td><a href=\"javascript:editFeed($feed_id);\">" .
$edit_link . "</a></td>";
</td</tr>";
print "<tr class=\"title\">
- <td width=\"10%\">Select</td><td width=\"80%\">Title</td>
+ <td width=\"5%\"></td><td width=\"80%\">Title</td>
</tr>";
$lnum = 0;
if (!$edit_cat_id || $subop != "editCat") {
- print "<td><input onclick='toggleSelectRow(this);'
+ print "<td align='center'><input onclick='toggleSelectRow(this);'
type=\"checkbox\" id=\"FCCHK-".$line["id"]."\"></td>";
print "<td><a href=\"javascript:editFeedCat($cat_id);\">" .
</td</tr>";
print "<tr class=\"title\">
- <td width=\"5%\">Select</td>
+ <td align='center' width=\"5%\"></td>
<td width=\"20%\">Filter expression</td>
<td width=\"20%\">Feed</td>
<td width=\"15%\">Match</td>
if (!$line["description"]) $line["description"] = "[No description]";
- print "<td><input onclick='toggleSelectRow(this);'
+ print "<td align='center'><input onclick='toggleSelectRow(this);'
type=\"checkbox\" id=\"FICHK-".$line["id"]."\"></td>";
print "<td><a href=\"javascript:editFilter($filter_id);\">" .
</td</tr>";
print "<tr class=\"title\">
- <td width=\"5%\">Select</td><td width=\"40%\">SQL expression
+ <td align='center' width=\"5%\"></td><td width=\"40%\">SQL expression
<a class=\"helpLink\" href=\"javascript:displayHelpInfobox(1)\">(?)</a>
</td>
<td width=\"40%\">Caption</td></tr>";
if (!$line["description"]) $line["description"] = "[No caption]";
- print "<td><input onclick='toggleSelectRow(this);'
+ print "<td align='center'><input onclick='toggleSelectRow(this);'
type=\"checkbox\" id=\"LICHK-".$line["id"]."\"></td>";
print "<td><a href=\"javascript:editLabel($label_id);\">" .
name=\"subop\" value=\"Save configuration\">";
print " <input class=\"button\" type=\"submit\"
- name=\"subop\" value=\"Reset to defaults\"></p>";
+ name=\"subop\" onclick=\"return validatePrefsReset()\"
+ value=\"Reset to defaults\"></p>";
print "</form>";
</td</tr>";
print "<tr class=\"title\">
- <td width=\"5%\">Select</td>
+ <td align='center' width=\"5%\"></td>
<td width='30%'>Username</td>
<td width='30%'>Access Level</td>
<td width='30%'>Last login</td></tr>";
if ($uid == $_SESSION["uid"]) {
- print "<td><input disabled=\"true\" type=\"checkbox\"
+ print "<td align='center'><input disabled=\"true\" type=\"checkbox\"
id=\"UMCHK-".$line["id"]."\"></td>";
print "<td>".$line["login"]."</td>";
} else if (!$edit_uid || $subop != "edit") {
- print "<td><input onclick='toggleSelectRow(this);'
+ print "<td align='center'><input onclick='toggleSelectRow(this);'
type=\"checkbox\" id=\"UMCHK-$uid\"></td>";
print "<td><a href=\"javascript:editUser($uid);\">" .
if ($op == "feed-details") {
- $feed_id = $_GET["id"];
-
- $result = db_query($link,
- "SELECT
- title,feed_url,
- SUBSTRING(last_updated,1,16) as last_updated,
- icon_url,site_url,
- (SELECT COUNT(int_id) FROM ttrss_user_entries
- WHERE feed_id = id) AS total,
- (SELECT COUNT(int_id) FROM ttrss_user_entries
- WHERE feed_id = id AND unread = true) AS unread,
- (SELECT COUNT(int_id) FROM ttrss_user_entries
- WHERE feed_id = id AND marked = true) AS marked
- FROM ttrss_feeds
- WHERE id = '$feed_id' AND owner_uid = ".$_SESSION["uid"]);
-
- if (db_num_rows($result) == 0) return;
-
- $title = db_fetch_result($result, 0, "title");
- $last_updated = date(get_pref($link, 'LONG_DATE_FORMAT'),
- strtotime(db_fetch_result($result, 0, "last_updated")));
- $feed_url = db_fetch_result($result, 0, "feed_url");
- $icon_url = db_fetch_result($result, 0, "icon_url");
- $total = db_fetch_result($result, 0, "total");
- $unread = db_fetch_result($result, 0, "unread");
- $marked = db_fetch_result($result, 0, "marked");
- $site_url = db_fetch_result($result, 0, "site_url");
-
- $result = db_query($link, "SELECT COUNT(id) AS subscribed
- FROM ttrss_feeds WHERE feed_url = '$feed_url'");
-
- $subscribed = db_fetch_result($result, 0, "subscribed");
-
- print "<div class=\"infoBoxContents\">";
-
- $icon_file = ICONS_DIR . "/$feed_id.ico";
-
- if (file_exists($icon_file) && filesize($icon_file) > 0) {
- $feed_icon = "<img width=\"16\" height=\"16\"
- src=\"" . ICONS_URL . "/$feed_id.ico\">";
- } else {
- $feed_icon = "";
- }
-
- print "<h1>$feed_icon $title</h1>";
-
- print "<table width='100%'>";
-
- if ($site_url) {
- print "<tr><td width='30%'>Link</td>
- <td><a href=\"$site_url\">$site_url</a>
- <a href=\"$feed_url\">(feed)</a></td>
- </td></tr>";
- } else {
- print "<tr><td width='30%'>Feed URL</td>
- <td><a href=\"$feed_url\">$feed_url</a></td></tr>";
- }
- print "<tr><td>Last updated</td><td>$last_updated</td></tr>";
- print "<tr><td>Total articles</td><td>$total</td></tr>";
- print "<tr><td>Unread articles</td><td>$unread</td></tr>";
- print "<tr><td>Starred articles</td><td>$marked</td></tr>";
- print "<tr><td>Subscribed users</td><td>$subscribed</td></tr>";
-
- print "</table>";
+// $feed_id = $_GET["id"];
- $result = db_query($link, "SELECT title,
- SUBSTRING(updated,1,16) AS updated,unread
- FROM ttrss_entries,ttrss_user_entries
- WHERE ref_id = id AND feed_id = '$feed_id'
- ORDER BY date_entered DESC LIMIT 5");
+ $feed_ids = split(",", db_escape_string($_GET["id"]));
- if (db_num_rows($result) > 0) {
+ print "<div class=\"infoBoxContents\">";
- print "<h1>Latest headlines</h1>";
+ foreach ($feed_ids as $feed_id) {
- print "<ul class=\"nomarks\">";
+ $result = db_query($link,
+ "SELECT
+ title,feed_url,
+ SUBSTRING(last_updated,1,16) as last_updated,
+ icon_url,site_url,
+ (SELECT COUNT(int_id) FROM ttrss_user_entries
+ WHERE feed_id = id) AS total,
+ (SELECT COUNT(int_id) FROM ttrss_user_entries
+ WHERE feed_id = id AND unread = true) AS unread,
+ (SELECT COUNT(int_id) FROM ttrss_user_entries
+ WHERE feed_id = id AND marked = true) AS marked
+ FROM ttrss_feeds
+ WHERE id = '$feed_id' AND owner_uid = ".$_SESSION["uid"]);
+
+ if (db_num_rows($result) == 0) return;
+
+ $title = db_unescape_string(db_fetch_result($result, 0, "title"));
+ $last_updated = date(get_pref($link, 'LONG_DATE_FORMAT'),
+ strtotime(db_fetch_result($result, 0, "last_updated")));
+ $feed_url = db_fetch_result($result, 0, "feed_url");
+ $icon_url = db_fetch_result($result, 0, "icon_url");
+ $total = db_fetch_result($result, 0, "total");
+ $unread = db_fetch_result($result, 0, "unread");
+ $marked = db_fetch_result($result, 0, "marked");
+ $site_url = db_fetch_result($result, 0, "site_url");
- while ($line = db_fetch_assoc($result)) {
- if ($line["unread"] == "t" || $line["unread"] == "1") {
- $line["title"] = "<b>" . $line["title"] . "</b>";
- }
- print "<li>" . $line["title"].
- " <span class=\"insensitive\">(" .
- date(get_pref($link, 'SHORT_DATE_FORMAT'),
- strtotime($line["updated"])).
- ")</span></li>";
+ $result = db_query($link, "SELECT COUNT(id) AS subscribed
+ FROM ttrss_feeds WHERE feed_url = '$feed_url'");
+
+ $subscribed = db_fetch_result($result, 0, "subscribed");
+
+ $icon_file = ICONS_DIR . "/$feed_id.ico";
+
+ if (file_exists($icon_file) && filesize($icon_file) > 0) {
+ $feed_icon = "<img width=\"16\" height=\"16\"
+ src=\"" . ICONS_URL . "/$feed_id.ico\">";
+ } else {
+ $feed_icon = "";
}
- print "</ul>";
+ print "<h1>$feed_icon $title</h1>";
- print "</div>";
+ print "<table width='100%'>";
- print "<div align='center'>
- <input type='submit' class='button'
- onclick=\"closeInfoBox()\" value=\"Close this window\"></div>";
+ if ($site_url) {
+ print "<tr><td width='30%'>Link</td>
+ <td><a href=\"$site_url\">$site_url</a>
+ <a href=\"$feed_url\">(feed)</a></td>
+ </td></tr>";
+ } else {
+ print "<tr><td width='30%'>Feed URL</td>
+ <td><a href=\"$feed_url\">$feed_url</a></td></tr>";
+ }
+ print "<tr><td>Last updated</td><td>$last_updated</td></tr>";
+ print "<tr><td>Total articles</td><td>$total</td></tr>";
+ print "<tr><td>Unread articles</td><td>$unread</td></tr>";
+ print "<tr><td>Starred articles</td><td>$marked</td></tr>";
+ print "<tr><td>Subscribed users</td><td>$subscribed</td></tr>";
+
+ print "</table>";
+
+/* $result = db_query($link, "SELECT title,
+ SUBSTRING(updated,1,16) AS updated,unread
+ FROM ttrss_entries,ttrss_user_entries
+ WHERE ref_id = id AND feed_id = '$feed_id'
+ ORDER BY date_entered DESC LIMIT 5");
+
+ if (db_num_rows($result) > 0) {
+
+ print "<h1>Latest headlines</h1>";
+
+ print "<ul class=\"nomarks\">";
+
+ while ($line = db_fetch_assoc($result)) {
+ if ($line["unread"] == "t" || $line["unread"] == "1") {
+ $line["title"] = "<b>" . $line["title"] . "</b>";
+ }
+ print "<li>" . $line["title"].
+ " <span class=\"insensitive\">(" .
+ date(get_pref($link, 'SHORT_DATE_FORMAT'),
+ strtotime($line["updated"])).
+ ")</span></li>";
+ }
+
+ print "</ul>";
+
+ } */
}
- }
+
+ print "</div>";
+
+ print "<div align='center'>
+ <input type='submit' class='button'
+ onclick=\"closeInfoBox()\" value=\"Close this window\"></div>";
+ }
db_close($link);
?>