Introduce `Response` for Modules to create a testable way for module responses

[friendica.git] / src / Module / Settings / Profile / Photo / Index.php

diff --git a/src/Module/Settings/Profile/Photo/Index.php b/src/Module/Settings/Profile/Photo/Index.php
index df9622f2e9f902b243fa08ad8ab00df42b2153b0..309a893e666b618cea848f5c8aab6e8095e2fd06 100644 (file)
--- a/src/Module/Settings/Profile/Photo/Index.php
+++ b/src/Module/Settings/Profile/Photo/Index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,7 +21,6 @@
 
 namespace Friendica\Module\Settings\Profile\Photo;
 
-use Friendica\App\Arguments;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\DI;
@@ -35,7 +34,7 @@ use Friendica\Util\Strings;
 
 class Index extends BaseSettings
 {
-       public static function post(array $parameters = [])
+       protected function post(array $request = [], array $post = [])
        {
                if (!Session::isAuthenticated()) {
                        return;
@@ -93,13 +92,13 @@ class Index extends BaseSettings
 
                $filename = '';
 
-               if (!Photo::store($Image, local_user(), 0, $resource_id, $filename, DI::l10n()->t('Profile Photos'), 0)) {
+               if (!Photo::store($Image, local_user(), 0, $resource_id, $filename, DI::l10n()->t(Photo::PROFILE_PHOTOS), 0, Photo::USER_AVATAR)) {
                        notice(DI::l10n()->t('Image upload failed.'));
                }
 
                if ($width > 640 || $height > 640) {
                        $Image->scaleDown(640);
-                       if (!Photo::store($Image, local_user(), 0, $resource_id, $filename, DI::l10n()->t('Profile Photos'), 1)) {
+                       if (!Photo::store($Image, local_user(), 0, $resource_id, $filename, DI::l10n()->t(Photo::PROFILE_PHOTOS), 1, Photo::USER_AVATAR)) {
                                notice(DI::l10n()->t('Image size reduction [%s] failed.', '640'));
                        }
                }
@@ -107,7 +106,7 @@ class Index extends BaseSettings
                DI::baseUrl()->redirect('settings/profile/photo/crop/' . $resource_id);
        }
 
-       public static function content(array $parameters = [])
+       protected function content(array $request = []): string
        {
                if (!Session::isAuthenticated()) {
                        throw new HTTPException\ForbiddenException(DI::l10n()->t('Permission denied.'));
@@ -134,7 +133,7 @@ class Index extends BaseSettings
                                DI::l10n()->t('or'),
                                ($newuser) ?
                                        '<a href="' . DI::baseUrl() . '">' . DI::l10n()->t('skip this step') . '</a>'
-                                       : '<a href="' . DI::baseUrl() . '/photos/' . DI::app()->user['nickname'] . '">'
+                                       : '<a href="' . DI::baseUrl() . '/photos/' . DI::app()->getLoggedInUserNickname() . '">'
                                                . DI::l10n()->t('select a photo from your photo albums') . '</a>'
                        ),
                ]);