$contactID = $session->get('userID');
$fromEmailValues = array();
- // add the domain email id
- $domainEmail = CRM_Core_BAO_Domain::getNameAndEmail();
- $domainEmail = "$domainEmail[0] <$domainEmail[1]>";
- $fromEmailValues[$domainEmail] = htmlspecialchars($domainEmail);
+ // add all configured FROM email addresses
+ $domainFrom = CRM_Core_OptionGroup::values('from_email_address');
+ foreach (array_keys($domainFrom) as $k) {
+ $domainEmail = $domainFrom[$k];
+ $fromEmailValues[$domainEmail] = htmlspecialchars($domainEmail);
+ }
// add logged in user's active email ids
if ($contactID) {
$fromEmail = "$fromDisplayName <$email>";
$fromEmailHtml = htmlspecialchars($fromEmail) . ' ' . $emailVal['locationType'];
- if (CRM_Utils_Array::value('is_primary', $emailVal)) {
+ if (!empty($emailVal['is_primary'])) {
$fromEmailHtml .= ' ' . ts('(preferred)');
}
$fromEmailValues[$fromEmail] = $fromEmailHtml;