friendica
/
friendica-addons
7
2
Fork 13
Code Issues 3 Pull Requests 2 Releases 16 Wiki Activity

[global] CR request: Moved proxify*() methods to separate class

This commit is contained in:
Roland Häder 2018-07-28 20:24:16 +02:00
parent 7032e088f7
commit e269589c65
No known key found for this signature in database
GPG Key ID: B72F8185C6C7BD78
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buffer/buffer.php
View File

@ -15,7 +15,7 @@ use Friendica\Core\L10n;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\ItemContent; use Friendica\Model\ItemContent;
use Friendica\Module\Proxy; use Friendica\Util\ProxyUtils;
function buffer_install() function buffer_install()
{ {
@ -365,11 +365,11 @@ function buffer_send(App $a, array &$b)
// The image proxy is used as a sanitizer. Buffer seems to be really picky about pictures // The image proxy is used as a sanitizer. Buffer seems to be really picky about pictures
if (isset($post["image"])) { if (isset($post["image"])) {
$post["image"] = Proxy::proxifyUrl($post["image"]); $post["image"] = ProxyUtils::proxifyUrl($post["image"]);
} }
if (isset($post["preview"])) { if (isset($post["preview"])) {
$post["preview"] = Proxy::proxifyUrl($post["preview"]); $post["preview"] = ProxyUtils::proxifyUrl($post["preview"]);
} }
// Seems like a bug to me // Seems like a bug to me

4
curweather/curweather.php
View File

@ -17,8 +17,8 @@ use Friendica\Core\Cache;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Module\Proxy;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\ProxyUtils;
function curweather_install() function curweather_install()
{ {
@ -138,7 +138,7 @@ function curweather_network_mod_init(App $a, &$b)
$t = get_markup_template("widget.tpl", "addon/curweather/" ); $t = get_markup_template("widget.tpl", "addon/curweather/" );
$curweather = replace_macros ($t, [ $curweather = replace_macros ($t, [
'$title' => L10n::t("Current Weather"), '$title' => L10n::t("Current Weather"),
'$icon' => Proxy::proxifyUrl('http://openweathermap.org/img/w/'.$res['icon'].'.png'), '$icon' => ProxyUtils::proxifyUrl('http://openweathermap.org/img/w/'.$res['icon'].'.png'),
'$city' => $res['city'], '$city' => $res['city'],
'$lon' => $res['lon'], '$lon' => $res['lon'],
'$lat' => $res['lat'], '$lat' => $res['lat'],

8
impressum/impressum.php
View File

@ -11,7 +11,7 @@ use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Module\Proxy; use Friendica\Util\ProxyUtils;
function impressum_install() { function impressum_install() {
Addon::registerHook('load_config', 'addon/impressum/impressum.php', 'impressum_load_config'); Addon::registerHook('load_config', 'addon/impressum/impressum.php', 'impressum_load_config');
@ -40,7 +40,7 @@ function obfuscate_email ($s) {
return $s; return $s;
} }
function impressum_footer($a, &$b) { function impressum_footer($a, &$b) {
$text = Proxy::proxifyHtml(BBCode::convert(Config::get('impressum','footer_text'))); $text = ProxyUtils::proxifyHtml(BBCode::convert(Config::get('impressum','footer_text')));
if (! $text == '') { if (! $text == '') {
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->get_baseurl().'/addon/impressum/impressum.css" media="all" />'; $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->get_baseurl().'/addon/impressum/impressum.css" media="all" />';
@ -58,8 +58,8 @@ function impressum_show($a,&$b) {
$b .= '<h3>'.L10n::t('Impressum').'</h3>'; $b .= '<h3>'.L10n::t('Impressum').'</h3>';
$owner = Config::get('impressum', 'owner'); $owner = Config::get('impressum', 'owner');
$owner_profile = Config::get('impressum','ownerprofile'); $owner_profile = Config::get('impressum','ownerprofile');
$postal = Proxy::proxifyHtml(BBCode::convert(Config::get('impressum', 'postal'))); $postal = ProxyUtils::proxifyHtml(BBCode::convert(Config::get('impressum', 'postal')));
$notes = Proxy::proxifyHtml(BBCode::convert(Config::get('impressum', 'notes'))); $notes = ProxyUtils::proxifyHtml(BBCode::convert(Config::get('impressum', 'notes')));
$email = obfuscate_email( Config::get('impressum','email') ); $email = obfuscate_email( Config::get('impressum','email') );
if (strlen($owner)) { if (strlen($owner)) {
if (strlen($owner_profile)) { if (strlen($owner_profile)) {

4
mastodoncustomemojis/mastodoncustomemojis.php
View File

@ -14,8 +14,8 @@ use Friendica\Core\Addon;
use Friendica\Core\Cache; use Friendica\Core\Cache;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Module\Proxy;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\ProxyUtils;
function mastodoncustomemojis_install() function mastodoncustomemojis_install()
{ {
@ -89,7 +89,7 @@ function mastodoncustomemojis_get_custom_emojis_for_author($author_link)
if (is_array($emojis_array)) { if (is_array($emojis_array)) {
foreach ($emojis_array as $emoji) { foreach ($emojis_array as $emoji) {
$emojis['texts'][] = ':' . $emoji['shortcode'] . ':'; $emojis['texts'][] = ':' . $emoji['shortcode'] . ':';
$emojis['icons'][] = '<img class="emoji mastodon" src="' . Proxy::proxifyUrl($emoji['static_url']) . '" alt=":' . $emoji['shortcode'] . ':" title=":' . $emoji['shortcode'] . ':"/>'; $emojis['icons'][] = '<img class="emoji mastodon" src="' . ProxyUtils::proxifyUrl($emoji['static_url']) . '" alt=":' . $emoji['shortcode'] . ':" title=":' . $emoji['shortcode'] . ':"/>';
} }
} }