servers/ttrss
1
0
Fork 0
mirror of https://tt-rss.org/git/tt-rss.git synced 2024-06-25 11:57:42 +02:00
Code Issues Releases Wiki Activity

more opml export tweaks, tiny category detection tweak on import

Browse Source
This commit is contained in:
Andrew Dolgov 2005-11-25 18:34:34 +01:00
parent a90005e6a4
commit fa7b874901
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
opml.php
View File

@ -36,8 +36,7 @@
if (get_pref($link, 'ENABLE_FEED_CATS')) { if (get_pref($link, 'ENABLE_FEED_CATS')) {
$cat_mode = true; $cat_mode = true;
$result = db_query($link, "SELECT $result = db_query($link, "SELECT
ttrss_feeds.feed_url AS feed_url, title,feed_url,site_url,
ttrss_feeds.title AS title,
(SELECT title FROM ttrss_feed_categories WHERE id = cat_id) as cat_title (SELECT title FROM ttrss_feed_categories WHERE id = cat_id) as cat_title
FROM ttrss_feeds FROM ttrss_feeds
WHERE WHERE
@ -53,6 +52,7 @@
while ($line = db_fetch_assoc($result)) { while ($line = db_fetch_assoc($result)) {
$title = htmlspecialchars($line["title"]); $title = htmlspecialchars($line["title"]);
$url = htmlspecialchars($line["feed_url"]); $url = htmlspecialchars($line["feed_url"]);
$site_url = htmlspecialchars($line["site_url"]);
if ($cat_mode) { if ($cat_mode) {
$cat_title = htmlspecialchars($line["cat_title"]); $cat_title = htmlspecialchars($line["cat_title"]);
@ -70,7 +70,13 @@
} }
} }
print "<outline text=\"$title\" xmlUrl=\"$url\"/>\n"; if ($site_url) {
$html_url_qpart = "htmlUrl=\"$site_url\"";
} else {
$html_url_qpart = "";
}
print "<outline text=\"$title\" xmlUrl=\"$url\" $html_url_qpart/>\n";
} }
if ($cat_mode && $old_cat_title) { if ($cat_mode && $old_cat_title) {
@ -116,7 +122,7 @@
$cat_title = db_escape_string($outline->get_attribute('title')); $cat_title = db_escape_string($outline->get_attribute('title'));
$feed_url = db_escape_string($outline->get_attribute('xmlUrl')); $feed_url = db_escape_string($outline->get_attribute('xmlUrl'));
if ($cat_title) { if ($cat_title && !$feed_url) {
db_query($link, "BEGIN"); db_query($link, "BEGIN");