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

diff --git a/buffer/buffer.php b/buffer/buffer.php
index c0a06d06892b2ba45ae07eacf54c76fe571eb931..69b313eded4055e9776386942398573e98abca7b 100644 (file)
--- a/buffer/buffer.php
+++ b/buffer/buffer.php
@@ -15,7 +15,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
 use Friendica\Model\ItemContent;
-use Friendica\Module\Proxy;
+use Friendica\Util\ProxyUtils;
 
 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
                                if (isset($post["image"])) {
-                                       $post["image"] = Proxy::proxifyUrl($post["image"]);
+                                       $post["image"] = ProxyUtils::proxifyUrl($post["image"]);
                                }
 
                                if (isset($post["preview"])) {
-                                       $post["preview"] = Proxy::proxifyUrl($post["preview"]);
+                                       $post["preview"] = ProxyUtils::proxifyUrl($post["preview"]);
                                }
 
                                // Seems like a bug to me

diff --git a/curweather/curweather.php b/curweather/curweather.php
index 6c8efa76352cd445fef0e83870741972346f0a2d..c3abba16ee7750802521fc21c182cb91cd62df1d 100644 (file)
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -17,8 +17,8 @@ use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Module\Proxy;
 use Friendica\Util\Network;
+use Friendica\Util\ProxyUtils;
 
 function curweather_install()
 {
@@ -138,7 +138,7 @@ function curweather_network_mod_init(App $a, &$b)
                $t = get_markup_template("widget.tpl", "addon/curweather/" );
                $curweather = replace_macros ($t, [
                        '$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'],
                        '$lon' => $res['lon'],
                        '$lat' => $res['lat'],

diff --git a/impressum/impressum.php b/impressum/impressum.php
index 64dcf1e0f4dfa956002a12f8be0a9aa24686868f..8177c080373c6235e45fde3939a6660a4166b9a1 100644 (file)
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -11,7 +11,7 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Module\Proxy;
+use Friendica\Util\ProxyUtils;
 
 function impressum_install() {
        Addon::registerHook('load_config', 'addon/impressum/impressum.php', 'impressum_load_config');
@@ -40,7 +40,7 @@ function obfuscate_email ($s) {
     return $s;
 }
 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 == '') {
         $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>';
     $owner = Config::get('impressum', 'owner');
     $owner_profile = Config::get('impressum','ownerprofile');
-    $postal = Proxy::proxifyHtml(BBCode::convert(Config::get('impressum', 'postal')));
-    $notes = Proxy::proxifyHtml(BBCode::convert(Config::get('impressum', 'notes')));
+    $postal = ProxyUtils::proxifyHtml(BBCode::convert(Config::get('impressum', 'postal')));
+    $notes = ProxyUtils::proxifyHtml(BBCode::convert(Config::get('impressum', 'notes')));
     $email = obfuscate_email( Config::get('impressum','email') );
     if (strlen($owner)) {
         if (strlen($owner_profile)) {

diff --git a/mastodoncustomemojis/mastodoncustomemojis.php b/mastodoncustomemojis/mastodoncustomemojis.php
index 079477e45b0aaab5088eedc9db86f9bab783b749..b9214d8e7467c549fdc6da058b96276ddbf9332d 100644 (file)
--- a/mastodoncustomemojis/mastodoncustomemojis.php
+++ b/mastodoncustomemojis/mastodoncustomemojis.php
@@ -14,8 +14,8 @@ use Friendica\Core\Addon;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\Protocol;
-use Friendica\Module\Proxy;
 use Friendica\Util\Network;
+use Friendica\Util\ProxyUtils;
 
 function mastodoncustomemojis_install()
 {
@@ -89,7 +89,7 @@ function mastodoncustomemojis_get_custom_emojis_for_author($author_link)
                        if (is_array($emojis_array)) {
                                foreach ($emojis_array as $emoji) {
                                        $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'] . ':"/>';
                                }
                        }