PluginProbe
Formidable Forms – WordPress Form Builder for Contact Forms, Calculators, Quizzes & More / 6.8
Formidable Forms – WordPress Form Builder for Contact Forms, Calculators, Quizzes & More v6.8
6.35 6.34 6.33.1 6.33 6.32.1 6.32 6.31 6.25 6.25.1 6.26 6.26.1 6.27 6.28 6.29 6.3 6.3.1 6.3.2 6.30 6.4 6.4.1 6.4.2 6.5 6.5.1 6.5.2 6.5.3 All 141 releases
← All changes | classes/models/FrmForm.php +126 -300 6.276.8 View file →
@@ -6,10 +6,9 @@
6 6 class FrmForm {
7 7
8 8 /**
9 9 * @param array $values
10 - *
11 - * @return bool|int id on success or false on failure.
10 + * @return int|bool id on success or false on failure.
12 11 */
13 12 public static function create( $values ) {
14 13 global $wpdb;
15 14
@@ -18,22 +17,22 @@
18 17 $new_values = array(
19 18 'form_key' => FrmAppHelper::get_unique_key( $values['form_key'], $wpdb->prefix . 'frm_forms', 'form_key' ),
20 19 'name' => $values['name'],
21 20 'description' => $values['description'],
22 - 'status' => $values['status'] ?? 'published',
23 - 'logged_in' => $values['logged_in'] ?? 0,
21 + 'status' => isset( $values['status'] ) ? $values['status'] : 'published',
22 + 'logged_in' => isset( $values['logged_in'] ) ? $values['logged_in'] : 0,
24 23 'is_template' => isset( $values['is_template'] ) ? (int) $values['is_template'] : 0,
25 24 'parent_form_id' => isset( $values['parent_form_id'] ) ? absint( $values['parent_form_id'] ) : 0,
26 25 'editable' => isset( $values['editable'] ) ? (int) $values['editable'] : 0,
27 - 'created_at' => $values['created_at'] ?? current_time( 'mysql', 1 ),
26 + 'created_at' => isset( $values['created_at'] ) ? $values['created_at'] : current_time( 'mysql', 1 ),
28 27 );
29 28
30 29 $options = isset( $values['options'] ) ? (array) $values['options'] : array();
31 30 FrmFormsHelper::fill_form_options( $options, $values );
32 31
33 - $options['before_html'] = $values['options']['before_html'] ?? FrmFormsHelper::get_default_html( 'before' );
34 - $options['after_html'] = $values['options']['after_html'] ?? FrmFormsHelper::get_default_html( 'after' );
35 - $options['submit_html'] = $values['options']['submit_html'] ?? FrmFormsHelper::get_default_html( 'submit' );
32 + $options['before_html'] = isset( $values['options']['before_html'] ) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html( 'before' );
33 + $options['after_html'] = isset( $values['options']['after_html'] ) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html( 'after' );
34 + $options['submit_html'] = isset( $values['options']['submit_html'] ) ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html( 'submit' );
36 35
37 36 /**
38 37 * Allows modifying form options before updating or creating.
39 38 *
@@ -60,9 +59,8 @@
60 59 /**
61 60 * @since 5.0.08
62 61 *
63 62 * @param array $options
64 - *
65 63 * @return array
66 64 */
67 65 private static function maybe_filter_form_options( $options ) {
68 66 if ( ! FrmAppHelper::allow_unfiltered_html() && ! empty( $options['submit_html'] ) ) {
@@ -71,22 +69,14 @@
71 69 return FrmAppHelper::maybe_filter_array( $options, array( 'submit_value', 'success_msg', 'before_html', 'after_html' ) );
72 70 }
73 71
74 72 /**
75 - * Duplicate a form.
76 - *
77 - * @param int $id Form ID to duplicate.
78 - * @param bool $template Whether the duplicated form is a template.
79 - * @param bool $copy_keys Whether to copy the original form key.
80 - * @param false|int $blog_id Blog ID when duplicating across sites, or false for current site.
81 - *
82 - * @return bool|int ID on success or false on failure
73 + * @return int|boolean ID on success or false on failure
83 74 */
84 75 public static function duplicate( $id, $template = false, $copy_keys = false, $blog_id = false ) {
85 76 global $wpdb;
86 77
87 78 $values = self::getOne( $id, $blog_id );
88 -
89 79 if ( ! $values ) {
90 80 return false;
91 81 }
92 82
@@ -103,10 +93,10 @@
103 93 'is_template' => $template ? 1 : 0,
104 94 );
105 95
106 96 if ( $blog_id ) {
107 - $new_values['status'] = 'published';
108 - $new_options = $values->options;
97 + $new_values['status'] = 'published';
98 + $new_options = $values->options;
109 99 FrmAppHelper::unserialize_or_decode( $new_options );
110 100 $new_options['email_to'] = get_option( 'admin_email' );
111 101 $new_options['copy'] = false;
112 102 $new_values['options'] = $new_options;
@@ -135,16 +125,10 @@
135 125
136 126 return false;
137 127 }
138 128
139 - /**
140 - * @param int $form_id
141 - * @param array $values
142 - *
143 - * @return void
144 - */
145 129 public static function after_duplicate( $form_id, $values ) {
146 - $new_opts = $values['options'];
130 + $new_opts = $values['options'];
147 131 FrmAppHelper::unserialize_or_decode( $new_opts );
148 132 $values['options'] = $new_opts;
149 133
150 134 if ( isset( $new_opts['success_msg'] ) ) {
@@ -152,9 +136,8 @@
152 136 }
153 137
154 138 $new_opts = apply_filters( 'frm_after_duplicate_form_values', $new_opts, $form_id );
155 139
156 - // phpcs:ignore Universal.Operators.StrictComparisons
157 140 if ( $new_opts != $values['options'] ) {
158 141 global $wpdb;
159 142 $wpdb->update( $wpdb->prefix . 'frm_forms', array( 'options' => maybe_serialize( $new_opts ) ), array( 'id' => $form_id ) );
160 143 }
@@ -167,10 +150,8 @@
167 150 *
168 151 * @since 5.3
169 152 *
170 153 * @param int $form_id Form ID.
171 - *
172 - * @return void
173 154 */
174 155 private static function switch_field_ids_in_fields( $form_id ) {
175 156 global $wpdb;
176 157
@@ -176,11 +157,10 @@
176 157
177 158 // Keys of fields that you want to check to replace field ID.
178 159 $keys = array( 'default_value', 'field_options' );
179 160 $sql_cols = 'fi.id';
180 -
181 161 foreach ( $keys as $key ) {
182 - $sql_cols .= ',fi.' . $key;
162 + $sql_cols .= ( ',fi.' . $key );
183 163 }
184 164
185 165 $fields = FrmDb::get_results(
186 166 "{$wpdb->prefix}frm_fields AS fi LEFT OUTER JOIN {$wpdb->prefix}frm_forms AS fr ON fi.form_id = fr.id",
@@ -206,14 +186,11 @@
206 186 *
207 187 * @since 5.3
208 188 *
209 189 * @param array $field Field array.
210 - *
211 - * @return void
212 190 */
213 191 private static function switch_field_ids_in_field( $field ) {
214 192 $new_values = array();
215 -
216 193 foreach ( $field as $key => $value ) {
217 194 if ( 'id' === $key || ! $value ) {
218 195 continue;
219 196 }
@@ -235,21 +212,15 @@
235 212 $new_values[ $key ] = $new_val;
236 213 }
237 214 }//end foreach
238 215
239 - if ( $new_values ) {
216 + if ( ! empty( $new_values ) ) {
240 217 FrmField::update( $field['id'], $new_values );
241 218 }
242 219 }
243 220
244 221 /**
245 - * Update a form.
246 - *
247 - * @param int $id Form ID.
248 - * @param array $values Form values to update.
249 - * @param bool $create_link Whether this is being called from link creation.
250 - *
251 - * @return bool|int
222 + * @return int|boolean
252 223 */
253 224 public static function update( $id, $values, $create_link = false ) {
254 225 global $wpdb;
255 226
@@ -263,23 +234,23 @@
263 234 $values['form_key'] = FrmAppHelper::get_unique_key( $values['form_key'], $wpdb->prefix . 'frm_forms', 'form_key', $id );
264 235 }
265 236
266 237 $form_fields = array( 'form_key', 'name', 'description', 'status', 'parent_form_id' );
267 - $new_values = self::set_update_options( array(), $values, array( 'form_id' => $id ) );
268 238
239 + $new_values = self::set_update_options( array(), $values, array( 'form_id' => $id ) );
240 +
269 241 foreach ( $values as $value_key => $value ) {
270 - if ( $value_key && in_array( $value_key, $form_fields, true ) ) {
242 + if ( $value_key && in_array( $value_key, $form_fields ) ) {
271 243 $new_values[ $value_key ] = $value;
272 244 }
273 245 }
274 246
275 - if ( ! empty( $values['new_status'] ) ) {
247 + if ( isset( $values['new_status'] ) && ! empty( $values['new_status'] ) ) {
276 248 $new_values['status'] = $values['new_status'];
277 249 }
278 250
279 - if ( $new_values ) {
251 + if ( ! empty( $new_values ) ) {
280 252 $query_results = $wpdb->update( $wpdb->prefix . 'frm_forms', $new_values, array( 'id' => $id ) );
281 -
282 253 if ( $query_results ) {
283 254 self::clear_form_cache();
284 255 }
285 256 } else {
@@ -298,9 +269,8 @@
298 269 /**
299 270 * @param array $new_values
300 271 * @param array $values
301 272 * @param array $args
302 - *
303 273 * @return array
304 274 */
305 275 public static function set_update_options( $new_values, $values, $args = array() ) {
306 276 if ( ! isset( $values['options'] ) ) {
@@ -309,12 +279,12 @@
309 279
310 280 $options = ! empty( $values['options'] ) ? (array) $values['options'] : array();
311 281 FrmFormsHelper::fill_form_options( $options, $values );
312 282
313 - $options['custom_style'] = $values['options']['custom_style'] ?? 0;
314 - $options['before_html'] = $values['options']['before_html'] ?? FrmFormsHelper::get_default_html( 'before' );
315 - $options['after_html'] = $values['options']['after_html'] ?? FrmFormsHelper::get_default_html( 'after' );
316 - $options['submit_html'] = isset( $values['options']['submit_html'] ) && '' !== $values['options']['submit_html'] ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html( 'submit' ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
283 + $options['custom_style'] = isset( $values['options']['custom_style'] ) ? $values['options']['custom_style'] : 0;
284 + $options['before_html'] = isset( $values['options']['before_html'] ) ? $values['options']['before_html'] : FrmFormsHelper::get_default_html( 'before' );
285 + $options['after_html'] = isset( $values['options']['after_html'] ) ? $values['options']['after_html'] : FrmFormsHelper::get_default_html( 'after' );
286 + $options['submit_html'] = ( isset( $values['options']['submit_html'] ) && '' !== $values['options']['submit_html'] ) ? $values['options']['submit_html'] : FrmFormsHelper::get_default_html( 'submit' );
317 287
318 288 /**
319 289 * Allows modifying form options before updating or creating.
320 290 *
@@ -331,14 +301,11 @@
331 301 return $new_values;
332 302 }
333 303
334 304 /**
335 - * @param int $id Form ID.
336 - * @param array $values Form values array.
337 - *
338 305 * @return array
339 306 */
340 - public static function update_fields( $id, $values ) { // phpcs:ignore SlevomatCodingStandard.Complexity.Cognitive.ComplexityTooHigh
307 + public static function update_fields( $id, $values ) {
341 308
342 309 if ( ! isset( $values['item_meta'] ) && ! isset( $values['field_options'] ) ) {
343 310 return $values;
344 311 }
@@ -343,10 +310,9 @@
343 310 return $values;
344 311 }
345 312
346 313 $all_fields = FrmField::get_all_for_form( $id );
347 -
348 - if ( ! $all_fields ) {
314 + if ( empty( $all_fields ) ) {
349 315 return $values;
350 316 }
351 317
352 318 if ( ! isset( $values['item_meta'] ) ) {
@@ -354,28 +320,28 @@
354 320 }
355 321
356 322 $field_array = array();
357 323 $existing_keys = array_keys( $values['item_meta'] );
358 -
359 324 foreach ( $all_fields as $fid ) {
360 - // phpcs:ignore WordPress.PHP.StrictInArray.MissingTrueStrict, SlevomatCodingStandard.Files.LineLength.LineTooLong
361 325 if ( ! in_array( $fid->id, $existing_keys ) && ( isset( $values['frm_fields_submitted'] ) && in_array( $fid->id, $values['frm_fields_submitted'] ) ) || isset( $values['options'] ) ) {
362 326 $values['item_meta'][ $fid->id ] = '';
363 327 }
364 -
365 328 $field_array[ $fid->id ] = $fid;
366 329 }
367 330 unset( $all_fields );
368 331
369 332 foreach ( $values['item_meta'] as $field_id => $default_value ) {
370 - $field = $field_array[ $field_id ] ?? FrmField::getOne( $field_id );
333 + if ( isset( $field_array[ $field_id ] ) ) {
334 + $field = $field_array[ $field_id ];
335 + } else {
336 + $field = FrmField::getOne( $field_id );
337 + }
371 338
372 339 if ( ! $field ) {
373 340 continue;
374 341 }
375 342
376 - $is_settings_page = isset( $values['options'] ) || isset( $values['field_options'][ 'custom_html_' . $field_id ] );
377 -
343 + $is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options'][ 'custom_html_' . $field_id ] ) );
378 344 if ( $is_settings_page ) {
379 345 self::get_settings_page_html( $values, $field );
380 346
381 347 if ( ! defined( 'WP_IMPORTING' ) ) {
@@ -388,14 +354,10 @@
388 354 // Don't check for POST html.
389 355 unset( $update_options['custom_html'] );
390 356 $update_options = apply_filters( 'frm_field_options_to_update', $update_options );
391 357
392 - if ( ! is_array( $field->field_options ) ) {
393 - $field->field_options = array();
394 - }
395 -
396 358 foreach ( $update_options as $opt => $default ) {
397 - $field->field_options[ $opt ] = $values['field_options'][ $opt . '_' . $field_id ] ?? $default;
359 + $field->field_options[ $opt ] = isset( $values['field_options'][ $opt . '_' . $field_id ] ) ? $values['field_options'][ $opt . '_' . $field_id ] : $default;
398 360 self::sanitize_field_opt( $opt, $field->field_options[ $opt ] );
399 361 }
400 362
401 363 $field->field_options = apply_filters( 'frm_update_field_options', $field->field_options, $field, $values );
@@ -404,9 +366,9 @@
404 366 'field_options' => $field->field_options,
405 367 'default_value' => isset( $values[ 'default_value_' . $field_id ] ) ? FrmAppHelper::maybe_json_encode( $values[ 'default_value_' . $field_id ] ) : '',
406 368 );
407 369
408 - if ( ! FrmAppHelper::allow_unfiltered_html() && isset( $values['field_options'][ 'options_' . $field_id ] ) && is_array( $values['field_options'][ 'options_' . $field_id ] ) ) { // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
370 + if ( ! FrmAppHelper::allow_unfiltered_html() && isset( $values['field_options'][ 'options_' . $field_id ] ) && is_array( $values['field_options'][ 'options_' . $field_id ] ) ) {
409 371 foreach ( $values['field_options'][ 'options_' . $field_id ] as $option_key => $option ) {
410 372 if ( is_array( $option ) ) {
411 373 foreach ( $option as $key => $item ) {
412 374 $values['field_options'][ 'options_' . $field_id ][ $option_key ][ $key ] = FrmAppHelper::kses( $item, 'all' );
@@ -434,9 +396,8 @@
434 396 *
435 397 * @param array $field
436 398 * @param array $values
437 399 * @param array $new_field
438 - *
439 400 * @return void
440 401 */
441 402 private static function maybe_update_max_option( $field, $values, &$new_field ) {
442 403 if ( $field->type === 'textarea' &&
@@ -441,8 +402,9 @@
441 402 private static function maybe_update_max_option( $field, $values, &$new_field ) {
442 403 if ( $field->type === 'textarea' &&
443 404 ! empty( $values['field_options'][ 'type_' . $field->id ] ) &&
444 405 in_array( $values['field_options'][ 'type_' . $field->id ], array( 'text', 'email', 'url', 'password', 'phone' ), true ) ) {
406 +
445 407 $new_field['field_options']['max'] = '';
446 408
447 409 /**
448 410 * Update posted field setting so that new 'max' option is displayed after form is saved and page reloads.
@@ -454,9 +416,8 @@
454 416
455 417 /**
456 418 * @param string $opt
457 419 * @param mixed $value
458 - *
459 420 * @return void
460 421 */
461 422 private static function sanitize_field_opt( $opt, &$value ) {
462 423 if ( ! is_string( $value ) ) {
@@ -477,19 +438,23 @@
477 438 if ( ! $should_sanitize ) {
478 439 return;
479 440 }
480 441
481 - $value = $opt === 'calc' ? self::sanitize_calc( $value ) : FrmAppHelper::kses( $value, 'all' );
442 + if ( $opt === 'calc' ) {
443 + $value = self::sanitize_calc( $value );
444 + } else {
445 + $value = FrmAppHelper::kses( $value, 'all' );
446 + }
447 +
482 448 $value = trim( $value );
483 449 }
484 450
485 451 /**
486 452 * @param string $value
487 - *
488 453 * @return string
489 454 */
490 455 private static function sanitize_calc( $value ) {
491 - if ( str_contains( $value, '<' ) ) {
456 + if ( false !== strpos( $value, '<' ) ) {
492 457 $value = self::normalize_calc_spaces( $value );
493 458 }
494 459 // Allow <= and >=.
495 460 $allow = array( '<= ', ' >=' );
@@ -495,9 +460,10 @@
495 460 $allow = array( '<= ', ' >=' );
496 461 $temp = array( '< = ', ' > =' );
497 462 $value = str_replace( $allow, $temp, $value );
498 463 $value = strip_tags( $value );
499 - return str_replace( $temp, $allow, $value );
464 + $value = str_replace( $temp, $allow, $value );
465 + return $value;
500 466 }
501 467
502 468 /**
503 469 * Format a comparison like 5<10 to 5 < 10. Also works on 5< 10, 5 <10, 5<=10 variations.
@@ -503,43 +469,35 @@
503 469 * Format a comparison like 5<10 to 5 < 10. Also works on 5< 10, 5 <10, 5<=10 variations.
504 470 * This is to avoid an issue with unspaced calculations being recognized as HTML that gets removed when strip_tags is called.
505 471 *
506 472 * @param string $calc
507 - *
508 473 * @return string
509 474 */
510 475 private static function normalize_calc_spaces( $calc ) {
511 476 // Check for a pattern with 5 parts
512 - // $1 \d|\] the first comparison digit or the end of a comparison shortcode.
477 + // $1 \d the first comparison digit.
513 478 // $2 a space (optional).
514 479 // $3 an equals sign (optional) that follows the < operator for <= comparisons.
515 480 // $4 another space (optional).
516 - // $5 \d|\[ the second comparison digit or the start of a comparison shortcode.
517 - return preg_replace( '/(\d|\])( ){0,1}<(=){0,1}( ){0,1}(\d|\[)/', '$1 <$3 $5', $calc );
481 + // $5 \d the second comparison digit.
482 + return preg_replace( '/(\d)( ){0,1}<(=){0,1}( ){0,1}(\d)/', '$1 <$3 $5', $calc );
518 483 }
519 484
520 485 /**
521 486 * Updating the settings page
522 - *
523 - * @param array $values Form values array.
524 - * @param object $field Field object, passed by reference.
525 - *
526 - * @return void
527 487 */
528 488 private static function get_settings_page_html( $values, &$field ) {
529 489 if ( isset( $values['field_options'][ 'custom_html_' . $field->id ] ) ) {
530 490 $prev_opts = array();
531 - $fallback_html = $field->field_options['custom_html'] ?? FrmFieldsHelper::get_default_html( $field->type );
491 + $fallback_html = isset( $field->field_options['custom_html'] ) ? $field->field_options['custom_html'] : FrmFieldsHelper::get_default_html( $field->type );
532 492
533 - $field->field_options['custom_html'] = $values['field_options'][ 'custom_html_' . $field->id ] ?? $fallback_html;
534 - } elseif ( $field->type === 'hidden' || $field->type === 'user_id' ) {
493 + $field->field_options['custom_html'] = isset( $values['field_options'][ 'custom_html_' . $field->id ] ) ? $values['field_options'][ 'custom_html_' . $field->id ] : $fallback_html;
494 + } elseif ( $field->type == 'hidden' || $field->type == 'user_id' ) {
535 495 $prev_opts = $field->field_options;
536 496 }
537 497
538 498 if ( isset( $prev_opts ) ) {
539 499 $field->field_options = apply_filters( 'frm_update_form_field_options', $field->field_options, $field, $values );
540 -
541 - // phpcs:ignore Universal.Operators.StrictComparisons
542 500 if ( $prev_opts != $field->field_options ) {
543 501 FrmField::update( $field->id, array( 'field_options' => $field->field_options ) );
544 502 }
545 503 }
@@ -544,15 +502,8 @@
544 502 }
545 503 }
546 504 }
547 505
548 - /**
549 - * @param object $field
550 - * @param array $values
551 - * @param array $new_field
552 - *
553 - * @return void
554 - */
555 506 private static function prepare_field_update_values( $field, $values, &$new_field ) {
556 507 $field_cols = array(
557 508 'field_order' => 0,
558 509 'field_key' => '',
@@ -561,16 +512,12 @@
561 512 'description' => '',
562 513 'options' => '',
563 514 'name' => '',
564 515 );
565 -
566 516 foreach ( $field_cols as $col => $default ) {
567 - $default = $default === '' ? $field->{$col} : $default;
568 - $new_field[ $col ] = $values['field_options'][ $col . '_' . $field->id ] ?? $default;
569 - }
517 + $default = ( $default === '' ) ? $field->{$col} : $default;
570 518
571 - if ( $field->type === 'submit' && isset( $new_field['field_order'] ) && (int) $new_field['field_order'] === FrmSubmitHelper::DEFAULT_ORDER ) {
572 - $new_field['field_order'] = $field->field_order;
519 + $new_field[ $col ] = isset( $values['field_options'][ $col . '_' . $field->id ] ) ? $values['field_options'][ $col . '_' . $field->id ] : $default;
573 520 }
574 521
575 522 // Don't save the template option.
576 523 if ( is_array( $new_field['options'] ) && isset( $new_field['options']['000'] ) ) {
@@ -582,12 +529,9 @@
582 529 * Get a list of all form settings that should be translated
583 530 * on a multilingual site.
584 531 *
585 532 * @since 3.06.01
586 - *
587 533 * @param object $form The form object.
588 - *
589 - * @return array
590 534 */
591 535 public static function translatable_strings( $form ) {
592 536 $strings = array(
593 537 'name',
@@ -607,18 +551,17 @@
607 551 /**
608 552 * @param int $id
609 553 * @param string $status
610 554 *
611 - * @return bool|int
555 + * @return int|boolean
612 556 */
613 557 public static function set_status( $id, $status ) {
614 - if ( 'trash' === $status ) {
558 + if ( 'trash' == $status ) {
615 559 return self::trash( $id );
616 560 }
617 561
618 562 $statuses = array( 'published', 'draft', 'trash' );
619 -
620 - if ( ! in_array( $status, $statuses, true ) ) {
563 + if ( ! in_array( $status, $statuses ) ) {
621 564 return false;
622 565 }
623 566
624 567 global $wpdb;
@@ -631,9 +574,9 @@
631 574 );
632 575 FrmDb::get_where_clause_and_values( $where );
633 576 array_unshift( $where['values'], $status );
634 577
635 - $query_results = $wpdb->query( $wpdb->prepare( 'UPDATE ' . $wpdb->prefix . 'frm_forms SET status = %s ' . $where['where'], $where['values'] ) ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared, SlevomatCodingStandard.Files.LineLength.LineTooLong
578 + $query_results = $wpdb->query( $wpdb->prepare( 'UPDATE ' . $wpdb->prefix . 'frm_forms SET status = %s ' . $where['where'], $where['values'] ) ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
636 579 } else {
637 580 $query_results = $wpdb->update( $wpdb->prefix . 'frm_forms', array( 'status' => $status ), array( 'id' => $id ) );
638 581 $wpdb->update( $wpdb->prefix . 'frm_forms', array( 'status' => $status ), array( 'parent_form_id' => $id ) );
639 582 }
@@ -645,11 +588,9 @@
645 588 return $query_results;
646 589 }
647 590
648 591 /**
649 - * @param int|string $id Form ID.
650 - *
651 - * @return bool|int
592 + * @return int|boolean
652 593 */
653 594 public static function trash( $id ) {
654 595 if ( ! EMPTY_TRASH_DAYS ) {
655 596 return self::destroy( $id );
@@ -655,17 +596,12 @@
655 596 return self::destroy( $id );
656 597 }
657 598
658 599 $form = self::getOne( $id );
659 -
660 600 if ( ! $form ) {
661 601 return false;
662 602 }
663 603
664 - if ( $form->status === 'trash' ) {
665 - return false;
666 - }
667 -
668 604 $options = $form->options;
669 605 $options['trash_time'] = time();
670 606
671 607 global $wpdb;
@@ -698,26 +634,21 @@
698 634 return $query_results;
699 635 }
700 636
701 637 /**
702 - * @param int|string $id Form ID.
703 - *
704 - * @return bool|int
638 + * @return int|boolean
705 639 */
706 640 public static function destroy( $id ) {
707 641 global $wpdb;
708 642
709 643 $form = self::getOne( $id );
710 -
711 644 if ( ! $form ) {
712 645 return false;
713 646 }
714 -
715 647 $id = $form->id;
716 648
717 649 // Disconnect the entries from this form
718 650 $entries = FrmDb::get_col( $wpdb->prefix . 'frm_items', array( 'form_id' => $id ) );
719 -
720 651 foreach ( $entries as $entry_id ) {
721 652 FrmEntry::destroy( $entry_id );
722 653 unset( $entry_id );
723 654 }
@@ -722,17 +653,13 @@
722 653 unset( $entry_id );
723 654 }
724 655
725 656 // Disconnect the fields from this form
726 - $wpdb->query( $wpdb->prepare( 'DELETE fi FROM ' . $wpdb->prefix . 'frm_fields AS fi LEFT JOIN ' . $wpdb->prefix . 'frm_forms fr ON (fi.form_id = fr.id) WHERE fi.form_id=%d OR parent_form_id=%d', $id, $id ) ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
657 + $wpdb->query( $wpdb->prepare( 'DELETE fi FROM ' . $wpdb->prefix . 'frm_fields AS fi LEFT JOIN ' . $wpdb->prefix . 'frm_forms fr ON (fi.form_id = fr.id) WHERE fi.form_id=%d OR parent_form_id=%d', $id, $id ) );
727 658
728 659 $query_results = $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_forms WHERE id=%d OR parent_form_id=%d', $id, $id ) );
729 -
730 660 if ( $query_results ) {
731 661 // Delete all form actions linked to this form
732 - /**
733 - * @var FrmFormAction
734 - */
735 662 $action_control = FrmFormActionsController::get_form_actions( 'email' );
736 663 $action_control->destroy( $id, 'all' );
737 664
738 665 // Clear form caching
@@ -747,10 +674,8 @@
747 674
748 675 /**
749 676 * Delete trashed forms based on how long they have been trashed
750 677 *
751 - * @param int|string $delete_timestamp Timestamp cutoff for deletion.
752 - *
753 678 * @return int The number of forms deleted
754 679 */
755 680 public static function scheduled_delete( $delete_timestamp = '' ) {
756 681 global $wpdb;
@@ -760,22 +685,19 @@
760 685 if ( ! $trash_forms ) {
761 686 return 0;
762 687 }
763 688
764 - if ( ! $delete_timestamp ) {
689 + if ( empty( $delete_timestamp ) ) {
765 690 $delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
766 691 }
767 692
768 693 $count = 0;
769 -
770 694 foreach ( $trash_forms as $form ) {
771 695 FrmAppHelper::unserialize_or_decode( $form->options );
772 -
773 696 if ( ! isset( $form->options['trash_time'] ) || $form->options['trash_time'] < $delete_timestamp ) {
774 697 self::destroy( $form->id );
775 -
776 698 if ( empty( $form->parent_form_id ) ) {
777 - ++$count;
699 + $count ++;
778 700 }
779 701 }
780 702
781 703 unset( $form );
@@ -784,17 +706,16 @@
784 706 return $count;
785 707 }
786 708
787 709 /**
788 - * @param int|string $id Form ID or key.
789 - *
790 710 * @return string form name
791 711 */
792 712 public static function getName( $id ) {
793 713 $form = FrmDb::check_cache( $id, 'frm_form' );
714 + if ( $form ) {
715 + $r = stripslashes( $form->name );
794 716
795 - if ( $form ) {
796 - return stripslashes( $form->name );
717 + return $r;
797 718 }
798 719
799 720 $query_key = is_numeric( $id ) ? 'id' : 'form_key';
800 721 $r = FrmDb::get_var( 'frm_forms', array( $query_key => $id ), 'name' );
@@ -799,9 +720,11 @@
799 720 $query_key = is_numeric( $id ) ? 'id' : 'form_key';
800 721 $r = FrmDb::get_var( 'frm_forms', array( $query_key => $id ), 'name' );
801 722
802 723 // An empty form name can result in a null value.
803 - return is_null( $r ) ? '' : stripslashes( $r );
724 + $r = is_null( $r ) ? '' : stripslashes( $r );
725 +
726 + return $r;
804 727 }
805 728
806 729 /**
807 730 * @since 3.0
@@ -816,9 +739,9 @@
816 739
817 740 /**
818 741 * @since 3.0
819 742 *
820 - * @param int|string $id
743 + * @param int $id
821 744 *
822 745 * @return string form key
823 746 */
824 747 public static function get_key_by_id( $id ) {
@@ -823,24 +746,23 @@
823 746 */
824 747 public static function get_key_by_id( $id ) {
825 748 $id = (int) $id;
826 749 $cache = FrmDb::check_cache( $id, 'frm_form' );
827 -
828 750 if ( $cache ) {
829 751 return $cache->form_key;
830 752 }
831 753
832 - return FrmDb::get_var( 'frm_forms', array( 'id' => $id ), 'form_key' );
754 + $key = FrmDb::get_var( 'frm_forms', array( 'id' => $id ), 'form_key' );
755 +
756 + return $key;
833 757 }
834 758
835 759 /**
836 760 * If $form is numeric, get the form object
837 761 *
762 + * @param object|int $form
763 + *
838 764 * @since 2.0.9
839 - *
840 - * @param int|object $form
841 - *
842 - * @return void
843 765 */
844 766 public static function maybe_get_form( &$form ) {
845 767 if ( ! is_object( $form ) && ! is_array( $form ) && ! empty( $form ) ) {
846 768 $form = self::getOne( $form );
@@ -847,33 +769,36 @@
847 769 }
848 770 }
849 771
850 772 /**
851 - * @param int|string $id
852 - * @param false|int $blog_id
853 - *
854 - * @return stdClass|null
773 + * @return object form
855 774 */
856 775 public static function getOne( $id, $blog_id = false ) {
857 776 global $wpdb;
858 777
859 778 if ( $blog_id && is_multisite() ) {
860 - $prefix = $wpdb->get_blog_prefix( $blog_id );
779 + global $wpmuBaseTablePrefix;
780 + $prefix = $wpmuBaseTablePrefix ? $wpmuBaseTablePrefix . $blog_id . '_' : $wpdb->get_blog_prefix( $blog_id );
781 +
861 782 $table_name = $prefix . 'frm_forms';
862 783 } else {
863 784 $table_name = $wpdb->prefix . 'frm_forms';
864 785 $cache = wp_cache_get( $id, 'frm_form' );
865 -
866 786 if ( $cache ) {
867 787 if ( isset( $cache->options ) ) {
868 788 FrmAppHelper::unserialize_or_decode( $cache->options );
869 789 }
870 790
871 - return self::prepare_form_row_data( $cache );
791 + return apply_filters( 'frm_form_object', wp_unslash( $cache ) );
872 792 }
873 793 }
874 794
875 - $where = is_numeric( $id ) ? array( 'id' => $id ) : array( 'form_key' => $id );
795 + if ( is_numeric( $id ) ) {
796 + $where = array( 'id' => $id );
797 + } else {
798 + $where = array( 'form_key' => $id );
799 + }
800 +
876 801 $results = FrmDb::get_row( $table_name, $where );
877 802
878 803 if ( isset( $results->options ) ) {
879 804 FrmDb::set_cache( $results->id, $results, 'frm_form' );
@@ -879,49 +804,17 @@
879 804 FrmDb::set_cache( $results->id, $results, 'frm_form' );
880 805 FrmAppHelper::unserialize_or_decode( $results->options );
881 806 }
882 807
883 - return self::prepare_form_row_data( $results );
808 + return apply_filters( 'frm_form_object', wp_unslash( $results ) );
884 809 }
885 810
886 811 /**
887 - * Make sure that if $row is an object, that $row->options is an array and not a string.
888 - *
889 - * @since 6.8.3
890 - *
891 - * @param stdClass|null $row The database row for a target form.
892 - *
893 - * @return stdClass|null
812 + * @return object|array of objects
894 813 */
895 - private static function prepare_form_row_data( $row ) {
896 - $row = wp_unslash( $row );
897 -
898 - if ( ! is_object( $row ) ) {
899 - return $row;
900 - }
901 -
902 - if ( ! is_array( $row->options ) ) {
903 - $row->options = FrmFormsHelper::get_default_opts();
904 - }
905 -
906 - /**
907 - * @since 4.03.02
908 - *
909 - * @param stdClass $row
910 - */
911 - return apply_filters( 'frm_form_object', $row );
912 - }
913 -
914 - /**
915 - * @param array|string $where Where conditions array or raw WHERE string.
916 - * @param string $order_by Order by clause.
917 - * @param int|string $limit Limit clause or number.
918 - *
919 - * @return array|object of objects
920 - */
921 814 public static function getAll( $where = array(), $order_by = '', $limit = '' ) {
922 - if ( is_array( $where ) && $where ) {
923 - if ( ! empty( $where['is_template'] ) && ! isset( $where['status'] ) && ! isset( $where['status !'] ) ) {
815 + if ( is_array( $where ) && ! empty( $where ) ) {
816 + if ( isset( $where['is_template'] ) && $where['is_template'] && ! isset( $where['status'] ) && ! isset( $where['status !'] ) ) {
924 817 // don't get trashed templates
925 818 $where['status'] = array( null, '', 'published' );
926 819 }
927 820
@@ -929,9 +822,9 @@
929 822 } else {
930 823 global $wpdb;
931 824
932 825 // The query has already been prepared if this is not an array.
933 - $query = 'SELECT * FROM ' . $wpdb->prefix . 'frm_forms' . FrmDb::prepend_and_or_where( ' WHERE ', $where ) . FrmDb::esc_order( $order_by ) . FrmDb::esc_limit( $limit ); // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
826 + $query = 'SELECT * FROM ' . $wpdb->prefix . 'frm_forms' . FrmDb::prepend_and_or_where( ' WHERE ', $where ) . FrmDb::esc_order( $order_by ) . FrmDb::esc_limit( $limit );
934 827 $results = $wpdb->get_results( $query ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
935 828 }
936 829
937 830 if ( $results ) {
@@ -940,9 +833,9 @@
940 833 FrmAppHelper::unserialize_or_decode( $result->options );
941 834 }
942 835 }
943 836
944 - if ( $limit === ' LIMIT 1' || (int) $limit === 1 ) {
837 + if ( $limit == ' LIMIT 1' || $limit == 1 ) {
945 838 // return the first form object if we are only getting one form
946 839 $results = reset( $results );
947 840 }
948 841
@@ -956,20 +849,20 @@
956 849 *
957 850 * @param array $query
958 851 * @param int $limit
959 852 * @param string $inc_children
960 - *
961 853 * @return array|object of forms A single form object would be passed if $limit was set to 1.
962 854 */
963 855 public static function get_published_forms( $query = array(), $limit = 999, $inc_children = 'exclude' ) {
964 856 $query['is_template'] = 0;
965 857 $query['status'] = array( null, '', 'published' );
966 -
967 - if ( $inc_children === 'exclude' ) {
858 + if ( $inc_children == 'exclude' ) {
968 859 $query['parent_form_id'] = array( null, 0 );
969 860 }
970 861
971 - return self::getAll( $query, 'name', $limit );
862 + $forms = self::getAll( $query, 'name', $limit );
863 +
864 + return $forms;
972 865 }
973 866
974 867 /**
975 868 * @return object count of forms
@@ -974,16 +867,18 @@
974 867 /**
975 868 * @return object count of forms
976 869 */
977 870 public static function get_count() {
871 + global $wpdb;
872 +
978 873 $cache_key = 'frm_form_counts';
979 - $counts = wp_cache_get( $cache_key, 'frm_form' );
980 874
875 + $counts = wp_cache_get( $cache_key, 'frm_form' );
981 876 if ( false !== $counts ) {
982 877 return $counts;
983 878 }
984 879
985 - $results = FrmDb::get_results(
880 + $results = (array) FrmDb::get_results(
986 881 'frm_forms',
987 882 array(
988 883 'or' => 1,
989 884 'parent_form_id' => null,
@@ -995,20 +890,20 @@
995 890 $statuses = array( 'published', 'draft', 'template', 'trash' );
996 891 $counts = array_fill_keys( $statuses, 0 );
997 892
998 893 foreach ( $results as $row ) {
999 - if ( 'trash' !== $row->status ) {
894 + if ( 'trash' != $row->status ) {
1000 895 if ( $row->is_template ) {
1001 - ++$counts['template'];
896 + $counts['template'] ++;
1002 897 } else {
1003 - ++$counts['published'];
898 + $counts['published'] ++;
1004 899 }
1005 900 } else {
1006 - ++$counts['trash'];
901 + $counts['trash'] ++;
1007 902 }
1008 903
1009 - if ( 'draft' === $row->status ) {
1010 - ++$counts['draft'];
904 + if ( 'draft' == $row->status ) {
905 + $counts['draft'] ++;
1011 906 }
1012 907
1013 908 unset( $row );
1014 909 }
@@ -1024,10 +919,8 @@
1024 919 * Called when a form is created, updated, duplicated, or deleted
1025 920 * or when the form status is changed
1026 921 *
1027 922 * @since 2.0.4
1028 - *
1029 - * @return void
1030 923 */
1031 924 public static function clear_form_cache() {
1032 925 FrmDb::cache_delete_group( 'frm_form' );
1033 926 }
@@ -1032,22 +925,16 @@
1032 925 FrmDb::cache_delete_group( 'frm_form' );
1033 926 }
1034 927
1035 928 /**
1036 - * @param array $values Form values to validate.
1037 - *
1038 929 * @return array of errors
1039 930 */
1040 931 public static function validate( $values ) {
1041 932 $errors = array();
933 +
1042 934 return apply_filters( 'frm_validate_form', $errors, $values );
1043 935 }
1044 936
1045 - /**
1046 - * @param object|null $form
1047 - *
1048 - * @return array
1049 - */
1050 937 public static function get_params( $form = null ) {
1051 938 global $frm_vars;
1052 939
1053 940 if ( ! $form ) {
@@ -1077,18 +964,16 @@
1077 964 );
1078 965
1079 966 $values = array();
1080 967 $values['posted_form_id'] = FrmAppHelper::get_param( 'form_id', '', 'get', 'absint' );
1081 -
1082 968 if ( ! $values['posted_form_id'] ) {
1083 969 $values['posted_form_id'] = FrmAppHelper::get_param( 'form', '', 'get', 'absint' );
1084 970 }
1085 971
1086 - // phpcs:ignore Universal.Operators.StrictComparisons
1087 972 if ( $form->id == $values['posted_form_id'] ) {
1088 973 // If there are two forms on the same page, make sure not to submit both.
1089 974 foreach ( $default_values as $var => $default ) {
1090 - if ( $var === 'action' ) {
975 + if ( $var == 'action' ) {
1091 976 $values[ $var ] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
1092 977 } else {
1093 978 $values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
1094 979 }
@@ -1100,9 +985,9 @@
1100 985 unset( $var, $default );
1101 986 }
1102 987 }
1103 988
1104 - if ( in_array( $values['action'], array( 'create', 'update' ), true ) &&
989 + if ( in_array( $values['action'], array( 'create', 'update' ) ) &&
1105 990 ( ! $_POST || ( ! isset( $_POST['action'] ) && ! isset( $_POST['frm_action'] ) ) ) // phpcs:ignore WordPress.Security.NonceVerification.Missing
1106 991 ) {
1107 992 $values['action'] = 'new';
1108 993 }
@@ -1109,11 +994,8 @@
1109 994
1110 995 return $values;
1111 996 }
1112 997
1113 - /**
1114 - * @return array
1115 - */
1116 998 public static function list_page_params() {
1117 999 $values = array();
1118 1000 $defaults = array(
1119 1001 'template' => 0,
@@ -1123,9 +1005,8 @@
1123 1005 'search' => '',
1124 1006 'sort' => '',
1125 1007 'sdir' => '',
1126 1008 );
1127 -
1128 1009 foreach ( $defaults as $var => $default ) {
1129 1010 $values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
1130 1011 }
1131 1012
@@ -1131,16 +1012,10 @@
1131 1012
1132 1013 return $values;
1133 1014 }
1134 1015
1135 - /**
1136 - * @param int|object|string|null $form
1137 - *
1138 - * @return array
1139 - */
1140 1016 public static function get_admin_params( $form = null ) {
1141 1017 $form_id = $form;
1142 -
1143 1018 if ( $form === null ) {
1144 1019 $form_id = self::get_current_form_id();
1145 1020 } elseif ( $form && is_object( $form ) ) {
1146 1021 $form_id = $form->id;
@@ -1158,9 +1033,8 @@
1158 1033 'sdir' => '',
1159 1034 'fid' => '',
1160 1035 'keep_post' => '',
1161 1036 );
1162 -
1163 1037 foreach ( $defaults as $var => $default ) {
1164 1038 $values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
1165 1039 }
1166 1040
@@ -1166,32 +1040,27 @@
1166 1040
1167 1041 return $values;
1168 1042 }
1169 1043
1170 - /**
1171 - * @param string $default_form
1172 - *
1173 - * @return int|string
1174 - */
1175 1044 public static function get_current_form_id( $default_form = 'none' ) {
1176 - $form = 'first' === $default_form ? self::get_current_form() : self::maybe_get_current_form();
1177 - return $form ? $form->id : 0;
1045 + if ( 'first' == $default_form ) {
1046 + $form = self::get_current_form();
1047 + } else {
1048 + $form = self::maybe_get_current_form();
1049 + }
1050 + $form_id = $form ? $form->id : 0;
1051 +
1052 + return $form_id;
1178 1053 }
1179 1054
1180 - /**
1181 - * @param int|string $form_id
1182 - *
1183 - * @return false|int|object|string
1184 - */
1185 1055 public static function maybe_get_current_form( $form_id = 0 ) {
1186 1056 global $frm_vars;
1187 1057
1188 - if ( ! empty( $frm_vars['current_form'] ) && ( ! $form_id || (int) $form_id === (int) $frm_vars['current_form']->id ) ) {
1058 + if ( isset( $frm_vars['current_form'] ) && $frm_vars['current_form'] && ( ! $form_id || $form_id == $frm_vars['current_form']->id ) ) {
1189 1059 return $frm_vars['current_form'];
1190 1060 }
1191 1061
1192 1062 $form_id = FrmAppHelper::get_param( 'form', $form_id, 'get', 'absint' );
1193 -
1194 1063 if ( $form_id ) {
1195 1064 $form_id = self::set_current_form( $form_id );
1196 1065 }
1197 1066
@@ -1197,16 +1066,10 @@
1197 1066
1198 1067 return $form_id;
1199 1068 }
1200 1069
1201 - /**
1202 - * @param int $form_id
1203 - *
1204 - * @return false|object
1205 - */
1206 1070 public static function get_current_form( $form_id = 0 ) {
1207 1071 $form = self::maybe_get_current_form( $form_id );
1208 -
1209 1072 if ( is_numeric( $form ) ) {
1210 1073 $form = self::set_current_form( $form );
1211 1074 }
1212 1075
@@ -1212,18 +1075,12 @@
1212 1075
1213 1076 return $form;
1214 1077 }
1215 1078
1216 - /**
1217 - * @param int $form_id
1218 - *
1219 - * @return false|object
1220 - */
1221 1079 public static function set_current_form( $form_id ) {
1222 1080 global $frm_vars;
1223 1081
1224 1082 $query = array();
1225 -
1226 1083 if ( $form_id ) {
1227 1084 $query['id'] = $form_id;
1228 1085 }
1229 1086
@@ -1231,19 +1088,11 @@
1231 1088
1232 1089 return $frm_vars['current_form'];
1233 1090 }
1234 1091
1235 - /**
1236 - * @param object $form
1237 - * @param int|string $this_load
1238 - * @param bool $global_load
1239 - *
1240 - * @return bool
1241 - */
1242 1092 public static function is_form_loaded( $form, $this_load, $global_load ) {
1243 1093 global $frm_vars;
1244 1094 $small_form = new stdClass();
1245 -
1246 1095 foreach ( array( 'id', 'form_key', 'name' ) as $var ) {
1247 1096 $small_form->{$var} = $form->{$var};
1248 1097 unset( $var );
1249 1098 }
@@ -1254,9 +1103,9 @@
1254 1103 $global_load = true;
1255 1104 $frm_vars['load_css'] = true;
1256 1105 }
1257 1106
1258 - return empty( $frm_vars['css_loaded'] ) && $global_load;
1107 + return ( ( ! isset( $frm_vars['css_loaded'] ) || ! $frm_vars['css_loaded'] ) && $global_load );
1259 1108 }
1260 1109
1261 1110 /**
1262 1111 * @since 4.06.03
@@ -1271,41 +1120,26 @@
1271 1120 } else {
1272 1121 $visible = true;
1273 1122 }
1274 1123
1275 - /**
1276 - * @since 6.25
1277 - *
1278 - * @param bool $visible
1279 - * @param object $form
1280 - */
1281 - $visible = (bool) apply_filters( 'frm_form_is_visible', $visible, $form );
1282 -
1283 1124 return $visible;
1284 1125 }
1285 1126
1286 - /**
1287 - * @param object $form
1288 - *
1289 - * @return bool
1290 - */
1291 1127 public static function show_submit( $form ) {
1292 - $show = ! $form->is_template && $form->status === 'published' && ! FrmAppHelper::is_admin();
1293 - return apply_filters( 'frm_show_submit_button', $show, $form );
1128 + $show = ( ! $form->is_template && $form->status == 'published' && ! FrmAppHelper::is_admin() );
1129 + $show = apply_filters( 'frm_show_submit_button', $show, $form );
1130 +
1131 + return $show;
1294 1132 }
1295 1133
1296 1134 /**
1297 1135 * @since 2.3
1298 - *
1299 - * @param array $atts Attributes including form, option, and default.
1300 - *
1301 - * @return mixed
1302 1136 */
1303 1137 public static function get_option( $atts ) {
1304 - $form = $atts['form'];
1305 - $default = $atts['default'] ?? '';
1138 + $form = $atts['form'];
1139 + $default = isset( $atts['default'] ) ? $atts['default'] : '';
1306 1140
1307 - return $form->options[ $atts['option'] ] ?? $default;
1141 + return isset( $form->options[ $atts['option'] ] ) ? $form->options[ $atts['option'] ] : $default;
1308 1142 }
1309 1143
1310 1144 /**
1311 1145 * Get the link to edit this form.
@@ -1310,12 +1144,9 @@
1310 1144 /**
1311 1145 * Get the link to edit this form.
1312 1146 *
1313 1147 * @since 4.0
1314 - *
1315 1148 * @param int $form_id The id of the form.
1316 - *
1317 - * @return string
1318 1149 */
1319 1150 public static function get_edit_link( $form_id ) {
1320 1151 return admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form_id );
1321 1152 }
@@ -1325,9 +1156,8 @@
1325 1156 *
1326 1157 * @since 6.2
1327 1158 *
1328 1159 * @param stdClass $form
1329 - *
1330 1160 * @return bool
1331 1161 */
1332 1162 public static function is_ajax_on( $form ) {
1333 1163 return ! empty( $form->options['ajax_submit'] );
@@ -1336,12 +1166,12 @@
1336 1166 /**
1337 1167 * Get the latest form available.
1338 1168 *
1339 1169 * @since 6.8
1340 - *
1341 1170 * @return object
1342 1171 */
1343 1172 public static function get_latest_form() {
1173 +
1344 1174 $args = array(
1345 1175 array(
1346 1176 'or' => 1,
1347 1177 'parent_form_id' => null,
@@ -1357,12 +1187,12 @@
1357 1187 /**
1358 1188 * Count and return total forms.
1359 1189 *
1360 1190 * @since 6.8
1361 - *
1362 1191 * @return int
1363 1192 */
1364 1193 public static function get_forms_count() {
1194 +
1365 1195 $args = array(
1366 1196 array(
1367 1197 'or' => 1,
1368 1198 'parent_form_id' => null,
@@ -1376,13 +1206,11 @@
1376 1206 }
1377 1207
1378 1208 /**
1379 1209 * @deprecated 2.03.05 This is still referenced in a few add ons (API, locations).
1380 - *
1381 1210 * @codeCoverageIgnore
1382 1211 *
1383 1212 * @param string $key
1384 - *
1385 1213 * @return int form id
1386 1214 */
1387 1215 public static function getIdByKey( $key ) {
1388 1216 _deprecated_function( __FUNCTION__, '2.03.05', 'FrmForm::get_id_by_key' );
@@ -1390,13 +1218,11 @@
1390 1218 }
1391 1219
1392 1220 /**
1393 1221 * @deprecated 2.03.05 This is still referenced in the API add on as of v1.13.
1394 - *
1395 1222 * @codeCoverageIgnore
1396 1223 *
1397 - * @param int|string $id
1398 - *
1224 + * @param string|int $id
1399 1225 * @return string
1400 1226 */
1401 1227 public static function getKeyById( $id ) {
1402 1228 _deprecated_function( __FUNCTION__, '2.03.05', 'FrmForm::get_key_by_id' );