Update function / rearrange tab order

[friendica.git] / src / Module / Profile / Photos.php

diff --git a/src/Module/Profile/Photos.php b/src/Module/Profile/Photos.php
index 3e5b9d604cc303b5fc9deaa632f7072e9e04ce8b..fcd0b78b09d8d27f14d72920a3b3dc722aa8ee8b 100644 (file)
--- a/src/Module/Profile/Photos.php
+++ b/src/Module/Profile/Photos.php
@@ -93,14 +93,14 @@ class Photos extends \Friendica\Module\BaseProfile
                }
 
                $str_contact_allow = isset($request['contact_allow']) ? $this->aclFormatter->toString($request['contact_allow']) : $this->owner['allow_cid'] ?? '';
-               $str_group_allow   = isset($request['group_allow'])   ? $this->aclFormatter->toString($request['group_allow'])   : $this->owner['allow_gid'] ?? '';
+               $str_circle_allow  = isset($request['circle_allow'])  ? $this->aclFormatter->toString($request['circle_allow'])  : $this->owner['allow_gid'] ?? '';
                $str_contact_deny  = isset($request['contact_deny'])  ? $this->aclFormatter->toString($request['contact_deny'])  : $this->owner['deny_cid']  ?? '';
-               $str_group_deny    = isset($request['group_deny'])    ? $this->aclFormatter->toString($request['group_deny'])    : $this->owner['deny_gid']  ?? '';
+               $str_circle_deny   = isset($request['circle_deny'])   ? $this->aclFormatter->toString($request['circle_deny'])   : $this->owner['deny_gid']  ?? '';
 
                $visibility = $request['visibility'] ?? '';
                if ($visibility === 'public') {
                        // The ACL selector introduced in version 2019.12 sends ACL input data even when the Public visibility is selected
-                       $str_contact_allow = $str_group_allow = $str_contact_deny = $str_group_deny = '';
+                       $str_contact_allow = $str_circle_allow = $str_contact_deny = $str_circle_deny = '';
                } else if ($visibility === 'custom') {
                        // Since we know from the visibility parameter the item should be private, we have to prevent the empty ACL
                        // case that would make it public. So we always append the author's contact id to the allowed contacts.
@@ -229,33 +229,15 @@ class Photos extends \Friendica\Module\BaseProfile
                        $image->scaleDown($max_length);
                }
 
-               $width  = $image->getWidth();
-               $height = $image->getHeight();
-
-               $smallest = 0;
-
                $resource_id = Photo::newResource();
 
-               $r = Photo::store($image, $this->owner['uid'], 0, $resource_id, $filename, $album, 0 , Photo::DEFAULT, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
-
-               if (!$r) {
+               $preview = Photo::storeWithPreview($image, $this->owner['uid'], $resource_id, $filename, $filesize, $album, '', $str_contact_allow, $str_circle_allow, $str_contact_deny, $str_circle_deny);
+               if ($preview < 0) {
                        $this->logger->warning('image store failed');
                        $this->systemMessages->addNotice($this->t('Image upload failed.'));
                        return;
                }
 
-               if ($width > 640 || $height > 640) {
-                       $image->scaleDown(640);
-                       Photo::store($image, $this->owner['uid'], 0, $resource_id, $filename, $album, 1, Photo::DEFAULT, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
-                       $smallest = 1;
-               }
-
-               if ($width > 320 || $height > 320) {
-                       $image->scaleDown(320);
-                       Photo::store($image, $this->owner['uid'], 0, $resource_id, $filename, $album, 2, Photo::DEFAULT, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
-                       $smallest = 2;
-               }
-
                $uri = Item::newURI();
 
                // Create item container
@@ -285,15 +267,13 @@ class Photos extends \Friendica\Module\BaseProfile
                $arr['author-avatar'] = $this->owner['thumb'];
                $arr['title']         = '';
                $arr['allow_cid']     = $str_contact_allow;
-               $arr['allow_gid']     = $str_group_allow;
+               $arr['allow_gid']     = $str_circle_allow;
                $arr['deny_cid']      = $str_contact_deny;
-               $arr['deny_gid']      = $str_group_deny;
+               $arr['deny_gid']      = $str_circle_deny;
                $arr['visible']       = $visible;
                $arr['origin']        = 1;
 
-               $arr['body']          = '[url=' . $this->baseUrl . '/photos/' . $this->owner['nickname'] . '/image/' . $resource_id . ']'
-                       . '[img]' . $this->baseUrl . "/photo/{$resource_id}-{$smallest}.".$image->getExt() . '[/img]'
-                       . '[/url]';
+               $arr['body']          = Images::getBBCodeByResource($resource_id, $this->owner['nickname'], $preview, $image->getExt());
 
                $item_id = Item::insert($arr);
                // Update the photo albums cache
@@ -354,7 +334,7 @@ class Photos extends \Friendica\Module\BaseProfile
                          $sql_extra
                        GROUP BY `resource-id`
                        ORDER BY `created` DESC
-                   LIMIT ? , ?",
+                       LIMIT ? , ?",
                        $this->owner['uid'],
                        Photo::DEFAULT,
                        $pager->getStart(),