chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use c_group_info.iid

Browse Source
pull/2487/head
jmontoyaa 9 years ago
parent ef58acabc0
commit 08e5092b7c
2 changed files with 34 additions and 25 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 25
      main/forum/forumfunction.inc.php
  2. 30
      main/group/group_space.php

25
main/forum/forumfunction.inc.php
Unescape View File

@ -4916,25 +4916,26 @@ function delete_attachment($post_id, $id_attach = 0, $display = true)
/** /**
* This function gets all the forum information of the all the forum of the group * This function gets all the forum information of the all the forum of the group
* *
* @param integer $group_id the id of the group we need the fora of (see forum.forum_of_group) * @param integer $groupId the id of the group we need the fora of (see forum.forum_of_group)
* @return array * @return array
* *
* @todo this is basically the same code as the get_forums function. Consider merging the two. * @todo this is basically the same code as the get_forums function. Consider merging the two.
*/ */
function get_forums_of_group($group_id) function get_forums_of_group($groupId)
{ {
$table_forums = Database :: get_course_table(TABLE_FORUM); $table_forums = Database :: get_course_table(TABLE_FORUM);
$table_threads = Database :: get_course_table(TABLE_FORUM_THREAD); $table_threads = Database :: get_course_table(TABLE_FORUM_THREAD);
$table_posts = Database :: get_course_table(TABLE_FORUM_POST); $table_posts = Database :: get_course_table(TABLE_FORUM_POST);
$table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY); $table_item_property = Database :: get_course_table(TABLE_ITEM_PROPERTY);
$course_id = api_get_course_int_id(); $course_id = api_get_course_int_id();
$groupId = (int) $groupId;
// Student // Student
// Select all the forum information of all forums (that are visible to students). // Select all the forum information of all forums (that are visible to students).
$sql = "SELECT * FROM ".$table_forums." forum , ".$table_item_property." item_properties $sql = "SELECT * FROM $table_forums forum, $table_item_property item_properties
WHERE WHERE
forum.forum_of_group = '".Database::escape_string($group_id)."' AND forum.forum_of_group = $groupId AND
forum.c_id = $course_id AND forum.c_id = $course_id AND
item_properties.c_id = $course_id AND item_properties.c_id = $course_id AND
forum.forum_id = item_properties.ref AND forum.forum_id = item_properties.ref AND
@ -4943,7 +4944,7 @@ function get_forums_of_group($group_id)
ORDER BY forum.forum_order ASC"; ORDER BY forum.forum_order ASC";
// Select the number of threads of the forums (only the threads that are visible). // Select the number of threads of the forums (only the threads that are visible).
$sql2 = "SELECT count(thread_id) AS number_of_threads, threads.forum_id $sql2 = "SELECT count(thread_id) AS number_of_threads, threads.forum_id
FROM $table_threads threads, ".$table_item_property." item_properties FROM $table_threads threads, $table_item_property item_properties
WHERE WHERE
threads.thread_id = item_properties.ref AND threads.thread_id = item_properties.ref AND
threads.c_id = $course_id AND threads.c_id = $course_id AND
@ -4953,7 +4954,7 @@ function get_forums_of_group($group_id)
GROUP BY threads.forum_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). // Select the number of posts of the forum (post that are visible and that are in a thread that is visible).
$sql3 = "SELECT count(post_id) AS number_of_posts, posts.forum_id $sql3 = "SELECT count(post_id) AS number_of_posts, posts.forum_id
FROM $table_posts posts, $table_threads threads, ".$table_item_property." item_properties FROM $table_posts posts, $table_threads threads, $table_item_property item_properties
WHERE posts.visible=1 AND WHERE posts.visible=1 AND
posts.c_id = $course_id AND posts.c_id = $course_id AND
item_properties.c_id = $course_id AND item_properties.c_id = $course_id AND
@ -4968,9 +4969,9 @@ function get_forums_of_group($group_id)
if (api_is_allowed_to_edit()) { if (api_is_allowed_to_edit()) {
// Select all the forum information of all forums (that are not deleted). // Select all the forum information of all forums (that are not deleted).
$sql = "SELECT * $sql = "SELECT *
FROM ".$table_forums." forum , ".$table_item_property." item_properties FROM $table_forums forum, $table_item_property item_properties
WHERE WHERE
forum.forum_of_group = '".Database::escape_string($group_id)."' AND forum.forum_of_group = $groupId AND
forum.c_id = $course_id AND forum.c_id = $course_id AND
item_properties.c_id = $course_id AND item_properties.c_id = $course_id AND
forum.forum_id = item_properties.ref AND forum.forum_id = item_properties.ref AND
@ -4980,7 +4981,7 @@ function get_forums_of_group($group_id)
// Select the number of threads of the forums (only the threads that are not deleted). // Select the number of threads of the forums (only the threads that are not deleted).
$sql2 = "SELECT count(thread_id) AS number_of_threads, threads.forum_id $sql2 = "SELECT count(thread_id) AS number_of_threads, threads.forum_id
FROM $table_threads threads, ".$table_item_property." item_properties FROM $table_threads threads, $table_item_property item_properties
WHERE WHERE
threads.thread_id=item_properties.ref AND threads.thread_id=item_properties.ref AND
threads.c_id = $course_id AND threads.c_id = $course_id AND
@ -4991,7 +4992,8 @@ function get_forums_of_group($group_id)
// Select the number of posts of the forum. // Select the number of posts of the forum.
$sql3 = "SELECT count(post_id) AS number_of_posts, forum_id $sql3 = "SELECT count(post_id) AS number_of_posts, forum_id
FROM $table_posts FROM $table_posts
WHERE c_id = $course_id GROUP BY forum_id"; WHERE c_id = $course_id
GROUP BY forum_id";
} }
@ -5024,7 +5026,8 @@ function get_forums_of_group($group_id)
} }
} }
// Finding the last post information (last_post_id, last_poster_id, last_post_date, last_poster_name, last_poster_lastname, last_poster_firstname). // Finding the last post information
// (last_post_id, last_poster_id, last_post_date, last_poster_name, last_poster_lastname, last_poster_firstname).
if (!empty($forum_list)) { if (!empty($forum_list)) {
foreach ($forum_list as $key => $value) { foreach ($forum_list as $key => $value) {
$last_post_info_of_forum = get_last_post_information($key, api_is_allowed_to_edit()); $last_post_info_of_forum = get_last_post_information($key, api_is_allowed_to_edit());

30
main/group/group_space.php
Unescape View File

@ -33,7 +33,7 @@ $interbreadcrumb[] = array('url' => 'group.php?'.api_get_cidreq(), 'name' => get
/* Ensure all private groups // Juan Carlos Raña Trabado */ /* Ensure all private groups // Juan Carlos Raña Trabado */
$forums_of_groups = get_forums_of_group($current_group['id']); $forums_of_groups = get_forums_of_group($current_group['iid']);
if (!GroupManager::userHasAccessToBrowse($user_id, $current_group, api_get_session_id())) { if (!GroupManager::userHasAccessToBrowse($user_id, $current_group, api_get_session_id())) {
api_not_allowed(true); api_not_allowed(true);
@ -117,7 +117,7 @@ if (api_is_allowed_to_edit(false, true) ||
) { ) {
$actions_array = array(); $actions_array = array();
// Link to the forum of this group // Link to the forum of this group
$forums_of_groups = get_forums_of_group($current_group['id']); $forums_of_groups = get_forums_of_group($current_group['iid']);
if (is_array($forums_of_groups)) { if (is_array($forums_of_groups)) {
if ($current_group['forum_state'] != GroupManager::TOOL_NOT_AVAILABLE) { if ($current_group['forum_state'] != GroupManager::TOOL_NOT_AVAILABLE) {
@ -218,12 +218,11 @@ if (api_is_allowed_to_edit(false, true) ||
if (!empty($actions_array)) { if (!empty($actions_array)) {
echo Display::actions($actions_array); echo Display::actions($actions_array);
} }
} else { } else {
$actions_array = array(); $actions_array = array();
// Link to the forum of this group // Link to the forum of this group
$forums_of_groups = get_forums_of_group($current_group['id']); $forums_of_groups = get_forums_of_group($current_group['iid']);
if (is_array($forums_of_groups)) { if (is_array($forums_of_groups)) {
if ($current_group['forum_state'] == GroupManager::TOOL_PUBLIC) { if ($current_group['forum_state'] == GroupManager::TOOL_PUBLIC) {
@ -379,9 +378,13 @@ $table->display();
*/ */
function get_number_of_group_users() function get_number_of_group_users()
{ {
global $current_group; $groupInfo = GroupManager::get_group_properties(api_get_user_id());
$course_id = api_get_course_int_id(); $course_id = api_get_course_int_id();
if (empty($groupInfo) || empty($course_id)) {
return 0;
}
// Database table definition // Database table definition
$table = Database :: get_course_table(TABLE_GROUP_USER); $table = Database :: get_course_table(TABLE_GROUP_USER);
@ -390,7 +393,7 @@ function get_number_of_group_users()
FROM $table FROM $table
WHERE WHERE
c_id = $course_id AND c_id = $course_id AND
group_id='".intval($current_group['id'])."'"; group_id = '".intval($groupInfo['iid'])."'";
$result = Database::query($sql); $result = Database::query($sql);
$return = Database::fetch_array($result, 'ASSOC'); $return = Database::fetch_array($result, 'ASSOC');
@ -411,14 +414,17 @@ function get_number_of_group_users()
*/ */
function get_group_user_data($from, $number_of_items, $column, $direction) function get_group_user_data($from, $number_of_items, $column, $direction)
{ {
global $current_group; $groupInfo = GroupManager::get_group_properties(api_get_user_id());
$course_id = api_get_course_int_id();
if (empty($groupInfo) || empty($course_id)) {
return 0;
}
// Database table definition // Database table definition
$table_group_user = Database:: get_course_table(TABLE_GROUP_USER); $table_group_user = Database:: get_course_table(TABLE_GROUP_USER);
$table_user = Database:: get_main_table(TABLE_MAIN_USER); $table_user = Database:: get_main_table(TABLE_MAIN_USER);
$course_id = api_get_course_int_id();
// Query // Query
if (api_get_setting('show_email_addresses') === 'true') { if (api_get_setting('show_email_addresses') === 'true') {
$sql = "SELECT user.id AS col0, $sql = "SELECT user.id AS col0,
@ -435,7 +441,7 @@ function get_group_user_data($from, $number_of_items, $column, $direction)
WHERE WHERE
group_rel_user.c_id = $course_id AND group_rel_user.c_id = $course_id AND
group_rel_user.user_id = user.id AND group_rel_user.user_id = user.id AND
group_rel_user.group_id = '".Database::escape_string($current_group['id'])."' group_rel_user.group_id = '".$groupInfo['iid']."'
ORDER BY col$column $direction ORDER BY col$column $direction
LIMIT $from, $number_of_items"; LIMIT $from, $number_of_items";
} else { } else {
@ -452,7 +458,7 @@ function get_group_user_data($from, $number_of_items, $column, $direction)
FROM $table_user u FROM $table_user u
INNER JOIN $table_group_user gu INNER JOIN $table_group_user gu
ON (gu.user_id = u.id) AND gu.c_id = $course_id ON (gu.user_id = u.id) AND gu.c_id = $course_id
WHERE gu.group_id = '".Database::escape_string($current_group['id'])."' WHERE gu.group_id = '".$groupInfo['iid']."'
ORDER BY col$column $direction ORDER BY col$column $direction
LIMIT $from, $number_of_items"; LIMIT $from, $number_of_items";
} else { } else {
@ -469,7 +475,7 @@ function get_group_user_data($from, $number_of_items, $column, $direction)
WHERE WHERE
group_rel_user.c_id = $course_id AND group_rel_user.c_id = $course_id AND
group_rel_user.user_id = user.id AND group_rel_user.user_id = user.id AND
group_rel_user.group_id = '".Database::escape_string($current_group['id'])."' group_rel_user.group_id = '".$groupInfo['iid']."'
ORDER BY col$column $direction ORDER BY col$column $direction
LIMIT $from, $number_of_items"; LIMIT $from, $number_of_items";
} }

Write Preview
Loading…
Cancel
Save