← All changes
|
backend/src/Factory/Notification/NotificationFactory.php
+43
-2
1.4
→
1.5.1
View file →
| @@ -14,8 +14,27 @@ | ||
| 14 | 14 | */ |
| 15 | 15 | class NotificationFactory |
| 16 | 16 | { |
| 17 | 17 | /** |
| 18 | + * Lite-owned keys; everything else is treated as extension data (Pro / add-ons). | |
| 19 | + * | |
| 20 | + * @var string[] | |
| 21 | + */ | |
| 22 | + private const KNOWN_NOTIFICATION_DATA_KEYS = [ | |
| 23 | + 'id', | |
| 24 | + 'name', | |
| 25 | + 'sender', | |
| 26 | + 'replyTo', | |
| 27 | + 'receiver', | |
| 28 | + 'enabled', | |
| 29 | + 'subject', | |
| 30 | + 'message', | |
| 31 | + 'showEmptyFields', | |
| 32 | + 'smartLogic', | |
| 33 | + 'formId', | |
| 34 | + ]; | |
| 35 | + | |
| 36 | + /** | |
| 18 | 37 | * Create a NotificationEntity from an array of data. |
| 19 | 38 | * |
| 20 | 39 | * @param array<string, mixed> $data |
| 21 | 40 | * |
| @@ -23,8 +42,17 @@ | ||
| 23 | 42 | * @throws InvalidArgumentException |
| 24 | 43 | */ |
| 25 | 44 | public static function create(array $data): NotificationEntity |
| 26 | 45 | { |
| 46 | + /** | |
| 47 | + * Normalize/augment notification factory input (e.g. Pro attachment fields from DB). | |
| 48 | + * | |
| 49 | + * @since 1.2.0 | |
| 50 | + * | |
| 51 | + * @param array<string, mixed> $data | |
| 52 | + */ | |
| 53 | + $data = apply_filters('ivyforms/notification/factory_data', $data); | |
| 54 | + | |
| 27 | 55 | $smartLogic = self::normalizeSmartLogic($data['smartLogic'] ?? false); |
| 28 | 56 | |
| 29 | 57 | $contact = new NotificationContact( |
| 30 | 58 | $data['sender'] ?? '', |
| @@ -40,9 +68,9 @@ | ||
| 40 | 68 | $contact, |
| 41 | 69 | $data['enabled'] ?? true, |
| 42 | 70 | $data['subject'] ?? '', |
| 43 | 71 | $data['message'] ?? '', |
| 44 | - $data['showEmptyFields'] ?? false, | |
| 72 | + (bool) ($data['showEmptyFields'] ?? false), | |
| 45 | 73 | $smartLogic, |
| 46 | 74 | $data['formId'] ?? 0 |
| 47 | 75 | ); |
| 48 | 76 | |
| @@ -88,9 +116,9 @@ | ||
| 88 | 116 | $notificationEntity->setMessage(wp_unslash($data['message'])); |
| 89 | 117 | } |
| 90 | 118 | |
| 91 | 119 | if (isset($data['showEmptyFields'])) { |
| 92 | - $notificationEntity->setShowEmptyFields($data['showEmptyFields']); | |
| 120 | + $notificationEntity->setShowEmptyFields((bool) $data['showEmptyFields']); | |
| 93 | 121 | } |
| 94 | 122 | |
| 95 | 123 | if (isset($data['smartLogic'])) { |
| 96 | 124 | $notificationEntity->setSmartLogic($smartLogic); |
| @@ -99,9 +127,22 @@ | ||
| 99 | 127 | if (isset($data['formId'])) { |
| 100 | 128 | $notificationEntity->setFormId($data['formId']); |
| 101 | 129 | } |
| 102 | 130 | |
| 131 | + $notificationEntity->setExtensionData(self::extractExtensionData($data)); | |
| 132 | + | |
| 103 | 133 | return $notificationEntity; |
| 134 | + } | |
| 135 | + | |
| 136 | + /** | |
| 137 | + * Keys in $data that are not owned by Lite. | |
| 138 | + * | |
| 139 | + * @param array<string, mixed> $data | |
| 140 | + * @return array<string, mixed> | |
| 141 | + */ | |
| 142 | + private static function extractExtensionData(array $data): array | |
| 143 | + { | |
| 144 | + return array_diff_key($data, array_flip(self::KNOWN_NOTIFICATION_DATA_KEYS)); | |
| 104 | 145 | } |
| 105 | 146 | |
| 106 | 147 | /** |
| 107 | 148 | * Normalize smartLogic from DB/API payload. |