Skip to content

Commit

Permalink
Course request: Fix email notifications text (new lines and signature)
Browse files Browse the repository at this point in the history 
Author: @nosolored
  • Loading branch information
@nosolored
nosolored committed Apr 25, 2024
1 parent 4728002 commit cbab6d8
Showing 1 changed file with 27 additions and 21 deletions.
48 changes: 27 additions & 21 deletions main/inc/lib/course_request.lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ public static function create_course_request(
$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);

Expand All @@ -155,12 +155,14 @@ public static function create_course_request(
$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(
Expand Down Expand Up @@ -197,7 +199,7 @@ public static function create_course_request(
$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'),
Expand All @@ -209,7 +211,8 @@ public static function create_course_request(
$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;
Expand Down Expand Up @@ -506,8 +509,8 @@ public static function accept_course_request($id)

// 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).' ';
Expand All @@ -522,13 +525,14 @@ public static function accept_course_request($id)
$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);
Expand Down Expand Up @@ -596,21 +600,22 @@ public static function reject_course_request($id)

// 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'),
Expand Down Expand Up @@ -685,20 +690,21 @@ public static function ask_for_additional_info($id)

// 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'),
Expand Down

0 comments on commit cbab6d8

Please sign in to comment.