mergue Teachar and tutor in Status, in column CT#968

main/user/user.php

@@ -473,7 +473,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
 				$temp[] = $o_course_user['role'];
 				$temp[] = implode(', ', $groups_name); //Group
 				$temp[] = $o_course_user['official_code'];
-
+/*
 				// deprecated feature
 				if ((isset($o_course_user['tutor_id']) && $o_course_user['tutor_id'] == 1) || (isset($o_course_user['status_session']) && $o_course_user['status_session'] == 2)) {
 					$temp[] = get_lang('Tutor');
@@ -486,7 +486,15 @@ function get_user_data($from, $number_of_items, $column, $direction) {
 				} else {
 					$temp[] = '-';
 				}
-
+*/
+				// deprecated feature
+				if ((isset($o_course_user['tutor_id']) && $o_course_user['tutor_id'] == 1) || (isset($o_course_user['status_session']) && $o_course_user['status_session'] == 2)) {
+					$temp[] = get_lang('Tutor');
+				} elseif (isset($o_course_user['status']) && $o_course_user['status'] == 1) {
+					$temp[] = get_lang('CourseManager');
+				} else {
+					$temp[] = '-';
+				}
 				$temp[] = $o_course_user['active'];
 				$temp[] = $user_id;
 			} else {
@@ -601,13 +609,13 @@ $table->set_header($header_nr++, get_lang('OfficialCode'));
 
 if (api_is_allowed_to_edit(null, true)) {
 	// deprecated feature
-	$table->set_header($header_nr++, get_lang('Tutor'), false);
-	$table->set_header($header_nr++, get_lang('CourseManager'), false);
+	//$table->set_header($header_nr++, get_lang('Tutor'), false);
+	$table->set_header($header_nr++, get_lang('Status'), false);
 	$table->set_header($header_nr++, get_lang('Active'), false);
         if (api_get_setting('allow_user_course_subscription_by_course_admin') == 'true') {
-            $table->set_column_filter(9, 'active_filter');
-        } else {
             $table->set_column_filter(8, 'active_filter');
+        } else {
+            $table->set_column_filter(7, 'active_filter');
         }
 	//actions column
 	$table->set_header($header_nr++, get_lang('Action'), false);