Improved language detection

[friendica.git] / src / Model / Photo.php

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index b2a815c839b8c516f1792afcef1279a886fdfc15..4d9ff4b6afb624279f953b1093a93de6d3ac49db 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -167,7 +167,7 @@ class Photo
 
                $sql_acl = Security::getPermissionsSQLByUserId($uid, $accessible);
 
-               $conditions = ['`resource-id` = ? AND `scale` <= ? ' . $sql_acl, $resourceid, $scale];
+               $conditions = ["`resource-id` = ? AND `scale` <= ? " . $sql_acl, $resourceid, $scale];
                $params = ['order' => ['scale' => true]];
                $photo = self::selectFirst([], $conditions, $params);
 
@@ -250,7 +250,7 @@ class Photo
         */
        private static function getFields(): array
        {
-               $allfields = DBStructure::definition(DI::app()->getBasePath(), false);
+               $allfields = DI::dbaDefinition()->getAll();
                $fields = array_keys($allfields['photo']['fields']);
                array_splice($fields, array_search('data', $fields), 1);
                return $fields;
@@ -317,11 +317,11 @@ class Photo
         * @param Image   $image     Image object with data
         * @param integer $uid       User ID
         * @param integer $cid       Contact ID
-        * @param integer $rid       Resource ID
+        * @param string  $rid       Resource ID
         * @param string  $filename  Filename
         * @param string  $album     Album name
         * @param integer $scale     Scale
-        * @param integer $type      Photo type
+        * @param integer $type      Photo type, optional, default: Photo::DEFAULT
         * @param string  $allow_cid Permissions, allowed contacts. optional, default = ""
         * @param string  $allow_gid Permissions, allowed groups. optional, default = ""
         * @param string  $deny_cid  Permissions, denied contacts.optional, default = ""
@@ -331,9 +331,9 @@ class Photo
         * @return boolean True on success
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function store(Image $image, int $uid, int $cid, int $rid, string $filename, string $album, int $scale, int $type = self::DEFAULT, string $allow_cid = '', string $allow_gid = '', string $deny_cid = '', string $deny_gid = '', string $desc = ''): bool
+       public static function store(Image $image, int $uid, int $cid, string $rid, string $filename, string $album, int $scale, int $type = self::DEFAULT, string $allow_cid = '', string $allow_gid = '', string $deny_cid = '', string $deny_gid = '', string $desc = ''): bool
        {
-               $photo = self::selectFirst(['guid'], ['`resource-id` = ? AND `guid` != ?', $rid, '']);
+               $photo = self::selectFirst(['guid'], ["`resource-id` = ? AND `guid` != ?", $rid, '']);
                if (DBA::isResult($photo)) {
                        $guid = $photo['guid'];
                } else {
@@ -476,7 +476,7 @@ class Photo
         * @param integer $uid           user id
         * @param integer $cid           contact id
         * @param boolean $quit_on_error optional, default false
-        * @return array
+        * @return array|bool Array on success, false on error
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
@@ -586,11 +586,13 @@ class Photo
        }
 
        /**
+        * Returns a float that represents the GPS coordinate from EXIF data
+        *
         * @param array $exifCoord coordinate
         * @param string $hemi      hemi
         * @return float
         */
-       public static function getGps(array $exifCoord, strinf $hemi): float
+       public static function getGps(array $exifCoord, string $hemi): float
        {
                $degrees = count($exifCoord) > 0 ? self::gps2Num($exifCoord[0]) : 0;
                $minutes = count($exifCoord) > 1 ? self::gps2Num($exifCoord[1]) : 0;
@@ -1093,7 +1095,7 @@ class Photo
 
                $r = self::store($image, $user['uid'], 0, $resource_id, $filename, $album, 0, self::DEFAULT, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
                if (!$r) {
-                       Logger::notice('Photo could not be stored');
+                       Logger::warning('Photo could not be stored', ['uid' => $user['uid'], 'resource_id' => $resource_id, 'filename' => $filename, 'album' => $album]);
                        return [];
                }
 
@@ -1180,7 +1182,7 @@ class Photo
 
                $r = self::store($image, $uid, 0, $resource_id, $filename, $album, 4, self::USER_AVATAR);
                if (!$r) {
-                       logger::notice('profile image upload with scale 4 (300) failed');
+                       logger::warning('profile image upload with scale 4 (300) failed', ['uid' => $uid, 'resource_id' => $resource_id, 'filename' => $filename, 'album' => $album]);
                }
 
                if ($width > 80 || $height > 80) {
@@ -1189,7 +1191,7 @@ class Photo
 
                $r = self::store($image, $uid, 0, $resource_id, $filename, $album, 5, self::USER_AVATAR);
                if (!$r) {
-                       logger::notice('profile image upload with scale 5 (80) failed');
+                       logger::warning('profile image upload with scale 5 (80) failed', ['uid' => $uid, 'resource_id' => $resource_id, 'filename' => $filename, 'album' => $album]);
                }
 
                if ($width > 48 || $height > 48) {
@@ -1198,7 +1200,7 @@ class Photo
 
                $r = self::store($image, $uid, 0, $resource_id, $filename, $album, 6, self::USER_AVATAR);
                if (!$r) {
-                       logger::notice('profile image upload with scale 6 (48) failed');
+                       logger::warning('profile image upload with scale 6 (48) failed', ['uid' => $uid, 'resource_id' => $resource_id, 'filename' => $filename, 'album' => $album]);
                }
 
                logger::info('new profile image upload ended');
@@ -1255,7 +1257,7 @@ class Photo
 
                $r = self::store($image, $uid, 0, $resource_id, $filename, $album, 3, self::USER_BANNER);
                if (!$r) {
-                       logger::notice('profile banner upload with scale 3 (960) failed');
+                       logger::warning('profile banner upload with scale 3 (960) failed');
                }
 
                logger::info('new profile banner upload ended');