deleted file mode 100644

@@ -1,323 +0,0 @@

-<?php

-

-declare(strict_types=1);

-

-/*

- * This file is part of Oveleon ContaoMemberExtension Bundle.

- *

- * @package     contao-member-extension-bundle

- * @license     MIT

- * @author      Daniele Sciannimanica   <https://github.com/doishub>

- * @author      Fabian Ekert            <https://github.com/eki89>

- * @author      Sebastian Zoglowek      <https://github.com/zoglo>

- * @copyright   Oveleon                 <https://www.oveleon.de/>

- */

-

-namespace Oveleon\ContaoMemberExtensionBundle;

-

-use Contao\Config;

-use Contao\CoreBundle\Monolog\ContaoContext;

-use Contao\Dbafs;

-use Contao\File;

-use Contao\FilesModel;

-use Contao\FileUpload;

-use Contao\Frontend;

-use Contao\FrontendUser;

-use Contao\MemberModel;

-use Contao\StringUtil;

-use Contao\System;

-use Contao\Validator;

-use Psr\Log\LogLevel;

-

-

-/**

- * Class Member

- *

- * @property int $avatar UUID of the avatar

- */

-class Member extends Frontend

-{

-    const DEFAULT_PICTURE = 'bundles/contaomemberextension/avatar.png';

-

-    /**

-     * MemberAvatar file name

-     */

-    protected string $avatarName = 'memberAvatar';

-

-    /**

-     * Create avatar for a member | Registration

-     */

-    public function createAvatar(int $userId, array $arrData): void

-    {

-        $objMember = MemberModel::findById($userId);

-        $this->processAvatar($objMember, $arrData);

-    }

-

-    /**

-     * Update avatar of a member | Login

-     */

-    public function updateAvatar(FrontendUser $objUser, array $arrData): void

-    {

-        $objMember = MemberModel::findById($objUser->id);

-        $this->processAvatar($objMember, $arrData);

-    }

-

-    /**

-     * Process avatar upload for a member

-     */

-    protected function processAvatar(MemberModel $objMember, ?array $arrData): void

-    {

-        $objMember = MemberModel::findByPk($objMember->id);

-

-        if ($objMember === null)

-        {

-            return;

-        }

-

-        $file = $_SESSION['FILES']['avatar'];

-        $maxlength_kb = $this->getMaximumUploadSize();

-        $maxlength_kb_readable = $this->getReadableSize($maxlength_kb);

-

-        // Sanitize the filename

-        try

-        {

-            $file['name'] = StringUtil::sanitizeFileName($file['name']);

-        }

-        catch (\InvalidArgumentException $e)

-        {

-            // ToDo: add error message for invalid characters

-            return;

-        }

-

-        // Invalid file name

-        if (!Validator::isValidFileName($file['name']))

-        {

-            // ToDo: add error message for invalid characters

-            return;

-        }

-

-        // File was not uploaded

-        if (!is_uploaded_file($file['tmp_name']))

-        {

-            // ToDo: Add error messages

-            /*if ($file['error'] == 1 || $file['error'] == 2) { // Add error message for maximum file size }

-            elseif ($file['error'] == 3) { // Add error message for partial upload }

-            elseif ($file['error'] > 0) { // Add error message for failed upload }*/

-

-            unset($_SESSION['FILES']['avatar']);

-

-            return;

-        }

-

-        // File is too big

-        if ($file['size'] > $maxlength_kb)

-        {

-            // ToDo: add error message for maximum file size

-            unset($_SESSION['FILES']['avatar']);

-

-            return;

-        }

-

-        $objFile = new File($file['name']);

-        $uploadTypes = StringUtil::trimsplit(',', \Config::get('validImageTypes'));

-

-        // File type is not allowed

-        if (!\in_array($objFile->extension, $uploadTypes))

-        {

-            // ToDo: add error message for not allowed file type

-            unset($_SESSION['FILES']['avatar']);

-

-            return;

-        }

-

-        if ($arrImageSize = @getimagesize($file['tmp_name']))

-        {

-            $intImageWidth = Config::get('imageWidth');

-

-            // Image exceeds maximum image width

-            if ($intImageWidth > 0 && $arrImageSize[0] > $intImageWidth) {

-                // ToDo: add error message for exceeding width

-                unset($_SESSION['FILES']['avatar']);

-

-                return;

-            }

-

-            $intImageHeight = Config::get('imageHeight');

-

-            // Image exceeds maximum image height

-            if ($intImageHeight > 0 && $arrImageSize[1] > $intImageHeight) {

-                // ToDo: add error message for exceeding height

-                unset($_SESSION['FILES']['avatar']);

-

-                return;

-            }

-        }

-

-        // Upload valid file type with no width and height -> svg

-

-        // Don't upload if no homedir is assigned

-        // ToDo: Create homedir?

-        if (!$objMember->assignDir || !$objMember->homeDir)

-        {

-            // ToDo: add error message for no homedir

-            return;

-        }

-

-        $intUploadFolder = $objMember->homeDir;

-

-        $objUploadFolder = FilesModel::findByUuid($intUploadFolder);

-

-        // The upload folder could not be found

-        if ($objUploadFolder === null)

-        {

-            throw new Exception("Invalid upload folder ID $intUploadFolder");

-        }

-

-        $strUploadFolder = $objUploadFolder->path;

-

-        // Store the file if the upload folder exists

-        $projectDir = System::getContainer()->getParameter('kernel.project_dir');

-

-        if (!!$strUploadFolder & is_dir($projectDir . '/' . $strUploadFolder))

-        {

-            // Delete existing avatar if it exists

-            $this->deleteAvatar($objMember);

-

-            $this->import('Files');

-

-            // Rename file

-            $file['name'] =  $this->avatarName . '.' . $objFile->extension;

-

-            // Move the file to its destination

-            $this->Files->move_uploaded_file($file['tmp_name'], $strUploadFolder . '/' . $file['name']);

-            $this->Files->chmod($strUploadFolder . '/' . $file['name'], 0666 & ~umask());

-

-            $strUuid = null;

-            $strFile = $strUploadFolder . '/' . $file['name'];

-

-

-            // Generate the DB entries

-            if (Dbafs::shouldBeSynchronized($strFile))

-            {

-                $objModel = FilesModel::findByPath($strFile);

-

-                if ($objModel === null)

-                {

-                    $objModel = Dbafs::addResource($strFile);

-                }

-

-                $strUuid = StringUtil::binToUuid($objModel->uuid);

-

-                // Update the hash of the target folder

-                Dbafs::updateFolderHashes($strUploadFolder);

-

-                // Update member avatar

-                $objMember->avatar = $objModel->uuid;

-                $objMember->save();

-            }

-

-            // Add the session entry

-            $_SESSION['FILES']['avatar'] = array

-            (

-                'name'     => $file['name'],

-                'type'     => $file['type'],

-                'tmp_name' => $projectDir . '/' . $strFile,

-                'error'    => $file['error'],

-                'size'     => $file['size'],

-                'uploaded' => true,

-                'uuid'     => $strUuid

-            );

-

-            // Add a log entry

-            $logger = System::getContainer()->get('monolog.logger.contao');

-            $logger->log(LogLevel::INFO, 'File "' . $strUploadFolder . '/' . $file['name'] . '" has been uploaded', ['contao' => new ContaoContext(__METHOD__, TL_FILES)]);

-        }

-

-        unset($_SESSION['FILES']['avatar']);

-    }

-

-    /**

-     * Return the maximum upload file size in bytes

-     */

-    protected function getMaximumUploadSize(): string

-    {

-        if ($this->maxlength > 0)

-        {

-            return $this->maxlength;

-        }

-

-        return FileUpload::getMaxUploadSize();

-    }

-

-    /**

-     * Parses an avatar to the template

-     */

-    public static function parseMemberAvatar(?MemberModel $objMember, &$objTemplate, $strImgSize): void

-    {

-        $objTemplate->addImage= true;

-

-        $objTemplate->singleSRC = self::DEFAULT_PICTURE;

-        $objTemplate->addFallbackImage = true;

-

-        $projectDir = System::getContainer()->getParameter('kernel.project_dir');

-

-        // Check if member avatar exists

-        if(null === $objMember || null === $objMember->avatar || null === ($objFile = FilesModel::findByUuid($objMember->avatar)) || !\is_file($projectDir.'/'.$objFile->path))

-        {

-            $objFile = !!($uuidDefault = Config::get('defaultAvatar')) ? FilesModel::findByUuid($uuidDefault) : null;

-        }

-

-        // Check if config avatar exists

-        if (null === $objFile || !\is_file($projectDir . '/' . $objFile->path))

-        {

-            return;

-        }

-

-        $objTemplate->addFallbackImage = false;

-        $arrData = ['singleSRC'=>$objFile->path, 'size'=>$strImgSize];

-

-        //ToDo: Change to FigureBuilder in the future

-        $objTemplate->addImageToTemplate($objTemplate, $arrData, null, null, $objFile);

-    }

-

-    /**

-     * Gets the url for a member avatar

-     */

-    public static function getMemberAvatarURL(?MemberModel $objMember): string

-    {

-        // ToDo: Merge logic with parseMemberAvatar

-        $projectDir = System::getContainer()->getParameter('kernel.project_dir');

-

-        if(null === $objMember || null === $objMember->avatar || null === ($objFile = FilesModel::findByUuid($objMember->avatar)) || !\is_file($projectDir.'/'. $objFile->path))

-        {

-            $objFile = !!($uuidDefault = Config::get('defaultAvatar')) ? FilesModel::findByUuid($uuidDefault) : null;

-        }

-

-        // Check if config avatar exists

-        if (null === $objFile || !\is_file($projectDir . '/' . $objFile->path))

-        {

-            return self::DEFAULT_PICTURE;

-        }

-

-        return $objFile->path;

-    }

-

-    /**

-     * Deletes an avatar

-     */

-    public static function deleteAvatar(MemberModel $objMember): void

-    {

-        if(!!$objMember->avatar)

-        {

-            $objFile = FilesModel::findByUuid($objMember->avatar) ?: '';

-            $projectDir = System::getContainer()->getParameter('kernel.project_dir');

-

-            // Only delete if file exists

-            if (!!$objFile && file_exists($projectDir . '/' . $objFile->path))

-            {

-                $file = new File($objFile->path);

-                $file->delete();

-            }

-        }

-    }

-}

