Skip to content

Now #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eileenmcnaughton wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Now #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c040947
Cast settings to an array
eileenmcnaughton Sep 12, 2019
84ed72f
Remove debug
eileenmcnaughton Sep 12, 2019
9577152
Regenerate civix
eileenmcnaughton Sep 12, 2019
920520c
Fix broken tpl
eileenmcnaughton Sep 12, 2019
1348037
Simplify management of activity type.
eileenmcnaughton Sep 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions CRM/Emailamender.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@ class CRM_Emailamender {
private $_aTopLevelFilterSettings;
private $_aSecondLevelFilterSettings;
private $_aCompoundTopLevelDomains;
private $_iCorrectedEmailAddressActivityTypeId;

public function __construct() {
$this->_aTopLevelFilterSettings = CRM_Core_BAO_Setting::getItem('uk.org.futurefirst.networks.emailamender', 'emailamender.top_level_domain_corrections');
$this->_aSecondLevelFilterSettings = CRM_Core_BAO_Setting::getItem('uk.org.futurefirst.networks.emailamender', 'emailamender.second_level_domain_corrections');
$this->_aCompoundTopLevelDomains = CRM_Core_BAO_Setting::getItem('uk.org.futurefirst.networks.emailamender', 'emailamender.compound_top_level_domains');
$this->iCorrectedEmailAddressActivityTypeId = CRM_Core_BAO_Setting::getItem('uk.org.futurefirst.networks.emailamender', 'emailamender.email_amended_activity_type_id');
$this->_aTopLevelFilterSettings = (array) CRM_Core_BAO_Setting::getItem('uk.org.futurefirst.networks.emailamender', 'emailamender.top_level_domain_corrections');
$this->_aSecondLevelFilterSettings = (array) CRM_Core_BAO_Setting::getItem('uk.org.futurefirst.networks.emailamender', 'emailamender.second_level_domain_corrections');
$this->_aCompoundTopLevelDomains = (array) CRM_Core_BAO_Setting::getItem('uk.org.futurefirst.networks.emailamender', 'emailamender.compound_top_level_domains');
}

/**
Expand Down Expand Up @@ -139,7 +137,7 @@ public function check_for_corrections($iEmailId, $iContactId, $sRawEmail) {
$createActivityOutput = civicrm_api('Activity', 'create', array(
'version' => '3',
'sequential' => '1',
'activity_type_id' => $this->iCorrectedEmailAddressActivityTypeId,
'activity_type_id' => 'corrected_email_address',
'source_contact_id' => $iContactId,
'target_contact_id' => $iContactId,
'assignee_contact_id' => $iContactId,
Expand Down
Loading