valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move url resolution before duplicate checks - otherwise we may get duplicates (refs #276)

This commit is contained in:
Christian Weiske 2010-11-09 08:03:27 +01:00 committed by Andrew Dolgov
parent 490c366d39
commit f6d8345b01
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
functions.php
View File

@ -2998,6 +2998,15 @@
$url = fix_url($url); $url = fix_url($url);
if (!validate_feed_url($url)) return 2; if (!validate_feed_url($url)) return 2;
if (url_is_html($url)) {
$feedUrls = get_feeds_from_html($url);
if (count($feedUrls) != 1) {
return 3;
}
//use feed url as new URL
$url = key($feedUrls);
}
if ($cat_id == "0" || !$cat_id) { if ($cat_id == "0" || !$cat_id) {
$cat_qpart = "NULL"; $cat_qpart = "NULL";
} else { } else {
@ -3009,15 +3018,6 @@
WHERE feed_url = '$url' AND owner_uid = ".$_SESSION["uid"]); WHERE feed_url = '$url' AND owner_uid = ".$_SESSION["uid"]);
if (db_num_rows($result) == 0) { if (db_num_rows($result) == 0) {
if (url_is_html($url)) {
$feedUrls = get_feeds_from_html($url);
if (count($feedUrls) != 1) {
return 3;
}
//use feed url as new URL
$url = key($feedUrls);
}
$result = db_query($link, $result = db_query($link,
"INSERT INTO ttrss_feeds "INSERT INTO ttrss_feeds
(owner_uid,feed_url,title,cat_id, auth_login,auth_pass) (owner_uid,feed_url,title,cat_id, auth_login,auth_pass)