Browse Source

Deprecating api_send_mail() function use instead api_mail_html()

Julio Montoya 12 years ago
parent
commit
caca1c9d2a
2 changed files with 13 additions and 8 deletions
  1. 1 0
      main/inc/lib/main_api.lib.php
  2. 12 8
      main/mySpace/myspace.lib.php

+ 1 - 0
main/inc/lib/main_api.lib.php

@@ -5453,6 +5453,7 @@ function is_allowed_to_edit() {
  * @param string $additional_headers
  * @param string $additional_parameters
  * @author Ivan Tcholakov, 04-OCT-2009, a reworked version of this function.
+ * @deprecated use api_mail_html
  * @link http://www.dokeos.com/forum/viewtopic.php?t=15557
  */
 function api_send_mail($to, $subject, $message, $additional_headers = null, $additional_parameters = null) {

+ 12 - 8
main/mySpace/myspace.lib.php

@@ -1677,15 +1677,19 @@ class MySpace {
 		$addedto = '';
 		if ($sendMail) {
 			$i = 0;
+            $from = api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS);
+            $fromEmail = api_get_setting('emailAdministrator');
+
 			foreach ($users as $index => $user) {
-				$emailto = api_get_person_name($user['FirstName'], $user['LastName'], null, PERSON_NAME_EMAIL_ADDRESS).' <'.$user['Email'].'>';
-				$emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
-				$emailbody = get_lang('Dear').' '.api_get_person_name($user['FirstName'], $user['LastName']).",\n\n".get_lang('YouAreReg')." ".api_get_setting('siteName')." ".get_lang('WithTheFollowingSettings')."\n\n".get_lang('Username')." : $user[UserName]\n".get_lang('Pass')." : $user[Password]\n\n".get_lang('Address')." ".api_get_setting('siteName')." ".get_lang('Is')." : ".api_get_path(WEB_PATH)." \n\n".get_lang('Problem')."\n\n".get_lang('Formula').",\n\n".api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n".get_lang('Manager')." ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n".get_lang('Email')." : ".api_get_setting('emailAdministrator')."";
-				$emailheaders = 'From: '.api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS).' <'.api_get_setting('emailAdministrator').">\n";
-				$emailheaders .= 'Reply-To: '.api_get_setting('emailAdministrator');
-				@api_send_mail($emailto, $emailsubject, $emailbody, $emailheaders);
-
-				if (($user['added_at_platform'] == 1  && $user['added_at_session'] == 1) || $user['added_at_session'] == 1) {
+                $emailto = api_get_person_name($user['FirstName'], $user['LastName'], null, PERSON_NAME_EMAIL_ADDRESS).' <'.$user['Email'].'>';
+                $emailsubject = '['.api_get_setting('siteName').'] '.get_lang('YourReg').' '.api_get_setting('siteName');
+                $emailbody = get_lang('Dear').' '.api_get_person_name($user['FirstName'], $user['LastName']).",\n\n".get_lang('YouAreReg')." ".api_get_setting('siteName')." ".get_lang('WithTheFollowingSettings')."\n\n".get_lang('Username')." : $user[UserName]\n".get_lang('Pass')." : $user[Password]\n\n".get_lang('Address')." ".api_get_setting('siteName')." ".get_lang('Is')." : ".api_get_path(WEB_PATH)." \n\n".get_lang('Problem')."\n\n".get_lang('Formula').",\n\n".api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))."\n".get_lang('Manager')." ".api_get_setting('siteName')."\nT. ".api_get_setting('administratorTelephone')."\n".get_lang('Email')." : ".api_get_setting('emailAdministrator');
+                //$emailheaders = 'From: '.api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'), null, PERSON_NAME_EMAIL_ADDRESS).' <'.api_get_setting('emailAdministrator').">\n";
+                //$emailheaders .= 'Reply-To: '.api_get_setting('emailAdministrator');
+                //@api_send_mail($emailto, $emailsubject, $emailbody, $emailheaders);
+                api_mail_html($emailto, $recipient_email, $emailsubject, $emailbody, $from, $fromEmail);
+
+                if (($user['added_at_platform'] == 1  && $user['added_at_session'] == 1) || $user['added_at_session'] == 1) {
 					if ($user['added_at_platform'] == 1) {
 						$addedto = get_lang('UserCreatedPlatform');
 					} else  {