merge

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 ';
 

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<data_terms.length;i++) {
                     specific_terms=data_terms[i].split("__|__|");
-                    var my_specific_terms = new RegExp('[^A-Za-z0-9/_\]('+specific_terms[1]+')',"gi");
+                    var my_specific_terms = new RegExp('[^A-Za-z0-9/_\<>]('+specific_terms[1]+')',"g");
 				    new_html=my_text.replace(my_specific_terms,"<span class=\"glossary-ajax\" style='color:blue'  name=\"link"+specific_terms[0]+"\">"+specific_terms[1]+"</span>");
                     $("body").html(new_html);
                     my_text=$("body").html();

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);

main/inc/lib/javascript/glossary.js

@@ -20,7 +20,7 @@ $(document).ready(function() {
 				
                 for(i=0;i<data_terms.length;i++) {
                     specific_terms=data_terms[i].split("__|__|");
-                    var my_specific_terms = new RegExp('[^A-Za-z0-9/_\]('+specific_terms[1]+')',"gi");
+                    var my_specific_terms = new RegExp('([^A-Za-z0-9/_\<>])('+specific_terms[1]+')',"g");
 					new_html=my_text.replace(my_specific_terms," <span class=\"glossary-ajax\" style='color:blue' name=\"link"+specific_terms[0]+"\">"+specific_terms[1]+"</span>");
 					$(".glossary-content").html(new_html);
                     my_text=$(".glossary-content").html();

main/newscorm/scorm_api.php

@@ -1617,7 +1617,7 @@ function attach_glossary_into_scorm() {
                 data_terms=datos.split("[|.|_|.|-|.|]");
                 for(i=0;i<data_terms.length;i++) {
                     specific_terms=data_terms[i].split("__|__|");
-                    var my_specific_terms = new RegExp('[^A-Za-z0-9/_\]('+specific_terms[1]+')',"gi");
+                    var my_specific_terms = new RegExp('[^A-Za-z0-9/_\<>]('+specific_terms[1]+')',"g");
                     new_html=my_text.replace(my_specific_terms," <span style='color:blue' class=\"glossary-ajax\" name=\"link"+specific_terms[0]+"\" >"+specific_terms[1]+"</span>");
                     $frame_content.html(new_html);
                     my_text=$frame_content.html();