Merge branch '1706-lock' of github.com:annando/friendica into 1706-lock

[friendica.git] / mod / proxy.php

diff --git a/mod/proxy.php b/mod/proxy.php
index 736b44007f0627d3f36822820de5c1e03ee738c5..9311e55a96c02e4e6be68b50b323bef4906ba5d3 100644 (file)
--- a/mod/proxy.php
+++ b/mod/proxy.php
@@ -1,6 +1,8 @@
 <?php
 // Based upon "Privacy Image Cache" by Tobias Hößl <https://github.com/CatoTH/>
 
+use Friendica\App;
+
 define('PROXY_DEFAULT_TIME', 86400); // 1 Day
 
 define('PROXY_SIZE_MICRO', 'micro');
@@ -136,6 +138,7 @@ function proxy_init(App $a) {
        }
 
        $valid = true;
+       $r = array();
 
        if (!$direct_cache AND ($cachefile == '')) {
                $r = qu("SELECT * FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", $urlhash);
@@ -146,8 +149,6 @@ function proxy_init(App $a) {
                                $mime = 'image/jpeg';
                        }
                }
-       } else {
-               $r = array();
        }
 
        if (!dbm::is_result($r)) {
@@ -264,7 +265,7 @@ function proxy_url($url, $writemode = false, $size = '') {
 
        // Only continue if it isn't a local image and the isn't deactivated
        if (proxy_is_local_image($url)) {
-               $url = str_replace(normalise_link($a->get_baseurl()) . '/', $a->get_baseurl() . '/', $url);
+               $url = str_replace(normalise_link(App::get_baseurl()) . '/', App::get_baseurl() . '/', $url);
                return $url;
        }
 
@@ -297,7 +298,7 @@ function proxy_url($url, $writemode = false, $size = '') {
                $longpath .= '.' . $extension;
        }
 
-       $proxypath = $a->get_baseurl() . '/proxy/' . $longpath;
+       $proxypath = App::get_baseurl() . '/proxy/' . $longpath;
 
        if ($size != '') {
                $size = ':' . $size;
@@ -308,7 +309,7 @@ function proxy_url($url, $writemode = false, $size = '') {
        if ((strlen($proxypath) > 250) AND $writemode) {
                return $shortpath;
        } elseif (strlen($proxypath) > 250) {
-               return $a->get_baseurl() . '/proxy/' . $shortpath . '?url=' . urlencode($url);
+               return App::get_baseurl() . '/proxy/' . $shortpath . '?url=' . urlencode($url);
        } elseif ($writemode) {
                return $longpath;
        } else {
@@ -330,7 +331,7 @@ function proxy_is_local_image($url) {
        }
 
        // links normalised - bug #431
-       $baseurl = normalise_link(get_app()->get_baseurl());
+       $baseurl = normalise_link(App::get_baseurl());
        $url = normalise_link($url);
        return (substr($url, 0, strlen($baseurl)) == $baseurl);
 }
@@ -372,8 +373,7 @@ function proxy_img_cb($matches) {
 }
 
 function proxy_parse_html($html) {
-       $a = get_app();
-       $html = str_replace(normalise_link($a->get_baseurl()) . '/', $a->get_baseurl() . '/', $html);
+       $html = str_replace(normalise_link(App::get_baseurl()) . '/', App::get_baseurl() . '/', $html);
 
        return preg_replace_callback('/(<img [^>]*src *= *["\'])([^"\']+)(["\'][^>]*>)/siU', 'proxy_img_cb', $html);
 }