chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'ycastillo-yoselyn.3702' into 1.9.x

Browse Source
1.9.x
Yannick Warnier 12 years ago
parent 033910b92c aa8445e4d2
commit e454431a73
1 changed files with 33 additions and 21 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 54
      main/inc/lib/notification.lib.php

54
main/inc/lib/notification.lib.php
Unescape View File

@ -154,31 +154,43 @@ class Notification extends Model
case self::NOTIFY_MESSAGE_AT_ONCE:
case self::NOTIFY_INVITATION_AT_ONCE:
case self::NOTIFY_GROUP_AT_ONCE:
if (!empty($user_info['mail'])) {
$mail = api_get_setting('noreply_email_address');
if ($user_setting == NOTIFY_INVITATION_AT_ONCE) {
$sender_info['complete_name'] = $this->admin_name;
$extra_headers = array();
$extra_headers['reply_to']['name'] = $this->admin_name;
if (!empty($mail)) {
$sender_info['email'] = $mail;
$extra_headers['reply_to']['mail'] = $mail;
} else {
$sender_info['email'] = $this->admin_email;
$extra_headers['reply_to']['mail'] = $this->admin_email;
}
}
if (!empty($user_info['mail']) || !empty($mail)) {
$name = api_get_person_name($user_info['firstname'], $user_info['lastname']);
if (!empty($sender_info['complete_name']) && !empty($sender_info['email'])) {
$extra_headers = array();
$extra_headers['reply_to']['mail'] = $sender_info['email'];
$extra_headers['reply_to']['name'] = $sender_info['complete_name'];
api_mail_html(
$name,
$user_info['mail'],
Security::filter_terms($title),
Security::filter_terms($content),
$sender_info['complete_name'],
$sender_info['email'],
$extra_headers
);
if ($user_setting != NOTIFY_INVITATION_AT_ONCE) {
$extra_headers = array();
$extra_headers['reply_to']['mail'] = $sender_info['email'];
$extra_headers['reply_to']['name'] = $sender_info['complete_name'];
}
} else {
api_mail_html(
$name,
$user_info['mail'],
Security::filter_terms($title),
Security::filter_terms($content),
$this->admin_name,
$this->admin_email
);
$extra_headers = array();
$sender_info['complete_name'] = $this->admin_name;
$sender_info['email'] = $this->admin_email;
}
api_mail_html(
$name,
$user_info['mail'],
Security::filter_terms($title),
Security::filter_terms($content),
$sender_info['complete_name'],
$sender_info['email'],
$extra_headers
);
}
$params['sent_at'] = api_get_utc_datetime();
// Saving the notification to be sent some day.

Write Preview
Loading…
Cancel
Save