@@ -1,20 +1,204 @@

-# Contao Member Extension Bundle

-Member Extension for Contao 4 Open Source CMS

-

-The following functions are added by this bundle:

-- Avatar (BE/FE)

-    - Fallback / Default Image

-- Memberlist

-- Memberreader

-

-### Avatar

-For the representation of the avatar, a separate module is provided. To prepare the avatar upload for the frontend, you only have to select the option "Avatar" in the module "Personal data".

-

-##### Member

-![Admin View: List](https://www.oveleon.de/share/github-assets/contao-member-extension-bundle/mebmer-extension-bundle-be.png)

-

-##### How to configurate the default avatar:

-###### Member list

-![Admin View: List](https://www.oveleon.de/share/github-assets/contao-member-extension-bundle/mebmer-extension-bundle-be-settings-1.png)

-###### Member settings

-![Admin View: List](https://www.oveleon.de/share/github-assets/contao-member-extension-bundle/mebmer-extension-bundle-be-settings-2.png)

+<p align="center"><img src="https://www.oveleon.de/share/github-assets/contao-member-extension-bundle/cme-logo.svg" width="200"></p>

+<h1 align="center">Contao Member Extension Bundle</h1>

+<p align="center"><i>Adds a listing of members with detail pages and extends them with an avatar that can be uploaded and deleted</i></p>

+<p align="center">

+    <a href="https://www.oveleon.de"><img src="https://img.shields.io/badge/oveleon-maintained-83aa0e?style=flat-square&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAAUCAYAAABvVQZ0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA/xpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ1IDc5LjE2MzQ5OSwgMjAxOC8wOC8xMy0xNjo0MDoyMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ1dWlkOjVEMjA4OTI0OTNCRkRCMTE5MTRBODU5MEQzMTUwOEM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjM5MjZBNjQzMzZFQjExRUFBMTdBQkNFQTAxNjg2RDI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjM5MjZBNjQyMzZFQjExRUFBMTdBQkNFQTAxNjg2RDI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIElsbHVzdHJhdG9yIENTNiAoV2luZG93cykiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0idXVpZDplMDhkZDhmZC1mOTA4LTQ5YzItYWMwZC00OGE3YTI4ODc2YWEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6OTA2RDhGOENERUQxRTgxMTgyMjVBMzBGQ0NBNjE4RUQiLz4gPGRjOnRpdGxlPiA8cmRmOkFsdD4gPHJkZjpsaSB4bWw6bGFuZz0ieC1kZWZhdWx0Ij5Mb2dvX292ZWxlb25fWmVpY2hlbl9yejwvcmRmOmxpPiA8L3JkZjpBbHQ+IDwvZGM6dGl0bGU+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+P8iBTQAAAbFJREFUeNqU08srRFEcB/BromGGaJRHKSIaYfIm7JRSsvHIyuM/wMorNeEfUMqKnbKwU2TBwpSUSWYWFmSBDKWmWcgwcX2Pvrc5HXfuXL/6zD2P3z2Puedouq5rilG40JPxAuUmeX84tGTkwyXsghOWYQmKoFazExzVDXFIgEeazcPV9TCnzGplRiHMl7KgCWYghy9vQAasMEfkTqQarJ9JFWw0YlhJFv2rUv8tdKiDhTib0eiHQyhOsR2xyjlp0BF5MBELdr6WohE++X6raBOz6PwWCfiCOLzDN8sRGICYyfdrgBA8Q2kmfnzQJirghlw+XZANUQ5qFmHY52R9/9lWCXjBpbRPcaubDhtHsRoOuN1reAO/1H/PpzfdaqrggzOLK7YFD6zPMqeL9at0gwWZuKa0i3hkuZf1E6tteqEZnmCRbZVwxPIOn3V83litaogzbrPuhDOIwbyUd8q8SavBOpl0rnxROadFugkFVoOJAx1h4rRJvw9e2b9u3ACrY9ENAZaD/L/E0aiHMbbfQc3v7bFxWAchqptHAAqN3HQrM0JcsXFohzzexWPYk5N+BBgAix5VyvzRZbwAAAAASUVORK5CYII=" alt="Oveleon"></a>

+    <a href="https://github.com/oveleon/https://github.com/oveleon/contao-member-extension-bundle"><img src="https://img.shields.io/badge/license-MIT-83aa0e?style=flat-square"/></a>

+    <a href="https://packagist.org/packages/oveleon/contao-member-extension-bundle"><img src="https://img.shields.io/packagist/dt/oveleon/contao-member-extension-bundle?color=0A7BBC&style=flat-square"/></a>

+</p>

+<br/>

+

+---

+

+> Working with **Contao 4.9** and up to **Contao 4.13** (PHP ^7.4 and PHP 8)

+

+---

+

+The Member extension bunde adds the possibility to display members and their details in lists using frontend modules.

+The member options are extended with an avatar that can be changed and uploaded in the member edit module and registration module.

+Additionally, you can display members with their details in a reader page.

+

++ [Features](#features)

++ [Installation](#installation)

+   + [Upgrading](#upgrading-to-version-12)

+   + [Composer](#via-composer)

+   + [Contao Manager](#via-contao-manager)

++ [Initial Setup](#initial-setup)

++ [Insert tags](#insert-tags)

+   + [Avatar insert tags](#avatar-insert-tags)

++ [Front end modules](#front-end-modules)

+   + [Memberlist](#memberlist)

+   + [Memberreader](#memberreader)

+   + [Avatar / Profile picture](#avatar--profile-picture)

+   + [Delete avatar](#delete-avatar)

++ [Support](#support)

++ [Sponsoring](#sponsoring)

+

+## Features

+

+- Compatible with Contao 4.9 and higher versions (PHP 8 Support)

+- Extends members with avatars

+- Paginated member lists

+- Member detail pages

+- Insert tags for member avatars

+

+---

+

+## Installation

+

+#### Upgrading to version 1.2

+> After upgrading from version 1.1 to version 1.2, make sure to edit your modules (memberlist, memberreader and avatar/profile picture) and set up the new templates.

+

+#### Via composer

+```

+composer require oveleon/contao-member-extension-bundle

+```

+

+#### Via contao-manager

+```

+Search for contao member extension bundle and add it to your extensions.

+```

+

+After installing the contao-member-extension-bundle, you need to run a **contao install**.

+

+---

+

+## Initial setup

+This bundle extends contao with the possibiity to extend members with an avatar and displaying members in a list with

+detail pages.

+

+1. Go into members and set up a default avatar in the newly added settings

+

+    ![Admin View: Member overview](https://www.oveleon.de/share/github-assets/contao-member-extension-bundle/default_avatar.jpg)

+    ![Admin View: Member settings](https://www.oveleon.de/share/github-assets/contao-member-extension-bundle/default_avatar_setup.jpg)

+

+2. To display your members, you need to setup a memberlist

+   1. Create the front end module *memberlist*

+   2. Choose the member groups and the member fields that should be displayed

+   3. Optionally you can set up a redirect page to your memberreader

+   4. Embed the module in a page

+

+    ![Admin View: Memberlist](https://www.oveleon.de/share/github-assets/contao-member-extension-bundle/module_memberlist.jpg)

+

+3. Displaying the avatar

+   1. Create the front end module *Avatar / profile picture*

+   2. Optionally you can set an image size

+   3. Embed the module in a page

+

+    ![Admin View: MemberAvatar](https://www.oveleon.de/share/github-assets/contao-member-extension-bundle/module_memberavatar.jpg)

+

+4. Module to delete an avatar

+   1. Create the front end module *Delete Avatar*

+   2. Embed the module in a page

+   3. The module only appears if a frontend user is logged in

+   4. You can check the "profile picture option" within registration to enable members to upload a profile picture within

+   registration

+

+    ![Admin View: MemberDeleteAvatar](https://www.oveleon.de/share/github-assets/contao-member-extension-bundle/module_memberdeleteavatar.jpg)

+

+6. Member reader page

+   1. Create the front end module *memberreader*

+   2. Choose the member groups and the member fields that are allowed

+

+---

+

+## Insert tags

+Member avatars can be shown using following *insert-tags*

+

+> For more information on *Insert tags*, please visit the official <a href="https://docs.contao.org/manual/en/article-management/insert-tags/" title="Insert tags :: Contao Manual" target="_blank">Contao documentation</a>.

+

+**Example**

+```

+{{avatar::member::current}}

+{{avatar::member::current::200x200xproportional}}

+{{avatar::member::4}}

+{{avatar::member::4::300x300xcrop}}

+```

+

+The allowed image size parameters are:

+"<strong>width</strong> x <strong>height</strong> x <strong>mode</strong>"

+

+Size mode (See: [Size Array](https://docs.contao.org/dev/framework/image-processing/image-sizes/#size-array))

+- crop

+- proportional

+- box

+

+The standard mode vor avatar insert tags is *crop*

+

+### Avatar insert tags

+

+<table>

+  <tr>

+    <th colspan="2"><strong>Member extension avatar</strong></th>

+  </tr>

+  <tr>

+    <td><strong>Insert tag</strong></td>

+    <td><strong>Description</strong></td>

+  </tr>

+  <tr>

+    <td>{{avatar::member::current}}</td>

+    <td>Displays the avatar of the logged in member</td>

+  </tr>

+  <tr>

+    <td>{{avatar::member::current::200x300}}</td>

+    <td>Displays the avatar of the logged in member with a width of 200 and a height of 300</td>

+  </tr>

+  <tr>

+    <td>{{avatar::member::current::300x400xbox}}</td>

+    <td>Displays the avatar of the logged in member with a width of 300, a height of 400 and the mode: box</td>

+  </tr>

+  <tr>

+    <td>{{avatar::member::123}}</td>

+    <td>Displays the avatar of member id 123</td>

+  </tr>

+  <tr>

+    <td>{{avatar::member::123::200x300}}</td>

+    <td>Displays the avatar of member id 123 with a width of 200 and a height of 300</td>

+  </tr>

+  <tr>

+    <td>{{avatar::member::123::300x400xbox}}</td>

+    <td>Displays the avatar of member id 123 with a width of 300, a height of 400 and the mode: box</td>

+  </tr>

+</table>

+

+---

+

+## Front end modules

+

+### Memberlist

+

+Displays activated members in a list

+

+### Memberreader

+

+Displays a detail page of a member

+

+### Avatar / Profile picture

+

+Displays an avatar of a member. If no avatar has been uploaded, the default avatar (or the fallback avatar from the bundle)

+will be shown

+

+### Delete Avatar

+

+A module that can be embedded into a page that adds the possibility to delete the avatar of a member.

+

+---

+

+## Support

+> We **only provide support** for **bugs, and feature requests**; please only post issues about these two topics.

+>

+> If you need help implementing Contao Member Extension Bundle or you are just starting out 

+> with Contao/CSS or HTML, please contact us on our [website](https://www.oveleon.de/kontakt.html#kontaktformular),

+> visit the [Contao Community](https://community.contao.org/) 

+> or the [Contao Slack](https://join.slack.com/t/contao/shared_invite/enQtNjUzMjY4MDU0ODM3LWVjYWMzODVkZjM5NjdlNDRiZjk2OTI3OWVkMmQ1YjA0MTQ3YTljMjFjODkwYTllN2NkMDcxMThiNzMzZjZlOGU),

+> you will be able to find more help there.

+>

+> This will help us to keep the issues related to this plugin and solve them faster.

+

+---

+

+## Sponsoring

+

+If you find this plugin useful, please consider [sponsoring us](https://github.com/sponsors/oveleon) 

+to help contribute to our time invested and to further development of this and other open source projects. 

+Thank you for your support! - [Oveleon](https://www.oveleon.de).

@@ -1,44 +1,70 @@

 {

-  "name":"oveleon/contao-member-extension-bundle",

-  "type":"contao-bundle",

-  "description":"Member feature extension for Contao.",

-  "keywords":["contao","member-extension-bundle"],

-  "homepage":"https://oveleon.de/",

-  "license":"MIT",

-  "authors":[

-    {

-      "name":"Oveleon",

-      "homepage":"https://oveleon.de/",

-      "role":"Developer"

-    }

-  ],

-  "require":{

-    "php":">=7.1",

-    "contao/core-bundle":"^4.4"

-  },

-  "require-dev": {

-    "contao/manager-plugin": "^2.0"

-  },

-  "conflict": {

-    "contao/core": "*",

-    "contao/core-bundle": "4.4.1",

-    "contao/manager-plugin": "<2.0 || >=3.0"

-  },

-  "autoload":{

-    "psr-4": {

-      "Oveleon\\ContaoMemberExtensionBundle\\": "src/"

-    },

-    "classmap": [

-      "src/Resources/contao/"

+    "name": "oveleon/contao-member-extension-bundle",

+    "type": "contao-bundle",

+    "description": "Member feature extension for Contao.",

+    "keywords": ["contao","member-extension-bundle"],

+    "homepage": "https://oveleon.de/",

+    "license": "MIT",

+    "authors": [

+        {

+            "name": "Oveleon",

+            "homepage": "https://oveleon.de/",

+            "role": "Developer"

+        },

+        {

+            "name": "Daniele Sciannimanica",

+            "homepage": "https://github.com/doishub",

+            "role":"Developer"

+        },

+        {

+            "name": "Fabian Ekert",

+            "homepage": "https://github.com/eki89",

+            "role": "Developer"

+        },

+        {

+            "name": "Sebastian Zoglowek",

+            "homepage": "https://github.com/zoglo",

+            "role": "Developer"

+        }

     ],

-    "exclude-from-classmap": [

-      "src/Resources/contao/config/",

-      "src/Resources/contao/dca/",

-      "src/Resources/contao/languages/",

-      "src/Resources/contao/templates/"

-    ]

-  },

-  "extra":{

-    "contao-manager-plugin": "Oveleon\\ContaoMemberExtensionBundle\\ContaoManager\\Plugin"

-  }

+    "require": {

+        "php": "^7.4 || ^8.0",

+        "contao/core-bundle":"^4.9"

+    },

+    "require-dev": {

+        "contao/manager-plugin": "^2.3.1"

+    },

+    "conflict": {

+        "contao/core": "*",

+        "contao/manager-plugin": "<2.0 || >=3.0"

+    },

+    "autoload": {

+        "psr-4": {

+            "Oveleon\\ContaoMemberExtensionBundle\\": "src/"

+        },

+        "classmap": [

+            "src/Resources/contao/"

+        ],

+        "exclude-from-classmap": [

+            "src/Resources/contao/config/",

+            "src/Resources/contao/dca/",

+            "src/Resources/contao/languages/",

+            "src/Resources/contao/templates/"

+        ]

+    },

+    "extra": {

+        "branch-alias": {

+            "dev-master": "1.2.x-dev"

+        },

+        "contao-manager-plugin": "Oveleon\\ContaoMemberExtensionBundle\\ContaoManager\\Plugin"

+    },

+    "config": {

+        "allow-plugins": {

+            "contao-components/installer": true,

+            "contao/manager-plugin": true

+        }

+    },

+    "support": {

+        "issues": "https://github.com/oveleon/contao-member-extension-bundle/issues"

+    }

 }

\ No newline at end of file

@@ -5,7 +5,12 @@ declare(strict_types=1);

 /*

  * This file is part of Oveleon ContaoMemberExtension Bundle.

  *

- * (c) https://www.oveleon.de/

+ * @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\ContaoManager;

@@ -15,7 +20,6 @@ use Contao\ManagerPlugin\Bundle\BundlePluginInterface;

 use Contao\ManagerPlugin\Bundle\Config\BundleConfig;

 use Contao\ManagerPlugin\Bundle\Parser\ParserInterface;

 use Oveleon\ContaoMemberExtensionBundle\ContaoMemberExtensionBundle;

-use Symfony\Component\HttpKernel\KernelInterface;

 class Plugin implements BundlePluginInterface

 {

@@ -5,7 +5,12 @@ declare(strict_types=1);

 /*

  * This file is part of Oveleon ContaoMemberExtension Bundle.

  *

- * (c) https://www.oveleon.de/

+ * @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;

new file mode 100644

@@ -0,0 +1,29 @@

+<?php

+

+/**

+ * Procuna

+ *

+ * @link      https://www.oveleon.de/

+ * @copyright Copyright (c) 2021  Oveleon GbR (https://www.oveleon.de)

+ */

+

+

+namespace Oveleon\ContaoMemberExtensionBundle\DependencyInjection;

+

+use Symfony\Component\Config\FileLocator;

+use Symfony\Component\DependencyInjection\ContainerBuilder;

+use Symfony\Component\DependencyInjection\Extension\Extension;

+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;

+

+class ContaoMemberExtensionExtension extends Extension

+{

+    public function load(array $configs, ContainerBuilder $container): void

+    {

+        $loader = new YamlFileLoader(

+            $container,

+            new FileLocator(__DIR__.'/../Resources/config')

+        );

+

+        $loader->load('listener.yml');

+    }

+}

new file mode 100644

@@ -0,0 +1,123 @@

+<?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\EventListener;

+

+use Contao\FrontendTemplate;

+use Contao\FrontendUser;

+use Contao\Image\ResizeConfiguration;

+use Contao\MemberModel;

+use Contao\System;

+use Contao\CoreBundle\Framework\ContaoFramework;

+use Oveleon\ContaoMemberExtensionBundle\Member;

+

+class InsertTagsListener

+{

+    private const SUPPORTED_TAGS = [

+        'avatar'

+    ];

+

+    /**

+     * @var ContaoFramework

+     */

+    private $framework;

+

+    public function __construct(ContaoFramework $framework)

+    {

+        $this->framework = $framework;

+    }

+

+    /**

+     * @return string|false

+     */

+    public function __invoke(string $tag, bool $useCache, $cacheValue, array $flags)

+    {

+        $elements = explode('::', $tag);

+        $key = strtolower($elements[0]);

+

+        if (\in_array($key, self::SUPPORTED_TAGS, true)) {

+            return $this->replaceEventInsertTag($key, $elements, $flags);

+        }

+

+        return false;

+    }

+

+    private function replaceEventInsertTag(string $insertTag, array $elements, array $flags): string

+    {

+        $this->framework->initialize();

+        $tokenChecker = System::getContainer()->get('contao.security.token_checker');

+

+        if($elements[1] !== 'member')

+        {

+            return '';

+        }

+

+        switch ($elements[2]) {

+

+            case 'current':

+                if(!$tokenChecker->hasFrontendUser())

+                {

+                    return '';

+                }

+                $memberID = FrontendUser::getInstance()->id;

+                break;

+

+            default:

+                if(!\is_numeric($elements[2]))

+                {

+                    return '';

+                }

+                $memberID = $elements[2];

+                break;

+        }

+

+        if(!!$objMember = MemberModel::findByPk($memberID))

+        {

+            $strImgSize = $this->convertImgSize($elements[3]);

+            $objTemplate = new FrontendTemplate('memberExtension_image');

+

+            Member::parseMemberAvatar($objMember, $objTemplate, $strImgSize);

+

+            return $objTemplate->parse();

+        }

+

+        return '';

+    }

+

+    private function convertImgSize($strSize): ?string

+    {

+        if (!$strSize)

+        {

+            return null;

+        }

+

+        list($intWidth, $intHeight, $mode) = explode('x', $strSize);

+

+        $arrSizes = [$intWidth, $intHeight];

+

+        $arrValidModes = [

+            ResizeConfiguration::MODE_BOX,

+            ResizeConfiguration::MODE_PROPORTIONAL,

+            ResizeConfiguration::MODE_CROP,

+        ];

+

+        if(!!$mode && in_array($mode, $arrValidModes, true))

+        {

+            $arrSizes[] = $mode;

+        }

+

+        return serialize($arrSizes);

+    }

+}

new file mode 100644

@@ -0,0 +1,8 @@

+services:

+    contao_member.listener.insert_tags:

+        class: Oveleon\ContaoMemberExtensionBundle\EventListener\InsertTagsListener

+        arguments:

+            - '@contao.framework'

+        tags:

+          - { name: contao.hook, hook: replaceInsertTags }

+        public: true

@@ -1,38 +1,90 @@

 <?php

+

+declare(strict_types=1);

+

 /*

  * This file is part of Oveleon ContaoMemberExtension Bundle.

  *

- * (c) https://www.oveleon.de/

+ * @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

- *

- * @author Fabian Ekert <fabian@oveleon.de>

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

+ * 

+ * @property int $avatar UUID of the avatar

  */

 class Member extends Frontend

 {

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

+

+    /**

+     * MemberAvatar file name

+     *

+     * @var string

+     */

+    protected $avatarName = 'memberAvatar';

+

+    /**

+     * Create avatar for a member | Registration

+     *

+     * @param int   $userId

+     * @param array $arrData

+     *

+     * @return void

+     */

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

+    {

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

+        $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 FrontendUser $objUser

-     * @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)

         {

@@ -41,6 +93,7 @@ class Member extends Frontend

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

         $maxlength_kb = $this->getMaximumUploadSize();

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

         // Sanitize the filename

         try

@@ -49,26 +102,34 @@ class Member extends Frontend

         }

         catch (\InvalidArgumentException $e)

         {

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

-

+            // ToDo: add error message for invalid characters

             return;

         }

         // Invalid file name

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

         {

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

-

+            // ToDo: add error message for invalid characters

             return;

         }

         // File was not uploaded

-        // ToDo

+        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: Fehler: Datei zu groß

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

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

             return;

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

         // File type is not allowed

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

         {

-            // ToDo: Fehler: Dateityp nicht erlaubt

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

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

             return;

@@ -91,9 +152,8 @@ class Member extends Frontend

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

             // Image exceeds maximum image width

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

-            {

-                // ToDo: Fehler: Bild ist zu groß in der breite

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

+                // ToDo: add error message for exceeding width

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

                 return;

@@ -102,81 +162,91 @@ class Member extends Frontend

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

             // Image exceeds maximum image height

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

-            {

-                // ToDo: Fehler: Bild ist zu groß in der höhe

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

+                // ToDo: add error message for exceeding height

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

                 return;

             }

+        }

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

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

-            // Overwrite the upload folder with user's home directory

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

-            {

-                return;

-            }

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

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

+        {

+            // ToDo: add error message for no homedir

+            return;

+        }

-            $intUploadFolder = $objMember->homeDir;

+        $intUploadFolder = $objMember->homeDir;

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

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

-            // The upload folder could not be found

-            if ($objUploadFolder === null)

-            {

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

-            }

+        // The upload folder could not be found

+        if ($objUploadFolder === null)

+        {

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

+        }

-            $strUploadFolder = $objUploadFolder->path;

+        $strUploadFolder = $objUploadFolder->path;

-            // Store the file if the upload folder exists

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

-            {

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

+        // Store the file if the upload folder exists

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

-                // Move the file to its destination

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

-                $this->Files->chmod($strUploadFolder . '/' . $file['name'], Config::get('defaultFileChmod'));

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

+        {

+            // Delete existing avatar if it exists

+            $this->deleteAvatar($objMember);

-                $strUuid = null;

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

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

-                // Generate the DB entries

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

-                {

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

+            // 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());

-                    if ($objModel === null)

-                    {

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

-                    }

+            $strUuid = null;

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

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

-                    // Update the hash of the target folder

-                    Dbafs::updateFolderHashes($strUploadFolder);

+            // Generate the DB entries

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

+            {

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

-                    // Update member avatar

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

-                    $objMember->save();

+                if ($objModel === null)

+                {

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

                 }

-                // Add the session entry (see #6986)

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

-                (

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

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

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

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

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

-                    'uploaded' => true,

-                    'uuid'     => $strUuid

-                );

-

-                // Add a log entry

-                $this->log('File "' . $strUploadFolder . '/' . $file['name'] . '" has been uploaded', __METHOD__, TL_FILES);

+                $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', array('contao' => new ContaoContext(__METHOD__, TL_FILES)));

         }

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

@@ -189,23 +259,75 @@ class Member extends Frontend

      */

     protected function getMaximumUploadSize()

     {

-        // Get the upload_max_filesize from the php.ini