Minor - cosmetic changes

skala
Julio Montoya 12 years ago
parent 9dbec1bb7a
commit 09a71c6da5
  1. 2
      main/group/group.php
  2. 19
      main/inc/lib/groupmanager.lib.php

@ -45,7 +45,7 @@ if (api_get_setting('allow_group_categories') == 'false') {
$num = Database::num_rows($res);
if ($num == 0) {
$sql = "INSERT INTO ".$cat_table." ( c_id, id , title , description , forum_state, wiki_state, max_student, self_reg_allowed, self_unreg_allowed, groups_per_user, display_order)
VALUES ($course_id, '2', '".lang2db($DefaultGroupCategory)."', '', '1', '1', '8', '0', '0', '0', '0');";
VALUES ($course_id, '2', '".lang2db(get_lang('DefaultGroupCategory'))."', '', '1', '1', '8', '0', '0', '0', '0');";
Database::query ($sql);
}
}

@ -117,10 +117,10 @@ class GroupManager {
g.self_unregistration_allowed,
g.session_id,
ug.user_id is_member
FROM ".$table_group." g
LEFT JOIN ".$table_group_user." ug
FROM $table_group g
LEFT JOIN $table_group_user ug
ON (ug.group_id = g.id AND ug.user_id = '".api_get_user_id()."' AND ug.c_id = $course_id AND g.c_id = $course_id)";
} elseif ($my_status_of_user_in_course==STUDENT || $is_student_in_session===true || $_SESSION['studentview'] == 'studentview') {
} elseif ($my_status_of_user_in_course==STUDENT || $is_student_in_session ===true || $_SESSION['studentview'] == 'studentview') {
$sql = "SELECT g.id,
g.name,
g.description,
@ -131,8 +131,8 @@ class GroupManager {
g.self_unregistration_allowed,
g.session_id,
ug.user_id is_member
FROM ".$table_group." g
LEFT JOIN ".$table_group_user." ug
FROM $table_group g
LEFT JOIN $table_group_user ug
ON (ug.group_id = g.id AND ug.user_id = '".api_get_user_id()."' AND ug.c_id = $course_id AND g.c_id = $course_id)";
}
@ -162,15 +162,8 @@ class GroupManager {
$groups = array();
$thisGroup= array();
while ($thisGroup = Database::fetch_array($groupList)) {
/*if ($thisGroup['category_id'] == self::VIRTUAL_COURSE_CATEGORY) {
$sql = "SELECT title FROM $table_course WHERE code = '".$thisGroup['name']."'";
$obj = Database::fetch_object(Database::query($sql));
$thisGroup['name'] = $obj->title;
}*/
$thisGroup['number_of_members'] = count(GroupManager::get_subscribed_users($thisGroup['id']));
//$thisGroup['number_of_members'] = GroupManager::get_subscribed_users($category);
if ($thisGroup['session_id']!=0) {
$sql_session = 'SELECT name FROM '.Database::get_main_table(TABLE_MAIN_SESSION).' WHERE id='.$thisGroup['session_id'];
$rs_session = Database::query($sql_session);

Loading…
Cancel
Save