';
+ } else {
+ $iconStatus = '
';
+ }
+ } else {
+ if ($_user['status'] == 1) {
+ if ($isAdmin) {
+ $iconStatus = '
';
+ } else {
+ $iconStatus = '
';
+ }
+ }
+ }
+
+ $post['user_data'] .= '';
- $html .= '
';
-
- echo $html;
- $count++;
-}
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index b9ab875568..9b7adbebe0 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -1588,6 +1588,12 @@ function _api_format_user($user, $add_password = false, $loadAvatars = true)
$result['profile_url'] = api_get_path(WEB_CODE_PATH).'social/profile.php?u='.$user_id;
+ $hasCertificates = Certificate::getCertificateByUser($user_id);
+ $result['has_certificates'] = 0;
+ if (!empty($hasCertificates)) {
+ $result['has_certificates'] = 1;
+ }
+
// Send message link
$sendMessage = api_get_path(WEB_AJAX_PATH).'user_manager.ajax.php?a=get_user_popup&user_id='.$user_id;
$result['complete_name_with_message_link'] = Display::url(
diff --git a/main/inc/lib/certificate.lib.php b/main/inc/lib/certificate.lib.php
index 6e97b89c69..20a92fd98e 100755
--- a/main/inc/lib/certificate.lib.php
+++ b/main/inc/lib/certificate.lib.php
@@ -842,4 +842,24 @@ class Certificate extends Model
false
);
}
+
+ /**
+ * @param int $userId
+ *
+ * @return array
+ */
+ public static function getCertificateByUser($userId)
+ {
+ $userId = (int) $userId;
+ if (empty($userId)) {
+ return [];
+ }
+
+ $table = Database::get_main_table(TABLE_MAIN_GRADEBOOK_CERTIFICATE);
+ $sql = "SELECT * FROM $table
+ WHERE user_id= $userId";
+ $rs = Database::query($sql);
+
+ return Database::store_result($rs, 'ASSOC');
+ }
}
diff --git a/main/template/default/forum/list.html.twig b/main/template/default/forum/list.html.twig
index 045bc619b5..ffcd5681a1 100644
--- a/main/template/default/forum/list.html.twig
+++ b/main/template/default/forum/list.html.twig
@@ -1,90 +1,157 @@
{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
-{% import '@ChamiloTheme/Macros/box.html.twig' as macro %}
+{% import '@ChamiloTheme/Macros/box.html.twig' as display %}
{% block content %}
{% autoescape false %}
+ {% if 'translate_html'|api_get_configuration_value %}
+
+ {% endif %}
+
+ {{ form_content }}
+ {{ search_filter }}
+
+ {% set fold_forum_categories = 'forum_fold_categories'|api_get_configuration_value %}
+
+ {% if data is not empty %}
+ {% for item in data %}
+
+ {% set category_language_array = [] %}
+ {% set category_language = '' %}
+ {% for extra_field in item.extra_fields %}
+ {% if extra_field.variable == 'language' %}
+ {% set category_language_array = extra_field.value | split(';') %}
+ {% set category_language = extra_field.value | replace({';': ' ' }) %}
+ {% endif %}
+ {% endfor %}
- ';
- $html .= '
';
- $html .= '';
- $html .= '
';
- $html .= '';
- $html .= '
';
-
- $html .= '';
- $username = '';
- if (isset($post['username'])) {
- $username = sprintf(get_lang('LoginX'), $post['username']);
- }
- if (empty($posterId)) {
- $name = $post['poster_name'];
- } else {
- $name = $post['complete_name'];
- }
-
- if ($origin != 'learnpath') {
- if ($allowUserImageForum) {
- $html .= '
';
-
- // note: this can be removed here because it will be displayed in the tree
- if (isset($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']][$post['post_id']]) &&
- !empty($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']][$post['post_id']]) &&
- !empty($whatsnew_post_info[$_GET['forum']][$post['thread_id']])
- ) {
- $post_image = Display::return_icon('forumpostnew.gif');
- } else {
- $post_image = Display::return_icon('forumpost.gif');
- }
-
- if ($post['post_notification'] == '1' && $post['poster_id'] == $userId) {
- $post_image .= Display::return_icon(
- 'forumnotification.gif',
- get_lang('YouWillBeNotified')
- );
- }
-
- $html .= ''.display_user_image($posterId, $name, $origin).'
';
- }
-
- $html .= Display::tag(
- 'h4',
- display_user_link($posterId, $name, $origin, $username),
- ['class' => 'title-username']
- );
- } else {
- if ($allowUserImageForum) {
- $html .= ''.display_user_image($posterId, $name, $origin).'
';
- }
-
- $html .= Display::tag(
- 'p',
- $name,
- [
- 'title' => api_htmlentities($username, ENT_QUOTES),
- 'class' => 'lead',
- ]
- );
- }
-
- if ($origin != 'learnpath') {
- $html .= Display::tag(
- 'p',
- Display::dateToStringAgoAndLongDate($post['post_date']),
- ['class' => 'post-date']
- );
- } else {
- $html .= Display::tag(
- 'p',
- Display::dateToStringAgoAndLongDate($post['post_date']),
- ['class' => 'text-muted']
- );
- }
-
- // get attach id
- $attachment_list = get_attachment($post['post_id']);
- $id_attach = !empty($attachment_list) ? $attachment_list['iid'] : '';
-
- $iconEdit = '';
- $editButton = '';
- // The user who posted it can edit his thread only if the course admin allowed this in the properties of the forum
- // The course admin him/herself can do this off course always
-
- $tutorGroup = GroupManager::is_tutor_of_group(api_get_user_id(), $groupInfo);
-
- if ((isset($groupInfo['iid']) && $tutorGroup) ||
- ($current_forum['allow_edit'] == 1 && $posterId == $userId) ||
- (api_is_allowed_to_edit(false, true) &&
- !(api_is_session_general_coach() && $current_forum['session_id'] != $sessionId))
- ) {
- if ($locked == false && postIsEditableByStudent($current_forum, $post)) {
- $editUrl = api_get_path(WEB_CODE_PATH).'forum/editpost.php?'.api_get_cidreq();
- $editUrl .= "&forum=$clean_forum_id&thread=$clean_thread_id&post={$post['post_id']}&id_attach=$id_attach";
-
- $iconEdit .= ""
- .Display::return_icon('edit.png', get_lang('Edit'), [], ICON_SIZE_SMALL)
- ."";
-
- $editButton = Display::toolbarButton(
- get_lang('Edit'),
- $editUrl,
- 'pencil',
- 'default'
- );
- }
- }
-
- if ((isset($groupInfo['iid']) && $tutorGroup) ||
- api_is_allowed_to_edit(false, true) &&
- !(api_is_session_general_coach() && $current_forum['session_id'] != $sessionId)
- ) {
- if ($locked == false) {
- $deleteUrl = api_get_self().'?'.api_get_cidreq().'&'.http_build_query([
- 'forum' => $clean_forum_id,
- 'thread' => $clean_thread_id,
- 'action' => 'delete',
- 'content' => 'post',
- 'id' => $post['post_id'],
- ]);
- $iconEdit .= Display::url(
- Display::return_icon('delete.png', get_lang('Delete'), [], ICON_SIZE_SMALL),
- $deleteUrl,
- [
- 'onclick' => "javascript:if(!confirm('"
- .addslashes(api_htmlentities(get_lang('DeletePost'), ENT_QUOTES))
- ."')) return false;",
- 'id' => "delete-post-{$post['post_id']}",
- ]
- );
- }
- }
-
- if (api_is_allowed_to_edit(false, true) &&
- !(
- api_is_session_general_coach() &&
- $current_forum['session_id'] != $sessionId
- )
- ) {
- $iconEdit .= return_visible_invisible_icon(
- 'post',
- $post['post_id'],
- $post['visible'],
- [
- 'forum' => $clean_forum_id,
- 'thread' => $clean_thread_id,
- ]
- );
-
- if ($count > 0) {
- $iconEdit .= "".Display::return_icon('move.png', get_lang('MovePost'), [], ICON_SIZE_SMALL)."";
- }
- }
-
- $userCanQualify = $currentThread['thread_peer_qualify'] == 1 && $post['poster_id'] != $userId;
- if (api_is_allowed_to_edit(null, true)) {
- $userCanQualify = true;
- }
-
- if (empty($currentThread['thread_qualify_max'])) {
- $userCanQualify = false;
- }
-
- if ($userCanQualify) {
- if ($count > 0) {
- $current_qualify_thread = showQualify(
- '1',
- $posterId,
- $_GET['thread']
- );
- if ($locked == false) {
- $iconEdit .= "".Display::return_icon('quiz.png', get_lang('Qualify'))."";
- }
- }
- }
-
- $statusIcon = getPostStatus($current_forum, $post);
- if (!empty($iconEdit)) {
- $html .= '';
- } else {
- if (!empty(strip_tags($statusIcon))) {
- $html .= '';
- }
- }
-
- $buttonReply = '';
- $buttonQuote = '';
- $waitingValidation = '';
-
- if (($current_forum_category && $current_forum_category['locked'] == 0) &&
- $current_forum['locked'] == 0 && $current_thread['locked'] == 0 || api_is_allowed_to_edit(false, true)
- ) {
- if ($userId || ($current_forum['allow_anonymous'] == 1 && !$userId)) {
- if (!api_is_anonymous() && api_is_allowed_to_session_edit(false, true)) {
- $buttonReply = Display::toolbarButton(
- get_lang('ReplyToMessage'),
- 'reply.php?'.api_get_cidreq().'&'.http_build_query([
- 'forum' => $clean_forum_id,
- 'thread' => $clean_thread_id,
- 'post' => $post['post_id'],
- 'action' => 'replymessage',
- ]),
- 'reply',
- 'primary',
- ['id' => "reply-to-post-{$post['post_id']}"]
- );
-
- $buttonQuote = Display::toolbarButton(
- get_lang('QuoteMessage'),
- 'reply.php?'.api_get_cidreq().'&'.http_build_query([
- 'forum' => $clean_forum_id,
- 'thread' => $clean_thread_id,
- 'post' => $post['post_id'],
- 'action' => 'quote',
- ]),
- 'quote-left',
- 'success',
- ['id' => "quote-post-{$post['post_id']}"]
- );
-
- if ($current_forum['moderated'] && !api_is_allowed_to_edit(false, true)) {
- if (empty($post['status']) || $post['status'] == CForumPost::STATUS_WAITING_MODERATION) {
- $buttonReply = '';
- $buttonQuote = '';
- }
- }
- }
- }
- } else {
- $closedPost = '';
- if ($current_forum_category && $current_forum_category['locked'] == 1) {
- $closedPost = Display::tag(
- 'div',
- ' '.get_lang('ForumcategoryLocked'),
- ['class' => 'alert alert-warning post-closed']
- );
- }
- if ($current_forum['locked'] == 1) {
- $closedPost = Display::tag(
- 'div',
- ' '.get_lang('ForumLocked'),
- ['class' => 'alert alert-warning post-closed']
- );
- }
- if ($current_thread['locked'] == 1) {
- $closedPost = Display::tag(
- 'div',
- ' '.get_lang('ThreadLocked'),
- ['class' => 'alert alert-warning post-closed']
- );
- }
-
- $html .= $closedPost;
- }
- $html .= '';
- // The post title
-
- $titlePost = Display::tag('h3', $post['post_title'], ['class' => 'forum_post_title']);
- $html .= Display::tag('div', $titlePost, ['class' => 'post-header']);
-
- // the post body
- $html .= Display::tag('div', $post['post_text'], ['class' => 'post-body']);
- $html .= '
';
- $html .= '';
- $html .= '
';
-
- // The post has been displayed => it can be removed from the what's new array
- unset($whatsnew_post_info[$current_forum['forum_id']][$current_thread['thread_id']][$post['post_id']]);
- unset($_SESSION['whatsnew_post_info'][$current_forum['forum_id']][$current_thread['thread_id']][$post['post_id']]);
-
- $html .= '';
- // The check if there is an attachment
- $attachment_list = getAllAttachment($post['post_id']);
- if (!empty($attachment_list) && is_array($attachment_list)) {
- foreach ($attachment_list as $attachment) {
- $user_filename = $attachment['filename'];
- $html .= Display::return_icon('attachment.gif', get_lang('Attachment'));
- $html .= ' '.$user_filename.' ';
- $html .= ''.$attachment['comment'].'';
- if (($current_forum['allow_edit'] == 1 && $post['user_id'] == $userId) ||
- (api_is_allowed_to_edit(false, true) && !(api_is_session_general_coach() && $current_forum['session_id'] != $sessionId))
- ) {
- $html .= ' '
- .Display::return_icon('delete.gif', get_lang('Delete')).'
'; - } - } - } - - $html .= '
';
- $html .= ''; - } - } - } - - $html .= '
';
- $html .= "$editButton $buttonReply $buttonQuote $waitingValidation";
- $html .= '
';
- $html .= '
- {{ item.description }}
+ {% if fold_forum_categories %}
+ {% set panel_icon %}
+
+ {{ 'forum_blue.png'|img(32) }}
+
+ {% endset %}
+
+ {% set panel_title %}
+ {{ item.title }}{{ item.icon_session }}
+ {% endset %}
+ {% else %}
+ {% set panel_title %}
+
+ {{ 'forum_blue.png'|img(32) }}
+ {{ item.title }}{{ item.icon_session }}
+
+
+ {{ item.tools }}
- {% for subitem in item.forums %}
- {% set content %}
-
-
+ {% endif %}
+
+ {% if forum_actions %}
+
-
-
- 
-
-
-
- {{ subitem.title }}
- {% if subitem.forum_of_group != 0 %}
-
- {{ "forum.png"|img(22) }} {{ "GoTo"|get_lang }} {{ subitem.forum_group_title }}
+ {% endset %}
+ {% endif %}
+
+ {% set panel_content %}
+
{% endautoescape %}
{% endblock %}
diff --git a/main/template/default/forum/posts.html.twig b/main/template/default/forum/posts.html.twig
new file mode 100644
index 0000000000..ce975d567f
--- /dev/null
+++ b/main/template/default/forum/posts.html.twig
@@ -0,0 +1,59 @@
+{% extends "@ChamiloTheme/Layout/layout_one_col.html.twig" %}
+{% import '@ChamiloTheme/Macros/box.html.twig' as display %}
+
+{% block content %}
+ {% autoescape false %}
+ {% if origin == 'learnpath' %}
+
- {{ subitem.title }}
- {% if subitem.forum_of_group != 0 %}
-
- {{ "forum.png"|img(22) }} {{ "GoTo"|get_lang }} {{ subitem.forum_group_title }}
+ {% endset %}
+ {% endif %}
+
+ {% set panel_content %}
+
+ {{ item.description }}
+
+ {% for subitem in item.forums %}
+
+
+
+
+
+
+
+ {% if subitem.forum_image is not empty %}
+ 
+ {% else %}
+ {% if subitem.forum_of_group == 0 %}
+ {{ 'forum_group.png'|img(48) }}
+ {% else %}
+ {{ 'forum.png'|img(48) }}
+ {% endif %}
+ {% endif %}
- {% endif %}
- {{ subitem.icon_session }}
-
+ {{ 'ForumThreads'| get_lang }}: {{ subitem.number_threads }}
+
+
+
+
-
-
- - {{ 'ForumThreads'| get_lang }}: {{ subitem.number_threads }}
+
+ {{ 'forum_yellow.png'|img(32) }}
+ {{ subitem.title }}
+ {% if subitem.forum_of_group != 0 %}
+
+ {{ "forum.png"|img(22) }} {{ "GoTo"|get_lang }} {{ subitem.forum_group_title }}
+
+ {% endif %}
+ {{ subitem.icon_session }}
+
{% if subitem.last_poster_id is not empty %}
- -
+
{{ subitem.last_poster_date }}
+ « {{ subitem.last_post_title }} »
{{ "By"|get_lang }}
{{ subitem.last_poster_user }}
-
+
{% endif %}
-
+
+ {{ subitem.description }}
+
+
+ {{ subitem.last_post_text }}
+
+ {{ subitem.alert }}
+ {% if subitem.moderation is not empty %}
+
+ {{ "PostsPendingModeration"|get_lang }}: {{ subitem.moderation }}
+
+ {% endif %}
+
-
- {{ subitem.description }}
-
- {{ subitem.alert }}
-
- {% if subitem.moderation is not empty %}
-
- {{ "PostsPendingModeration"|get_lang }}: {{ subitem.moderation }}
-
- {% endif %}
- {% endset %}
- {% set forum_id = 'forum-'~ subitem.id %}
-
- {{ macro.panel_box(forum_id,'', content ) }}
- {% endfor %}
-
+
+ {% endfor %}
+ {% endset %}
+
+
+ {% if fold_forum_categories %}
+ {{ display.collapse('category_' ~ item.id, panel_title, panel_content, false, fold_forum_categories, item.tools, panel_icon ) }}
+ {% else %}
+
+ {{ display.panel(panel_title, panel_content) }}
+ {% endif %}
-
- {% endfor %}
+ {% endfor %}
{% else %}
{{ 'NoForumInThisCategory'|get_lang }}
{% endif %}
-
+
+ {% endfor %}
+ {% endset %}
+
+
+
+
+
-
+
+
+ {% if subitem.forum_image is not empty %}
+
+ {% else %}
+ {% if subitem.forum_of_group == 0 %}
+ {{ 'forum_group.png'|img(48) }}
+ {% else %}
+ {{ 'forum.png'|img(48) }}
+ {% endif %}
+ {% endif %}
- {% endif %}
- {{ subitem.icon_session }}
-
+
+
+ {{ 'ForumThreads'| get_lang }}: {{ subitem.number_threads }}
+
+
-
-
-
-
- {{ 'ForumThreads'| get_lang }}: {{ subitem.number_threads }} +
-
+ {{ subitem.last_poster_date }} + « {{ subitem.last_post_title }} » {{ "By"|get_lang }} {{ subitem.last_poster_user }} - +{% endif %} -
+ {{ 'forum_yellow.png'|img(32) }} + {{ subitem.title }} + {% if subitem.forum_of_group != 0 %} + + {{ "forum.png"|img(22) }} {{ "GoTo"|get_lang }} {{ subitem.forum_group_title }} + + {% endif %} + {{ subitem.icon_session }} +
{% if subitem.last_poster_id is not empty %} -
+ {{ subitem.description }}
+
+
+ {{ subitem.last_post_text }}
+
+ {{ subitem.alert }}
+ {% if subitem.moderation is not empty %}
+
+ {{ "PostsPendingModeration"|get_lang }}: {{ subitem.moderation }}
+
+ {% endif %}
+
- {{ subitem.description }}
-
- {{ subitem.alert }}
-
- {% if subitem.moderation is not empty %}
-
- {{ "PostsPendingModeration"|get_lang }}: {{ subitem.moderation }}
-
- {% endif %}
- {% endset %}
- {% set forum_id = 'forum-'~ subitem.id %}
-
- {{ macro.panel_box(forum_id,'', content ) }}
- {% endfor %}
-
+ {% if fold_forum_categories %}
+ {{ display.collapse('category_' ~ item.id, panel_title, panel_content, false, fold_forum_categories, item.tools, panel_icon ) }}
+ {% else %}
+
+ {{ display.panel(panel_title, panel_content) }}
+ {% endif %}
-
+ {{ forum_actions }}
+
+ {% endif %}
+
+ {% for post in posts %}
+ {% set post_data %}
+
+
+
+ {{ post.user_data }}
+
+ {% set highlight = '' %}
+ {% if post.current %}
+ {% set highlight = 'alert alert-danger' %}
+ {% endif %}
+
+ {% set highlight_revision = '' %}
+ {% if post.is_a_revision %}
+ {% set highlight_revision = 'forum_revision' %}
+ {% endif %}
+
+
+ {{ post.post_title }}
+
+ {% if post.is_a_revision %}
+ {{ 'ProposedRevision' | get_lang }} {{ post.flag_revision }}
+ {% endif %}
+
+
+
+ {{ post.post_data }}
+
+
+ {{ post.post_attachments }}
+
+
+
+ {% endset %}
+
+
+ {{ post.post_buttons }}
+
+
+ {{ display.panel('', post_data ) }}
+
+ {% endfor %}
+ {% endautoescape %}
+{% endblock %}
diff --git a/src/ThemeBundle/Resources/views/Macros/box.html.twig b/src/ThemeBundle/Resources/views/Macros/box.html.twig
index 2527f32348..4e2fb688fe 100644
--- a/src/ThemeBundle/Resources/views/Macros/box.html.twig
+++ b/src/ThemeBundle/Resources/views/Macros/box.html.twig
@@ -54,16 +54,27 @@
{% endmacro %}
-{% macro collapse(name, title, content, list = false, expanded = 'true') %}
+{% macro collapse(name, title, content, list = false, expanded = 'true', title_right = '', title_icons = '') %}
{% autoescape false %}
+
+ {% if title_icons %}
+ {{ title_icons }}
+ {% endif %}
+
{{ title }}
+ + {% if title_right %} +
+ {{ title_right }}
+
+ {% endif %}