From 93871072dac811f94bff1e79bfb1055a8864bfaa Mon Sep 17 00:00:00 2001 From: Arthur Portugal Date: Thu, 29 Oct 2009 10:52:01 -0500 Subject: [PATCH 1/3] Fixed the fill users into a group DT#5496 --- main/inc/lib/course.lib.php | 3 +-- main/inc/lib/groupmanager.lib.php | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php index f6be787524..5ec9ac9400 100644 --- a/main/inc/lib/course.lib.php +++ b/main/inc/lib/course.lib.php @@ -858,11 +858,10 @@ class CourseManager { $course_code = Database::escape_string($course_code); $users = array(); - $where = array(); $sql = $session_id == 0 ? 'SELECT DISTINCT course_rel_user.status, user.user_id, course_rel_user.role, course_rel_user.tutor_id ' - : 'SELECT DISTINCT user.user_id '; + : 'SELECT DISTINCT user.user_id, user.status '; $sql .= ' FROM '.Database::get_main_table(TABLE_MAIN_USER).' as user '; diff --git a/main/inc/lib/groupmanager.lib.php b/main/inc/lib/groupmanager.lib.php index 7b60930c50..9b00f819d8 100644 --- a/main/inc/lib/groupmanager.lib.php +++ b/main/inc/lib/groupmanager.lib.php @@ -820,7 +820,8 @@ class GroupManager { $course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER); $group_table = Database :: get_course_table(TABLE_GROUP); $group_user_table = Database :: get_course_table(TABLE_GROUP_USER); - $complete_user_list = CourseManager :: get_real_and_linked_user_list($_course['sysCode']); + $session_id = api_get_session_id(); + $complete_user_list = CourseManager :: get_real_and_linked_user_list($_course['sysCode'], true, $session_id); $number_groups_per_user = ($groups_per_user == GROUP_PER_MEMBER_NO_LIMIT ? INFINITE : $groups_per_user); /* * Retrieve all the groups where enrollment is still allowed @@ -854,7 +855,7 @@ class GroupManager { } //first sort by user_id to filter out duplicates $complete_user_list = TableSort :: sort_table($complete_user_list, 'user_id'); - $complete_user_list = self :: filter_duplicates($complete_user_list, "user_id"); + $complete_user_list = self :: filter_duplicates($complete_user_list, 'user_id'); $complete_user_list = self :: filter_only_students($complete_user_list); //now sort by # of group left $complete_user_list = TableSort :: sort_table($complete_user_list, 'number_groups_left', SORT_DESC); From 9fcfdb4ef9e49ee0eb96f42fcd006fca1c4158a6 Mon Sep 17 00:00:00 2001 From: Isaac Flores Date: Thu, 29 Oct 2009 11:02:03 -0500 Subject: [PATCH 2/3] Improvements of glossary in extra tools --- .../fckeditor/editor/plugins/glossary/fck_glossary_automatic.js | 2 +- main/inc/lib/javascript/glossary.js | 2 +- main/newscorm/scorm_api.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main/inc/lib/fckeditor/editor/plugins/glossary/fck_glossary_automatic.js b/main/inc/lib/fckeditor/editor/plugins/glossary/fck_glossary_automatic.js index a9de15c94c..a3e5c8337e 100755 --- a/main/inc/lib/fckeditor/editor/plugins/glossary/fck_glossary_automatic.js +++ b/main/inc/lib/fckeditor/editor/plugins/glossary/fck_glossary_automatic.js @@ -18,7 +18,7 @@ $(document).ready(function() { data_terms=datas.split("[|.|_|.|-|.|]"); for(i=0;i]('+specific_terms[1]+')',""); new_html=my_text.replace(my_specific_terms,""+specific_terms[1]+""); $("body").html(new_html); my_text=$("body").html(); diff --git a/main/inc/lib/javascript/glossary.js b/main/inc/lib/javascript/glossary.js index 41d979ba00..918ba0e3b9 100644 --- a/main/inc/lib/javascript/glossary.js +++ b/main/inc/lib/javascript/glossary.js @@ -20,7 +20,7 @@ $(document).ready(function() { for(i=0;i])('+specific_terms[1]+')',""); new_html=my_text.replace(my_specific_terms," "+specific_terms[1]+""); $(".glossary-content").html(new_html); my_text=$(".glossary-content").html(); diff --git a/main/newscorm/scorm_api.php b/main/newscorm/scorm_api.php index 25f9f0fc79..3a5b1e772b 100755 --- a/main/newscorm/scorm_api.php +++ b/main/newscorm/scorm_api.php @@ -1617,7 +1617,7 @@ function attach_glossary_into_scorm() { data_terms=datos.split("[|.|_|.|-|.|]"); for(i=0;i]('+specific_terms[1]+')',""); new_html=my_text.replace(my_specific_terms," "+specific_terms[1]+""); $frame_content.html(new_html); my_text=$frame_content.html(); From 398bd9a5b5fab8e831b5a6ed99812dff69082647 Mon Sep 17 00:00:00 2001 From: Isaac Flores Date: Thu, 29 Oct 2009 11:20:28 -0500 Subject: [PATCH 3/3] Allow search in complete document --- .../fckeditor/editor/plugins/glossary/fck_glossary_automatic.js | 2 +- main/inc/lib/javascript/glossary.js | 2 +- main/newscorm/scorm_api.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main/inc/lib/fckeditor/editor/plugins/glossary/fck_glossary_automatic.js b/main/inc/lib/fckeditor/editor/plugins/glossary/fck_glossary_automatic.js index a3e5c8337e..172930f30d 100755 --- a/main/inc/lib/fckeditor/editor/plugins/glossary/fck_glossary_automatic.js +++ b/main/inc/lib/fckeditor/editor/plugins/glossary/fck_glossary_automatic.js @@ -18,7 +18,7 @@ $(document).ready(function() { data_terms=datas.split("[|.|_|.|-|.|]"); for(i=0;i]('+specific_terms[1]+')',""); + var my_specific_terms = new RegExp('[^A-Za-z0-9/_\<>]('+specific_terms[1]+')',"g"); new_html=my_text.replace(my_specific_terms,""+specific_terms[1]+""); $("body").html(new_html); my_text=$("body").html(); diff --git a/main/inc/lib/javascript/glossary.js b/main/inc/lib/javascript/glossary.js index 918ba0e3b9..ce83b876ad 100644 --- a/main/inc/lib/javascript/glossary.js +++ b/main/inc/lib/javascript/glossary.js @@ -20,7 +20,7 @@ $(document).ready(function() { for(i=0;i])('+specific_terms[1]+')',""); + var my_specific_terms = new RegExp('([^A-Za-z0-9/_\<>])('+specific_terms[1]+')',"g"); new_html=my_text.replace(my_specific_terms," "+specific_terms[1]+""); $(".glossary-content").html(new_html); my_text=$(".glossary-content").html(); diff --git a/main/newscorm/scorm_api.php b/main/newscorm/scorm_api.php index 3a5b1e772b..2e6b62888c 100755 --- a/main/newscorm/scorm_api.php +++ b/main/newscorm/scorm_api.php @@ -1617,7 +1617,7 @@ function attach_glossary_into_scorm() { data_terms=datos.split("[|.|_|.|-|.|]"); for(i=0;i]('+specific_terms[1]+')',""); + var my_specific_terms = new RegExp('[^A-Za-z0-9/_\<>]('+specific_terms[1]+')',"g"); new_html=my_text.replace(my_specific_terms," "+specific_terms[1]+""); $frame_content.html(new_html); my_text=$frame_content.html();