| @@ -186,8 +186,9 @@ | ||
| 186 | 186 | } |
| 187 | 187 | } |
| 188 | 188 | } |
| 189 | 189 | $fields_merge_tag_object->include_all_fields_merge_tags(); |
| 190 | + add_filter('ninja_forms_merge_tag_value_signature', [$this, 'filter_ninja_forms_merge_tag_value_signature'], 999); | |
| 190 | 191 | foreach ($fields as $field) { |
| 191 | 192 | if (isset($field['type']) && ($field['type'] === 'repeater' || $field['type'] === 'file_upload')) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedIf |
| 192 | 193 | } else { |
| 193 | 194 | // Fix PHP warnings |
| @@ -210,8 +211,9 @@ | ||
| 210 | 211 | } |
| 211 | 212 | $fields_merge_tag_object->add_field($field); // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged |
| 212 | 213 | } |
| 213 | 214 | } |
| 215 | + remove_filter('ninja_forms_merge_tag_value_signature', [$this, 'filter_ninja_forms_merge_tag_value_signature'], 999); | |
| 214 | 216 | } |
| 215 | 217 | } |
| 216 | 218 | } |
| 217 | 219 | break; |
| @@ -349,15 +351,15 @@ | ||
| 349 | 351 | } |
| 350 | 352 | |
| 351 | 353 | // load filters |
| 352 | 354 | public function load_filters() { |
| 353 | - add_filter('ninja_forms_run_action_settings', array($this, 'filter_ninja_forms_run_action_settings'), 10, 4); | |
| 354 | - add_filter('ninja_forms_post_run_action_type_save', array($this, 'filter_ninja_forms_post_run_action_type_save')); | |
| 355 | - add_filter('ninja_forms_post_run_action_type_email', array($this, 'filter_ninja_forms_post_run_action_type_email')); | |
| 356 | - add_filter('ninja_forms_action_email_attachments', array($this, 'filter_ninja_forms_action_email_attachments'), 10, 3); | |
| 357 | - add_filter('ninja_forms_action_email_message', array($this, 'filter_ninja_forms_action_email_message'), 10, 3); | |
| 355 | + add_filter('ninja_forms_run_action_settings', [$this, 'filter_ninja_forms_run_action_settings'], 10, 4); | |
| 356 | + add_filter('ninja_forms_post_run_action_type_save', [$this, 'filter_ninja_forms_post_run_action_type_save']); | |
| 357 | + add_filter('ninja_forms_post_run_action_type_email', [$this, 'filter_ninja_forms_post_run_action_type_email']); | |
| 358 | + add_filter('ninja_forms_action_email_attachments', [$this, 'filter_ninja_forms_action_email_attachments'], 10, 3); | |
| 359 | + add_filter('ninja_forms_action_email_message', [$this, 'filter_ninja_forms_action_email_message'], 10, 3); | |
| 358 | 360 | // 1.25.14 trigger email action fix |
| 359 | - add_filter('rest_dispatch_request', array($this, 'filter_rest_dispatch_request'), 10, 3); | |
| 361 | + add_filter('rest_dispatch_request', [$this, 'filter_rest_dispatch_request'], 10, 3); | |
| 360 | 362 | } |
| 361 | 363 | |
| 362 | 364 | // run action settings filter |
| 363 | 365 | public function filter_ninja_forms_run_action_settings($settings, $form_id, $action_id, $form_data) { |
| @@ -470,8 +472,19 @@ | ||
| 470 | 472 | } |
| 471 | 473 | return $result; |
| 472 | 474 | } |
| 473 | 475 | |
| 476 | + // filter ninja forms signature merge tag | |
| 477 | + public function filter_ninja_forms_merge_tag_value_signature($value) { | |
| 478 | + if (empty($value)) { | |
| 479 | + return ''; | |
| 480 | + } | |
| 481 | + if (!is_string($value)) { | |
| 482 | + return $value; | |
| 483 | + } | |
| 484 | + return strip_tags($value, '<img>'); | |
| 485 | + } | |
| 486 | + | |
| 474 | 487 | // filter content |
| 475 | 488 | public function filter_content($message, $dataset_id, $filter, $type = '') { |
| 476 | 489 | if (false !== strpos($message, '[')) { |
| 477 | 490 | $shortcode_tags = array( |
| @@ -959,9 +972,9 @@ | ||
| 959 | 972 | ); |
| 960 | 973 | } |
| 961 | 974 | } |
| 962 | 975 | break; |
| 963 | - case 'asignature': | |
| 976 | + case 'signature': | |
| 964 | 977 | $elements[] = $this->auto_field( |
| 965 | 978 | $field, |
| 966 | 979 | array( |
| 967 | 980 | 'type' => 'e2pdf-html', |
