From 35f6f7938aaa22081fc210ca495dd0ce55cfe054 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 11 Mar 2014 12:10:33 -0400 Subject: [PATCH] Fixes in code style -refs #6909 --- main/exercice/exercise.class.php | 14 +++++++------- main/exercice/exercise.lib.php | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php index a8c1265810..242b5401eb 100644 --- a/main/exercice/exercise.class.php +++ b/main/exercice/exercise.class.php @@ -3296,13 +3296,13 @@ class Exercise { * Sends a notification when a user ends an examn * */ - function send_notification_for_questions($question_list_answers, $origin, $exe_id) { + function send_mail_notification_for_exam($question_list_answers, $origin, $exe_id) { if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1 ) { return null; } // Email configuration settings - $coursecode = api_get_course_id(); - $course_info = api_get_course_info(api_get_course_id()); + $courseCode = api_get_course_id(); + $courseInfo = api_get_course_info($courseCode); $url_email = api_get_path(WEB_CODE_PATH).'exercice/exercise_show.php?'.api_get_cidreq().'&id_session='.api_get_session_id().'&id='.$exe_id.'&action=qualify'; $user_info = UserManager::get_user_info_by_id(api_get_user_id()); @@ -3334,7 +3334,7 @@ class Exercise { $msg = str_replace("#firstName#", $user_info['firstname'],$msg1); $msg1 = str_replace("#lastName#", $user_info['lastname'],$msg); - $msg = str_replace("#course#", $course_info['name'],$msg1); + $msg = str_replace("#course#", $courseInfo['name'],$msg1); if ($origin != 'learnpath') { $msg.= get_lang('ClickToCommentAndGiveFeedback').',
@@ -3413,10 +3413,10 @@ class Exercise { } if (!empty($open_question_list)) { - $msg .= '


'.get_lang('OpenQuestionsAttemptedAre').' :

+ $msg .= '


'.get_lang('OpenQuestionsAttemptedAre').' :

'; $msg .= $open_question_list; - $msg.='

'; + $msg .= '
'; $msg1 = str_replace("#exercise#", $this->exercise, $msg); @@ -3426,7 +3426,7 @@ class Exercise { $msg = str_replace("#course#", $course_info['name'],$msg1); if ($origin != 'learnpath') { - $msg.= get_lang('ClickToCommentAndGiveFeedback').',
+ $msg .= get_lang('ClickToCommentAndGiveFeedback').',
#url#'; } $msg1 = str_replace("#url#", $url_email, $msg); diff --git a/main/exercice/exercise.lib.php b/main/exercice/exercise.lib.php index 1293e1784e..65b4ee6236 100644 --- a/main/exercice/exercise.lib.php +++ b/main/exercice/exercise.lib.php @@ -2306,7 +2306,7 @@ function display_question_list_by_attempt($objExercise, $exe_id, $save_user_resu // Send notification .. if (!api_is_allowed_to_edit(null,true)) { if (api_get_course_setting('email_alert_manager_on_new_quiz') == 1 ) { - $objExercise->send_notification_for_questions($question_list_answers, $origin, $exe_id); + $objExercise->send_mail_notification_for_exam($question_list_answers, $origin, $exe_id); } $objExercise->send_notification_for_open_questions($question_list_answers, $origin, $exe_id); $objExercise->send_notification_for_oral_questions($question_list_answers, $origin, $exe_id);