chamilo / chamilo-lms

main/user/user_import.php

Spacing +8 added lines, -8 removed lines

@@ -15,8 +15,8 @@ 
 
 $tool_name = get_lang('ImportUsersToACourse');
 
-$interbreadcrumb[] = array ("url" => "user.php", "name" => get_lang("Users"));
-$interbreadcrumb[] = array ("url" => "#", "name" => get_lang("ImportUsersToACourse"));
+$interbreadcrumb[] = array("url" => "user.php", "name" => get_lang("Users"));
+$interbreadcrumb[] = array("url" => "#", "name" => get_lang("ImportUsersToACourse"));
 
 $form = new FormValidator('user_import', 'post', 'user_import.php');
 $form->addElement('header', $tool_name);
@@ -42,7 +42,7 @@ 
     if (isset($_FILES['import_file']['size']) && $_FILES['import_file']['size'] !== 0) {
         $unsubscribe_users = isset($_POST['unsubscribe_users']) ? true : false;
         //@todo : csvToArray deprecated
-        $users  = Import::csvToArray($_FILES['import_file']['tmp_name']);
+        $users = Import::csvToArray($_FILES['import_file']['tmp_name']);
         $invalid_users  = array();
         $clean_users    = array();
 
@@ -79,7 +79,7 @@ 
                         $user_ids = array();
                         foreach ($current_user_list as $user) {
                             if (!CourseManager::is_course_teacher($user['user_id'], $course_code)) {
-                                $user_ids[]= $user['user_id'];
+                                $user_ids[] = $user['user_id'];
                             }
                         }
                         CourseManager::unsubscribe_user($user_ids, $course_code, $session_id);
@@ -92,12 +92,12 @@ 
                     if (empty($session_id)) {
                         //just to make sure
                         if (CourseManager :: is_user_subscribed_in_course($userId, $course_code)) {
-                            $user_to_show[]= $userInfo['complete_name'];
+                            $user_to_show[] = $userInfo['complete_name'];
                         }
                     } else {
                         //just to make sure
                         if (CourseManager::is_user_subscribed_in_course($userId, $course_code, true, $session_id)) {
-                            $user_to_show[]= $userInfo['complete_name'];
+                            $user_to_show[] = $userInfo['complete_name'];
                         }
                     }
                 }
@@ -105,7 +105,7 @@ 
                 $message = get_lang('CheckUsersWithId');
                 $type = 'warning';
                 foreach ($invalid_users as $invalid_user) {
-                    $user_to_show[]= $invalid_user;
+                    $user_to_show[] = $invalid_user;
                 }
             }
         }
@@ -130,7 +130,7 @@ 
             Display::display_warning_message($message.':  <br />'.$userMessage, false);
         }
     } else {
-        $empty_line_msg = ($empty_line == 0) ? get_lang('ErrorsWhenImportingFile'): get_lang('ErrorsWhenImportingFile').': '.get_lang('EmptyHeaderLine');
+        $empty_line_msg = ($empty_line == 0) ? get_lang('ErrorsWhenImportingFile') : get_lang('ErrorsWhenImportingFile').': '.get_lang('EmptyHeaderLine');
         Display::display_error_message($empty_line_msg);
     }
 }

main/user/subscribe_user.php

Spacing +78 added lines, -78 removed lines

@@ -8,7 +8,7 @@ 
 */
 
 require_once '../inc/global.inc.php';
-$current_course_tool  = TOOL_USER;
+$current_course_tool = TOOL_USER;
 
 // the section (for the tabs)
 $this_section = SECTION_COURSES;
@@ -51,8 +51,8 @@ 
 }
 
 $current_session_id = api_get_session_id();
