Fix merge with 1.11.x

main/inc/ajax/social.ajax.php

@@ -275,7 +275,7 @@ switch ($action) {
         $userId = isset($_REQUEST['u']) ? (int) $_REQUEST['u'] : api_get_user_id();
         $html = '';
         if ($userId == api_get_user_id()) {
-            $threadList = SocialManager::getThreadList();
+            $threadList = SocialManager::getThreadList($userId);
             $threadIdList = [];
             if (!empty($threadList)) {
                 $threadIdList = array_column($threadList, 'id');

main/inc/lib/course.lib.php

@@ -5779,8 +5779,8 @@ class CourseManager
      */
     public static function getFirstCourseAccessPerSessionAndUser($sessionId, $userId)
     {
-        $sessionId = intval($sessionId);
-        $userId = intval($userId);
+        $sessionId = (int) $sessionId;
+        $userId = (int) $userId;
 
         $table = Database::get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
         $sql = "SELECT * FROM $table

main/inc/lib/document.lib.php

@@ -498,7 +498,7 @@ class DocumentManager
      */
     public static function getSessionFolderFilters($path, $sessionId)
     {
-        $sessionId = intval($sessionId);
+        $sessionId = (int) $sessionId;
         $condition = null;
 
         if (!empty($sessionId)) {

main/inc/lib/exercise.lib.php

@@ -5292,8 +5292,9 @@ EOT;
      * @param int $courseId
      * @param int $sessionId
      *
-     * @return bool
      * @throws \Doctrine\ORM\Query\QueryException
+     *
+     * @return bool
      */
     public static function isQuestionsLimitPerDayReached($userId, $numberOfQuestions, $courseId, $sessionId)
     {

main/inc/lib/exercise_show_functions.lib.php

@@ -190,12 +190,6 @@ class ExerciseShowFunctions
                 echo Security::remove_XSS($answer);
             }
             echo '</td>';
-
-            if (!api_is_allowed_to_edit(null, true) && $feedback_type != EXERCISE_FEEDBACK_TYPE_EXAM) {
-                echo '<td>';
-                $comm = Event::get_comments($id, $questionId);
-                echo '</td>';
-            }
             echo '</tr>';
         }
     }
@@ -413,9 +407,6 @@ class ExerciseShowFunctions
                 echo $comment;
             }
             echo '</td>';
-            if ($ans == 1) {
-                $comm = Event::get_comments($id, $questionId);
-            }
         } else {
             echo '<td>&nbsp;</td>';
         }
@@ -708,9 +699,6 @@ class ExerciseShowFunctions
                 echo '<span style="font-weight: bold; color: '.$color.';">'.nl2br($answerComment).'</span>';
             }
             echo '</td>';
-            if ($ans == 1) {
-                $comm = Event::get_comments($id, $questionId);
-            }
         } else {
             echo '<td>&nbsp;</td>';
         }

main/inc/lib/message.lib.php

