Just some more fixed notice

[friendica.git] / mod / proxy.php

diff --git a/mod/proxy.php b/mod/proxy.php
index 8b5f0834f297dab95905dbf939c74b8e887bb619..6dc396787664ff64211f5d3c9a4bc2987a6be7fe 100644 (file)
--- a/mod/proxy.php
+++ b/mod/proxy.php
@@ -1,10 +1,18 @@
 <?php
-// Based upon "Privacy Image Cache" by Tobias Hößl <https://github.com/CatoTH/>
+/**
+ * @file mod/proxy.php
+ * @brief Based upon "Privacy Image Cache" by Tobias Hößl <https://github.com/CatoTH/>
+ */
 
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
+use Friendica\Database\dba;
 use Friendica\Database\DBM;
+use Friendica\Model\Photo;
+use Friendica\Object\Image;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
 
 define('PROXY_DEFAULT_TIME', 86400); // 1 Day
 
@@ -15,7 +23,6 @@ define('PROXY_SIZE_MEDIUM', 'medium');
 define('PROXY_SIZE_LARGE', 'large');
 
 require_once 'include/security.php';
-require_once 'include/Photo.php';
 
 function proxy_init(App $a) {
        // Pictures are stored in one of the following ways:
@@ -100,7 +107,7 @@ function proxy_init(App $a) {
                        $url = substr($url, 0, $pos + 1);
                }
 
-               $url = str_replace(array('.jpg', '.jpeg', '.gif', '.png'), array('','','',''), $url);
+               $url = str_replace(['.jpg', '.jpeg', '.gif', '.png'], ['','','',''], $url);
 
                $url = base64_decode(strtr($url, '-_', '+/'), true);
 
@@ -127,9 +134,9 @@ function proxy_init(App $a) {
 
                        // reduce quality - if it isn't a GIF
                        if ($mime != 'image/gif') {
-                               $img = new Photo($img_str, $mime);
-                               if ($img->is_valid()) {
-                                       $img_str = $img->imageString();
+                               $Image = new Image($img_str, $mime);
+                               if ($Image->isValid()) {
+                                       $img_str = $Image->asString();
                                }
                        }
 
@@ -141,24 +148,23 @@ function proxy_init(App $a) {
        }
 
        $valid = true;
-       $r = array();
-
+       $photo = null;
        if (!$direct_cache && ($cachefile == '')) {
-               $r = dba::select('photo', array('data', 'desc'), array('resource-id' => $urlhash), array('limit' => 1));
-               if (DBM::is_result($r)) {
-                       $img_str = $r['data'];
-                       $mime = $r['desc'];
+               $photo = dba::selectFirst('photo', ['data', 'desc'], ['resource-id' => $urlhash]);
+               if (DBM::is_result($photo)) {
+                       $img_str = $photo['data'];
+                       $mime = $photo['desc'];
                        if ($mime == '') {
                                $mime = 'image/jpeg';
                        }
                }
        }
 
-       if (!DBM::is_result($r)) {
+       if (!DBM::is_result($photo)) {
                // It shouldn't happen but it does - spaces in URL
                $_REQUEST['url'] = str_replace(' ', '+', $_REQUEST['url']);
                $redirects = 0;
-               $img_str = fetch_url($_REQUEST['url'], true, $redirects, 10);
+               $img_str = Network::fetchUrl($_REQUEST['url'], true, $redirects, 10);
 
                $tempfile = tempnam(get_temppath(), 'cache');
                file_put_contents($tempfile, $img_str);
@@ -171,10 +177,10 @@ function proxy_init(App $a) {
                        $mime = 'image/png';
                        $cachefile = ''; // Clear the cachefile so that the dummy isn't stored
                        $valid = false;
-                       $img = new Photo($img_str, 'image/png');
-                       if ($img->is_valid()) {
-                               $img->scaleImage(10);
-                               $img_str = $img->imageString();
+                       $Image = new Image($img_str, 'image/png');
+                       if ($Image->isValid()) {
+                               $Image->scaleDown(10);
+                               $img_str = $Image->asString();
                        }
                } elseif ($mime != 'image/jpeg' && !$direct_cache && $cachefile == '') {
                        $image = @imagecreatefromstring($img_str);
@@ -183,15 +189,15 @@ function proxy_init(App $a) {
                                die();
                        }
 
-                       $fields = array('uid' => 0, 'contact-id' => 0, 'guid' => get_guid(), 'resource-id' => $urlhash, 'created' => datetime_convert(), 'edited' => datetime_convert(),
+                       $fields = ['uid' => 0, 'contact-id' => 0, 'guid' => System::createGUID(), 'resource-id' => $urlhash, 'created' => DateTimeFormat::utcNow(), 'edited' => DateTimeFormat::utcNow(),
                                'filename' => basename($_REQUEST['url']), 'type' => '', 'album' => '', 'height' => imagesy($image), 'width' => imagesx($image),
                                'datasize' => 0, 'data' => $img_str, 'scale' => 100, 'profile' => 0,
-                               'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '', 'desc' => $mime);
+                               'allow_cid' => '', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '', 'desc' => $mime];
                        dba::insert('photo', $fields);
                } else {
-                       $img = new Photo($img_str, $mime);
-                       if ($img->is_valid() && !$direct_cache && ($cachefile == '')) {
-                               $img->store(0, 0, $urlhash, $_REQUEST['url'], '', 100);
+                       $Image = new Image($img_str, $mime);
+                       if ($Image->isValid() && !$direct_cache && ($cachefile == '')) {
+                               Photo::store($Image, 0, 0, $urlhash, $_REQUEST['url'], '', 100);
                        }
                }
        }
@@ -200,10 +206,10 @@ function proxy_init(App $a) {
 
        // reduce quality - if it isn't a GIF
        if ($mime != 'image/gif') {
-               $img = new Photo($img_str, $mime);
-               if ($img->is_valid()) {
-                       $img->scaleImage($size);
-                       $img_str = $img->imageString();
+               $Image = new Image($img_str, $mime);
+               if ($Image->isValid()) {
+                       $Image->scaleDown($size);
+                       $img_str = $Image->asString();
                }
        }
 
@@ -283,7 +289,7 @@ function proxy_url($url, $writemode = false, $size = '') {
        // Extract the URL extension
        $extension = pathinfo(parse_url($url, PHP_URL_PATH), PATHINFO_EXTENSION);
 
-       $extensions = array('jpg', 'jpeg', 'gif', 'png');
+       $extensions = ['jpg', 'jpeg', 'gif', 'png'];
        if (in_array($extension, $extensions)) {
                $shortpath .= '.' . $extension;
                $longpath .= '.' . $extension;
@@ -337,7 +343,7 @@ function proxy_parse_query($url) {
        $query = parse_url($url, PHP_URL_QUERY);
        $query = html_entity_decode($query);
        $query_list = explode('&', $query);
-       $arr = array();
+       $arr = [];
 
        foreach ($query_list as $key_value) {
                $key_value_list = explode('=', $key_value);