diff --git a/main/admin/add_users_to_usergroup.php b/main/admin/add_users_to_usergroup.php index a33f532ce1..33369a9f28 100755 --- a/main/admin/add_users_to_usergroup.php +++ b/main/admin/add_users_to_usergroup.php @@ -323,7 +323,8 @@ function formatCompleteName(array $userInfo, bool $orderListByOfficialCode): str { if ($orderListByOfficialCode) { $officialCode = !empty($userInfo['official_code']) ? $userInfo['official_code'].' - ' : '? - '; - return $officialCode.$userInfo['complete_name_with_username']; + + return $officialCode.$userInfo['complete_name_with_username']; } $officialCode = !empty($userInfo['official_code']) ? ' - '.$userInfo['official_code'] : null; diff --git a/main/gradebook/gradebook_display_certificate.php b/main/gradebook/gradebook_display_certificate.php index 5bf51701e3..cf75fbb364 100755 --- a/main/gradebook/gradebook_display_certificate.php +++ b/main/gradebook/gradebook_display_certificate.php @@ -173,7 +173,7 @@ switch ($action) { } break; case 'download_certificates_report': - $exportData = array_map(function($learner) { + $exportData = array_map(function ($learner) { return [ $learner['user_id'], $learner['username'], diff --git a/main/gradebook/lib/fe/gradebooktable.class.php b/main/gradebook/lib/fe/gradebooktable.class.php index 74ef85b81d..e385902736 100755 --- a/main/gradebook/lib/fe/gradebooktable.class.php +++ b/main/gradebook/lib/fe/gradebooktable.class.php @@ -117,7 +117,7 @@ class GradebookTable extends SortableTable } if ($showWeight) { $this->set_header($column++, get_lang('Weight'), false, $styleTextRight100, $styleTextRight100); - } + } if (!$this->teacherView) { $this->set_header($column++, get_lang('Result'), false, $styleTextRight, $styleTextRight); @@ -126,13 +126,13 @@ class GradebookTable extends SortableTable if (empty($model)) { if (in_array(1, $this->loadStats)) { $this->set_header($column++, get_lang('Ranking'), false, $styleTextRight100, $styleTextRight100); - } + } if (in_array(2, $this->loadStats)) { $this->set_header($column++, get_lang('BestScore'), false, $styleTextRight120, $styleTextRight120); - } + } if (in_array(3, $this->loadStats)) { $this->set_header($column++, get_lang('Average'), false, $styleTextRight100, $styleTextRight100); - } + } } if ($this->teacherView) { diff --git a/main/inc/ajax/document.ajax.php b/main/inc/ajax/document.ajax.php index 312f0eb97a..9db4f04161 100755 --- a/main/inc/ajax/document.ajax.php +++ b/main/inc/ajax/document.ajax.php @@ -74,7 +74,6 @@ switch ($action) { ]); exit; } else { - // User access same as upload.php $is_allowed_to_edit = api_is_allowed_to_edit(null, true); @@ -93,7 +92,11 @@ switch ($action) { $groupInfo = GroupManager::get_group_properties(api_get_group_id()); // Only course admin or group members allowed if ($is_allowed_to_edit || GroupManager::is_user_in_group(api_get_user_id(), $groupInfo)) { - if (!GroupManager::allowUploadEditDocument(api_get_user_id(), api_get_course_int_id(), $groupInfo)) { + if (!GroupManager::allowUploadEditDocument( + api_get_user_id(), + api_get_course_int_id(), + $groupInfo + )) { exit; } } else { diff --git a/main/inc/lib/myspace.lib.php b/main/inc/lib/myspace.lib.php index db62995ca2..ef17cc2fd0 100644 --- a/main/inc/lib/myspace.lib.php +++ b/main/inc/lib/myspace.lib.php @@ -3618,10 +3618,10 @@ class MySpace api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n". get_lang('Manager')." ".api_get_setting('siteName')."\nT. ". api_get_setting('administratorTelephone')."\n".get_lang('Email')." : ".api_get_setting('emailAdministrator'); - + $emailbody = nl2br($emailbody); - MessageManager::send_message_simple($user['id'], $emailsubject, $emailbody, 0, false, false, array(), false); - + MessageManager::send_message_simple($user['id'], $emailsubject, $emailbody, 0, false, false, [], false); + $userInfo = api_get_user_info($user['id']); if (($user['added_at_platform'] == 1 && $user['added_at_session'] == 1) || $user['added_at_session'] == 1) { diff --git a/main/mySpace/access_details_session.php b/main/mySpace/access_details_session.php index bef0ee2874..3cbe262a87 100644 --- a/main/mySpace/access_details_session.php +++ b/main/mySpace/access_details_session.php @@ -588,7 +588,7 @@ if ($formByDay->validate()) { $formByDay->setDefaults(['from' => $startDate, 'to' => $endDate]); Display::display_header(''); -echo Display::page_header(get_lang('CertificateOfAchievement'),get_lang('CertificateOfAchievementHelp')); +echo Display::page_header(get_lang('CertificateOfAchievement'), get_lang('CertificateOfAchievementHelp')); echo Display::page_subheader( get_lang('User').': '.$userInfo['complete_name'] );