Skip to content

Commit

Permalink
Remove wrong post count number see BT#10757
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmontoyaa
jmontoyaa committed Jan 27, 2016
1 parent 3c8ecea commit 3da7cdd
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 92 deletions.
112 changes: 32 additions & 80 deletions main/forum/forumfunction.inc.php
View file
Expand Up @@ -1450,21 +1450,18 @@ function get_forums(
) {
$course_info = api_get_course_info($course_code);

$table_users = Database :: get_main_table(TABLE_MAIN_USER);
$table_forums = Database :: get_course_table(TABLE_FORUM);
$table_threads = Database :: get_course_table(TABLE_FORUM_THREAD);
$table_posts = Database :: get_course_table(TABLE_FORUM_POST);
$table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);

// GETTING ALL THE FORUMS

// Condition for the session
if (empty($sessionId)) {
$session_id = api_get_session_id();
} else {
$session_id = $sessionId;
}

$sessionIdLink = ($session_id === 0) ? '' : 'AND threads.session_id = item_properties.session_id';

$condition_session = api_get_session_condition(
Expand Down Expand Up @@ -1505,7 +1502,7 @@ function get_forums(
INNER JOIN ".$table_item_property." item_properties
ON (
threads.thread_id=item_properties.ref AND
threads.c_id = item_properties.c_id
threads.c_id = item_properties.c_id
$sessionIdLink
)
WHERE
Expand All @@ -1515,20 +1512,6 @@ function get_forums(
item_properties.c_id = $course_id
GROUP BY threads.forum_id";

// Select the number of posts of the forum (post that are visible and that are in a thread that is visible).
$sql3 = "SELECT count(*) AS number_of_posts, posts.forum_id
FROM $table_posts posts, $table_threads threads, ".$table_item_property." item_properties
WHERE
posts.visible=1 AND
posts.thread_id=threads.thread_id AND
threads.thread_id=item_properties.ref AND
threads.session_id = item_properties.session_id AND
item_properties.visibility=1 AND
item_properties.tool='".TOOL_FORUM_THREAD."' AND
threads.c_id = $course_id AND
posts.c_id = $course_id AND
item_properties.c_id = $course_id
GROUP BY threads.forum_id";

// Course Admin
if (api_is_allowed_to_edit()) {
Expand All @@ -1554,7 +1537,7 @@ function get_forums(
INNER JOIN ".$table_item_property." item_properties
ON (
threads.thread_id=item_properties.ref AND
threads.c_id = item_properties.c_id
threads.c_id = item_properties.c_id
$sessionIdLink
)
WHERE
Expand All @@ -1563,19 +1546,6 @@ function get_forums(
threads.c_id = $course_id AND
item_properties.c_id = $course_id
GROUP BY threads.forum_id";
// Select the number of posts of the forum.
$sql3 = "SELECT count(*) AS number_of_posts, posts.forum_id
FROM $table_posts posts, $table_threads threads, ".$table_item_property." item_properties
WHERE
posts.thread_id=threads.thread_id AND
threads.thread_id=item_properties.ref AND
threads.session_id = item_properties.session_id AND
item_properties.visibility=1 AND
item_properties.tool='".TOOL_FORUM_THREAD."' AND
posts.c_id = $course_id AND
threads.c_id = $course_id AND
item_properties.c_id = $course_id
GROUP BY threads.forum_id";
}
} else {
// GETTING ONE SPECIFIC FORUM
Expand Down Expand Up @@ -1605,31 +1575,6 @@ function get_forums(
forum_id = ".intval($id)." AND
c_id = $course_id
GROUP BY forum_id";

// Select the number of posts of the forum.
$sql3 = "SELECT count(*) AS number_of_posts, forum_id
FROM $table_posts
WHERE
forum_id = ".intval($id)." AND
c_id = $course_id
GROUP BY forum_id";

// Select the last post and the poster (note: this is probably no longer needed).
$sql4 = "SELECT
post.post_id,
post.forum_id,
post.poster_id,
post.poster_name,
post.post_date,
users.lastname,
users.firstname
FROM $table_posts post, $table_users users
WHERE
forum_id = ".intval($id)." AND
post.poster_id=users.user_id AND
post.c_id = $course_id
GROUP BY post.forum_id
ORDER BY post.post_id ASC";
}

// Handling all the forum information.
Expand All @@ -1653,25 +1598,16 @@ function get_forums(
}
}

// Handling the postcount information.
$result3 = Database::query($sql3);
while ($row3 = Database::fetch_array($result3)) {
if ($id == '') {
// This is needed because sql3 takes also the deleted forums into account.
if (array_key_exists($row3['forum_id'], $forum_list)) {
$forum_list[$row3['forum_id']]['number_of_posts'] = $row3['number_of_posts'];
}
} else {
$forum_list['number_of_posts'] = $row3['number_of_posts'];
}
}

/* Finding the last post information
(last_post_id, last_poster_id, last_post_date, last_poster_name, last_poster_lastname, last_poster_firstname)*/
if ($id == '') {
if (is_array($forum_list)) {
foreach ($forum_list as $key => $value) {
$last_post_info_of_forum = get_last_post_information($key, api_is_allowed_to_edit(), $course_id);
$last_post_info_of_forum = get_last_post_information(
$key,
api_is_allowed_to_edit(),
$course_id
);
$forum_list[$key]['last_post_id'] = $last_post_info_of_forum['last_post_id'];
$forum_list[$key]['last_poster_id'] = $last_post_info_of_forum['last_poster_id'];
$forum_list[$key]['last_post_date'] = $last_post_info_of_forum['last_post_date'];
Expand All @@ -1683,7 +1619,11 @@ function get_forums(
$forum_list = array();
}
} else {
$last_post_info_of_forum = get_last_post_information($id, api_is_allowed_to_edit(), $course_id);
$last_post_info_of_forum = get_last_post_information(
$id,
api_is_allowed_to_edit(),
$course_id
);
$forum_list['last_post_id'] = $last_post_info_of_forum['last_post_id'];
$forum_list['last_poster_id'] = $last_post_info_of_forum['last_poster_id'];
$forum_list['last_post_date'] = $last_post_info_of_forum['last_post_date'];
Expand Down Expand Up @@ -2767,7 +2707,8 @@ function show_add_post_form($current_forum, $forum_setting, $action = '', $id =
empty($values['weight_calification'])
) {
Display::display_error_message(
get_lang('YouMustAssignWeightOfQualification').'&nbsp;<a href="javascript:window.history.go(-1);">'.get_lang('Back').'</a>',
get_lang('YouMustAssignWeightOfQualification').'&nbsp;<a href="javascript:window.history.go(-1);">'.
get_lang('Back').'</a>',
false
);

Expand Down Expand Up @@ -3111,10 +3052,11 @@ function store_reply($current_forum, $values)
'visible' => $visible,
]
);
if ($new_post_id) {

if ($new_post_id) {
$sql = "UPDATE $table_posts SET post_id = iid WHERE iid = $new_post_id";
Database::query($sql);

$values['new_post_id'] = $new_post_id;
$message = get_lang('ReplyAdded');

Expand Down Expand Up @@ -3142,12 +3084,19 @@ function store_reply($current_forum, $values)
api_get_user_id()
);

// Insert post
api_item_property_update(
$_course,
TOOL_FORUM_POST,
$new_post_id,
'NewPost',
api_get_user_id()
);

if ($current_forum['approval_direct_post'] == '1' &&
!api_is_allowed_to_edit(null, true)
) {
$message .= '<br />'.get_lang(
'MessageHasToBeApproved'
).'<br />';
$message .= '<br />'.get_lang('MessageHasToBeApproved').'<br />';
}

// Setting the notification correctly.
Expand All @@ -3157,7 +3106,6 @@ function store_reply($current_forum, $values)
}

send_notification_mails($values['thread_id'], $values);

add_forum_attachment_file('', $new_post_id);
}

Expand Down Expand Up @@ -3732,7 +3680,10 @@ function get_post_topics_of_forum($forum_id)
$number_of_topics = 0; // Due to the nature of the group by this can result in an empty string.
}

$return = array('number_of_topics' => $number_of_topics, 'number_of_posts' => $number_of_posts);
$return = array(
'number_of_topics' => $number_of_topics,
'number_of_posts' => $number_of_posts,
);

return $return;
}
Expand Down Expand Up @@ -4354,6 +4305,7 @@ function display_forum_search_results($search_term)
$forum_list = get_forums();

$result = Database::query($sql);
$search_results = [];
while ($row = Database::fetch_array($result, 'ASSOC')) {
$display_result = false;
/*
Expand Down
10 changes: 2 additions & 8 deletions main/forum/index.php
View file
Expand Up @@ -490,7 +490,7 @@ function hidecontent(content){
$html .= '<div class="row">';
$html .= '<div class="col-md-6">';
$html .= '<div class="col-md-3">';
$html .= '<div class="number-post">'.$forum_image.'<p>'.$number_posts.' ' . get_lang('Posts') . '</p>'
$html .= '<div class="number-post">'.$forum_image.'<p>'.$number_threads.' ' . get_lang('ForumThreads') . '</p>'
. '</div>';
$html .= '</div>';

Expand Down Expand Up @@ -556,13 +556,7 @@ function hidecontent(content){
$html .= '<div class="col-md-6">';
$html .= '<div class="row">';
$html .= '<div class="col-md-2">';
$html .= Display::return_icon(
'post-forum.png',
get_lang('Forum'),
null,
ICON_SIZE_SMALL
);
$html .= ' ' . $number_threads . '<br>'.$newPost.'</div>';
$html .= $newPost.'</div>';
$html .= '<div class="col-md-6">';

// The last post in the forum.
Expand Down
2 changes: 1 addition & 1 deletion main/forum/reply.php
View file
Expand Up @@ -17,7 +17,7 @@
*
* @package chamilo.forum
*/
// Including the global initialization file.

require_once '../inc/global.inc.php';

// The section (tabs).
Expand Down
5 changes: 2 additions & 3 deletions main/forum/viewforumcategory.php
View file
Expand Up @@ -371,7 +371,7 @@ function hidecontent(content){
$html .= '<div class="row">';
$html .= '<div class="col-md-6">';
$html .= '<div class="col-md-3">';
$html .= '<div class="number-post">'.$forum_image .'<p>' . $my_number_posts . ' ' . get_lang('Posts') . '</p></div>';
$html .= '<div class="number-post">'.$forum_image .'<p>' . $my_number_threads . ' ' . get_lang('ForumThreads') . '</p></div>';
$html .= '</div>';

$html .= '<div class="col-md-9">';
Expand Down Expand Up @@ -430,8 +430,7 @@ function hidecontent(content){

$html .= '<div class="row">';
$html .= '<div class="col-md-2">';
$html .= Display::return_icon('post-forum.png', get_lang('Threads'), null, ICON_SIZE_SMALL);
$html .= ' ' . $my_number_threads . '<br>' . $newPost . '</div>';
$html .= $newPost . '</div>';

// the last post in the forum
if ($forum['last_poster_name'] != '') {
Expand Down

0 comments on commit 3da7cdd

Please sign in to comment.