|
|
@ -3629,9 +3629,11 @@
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (get_pref($link, "STRIP_IMAGES", $owner)) {
|
|
|
|
if (get_pref($link, "STRIP_IMAGES", $owner)) {
|
|
|
|
|
|
|
|
|
|
|
|
$res = preg_replace('/<img[^>]+>/is', '', $res);
|
|
|
|
$res = preg_replace('/<img[^>]+>/is', '', $res);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW')) {
|
|
|
|
|
|
|
|
$res = preg_replace("/href=/i", "target=\"_blank\" href=", $res);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return $res;
|
|
|
|
return $res;
|
|
|
@ -4612,12 +4614,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
if ($result) {
|
|
|
|
if ($result) {
|
|
|
|
|
|
|
|
|
|
|
|
$link_target = "";
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW')) {
|
|
|
|
|
|
|
|
$link_target = "target=\"_blank\"";
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$line = db_fetch_assoc($result);
|
|
|
|
$line = db_fetch_assoc($result);
|
|
|
|
|
|
|
|
|
|
|
|
if ($line["icon_url"]) {
|
|
|
|
if ($line["icon_url"]) {
|
|
|
@ -4635,10 +4631,10 @@
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
$comments_url = $line["link"];
|
|
|
|
$comments_url = $line["link"];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$entry_comments = "<a $link_target href=\"$comments_url\">$num_comments comments</a>";
|
|
|
|
$entry_comments = "<a target='_blank' href=\"$comments_url\">$num_comments comments</a>";
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
if ($line["comments"] && $line["link"] != $line["comments"]) {
|
|
|
|
if ($line["comments"] && $line["link"] != $line["comments"]) {
|
|
|
|
$entry_comments = "<a $link_target href=\"".$line["comments"]."\">comments</a>";
|
|
|
|
$entry_comments = "<a target='_blank' href=\"".$line["comments"]."\">comments</a>";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -4669,7 +4665,7 @@
|
|
|
|
print "<div class=\"postDate$rtl_class\">$parsed_updated</div>";
|
|
|
|
print "<div class=\"postDate$rtl_class\">$parsed_updated</div>";
|
|
|
|
|
|
|
|
|
|
|
|
if ($line["link"]) {
|
|
|
|
if ($line["link"]) {
|
|
|
|
print "<div clear='both'><a $link_target href=\"" . $line["link"] . "\">" .
|
|
|
|
print "<div clear='both'><a target='_blank' href=\"" . $line["link"] . "\">" .
|
|
|
|
$line["title"] . "</a><span class='author'>$entry_author</span></div>";
|
|
|
|
$line["title"] . "</a><span class='author'>$entry_author</span></div>";
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
print "<div clear='both'>" . $line["title"] . "$entry_author</div>";
|
|
|
|
print "<div clear='both'>" . $line["title"] . "$entry_author</div>";
|
|
|
@ -4750,11 +4746,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
$article_content = sanitize_rss($link, $line["content"]);
|
|
|
|
$article_content = sanitize_rss($link, $line["content"]);
|
|
|
|
|
|
|
|
|
|
|
|
if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW')) {
|
|
|
|
|
|
|
|
$article_content = preg_replace("/href=/i", "target=\"_blank\" href=",
|
|
|
|
|
|
|
|
$article_content);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
print "<div id=\"POSTNOTE-$id\">";
|
|
|
|
print "<div id=\"POSTNOTE-$id\">";
|
|
|
|
if ($line['note']) {
|
|
|
|
if ($line['note']) {
|
|
|
|
print format_article_note($id, $line['note']);
|
|
|
|
print format_article_note($id, $line['note']);
|
|
|
@ -5278,11 +5269,6 @@
|
|
|
|
|
|
|
|
|
|
|
|
print "</span></div>";
|
|
|
|
print "</span></div>";
|
|
|
|
|
|
|
|
|
|
|
|
if (get_pref($link, 'OPEN_LINKS_IN_NEW_WINDOW')) {
|
|
|
|
|
|
|
|
$line["content_preview"] = preg_replace("/href=/i",
|
|
|
|
|
|
|
|
"target=\"_blank\" href=", $line["content_preview"]);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if ($show_excerpt) {
|
|
|
|
if ($show_excerpt) {
|
|
|
|
print "<div class=\"cdmExcerpt\" id=\"CEXC-$id\"
|
|
|
|
print "<div class=\"cdmExcerpt\" id=\"CEXC-$id\"
|
|
|
|
onclick=\"cdmExpandArticle($id)\"
|
|
|
|
onclick=\"cdmExpandArticle($id)\"
|
|
|
|