<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.4 |
+ | CiviCRM version 4.5 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013 |
+ | Copyright CiviCRM LLC (c) 2004-2014 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
* $Id$
*
*/
* has more business logic
*
* @param array $params input parameters
+ *
+ * @return object
*/
static function create($params) {
// if id is set & is_primary isn't we can assume no change
*
* @param int $id the contact id
*
+ * @param bool $updateBlankLocInfo
+ *
* @return array the array of email id's
* @access public
* @static
}
/**
- * Function to set / reset hold status for an email
+ * set / reset hold status for an email
*
* @param object $email email object
*
$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) {
return $fromEmailValues;
}
+ /**
+ * @return object
+ */
static function isMultipleBulkMail() {
return CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::MAILING_PREFERENCES_NAME, 'civimail_multiple_bulk_emails', NULL, FALSE);
}