@@ -41,18 +41,11 @@ class Member extends Frontend

     /**

      * MemberAvatar file name

-     *

-     * @var string

      */

-    protected $avatarName = 'memberAvatar';

+    protected string $avatarName = 'memberAvatar';

     /**

      * Create avatar for a member | Registration

-     *

-     * @param int   $userId

-     * @param array $arrData

-     *

-     * @return void

      */

     public function createAvatar(int $userId, array $arrData): void

     {

@@ -62,13 +55,8 @@ class Member extends Frontend

     /**

      * Update avatar of a member | Login

-     *

-     * @param FrontendUser  $objUser

-     * @param array         $arrData

-     *

-     * @return void

      */

-    public function updateAvatar(FrontendUser $objUser, $arrData): void

+    public function updateAvatar(FrontendUser $objUser, array $arrData): void

     {

         $objMember = MemberModel::findById($objUser->id);

         $this->processAvatar($objMember, $arrData);

@@ -76,11 +64,6 @@ class Member extends Frontend

     /**

      * Process avatar upload for a member

-     *

-     * @param MemberModel   $objMember

-     * @param array         $arrData

-     *

-     * @return void

      */

     protected function processAvatar(MemberModel $objMember, ?array $arrData): void

     {

@@ -173,6 +156,7 @@ class Member extends Frontend

         // Upload valid file type with no width and height -> svg

         // Don't upload if no homedir is assigned

+        // ToDo: Create homedir?

         if (!$objMember->assignDir || !$objMember->homeDir)

         {

             // ToDo: add error message for no homedir

@@ -186,7 +170,7 @@ class Member extends Frontend

         // The upload folder could not be found

         if ($objUploadFolder === null)

         {

-            throw new \Exception("Invalid upload folder ID $intUploadFolder");

+            throw new Exception("Invalid upload folder ID $intUploadFolder");

         }

         $strUploadFolder = $objUploadFolder->path;

@@ -246,7 +230,7 @@ class Member extends Frontend

             // Add a log entry

             $logger = System::getContainer()->get('monolog.logger.contao');

-            $logger->log(LogLevel::INFO, 'File "' . $strUploadFolder . '/' . $file['name'] . '" has been uploaded', array('contao' => new ContaoContext(__METHOD__, TL_FILES)));

+            $logger->log(LogLevel::INFO, 'File "' . $strUploadFolder . '/' . $file['name'] . '" has been uploaded', ['contao' => new ContaoContext(__METHOD__, TL_FILES)]);

         }

         unset($_SESSION['FILES']['avatar']);

@@ -254,10 +238,8 @@ class Member extends Frontend

     /**

      * Return the maximum upload file size in bytes

-     *

-     * @return string

      */

-    protected function getMaximumUploadSize()

+    protected function getMaximumUploadSize(): string

     {

         if ($this->maxlength > 0)

         {

@@ -269,13 +251,8 @@ class Member extends Frontend

     /**

      * Parses an avatar to the template

-     *

-     * @param MemberModel|null $objMember

-     * @param $objTemplate

-     * @param $strImgSize

-     * @return void

      */

-    public static function parseMemberAvatar(?MemberModel $objMember, &$objTemplate, $strImgSize)

+    public static function parseMemberAvatar(?MemberModel $objMember, &$objTemplate, $strImgSize): void

     {

         $objTemplate->addImage= true;

@@ -305,9 +282,6 @@ class Member extends Frontend

     /**

      * Gets the url for a member avatar

-     *

-     * @param MemberModel|null $objMember

-     * @return string

      */

     public static function getMemberAvatarURL(?MemberModel $objMember): string

     {

@@ -329,9 +303,7 @@ class Member extends Frontend

     }

     /**

-     * @param MemberModel $objMember

-     *

-     * @return void

+     * Deletes an avatar

      */

     public static function deleteAvatar(MemberModel $objMember): void

     {

@@ -32,7 +32,7 @@ use Psr\Log\LogLevel;

 /**

  * Class Member

- * 

+ *

  * @property int $avatar UUID of the avatar

  */

 class Member extends Frontend

@@ -270,36 +270,27 @@ class Member extends Frontend

     /**

      * Parses an avatar to the template

      *

-     * @param MemberModel $objMember

+     * @param MemberModel|null $objMember

      * @param $objTemplate

      * @param $strImgSize

      * @return void

      */

-    public static function parseMemberAvatar(MemberModel $objMember, &$objTemplate, $strImgSize)

+    public static function parseMemberAvatar(?MemberModel $objMember, &$objTemplate, $strImgSize)

     {

         $objTemplate->addImage= true;

         $objTemplate->singleSRC = self::DEFAULT_PICTURE;

         $objTemplate->addFallbackImage = true;

-        $uuidDefault = Config::get('defaultAvatar');

+        $projectDir = System::getContainer()->getParameter('kernel.project_dir');

-        if(!!$objMember->avatar)

-        {

-            $objFile = FilesModel::findByUuid($objMember->avatar);

-        }

-        else if(!!$uuidDefault)

-        {

-            $objFile = FilesModel::findByUuid($uuidDefault);

-        }

-        else

+        // Check if member avatar exists

+        if(null === $objMember || null === $objMember->avatar || null === ($objFile = FilesModel::findByUuid($objMember->avatar)) || !\is_file($projectDir.'/'.$objFile->path))

         {

-            return;

+            $objFile = !!($uuidDefault = Config::get('defaultAvatar')) ? FilesModel::findByUuid($uuidDefault) : null;

         }

-        $projectDir = System::getContainer()->getParameter('kernel.project_dir');

-

-        // If file does not exist use default image

+        // Check if config avatar exists

         if (null === $objFile || !\is_file($projectDir . '/' . $objFile->path))

         {

             return;

@@ -313,6 +304,31 @@ class Member extends Frontend

     }

     /**

+     * Gets the url for a member avatar

+     *

+     * @param MemberModel|null $objMember

+     * @return string

+     */

+    public static function getMemberAvatarURL(?MemberModel $objMember): string

+    {

+        // ToDo: Merge logic with parseMemberAvatar

+        $projectDir = System::getContainer()->getParameter('kernel.project_dir');

+

+        if(null === $objMember || null === $objMember->avatar || null === ($objFile = FilesModel::findByUuid($objMember->avatar)) || !\is_file($projectDir.'/'. $objFile->path))

+        {

+            $objFile = !!($uuidDefault = Config::get('defaultAvatar')) ? FilesModel::findByUuid($uuidDefault) : null;

+        }

+

+        // Check if config avatar exists

+        if (null === $objFile || !\is_file($projectDir . '/' . $objFile->path))

+        {

+            return self::DEFAULT_PICTURE;

+        }

+

+        return $objFile->path;

+    }

+

+    /**

      * @param MemberModel $objMember

      *

      * @return void

@@ -277,8 +277,10 @@ class Member extends Frontend

      */

     public static function parseMemberAvatar(MemberModel $objMember, &$objTemplate, $strImgSize)

     {

+        $objTemplate->addImage= true;

+

         $objTemplate->singleSRC = self::DEFAULT_PICTURE;

-        $objTemplate->addImage = false;

+        $objTemplate->addFallbackImage = true;

         $uuidDefault = Config::get('defaultAvatar');

@@ -303,7 +305,7 @@ class Member extends Frontend

             return;

         }

-        $objTemplate->addImage = true;

+        $objTemplate->addFallbackImage = false;

         $arrData = ['singleSRC'=>$objFile->path, 'size'=>$strImgSize];

         //ToDo: Change to FigureBuilder in the future

@@ -307,7 +307,7 @@ class Member extends Frontend

         $arrData = ['singleSRC'=>$objFile->path, 'size'=>$strImgSize];

         //ToDo: Change to FigureBuilder in the future

-        $objTemplate->addImageToTemplate($objTemplate, $arrData);

+        $objTemplate->addImageToTemplate($objTemplate, $arrData, null, null, $objFile);

     }

     /**

@@ -37,6 +37,8 @@ use Psr\Log\LogLevel;

  */

 class Member extends Frontend

 {

+    const DEFAULT_PICTURE = 'bundles/contaomemberextension/avatar.png';

+

     /**

      * MemberAvatar file name

      *

@@ -266,6 +268,49 @@ class Member extends Frontend

     }

     /**

+     * Parses an avatar to the template

+     *

+     * @param MemberModel $objMember

+     * @param $objTemplate

+     * @param $strImgSize

+     * @return void

+     */

+    public static function parseMemberAvatar(MemberModel $objMember, &$objTemplate, $strImgSize)

+    {

+        $objTemplate->singleSRC = self::DEFAULT_PICTURE;

+        $objTemplate->addImage = false;

+

+        $uuidDefault = Config::get('defaultAvatar');

+

+        if(!!$objMember->avatar)

+        {

+            $objFile = FilesModel::findByUuid($objMember->avatar);

+        }

+        else if(!!$uuidDefault)

+        {

+            $objFile = FilesModel::findByUuid($uuidDefault);

+        }

+        else

+        {

+            return;

+        }

+

+        $projectDir = System::getContainer()->getParameter('kernel.project_dir');

+

+        // If file does not exist use default image

+        if (null === $objFile || !\is_file($projectDir . '/' . $objFile->path))

+        {

+            return;

+        }

+

+        $objTemplate->addImage = true;

+        $arrData = ['singleSRC'=>$objFile->path, 'size'=>$strImgSize];

+

+        //ToDo: Change to FigureBuilder in the future

+        $objTemplate->addImageToTemplate($objTemplate, $arrData);

+    }

+

+    /**

      * @param MemberModel $objMember

      *

      * @return void

@@ -80,7 +80,7 @@ class Member extends Frontend

      *

      * @return void

      */

-    protected function processAvatar(MemberModel $objMember, array $arrData): void

+    protected function processAvatar(MemberModel $objMember, ?array $arrData): void

     {

         $objMember = MemberModel::findByPk($objMember->id);

@@ -270,7 +270,7 @@ class Member extends Frontend

      *

      * @return void

      */

-    public function deleteAvatar(MemberModel $objMember): void

+    public static function deleteAvatar(MemberModel $objMember): void

     {

         if(!!$objMember->avatar)

         {

@@ -20,13 +20,21 @@ use Contao\CoreBundle\Monolog\ContaoContext;

 use Contao\Dbafs;

 use Contao\File;

 use Contao\FilesModel;

+use Contao\FileUpload;

 use Contao\Frontend;

+use Contao\FrontendUser;

 use Contao\MemberModel;

 use Contao\StringUtil;

 use Contao\System;

 use Contao\Validator;

 use Psr\Log\LogLevel;

+

+/**

+ * Class Member

+ * 

+ * @property int $avatar UUID of the avatar

+ */

 class Member extends Frontend

 {

     /**

@@ -39,24 +47,42 @@ class Member extends Frontend

     /**

      * Create avatar for a member | Registration

      *

-     * @param int          $userId

-     * @param array        $arrData

+     * @param int   $userId

+     * @param array $arrData

+     *

+     * @return void

      */

-    public function createAvatar($userId, $arrData)

+    public function createAvatar(int $userId, array $arrData): void

     {

         $objMember = MemberModel::findById($userId);

-        $this->updateAvatar($objMember, $arrData);

+        $this->processAvatar($objMember, $arrData);

+    }

+

+    /**

+     * Update avatar of a member | Login

+     *

+     * @param FrontendUser  $objUser

+     * @param array         $arrData

+     *

+     * @return void

+     */

+    public function updateAvatar(FrontendUser $objUser, $arrData): void

+    {

+        $objMember = MemberModel::findById($objUser->id);

+        $this->processAvatar($objMember, $arrData);

     }

     /**

-     * Update avatar of member

+     * Process avatar upload for a member

+     *

+     * @param MemberModel   $objMember

+     * @param array         $arrData

      *

-     * @param MemberModel  $objMember

-     * @param array        $arrData

+     * @return void

      */

-    public function updateAvatar($objUser, $arrData)

+    protected function processAvatar(MemberModel $objMember, array $arrData): void

     {

-        $objMember = MemberModel::findByPk($objUser->id);

+        $objMember = MemberModel::findByPk($objMember->id);

         if ($objMember === null)

         {

@@ -74,38 +100,26 @@ class Member extends Frontend

         }

         catch (\InvalidArgumentException $e)

         {

-            // ToDo: Fehler: Dateiname beinhaltet unzulässige Zeichen

-            $this->addError($GLOBALS['TL_LANG']['ERR']['filename']);

-

+            // ToDo: add error message for invalid characters

             return;

         }

         // Invalid file name

         if (!Validator::isValidFileName($file['name']))

         {

-            // ToDo: Fehler: Dateiname beinhaltet unzulässige Zeichen

-            $this->addError($GLOBALS['TL_LANG']['ERR']['filename']);

+            // ToDo: add error message for invalid characters

             return;

         }

         // File was not uploaded

-        // ToDo: File was not uploaded

         if (!is_uploaded_file($file['tmp_name']))

         {

-            if ($file['error'] == 1 || $file['error'] == 2)

-            {

-                $this->addError(sprintf($GLOBALS['TL_LANG']['ERR']['filesize'], $maxlength_kb_readable));

-            }

-            elseif ($file['error'] == 3)

-            {

-                $this->addError(sprintf($GLOBALS['TL_LANG']['ERR']['filepartial'], $file['name']));

-            }

-            elseif ($file['error'] > 0)

-            {

-                $this->addError(sprintf($GLOBALS['TL_LANG']['ERR']['fileerror'], $file['error'], $file['name']));

-            }

+            // ToDo: Add error messages

+            /*if ($file['error'] == 1 || $file['error'] == 2) { // Add error message for maximum file size }

+            elseif ($file['error'] == 3) { // Add error message for partial upload }

+            elseif ($file['error'] > 0) { // Add error message for failed upload }*/

-            unset($_FILES[$this->strName]);

+            unset($_SESSION['FILES']['avatar']);

             return;

         }

@@ -113,8 +127,7 @@ class Member extends Frontend

         // File is too big

         if ($file['size'] > $maxlength_kb)

         {

-            // ToDo: Fehler: Datei zu groß

-            $this->addError(sprintf($GLOBALS['TL_LANG']['ERR']['filesize'], $maxlength_kb_readable));

+            // ToDo: add error message for maximum file size

             unset($_SESSION['FILES']['avatar']);

             return;

@@ -126,8 +139,7 @@ class Member extends Frontend

         // File type is not allowed

         if (!\in_array($objFile->extension, $uploadTypes))

         {

-            // ToDo: Fehler: Dateityp nicht erlaubt

-            $this->addError(sprintf($GLOBALS['TL_LANG']['ERR']['filetype'], $objFile->extension));

+            // ToDo: add error message for not allowed file type

             unset($_SESSION['FILES']['avatar']);

             return;

@@ -139,8 +151,8 @@ class Member extends Frontend

             // Image exceeds maximum image width

             if ($intImageWidth > 0 && $arrImageSize[0] > $intImageWidth) {

-                $this->addError(sprintf($GLOBALS['TL_LANG']['ERR']['filewidth'], $file['name'], $intImageWidth));

-                unset($_FILES[$this->strName]);

+                // ToDo: add error message for exceeding width

+                unset($_SESSION['FILES']['avatar']);

                 return;

             }

@@ -149,8 +161,8 @@ class Member extends Frontend

             // Image exceeds maximum image height

             if ($intImageHeight > 0 && $arrImageSize[1] > $intImageHeight) {

-                $this->addError(sprintf($GLOBALS['TL_LANG']['ERR']['fileheight'], $file['name'], $intImageHeight));

-                unset($_FILES[$this->strName]);

+                // ToDo: add error message for exceeding height

+                unset($_SESSION['FILES']['avatar']);

                 return;

             }

@@ -159,9 +171,9 @@ class Member extends Frontend

         // Upload valid file type with no width and height -> svg

         // Don't upload if no homedir is assigned

-        // ToDo: Add error

         if (!$objMember->assignDir || !$objMember->homeDir)

         {

+            // ToDo: add error message for no homedir

             return;

         }

@@ -245,45 +257,28 @@ class Member extends Frontend

      */

     protected function getMaximumUploadSize()

     {

-        // Get the upload_max_filesize from the php.ini

-        $upload_max_filesize = ini_get('upload_max_filesize');

-

-        // Convert the value to bytes

-        if (stripos($upload_max_filesize, 'K') !== false)

+        if ($this->maxlength > 0)

         {

-            $upload_max_filesize = round($upload_max_filesize * 1024);

-        }

-        elseif (stripos($upload_max_filesize, 'M') !== false)

-        {

-            $upload_max_filesize = round($upload_max_filesize * 1024 * 1024);

-        }

-        elseif (stripos($upload_max_filesize, 'G') !== false)

-        {

-            $upload_max_filesize = round($upload_max_filesize * 1024 * 1024 * 1024);

+            return $this->maxlength;

         }

-        return min($upload_max_filesize, Config::get('maxFileSize'));

+        return FileUpload::getMaxUploadSize();

     }

     /**

-     * Add an error message

+     * @param MemberModel $objMember

      *

-     * @param string $strError The error message

+     * @return void

      */

-    public function addError($strError)

-    {

-        $this->class = 'error';

-        $this->arrErrors[] = $strError;

-    }

-

-    public function deleteAvatar($objMember)

+    public function deleteAvatar(MemberModel $objMember): void

     {

         if(!!$objMember->avatar)

         {

-            $objFile = FilesModel::findByUuid($objMember->avatar) ?? '';

+            $objFile = FilesModel::findByUuid($objMember->avatar) ?: '';

+            $projectDir = System::getContainer()->getParameter('kernel.project_dir');

-            // Only delete existing file

-            if (!!$objFile && file_exists($objFile->path))

+            // Only delete if file exists

+            if (!!$objFile && file_exists($projectDir . '/' . $objFile->path))

             {

                 $file = new File($objFile->path);

                 $file->delete();

@@ -1,33 +1,57 @@

 <?php