PluginProbe
Bit Form – Contact Form, Payment Forms, Multi Step Forms, Calculator & Custom Form Builder / V3.3.2
Bit Form – Contact Form, Payment Forms, Multi Step Forms, Calculator & Custom Form Builder vV3.3.2
V3.3.2 3.3.1 V-3.3.0 3.2.2 3.2.1 3.2.0 3.1.4 3.1.3 3.1.2 3.1.1 3.1.0 V3.0.3 V3.0.2 -3.0.1 V_3.0.0 1.1.1 1.1.8 1.2 1.3 1.4 1.4.18 1.5.2 1.9 2.0 2.10.0 All 139 releases
← All changes | includes/Frontend/Form/FrontendFormHandler.php +475 -116 2.10.0 → V3.3.2 View file →
@@ -1,23 +1,36 @@
1 1 <?php
2 2
3 3 namespace BitCode\BitForm\Frontend\Form;
4 4
5 +if (!defined('ABSPATH')) {
6 + exit;
7 +}
8 +
9 +use BitCode\BitForm\Admin\Form\AdminFormHandler;
5 10 use BitCode\BitForm\Admin\Form\FrontEndScriptGenerator;
6 11 use BitCode\BitForm\Admin\Form\Helpers;
12 +use BitCode\BitForm\Core\Cryptography\Cryptography;
7 13 use BitCode\BitForm\Core\Database\FormEntryMetaModel;
8 14 use BitCode\BitForm\Core\Database\FormModel;
9 15 use BitCode\BitForm\Core\Form\FormManager;
10 16 use BitCode\BitForm\Core\Integration\IntegrationHandler;
17 +use BitCode\BitForm\Core\Util\EscapingHelper;
11 18 use BitCode\BitForm\Core\Util\FieldValueHandler;
12 19 use BitCode\BitForm\Core\Util\FileDownloadProvider;
20 +use BitCode\BitForm\Core\Util\FileHandler;
13 21 use BitCode\BitForm\Core\Util\FrontendHelpers;
22 +use BitCode\BitForm\Core\Util\Log;
23 +use BitCode\BitForm\Core\Util\SmartTagRegistry;
24 +use BitCode\BitForm\Core\Util\SmartTags;
14 25 use BitCode\BitForm\Core\Util\Utilities;
15 26 use BitCode\BitForm\Core\WorkFlow\WorkFlow;
16 -use BitCode\BitFormPro\Admin\FormSettings\FormAbandonment;
17 27
18 28 final class FrontendFormHandler
19 29 {
30 + /** Largest stored signature inlined into the page as a data URI. */
31 + private const MAX_INLINE_SIGNATURE_BYTES = 2097152;
32 +
20 33 public function __construct()
21 34 {
22 35 // before markup load - formids [], posts [1,2]
23 36 add_action('wp_enqueue_scripts', [$this, 'loadAssets']);
@@ -23,41 +36,82 @@
23 36 add_action('wp_enqueue_scripts', [$this, 'loadAssets']);
24 37 // markup loads - formids []
25 38 add_shortcode('bitform', [$this, 'handleFrontendRenderRequest']);
26 39 // after markup load - formids [1,35,3]
27 - add_action('wp_footer', [$this, 'generateJS']);
40 + // After popup plugins render at 10 (that is when popup-only forms register
41 + // their formID), before wp_print_footer_scripts at 20.
42 + add_action('wp_footer', [$this, 'generateJS'], 15);
28 43 }
29 44
30 - private function validPassowordResetToken($token, $userID, $formId)
45 + /**
46 + * A reset form opened from a used or expired link cannot succeed, so show why instead of
47 + * the form. Returns the notice markup, or '' when the link is fine or the form is not a
48 + * reset form. Rendered in place of the form (the old exit() cut the page off mid-theme).
49 + *
50 + * @param string $token key from the reset link
51 + * @param string $userID user ID from the reset link
52 + * @param int $formId form being rendered
53 + *
54 + * @return string
55 + */
56 + private function invalidPasswordResetNotice($token, $userID, $formId)
31 57 {
32 58 $existResetInteg = (new IntegrationHandler($formId))->getAllIntegration('wp_user_auth', 'wp_auth', 1);
33 - if (!is_wp_error($existResetInteg) && count($existResetInteg) > 0) {
34 - if ('reset' === $existResetInteg[0]->integration_name) {
35 - $user = get_userdata($userID);
36 - if ($user) {
37 - $validKey = check_password_reset_key($token, $user->user_login);
38 - if (is_wp_error($validKey)) {
39 - echo "<div id='bf-resp' style='display:grid;justify-content:center;color:#860000;'>This password reset token is invalid.</div>";
40 - exit();
41 - }
42 - } else {
43 - echo "<div id='bf-resp' style='display:grid;justify-content:center;color:#860000;'>Invalid User!!</div>";
44 - exit();
45 - }
46 - }
59 + if (is_wp_error($existResetInteg) || empty($existResetInteg) || 'reset' !== $existResetInteg[0]->integration_name) {
60 + return '';
47 61 }
62 + $user = get_userdata((int) $userID);
63 + if ($user && !is_wp_error(check_password_reset_key($token, $user->user_login))) {
64 + return '';
65 + }
66 + return "<div id='bf-resp' role='alert' style='display:grid;justify-content:center;color:#860000;'>"
67 + . esc_html__('This password reset link is invalid or has expired. Please request a new one.', 'bit-form')
68 + . '</div>';
48 69 }
49 70
50 71 private function getJSFileSrc($postId)
51 72 {
52 - $formUpdateVersion = get_option('bit-form_form_update_version');
73 + $formUpdateVersion = get_option('bitform_form_update_version');
53 74 $formScriptSrc = BITFORMS_UPLOAD_BASE_URL . "/form-scripts/$postId/bitform-js-$postId.js?bfv=$formUpdateVersion";
54 75
55 76 return $formScriptSrc;
56 77 }
57 78
79 + private function getJSFilePath($postId)
80 + {
81 + return BITFORMS_CONTENT_DIR . "/form-scripts/$postId/bitform-js-$postId.js";
82 + }
83 +
84 + /**
85 + * Does this page's bundle need (re)generating?
86 + *
87 + * The DB flag alone is not enough: a page marked generated whose file was never written
88 + * (crashed generation, unwritable uploads dir) would enqueue a 404 forever. Conversely a
89 + * file that cannot be written must not make every request rebuild it, so a missing file
90 + * is retried on a backoff window rather than on every hit.
91 + *
92 + * @param int $postId
93 + * @param bool $regenerateScriptFlag DB-side verdict from regenerateScriptChecker()
94 + *
95 + * @return bool
96 + */
97 + private function needsScriptGeneration($postId, $regenerateScriptFlag)
98 + {
99 + if (file_exists($this->getJSFilePath($postId))) {
100 + return (bool) $regenerateScriptFlag;
101 + }
102 + $retryKey = 'bitforms_js_regen_' . $postId;
103 + if (get_transient($retryKey)) {
104 + return false;
105 + }
106 + set_transient($retryKey, 1, 5 * MINUTE_IN_SECONDS);
107 + return true;
108 + }
109 +
58 110 public function generateJs($formID = null, $entryID = null, $formType = null)
59 111 {
112 + // bitform-js-{postId}.js is disk-cached per post ID with no language key.
113 + // Display strings must stay out of it and travel in bf_globals per request.
60 114 // return true;
61 115 $isFormPreview = get_transient('bitform_form_preview');
62 116 if ($isFormPreview && !$formID) {
63 117 delete_transient('bitform_form_preview');
@@ -76,12 +130,12 @@
76 130 $formIDs = [];
77 131 $previewMode = 'classic';
78 132 $postId = '';
79 133
80 - $formUpdateVersion = get_option('bit-form_form_update_version');
134 + $formUpdateVersion = get_option('bitform_form_update_version');
81 135 if ($formID) {
82 136 $formIDs[] = $formID;
83 - $FrontendFormManager = new FrontendFormManager($formID, 1);
137 + $FrontendFormManager = FrontendFormManager::getInstance($formID, 1);
84 138 $formInfo = $FrontendFormManager->getFormInfo();
85 139 $FormIdentifier = esc_js($FrontendFormManager->getFormIdentifier());
86 140 $formContent = $FrontendFormManager->getFormContentWithValue($this->getValuesFromQueryParams());
87 141 $formContent->formId = $formID;
@@ -117,8 +171,10 @@
117 171 if (!$regenerateScriptFlag) {
118 172 $regenerateScriptFlag = $this->deleteUnusedFormPageIds($postId, $bfUniqFormIds);
119 173 }
120 174 $isJsGenerating = get_option('bitforms_frontend_js_generating');
175 + // The fast path also requires the cached bundle to exist on disk, not just be flagged in the DB.
176 + $regenerateScriptFlag = $this->needsScriptGeneration($postId, $regenerateScriptFlag);
121 177 if (!$regenerateScriptFlag && !$isJsGenerating && !empty($formIDs)) {
122 178 wp_enqueue_script('bit-form-all-script-test', $this->getJSFileSrc($postId), [], $formUpdateVersion, true);
123 179 return;
124 180 }
@@ -123,9 +179,9 @@
123 179 return;
124 180 }
125 181 foreach ($bfFrontendFormIds as $index => $formId) {
126 182 $shortCodeCounter = $index + 1;
127 - $FrontendFormManager = new FrontendFormManager($formId, $shortCodeCounter);
183 + $FrontendFormManager = FrontendFormManager::getInstance($formId, $shortCodeCounter);
128 184 $formInfo = $FrontendFormManager->getFormInfo();
129 185 $FormIdentifier = esc_js($FrontendFormManager->getFormIdentifier());
130 186 $formContent = $FrontendFormManager->getFormContentWithValue($this->getValuesFromQueryParams());
131 187 $formContent->formId = $formId;
@@ -148,8 +204,16 @@
148 204 return;
149 205 }
150 206
151 207 $frontendScriptGenObj->generateJsFile($formContents, $allFields, $contentIds, $postId, $formIDs, $previewMode);
208 + if ('preview' === $previewMode) {
209 + return;
210 + }
211 + // Only mark the page as generated once the bundle is verifiably on disk; otherwise the
212 + // next request must retry generation instead of fast-pathing to a stale/missing file.
213 + if (!empty($bfUniqFormIds) && file_exists($this->getJSFilePath($postId))) {
214 + $this->markScriptGenerated($bfUniqFormIds, $postId);
215 + }
152 216 wp_enqueue_script('bit-form-all-script-test', $this->getJSFileSrc($postId), [], $formUpdateVersion, true);
153 217 }
154 218
155 219 private function deleteUnusedFormPageIds($postId, $formIDs)
@@ -165,9 +229,9 @@
165 229 );
166 230 $regenerateScriptFlag = false;
167 231 foreach ($forms as $form) {
168 232 $formId = $form->id;
169 - $generatedScriptPageIdsDecoded = json_decode($form->generated_script_page_ids, true);
233 + $generatedScriptPageIdsDecoded = json_decode((string) $form->generated_script_page_ids, true);
170 234 $generatedScriptPageIds = is_array($generatedScriptPageIdsDecoded) ? array_keys($generatedScriptPageIdsDecoded) : [];
171 235 if (!empty($generatedScriptPageIds) && !in_array($formId, $formIDs) && in_array($postId, $generatedScriptPageIds)) {
172 236 unset($generatedScriptPageIdsDecoded[$postId]);
173 237 if (empty($generatedScriptPageIdsDecoded)) {
@@ -177,15 +241,15 @@
177 241 $formModel->update(['generated_script_page_ids' => wp_json_encode($generatedScriptPageIdsDecoded)], ['id' => $formId]);
178 242 }
179 243 }
180 244 if ($regenerateScriptFlag) {
181 - $formUpdateVersion = get_option('bit-form_form_update_version');
245 + $formUpdateVersion = get_option('bitform_form_update_version');
182 246 if (!$formUpdateVersion) {
183 247 $formUpdateVersion = 1;
184 248 } else {
185 249 $formUpdateVersion = (int) $formUpdateVersion + 1;
186 250 }
187 - update_option('bit-form_form_update_version', $formUpdateVersion);
251 + update_option('bitform_form_update_version', $formUpdateVersion);
188 252 }
189 253 return $regenerateScriptFlag;
190 254 }
191 255
@@ -195,27 +259,45 @@
195 259 if (!is_a($post, 'WP_Post') && !isset($post->ID)) {
196 260 return;
197 261 }
198 262 $postId = $post->ID;
199 - $regenerateScriptFlag = false;
200 - $formModel = new FormModel();
263 + // Read-only check. Marking the page as generated is deferred to markScriptGenerated(),
264 + // called only after the bundle file is actually written — marking here left the DB
265 + // saying "generated" while the file stayed stale whenever generation failed mid-way.
201 266 foreach ($formsIds as $formId) {
202 - $formInstance = new FormManager($formId);
267 + $formInstance = FormManager::getInstance($formId);
203 268 if (!$formInstance->isExist()) {
204 269 continue;
205 270 }
206 271 $generatedPages = $formInstance->getFormData('generated_script_page_ids');
207 272 if (empty($generatedPages)) {
208 - $regenerateScriptFlag = true;
209 - } elseif (is_object($generatedPages) && (!isset($generatedPages->{$postId}) || (isset($generatedPages->{$postId}) && false === $generatedPages->{$postId}))) {
210 - $regenerateScriptFlag = true;
273 + return true;
211 274 }
212 - if (!$regenerateScriptFlag) {
275 + if (is_object($generatedPages) && (!isset($generatedPages->{$postId}) || false === $generatedPages->{$postId})) {
276 + return true;
277 + }
278 + }
279 + return false;
280 + }
281 +
282 + private function markScriptGenerated($formsIds, $postId)
283 + {
284 + // Fetched via FormModel rather than FormManager: FormManager keeps its row in a static
285 + // property shared across instances, so after the render loop it holds the last form's
286 + // data regardless of which instance is asked.
287 + $formModel = new FormModel();
288 + foreach ($formsIds as $formId) {
289 + $form = $formModel->get(['generated_script_page_ids'], ['id' => $formId]);
290 + if (is_wp_error($form) || empty($form)) {
213 291 continue;
214 292 }
293 + $generatedPages = Utilities::jsonObj($form[0]->generated_script_page_ids ?? '');
215 294 if (!is_object($generatedPages)) {
216 295 $generatedPages = (object) [];
217 296 }
297 + if (!empty($generatedPages->{$postId})) {
298 + continue;
299 + }
218 300 $generatedPages->{$postId} = true;
219 301 $formModel->update(
220 302 [
221 303 'generated_script_page_ids' => \wp_json_encode($generatedPages)
@@ -224,16 +306,16 @@
224 306 'id' => $formId,
225 307 ]
226 308 );
227 309 }
228 - return $regenerateScriptFlag;
229 310 }
230 311
231 312 private function addInlineScript($code, $handle = '', $position = 'after')
232 313 {
233 314 $scriptHandle = !empty($handle) ? $handle : 'bf-inline-script';
315 + $formUpdateVersion = get_option('bitform_form_update_version');
234 316 if (!wp_script_is($scriptHandle)) {
235 - wp_register_script($scriptHandle, '', [], '', true);
317 + wp_register_script($scriptHandle, '', [], $formUpdateVersion, true);
236 318 wp_enqueue_script($scriptHandle);
237 319 }
238 320 wp_add_inline_script($scriptHandle, $code, $position);
239 321 }
@@ -240,10 +322,11 @@
240 322
241 323 private function addInlineStyle($code, $handle = '')
242 324 {
243 325 $styleHandle = !empty($handle) ? $handle : 'bf-inline-style';
326 + $formUpdateVersion = get_option('bitform_form_update_version');
244 327 if (!wp_style_is($styleHandle)) {
245 - wp_register_style($styleHandle, '', [], '', true);
328 + wp_register_style($styleHandle, '', [], $formUpdateVersion);
246 329 wp_enqueue_style($styleHandle);
247 330 }
248 331 wp_add_inline_style($styleHandle, $code);
249 332 }
@@ -269,37 +352,37 @@
269 352
270 353 return $fields;
271 354 }
272 355
273 - private function executeOnUserInput($formID, $shortCodeCounter, $fields)
356 + private function executeOnUserInput($formID, $shortCodeCounter, $workFlowRunType = 'create')
274 357 {
275 - $FrontendFormManager = new FrontendFormManager($formID, $shortCodeCounter);
358 + $FrontendFormManager = FrontendFormManager::getInstance($formID, $shortCodeCounter);
276 359 $previousValue = $this->getValuesFromQueryParams();
277 360 $formContent = $FrontendFormManager->getFormContentWithValue($previousValue);
278 361 $customCodesExist = strpos(FrontEndScriptGenerator::getCustomCodes($formID)['JavaScript'], 'bfVars');
279 362 if ($customCodesExist || (!empty($formContent->workFlowExist) && !empty($formContent->workFlowExist->oninput))) {
280 363 $workFlowRunHelper = new WorkFlow($formID);
281 - return $workFlowRunHelper->executeOnUserInput('create', $fields);
364 + return $workFlowRunHelper->executeOnUserInput($workFlowRunType);
282 365 }
283 366 }
284 367
285 368 private function getValuesFromQueryParams()
286 369 {
287 - $reqField = $_SERVER['QUERY_STRING'];
370 + // Read-only: query string parsed to pre-fill form fields. Values are sanitized per field before use.
288 371 $queryParamsValue = [];
289 - if (!empty($reqField)) {
372 + if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) {
373 + $reqField = wp_unslash($_SERVER['QUERY_STRING']);
290 374 foreach (explode('&', $reqField) as $keyValue) {
291 - // $pattern = '/([a-zA-Z0-9])([a-zA-Z])\=+/';
292 - $pattern = '/([^.]+)=(.*?)([^.]+)/';
293 - $matches = preg_match($pattern, $keyValue, $matchFormat);
294 - if ($matches) {
375 + if (false !== strpos($keyValue, '=')) {
295 376 list($field, $value) = explode('=', $keyValue, 2);
296 377
297 378 if (!trim($value)) {
298 379 continue;
299 380 }
300 -
301 - $queryParamsValue[$field][] = sanitize_text_field(urldecode($value));
381 + $field = sanitize_text_field(urldecode($field));
382 + if (!empty($field)) {
383 + $queryParamsValue[$field][] = sanitize_text_field(urldecode($value));
384 + }
302 385 }
303 386 }
304 387 }
305 388
@@ -314,8 +397,11 @@
314 397 $formID = intval($atts['form_id']);
315 398 }
316 399 if (isset($atts['entry_id'])) {
317 400 $entryId = intval($atts['entry_id']);
401 + // Read-only: entry ID from query string for shortcode render. No state mutation.
402 + } elseif (isset($_GET['bf_entry_id']) && !is_array($_GET['bf_entry_id'])) {
403 + $entryId = intval(sanitize_text_field(wp_unslash($_GET['bf_entry_id'])));
318 404 } else {
319 405 $entryId = false;
320 406 }
321 407 if (isset($atts['id'])) {
@@ -327,24 +413,25 @@
327 413 return __('Form ID cannot be empty', 'bit-form');
328 414 }
329 415
330 416 if (!$this->isExist($formID)) {
417 + /* translators: %s: form ID */
331 418 return sprintf(__('#%s no. Form doesn\'t exists', 'bit-form'), $formID);
332 419 }
333 420
334 - // check for abandoned form entry id
335 - $isAbandoned = false;
336 - if (empty($entryId) && Utilities::isPro() && class_exists('\BitCode\BitFormPro\Admin\FormSettings\FormAbandonment')) {
337 - $FormAbandonment = new FormAbandonment($formID);
338 - $isAbandoned = $FormAbandonment->checkAbandonedFormEntryId();
339 - }
421 + // Add-ons return the id of the abandoned entry this visitor can resume. A bare
422 + // true (older Pro) carries no id, so nothing is restored rather than entry #1.
423 + $abandonedEntryId = apply_filters('bitform_is_abandoned_entry', false, $formID, $entryId, $atts);
424 + $abandonedEntryId = (!is_bool($abandonedEntryId) && is_numeric($abandonedEntryId)) ? (int) $abandonedEntryId : 0;
425 + $isAbandoned = $abandonedEntryId > 0;
340 426
341 427 FrontendHelpers::setBfFrontendFormIds($formID);
342 428 $bfFrontendFormIds = FrontendHelpers::$bfFrontendFormIds;
343 429 $shortCodeCounter = count($bfFrontendFormIds);
344 - $FrontendFormManager = new FrontendFormManager($formID, $shortCodeCounter);
430 + $FrontendFormManager = FrontendFormManager::getInstance($formID, $shortCodeCounter);
345 431
346 432 if (!$FrontendFormManager->checkStatus()) {
433 + /* translators: %s: form ID */
347 434 return sprintf(__('#%s no. Form is not active', 'bit-form'), $formID);
348 435 }
349 436 ob_start();
350 437 $this->loadAssets($formID, $formType);
@@ -354,10 +441,15 @@
354 441 if ($font && !$formPreview) {
355 442 wp_enqueue_style('bf-google-font', $font, '1.0.0', true);
356 443 }
357 444
445 + // Read-only: password reset token from URL for display-time validation. No state written until form is submitted.
358 446 if (!empty($_GET['token']) && !empty($_GET['id'])) {
359 - $this->validPassowordResetToken($_GET['token'], $_GET['id'], $formID);
447 + $resetNotice = $this->invalidPasswordResetNotice(sanitize_text_field(wp_unslash($_GET['token'])), sanitize_text_field(wp_unslash($_GET['id'])), $formID);
448 + if ('' !== $resetNotice) {
449 + ob_end_clean();
450 + return $resetNotice;
451 + }
360 452 }
361 453
362 454 $previousValue = $this->getValuesFromQueryParams();
363 455 $errorMessages = []; // delete
@@ -373,23 +465,38 @@
373 465 $nestedLayout = isset($formContent->nestedLayout) ? $formContent->nestedLayout : (object) [];
374 466 $buttons = !empty($formContent->buttons) ? $formContent->buttons : '';
375 467 $additional = $formContent->additional;
376 468
377 - $workFlowRunType = $entryId ? 'edit' : 'create';
378 - if ($entryId) {
379 - $fields = $this->setFieldsValue($fields, $formID, $entryId);
469 + // $workFlowRunType = $entryId ? 'edit' : 'create';
470 + if ($entryId && (FrontendHelpers::is_current_user_can_access($formID, 'entryEditAccess'))) {
471 + $workFlowRunType = 'edit';
472 + $adminFormHandler = new AdminFormHandler();
473 + $getEntry = $adminFormHandler->getSingleEntry($formID, $entryId);
474 + if (FrontendHelpers::is_current_user_can_access($formID, 'entryEditAccess', '', $getEntry->__user_id)) {
475 + $fields = $this->setFieldsValue($fields, $formID, $entryId);
476 + } elseif (!$isAbandoned) {
477 + $entryId = false;
478 + $workFlowRunType = 'create';
479 + }
480 + } else {
481 + $entryId = false;
482 + $workFlowRunType = 'create';
380 483 }
381 484
485 + // if ($entryId) {
486 + // $fields = $this->setFieldsValue($fields, $formID, $entryId);
487 + // }
488 +
382 489 $fields = apply_filters('bitform_filter_before_workflow_onload_fields', $fields, $formID);
383 490 $fields = $this->triggerWorkflowOnLoad($formID, $shortCodeCounter, $fields, $workFlowRunType);
384 491 $fields = apply_filters('bitform_filter_after_workflow_onload_fields', $fields, $formID);
385 492 do_action('bitform_onload_fields', $fields, $formID);
386 - $workFlowreturnedOnUserInput = $this->executeOnUserInput($formID, $shortCodeCounter, $fields);
493 + $workFlowreturnedOnUserInput = $this->executeOnUserInput($formID, $shortCodeCounter, $workFlowRunType);
387 494
388 495 // test for form before remove
389 - $noLabel = ['decision-box', 'html', 'button', 'paypal', 'razorpay', 'recaptcha'];
496 + $noLabelFieldTypes = ['decision-box', 'gdpr', 'html', 'shortcode', 'button', 'paypal', 'razorpay', 'recaptcha', 'turnstile', 'hcaptcha', 'stripe', 'spacer'];
390 497 foreach ($fields as $fldKey => $field) {
391 - if (!in_array($field->typ, $noLabel) && isset($field->lbl)) {
498 + if (!in_array($field->typ, $noLabelFieldTypes) && isset($field->lbl)) {
392 499 $lblReplaceToBackslash = str_replace('$_bf_$', '\\', $field->lbl);
393 500 $fields->{$fldKey}->lbl = FieldValueHandler::replaceSmartTagWithValue($lblReplaceToBackslash);
394 501 }
395 502 }
@@ -395,9 +502,9 @@
395 502 }
396 503 $fieldsKey = $FrontendFormManager->getFieldsKey();
397 504
398 505 $captchaV3Settings = $FrontendFormManager->getCaptchaV3Settings();
399 - if ($FrontendFormManager->getCaptchaSettings() || $captchaV3Settings || $FrontendFormManager->getTurnstileSettings()) {
506 + if ($FrontendFormManager->getCaptchaSettings() || $captchaV3Settings || $FrontendFormManager->getTurnstileSettings() || $FrontendFormManager->isFieldTypeExist('hcaptcha')) {
400 507 $integrationHandler = new IntegrationHandler(0);
401 508 $allFormIntegrations = $integrationHandler->getAllIntegration('app');
402 509 if (!is_wp_error($allFormIntegrations)) {
403 510 foreach ($allFormIntegrations as $integration) {
@@ -405,12 +512,14 @@
405 512 $FrontendFormManager->getCaptchaSettings()
406 513 && !is_null($integration->integration_type)
407 514 && 'gReCaptcha' === $integration->integration_type
408 515 ) {
409 - $integrationDetails = json_decode($integration->integration_details);
410 - $integrationDetails->id = $integration->id;
411 - $reCAPTCHA = $integrationDetails;
412 - $reCAPTCHAVersion = 'v2';
516 + $integrationDetails = Utilities::jsonObj($integration->integration_details);
517 + if ($integrationDetails) {
518 + $integrationDetails->id = $integration->id;
519 + $reCAPTCHA = $integrationDetails;
520 + $reCAPTCHAVersion = 'v2';
521 + }
413 522 }
414 523
415 524 if (
416 525 $FrontendFormManager->getTurnstileSettings()
@@ -416,18 +525,29 @@
416 525 $FrontendFormManager->getTurnstileSettings()
417 526 && !is_null($integration->integration_type)
418 527 && 'turnstileCaptcha' === $integration->integration_type
419 528 ) {
420 - $integrationDetails = json_decode($integration->integration_details);
421 - $turnstileSiteKey = $integrationDetails->siteKey;
529 + $integrationDetails = Utilities::jsonObj($integration->integration_details);
530 + $turnstileSiteKey = $integrationDetails->siteKey ?? '';
422 531 }
423 532
533 + if (
534 + $FrontendFormManager->isFieldTypeExist('hcaptcha')
535 + && !is_null($integration->integration_type)
536 + && 'hcaptcha' === $integration->integration_type
537 + ) {
538 + $integrationDetails = Utilities::jsonObj($integration->integration_details);
539 + $hCaptchaSiteKey = $integrationDetails->siteKey ?? '';
540 + }
541 +
424 542 if ($captchaV3Settings) {
425 543 if (!is_null($integration->integration_type) && 'gReCaptchaV3' === $integration->integration_type) {
426 - $integrationDetails = json_decode($integration->integration_details);
427 - $integrationDetails->id = $integration->id;
428 - $reCAPTCHA = $integrationDetails;
429 - $reCAPTCHAVersion = 'v3';
544 + $integrationDetails = Utilities::jsonObj($integration->integration_details);
545 + if ($integrationDetails) {
546 + $integrationDetails->id = $integration->id;
547 + $reCAPTCHA = $integrationDetails;
548 + $reCAPTCHAVersion = 'v3';
549 + }
430 550 }
431 551 }
432 552 }
433 553 }
@@ -435,9 +555,11 @@
435 555
436 556 if ($captchaV3Settings && !empty($reCAPTCHA->siteKey)) {
437 557 // DANGER: no matter what, DONT CHANGE THE SCRIPT ID OF THIS SCRIPT
438 558 $scriptId = BITFORMS_PREFIX . 'recaptcha';
439 - wp_enqueue_script($scriptId, "https://www.google.com/recaptcha/api.js?render={$reCAPTCHA->siteKey}");
559 + // External Google reCAPTCHA script; version managed by URL query param. Loaded in header because
560 + // standalone form views do not render wp_footer(), making footer enqueue unreliable.
561 + wp_enqueue_script($scriptId, "https://www.google.com/recaptcha/api.js?render={$reCAPTCHA->siteKey}", [], null, false);
440 562 }
441 563
442 564 $configs = [
443 565 'bf_separator' => BITFORMS_BF_SEPARATOR,
@@ -455,22 +577,23 @@
455 577 if (!empty($paymentFieldData)) {
456 578 $integrationHandler = new IntegrationHandler(0);
457 579 foreach ($paymentFieldData as $fldKey => $fldData) {
458 580 $paymentIntegration = $integrationHandler->getAIntegration($fldData->payIntegID);
459 - if(is_wp_error($paymentIntegration)) {
581 + if (is_wp_error($paymentIntegration)) {
460 582 continue;
461 583 }
584 + $paymentIntegrationRow = Utilities::firstRow($paymentIntegration);
462 585 if ('paypal' === $fldData->typ) {
463 - $integrationDetails = json_decode($paymentIntegration[0]->integration_details);
464 - $clientID = $integrationDetails->clientID;
586 + $integrationDetails = Utilities::jsonObj($paymentIntegrationRow->integration_details ?? '');
587 + $clientID = $integrationDetails->clientID ?? '';
465 588 $fields->{$fldKey}->clientId = $clientID;
466 589 } elseif ('razorpay' === $fldData->typ) {
467 - $integrationDetails = json_decode($paymentIntegration[0]->integration_details);
468 - $clientID = $integrationDetails->apiKey;
590 + $integrationDetails = Utilities::jsonObj($paymentIntegrationRow->integration_details ?? '');
591 + $clientID = $integrationDetails->apiKey ?? '';
469 592 $fields->{$fldKey}->clientId = $clientID;
470 593 } elseif ('stripe' === $fldData->typ) {
471 - $integrationDetails = json_decode($paymentIntegration[0]->integration_details);
472 - $publishableKey = $integrationDetails->publishableKey;
594 + $integrationDetails = Utilities::jsonObj($paymentIntegrationRow->integration_details ?? '');
595 + $publishableKey = $integrationDetails->publishableKey ?? '';
473 596 $fields->{$fldKey}->publishableKey = $publishableKey;
474 597 }
475 598 }
476 599 }
@@ -490,17 +613,19 @@
490 613 'appID' => "bitforms_{$formID}",
491 614 'GCLID' => $FrontendFormManager->isGCLIDEnabled(),
492 615 'assetUrl' => BITFORMS_ASSET_URI,
493 616 'onfieldCondition' => !empty($workFlowreturnedOnUserInput['onfield_input_conditions']) ? $workFlowreturnedOnUserInput['onfield_input_conditions'] : false,
494 - 'smartTags' => !empty($workFlowreturnedOnUserInput['smart_tags']) ? $workFlowreturnedOnUserInput['smart_tags'] : [],
617 + 'smartTags' => $this->buildFrontendSmartTags($formID, $workFlowreturnedOnUserInput, $fields),
495 618 'paymentCallbackUrl' => get_rest_url() . 'bitform/v1/payments/razorpay',
496 619 'gRecaptchaSiteKey' => !empty($reCAPTCHA->siteKey) ? $reCAPTCHA->siteKey : null,
497 620 'gRecaptchaVersion' => !empty($reCAPTCHAVersion) ? $reCAPTCHAVersion : null,
498 - 'turnstileSiteKey' => !empty($turnstileSiteKey) ? $turnstileSiteKey : null
621 + 'turnstileSiteKey' => !empty($turnstileSiteKey) ? $turnstileSiteKey : null,
622 + 'hCaptchaSiteKey' => !empty($hCaptchaSiteKey) ? $hCaptchaSiteKey : null,
499 623 ];
500 624
501 625 if ($entryId) {
502 626 $bitFormFrontArr['entryId'] = $entryId;
627 + self::markResponseUncacheable();
503 628 }
504 629
505 630 if (isset($additional->enabled->validateFocusLost)) {
506 631 $bitFormFrontArr['validateFocusLost'] = true;
@@ -505,16 +630,24 @@
505 630 if (isset($additional->enabled->validateFocusLost)) {
506 631 $bitFormFrontArr['validateFocusLost'] = true;
507 632 }
508 633
509 - if (!empty($isAbandoned)) {
510 - $bitFormFrontArr['oldValues'] = $this->getFieldsValue($formID, $isAbandoned);
634 + if ($isAbandoned) {
635 + // One visitor's typed values, so this response must not be page-cached.
636 + $bitFormFrontArr['oldValues'] = $this->getFieldsValue($formID, $abandonedEntryId);
637 + self::markResponseUncacheable();
511 638 if (empty($entryId)) {
512 - $bitFormFrontArr['entryId'] = $isAbandoned;
639 + // Later draft saves must update this entry, not start a new one each time.
640 + $bitFormFrontArr['entryId'] = $abandonedEntryId;
641 + $entryToken = Cryptography::encrypt($abandonedEntryId, Helpers::getBitformSalt());
642 + if (is_string($entryToken)) {
643 + $bitFormFrontArr['entryToken'] = $entryToken;
644 + }
513 645 }
514 646 }
515 647
516 648 $formInfo = $FrontendFormManager->getFormInfo();
649 + $bitFormFrontArr['formName'] = $formInfo->formName ?? '';
517 650 if (is_array($layout) && count($layout) > 1) {
518 651 $multiStepSettings = isset($formInfo->multiStepSettings) ? $formInfo->multiStepSettings : null;
519 652 $newTempSettings = (object) [
520 653 'validateOnStepChange' => isset($multiStepSettings->validateOnStepChange) ? $multiStepSettings->validateOnStepChange : false,
@@ -533,34 +666,42 @@
533 666 }
534 667 $bitFormFrontArr['formInfo']->conversationalSettings = $formInfo->conversationalSettings;
535 668 }
536 669
537 - $bitFormsFront = apply_filters(
538 - 'bitforms_localized_script',
539 - $bitFormFrontArr
540 - );
670 + $formAbandonmentSettings = $FrontendFormManager->getFormAbandonmentSettings();
671 + if (Helpers::property_exists_nested($formAbandonmentSettings, 'active', true)) {
672 + $bitFormFrontArr['formSettings'] = (object)[
673 + 'formAbandonment' => $formAbandonmentSettings
674 + ];
675 + }
541 676
542 677 $layout = wp_json_encode($layout);
543 678 $buttons = wp_json_encode($buttons);
544 679 $frontArr = wp_json_encode($bitFormFrontArr);
545 680
546 - $bfGlobals = <<<BFGLOBALS
547 - if(!window.bf_globals) {
548 - window.bf_globals = {}
549 - } if(!window.bf_globals.{$FormIdentifier}) {
550 - window.bf_globals.{$FormIdentifier} = {}
681 + $bfGlobals = sprintf('
682 + if(!window.bf_globals) {
683 + window.bf_globals = {}
684 + } if(!window.bf_globals.%1$s) {
685 + window.bf_globals.%1$s = {}
551 686 }
552 - if(document.getElementById('{$FormIdentifier}')) {
553 - window.bf_globals.{$FormIdentifier} = {...window.bf_globals.{$FormIdentifier}, ...{$frontArr}};
554 - }
555 -BFGLOBALS;
687 + window.bf_globals.%1$s = {
688 + ...window.bf_globals.%1$s,
689 + ...%2$s
690 + };
691 + if (typeof window.bitformInit === "function") { window.bitformInit("%1$s"); }', $FormIdentifier, $frontArr);
556 692
693 + // Inert copy of the config. Optimizers only rewrite executable scripts, so
694 + // this survives and travels with the markup; the runtime hydrates from it
695 + // whenever bf_globals is missing.
696 + $configTag = self::buildFormConfigTag($FormIdentifier, $bitFormFrontArr);
697 +
557 698 if ('conversational' === $formType
558 699 && isset($formContent->formInfo->conversationalSettings->enable)
559 700 && $formContent->formInfo->conversationalSettings->enable) {
560 - $html = $FrontendFormManager->conversationalFormView($fields, $file, $errorMessages);
701 + $html = $FrontendFormManager->conversationalFormView($fields, $file, $errorMessages, null, !empty($entryId));
561 702 } else {
562 - $html = $FrontendFormManager->formView($fields, $file, $errorMessages);
703 + $html = $FrontendFormManager->formView($fields, $file, $errorMessages, null, !empty($entryId));
563 704 }
564 705
565 706 // if form preview then return html otherwise echo with output buffer
566 707 if ($formPreview) {
@@ -568,17 +709,142 @@
568 709 $formViewObject = new \stdClass();
569 710 $formViewObject->html = $html;
570 711 $formViewObject->font = $font;
571 712 $formViewObject->bfGlobals = $bfGlobals;
713 + $formViewObject->configTag = $configTag;
714 + $formViewObject->formContent = $formContent;
572 715 return $formViewObject;
573 716 }
574 - $html .= <<<BFGLOBALSSCRIPT
575 - <script id="bit-form-bf-globals-{$FormIdentifier}">{$bfGlobals}</script>
576 -BFGLOBALSSCRIPT;
577 - echo trim($html);
717 +
718 + $bfGlobalsHandle = 'bitform-bf-globals-' . sanitize_key($FormIdentifier);
719 + $this->addInlineScript($bfGlobals, $bfGlobalsHandle, 'after');
720 + $this->emitShowPickerBridge();
721 +
722 + // Printed outside wp_kses rather than allowing <script> in form markup.
723 + // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- built by buildFormConfigTag(), JSON_HEX_* escaped.
724 + echo $configTag;
725 + echo wp_kses(trim($html), EscapingHelper::getFormAllowedHtml($formContent));
578 726 return ob_get_clean();
579 727 }
580 728
729 + /**
730 + * Keep per-visitor config (oldValues, entryId) out of full-page caches.
731 + *
732 + * @return void
733 + */
734 + public static function markResponseUncacheable()
735 + {
736 + // DONOTCACHEPAGE does the work; caches read it at shutdown. Rendering
737 + // usually runs after headers are sent, so nocache_headers() is a bonus.
738 + if (!defined('DONOTCACHEPAGE')) {
739 + define('DONOTCACHEPAGE', true);
740 + }
741 + if (!headers_sent() && function_exists('nocache_headers')) {
742 + nocache_headers();
743 + }
744 + }
745 +
746 + /**
747 + * Build the inert JSON config block for a rendered form.
748 + *
749 + * JSON_HEX_* escapes < > & as \u00XX so no field value can close the script
750 + * element or inject markup.
751 + *
752 + * @param string $formIdentifier
753 + * @param array $config
754 + *
755 + * @return string
756 + */
757 + public static function buildFormConfigTag($formIdentifier, $config)
758 + {
759 + $json = wp_json_encode($config, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT);
760 + if (false === $json) {
761 + return '';
762 + }
763 + // Some optimizers wrap any inline <script>, including application/json,
764 + // in DOMContentLoaded boilerplate that corrupts the JSON. These attributes
765 + // make the common ones skip it; the JS side also salvage-parses.
766 + return sprintf(
767 + '<script type="application/json" class="bf-form-config" id="bf-config-%1$s" data-bf-form="%1$s" data-no-optimize="1" data-no-defer="1" data-no-minify="1" data-cfasync="false" nowprocket>%2$s</script>',
768 + esc_attr($formIdentifier),
769 + $json
770 + );
771 + }
772 +
773 + /**
774 + * Build the smart-tag map exposed to the browser in window.bf_globals[formId].smartTags.
775 + *
776 + * Security: the legacy code shipped the ENTIRE ~43-tag map to every visitor, leaking
777 + * PII (admin/user/author email) and freezing per-visitor request data (IP, time,
778 + * browser, referer) into cacheable HTML. We now emit ONLY tags that are (a) actually
779 + * referenced by this form's client-evaluated surfaces — conditional logic, payment
780 + * notes, admin custom JS — AND (b) flagged frontend-safe in the registry (static/post
781 + * context only). Sensitive (identity) and request/visitor tags are never emitted; they
782 + * resolve server-side at submit time instead.
783 + *
784 + * @param int|string $formID
785 + * @param mixed $workflowConditions on-field input conditions (client-evaluated)
786 + * @param mixed $fields form fields object (carries payment notes, etc.)
787 + * @return array<string,string>
788 + */
789 + private function buildFrontendSmartTags($formID, $workflowConditions, $fields)
790 + {
791 + // Haystack = only surfaces the browser actually evaluates against smartTags.
792 + $haystack = wp_json_encode($workflowConditions) . ' ' . wp_json_encode($fields);
793 + $customJs = FrontEndScriptGenerator::getCustomCodes($formID)['JavaScript'];
794 + if (is_string($customJs) && '' !== $customJs) {
795 + $haystack .= ' ' . $customJs;
796 + }
797 +
798 + $ctx = SmartTags::getPostUserData();
799 + $frontendSmartTags = [];
800 + $referenced = [];
801 + foreach (SmartTags::smartTagFieldKeys() as $key) {
802 + if (!SmartTagRegistry::isFrontendExposable($key)) {
803 + continue; // identity / request / param tags never travel to the browser
804 + }
805 + // Match '${' . key prefix so keys containing spaces/slashes/commas are handled.
806 + if (false !== strpos($haystack, '${' . $key)) {
807 + $referenced[] = $key;
808 + $frontendSmartTags[$key] = SmartTagRegistry::resolve($key, $ctx);
809 + }
810 + }
811 +
812 + /**
813 + * Escape hatch: a site that genuinely needs an extra tag client-side can opt it
814 + * back in explicitly here, rather than core shipping everything by default.
815 + *
816 + * @param array<string,string> $frontendSmartTags resolved frontend-safe smart tags
817 + * @param int|string $formID
818 + * @param string[] $referenced keys detected in client surfaces
819 + */
820 + return apply_filters('bitform_frontend_smarttags', $frontendSmartTags, $formID, $referenced);
821 + }
822 +
823 + /**
824 + * Delegated listener that opens the native picker on date/time inputs marked
825 + * with data-bf-show-picker. Replaces the legacy hardcoded onclick attribute.
826 + * Registered as inline script once per request via wp_add_inline_script so
827 + * the markup never travels through wp_kses().
828 + */
829 + private function emitShowPickerBridge()
830 + {
831 + static $emitted = false;
832 + if ($emitted) {
833 + return;
834 + }
835 + $emitted = true;
836 + $code = 'if(!window.__bfShowPickerBound){window.__bfShowPickerBound=true;document.addEventListener("click",function(e){var t=e.target;if(t&&t.matches&&t.matches("input[data-bf-show-picker=\"1\"]")&&typeof t.showPicker==="function"){try{t.showPicker();}catch(_){}}});}';
837 + $this->addInlineScript($code, 'bitform-show-picker-bridge', 'after');
838 + }
839 +
840 + /**
841 + * Does this form row exist?
842 + *
843 + * @param int $formID
844 + *
845 + * @return bool
846 + */
581 847 private function isExist($formID)
582 848 {
583 849 $formModel = new FormModel();
584 850 $form = $formModel->get(
@@ -588,16 +854,37 @@
588 854 [
589 855 'id' => $formID,
590 856 ]
591 857 );
592 - if (!is_wp_error($form)) {
593 - return true;
858 +
859 + if (is_wp_error($form)) {
860 + if ('result_empty' !== $form->get_error_code()) {
861 + Log::debug_log([
862 + 'message' => 'Form lookup failed — reported to the visitor as a missing form',
863 + 'formID' => $formID,
864 + 'code' => $form->get_error_code(),
865 + 'error' => $form->get_error_message(),
866 + ]);
867 + }
868 +
869 + return false;
594 870 }
595 - return false;
871 +
872 + if (empty($form)) {
873 + Log::debug_log([
874 + 'message' => 'Form lookup returned no rows without an error (is the form table present?)',
875 + 'formID' => $formID,
876 + ]);
877 +
878 + return false;
879 + }
880 +
881 + return true;
596 882 }
597 883
598 884 private function getFieldsValue($formID, $entryID)
599 885 {
886 + $FrontendFormManager = FrontendFormManager::getInstance($formID, 1);
600 887 $formEntryModel = new FormEntryMetaModel();
601 888 $metaValues = $formEntryModel->get(
602 889 [
603 890 'meta_key',
@@ -606,8 +893,9 @@
606 893 [
607 894 'bitforms_form_entry_id' => $entryID,
608 895 ]
609 896 );
897 + $formFields = $FrontendFormManager->getFields();
610 898 $fldsData = (object) [];
611 899 if (!is_wp_error($metaValues)) {
612 900 foreach ($metaValues as $metaValue) {
613 901 $metaKey = $metaValue->meta_key;
@@ -621,12 +909,19 @@
621 909 } else {
622 910 $metaVal = implode(BITFORMS_BF_SEPARATOR, $metaVal);
623 911 }
624 912 }
913 + // A restored draft never gets the password back; the visitor types it again.
914 + if (isset($formFields[$metaKey]['type']) && 'password' === $formFields[$metaKey]['type']) {
915 + continue;
916 + }
625 917 if (!isset($fldsData->{$metaKey})) {
626 918 $fldsData->{$metaKey} = '';
627 919 }
628 920 $fldsData->{$metaKey} = $metaVal;
921 + if (isset($formFields[$metaKey]['type']) && in_array($formFields[$metaKey]['type'], ['file-up', 'advanced-file-up'])) {
922 + $fldsData->{$metaKey} = $metaValue->meta_value;
923 + }
629 924 }
630 925 }
631 926
632 927 return $fldsData;
@@ -644,8 +939,23 @@
644 939 'bitforms_form_entry_id' => $entryID,
645 940 ]
646 941 );
647 942 if (!is_wp_error($metaValues)) {
943 + $urlQuery = wp_parse_url(FileDownloadProvider::getBaseDownloadURL(), PHP_URL_QUERY);
944 + $baseDLURL = FileDownloadProvider::getBaseDownloadURL();
945 + $baseDLURL = empty($urlQuery) ? $baseDLURL . '?' : $baseDLURL . '&';
946 + $baseDLURL .= "formID={$formID}&entryID={$entryID}";
947 +
948 + foreach ($fields as $field) {
949 + if ('file-up' === $field->typ || 'advanced-file-up' === $field->typ) {
950 + if (!isset($field->config)) {
951 + $field->config = (object) [];
952 + } elseif (is_array($field->config)) {
953 + $field->config = (object) $field->config;
954 + }
955 + $field->config->baseDLURL = $baseDLURL;
956 + }
957 + }
648 958 foreach ($metaValues as $metaValue) {
649 959 $metaKey = $metaValue->meta_key;
650 960 $metaVal = $metaValue->meta_value;
651 961 // if meta value is array then convert to string
@@ -657,23 +967,72 @@
657 967 } else {
658 968 $metaVal = implode(BITFORMS_BF_SEPARATOR, $metaVal);
659 969 }
660 970 }
971 + if (property_exists($fields, $metaKey) && 'password' === $fields->{$metaKey}->typ) {
972 + // Never hand a stored password back to the browser; blank keeps it on update.
973 + $fields->{$metaKey}->val = '';
974 + if ('' !== (string) $metaValue->meta_value && isset($fields->{$metaKey}->valid) && is_object($fields->{$metaKey}->valid)) {
975 + $fields->{$metaKey}->valid->req = false;
976 + }
977 + continue;
978 + }
661 979 if (property_exists($fields, $metaKey)) {
662 980 $fields->{$metaKey}->val = $metaVal;
663 981 if ('file-up' === $fields->{$metaKey}->typ || 'advanced-file-up' === $fields->{$metaKey}->typ) {
664 982 $fields->{$metaKey}->val = $metaValue->meta_value;
665 983 $fields->{$metaKey}->config->oldFiles = $metaValue->meta_value;
666 - $urlQuery = wp_parse_url(FileDownloadProvider::getBaseDownloadURL(), PHP_URL_QUERY);
667 - $baseDLURL = FileDownloadProvider::getBaseDownloadURL();
668 - $baseDLURL = empty($urlQuery) ? $baseDLURL . '?' : $baseDLURL . '&';
669 - $fields->{$metaKey}->config->baseDLURL = $baseDLURL . "formID={$formID}&entryID={$entryID}";
670 984 }
985 + if ('signature' === $fields->{$metaKey}->typ) {
986 + $this->setOldSignature($fields->{$metaKey}, $formID, $entryID, $metaValue->meta_value);
987 + }
671 988 }
672 989 }
673 990 }
991 + return $fields;
992 + }
674 993
675 - return $fields;
994 + /** Give the signature field its stored signature: a data URI to redraw, and the name it posts back as `_old`. */
995 + private function setOldSignature($field, $formID, $entryID, $storedValue)
996 + {
997 + $fileName = is_string($storedValue) ? trim($storedValue) : '';
998 + $decoded = json_decode($fileName, true);
999 + if (is_array($decoded)) {
1000 + $fileName = empty($decoded) ? '' : trim((string) reset($decoded));
1001 + }
1002 + // signature-failed.png means the stored signature was never usable.
1003 + if ('' === $fileName || 'signature-failed.png' === $fileName) {
1004 + return;
1005 + }
1006 + $fileName = sanitize_file_name($fileName);
1007 + if (!isset($field->config)) {
1008 + $field->config = (object) [];
1009 + } elseif (is_array($field->config)) {
1010 + $field->config = (object) $field->config;
1011 + }
1012 + $field->config->oldSignatureFile = $fileName;
1013 +
1014 + $filePath = FileHandler::getEntriesFileUploadDir($formID, $entryID) . DIRECTORY_SEPARATOR . $fileName;
1015 + if (!is_file($filePath) || !is_readable($filePath)) {
1016 + return;
1017 + }
1018 + // The types getSignatureFilePath() writes; wp_check_filetype() reports none for SVG.
1019 + $signatureMimeTypes = ['png' => 'image/png', 'jpg' => 'image/jpeg', 'svg' => 'image/svg+xml'];
1020 + $extension = strtolower((string) pathinfo($fileName, PATHINFO_EXTENSION));
1021 + if (!isset($signatureMimeTypes[$extension])) {
1022 + return;
1023 + }
1024 + $mimeType = $signatureMimeTypes[$extension];
1025 + // A hand-drawn signature is a few KB; a larger file is not worth inlining.
1026 + if (filesize($filePath) > self::MAX_INLINE_SIGNATURE_BYTES) {
1027 + return;
1028 + }
1029 + // phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_operations_file_get_contents -- local upload dir read, inlined as a data URI for the signature pad.
1030 + $contents = file_get_contents($filePath);
1031 + if (false === $contents || '' === $contents) {
1032 + return;
1033 + }
1034 + $field->config->oldSignature = 'data:' . $mimeType . ';base64,' . base64_encode($contents);
676 1035 }
677 1036
678 1037 public function loadAssets($formID = 0, $fromType = 'classic')
679 1038 {
@@ -695,31 +1054,31 @@
695 1054 $newFormId = $formID . '-formid';
696 1055 } else {
697 1056 $newFormId = $formID;
698 1057 }
699 - $formUpdateVersion = get_option('bit-form_form_update_version');
1058 + $formUpdateVersion = get_option('bitform_form_update_version');
700 1059 if (!wp_style_is('bitform-style-' . $newFormId) && is_readable(BITFORMS_CONTENT_DIR . '/form-styles/bitform-' . $newFormId . '.css')) {
701 1060 wp_enqueue_style(
702 1061 'bitform-style-' . $newFormId,
703 - BITFORMS_UPLOAD_BASE_URL . "/form-styles/bitform-{$newFormId}.css",
1062 + FrontendHelpers::styleSrc("form-styles/bitform-{$newFormId}.css"),
704 1063 [],
705 1064 $formUpdateVersion
706 1065 );
707 1066 if ($isPageBuilder) {
708 1067 $formStyle = file_get_contents(BITFORMS_CONTENT_DIR . '/form-styles/bitform-' . $newFormId . '.css');
709 - echo sprintf("<style id='bitform-style-{$newFormId}'>%s</style>", $formStyle);
1068 + echo '<style id="bitform-style-' . esc_attr((string) $newFormId) . '">' . wp_kses($formStyle, []) . '</style>';
710 1069 }
711 1070 }
712 1071 if (!wp_style_is('bitform-style-custom-' . $formID) && is_readable(BITFORMS_CONTENT_DIR . '/form-styles/bitform-custom-' . $formID . '.css')) {
713 1072 wp_enqueue_style(
714 1073 'bitform-style-custom-' . $formID,
715 - BITFORMS_UPLOAD_BASE_URL . "/form-styles/bitform-custom-{$formID}.css",
1074 + FrontendHelpers::styleSrc("form-styles/bitform-custom-{$formID}.css"),
716 1075 [],
717 1076 $formUpdateVersion
718 1077 );
719 1078 if ($isPageBuilder) {
720 1079 $formStyle = file_get_contents(BITFORMS_CONTENT_DIR . '/form-styles/bitform-custom-' . $formID . '.css');
721 - echo sprintf("<style id='bitform-style-custom-{$formID}'>%s</style>", $formStyle);
1080 + echo '<style id="bitform-style-custom-' . esc_attr((string) $formID) . '">' . wp_kses($formStyle, []) . '</style>';
722 1081 }
723 1082 }
724 1083 // load conversational form css
725 1084 if ('conversational' === $fromType) {
@@ -726,9 +1085,9 @@
726 1085 if (!wp_style_is('bitform-conversational-style-' . $formID) &&
727 1086 is_readable(BITFORMS_CONTENT_DIR . "/form-styles/bitform-conversational-{$formID}.css")) {
728 1087 wp_enqueue_style(
729 1088 'bitform-conversational-style',
730 - BITFORMS_UPLOAD_BASE_URL . "/form-styles/bitform-conversational-{$formID}.css",
1089 + FrontendHelpers::styleSrc("form-styles/bitform-conversational-{$formID}.css"),
731 1090 [],
732 1091 $formUpdateVersion
733 1092 );
734 1093 }