Convert variable names to camel case
[MAILPOET-1796]
This commit is contained in:
@@ -11,41 +11,41 @@ class Subscriber {
|
||||
* @param \MailPoet\Models\Subscriber|false|mixed $subscriber
|
||||
*/
|
||||
public static function process(
|
||||
$shortcode_details,
|
||||
$shortcodeDetails,
|
||||
$newsletter,
|
||||
$subscriber
|
||||
) {
|
||||
if ($subscriber !== false && !($subscriber instanceof SubscriberModel)) {
|
||||
return $shortcode_details['shortcode'];
|
||||
return $shortcodeDetails['shortcode'];
|
||||
}
|
||||
$default_value = ($shortcode_details['action_argument'] === 'default') ?
|
||||
$shortcode_details['action_argument_value'] :
|
||||
$defaultValue = ($shortcodeDetails['action_argument'] === 'default') ?
|
||||
$shortcodeDetails['action_argument_value'] :
|
||||
'';
|
||||
switch ($shortcode_details['action']) {
|
||||
switch ($shortcodeDetails['action']) {
|
||||
case 'firstname':
|
||||
return (!empty($subscriber->first_name)) ? $subscriber->first_name : $default_value;
|
||||
return (!empty($subscriber->firstName)) ? $subscriber->firstName : $defaultValue;
|
||||
case 'lastname':
|
||||
return (!empty($subscriber->last_name)) ? $subscriber->last_name : $default_value;
|
||||
return (!empty($subscriber->lastName)) ? $subscriber->lastName : $defaultValue;
|
||||
case 'email':
|
||||
return ($subscriber) ? $subscriber->email : false;
|
||||
case 'displayname':
|
||||
if ($subscriber && $subscriber->wp_user_id) {
|
||||
$wp_user = WPFunctions::get()->getUserdata($subscriber->wp_user_id);
|
||||
return $wp_user->user_login;
|
||||
if ($subscriber && $subscriber->wpUserId) {
|
||||
$wpUser = WPFunctions::get()->getUserdata($subscriber->wpUserId);
|
||||
return $wpUser->userLogin;
|
||||
}
|
||||
return $default_value;
|
||||
return $defaultValue;
|
||||
case 'count':
|
||||
return SubscriberModel::filter('subscribed')
|
||||
->count();
|
||||
default:
|
||||
if (preg_match('/cf_(\d+)/', $shortcode_details['action'], $custom_field) &&
|
||||
if (preg_match('/cf_(\d+)/', $shortcodeDetails['action'], $customField) &&
|
||||
!empty($subscriber->id)
|
||||
) {
|
||||
$custom_field = SubscriberCustomField
|
||||
$customField = SubscriberCustomField
|
||||
::where('subscriber_id', $subscriber->id)
|
||||
->where('custom_field_id', $custom_field[1])
|
||||
->where('custom_field_id', $customField[1])
|
||||
->findOne();
|
||||
return ($custom_field instanceof SubscriberCustomField) ? $custom_field->value : false;
|
||||
return ($customField instanceof SubscriberCustomField) ? $customField->value : false;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
Reference in New Issue
Block a user