ProPeace/de.systopia.twingle
6
0
Fork 0
Code Issues 2 Pull requests Projects 1 Releases Packages Wiki Activity Actions

Merge branch 'issue/86'

Browse source
This commit is contained in:
Jens Schuppe 2024-06-06 11:07:15 +02:00
commit 5169e5a0ce
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CRM/Twingle/Profile.php
View file

@ -111,7 +111,8 @@ class CRM_Twingle_Profile {
*/
public function getCustomFieldMapping() {
$custom_field_mapping = [];
if (is_string($custom_field_definition = $this->getAttribute('custom_field_mapping'))) {
if ('' !== ($custom_field_definition = $this->getAttribute('custom_field_mapping', ''))) {
/** @var string $custom_field_definition */
$custom_field_maps = preg_split(
'/\r\n|\r|\n/',
$custom_field_definition,
@ -205,7 +206,9 @@ class CRM_Twingle_Profile {
* @return mixed | NULL
*/
public function getAttribute($attribute_name, $default = NULL) {
return $this->data[$attribute_name] ?? $default;
return (isset($this->data[$attribute_name]) && $this->data[$attribute_name] !== '')
? $this->data[$attribute_name]
: $default;
}
/**

6
CRM/Twingle/Submission.php
View file

@ -72,8 +72,8 @@ class CRM_Twingle_Submission {
// Get the payment instrument defined within the profile, or return an error
// if none matches (i.e. an unknown payment method was submitted).
$payment_instrument_id = $profile->getAttribute('pi_' . $params['payment_method']);
if (!isset($payment_instrument_id)) {
$payment_instrument_id = $profile->getAttribute('pi_' . $params['payment_method'], '');
if ('' !== $payment_instrument_id) {
throw new CRM_Core_Exception(
E::ts('Payment method could not be matched to existing payment instrument.'),
'invalid_format'
@ -101,7 +101,7 @@ class CRM_Twingle_Submission {
// matches (i.e. an unknown gender was submitted).
if (is_string($params['user_gender'])) {
$gender_id = $profile->getAttribute('gender_' . $params['user_gender']);
if (!isset($gender_id)) {
if (!is_numeric($gender_id)) {
throw new CRM_Core_Exception(
E::ts('Gender could not be matched to existing gender.'),
'invalid_format'