From cbab6d8af59ea6feaad033ddb67ed82bd310ac22 Mon Sep 17 00:00:00 2001 From: Nosolored SL Date: Thu, 25 Apr 2024 11:17:27 +0200 Subject: [PATCH] Course request: Fix email notifications text (new lines and signature) Author: @nosolored --- main/inc/lib/course_request.lib.php | 48 ++++++++++++++++------------- 1 file changed, 27 insertions(+), 21 deletions(-) diff --git a/main/inc/lib/course_request.lib.php b/main/inc/lib/course_request.lib.php index cdd7728445..1e8348490b 100755 --- a/main/inc/lib/course_request.lib.php +++ b/main/inc/lib/course_request.lib.php @@ -138,9 +138,9 @@ class CourseRequestManager $last_insert_id = Database::insert_id(); // E-mail notifications. - - // E-mail language: The platform language seems to be the best choice. - $email_language = api_get_setting('platformLanguage'); + + $email_language = $user_info['language']; + $email_language_admin = api_get_setting('platformLanguage'); $email_subject = sprintf(get_lang('CourseRequestEmailSubject', null, $email_language), '['.api_get_setting('siteName').']', $code); @@ -155,12 +155,14 @@ class CourseRequestManager $email_body .= get_lang('TargetAudience', null, $email_language).': '.$target_audience."\n"; $email_body .= get_lang('Ln', null, $email_language).': '.$course_language."\n"; $email_body .= get_lang('FillWithExemplaryContent', null, $email_language).': '.($exemplary_content ? get_lang('Yes', null, $email_language) : get_lang('No', null, $email_language))."\n"; - + $email_body = nl2br($email_body); + // Sending an e-mail to the platform administrator. $email_body_admin = $email_body; - $email_body_admin .= "\n".get_lang('CourseRequestPageForApproval', null, $email_language).' '.api_get_path(WEB_CODE_PATH).'admin/course_request_edit.php?id='.$last_insert_id."\n"; - $email_body_admin .= "\n".get_lang('CourseRequestLegalNote', null, $email_language)."\n"; - + $email_body_admin .= "\n".get_lang('CourseRequestPageForApproval', null, $email_language_admin).' '.api_get_path(WEB_CODE_PATH).'admin/course_request_edit.php?id='.$last_insert_id."\n"; + $email_body_admin .= "\n".get_lang('CourseRequestLegalNote', null, $email_language_admin)."\n"; + $email_body_admin = nl2br($email_body_admin); + $sender_name_teacher = api_get_person_name($user_info['firstname'], $user_info['lastname'], null, PERSON_NAME_EMAIL_ADDRESS); $sender_email_teacher = $user_info['mail']; $recipient_name_admin = api_get_person_name( @@ -197,7 +199,7 @@ class CourseRequestManager $email_body_teacher = get_lang('Dear', null, $email_language).' '; $email_body_teacher .= api_get_person_name($user_info['firstname'], $user_info['lastname'], null, null, $email_language).",\n\n"; $email_body_teacher .= $email_body; - $email_body_teacher .= "\n".get_lang('Formula', null, $email_language)."\n"; + $email_body_teacher .= "\n".get_lang('SignatureFormula', null, $email_language)."\n"; $email_body_teacher .= api_get_person_name( api_get_setting('administratorName'), api_get_setting('administratorSurname'), @@ -209,7 +211,8 @@ class CourseRequestManager $email_body_teacher .= get_lang('Phone', null, $email_language).': '.api_get_setting('administratorTelephone')."\n"; $email_body_teacher .= get_lang('Email', null, $email_language).': '.api_get_setting('emailAdministrator', null, $email_language)."\n"; $email_body_teacher .= "\n".get_lang('CourseRequestLegalNote', null, $email_language)."\n"; - + $email_body_teacher = nl2br($email_body_teacher); + // Swap the sender and the recipient. $sender_name_admin = $recipient_name_admin; $sender_email_admin = $recipient_email_admin; @@ -506,8 +509,8 @@ class CourseRequestManager // E-mail notification. - // E-mail language: The platform language seems to be the best choice - $email_language = api_get_setting('platformLanguage'); + // E-mail language: The user language seems to be the best choice + $email_language = $user_info['language']; $email_subject = sprintf(get_lang('CourseRequestAcceptedEmailSubject', null, $email_language), '['.api_get_setting('siteName').']', $course_info['code']); $email_body = get_lang('Dear', null, $email_language).' '; @@ -522,13 +525,14 @@ class CourseRequestManager $course_info['code'], api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/' )."\n"; - $email_body .= "\n".get_lang('Formula', null, $email_language)."\n"; + $email_body .= "\n".get_lang('SignatureFormula', null, $email_language)."\n"; $email_body .= api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, null, $email_language)."\n"; $email_body .= get_lang('Manager', null, $email_language).' '.api_get_setting('siteName')."\n"; $email_body .= get_lang('Phone', null, $email_language).': '.api_get_setting('administratorTelephone')."\n"; $email_body .= get_lang('Email', null, $email_language).': '.api_get_setting('emailAdministrator', null, $email_language)."\n"; $email_body .= "\n".get_lang('CourseRequestLegalNote', null, $email_language)."\n"; - + $email_body = nl2br($email_body); + $sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS); $sender_email = api_get_setting('emailAdministrator'); $recipient_name = api_get_person_name($user_info['firstname'], $user_info['lastname'], null, PERSON_NAME_EMAIL_ADDRESS); @@ -596,21 +600,22 @@ class CourseRequestManager // E-mail notification. - // E-mail language: The platform language seems to be the best choice. - $email_language = api_get_setting('platformLanguage'); + // E-mail language: The user language seems to be the best choice. + $email_language = $user_info['language']; $email_subject = sprintf(get_lang('CourseRequestRejectedEmailSubject', null, $email_language), '['.api_get_setting('siteName').']', $code); $email_body = get_lang('Dear', null, $email_language).' '; $email_body .= api_get_person_name($user_info['firstname'], $user_info['lastname'], null, null, $email_language).",\n\n"; $email_body .= sprintf(get_lang('CourseRequestRejectedEmailText', null, $email_language), $code)."\n"; - $email_body .= "\n".get_lang('Formula', null, $email_language)."\n"; + $email_body .= "\n".get_lang('SignatureFormula', null, $email_language)."\n"; $email_body .= api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, null, $email_language)."\n"; $email_body .= get_lang('Manager', null, $email_language).' '.api_get_setting('siteName')."\n"; $email_body .= get_lang('Phone', null, $email_language).': '.api_get_setting('administratorTelephone')."\n"; $email_body .= get_lang('Email', null, $email_language).': '.api_get_setting('emailAdministrator', null, $email_language)."\n"; $email_body .= "\n".get_lang('CourseRequestLegalNote', null, $email_language)."\n"; - + $email_body = nl2br($email_body); + $sender_name = api_get_person_name( api_get_setting('administratorName'), api_get_setting('administratorSurname'), @@ -685,20 +690,21 @@ class CourseRequestManager // E-mail notification. - // E-mail language: The platform language seems to be the best choice. - $email_language = api_get_setting('platformLanguage'); + // E-mail language: The user language seems to be the best choice. + $email_language = $user_info['language']; $email_subject = sprintf(get_lang('CourseRequestAskInfoEmailSubject', null, $email_language), '['.api_get_setting('siteName').']', $code); $email_body = get_lang('Dear', null, $email_language).' '; $email_body .= api_get_person_name($user_info['firstname'], $user_info['lastname'], null, null, $email_language).",\n\n"; $email_body .= sprintf(get_lang('CourseRequestAskInfoEmailText', null, $email_language), $code)."\n"; - $email_body .= "\n".get_lang('Formula', null, $email_language)."\n"; + $email_body .= "\n".get_lang('SignatureFormula', null, $email_language)."\n"; $email_body .= api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n"; $email_body .= get_lang('Manager', null, $email_language).' '.api_get_setting('siteName')."\n"; $email_body .= get_lang('Phone', null, $email_language).': '.api_get_setting('administratorTelephone')."\n"; $email_body .= get_lang('Email', null, $email_language).': '.api_get_setting('emailAdministrator')."\n"; $email_body .= "\n".get_lang('CourseRequestLegalNote', null, $email_language)."\n"; - + $email_body = nl2br($email_body); + $sender_name = api_get_person_name( api_get_setting('administratorName'), api_get_setting('administratorSurname'),