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

use canonical fetch url for Far Side

This commit is contained in:
Andrew Dolgov 2020-02-27 10:24:12 +03:00
parent db8a1f76c7
commit 3b62150abd
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/af_comics/init.php
View File

@ -157,6 +157,8 @@ class Af_Comics extends Plugin {
} else if (preg_match("#^https?://www\.thefarside\.com#", $fetch_url)) { } else if (preg_match("#^https?://www\.thefarside\.com#", $fetch_url)) {
require_once 'lib/MiniTemplator.class.php'; require_once 'lib/MiniTemplator.class.php';
$article_link = htmlspecialchars("https://www.thefarside.com" . date('/Y/m/d'));
$tpl = new MiniTemplator(); $tpl = new MiniTemplator();
$tpl->readTemplateFromFile('templates/generated_feed.txt'); $tpl->readTemplateFromFile('templates/generated_feed.txt');
@ -166,7 +168,7 @@ class Af_Comics extends Plugin {
$tpl->setVariable('FEED_URL', htmlspecialchars($fetch_url), true); $tpl->setVariable('FEED_URL', htmlspecialchars($fetch_url), true);
$tpl->setVariable('SELF_URL', htmlspecialchars($fetch_url), true); $tpl->setVariable('SELF_URL', htmlspecialchars($fetch_url), true);
$body = fetch_file_contents(['url' => $fetch_url, 'type' => 'text/html', 'followlocation' => false]); $body = fetch_file_contents(['url' => $article_link, 'type' => 'text/html', 'followlocation' => false]);
if ($body) { if ($body) {
$doc = new DOMDocument(); $doc = new DOMDocument();
@ -196,10 +198,8 @@ class Af_Comics extends Plugin {
$title = date('l, F d, Y'); $title = date('l, F d, Y');
} }
$article_link = htmlspecialchars($fetch_url . "?" . date('/Y/m/d')); $tpl->setVariable('ARTICLE_ID', htmlspecialchars($article_link), true);
$tpl->setVariable('ARTICLE_LINK', htmlspecialchars($article_link), true);
$tpl->setVariable('ARTICLE_ID', $article_link, true);
$tpl->setVariable('ARTICLE_LINK', $article_link, true);
$tpl->setVariable('ARTICLE_UPDATED_ATOM', date('c', mktime(11, 0, 0)), true); $tpl->setVariable('ARTICLE_UPDATED_ATOM', date('c', mktime(11, 0, 0)), true);
$tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($title), true); $tpl->setVariable('ARTICLE_TITLE', htmlspecialchars($title), true);
$tpl->setVariable('ARTICLE_EXCERPT', '', true); $tpl->setVariable('ARTICLE_EXCERPT', '', true);