Merge remote-tracking branch 'upstream/develop' into rewrites/app_get_baseurl_static

[friendica.git] / mod / proxy.php

diff --git a/mod/proxy.php b/mod/proxy.php
index 736b44007f0627d3f36822820de5c1e03ee738c5..e14f08570c377ce8ed96e7f8ef7380747e132234 100644 (file)
--- a/mod/proxy.php
+++ b/mod/proxy.php
@@ -140,11 +140,23 @@ function proxy_init(App $a) {
        if (!$direct_cache AND ($cachefile == '')) {
                $r = qu("SELECT * FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", $urlhash);
                if (dbm::is_result($r)) {
+<<<<<<< HEAD
+<<<<<<< origin/rewrites/app_get_baseurl_static
+                       $img_str = $r[0]['data'];
+                       $mime = $r[0]["desc"];
+                       if ($mime == "") $mime = "image/jpeg";
+=======
+=======
+>>>>>>> upstream/develop
                        $img_str = $r[0]['data'];
                        $mime = $r[0]['desc'];
                        if ($mime == '') {
                                $mime = 'image/jpeg';
                        }
+<<<<<<< HEAD
+>>>>>>> HEAD~0
+=======
+>>>>>>> upstream/develop
                }
        } else {
                $r = array();
@@ -264,7 +276,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 +309,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 +320,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 +342,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 +384,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);
 }