Skip to content

Commit cbab6d8

Browse files
nosolorednosolored
authored
Course request: Fix email notifications text (new lines and signature)
Author: @nosolored
1 parent 4728002 commit cbab6d8

File tree

1 file changed

+27
-21
lines changed

1 file changed

+27
-21
lines changed

‎main/inc/lib/course_request.lib.php‎

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@ public static function create_course_request(
138138
$last_insert_id = Database::insert_id();
139139

140140
// E-mail notifications.
141-
142-
// E-mail language: The platform language seems to be the best choice.
143-
$email_language = api_get_setting('platformLanguage');
141+
142+
$email_language = $user_info['language'];
143+
$email_language_admin = api_get_setting('platformLanguage');
144144

145145
$email_subject = sprintf(get_lang('CourseRequestEmailSubject', null, $email_language), '['.api_get_setting('siteName').']', $code);
146146

@@ -155,12 +155,14 @@ public static function create_course_request(
155155
$email_body .= get_lang('TargetAudience', null, $email_language).': '.$target_audience."\n";
156156
$email_body .= get_lang('Ln', null, $email_language).': '.$course_language."\n";
157157
$email_body .= get_lang('FillWithExemplaryContent', null, $email_language).': '.($exemplary_content ? get_lang('Yes', null, $email_language) : get_lang('No', null, $email_language))."\n";
158-
158+
$email_body = nl2br($email_body);
159+
159160
// Sending an e-mail to the platform administrator.
160161
$email_body_admin = $email_body;
161-
$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";
162-
$email_body_admin .= "\n".get_lang('CourseRequestLegalNote', null, $email_language)."\n";
163-
162+
$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";
163+
$email_body_admin .= "\n".get_lang('CourseRequestLegalNote', null, $email_language_admin)."\n";
164+
$email_body_admin = nl2br($email_body_admin);
165+
164166
$sender_name_teacher = api_get_person_name($user_info['firstname'], $user_info['lastname'], null, PERSON_NAME_EMAIL_ADDRESS);
165167
$sender_email_teacher = $user_info['mail'];
166168
$recipient_name_admin = api_get_person_name(
@@ -197,7 +199,7 @@ public static function create_course_request(
197199
$email_body_teacher = get_lang('Dear', null, $email_language).' ';
198200
$email_body_teacher .= api_get_person_name($user_info['firstname'], $user_info['lastname'], null, null, $email_language).",\n\n";
199201
$email_body_teacher .= $email_body;
200-
$email_body_teacher .= "\n".get_lang('Formula', null, $email_language)."\n";
202+
$email_body_teacher .= "\n".get_lang('SignatureFormula', null, $email_language)."\n";
201203
$email_body_teacher .= api_get_person_name(
202204
api_get_setting('administratorName'),
203205
api_get_setting('administratorSurname'),
@@ -209,7 +211,8 @@ public static function create_course_request(
209211
$email_body_teacher .= get_lang('Phone', null, $email_language).': '.api_get_setting('administratorTelephone')."\n";
210212
$email_body_teacher .= get_lang('Email', null, $email_language).': '.api_get_setting('emailAdministrator', null, $email_language)."\n";
211213
$email_body_teacher .= "\n".get_lang('CourseRequestLegalNote', null, $email_language)."\n";
212-
214+
$email_body_teacher = nl2br($email_body_teacher);
215+
213216
// Swap the sender and the recipient.
214217
$sender_name_admin = $recipient_name_admin;
215218
$sender_email_admin = $recipient_email_admin;
@@ -506,8 +509,8 @@ public static function accept_course_request($id)
506509

507510
// E-mail notification.
508511

509-
// E-mail language: The platform language seems to be the best choice
510-
$email_language = api_get_setting('platformLanguage');
512+
// E-mail language: The user language seems to be the best choice
513+
$email_language = $user_info['language'];
511514
$email_subject = sprintf(get_lang('CourseRequestAcceptedEmailSubject', null, $email_language), '['.api_get_setting('siteName').']', $course_info['code']);
512515

513516
$email_body = get_lang('Dear', null, $email_language).' ';
@@ -522,13 +525,14 @@ public static function accept_course_request($id)
522525
$course_info['code'],
523526
api_get_path(WEB_COURSE_PATH).$course_info['directory'].'/'
524527
)."\n";
525-
$email_body .= "\n".get_lang('Formula', null, $email_language)."\n";
528+
$email_body .= "\n".get_lang('SignatureFormula', null, $email_language)."\n";
526529
$email_body .= api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, null, $email_language)."\n";
527530
$email_body .= get_lang('Manager', null, $email_language).' '.api_get_setting('siteName')."\n";
528531
$email_body .= get_lang('Phone', null, $email_language).': '.api_get_setting('administratorTelephone')."\n";
529532
$email_body .= get_lang('Email', null, $email_language).': '.api_get_setting('emailAdministrator', null, $email_language)."\n";
530533
$email_body .= "\n".get_lang('CourseRequestLegalNote', null, $email_language)."\n";
531-
534+
$email_body = nl2br($email_body);
535+
532536
$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
533537
$sender_email = api_get_setting('emailAdministrator');
534538
$recipient_name = api_get_person_name($user_info['firstname'], $user_info['lastname'], null, PERSON_NAME_EMAIL_ADDRESS);
@@ -596,21 +600,22 @@ public static function reject_course_request($id)
596600

597601
// E-mail notification.
598602

599-
// E-mail language: The platform language seems to be the best choice.
600-
$email_language = api_get_setting('platformLanguage');
603+
// E-mail language: The user language seems to be the best choice.
604+
$email_language = $user_info['language'];
601605

602606
$email_subject = sprintf(get_lang('CourseRequestRejectedEmailSubject', null, $email_language), '['.api_get_setting('siteName').']', $code);
603607

604608
$email_body = get_lang('Dear', null, $email_language).' ';
605609
$email_body .= api_get_person_name($user_info['firstname'], $user_info['lastname'], null, null, $email_language).",\n\n";
606610
$email_body .= sprintf(get_lang('CourseRequestRejectedEmailText', null, $email_language), $code)."\n";
607-
$email_body .= "\n".get_lang('Formula', null, $email_language)."\n";
611+
$email_body .= "\n".get_lang('SignatureFormula', null, $email_language)."\n";
608612
$email_body .= api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, null, $email_language)."\n";
609613
$email_body .= get_lang('Manager', null, $email_language).' '.api_get_setting('siteName')."\n";
610614
$email_body .= get_lang('Phone', null, $email_language).': '.api_get_setting('administratorTelephone')."\n";
611615
$email_body .= get_lang('Email', null, $email_language).': '.api_get_setting('emailAdministrator', null, $email_language)."\n";
612616
$email_body .= "\n".get_lang('CourseRequestLegalNote', null, $email_language)."\n";
613-
617+
$email_body = nl2br($email_body);
618+
614619
$sender_name = api_get_person_name(
615620
api_get_setting('administratorName'),
616621
api_get_setting('administratorSurname'),
@@ -685,20 +690,21 @@ public static function ask_for_additional_info($id)
685690

686691
// E-mail notification.
687692

688-
// E-mail language: The platform language seems to be the best choice.
689-
$email_language = api_get_setting('platformLanguage');
693+
// E-mail language: The user language seems to be the best choice.
694+
$email_language = $user_info['language'];
690695
$email_subject = sprintf(get_lang('CourseRequestAskInfoEmailSubject', null, $email_language), '['.api_get_setting('siteName').']', $code);
691696

692697
$email_body = get_lang('Dear', null, $email_language).' ';
693698
$email_body .= api_get_person_name($user_info['firstname'], $user_info['lastname'], null, null, $email_language).",\n\n";
694699
$email_body .= sprintf(get_lang('CourseRequestAskInfoEmailText', null, $email_language), $code)."\n";
695-
$email_body .= "\n".get_lang('Formula', null, $email_language)."\n";
700+
$email_body .= "\n".get_lang('SignatureFormula', null, $email_language)."\n";
696701
$email_body .= api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n";
697702
$email_body .= get_lang('Manager', null, $email_language).' '.api_get_setting('siteName')."\n";
698703
$email_body .= get_lang('Phone', null, $email_language).': '.api_get_setting('administratorTelephone')."\n";
699704
$email_body .= get_lang('Email', null, $email_language).': '.api_get_setting('emailAdministrator')."\n";
700705
$email_body .= "\n".get_lang('CourseRequestLegalNote', null, $email_language)."\n";
701-
706+
$email_body = nl2br($email_body);
707+
702708
$sender_name = api_get_person_name(
703709
api_get_setting('administratorName'),
704710
api_get_setting('administratorSurname'),

0 commit comments

Comments
 (0)