$faviconURL = $urlParts['scheme'].'://'.$urlParts['host'].$linkUrl;
} else if (substr($linkUrl, 0, 7) == 'http://') {
$faviconURL = $linkUrl;
+ } else if (substr($url, -1, 1) == '/') {
+ $faviconURL = $url.$linkUrl;
} else {
- $pos = strrpos($url, "/");
- // no "/" in url or "/" is part of "://"
- if ($pos === false || $pos == (strpos($url, "://")+2)) {
- $faviconURL = $url.'/'.$linkUrl;
- } else {
- $faviconURL = substr($url, 0, $pos+1).$linkUrl;
- }
+ $faviconURL = $url.'/'.$linkUrl;
}
} else {
$http_response = fgets( $socket, 22 );
- $responses = "/(200 OK)|(30[123])/";
+ $responses = "/(200 OK)|(30[0-9] Moved)/";
if ( preg_match($responses, $http_response) ) {
fclose($socket);
return true;
if (defined('DAEMON_EXTENDED_DEBUG') || $_GET['xdebug']) {
_debug("update_rss_feed: new feed, catching it up...");
}
- catchup_feed($link, $feed, false, $owner_uid);
+ catchup_feed($link, $feed, false);
}
if (!$hidden) {
}
}
- function catchup_feed($link, $feed, $cat_view, $owner_uid) {
-
- if (!$owner_uid) $owner_uid = $_SESSION['uid'];
+ function catchup_feed($link, $feed, $cat_view) {
if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) {
}
$tmp_result = db_query($link, "SELECT id
- FROM ttrss_feeds WHERE $cat_qpart AND owner_uid = $owner_uid");
+ FROM ttrss_feeds WHERE $cat_qpart AND owner_uid = " .
+ $_SESSION["uid"]);
while ($tmp_line = db_fetch_assoc($tmp_result)) {
db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW()
- WHERE feed_id = '$tmp_feed' AND owner_uid = $owner_uid");
+ WHERE feed_id = '$tmp_feed' AND owner_uid = " . $_SESSION["uid"]);
}
} else if ($feed == -2) {
db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW() WHERE (SELECT COUNT(*)
FROM ttrss_user_labels2 WHERE article_id = ref_id) > 0
- AND unread = true AND owner_uid = $owner_uid");
+ AND unread = true AND owner_uid = " . $_SESSION["uid"]);
}
} else if ($feed > 0) {
db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW()
WHERE (feed_id = '$feed' OR $children_qpart)
- AND owner_uid = $owner_uid");
+ AND owner_uid = " . $_SESSION["uid"]);
} else {
db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW()
- WHERE feed_id = '$feed' AND owner_uid = $owner_uid");
+ WHERE feed_id = '$feed' AND owner_uid = " . $_SESSION["uid"]);
}
} else if ($feed < 0 && $feed > -10) { // special, like starred
if ($feed == -1) {
db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW()
- WHERE marked = true AND owner_uid = $owner_uid");
+ WHERE marked = true AND owner_uid = ".$_SESSION["uid"]);
}
if ($feed == -2) {
db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW()
- WHERE published = true AND owner_uid = $owner_uid");
+ WHERE published = true AND owner_uid = ".$_SESSION["uid"]);
}
if ($feed == -3) {
ttrss_user_entries WHERE $match_part AND
unread = true AND
ttrss_user_entries.ref_id = ttrss_entries.id AND
- owner_uid = $owner_uid");
+ owner_uid = ".$_SESSION["uid"]);
$affected_ids = array();
if ($feed == -4) {
db_query($link, "UPDATE ttrss_user_entries
SET unread = false,last_read = NOW()
- WHERE owner_uid = $owner_uid");
+ WHERE owner_uid = ".$_SESSION["uid"]);
}
} else if ($feed < -10) { // label
db_query($link, "UPDATE ttrss_user_entries, ttrss_user_labels2
SET unread = false, last_read = NOW()
WHERE label_id = '$label_id' AND unread = true
- AND owner_uid = '$owner_uid' AND ref_id = article_id");
+ AND owner_uid = '".$_SESSION["uid"]."' AND ref_id = article_id");
}
- ccache_update($link, $feed, $owner_uid, $cat_view);
+ ccache_update($link, $feed, $_SESSION["uid"], $cat_view);
} else { // tag
db_query($link, "BEGIN");
$tag_name = db_escape_string($feed);
$result = db_query($link, "SELECT post_int_id FROM ttrss_tags
- WHERE tag_name = '$tag_name' AND owner_uid = $owner_uid");
+ WHERE tag_name = '$tag_name' AND owner_uid = " . $_SESSION["uid"]);
while ($line = db_fetch_assoc($result)) {
db_query($link, "UPDATE ttrss_user_entries SET
guid,
ttrss_entries.id,ttrss_entries.title,
updated,
- note,
unread,feed_id,marked,published,link,last_read,
".SUBSTRING_FOR_DATE."(last_read,1,19) as last_read_noms,
$vfeed_query_part
$result = db_query($link, "SELECT
guid,
- note,
ttrss_entries.id as id,title,
updated,
unread,feed_id,
function generate_syndicated_feed($link, $owner_uid, $feed, $is_cat,
$limit, $search, $search_mode, $match_on) {
- $note_style = "background-color : #fff7d5; border-width : 1px; ".
- "padding : 5px; border-style : dashed; border-color : #e7d796;".
- "margin-top : 5px; color : #9a8c59;";
-
if (!$limit) $limit = 30;
$qfh_ret = queryFeedHeadlines($link, $feed,
print "<title>" .
htmlspecialchars($line["title"]) . "</title>";
- print "<description><![CDATA[";
- print $line["content_preview"];
- if ($line["note"]) {
- print "<div style='$note_style'>";
- print $line["note"];
- print "</div>";
- }
- print "]]></description>";
+ print "<description><![CDATA[" .
+ $line["content_preview"] . "]]></description>";
print "</item>";
}
".SUBSTRING_FOR_DATE."(updated,1,16) as updated,
(SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url,
num_comments,
- author,
- note
+ author
FROM ttrss_entries,ttrss_user_entries
WHERE id = '$id' AND ref_id = id AND owner_uid = " . $_SESSION["uid"]);
if (!$entry_comments) $entry_comments = " "; # placeholder
print "<div style='float : right'>
- <img src='images/tag.png' class='tagsPic' alt='Tags' title='Tags'> ";
+ <img src='images/tag.png' class='tagsPic' alt='Tags' title='Tags'>";
if (!$zoom_mode) {
print "<span id=\"ATSTR-$id\">$tags_str</span>
style=\"cursor : pointer\" style=\"cursor : pointer\"
onclick=\"zoomToArticle($id)\"
alt='Zoom' title='".__('Show article summary in new window')."'>";
-
- $note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);
-
- print "<img src=\"images/art-pub-note.png\" class='tagsPic'
- style=\"cursor : pointer\" style=\"cursor : pointer\"
- onclick=\"publishWithNote($id, '$note_escaped')\"
- alt='PubNote' title='".__('Publish article with a note')."'>";
-
}
print "</div>";
print "<div clear='both'>$entry_comments</div>";
print $article_content;
- print "<div id=\"POSTNOTE-$id\">";
- if ($line['note']) {
- print format_article_note($id, $line['note']);
- }
- print "</div>";
-
$result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE
post_id = '$id' AND content_url != ''");
// print "<div class=\"cdmInnerContent\" id=\"CICD-$id\" $cdm_cstyle>";
print sanitize_rss($link, $line["content_preview"]);
-
- print "<div id=\"POSTNOTE-$id\">";
- if ($line['note']) {
- print format_article_note($id, $line['note']);
- }
- print "</div>";
-
$article_content = $line["content_preview"];
$e_result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE
" <input type=\"checkbox\" onclick=\"toggleSelectRowById(this,
'RROW-$id')\" class=\"feedCheckBox\" id=\"RCHK-$id\">";
- print "</span><span class='s1'>$marked_pic ";
- print "$published_pic ";
- print "<img src=\"images/art-zoom.png\" class='tagsPic'
+ print "</span><span class='s1'>$marked_pic</span> ";
+ print "<span class='s1'>$published_pic</span> ";
+ print "<span class='s1'><img src=\"images/art-zoom.png\" class='tagsPic'
onclick=\"zoomToArticle($id)\"
style=\"cursor : pointer\"
alt='Zoom'
- title='".__('Show article summary in new window')."'> ";
-
- $note_escaped = htmlspecialchars($line['note'], ENT_QUOTES);
-
- print "<img src=\"images/art-pub-note.png\" class='tagsPic'
- style=\"cursor : pointer\" style=\"cursor : pointer\"
- onclick=\"publishWithNote($id, '$note_escaped')\"
- alt='PubNote' title='".__('Publish article with a note')."'>";
-
- print "</span>";
+ title='".__('Show article summary in new window')."'></span>";
$tags_str = format_tags_string(get_article_tags($link, $id), $id);
print "</span>";
- print "<span class='s2'><a class=\"cdmToggleLink\"
+ print "<span class='s2'>
Toggle: <a class=\"cdmToggleLink\"
href=\"javascript:toggleUnread($id)\">
- ".__('toggle unread')."</a></span>";
+ Unread</a></span>";
print "</div>";
print "</div>";
value = 0 WHERE owner_uid = '$owner_uid'");
}
- function ccache_remove($link, $feed_id, $owner_uid, $is_cat = false) {
-
- if (!$is_cat) {
- $table = "ttrss_counters_cache";
- } else {
- $table = "ttrss_cat_counters_cache";
- }
-
- db_query($link, "DELETE FROM $table WHERE
- feed_id = '$feed_id' AND owner_uid = '$owner_uid'");
-
- }
-
function ccache_update_all($link, $owner_uid) {
if (get_pref($link, 'ENABLE_FEED_CATS', $owner_uid)) {
$unread = (int) getFeedArticles($link, $feed_id, $is_cat, true, $owner_uid);
}
- db_query($link, "BEGIN");
-
$result = db_query($link, "SELECT feed_id FROM $table
WHERE owner_uid = '$owner_uid' AND feed_id = '$feed_id' LIMIT 1");
($feed_id, $unread, $owner_uid, NOW())");
}
- db_query($link, "COMMIT");
-
if ($feed_id > 0 && $prev_unread != $unread) {
if (!$is_cat) {
return $labels_str;
}
-
- function format_article_note($id, $note) {
-
- $note_escaped = htmlspecialchars($note, ENT_QUOTES);
-
- $str = "<div class='articleNote'>";
- $str .= "<div class='articleNoteOps'>";
- $str .= "<a href=\"javascript:publishWithNote($id, '$note_escaped')\">".
- __('edit note')."</a>";
- $str .= "</div>";
- $str .= $note;
- $str .= "</div>";
-
- return $str;
- }
?>
git.wh0rd.org / tt-rss.git / blobdiff