From e75f5d88881addeb0ddcf2cfa3054f2ffd978f94 Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Tue, 11 Oct 2016 14:12:59 +0200 Subject: [PATCH] Minor - format code + add message --- main/group/group.php | 4 ++++ main/group/group_edit.php | 19 +++++++++++++------ main/group/group_space.php | 1 + 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/main/group/group.php b/main/group/group.php index c5a9293150..204881668a 100755 --- a/main/group/group.php +++ b/main/group/group.php @@ -77,6 +77,10 @@ if (isset($_GET['action']) && $is_allowed_in_course) { Display::addFlash(Display::return_message(get_lang('GroupNowMember'))); header("Location: $currentUrl"); exit; + } else { + Display::addFlash(Display::return_message(get_lang('Error'))); + header("Location: $currentUrl"); + exit; } break; case 'self_unreg': diff --git a/main/group/group_edit.php b/main/group/group_edit.php index dba27e47f3..55dc4f666a 100755 --- a/main/group/group_edit.php +++ b/main/group/group_edit.php @@ -104,7 +104,7 @@ function check_group_members($value) return true; } if (isset($value['max_member']) && isset($value['group_members']) && $value['max_member'] < count($value['group_members'])) { - return array ('group_members' => get_lang('GroupTooMuchMembers')); + return array('group_members' => get_lang('GroupTooMuchMembers')); } return true; } @@ -157,7 +157,7 @@ $group_tutors_element = $form->addElement( ); // Group members -$group_member_list = GroupManager :: get_subscribed_users($current_group['iid']); +$group_member_list = GroupManager::get_subscribed_users($current_group['iid']); $selected_users = array (); foreach ($group_member_list as $index => $user) { @@ -172,7 +172,14 @@ foreach ($complete_user_list as $index => $user) { } } -$group_members_element = $form->addElement('advmultiselect', 'group_members', get_lang('GroupMembers'), $possible_users, 'style="width: 280px;"'); +$group_members_element = $form->addElement( + 'advmultiselect', + 'group_members', + get_lang('GroupMembers'), + $possible_users, + 'style="width: 280px;"' +); + $form->addFormRule('check_group_members'); // Members per group @@ -306,7 +313,7 @@ if ($form->validate()) { } else { $max_member = $values['max_member']; } - $self_registration_allowed = isset($values['self_registration_allowed']) ? 1 : 0; + $self_registration_allowed = isset($values['self_registration_allowed']) ? 1 : 0; $self_unregistration_allowed = isset($values['self_unregistration_allowed']) ? 1 : 0; GroupManager::set_group_properties( @@ -369,9 +376,9 @@ if (!empty($_GET['keyword']) && !empty($_GET['submit'])) { echo '
'.get_lang('SearchResultsFor').' '.$keyword_name.'
'; } -Display :: display_header($nameTools, 'Group'); +Display::display_header($nameTools, 'Group'); $form->setDefaults($defaults); $form->display(); -Display :: display_footer(); +Display::display_footer(); diff --git a/main/group/group_space.php b/main/group/group_space.php index 687f9465a8..498619ddb7 100755 --- a/main/group/group_space.php +++ b/main/group/group_space.php @@ -345,6 +345,7 @@ $my_gidreq = isset($_GET['gidReq']) ? Security::remove_XSS($_GET['gidReq']) : '' $parameters = array('cidReq' => $my_cidreq, 'origin'=> $my_origin, 'gidReq' => $my_gidreq); $table->set_additional_parameters($parameters); $table->set_header(0, ''); + if (api_is_western_name_order()) { $table->set_header(1, get_lang('FirstName')); $table->set_header(2, get_lang('LastName'));