From 3df10a84d0750d1ddf998edbcc0c1b4903402d53 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 24 May 2021 15:28:41 +0200
Subject: [PATCH] Fix group images #3805

---
 .../main/inc/lib/formvalidator/FormValidator.class.php |  2 +-
 public/main/inc/lib/social.lib.php                     |  2 +-
 public/main/inc/lib/usergroup.lib.php                  | 10 ++--------
 public/main/social/group_view.php                      |  3 +--
 public/main/social/groups.php                          | 10 ++++------
 .../main/template/default/social/group_view.html.twig  |  6 ------
 public/main/template/default/social/groups.html.twig   | 10 +---------
 7 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/public/main/inc/lib/formvalidator/FormValidator.class.php b/public/main/inc/lib/formvalidator/FormValidator.class.php
index ed6a845c24..2bf108459b 100644
--- a/public/main/inc/lib/formvalidator/FormValidator.class.php
+++ b/public/main/inc/lib/formvalidator/FormValidator.class.php
@@ -30,7 +30,7 @@ class FormValidator extends HTML_QuickForm
     public function __construct(
         string $name,
         string $method = 'post',
-        string $action = '',
+        ?string $action = '',
         ?string $target = '',
         ?array $attributes = [],
         string $layout = self::LAYOUT_HORIZONTAL,
diff --git a/public/main/inc/lib/social.lib.php b/public/main/inc/lib/social.lib.php
index bf32be3925..e1656bdd68 100644
--- a/public/main/inc/lib/social.lib.php
+++ b/public/main/inc/lib/social.lib.php
@@ -3074,7 +3074,7 @@ class SocialManager extends UserManager
                         GROUP_IMAGE_SIZE_BIG
                     );
 
-                    $result['picture'] = '<img class="img-responsive" src="'.$picture['file'].'" />';
+                    $result['picture'] = '<img class="img-responsive" src="'.$picture.'" />';
                     $group_actions = '<div class="group-more"><a class="btn btn-default" href="groups.php?#tab_browse-2">'.
                         get_lang('See more').'</a></div>';
                     $group_info = '<div class="description"><p>'.cut($result['description'], 120, true)."</p></div>";
diff --git a/public/main/inc/lib/usergroup.lib.php b/public/main/inc/lib/usergroup.lib.php
index d72135181a..224392f1b9 100644
--- a/public/main/inc/lib/usergroup.lib.php
+++ b/public/main/inc/lib/usergroup.lib.php
@@ -4,6 +4,7 @@
 
 use Chamilo\CoreBundle\Entity\Usergroup as UserGroupEntity;
 use Chamilo\CoreBundle\Framework\Container;
+use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 /**
  * Class UserGroup.
@@ -1599,14 +1600,7 @@ class UserGroup extends Model
         return true;
     }
 
-    /**
-     * @param UserGroupEntity $groupId
-     * @param string          $picture
-     * @param string          $cropParameters
-     *
-     * @return bool
-     */
-    public function manageFileUpload($userGroup, $picture, $cropParameters = '')
+    public function manageFileUpload(UserGroupEntity $userGroup, UploadedFile $picture, string $cropParameters = ''): bool
     {
         if ($userGroup) {
             $illustrationRepo = Container::getIllustrationRepository();
diff --git a/public/main/social/group_view.php b/public/main/social/group_view.php
index d18bbba683..96ead17d5c 100644
--- a/public/main/social/group_view.php
+++ b/public/main/social/group_view.php
@@ -349,5 +349,4 @@ $tpl->assign('social_forum', $socialForum);
 $tpl->assign('social_right_content', $social_right_content);
 $tpl->assign('list_members', $listMembers);
 $tpl->assign('list_topic', $listTopic);
-$social_layout = $tpl->get_template('social/group_view.tpl');
-$tpl->display($social_layout);
+$tpl->display($tpl->get_template('social/group_view.html.twig'));
diff --git a/public/main/social/groups.php b/public/main/social/groups.php
index 7af96a8807..dc85e41513 100644
--- a/public/main/social/groups.php
+++ b/public/main/social/groups.php
@@ -319,7 +319,7 @@ if (isset($_GET['view']) && in_array($_GET['view'], $allowed_views)) {
     } else {
         $my_group_content = '<span class="muted">'.get_lang('(none)').'</span>';
     }
-    if ('true' == api_get_setting('allow_students_to_create_groups_in_social')) {
+    if ('true' === api_get_setting('allow_students_to_create_groups_in_social')) {
         $create_group_item =
             '<a class="btn btn-default" href="'.api_get_path(WEB_PATH).'main/social/group_add.php">'.
             get_lang('Create a social group').'</a>';
@@ -377,11 +377,9 @@ if (isset($_GET['view']) && 'mygroups' == $_GET['view']) {
     $show_menu = $_GET['view'];
 }
 
-$social_menu_block = SocialManager::show_social_menu($show_menu);
-$templateName = 'social/groups.tpl';
+//$social_menu_block = SocialManager::show_social_menu($show_menu);
 
 $tpl->setHelp('Groups');
-$tpl->assign('social_menu_block', $social_menu_block);
+//$tpl->assign('social_menu_block', $social_menu_block);
 $tpl->assign('social_right_content', $social_right_content);
-$social_layout = $tpl->get_template($templateName);
-$tpl->display($social_layout);
+$tpl->display($tpl->get_template('social/groups.html.twig'));
diff --git a/public/main/template/default/social/group_view.html.twig b/public/main/template/default/social/group_view.html.twig
index f821fe171a..d286d7482c 100644
--- a/public/main/template/default/social/group_view.html.twig
+++ b/public/main/template/default/social/group_view.html.twig
@@ -4,12 +4,6 @@
 {% block content %}
 {% autoescape false %}
 <div class="row">
-    <div class="col-md-4">
-        {% set avatar %}
-            {% include '@ChamiloCore/Social/user_block.html.twig' %}
-        {% endset %}
-        {{ macro.panel('', avatar ) }}
-    </div>
     <div class="col-md-8">
         <div class="sm-groups-content">
             {{ create_link }}
diff --git a/public/main/template/default/social/groups.html.twig b/public/main/template/default/social/groups.html.twig
index ae90d0547a..ac42ab50ca 100644
--- a/public/main/template/default/social/groups.html.twig
+++ b/public/main/template/default/social/groups.html.twig
@@ -4,15 +4,7 @@
 {% block content %}
 {% autoescape false %}
 <div class="row">
-    <div class="col-md-4">
-        {% set avatar %}
-            {% include '@ChamiloCore/Social/user_block.html.twig' %}
-        {% endset %}
-        {{ macro.panel('', avatar ) }}
-    </div>
-    <div class="col-md-8">
-        {{ social_right_content }}
-    </div>
+    {{ social_right_content }}
 </div>
 {% endautoescape %}
 {% endblock %}