@@ -2797,7 +2797,7 @@ class MessageManager
             Display::returnFontAwesomeIcon('thumbs-up', '', true)
                 .PHP_EOL.'<span>'.$countLikes['likes'].'</span>',
             [
-                'title' => get_lang('Like'),
+                'title' => get_lang('VoteLike'),
                 'class' => 'btn btn-default social-like '.($countLikes['user_liked'] ? 'disabled' : ''),
                 'data-status' => 'like',
                 'data-message' => $messageId,
@@ -2809,7 +2809,7 @@ class MessageManager
             Display::returnFontAwesomeIcon('thumbs-down', '', true)
             .PHP_EOL.'<span>'.$countLikes['dislikes'].'</span>',
             [
-                'title' => get_lang('Dislike'),
+                'title' => get_lang('VoteDislike'),
                 'class' => 'btn btn-default social-like '.($countLikes['user_disliked'] ? 'disabled' : ''),
                 'data-status' => 'dislike',
                 'data-message' => $messageId,

main/inc/lib/skill.lib.php

@@ -2187,8 +2187,10 @@ class Skill extends Model
      */
     public static function isAllowed($studentId = 0, $blockPage = true)
     {
+        $allowHR = api_get_setting('allow_hr_skills_management') === 'true';
+
         if (self::isToolAvailable()) {
-            if (api_is_platform_admin()) {
+            if (api_is_platform_admin(false, $allowHR)) {
                 return true;
             }
 

main/inc/lib/social.lib.php

@@ -3030,9 +3030,11 @@ class SocialManager extends UserManager
     }
 
     /**
+     * @param int $userId
+     *
      * @return array
      */
-    public static function getThreadList()
+    public static function getThreadList($userId)
     {
         $forumCourseId = api_get_configuration_value('global_forums_course_id');
 
@@ -3041,7 +3043,7 @@ class SocialManager extends UserManager
         $threads = [];
         if (!empty($forumCourseId)) {
             $courseInfo = api_get_course_info_by_id($forumCourseId);
-            getNotificationsPerUser(api_get_user_id(), true, $forumCourseId);
+            getNotificationsPerUser($userId, true, $forumCourseId);
             $notification = Session::read('forum_notification');
             Session::erase('forum_notification');
 
@@ -3176,9 +3178,11 @@ class SocialManager extends UserManager
         $html .= '<div class="post-date">'.$date.'</div>';
         $html .= '</div>';
         $html .= '<div class="msg-content">';
-        $html .= '<div class="post-attachment thumbnail">';
-        $html .= $postAttachment;
-        $html .= '</div>';
+        if (!empty($postAttachment)) {
+            $html .= '<div class="post-attachment thumbnail">';
+            $html .= $postAttachment;
+            $html .= '</div>';
+        }
         $html .= '<div>'.Security::remove_XSS($message['content']).'</div>';
         $html .= '</div>';
         $html .= '</div>'; // end mediaPost
@@ -3188,4 +3192,142 @@ class SocialManager extends UserManager
 
         return $html;
     }
+
+    /**
+     * @param int $userId
+     *
+     * @return string
+     */
+    public static function getGroupBlock($userId)
+    {
+        $threadList = self::getThreadList($userId);
+        $userGroup = new UserGroup();
+
+        $forumCourseId = api_get_configuration_value('global_forums_course_id');
+        $courseInfo = null;
+        if (!empty($forumCourseId)) {
+            $courseInfo = api_get_course_info_by_id($forumCourseId);
+        }
+
+        $social_group_block = '';
+        if (!empty($courseInfo)) {
+            if (!empty($threadList)) {
+                $social_group_block .= '<div class="list-group">';
+                foreach ($threadList as $group) {
+                    $social_group_block .= ' <li class="list-group-item">';
+                    $social_group_block .= $group['name'];
+                    $social_group_block .= '</li>';
+                }
+                $social_group_block .= '</div>';
+            }
+
+            $social_group_block .= Display::url(
+                get_lang('SeeAllCommunities'),
+                api_get_path(WEB_CODE_PATH).'forum/index.php?cidReq='.$courseInfo['code']
+            );
+
+            if (!empty($social_group_block)) {
+                $social_group_block = Display::panelCollapse(
+                    get_lang('MyCommunities'),
+                    $social_group_block,
+                    'sm-groups',
+                    null,
+                    'grups-acordion',
+                    'groups-collapse'
+                );
+            }
+        } else {
+            // Load my groups
+            $results = $userGroup->get_groups_by_user($userId,
+                [
+                    GROUP_USER_PERMISSION_ADMIN,
+                    GROUP_USER_PERMISSION_READER,
+                    GROUP_USER_PERMISSION_MODERATOR,
+                    GROUP_USER_PERMISSION_HRM,
+                ]
+            );
+
+            $myGroups = [];
+            if (!empty($results)) {
+                foreach ($results as $result) {
+                    $id = $result['id'];
+                    $result['description'] = Security::remove_XSS($result['description'], STUDENT, true);
+                    $result['name'] = Security::remove_XSS($result['name'], STUDENT, true);
+
+                    $group_url = "group_view.php?id=$id";
+
+                    $link = Display::url(
+                        api_ucwords(cut($result['name'], 40, true)),
+                        $group_url
+                    );
+
+                    $result['name'] = $link;
+
+                    $picture = $userGroup->get_picture_group(
+                        $id,
+                        $result['picture'],
+                        null,
+                        GROUP_IMAGE_SIZE_BIG
+                    );
+
+                    $result['picture'] = '<img class="img-responsive" src="'.$picture['file'].'" />';
+                    $group_actions = '<div class="group-more"><a class="btn btn-default" href="groups.php?#tab_browse-2">'.
+                        get_lang('SeeMore').'</a></div>';
+                    $group_info = '<div class="description"><p>'.cut($result['description'], 120, true)."</p></div>";
+                    $myGroups[] = [
+                        'url' => Display::url(
+                            $result['picture'],
+                            $group_url
+                        ),
+                        'name' => $result['name'],
+                        'description' => $group_info.$group_actions,
+                    ];
+                }
+
+                $social_group_block .= '<div class="list-group">';
+                foreach ($myGroups as $group) {
+                    $social_group_block .= ' <li class="list-group-item">';
+                    $social_group_block .= $group['name'];
+                    $social_group_block .= '</li>';
+                }
+                $social_group_block .= '</div>';
+
+                $form = new FormValidator(
+                    'find_groups_form',
+                    'get',
+                    api_get_path(WEB_CODE_PATH).'social/search.php?search_type=2',
+                    null,
+                    null,
+                    FormValidator::LAYOUT_BOX_NO_LABEL
+                );
+                $form->addHidden('search_type', 2);
+
+                $form->addText(
+                    'q',
+                    get_lang('Search'),
+                    false,
+                    [
+                        'aria-label' => get_lang('Search'),
+                        'custom' => true,
+                        'placeholder' => get_lang('Search'),
+                    ]
+                );
+
+                $social_group_block .= $form->returnForm();
+
+                if (!empty($social_group_block)) {
+                    $social_group_block = Display::panelCollapse(
+                        get_lang('MyGroups'),
+                        $social_group_block,
+                        'sm-groups',
+                        null,
+                        'grups-acordion',
+                        'groups-collapse'
+                    );
+                }
+            }
+        }
+
+        return $social_group_block;
+    }
 }