mexon/friendica-addons
1
1
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

more fixes

Browse source
This commit is contained in:
Matthew Exon 2019-07-20 14:45:10 +01:00 committed by Matthew Exon
parent e2de4d12c5
commit 5927a01454
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
retriever/retriever.php
View file

@ -11,6 +11,7 @@ use Friendica\Core\Addon;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer;
use Friendica\Content\Text\HTML; use Friendica\Content\Text\HTML;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Object\Image; use Friendica\Object\Image;
@ -533,8 +534,8 @@ function retriever_apply_dom_filter($retriever, &$item, $resource) {
} }
$params = array('$spec' => $retriever['data']); $params = array('$spec' => $retriever['data']);
$extract_template = get_markup_template('extract.tpl', 'addon/retriever/'); $extract_template = Renderer::getMarkupTemplate('extract.tpl', 'addon/retriever/');
$extract_xslt = replace_macros($extract_template, $params); $extract_xslt = Renderer::replaceMacros($extract_template, $params);
if ($retriever['data']['include']) { if ($retriever['data']['include']) {
$doc = retriever_apply_xslt_text($extract_xslt, $doc); $doc = retriever_apply_xslt_text($extract_xslt, $doc);
} }
@ -550,8 +551,8 @@ function retriever_apply_dom_filter($retriever, &$item, $resource) {
$rooturl = $components['scheme'] . "://" . $components['host']; $rooturl = $components['scheme'] . "://" . $components['host'];
$dirurl = $rooturl . dirname($components['path']) . "/"; $dirurl = $rooturl . dirname($components['path']) . "/";
$params = array('$dirurl' => $dirurl, '$rooturl' => $rooturl); $params = array('$dirurl' => $dirurl, '$rooturl' => $rooturl);
$fix_urls_template = get_markup_template('fix-urls.tpl', 'addon/retriever/'); $fix_urls_template = Renderer::getMarkupTemplate('fix-urls.tpl', 'addon/retriever/');
$fix_urls_xslt = replace_macros($fix_urls_template, $params); $fix_urls_xslt = Renderer::replaceMacros($fix_urls_template, $params);
$doc = retriever_apply_xslt_text($fix_urls_xslt, $doc); $doc = retriever_apply_xslt_text($fix_urls_xslt, $doc);
if (!$doc) { if (!$doc) {
Logger::log('retriever_apply_dom_filter: failed to apply fix urls XSLT template', Logger::INFO); Logger::log('retriever_apply_dom_filter: failed to apply fix urls XSLT template', Logger::INFO);
@ -675,8 +676,8 @@ function retriever_content($a) {
foreach ($feeds as $k=>$v) { foreach ($feeds as $k=>$v) {
$feeds[$k]['url'] = $a->getBaseUrl() . '/retriever/' . $v['id']; $feeds[$k]['url'] = $a->getBaseUrl() . '/retriever/' . $v['id'];
} }
$template = get_markup_template('/help.tpl', 'addon/retriever/'); $template = Renderer::getMarkupTemplate('/help.tpl', 'addon/retriever/');
$a->page['content'] .= replace_macros($template, array( $a->page['content'] .= Renderer::replaceMacros($template, array(
'$config' => $a->get_baseurl() . '/settings/addon', '$config' => $a->get_baseurl() . '/settings/addon',
'$feeds' => $feeds)); '$feeds' => $feeds));
return; return;
@ -718,8 +719,8 @@ function retriever_content($a) {
$a->page['content'] .= ".</p></b>"; $a->page['content'] .= ".</p></b>";
} }
$template = get_markup_template('/rule-config.tpl', 'addon/retriever/'); $template = Renderer::getMarkupTemplate('/rule-config.tpl', 'addon/retriever/');
$a->page['content'] .= replace_macros($template, array( $a->page['content'] .= Renderer::replaceMacros($template, array(
'$enable' => array( '$enable' => array(
'retriever_enable', 'retriever_enable',
L10n::t('Enabled'), L10n::t('Enabled'),
@ -801,8 +802,8 @@ function retriever_post_remote_hook(&$a, &$item) {
function retriever_plugin_settings(&$a,&$s) { function retriever_plugin_settings(&$a,&$s) {
$all_photos = PConfig::get(local_user(), 'retriever', 'all_photos'); $all_photos = PConfig::get(local_user(), 'retriever', 'all_photos');
$oembed = PConfig::get(local_user(), 'retriever', 'oembed'); $oembed = PConfig::get(local_user(), 'retriever', 'oembed');
$template = get_markup_template('/settings.tpl', 'addon/retriever/'); $template = Renderer::getMarkupTemplate('/settings.tpl', 'addon/retriever/');
$s .= replace_macros($template, array( $s .= Renderer::replaceMacros($template, array(
'$allphotos' => array( '$allphotos' => array(
'retriever_all_photos', 'retriever_all_photos',
L10n::t('All Photos'), L10n::t('All Photos'),