fixed avatar image path determination

zikula-modules · May 31, 2020 · 7b6ad9e · craigh · May 31, 2020 · Guite
1 parent eab3353
commit 7b6ad9e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/Bridge/ProfileModuleBridge.php b/Bridge/ProfileModuleBridge.php
@@ -16,6 +16,7 @@
 use InvalidArgumentException;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\Routing\RouterInterface;
+use Zikula\Bundle\CoreBundle\HttpKernel\ZikulaHttpKernelInterface;
 use Zikula\ExtensionsModule\Api\ApiInterface\VariableApiInterface;
 use Zikula\ProfileModule\Helper\GravatarHelper;
 use Zikula\ProfileModule\ProfileConstant;
@@ -27,6 +28,11 @@
 
 class ProfileModuleBridge implements ProfileModuleInterface
 {
+    /**
+     * @var ZikulaHttpKernelInterface
+     */
+    private $kernel;
+
     /**
      * @var RouterInterface
      */
@@ -63,6 +69,7 @@ class ProfileModuleBridge implements ProfileModuleInterface
     private $prefix;
 
     public function __construct(
+        ZikulaHttpKernelInterface $kernel,
         RouterInterface $router,
         RequestStack $requestStack,
         VariableApiInterface $variableApi,
@@ -71,6 +78,7 @@ public function __construct(
         GravatarHelper $gravatarHelper,
         $prefix
     ) {
+        $this->kernel = $kernel;
         $this->router = $router;
         $this->requestStack = $requestStack;
         $this->variableApi = $variableApi;
@@ -122,7 +130,7 @@ public function getAvatar($uid = null, array $parameters = []): string
 
         $avatarUrl = '';
         if (!in_array($avatar, ['blank.gif', 'blank.jpg'], true)) {
-            if (isset($avatar) && !empty($avatar) && $avatar !== $gravatarImage && file_exists($avatarPath . '/' . $avatar)) {
+            if (isset($avatar) && !empty($avatar) && $avatar !== $gravatarImage && file_exists($this->kernel->getProjectDir() . '/' . $avatarPath . '/' . $avatar)) {
                 $request = $this->requestStack->getCurrentRequest();
                 if (null !== $request) {
                     $avatarUrl = $request->getSchemeAndHttpHost() . $request->getBasePath() . '/' . $avatarPath . '/' . $avatar;

diff --git a/Controller/ConfigController.php b/Controller/ConfigController.php
@@ -17,6 +17,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Zikula\Bundle\CoreBundle\Controller\AbstractController;
+use Zikula\Bundle\CoreBundle\HttpKernel\ZikulaHttpKernelInterface;
 use Zikula\ExtensionsModule\Api\ApiInterface\VariableApiInterface;
 use Zikula\PermissionsModule\Annotation\PermissionCheck;
 use Zikula\ProfileModule\Form\Type\ConfigType;
@@ -35,8 +36,11 @@ class ConfigController extends AbstractController
      * @Theme("admin")
      * @Template("@ZikulaProfileModule/Config/config.html.twig")
      */
-    public function configAction(Request $request, VariableApiInterface $variableApi): array
-    {
+    public function configAction(
+        Request $request,
+        ZikulaHttpKernelInterface $kernel,
+        VariableApiInterface $variableApi
+    ): array {
         $modVars = $this->getVars();
 
         $varsInUsersModule = [
@@ -72,8 +76,8 @@ public function configAction(Request $request, VariableApiInterface $variableApi
 
         $pathWarning = '';
         if (true === $modVars['allowUploads']) {
-            $path = $modVars[ProfileConstant::MODVAR_AVATAR_IMAGE_PATH];
-            if (!(file_exists($path) && is_readable($path))) {
+            $path = $kernel->getProjectDir() . '/' . $modVars[ProfileConstant::MODVAR_AVATAR_IMAGE_PATH];
+            if (!file_exists($path) || !is_readable($path)) {
                 $pathWarning = $this->trans('Warning! The avatar directory does not exist or is not readable for the webserver.');
             } elseif (!is_writable($path)) {
                 $pathWarning = $this->trans('Warning! The webserver cannot write to the avatar directory.');

diff --git a/Form/Type/AvatarType.php b/Form/Type/AvatarType.php
@@ -18,6 +18,7 @@
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\FileType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Zikula\Bundle\CoreBundle\HttpKernel\ZikulaHttpKernelInterface;
 use Zikula\ExtensionsModule\Api\ApiInterface\VariableApiInterface;
 use Zikula\UsersModule\Constant as UsersConstant;
 
@@ -33,10 +34,12 @@ class AvatarType extends AbstractType
      */
     private $avatarPath;
 
-    public function __construct(VariableApiInterface $variableApi)
-    {
+    public function __construct(
+        ZikulaHttpKernelInterface $kernel,
+        VariableApiInterface $variableApi
+    ) {
         $this->modVars = $variableApi->getAll('ZikulaProfileModule');
-        $this->avatarPath = $variableApi->get(UsersConstant::MODNAME, 'avatarpath', 'public/uploads/avatar');
+        $this->avatarPath = $kernel->getProjectDir() . '/' . $variableApi->get(UsersConstant::MODNAME, 'avatarpath', 'public/uploads/avatar');
     }
 
     public function configureOptions(OptionsResolver $resolver)

diff --git a/Menu/ExtensionMenu.php b/Menu/ExtensionMenu.php
@@ -102,8 +102,7 @@ private function getAdmin(): ?ItemInterface
         if ($this->permissionApi->hasPermission($this->getBundleName().'::', '::', ACCESS_ADD)) {
             $menu->addChild('Create new property', [
                 'route' => 'zikulaprofilemodule_property_edit',
-            ])->setAttribute('icon', 'fas fa-plus')
-            ->setLinkAttribute('class', 'text-success');
+            ])->setAttribute('icon', 'fas fa-plus');
         }
         if ($this->permissionApi->hasPermission($this->getBundleName().'::', '::', ACCESS_ADMIN)) {
             $menu->addChild('Settings', [