Merge pull request #5862 from nupplaphil/rename_App_Methods

[friendica.git] / src / Module / Proxy.php

diff --git a/src/Module/Proxy.php b/src/Module/Proxy.php
index bf6d6b6d03e5e7559997f51dad73a8765ddab825..14e842562f559b52947dfb6a3079f89ab99539a2 100644 (file)
--- a/src/Module/Proxy.php
+++ b/src/Module/Proxy.php
@@ -8,6 +8,7 @@ namespace Friendica\Module;
 use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Photo;
@@ -45,7 +46,7 @@ class Proxy extends BaseModule
                 *
                 * Question: Do we really need these three methods?
                 */
-               if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
+               if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
                        header('HTTP/1.1 304 Not Modified');
                        header('Last-Modified: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
                        header('Etag: ' . $_SERVER['HTTP_IF_NONE_MATCH']);
@@ -70,7 +71,7 @@ class Proxy extends BaseModule
                $thumb = false;
                $size = 1024;
                $sizetype = '';
-               $basepath = $a->get_basepath();
+               $basepath = $a->getBasePath();
 
                // If the cache path isn't there, try to create it
                if (!is_dir($basepath . '/proxy') && is_writable($basepath)) {
@@ -133,6 +134,10 @@ class Proxy extends BaseModule
                        $direct_cache = false;
                }
 
+               if (empty($_REQUEST['url'])) {
+                       System::httpExit(400, ["title" => L10n::t('Bad Request.')]);
+               }
+
                if (!$direct_cache) {
                        $urlhash = 'pic:' . sha1($_REQUEST['url']);
 
@@ -191,7 +196,7 @@ class Proxy extends BaseModule
                        unlink($tempfile);
 
                        // If there is an error then return a blank image
-                       if ((substr($a->get_curl_code(), 0, 1) == '4') || (!$img_str)) {
+                       if ((substr(Network::getCurl()->getCode(), 0, 1) == '4') || (!$img_str)) {
                                $img_str = file_get_contents('images/blank.png');
                                $mime = 'image/png';
                                $cachefile = ''; // Clear the cachefile so that the dummy isn't stored