Merge pull request #4312 from zeroadam/feature/L10n

[friendica.git] / src / Object / Image.php

diff --git a/src/Object/Image.php b/src/Object/Image.php
index 7cbc2432d995ecf2f4352b4eb80bcdc3c6d7349d..2feb3b92411e1fc8223244be2f4e7db5fce7d81a 100644 (file)
--- a/src/Object/Image.php
+++ b/src/Object/Image.php
@@ -8,6 +8,7 @@ namespace Friendica\Object;
 use Friendica\App;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Model\Photo;
@@ -15,8 +16,6 @@ use Exception;
 use Imagick;
 use ImagickPixel;
 
-require_once "include/photos.php";
-
 /**
  * Class to handle images
  */
@@ -43,13 +42,13 @@ class Image
                if (class_exists('Imagick')) {
                        // Imagick::queryFormats won't help us a lot there...
                        // At least, not yet, other parts of friendica uses this array
-                       $t = array(
+                       $t = [
                                'image/jpeg' => 'jpg',
                                'image/png' => 'png',
                                'image/gif' => 'gif'
-                       );
+                       ];
                } else {
-                       $t = array();
+                       $t = [];
                        $t['image/jpeg'] ='jpg';
                        if (imagetypes() & IMG_PNG) {
                                $t['image/png'] = 'png';
@@ -115,11 +114,11 @@ class Image
         */
        public static function getFormatsMap()
        {
-               $m = array(
+               $m = [
                        'image/jpeg' => 'JPG',
                        'image/png' => 'PNG',
                        'image/gif' => 'GIF'
-               );
+               ];
                return $m;
        }
 
@@ -728,7 +727,7 @@ class Image
                $type = null;
                if ($fromcurl) {
                        $a = get_app();
-                       $headers=array();
+                       $headers=[];
                        $h = explode("\n", $a->get_curl_headers());
                        foreach ($h as $l) {
                                list($k,$v) = array_map("trim", explode(":", trim($l), 2));
@@ -769,7 +768,7 @@ class Image
         */
        public static function getInfoFromURL($url)
        {
-               $data = array();
+               $data = [];
 
                $data = Cache::get($url);
 
@@ -852,7 +851,7 @@ class Image
                                }
                        }
                }
-               return array("width" => $dest_width, "height" => $dest_height);
+               return ["width" => $dest_width, "height" => $dest_height];
        }
 
        /**
@@ -873,7 +872,7 @@ class Image
 
                if (!DBM::is_result($r)) {
                        logger("Can't detect user data for uid ".$uid, LOGGER_DEBUG);
-                       return(array());
+                       return([]);
                }
 
                $page_owner_nick  = $r[0]['nickname'];
@@ -884,7 +883,7 @@ class Image
 
                if ((strlen($imagedata) == 0) && ($url == "")) {
                        logger("No image data and no url provided", LOGGER_DEBUG);
-                       return(array());
+                       return([]);
                } elseif (strlen($imagedata) == 0) {
                        logger("Uploading picture from ".$url, LOGGER_DEBUG);
 
@@ -897,7 +896,7 @@ class Image
 
                if (($maximagesize) && (strlen($imagedata) > $maximagesize)) {
                        logger("Image exceeds size limit of ".$maximagesize, LOGGER_DEBUG);
-                       return(array());
+                       return([]);
                }
 
                $tempfile = tempnam(get_temppath(), "cache");
@@ -911,7 +910,7 @@ class Image
                if (!isset($data["mime"])) {
                        unlink($tempfile);
                        logger("File is no picture", LOGGER_DEBUG);
-                       return(array());
+                       return([]);
                }
 
                $Image = new Image($imagedata, $data["mime"]);
@@ -919,7 +918,7 @@ class Image
                if (!$Image->isValid()) {
                        unlink($tempfile);
                        logger("Picture is no valid picture", LOGGER_DEBUG);
-                       return(array());
+                       return([]);
                }
 
                $Image->orient($tempfile);
@@ -946,15 +945,15 @@ class Image
                $defperm = "";
                $visitor = 0;
 
-               $r = Photo::store($Image, $uid, $visitor, $hash, $tempfile, t('Wall Photos'), 0, 0, $defperm);
+               $r = Photo::store($Image, $uid, $visitor, $hash, $tempfile, L10n::t('Wall Photos'), 0, 0, $defperm);
 
                if (!$r) {
                        logger("Picture couldn't be stored", LOGGER_DEBUG);
-                       return(array());
+                       return([]);
                }
 
-               $image = array("page" => System::baseUrl().'/photos/'.$page_owner_nick.'/image/'.$hash,
-                       "full" => System::baseUrl()."/photo/{$hash}-0.".$Image->getExt());
+               $image = ["page" => System::baseUrl().'/photos/'.$page_owner_nick.'/image/'.$hash,
+                       "full" => System::baseUrl()."/photo/{$hash}-0.".$Image->getExt()];
 
                if ($width > 800 || $height > 800) {
                        $image["large"] = System::baseUrl()."/photo/{$hash}-0.".$Image->getExt();
@@ -962,7 +961,7 @@ class Image
 
                if ($width > 640 || $height > 640) {
                        $Image->scaleDown(640);
-                       $r = Photo::store($Image, $uid, $visitor, $hash, $tempfile, t('Wall Photos'), 1, 0, $defperm);
+                       $r = Photo::store($Image, $uid, $visitor, $hash, $tempfile, L10n::t('Wall Photos'), 1, 0, $defperm);
                        if ($r) {
                                $image["medium"] = System::baseUrl()."/photo/{$hash}-1.".$Image->getExt();
                        }
@@ -970,7 +969,7 @@ class Image
 
                if ($width > 320 || $height > 320) {
                        $Image->scaleDown(320);
-                       $r = Photo::store($Image, $uid, $visitor, $hash, $tempfile, t('Wall Photos'), 2, 0, $defperm);
+                       $r = Photo::store($Image, $uid, $visitor, $hash, $tempfile, L10n::t('Wall Photos'), 2, 0, $defperm);
                        if ($r) {
                                $image["small"] = System::baseUrl()."/photo/{$hash}-2.".$Image->getExt();
                        }
@@ -995,7 +994,7 @@ class Image
                        $min = 160;
                        $Image->crop(160, $x, $y, $min, $min);
 
-                       $r = Photo::store($Image, $uid, $visitor, $hash, $tempfile, t('Wall Photos'), 3, 0, $defperm);
+                       $r = Photo::store($Image, $uid, $visitor, $hash, $tempfile, L10n::t('Wall Photos'), 3, 0, $defperm);
                        if ($r) {
                                $image["thumb"] = System::baseUrl()."/photo/{$hash}-3.".$Image->getExt();
                        }