Skip to content
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

Jump to bottom

Remove obsolete IF #19108

Merged
merged 1 commit into from
Dec 4, 2020
Merged

Remove obsolete IF #19108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
102 changes: 50 additions & 52 deletions CRM/Contact/Import/Parser/Contact.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1684,67 +1684,65 @@ public function createContact(&$formatted, &$contactFields, $onDuplicate, $conta
return $error;
}

if (is_null($error)) {
if ($contactId) {
$this->formatParams($formatted, $onDuplicate, (int) $contactId);
}
if ($contactId) {
$this->formatParams($formatted, $onDuplicate, (int) $contactId);
}

// Resetting and rebuilding cache could be expensive.
CRM_Core_Config::setPermitCacheFlushMode(FALSE);

// If a user has logged in, or accessed via a checksum
// Then deliberately 'blanking' a value in the profile should remove it from their record
// @todo this should either be TRUE or FALSE in the context of import - once
// we figure out which we can remove all the rest.
// Also note the meaning of this parameter is less than it used to
// be following block cleanup.
$formatted['updateBlankLocInfo'] = TRUE;
if ((CRM_Core_Session::singleton()->get('authSrc') & (CRM_Core_Permission::AUTH_SRC_CHECKSUM + CRM_Core_Permission::AUTH_SRC_LOGIN)) == 0) {
$formatted['updateBlankLocInfo'] = FALSE;
}
// Resetting and rebuilding cache could be expensive.
CRM_Core_Config::setPermitCacheFlushMode(FALSE);

// If a user has logged in, or accessed via a checksum
// Then deliberately 'blanking' a value in the profile should remove it from their record
// @todo this should either be TRUE or FALSE in the context of import - once
// we figure out which we can remove all the rest.
// Also note the meaning of this parameter is less than it used to
// be following block cleanup.
$formatted['updateBlankLocInfo'] = TRUE;
if ((CRM_Core_Session::singleton()->get('authSrc') & (CRM_Core_Permission::AUTH_SRC_CHECKSUM + CRM_Core_Permission::AUTH_SRC_LOGIN)) == 0) {
$formatted['updateBlankLocInfo'] = FALSE;
}

list($data, $contactDetails) = CRM_Contact_BAO_Contact::formatProfileContactParams($formatted, $contactFields, $contactId, NULL, $formatted['contact_type']);

// manage is_opt_out
if (array_key_exists('is_opt_out', $contactFields) && array_key_exists('is_opt_out', $formatted)) {
$wasOptOut = $contactDetails['is_opt_out'] ?? FALSE;
$isOptOut = $formatted['is_opt_out'];
$data['is_opt_out'] = $isOptOut;
// on change, create new civicrm_subscription_history entry
if (($wasOptOut != $isOptOut) && !empty($contactDetails['contact_id'])) {
$shParams = [
'contact_id' => $contactDetails['contact_id'],
'status' => $isOptOut ? 'Removed' : 'Added',
'method' => 'Web',
];
CRM_Contact_BAO_SubscriptionHistory::create($shParams);
}
list($data, $contactDetails) = CRM_Contact_BAO_Contact::formatProfileContactParams($formatted, $contactFields, $contactId, NULL, $formatted['contact_type']);

// manage is_opt_out
if (array_key_exists('is_opt_out', $contactFields) && array_key_exists('is_opt_out', $formatted)) {
$wasOptOut = $contactDetails['is_opt_out'] ?? FALSE;
$isOptOut = $formatted['is_opt_out'];
$data['is_opt_out'] = $isOptOut;
// on change, create new civicrm_subscription_history entry
if (($wasOptOut != $isOptOut) && !empty($contactDetails['contact_id'])) {
$shParams = [
'contact_id' => $contactDetails['contact_id'],
'status' => $isOptOut ? 'Removed' : 'Added',
'method' => 'Web',
];
CRM_Contact_BAO_SubscriptionHistory::create($shParams);
}
}

$contact = CRM_Contact_BAO_Contact::create($data);
$cid = $contact->id;
$contact = CRM_Contact_BAO_Contact::create($data);
$cid = $contact->id;

// Process group and tag
if (isset($formatted['group'])) {
$method = 'Admin';
CRM_Contact_BAO_GroupContact::create($formatted['group'], $cid, FALSE, $method);
}
// Process group and tag
if (isset($formatted['group'])) {
$method = 'Admin';
CRM_Contact_BAO_GroupContact::create($formatted['group'], $cid, FALSE, $method);
}

if (!empty($fields['tag']) && array_key_exists('tag', $formatted)) {
// Convert comma separated form values from select2 v3
$tags = is_array($formatted['tag']) ? $formatted['tag'] : array_fill_keys(array_filter(explode(',', $formatted['tag'])), 1);
CRM_Core_BAO_EntityTag::create($tags, 'civicrm_contact', $cid);
}
if (!empty($fields['tag']) && array_key_exists('tag', $formatted)) {
// Convert comma separated form values from select2 v3
$tags = is_array($formatted['tag']) ? $formatted['tag'] : array_fill_keys(array_filter(explode(',', $formatted['tag'])), 1);
CRM_Core_BAO_EntityTag::create($tags, 'civicrm_contact', $cid);
}

CRM_Core_Config::setPermitCacheFlushMode(TRUE);
CRM_Core_Config::setPermitCacheFlushMode(TRUE);

$contact = [
'contact_id' => $cid,
];
$contact = [
'contact_id' => $cid,
];

$defaults = [];
$newContact = CRM_Contact_BAO_Contact::retrieve($contact, $defaults);
}
$defaults = [];
$newContact = CRM_Contact_BAO_Contact::retrieve($contact, $defaults);

//get the id of the contact whose street address is not parsable, CRM-5886
if ($this->_parseStreetAddress && is_object($newContact) && property_exists($newContact, 'address') && $newContact->address) {
Expand Down