diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php
index 173b3fb7f40..ba8d0b90a5a 100755
--- a/main/exercice/exercise.class.php
+++ b/main/exercice/exercise.class.php
@@ -4035,26 +4035,26 @@ public function send_mail_notification_for_exam($question_list_answers, $origin,
. '&action=qualify';
$user_info = api_get_user_info(api_get_user_id());
- $msg = '
'.get_lang('ExerciseAttempted').' :
- '.get_lang('AttemptDetails').' :
-
-
- '.get_lang('CourseName').' |
- #course# |
-
-
- '.get_lang('TestAttempted').' |
- #exercise# |
-
-
- '.get_lang('StudentName').' |
- #firstName# #lastName# |
-
-
- '.get_lang('StudentEmail').' |
- #email# |
-
-
';
+ $msg = get_lang('ExerciseAttempted').'
'
+ .get_lang('AttemptDetails').' :
'.
+ ''
+ .''
+ .''.get_lang('CourseName').' | '
+ .'#course# | '
+ .'
'
+ .''
+ .''.get_lang('TestAttempted').' | '
+ .'#exercise# | '
+ .'
'
+ .''
+ .''.get_lang('StudentName').' | '
+ .'#firstName# #lastName# | '
+ .'
'
+ .''
+ .''.get_lang('StudentEmail').' | '
+ .'#email# | '
+ .'
'
+ .'
';
$open_question_list = null;
$msg = str_replace("#email#", $user_info['email'], $msg);
@@ -4064,8 +4064,7 @@ public function send_mail_notification_for_exam($question_list_answers, $origin,
$msg = str_replace("#course#", $courseInfo['name'], $msg1);
if ($origin != 'learnpath') {
- $msg.= get_lang('ClickToCommentAndGiveFeedback').',
- #url#';
+ $msg.= '
'.get_lang('ClickToCommentAndGiveFeedback').'';
}
$msg1 = str_replace("#url#", $url_email, $msg);
$mail_content = $msg1;
@@ -4111,26 +4110,26 @@ function send_notification_for_open_questions($question_list_answers, $origin, $
. '&action=qualify';
$user_info = api_get_user_info(api_get_user_id());
- $msg = ''.get_lang('OpenQuestionsAttempted').' :
- '.get_lang('AttemptDetails').' :
-
-
- '.get_lang('CourseName').' |
- #course# |
-
-
- '.get_lang('TestAttempted').' |
- #exercise# |
-
-
- '.get_lang('StudentName').' |
- #firstName# #lastName# |
-
-
- '.get_lang('StudentEmail').' |
- #mail# |
-
-
';
+ $msg = get_lang('OpenQuestionsAttempted').'
'
+ .get_lang('AttemptDetails').' :
'
+ .''
+ .''
+ .''.get_lang('CourseName').' | '
+ .'#course# | '
+ .'
'
+ .''
+ .''.get_lang('TestAttempted').' | '
+ .'#exercise# | '
+ .'
'
+ .''
+ .''.get_lang('StudentName').' | '
+ .'#firstName# #lastName# | '
+ .'
'
+ .''
+ .''.get_lang('StudentEmail').' | '
+ .'#mail# | '
+ .'
'
+ .'
';
$open_question_list = null;
foreach ($question_list_answers as $item) {
$question = $item['question'];
@@ -4138,21 +4137,21 @@ function send_notification_for_open_questions($question_list_answers, $origin, $
$answer_type = $item['answer_type'];
if (!empty($question) && !empty($answer) && $answer_type == FREE_ANSWER) {
- $open_question_list.='
-
- '.get_lang('Question').' |
- '.$question.' |
-
-
- '.get_lang('Answer').' |
- '.$answer.' |
-
';
+ $open_question_list .=
+ ''
+ .' '.get_lang('Question').' | '
+ .''.$question.' | '
+ .'
'
+ .''
+ .' '.get_lang('Answer').' | '
+ .''.$answer.' | '
+ .'
';
}
}
if (!empty($open_question_list)) {
- $msg .= '
'.get_lang('OpenQuestionsAttemptedAre').' :
- ';
+ $msg .= '
'.get_lang('OpenQuestionsAttemptedAre').' :
'.
+ '';
$msg .= $open_question_list;
$msg .= '
';
@@ -4164,8 +4163,7 @@ function send_notification_for_open_questions($question_list_answers, $origin, $
$msg = str_replace("#course#", $course_info['name'],$msg1);
if ($origin != 'learnpath') {
- $msg .= get_lang('ClickToCommentAndGiveFeedback').',
- #url#';
+ $msg .= '
'.get_lang('ClickToCommentAndGiveFeedback').'';
}
$msg1 = str_replace("#url#", $url_email, $msg);
$mail_content = $msg1;
@@ -4215,39 +4213,39 @@ function send_notification_for_oral_questions($question_list_answers, $origin, $
$answer_type = $item['answer_type'];
if (!empty($question) && !empty($answer) && $answer_type == ORAL_EXPRESSION) {
- $oral_question_list.='
-
- '.get_lang('Question').' |
- '.$question.' |
-
-
- '.get_lang('Answer').' |
- '.$answer.' |
-
';
+ $oral_question_list.='
'
+ .''
+ .' '.get_lang('Question').' | '
+ .''.$question.' | '
+ .'
'
+ .''
+ .' '.get_lang('Answer').' | '
+ .''.$answer.' | '
+ .'
';
}
}
if (!empty($oral_question_list)) {
- $msg = ''.get_lang('OralQuestionsAttempted').' :
- '.get_lang('AttemptDetails').' :
-
-
- '.get_lang('CourseName').' |
- #course# |
-
-
- '.get_lang('TestAttempted').' |
- #exercise# |
-
-
- '.get_lang('StudentName').' |
- #firstName# #lastName# |
-
-
- '.get_lang('StudentEmail').' |
- #mail# |
-
-
';
+ $msg = get_lang('OralQuestionsAttempted').'
+ '.get_lang('AttemptDetails').' :
'
+ .''
+ .''
+ .''.get_lang('CourseName').' | '
+ .'#course# | '
+ .'
'
+ .''
+ .''.get_lang('TestAttempted').' | '
+ .'#exercise# | '
+ .'
'
+ .''
+ .''.get_lang('StudentName').' | '
+ .'#firstName# #lastName# | '
+ .'
'
+ .''
+ .''.get_lang('StudentEmail').' | '
+ .'#mail# | '
+ .'
'
+ .'
';
$msg .= '
'.sprintf(get_lang('OralQuestionsAttemptedAreX'),$oral_question_list).'
';
$msg1 = str_replace("#exercise#", $this->exercise, $msg);
$msg = str_replace("#firstName#", $user_info['firstname'], $msg1);
@@ -4256,8 +4254,7 @@ function send_notification_for_oral_questions($question_list_answers, $origin, $
$msg = str_replace("#course#", $course_info['name'], $msg1);
if ($origin != 'learnpath') {
- $msg.= get_lang('ClickToCommentAndGiveFeedback').',
- #url#';
+ $msg.= '
'.get_lang('ClickToCommentAndGiveFeedback').'';
}
$msg1 = str_replace("#url#", $url_email, $msg);
$mail_content = $msg1;