Browse Source

Minor corrections

Julio Montoya 13 years ago
parent
commit
8012633e22
2 changed files with 12 additions and 20 deletions
  1. 12 10
      main/exercice/exercise.class.php
  2. 0 10
      main/exercice/exercise_result.php

+ 12 - 10
main/exercice/exercise.class.php

@@ -3036,8 +3036,16 @@ class Exercise {
 		$return_array = array('score'=>$questionScore, 'weight'=>$questionWeighting,'extra'=>$extra_data);
 		return $return_array;
 	} //End function
-
-	function send_notification($arrques, $arrans, $origin) {
+	
+	/**
+	 * Sends a notification when a user ends an examn
+	 * 
+	 */
+	function send_notification($arrques, $arrans, $origin) {		
+		
+		if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1 ) {
+			return '';
+		}
 
 		// Email configuration settings
 		$coursecode     = api_get_course_id();
@@ -3064,13 +3072,8 @@ class Exercise {
 		}
 
 		$url_email = api_get_path(WEB_CODE_PATH).'exercice/exercice.php?'.api_get_cidreq().'&id_session='.api_get_session_id().'&show=result&exerciseId='.$this->id;
-
 		$user_info = UserManager::get_user_info_by_id(api_get_user_id());
 
-		if (api_get_course_setting('email_alert_manager_on_new_quiz') != 1 ) {
-			return '';
-		}
-
 		$mycharset = api_get_system_encoding();
 		$msg = '<html><head>
                 <link rel="stylesheet" href="'.api_get_path(WEB_CODE_PATH).'css/'.api_get_setting('stylesheets').'/default.css" type="text/css">
@@ -3173,15 +3176,14 @@ class Exercise {
 			}
 			$msg .= '</body></html>';
 
-			$msg = str_replace("#url#",$url_email,$msg);
+			$msg = str_replace("#url#", $url_email, $msg);
 			$mail_content = $msg;
-
 			$sender_name = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
 			$email_admin = api_get_setting('emailAdministrator');
-
 			$subject = get_lang('ExerciseAttempted');
 			$result = @api_mail_html('', $to, $subject, $mail_content, $sender_name, $email_admin, array('charset'=>$mycharset));
 		}
+		var_dump($result);exit;
 	}
 
 	function show_exercise_result_header($user_data, $date = null) {

+ 0 - 10
main/exercice/exercise_result.php

@@ -67,16 +67,6 @@ if (empty($objExercise)) {
     api_not_allowed();
 }
 
-// set admin name as person who sends the results e-mail (lacks policy about whom should really send the results)
-
-$query      = "SELECT user_id FROM $main_admin_table LIMIT 1"; //get all admins from admin table
-$admin_id   = Database::result(Database::query($query),0,"user_id");
-$uinfo      = api_get_user_info($admin_id);
-$from       = $uinfo['mail'];
-$from_name  = api_get_person_name($uinfo['firstname'], $uinfo['lastname'], null, PERSON_NAME_EMAIL_ADDRESS);
-$str        = $_SERVER['REQUEST_URI'];
-$url        = api_get_path(WEB_CODE_PATH).'exercice/exercice.php?'.api_get_cidreq().'&show=result';
-
 $gradebook = '';
 if (isset($_SESSION['gradebook'])) {
 	$gradebook=	$_SESSION['gradebook'];