-$list_register_user='';
-$list_not_register_user='';
+$list_register_user = '';
+$list_not_register_user = '';
 
 if (isset($_REQUEST['register'])) {
     if ($type == COURSEMANAGER) {
@@ -80,9 +80,9 @@ 
 
     if (is_array($user_id_temp)) {
         $counter = count($user_id_temp);
-        for ($j=0; $j<$counter;$j++) {
-            if 	($user_id_temp[$j]==$_GET['user_id']) {
-                if ($result_simple_sub)	{
+        for ($j = 0; $j < $counter; $j++) {
+            if ($user_id_temp[$j] == $_GET['user_id']) {
+                if ($result_simple_sub) {
                     Display::addFlash(Display::return_message($_SESSION['session_user_name'][$j].' '.get_lang('AddedToCourse')));
                 } else {
                     Display::addFlash(Display::return_message($_SESSION['session_user_name'][$j].' '.get_lang('NotAddedToCourse'), 'error'));
@@ -99,7 +99,7 @@ 
 }
 
 if (isset($_POST['action'])) {
-    switch($_POST['action']) {
+    switch ($_POST['action']) {
         case 'subscribe':
             if (is_array($_POST['user'])) {
                 foreach ($_POST['user'] as $index => $user_id) {
@@ -136,7 +136,7 @@ 
             $counter = 0;
             $is_suscribe_counter = count($is_suscribe_user_id);
 
-            $list_register_user='';
+            $list_register_user = '';
 
             for ($i = 0; $i < $is_suscribe_counter; $i++) {
                 for ($j = 0; $j < count($user_id_temp); $j++) {
@@ -195,25 +195,25 @@ 
 $parameters['type'] = $type;
 $table->set_additional_parameters($parameters);
 $col = 0;
-$table->set_header($col ++, '', false);
-$table->set_header($col ++, get_lang('OfficialCode'));
+$table->set_header($col++, '', false);
+$table->set_header($col++, get_lang('OfficialCode'));
 if (api_is_western_name_order()) {
-    $table->set_header($col ++, get_lang('FirstName'));
-    $table->set_header($col ++, get_lang('LastName'));
+    $table->set_header($col++, get_lang('FirstName'));
+    $table->set_header($col++, get_lang('LastName'));
 } else {
-    $table->set_header($col ++, get_lang('LastName'));
-    $table->set_header($col ++, get_lang('FirstName'));
+    $table->set_header($col++, get_lang('LastName'));
+    $table->set_header($col++, get_lang('FirstName'));
 }
 
 if (api_get_setting('show_email_addresses') == 'true') {
-    $table->set_header($col ++, get_lang('Email'));
-    $table->set_column_filter($col -1, 'email_filter');
+    $table->set_header($col++, get_lang('Email'));
+    $table->set_column_filter($col - 1, 'email_filter');
 }
 $table->set_header($col++, get_lang('Active'), false);
-$table->set_column_filter($col -1, 'active_filter');
-$table->set_header($col ++, get_lang('Actions'), false);
-$table->set_column_filter($col -1, 'reg_filter');
-$table->set_form_actions(array ('subscribe' => get_lang('reg')), 'user');
+$table->set_column_filter($col - 1, 'active_filter');
+$table->set_header($col++, get_lang('Actions'), false);
+$table->set_column_filter($col - 1, 'reg_filter');
+$table->set_form_actions(array('subscribe' => get_lang('reg')), 'user');
 
 if (!empty($_POST['keyword'])) {
     $keyword_name = Security::remove_XSS($_POST['keyword']);
@@ -281,7 +281,7 @@ 
     $courseCode = api_get_course_id();
     $sessionId = api_get_session_id();
 
-	if (isset($_REQUEST['type']) && $_REQUEST['type']=='teacher') {
+	if (isset($_REQUEST['type']) && $_REQUEST['type'] == 'teacher') {
 
 		if (api_get_session_id() != 0) {
 
@@ -299,7 +299,7 @@ 
 
 			if (api_is_multiple_url_enabled()) {
 				$url_access_id = api_get_current_access_url_id();
-				if ($url_access_id !=-1) {
+				if ($url_access_id != -1) {
 					$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 					$sql = "SELECT COUNT(u.user_id)
 							FROM $user_table u
@@ -326,7 +326,7 @@ 
 
 			if (api_is_multiple_url_enabled()) {
 				$url_access_id = api_get_current_access_url_id();
-				if ($url_access_id !=-1) {
+				if ($url_access_id != -1) {
 					$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 
 					$sql = "SELECT COUNT(u.user_id)
@@ -356,7 +356,7 @@ 
 
 			if (api_is_multiple_url_enabled()) {
 				$url_access_id = api_get_current_access_url_id();
-				if ($url_access_id !=-1) {
+				if ($url_access_id != -1) {
 					$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 					$sql = "SELECT COUNT(u.user_id)
 							FROM $user_table u
@@ -384,9 +384,9 @@ 
 			if (isset($_GET['subscribe_user_filter_value']) &&
                 !empty($_GET['subscribe_user_filter_value']) &&
                 api_get_setting('ProfilingFilterAddingUsers') == 'true'
-            ){
-				$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-				$sql .=	"
+            ) {
+				$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
+				$sql .= "
 					LEFT JOIN $table_user_field_values field_values
 					ON field_values.item_id = u.user_id
 					WHERE
@@ -395,14 +395,14 @@ 
 						field_values.field_id = '".intval($field_identification[0])."' AND
 						field_values.value = '".Database::escape_string($field_identification[1])."'
 					";
-			} else	{
-				$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
+			} else {
+				$sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
 			}
 
 			if (api_is_multiple_url_enabled()) {
 				$url_access_id = api_get_current_access_url_id();
 
-				if ($url_access_id !=-1) {
+				if ($url_access_id != -1) {
 
 					$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 
@@ -449,7 +449,7 @@ 
 			$users_of_course[] = $course_user['user_id'];
 	    }
 	}
-    $sql .=" AND u.status <> ".ANONYMOUS." ";
+    $sql .= " AND u.status <> ".ANONYMOUS." ";
 	$res = Database::query($sql);
     $count_user = 0;
 
@@ -521,8 +521,8 @@ 
 				!empty($_GET['subscribe_user_filter_value']) &&
 				api_get_setting('ProfilingFilterAddingUsers') == 'true'
 			) {
-				$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-				$sql .=	"
+				$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
+				$sql .= "
 					LEFT JOIN $table_user_field_values field_values
 						ON field_values.item_id = u.user_id
 					WHERE
@@ -532,10 +532,10 @@ 
 						field_values.field_id = '".intval($field_identification[0])."' AND
 						field_values.value = '".Database::escape_string($field_identification[1])."'";
 			} else {
-				$sql .=	"WHERE cu.user_id IS NULL AND u.status=1 AND (u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
+				$sql .= "WHERE cu.user_id IS NULL AND u.status=1 AND (u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
 			}
 
-            $sql .=	" AND access_url_id= $url_access_id";
+            $sql .= " AND access_url_id= $url_access_id";
 
 		} else {
 		     // adding a teacher NOT through a session
@@ -549,21 +549,21 @@ 
 					!empty($_GET['subscribe_user_filter_value']) &&
 					api_get_setting('ProfilingFilterAddingUsers') == 'true'
 				) {
-					$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-					$sql .=	"
+					$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
+					$sql .= "
 						LEFT JOIN $table_user_field_values field_values
 							ON field_values.item_id = u.user_id
 						WHERE
 							cu.user_id IS NULL AND u.status<>".DRH." AND
 							field_values.field_id = '".intval($field_identification[0])."' AND
 							field_values.value = '".Database::escape_string($field_identification[1])."'";
-				} else	{
-					$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
+				} else {
+					$sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
 				}
 
 				// adding a teacher NOT trough a session on a portal with multiple URLs
 				if (api_is_multiple_url_enabled()) {
-					if ($url_access_id !=-1) {
+					if ($url_access_id != -1) {
 						$sql = "SELECT $select_fields
 						FROM $user_table u
 						LEFT JOIN $course_user_table cu
@@ -575,9 +575,9 @@ 
 					if (isset($_GET['subscribe_user_filter_value']) &&
 						!empty($_GET['subscribe_user_filter_value']) &&
 						api_get_setting('ProfilingFilterAddingUsers') == 'true'
-					){
+					) {
 						$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
-						$sql .=	"
+						$sql .= "
 							LEFT JOIN $table_user_field_values field_values
 								ON field_values.item_id = u.user_id
 							WHERE
@@ -585,8 +585,8 @@ 
 							 	u.status<>".DRH." AND
 							 	field_values.field_id = '".intval($field_identification[0])."' AND
 							 	field_values.value = '".Database::escape_string($field_identification[1])."'";
-					} else	{
-						$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
+					} else {
+						$sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
 					}
 				}
 			}
@@ -607,9 +607,9 @@ 
             }
 
             // applying the filter of the additional user profile fields
-            if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value'])){
-                $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-                $sql .=	"
+            if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value'])) {
+                $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
+                $sql .= "
                     LEFT JOIN $table_user_field_values field_values
                         ON field_values.item_id = u.user_id
                     WHERE
@@ -618,15 +618,15 @@ 
                     	(u.official_code <> 'ADMIN' OR u.official_code IS NULL) AND
                     	field_values.field_id = '".intval($field_identification[0])."' AND
                     	field_values.value = '".Database::escape_string($field_identification[1])."'";
-            } else	{
-                $sql .=	"WHERE
+            } else {
+                $sql .= "WHERE
                 			cu.user_id IS NULL AND
                 			u.status<>".DRH." AND
                 			(u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
             }
 
             if (api_is_multiple_url_enabled()) {
-                $sql .=  "AND access_url_id = $url_access_id";
+                $sql .= "AND access_url_id = $url_access_id";
             }
 
 		} else {
@@ -638,9 +638,9 @@ 
                     	c_id ='".$courseId."'";
 
 			// applying the filter of the additional user profile fields
-			if (isset($_GET['subscribe_user_filter_value']) && !empty($_GET['subscribe_user_filter_value'])){
-				$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-				$sql .=	"
+			if (isset($_GET['subscribe_user_filter_value']) && !empty($_GET['subscribe_user_filter_value'])) {
+				$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
+				$sql .= "
 					LEFT JOIN $table_user_field_values field_values
 						ON field_values.item_id = u.user_id
 					WHERE
@@ -648,14 +648,14 @@ 
 						u.status<>".DRH." AND
 						field_values.field_id = '".intval($field_identification[0])."' AND
 						field_values.value = '".Database::escape_string($field_identification[1])."'";
-			} else	{
-				$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
+			} else {
+				$sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
 			}
 
 			//showing only the courses of the current Chamilo access_url_id
 
 			if (api_is_multiple_url_enabled()) {
-				if ($url_access_id !=-1) {
+				if ($url_access_id != -1) {
 					$sql = "SELECT $select_fields
 						FROM $user_table u
 						LEFT JOIN $course_user_table cu
@@ -667,9 +667,9 @@ 
 					if (isset($_GET['subscribe_user_filter_value']) &&
 						!empty($_GET['subscribe_user_filter_value']) &&
 						api_get_setting('ProfilingFilterAddingUsers') == 'true'
-					){
+					) {
 						$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
-						$sql .=	"
+						$sql .= "
 							LEFT JOIN $table_user_field_values field_values
 								ON field_values.item_id = u.user_id
 							WHERE
@@ -679,8 +679,8 @@ 
 								field_values.value = '".Database::escape_string($field_identification[1])."' AND
 								access_url_id = $url_access_id
                             ";
-					} else	{
-						$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
+					} else {
+						$sql .= "WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
 					}
 				}
 			}
@@ -718,14 +718,14 @@ 
 		}
 	}
 
-	$sql .=" AND u.status != ".ANONYMOUS." ";
+	$sql .= " AND u.status != ".ANONYMOUS." ";
 
 	// Sorting and pagination (used by the sortable table)
 	$sql .= " ORDER BY col$column $direction ";
 	$sql .= " LIMIT $from,$number_of_items";
 
 	$res = Database::query($sql);
-	$users = array ();
+	$users = array();
 	while ($user = Database::fetch_row($res)) {
 		$users[] = $user;
 		$_SESSION['session_user_id'][] = $user[0];
@@ -736,12 +736,12 @@ 
 		}
 	}
 	// adding additional users based on the search on the additional profile fields
-	if (isset($_REQUEST['keyword'])){
+	if (isset($_REQUEST['keyword'])) {
 		if (is_array($additional_users)) {
-			foreach($additional_users as $additional_user_key=>$additional_user_value){
+			foreach ($additional_users as $additional_user_key=>$additional_user_value) {
 				if (!in_array($additional_user_key, $_SESSION['session_user_id']) &&
-                    !in_array($additional_user_key,$users_of_course)
-                ){
+                    !in_array($additional_user_key, $users_of_course)
+                ) {
                     $users[] = array(
                         $additional_user_value['col0'],
                         $additional_user_value['col1'],
@@ -792,20 +792,20 @@ 
 
 function active_filter($active, $url_params, $row) {
 	$_user = api_get_user_info();
-	if ($active=='1') {
-		$action='AccountActive';
-		$image='accept';
+	if ($active == '1') {
+		$action = 'AccountActive';
+		$image = 'accept';
 	}
 
-	if ($active=='0') {
-		$action='AccountInactive';
-		$image='error';
+	if ($active == '0') {
+		$action = 'AccountInactive';
+		$image = 'error';
 	}
     $result = null;
-	if ($row['0']<>$_user['user_id']) {
+	if ($row['0'] <> $_user['user_id']) {
 	// you cannot lock yourself out otherwise you could disable all the accounts
 	// including your own => everybody is locked out and nobody can change it anymore.
-		$result = Display::return_icon($image.'.png',  get_lang(ucfirst($action)), array() , ICON_SIZE_TINY);
+		$result = Display::return_icon($image.'.png', get_lang(ucfirst($action)), array(), ICON_SIZE_TINY);
 	}
 	return $result;
 }
@@ -839,7 +839,7 @@ 
 		$profiling_field_options_exact_values[] = $profiling_field_options;
 	}
     $profiling_field_options_exact_values_sql = '';
-	foreach ($profiling_field_options_exact_values as $profilingkey => $profilingvalue){
+	foreach ($profiling_field_options_exact_values as $profilingkey => $profilingvalue) {
 		$profiling_field_options_exact_values_sql .= " OR (field_id = '".$profilingvalue['field_id']."' AND value='".$profilingvalue['option_value']."') ";
 	}
 
@@ -880,9 +880,9 @@ 
 function display_extra_profile_fields_filter()
 {
 	// getting all the additional user profile fields
-	$extra = UserManager::get_extra_fields(0,50,5,'ASC');
+	$extra = UserManager::get_extra_fields(0, 50, 5, 'ASC');
 
-	$return='<option value="">'.get_lang('SelectFilter').'</option>';
+	$return = '<option value="">'.get_lang('SelectFilter').'</option>';
 
 	// looping through the additional user profile fields
 	foreach ($extra as $id => $field_details) {
@@ -898,7 +898,7 @@ 
 			case ExtraField::FIELD_TYPE_SELECT:
 			case ExtraField::FIELD_TYPE_SELECT_MULTIPLE:
 				$return .= '<optgroup label="'.$field_details[3].'">';
-				foreach($field_details[9] as $option_id => $option_details) {
+				foreach ($field_details[9] as $option_id => $option_details) {
 					if ($_GET['subscribe_user_filter_value'] == $field_details[0].'*'.$option_details[1]) {
 						$selected = 'selected="selected"';
 					} else {

Doc Comments -1 removed lines

@@ -735,7 +735,6 @@
  * lock = the user can no longer use this account
  * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
  * @param int $active the current state of the account
- * @param int $user_id The user id
  * @param string $urlParams
  *
  * @return string Some HTML-code with the lock/unlock button

Indentation +297 added lines, -297 removed lines

@@ -24,7 +24,7 @@ 
 
 // Access restriction
 if (!api_is_allowed_to_edit()) {
-	 api_not_allowed(true);
+        api_not_allowed(true);
 }
 
 $tool_name = get_lang("SubscribeUserToCourse");
@@ -34,7 +34,7 @@ 
 $courseInfo = api_get_course_info();
 
 if ($type == COURSEMANAGER) {
-	$tool_name = get_lang("SubscribeUserToCourseAsTeacher");
+    $tool_name = get_lang("SubscribeUserToCourseAsTeacher");
 }
 
 //extra entries in breadcrumb
@@ -47,7 +47,7 @@ 
         "url" => "subscribe_user.php?type=".$type.'&'.api_get_cidreq(),
         "name" => $tool_name,
     );
-	$tool_name = get_lang('SearchResults');
+    $tool_name = get_lang('SearchResults');
 }
 
 $current_session_id = api_get_session_id();
@@ -76,7 +76,7 @@ 
         );
     }
 
-	$user_id_temp = $_SESSION['session_user_id'];
+    $user_id_temp = $_SESSION['session_user_id'];
 
     if (is_array($user_id_temp)) {
         $counter = count($user_id_temp);
@@ -169,16 +169,16 @@ 
 
             header('Location:'.api_get_path(WEB_CODE_PATH).'user/user.php?'.api_get_cidreq().'&type='.$type);
             exit;
-			break;
-	}
+            break;
+    }
 }
 
 if (!empty($_SESSION['session_user_id'])) {
-	unset($_SESSION['session_user_id']);
+    unset($_SESSION['session_user_id']);
 }
 
 if (!empty($_SESSION['session_user_name'])) {
-	unset($_SESSION['session_user_name']);
+    unset($_SESSION['session_user_name']);
 }
 
 $is_western_name_order = api_is_western_name_order();
@@ -186,10 +186,10 @@ 
 
 // Build table
 $table = new SortableTable(
-	'subscribe_users',
-	'get_number_of_users',
-	'get_user_data',
-	($is_western_name_order xor $sort_by_first_name) ? 3 : 2
+    'subscribe_users',
+    'get_number_of_users',
+    'get_user_data',
+    ($is_western_name_order xor $sort_by_first_name) ? 3 : 2
 );
 $parameters['keyword'] = $keyword;
 $parameters['type'] = $type;
@@ -272,20 +272,20 @@ 
  */
 function get_number_of_users()
 {
-	// Database table definition
-	$user_table = Database::get_main_table(TABLE_MAIN_USER);
-	$course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
-	$tbl_session_rel_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-	$table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
+    // Database table definition
+    $user_table = Database::get_main_table(TABLE_MAIN_USER);
+    $course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
+    $tbl_session_rel_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+    $table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
 
     $courseCode = api_get_course_id();
     $sessionId = api_get_session_id();
 
-	if (isset($_REQUEST['type']) && $_REQUEST['type']=='teacher') {
+    if (isset($_REQUEST['type']) && $_REQUEST['type']=='teacher') {
 
-		if (api_get_session_id() != 0) {
+        if (api_get_session_id() != 0) {
 
-			$sql = "SELECT COUNT(u.user_id)
+            $sql = "SELECT COUNT(u.user_id)
 					FROM $user_table u
 					LEFT JOIN $tbl_session_rel_course_user cu
 					ON
@@ -297,11 +297,11 @@ 
 						u.status = 1 AND
 						(u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
 
-			if (api_is_multiple_url_enabled()) {
-				$url_access_id = api_get_current_access_url_id();
-				if ($url_access_id !=-1) {
-					$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-					$sql = "SELECT COUNT(u.user_id)
+            if (api_is_multiple_url_enabled()) {
+                $url_access_id = api_get_current_access_url_id();
+                if ($url_access_id !=-1) {
+                    $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+                    $sql = "SELECT COUNT(u.user_id)
 							FROM $user_table u
 							LEFT JOIN $tbl_session_rel_course_user cu
 							ON
@@ -315,34 +315,34 @@ 
 								u.status = 1 AND
 								(u.official_code <> 'ADMIN' OR u.official_code IS NULL)
 							";
-				}
-			}
-		} else {
-			$sql = "SELECT COUNT(u.user_id)
+                }
+            }
+        } else {
+            $sql = "SELECT COUNT(u.user_id)
 					FROM $user_table u
 					LEFT JOIN $course_user_table cu
 					ON u.user_id = cu.user_id and c_id='".api_get_course_int_id()."'
 				    WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
 
-			if (api_is_multiple_url_enabled()) {
-				$url_access_id = api_get_current_access_url_id();
-				if ($url_access_id !=-1) {
-					$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+            if (api_is_multiple_url_enabled()) {
+                $url_access_id = api_get_current_access_url_id();
+                if ($url_access_id !=-1) {
+                    $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 
-					$sql = "SELECT COUNT(u.user_id)
+                    $sql = "SELECT COUNT(u.user_id)
 						FROM $user_table u
 						LEFT JOIN $course_user_table cu
 						ON u.user_id = cu.user_id AND c_id='".api_get_course_int_id()."'
 						INNER JOIN  $tbl_url_rel_user as url_rel_user
 						ON (url_rel_user.user_id = u.user_id)
 						WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
-				}
-			}
-		}
-	} else {
-		// students
-		if (api_get_session_id() != 0) {
-			$sql = "SELECT COUNT(u.user_id)
+                }
+            }
+        }
+    } else {
+        // students
+        if (api_get_session_id() != 0) {
+            $sql = "SELECT COUNT(u.user_id)
 					FROM $user_table u
 					LEFT JOIN $tbl_session_rel_course_user cu
 					ON
@@ -354,11 +354,11 @@ 
 						u.status<>".DRH." AND
 						(u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
 
-			if (api_is_multiple_url_enabled()) {
-				$url_access_id = api_get_current_access_url_id();
-				if ($url_access_id !=-1) {
-					$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
-					$sql = "SELECT COUNT(u.user_id)
+            if (api_is_multiple_url_enabled()) {
+                $url_access_id = api_get_current_access_url_id();
+                if ($url_access_id !=-1) {
+                    $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+                    $sql = "SELECT COUNT(u.user_id)
 							FROM $user_table u
 							LEFT JOIN $tbl_session_rel_course_user cu
 							ON
@@ -372,21 +372,21 @@ 
 								u.status<>".DRH." AND
 								access_url_id= $url_access_id AND
 								(u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
-				}
-			}
-		} else {
-			$sql = "SELECT COUNT(u.user_id)
+                }
+            }
+        } else {
+            $sql = "SELECT COUNT(u.user_id)
 					FROM $user_table u
 					LEFT JOIN $course_user_table cu
 					ON u.user_id = cu.user_id AND c_id='".api_get_course_int_id()."'";
 
-			// we change the SQL when we have a filter
-			if (isset($_GET['subscribe_user_filter_value']) &&
+            // we change the SQL when we have a filter
+            if (isset($_GET['subscribe_user_filter_value']) &&
                 !empty($_GET['subscribe_user_filter_value']) &&
                 api_get_setting('ProfilingFilterAddingUsers') == 'true'
             ){
-				$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-				$sql .=	"
+                $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
+                $sql .=	"
 					LEFT JOIN $table_user_field_values field_values
 					ON field_values.item_id = u.user_id
 					WHERE
@@ -395,32 +395,32 @@ 
 						field_values.field_id = '".intval($field_identification[0])."' AND
 						field_values.value = '".Database::escape_string($field_identification[1])."'
 					";
-			} else	{
-				$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
-			}
+            } else	{
+                $sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
+            }
 
-			if (api_is_multiple_url_enabled()) {
-				$url_access_id = api_get_current_access_url_id();
+            if (api_is_multiple_url_enabled()) {
+                $url_access_id = api_get_current_access_url_id();
 
-				if ($url_access_id !=-1) {
+                if ($url_access_id !=-1) {
 
-					$tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+                    $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 
-					$sql = "SELECT COUNT(u.user_id)
+                    $sql = "SELECT COUNT(u.user_id)
 							FROM $user_table u
 							LEFT JOIN $course_user_table cu on u.user_id = cu.user_id and c_id='".api_get_course_int_id()."'
 							INNER JOIN  $tbl_url_rel_user as url_rel_user
 							ON (url_rel_user.user_id = u.user_id)
 							WHERE cu.user_id IS NULL AND access_url_id= $url_access_id AND u.status<>".DRH." ";
-				}
-			}
-		}
-	}
-
-	// when there is a keyword then we are searching and we have to change the SQL statement
-	if (isset($_GET['keyword']) AND !empty($_GET['keyword'])) {
-		$keyword = Database::escape_string(trim($_REQUEST['keyword']));
-		$sql .= " AND (
+                }
+            }
+        }
+    }
+
+    // when there is a keyword then we are searching and we have to change the SQL statement
+    if (isset($_GET['keyword']) AND !empty($_GET['keyword'])) {
+        $keyword = Database::escape_string(trim($_REQUEST['keyword']));
+        $sql .= " AND (
 		    firstname LIKE '%".$keyword."%' OR
 		    lastname LIKE '%".$keyword."%' OR
 		    email LIKE '%".$keyword."%' OR
@@ -428,37 +428,37 @@ 
 		    official_code LIKE '%".$keyword."%'
         )";
 
-		// we also want to search for users who have something in their profile fields that matches the keyword
-		if (api_get_setting('ProfilingFilterAddingUsers') == 'true') {
-			$additional_users = search_additional_profile_fields($keyword);
-		}
+        // we also want to search for users who have something in their profile fields that matches the keyword
+        if (api_get_setting('ProfilingFilterAddingUsers') == 'true') {
+            $additional_users = search_additional_profile_fields($keyword);
+        }
 
-		// getting all the users of the course (to make sure that we do not display users that are already in the course)
-		if (!empty($_SESSION["id_session"])) {
+        // getting all the users of the course (to make sure that we do not display users that are already in the course)
+        if (!empty($_SESSION["id_session"])) {
             $a_course_users = CourseManager:: get_user_list_from_course_code(
                 $courseCode,
                 $sessionId
             );
-		} else {
+        } else {
             $a_course_users = CourseManager:: get_user_list_from_course_code(
                 $courseCode,
                 0
             );
-	    }
-		foreach ($a_course_users as $user_id=>$course_user) {
-			$users_of_course[] = $course_user['user_id'];
-	    }
-	}
+        }
+        foreach ($a_course_users as $user_id=>$course_user) {
+            $users_of_course[] = $course_user['user_id'];
+        }
+    }
     $sql .=" AND u.status <> ".ANONYMOUS." ";
-	$res = Database::query($sql);
+    $res = Database::query($sql);
     $count_user = 0;
 
     if ($res) {
-	   $row = Database::fetch_row($res);
-	   $count_user = $row[0];
-	}
+        $row = Database::fetch_row($res);
+        $count_user = $row[0];
+    }
 
-	return $count_user;
+    return $count_user;
 }
 /**
  * Get the users to display on the current page.
@@ -468,17 +468,17 @@ 
     $url_access_id = api_get_current_access_url_id();
     $course_code = api_get_course_id();
     $session_id = api_get_session_id();
-	$courseId = api_get_course_int_id();
+    $courseId = api_get_course_int_id();
 
-	// Database table definitions
-	$user_table = Database::get_main_table(TABLE_MAIN_USER);
-	$course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
-	$tbl_session_rel_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
-	$table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
+    // Database table definitions
+    $user_table = Database::get_main_table(TABLE_MAIN_USER);
+    $course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
+    $tbl_session_rel_course_user = Database::get_main_table(TABLE_MAIN_SESSION_COURSE_USER);
+    $table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
     $tbl_url_rel_user = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
 
     // adding teachers
-	$is_western_name_order = api_is_western_name_order();
+    $is_western_name_order = api_is_western_name_order();
 
     if (api_get_setting('show_email_addresses') == 'true') {
 
@@ -503,10 +503,10 @@ 
                 u.active               AS col4,
                 u.user_id              AS col5";
     }
-	if (isset($_REQUEST['type']) && $_REQUEST['type'] == COURSEMANAGER) {
-		// adding a teacher through a session
-		if (!empty($session_id)) {
-			$sql = "SELECT $select_fields
+    if (isset($_REQUEST['type']) && $_REQUEST['type'] == COURSEMANAGER) {
+        // adding a teacher through a session
+        if (!empty($session_id)) {
+            $sql = "SELECT $select_fields
 					FROM $user_table u
 					LEFT JOIN $tbl_session_rel_course_user cu
 					ON
@@ -516,13 +516,13 @@ 
                     INNER JOIN  $tbl_url_rel_user as url_rel_user
                     ON (url_rel_user.user_id = u.user_id) ";
 
-			// applying the filter of the additional user profile fields
-			if (isset($_GET['subscribe_user_filter_value']) &&
-				!empty($_GET['subscribe_user_filter_value']) &&
-				api_get_setting('ProfilingFilterAddingUsers') == 'true'
-			) {
-				$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-				$sql .=	"
+            // applying the filter of the additional user profile fields
+            if (isset($_GET['subscribe_user_filter_value']) &&
+                !empty($_GET['subscribe_user_filter_value']) &&
+                api_get_setting('ProfilingFilterAddingUsers') == 'true'
+            ) {
+                $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
+                $sql .=	"
 					LEFT JOIN $table_user_field_values field_values
 						ON field_values.item_id = u.user_id
 					WHERE
@@ -531,53 +531,53 @@ 
 						(u.official_code <> 'ADMIN' OR u.official_code IS NULL) AND
 						field_values.field_id = '".intval($field_identification[0])."' AND
 						field_values.value = '".Database::escape_string($field_identification[1])."'";
-			} else {
-				$sql .=	"WHERE cu.user_id IS NULL AND u.status=1 AND (u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
-			}
+            } else {
+                $sql .=	"WHERE cu.user_id IS NULL AND u.status=1 AND (u.official_code <> 'ADMIN' OR u.official_code IS NULL) ";
+            }
 
             $sql .=	" AND access_url_id= $url_access_id";
 
-		} else {
-		     // adding a teacher NOT through a session
-			$sql = "SELECT $select_fields
+        } else {
+                // adding a teacher NOT through a session
+            $sql = "SELECT $select_fields
                     FROM $user_table u
                     LEFT JOIN $course_user_table cu
                     ON u.user_id = cu.user_id AND c_id = '".$courseId."'";
 
-				// applying the filter of the additional user profile fields
-				if (isset($_GET['subscribe_user_filter_value']) &&
-					!empty($_GET['subscribe_user_filter_value']) &&
-					api_get_setting('ProfilingFilterAddingUsers') == 'true'
-				) {
-					$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-					$sql .=	"
+                // applying the filter of the additional user profile fields
+                if (isset($_GET['subscribe_user_filter_value']) &&
+                    !empty($_GET['subscribe_user_filter_value']) &&
+                    api_get_setting('ProfilingFilterAddingUsers') == 'true'
+                ) {
+                    $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
+                    $sql .=	"
 						LEFT JOIN $table_user_field_values field_values
 							ON field_values.item_id = u.user_id
 						WHERE
 							cu.user_id IS NULL AND u.status<>".DRH." AND
 							field_values.field_id = '".intval($field_identification[0])."' AND
 							field_values.value = '".Database::escape_string($field_identification[1])."'";
-				} else	{
-					$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
-				}
-
-				// adding a teacher NOT trough a session on a portal with multiple URLs
-				if (api_is_multiple_url_enabled()) {
-					if ($url_access_id !=-1) {
-						$sql = "SELECT $select_fields
+                } else	{
+                    $sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
+                }
+
+                // adding a teacher NOT trough a session on a portal with multiple URLs
+                if (api_is_multiple_url_enabled()) {
+                    if ($url_access_id !=-1) {
+                        $sql = "SELECT $select_fields
 						FROM $user_table u
 						LEFT JOIN $course_user_table cu
 						ON u.user_id = cu.user_id and c_id='".$courseId."'
 						INNER JOIN  $tbl_url_rel_user as url_rel_user
 						ON (url_rel_user.user_id = u.user_id) ";
 
-					// applying the filter of the additional user profile fields
-					if (isset($_GET['subscribe_user_filter_value']) &&
-						!empty($_GET['subscribe_user_filter_value']) &&
-						api_get_setting('ProfilingFilterAddingUsers') == 'true'
-					){
-						$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
-						$sql .=	"
+                    // applying the filter of the additional user profile fields
+                    if (isset($_GET['subscribe_user_filter_value']) &&
+                        !empty($_GET['subscribe_user_filter_value']) &&
+                        api_get_setting('ProfilingFilterAddingUsers') == 'true'
+                    ){
+                        $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
+                        $sql .=	"
 							LEFT JOIN $table_user_field_values field_values
 								ON field_values.item_id = u.user_id
 							WHERE
@@ -585,16 +585,16 @@ 
 							 	u.status<>".DRH." AND
 							 	field_values.field_id = '".intval($field_identification[0])."' AND
 							 	field_values.value = '".Database::escape_string($field_identification[1])."'";
-					} else	{
-						$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
-					}
-				}
-			}
-		}
-	} else {
-		// adding a student
-		if (!empty($session_id)) {
-			$sql = "SELECT $select_fields
+                    } else	{
+                        $sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
+                    }
+                }
+            }
+        }
+    } else {
+        // adding a student
+        if (!empty($session_id)) {
+            $sql = "SELECT $select_fields
                     FROM $user_table u
                     LEFT JOIN $tbl_session_rel_course_user cu
                     ON
@@ -629,7 +629,7 @@ 
                 $sql .=  "AND access_url_id = $url_access_id";
             }
 
-		} else {
+        } else {
             $sql = "SELECT $select_fields
                     FROM $user_table u
                     LEFT JOIN $course_user_table cu
@@ -637,10 +637,10 @@ 
                     	u.user_id = cu.user_id AND
                     	c_id ='".$courseId."'";
 
-			// applying the filter of the additional user profile fields
-			if (isset($_GET['subscribe_user_filter_value']) && !empty($_GET['subscribe_user_filter_value'])){
-				$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-				$sql .=	"
+            // applying the filter of the additional user profile fields
+            if (isset($_GET['subscribe_user_filter_value']) && !empty($_GET['subscribe_user_filter_value'])){
+                $field_identification = explode('*',$_GET['subscribe_user_filter_value']);
+                $sql .=	"
 					LEFT JOIN $table_user_field_values field_values
 						ON field_values.item_id = u.user_id
 					WHERE
@@ -648,28 +648,28 @@ 
 						u.status<>".DRH." AND
 						field_values.field_id = '".intval($field_identification[0])."' AND
 						field_values.value = '".Database::escape_string($field_identification[1])."'";
-			} else	{
-				$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
-			}
+            } else	{
+                $sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." ";
+            }
 
-			//showing only the courses of the current Chamilo access_url_id
+            //showing only the courses of the current Chamilo access_url_id
 
-			if (api_is_multiple_url_enabled()) {
-				if ($url_access_id !=-1) {
-					$sql = "SELECT $select_fields
+            if (api_is_multiple_url_enabled()) {
+                if ($url_access_id !=-1) {
+                    $sql = "SELECT $select_fields
 						FROM $user_table u
 						LEFT JOIN $course_user_table cu
 						ON u.user_id = cu.user_id AND c_id='".$courseId."'
 						INNER JOIN  $tbl_url_rel_user as url_rel_user
 						ON (url_rel_user.user_id = u.user_id) ";
 
-					// applying the filter of the additional user profile fields
-					if (isset($_GET['subscribe_user_filter_value']) &&
-						!empty($_GET['subscribe_user_filter_value']) &&
-						api_get_setting('ProfilingFilterAddingUsers') == 'true'
-					){
-						$field_identification = explode('*', $_GET['subscribe_user_filter_value']);
-						$sql .=	"
+                    // applying the filter of the additional user profile fields
+                    if (isset($_GET['subscribe_user_filter_value']) &&
+                        !empty($_GET['subscribe_user_filter_value']) &&
+                        api_get_setting('ProfilingFilterAddingUsers') == 'true'
+                    ){
+                        $field_identification = explode('*', $_GET['subscribe_user_filter_value']);
+                        $sql .=	"
 							LEFT JOIN $table_user_field_values field_values
 								ON field_values.item_id = u.user_id
 							WHERE
@@ -679,19 +679,19 @@ 
 								field_values.value = '".Database::escape_string($field_identification[1])."' AND
 								access_url_id = $url_access_id
                             ";
-					} else	{
-						$sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
-					}
-				}
-			}
-		}
-	}
-
-	// adding additional WHERE statements to the SQL for the search functionality
+                    } else	{
+                        $sql .=	"WHERE cu.user_id IS NULL AND u.status<>".DRH." AND access_url_id= $url_access_id ";
+                    }
+                }
+            }
+        }
+    }
+
+    // adding additional WHERE statements to the SQL for the search functionality
     $additional_users = null;
-	if (isset($_REQUEST['keyword'])) {
-		$keyword = Database::escape_string(trim($_REQUEST['keyword']));
-		$sql .= " AND (
+    if (isset($_REQUEST['keyword'])) {
+        $keyword = Database::escape_string(trim($_REQUEST['keyword']));
+        $sql .= " AND (
 					firstname LIKE '%".$keyword."%' OR
 					lastname LIKE '%".$keyword."%' OR
 					email LIKE '%".$keyword."%' OR
@@ -700,46 +700,46 @@ 
 					)
 				";
 
-		if (api_get_setting('ProfilingFilterAddingUsers') == 'true') {
-			// we also want to search for users who have something in
-			// their profile fields that matches the keyword
-			$additional_users = search_additional_profile_fields($keyword);
-		}
-
-		// getting all the users of the course (to make sure that we do not
-		// display users that are already in the course)
-		if (!empty($session_id)) {
-			$a_course_users = CourseManager :: get_user_list_from_course_code($course_code, $session_id);
-		} else {
-			$a_course_users = CourseManager :: get_user_list_from_course_code($course_code, 0);
-	    }
-		foreach ($a_course_users as $user_id=>$course_user) {
-			$users_of_course[] = $course_user['user_id'];
-		}
-	}
-
-	$sql .=" AND u.status != ".ANONYMOUS." ";
-
-	// Sorting and pagination (used by the sortable table)
-	$sql .= " ORDER BY col$column $direction ";
-	$sql .= " LIMIT $from,$number_of_items";
-
-	$res = Database::query($sql);
-	$users = array ();
-	while ($user = Database::fetch_row($res)) {
-		$users[] = $user;
-		$_SESSION['session_user_id'][] = $user[0];
-		if ($is_western_name_order) {
-			$_SESSION['session_user_name'][] = api_get_person_name($user[2], $user[3]);
-		} else {
-			$_SESSION['session_user_name'][] = api_get_person_name($user[3], $user[2]);
-		}
-	}
-	// adding additional users based on the search on the additional profile fields
-	if (isset($_REQUEST['keyword'])){
-		if (is_array($additional_users)) {
-			foreach($additional_users as $additional_user_key=>$additional_user_value){
-				if (!in_array($additional_user_key, $_SESSION['session_user_id']) &&
+        if (api_get_setting('ProfilingFilterAddingUsers') == 'true') {
+            // we also want to search for users who have something in
+            // their profile fields that matches the keyword
+            $additional_users = search_additional_profile_fields($keyword);
+        }
+
+        // getting all the users of the course (to make sure that we do not
+        // display users that are already in the course)
+        if (!empty($session_id)) {
+            $a_course_users = CourseManager :: get_user_list_from_course_code($course_code, $session_id);
+        } else {
+            $a_course_users = CourseManager :: get_user_list_from_course_code($course_code, 0);
+        }
+        foreach ($a_course_users as $user_id=>$course_user) {
+            $users_of_course[] = $course_user['user_id'];
+        }
+    }
+
+    $sql .=" AND u.status != ".ANONYMOUS." ";
+
+    // Sorting and pagination (used by the sortable table)
+    $sql .= " ORDER BY col$column $direction ";
+    $sql .= " LIMIT $from,$number_of_items";
+
+    $res = Database::query($sql);
+    $users = array ();
+    while ($user = Database::fetch_row($res)) {
+        $users[] = $user;
+        $_SESSION['session_user_id'][] = $user[0];
+        if ($is_western_name_order) {
+            $_SESSION['session_user_name'][] = api_get_person_name($user[2], $user[3]);
+        } else {
+            $_SESSION['session_user_name'][] = api_get_person_name($user[3], $user[2]);
+        }
+    }
+    // adding additional users based on the search on the additional profile fields
+    if (isset($_REQUEST['keyword'])){
+        if (is_array($additional_users)) {
+            foreach($additional_users as $additional_user_key=>$additional_user_value){
+                if (!in_array($additional_user_key, $_SESSION['session_user_id']) &&
                     !in_array($additional_user_key,$users_of_course)
                 ){
                     $users[] = array(
@@ -751,11 +751,11 @@ 
                         $additional_user_value['col5'],
                         $additional_user_value['col6'],
                     );
-				}
-			}
-		}
-	}
-	return $users;
+                }
+            }
+        }
+    }
+    return $users;
 }
 /**
 * Returns a mailto-link
@@ -763,7 +763,7 @@ 
 * @return string HTML-code with a mailto-link
 */
 function email_filter($email) {
-	return Display :: encrypted_mailto_link($email, $email);
+    return Display :: encrypted_mailto_link($email, $email);
 }
 /**
  * Build the reg-column of the table
@@ -776,8 +776,8 @@ 
     } else {
         $type = STUDENT;
     }
-	$result = '<a class="btn btn-small btn-primary" href="'.api_get_self().'?register=yes&type='.$type.'&user_id='.$user_id.'">'.get_lang("reg").'</a>';
-	return $result;
+    $result = '<a class="btn btn-small btn-primary" href="'.api_get_self().'?register=yes&type='.$type.'&user_id='.$user_id.'">'.get_lang("reg").'</a>';
+    return $result;
 }
 
 /**
@@ -791,23 +791,23 @@ 
  */
 
 function active_filter($active, $url_params, $row) {
-	$_user = api_get_user_info();
-	if ($active=='1') {
-		$action='AccountActive';
-		$image='accept';
-	}
-
-	if ($active=='0') {
-		$action='AccountInactive';
-		$image='error';
-	}
+    $_user = api_get_user_info();
+    if ($active=='1') {
+        $action='AccountActive';
+        $image='accept';
+    }
+
+    if ($active=='0') {
+        $action='AccountInactive';
+        $image='error';
+    }
     $result = null;
-	if ($row['0']<>$_user['user_id']) {
-	// you cannot lock yourself out otherwise you could disable all the accounts
-	// including your own => everybody is locked out and nobody can change it anymore.
-		$result = Display::return_icon($image.'.png',  get_lang(ucfirst($action)), array() , ICON_SIZE_TINY);
-	}
-	return $result;
+    if ($row['0']<>$_user['user_id']) {
+    // you cannot lock yourself out otherwise you could disable all the accounts
+    // including your own => everybody is locked out and nobody can change it anymore.
+        $result = Display::return_icon($image.'.png',  get_lang(ucfirst($action)), array() , ICON_SIZE_TINY);
+    }
+    return $result;
 }
 
 /**
@@ -825,29 +825,29 @@ 
  */
 function search_additional_profile_fields($keyword)
 {
-	// database table definitions
-	$table_user_field_options = Database :: get_main_table(TABLE_EXTRA_FIELD_OPTIONS);
-	$table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
+    // database table definitions
+    $table_user_field_options = Database :: get_main_table(TABLE_EXTRA_FIELD_OPTIONS);
+    $table_user_field_values = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
     $tableExtraField = Database::get_main_table(TABLE_EXTRA_FIELD);
-	$table_user = Database::get_main_table(TABLE_MAIN_USER);
+    $table_user = Database::get_main_table(TABLE_MAIN_USER);
 
-	// getting the field option text that match this keyword (for radio buttons and checkboxes)
-	$sql = "SELECT * FROM $table_user_field_options
+    // getting the field option text that match this keyword (for radio buttons and checkboxes)
+    $sql = "SELECT * FROM $table_user_field_options
 	        WHERE display_text LIKE '%".$keyword."%'";
-	$result_profiling = Database::query($sql);
-	while ($profiling_field_options = Database::fetch_array($result_profiling)) {
-		$profiling_field_options_exact_values[] = $profiling_field_options;
-	}
+    $result_profiling = Database::query($sql);
+    while ($profiling_field_options = Database::fetch_array($result_profiling)) {
+        $profiling_field_options_exact_values[] = $profiling_field_options;
+    }
     $profiling_field_options_exact_values_sql = '';
-	foreach ($profiling_field_options_exact_values as $profilingkey => $profilingvalue){
-		$profiling_field_options_exact_values_sql .= " OR (field_id = '".$profilingvalue['field_id']."' AND value='".$profilingvalue['option_value']."') ";
-	}
+    foreach ($profiling_field_options_exact_values as $profilingkey => $profilingvalue){
+        $profiling_field_options_exact_values_sql .= " OR (field_id = '".$profilingvalue['field_id']."' AND value='".$profilingvalue['option_value']."') ";
+    }
 
     $extraFieldType = \Chamilo\CoreBundle\Entity\ExtraField::USER_FIELD_TYPE;
 
-	// getting all the user ids of the users who have chosen on of the predefined fields that contain the keyword
-	// or all the users who have entered the keyword in a free-form field
-	$sql = "SELECT
+    // getting all the user ids of the users who have chosen on of the predefined fields that contain the keyword
+    // or all the users who have entered the keyword in a free-form field
+    $sql = "SELECT
 	            user.user_id as col0,
 	            user.official_code as col1,
 	            user.lastname as col2,
@@ -861,13 +861,13 @@ 
                 user_values.field_id = e.id AND
                 e.extra_field_type = $extraFieldType AND
                 (value LIKE '%".$keyword."%'".$profiling_field_options_exact_values_sql.")";
-	$result = Database::query($sql);
+    $result = Database::query($sql);
     $additional_users = array();
-	while ($profiled_users = Database::fetch_array($result)) {
-		$additional_users[$profiled_users['col0']] = $profiled_users;
-	}
+    while ($profiled_users = Database::fetch_array($result)) {
+        $additional_users[$profiled_users['col0']] = $profiled_users;
+    }
 
-	return $additional_users;
+    return $additional_users;
 }
 
 /**
@@ -879,41 +879,41 @@ 
  */
 function display_extra_profile_fields_filter()
 {
-	// getting all the additional user profile fields
-	$extra = UserManager::get_extra_fields(0,50,5,'ASC');
-
-	$return='<option value="">'.get_lang('SelectFilter').'</option>';
-
-	// looping through the additional user profile fields
-	foreach ($extra as $id => $field_details) {
-		// $field_details[2] contains the type of the additional user profile field
-		switch ($field_details[2]) {
-			// text fields cannot be used as a filter
-			case ExtraField::FIELD_TYPE_TEXT:
-				break;
-			// text area fields cannot be used as a filter
-			case ExtraField::FIELD_TYPE_TEXTAREA:
-				break;
-			case ExtraField::FIELD_TYPE_RADIO:
-			case ExtraField::FIELD_TYPE_SELECT:
-			case ExtraField::FIELD_TYPE_SELECT_MULTIPLE:
-				$return .= '<optgroup label="'.$field_details[3].'">';
-				foreach($field_details[9] as $option_id => $option_details) {
-					if ($_GET['subscribe_user_filter_value'] == $field_details[0].'*'.$option_details[1]) {
-						$selected = 'selected="selected"';
-					} else {
-						$selected = false;
-					}
-					$return .= '<option value="'.$field_details[0].'*'.$option_details[1].'" '.$selected.'>'.$option_details[2].'</option>';
-				}
-				$return .= '</optgroup>';
-				break;
-		}
-	}
-
-	echo '<form id="subscribe_user_filter" name="subscribe_user_filter" method="get" action="'.api_get_self().'?api_get_cidreq" style="float:left;">';
-	echo '	<input type="hidden" name="type" id="type" value="'.Security::remove_XSS($_REQUEST['type']).'" />';
-	echo   '<select name="subscribe_user_filter_value" id="subscribe_user_filter_value">'.$return.'</select>';
-	echo   '<button type="submit" name="submit_filter" id="submit_filter" value="" class="search">'.get_lang('Filter').'</button>';
-	echo '</form>';
+    // getting all the additional user profile fields
+    $extra = UserManager::get_extra_fields(0,50,5,'ASC');
+
+    $return='<option value="">'.get_lang('SelectFilter').'</option>';
+
+    // looping through the additional user profile fields
+    foreach ($extra as $id => $field_details) {
+        // $field_details[2] contains the type of the additional user profile field
+        switch ($field_details[2]) {
+            // text fields cannot be used as a filter
+            case ExtraField::FIELD_TYPE_TEXT:
+                break;
+            // text area fields cannot be used as a filter
+            case ExtraField::FIELD_TYPE_TEXTAREA:
+                break;
+            case ExtraField::FIELD_TYPE_RADIO:
+            case ExtraField::FIELD_TYPE_SELECT:
+            case ExtraField::FIELD_TYPE_SELECT_MULTIPLE:
+                $return .= '<optgroup label="'.$field_details[3].'">';
+                foreach($field_details[9] as $option_id => $option_details) {
+                    if ($_GET['subscribe_user_filter_value'] == $field_details[0].'*'.$option_details[1]) {
+                        $selected = 'selected="selected"';
+                    } else {
+                        $selected = false;
+                    }
+                    $return .= '<option value="'.$field_details[0].'*'.$option_details[1].'" '.$selected.'>'.$option_details[2].'</option>';
+                }
+                $return .= '</optgroup>';
+                break;
+        }
+    }
+
+    echo '<form id="subscribe_user_filter" name="subscribe_user_filter" method="get" action="'.api_get_self().'?api_get_cidreq" style="float:left;">';
+    echo '	<input type="hidden" name="type" id="type" value="'.Security::remove_XSS($_REQUEST['type']).'" />';
+    echo   '<select name="subscribe_user_filter_value" id="subscribe_user_filter_value">'.$return.'</select>';
+    echo   '<button type="submit" name="submit_filter" id="submit_filter" value="" class="search">'.get_lang('Filter').'</button>';
+    echo '</form>';
 }

main/user/subscribe_class.php

Spacing +7 added lines, -7 removed lines

@@ -51,7 +51,7 @@ 
     $courseCode = api_get_course_id();
 
     $sql = "SELECT * FROM $course_class_table
-            WHERE course_code = '" . $courseCode. "'";
+            WHERE course_code = '".$courseCode."'";
     $res = Database::query($sql);
     $subscribed_classes = array();
     while ($obj = Database::fetch_object($res)) {
@@ -60,10 +60,10 @@ 
     $sql = "SELECT c.id	FROM $class_table c WHERE 1 = 1";
     if (isset($_GET['keyword'])) {
         $keyword = Database::escape_string(trim($_GET['keyword']));
-        $sql .= " AND (c.name LIKE '%" . $keyword . "%')";
+        $sql .= " AND (c.name LIKE '%".$keyword."%')";
     }
     if (count($subscribed_classes) > 0) {
-        $sql .= " AND c.id NOT IN ('" . implode("','", $subscribed_classes) . "')";
+        $sql .= " AND c.id NOT IN ('".implode("','", $subscribed_classes)."')";
     }
     $res = Database::query($sql);
     $result = Database::num_rows($res);
@@ -81,7 +81,7 @@ 
     $class_user_table = Database :: get_main_table(TABLE_MAIN_CLASS_USER);
     $courseCode = api_get_course_id();
 
-    $sql = "SELECT * FROM $course_class_table WHERE course_code = '" . $courseCode . "'";
+    $sql = "SELECT * FROM $course_class_table WHERE course_code = '".$courseCode."'";
     $res = Database::query($sql);
     $subscribed_classes = array();
     while ($obj = Database::fetch_object($res)) {
@@ -97,10 +97,10 @@ 
     $sql .= " WHERE 1 = 1";
     if (isset($_GET['keyword'])) {
         $keyword = Database::escape_string(trim($_GET['keyword']));
-        $sql .= " AND (c.name LIKE '%" . $keyword . "%')";
+        $sql .= " AND (c.name LIKE '%".$keyword."%')";
     }
     if (count($subscribed_classes) > 0) {
-        $sql .= " AND c.id NOT IN ('" . implode("','", $subscribed_classes) . "')";
+        $sql .= " AND c.id NOT IN ('".implode("','", $subscribed_classes)."')";
     }
     $sql .= " GROUP BY c.id, c.name ";
     $sql .= " ORDER BY col$column $direction ";
@@ -119,7 +119,7 @@ 
  * @return string Some HTML-code
  */
 function reg_filter($class_id) {
-    $result = "<a href=\"" . api_get_self() . "?register=yes&amp;class_id=" . $class_id . "\">" . get_lang("reg") . "</a>";
+    $result = "<a href=\"".api_get_self()."?register=yes&amp;class_id=".$class_id."\">".get_lang("reg")."</a>";
     return $result;
 }
 

plugin/openmeetings/lang/english.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
 $strings['VideoConferenceAddedToTheCalendar']   = "Videoconference added to the calendar";
 $strings['VideoConferenceAddedToTheLinkTool']   = "Videoconference added to the link tool";
 
-$strings['GoToTheVideoConference']   = "Go to the videoconference";
+$strings['GoToTheVideoConference'] = "Go to the videoconference";
 
 $strings['Records']             = "Recording";
 $strings['Meeting']             = "Meeting";
@@ -31,7 +31,7 @@ 
 $strings['EnterConference']     = "Enter the videoconference";
 $strings['RecordList']          = "Recording list";
 $strings['ServerIsNotRunning']  = "Videoconference server is not running";
-$strings['ServerIsNotConfigured']  = "Videoconference server is not configured";
+$strings['ServerIsNotConfigured'] = "Videoconference server is not configured";
 
 $strings['XUsersOnLine']        = "%s user(s) online";
 

plugin/openmeetings/lang/french.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 $strings['VideoConferenceAddedToTheCalendar']   = "Vidéoconférence ajoutée au calendrier";
 $strings['VideoConferenceAddedToTheLinkTool']   = "Vidéoconférence ajoutée comme lien. Vous pouvez éditer et publier le lien sur la page principale du cours depuis l'outil liens.";
 
-$strings['GoToTheVideoConference']   = "Entrer dans la salle de conférence";
+$strings['GoToTheVideoConference'] = "Entrer dans la salle de conférence";
 
 $strings['Records']             = "Enregistrement";
 $strings['Meeting']             = "Salle de conférence";
@@ -24,7 +24,7 @@ 
 $strings['EnterConference']     = "Entrer dans la salle de conférence";
 $strings['RecordList']          = "Liste des enregistrements";
 $strings['ServerIsNotRunning']  = "Le serveur de vidéoconférence ne fonctionne pas";
-$strings['ServerIsNotConfigured']  = "Le serveur de vidéoconférence n'est pas configuré correctement";
+$strings['ServerIsNotConfigured'] = "Le serveur de vidéoconférence n'est pas configuré correctement";
 
 $strings['XUsersOnLine']        = "%s utilisateurs dans la salle";
 

plugin/openmeetings/lang/spanish.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 $strings['VideoConferenceAddedToTheCalendar']   = "Videoconferencia añadida al calendario";
 $strings['VideoConferenceAddedToTheLinkTool']   = "Videoconferencia añadida como enlace. Puede editar y publicar el enlace en la página principal del curso desde la herramienta de enlace.";
 
-$strings['GoToTheVideoConference']   = "Ir a la videoconferencia";
+$strings['GoToTheVideoConference'] = "Ir a la videoconferencia";
 
 $strings['Records']             = "Grabación";
 $strings['Meeting']             = "Sala de conferencia";
@@ -24,7 +24,7 @@ 
 $strings['EnterConference']     = "Entrar a la videoconferencia";
 $strings['RecordList']          = "Lista de grabaciones";
 $strings['ServerIsNotRunning']  = "El servidor de videoconferencia no está funcionando";
-$strings['ServerIsNotConfigured']  = "El servidor de videoconferencia no está configurado correctamente";
+$strings['ServerIsNotConfigured'] = "El servidor de videoconferencia no está configurado correctamente";
 
 $strings['XUsersOnLine']        = "%s usuario(s) en la sala";
 

plugin/createdrupaluser/index.php

Spacing +1 added lines, -1 removed lines

@@ -5,6 +5,6 @@
  * @author Imanol Losada Oriol <imanol.losada@beeznest.com>
  * @package chamilo.plugin.skype
  */
-require_once __DIR__ . '/config.php';
+require_once __DIR__.'/config.php';
 
 Skype::create()->install();

plugin/createdrupaluser/config.php

Spacing +1 added lines, -1 removed lines

@@ -6,4 +6,4 @@
  * @package chamilo.plugin.skype
  */
 
-require_once api_get_path(SYS_PATH) . 'main/inc/global.inc.php';
+require_once api_get_path(SYS_PATH).'main/inc/global.inc.php';

plugin/createdrupaluser/install.php

Spacing +1 added lines, -1 removed lines

@@ -5,6 +5,6 @@
  * @author Imanol Losada Oriol <imanol.losada@beeznest.com>
  * @package chamilo.plugin.skype
  */
-require_once __DIR__ . '/config.php';
+require_once __DIR__.'/config.php';
 
 Skype::create()->install();