| @@ -6,9 +6,8 @@ | ||
| 6 | 6 | class FrmForm { |
| 7 | 7 | |
| 8 | 8 | /** |
| 9 | 9 | * @param array $values |
| 10 | - * | |
| 11 | 10 | * @return bool|int id on success or false on failure. |
| 12 | 11 | */ |
| 13 | 12 | public static function create( $values ) { |
| 14 | 13 | global $wpdb; |
| @@ -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,15 +69,8 @@ | ||
| 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 | 73 | * @return bool|int 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; |
| @@ -84,9 +75,8 @@ | ||
| 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 | |
| @@ -135,14 +125,8 @@ | ||
| 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 | 130 | $new_opts = $values['options']; |
| 147 | 131 | FrmAppHelper::unserialize_or_decode( $new_opts ); |
| 148 | 132 | $values['options'] = $new_opts; |
| @@ -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,9 +157,8 @@ | ||
| 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 | 162 | $sql_cols .= ',fi.' . $key; |
| 183 | 163 | } |
| 184 | 164 | |
| @@ -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,20 +212,14 @@ | ||
| 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 | 222 | * @return bool|int |
| 252 | 223 | */ |
| 253 | 224 | public static function update( $id, $values, $create_link = false ) { |
| 254 | 225 | global $wpdb; |
| @@ -263,12 +234,13 @@ | ||
| 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,11 +247,10 @@ | ||
| 275 | 247 | if ( ! 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,35 +469,29 @@ | ||
| 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; | |
| 493 | + $field->field_options['custom_html'] = isset( $values['field_options'][ 'custom_html_' . $field->id ] ) ? $values['field_options'][ 'custom_html_' . $field->id ] : $fallback_html; | |
| 534 | 494 | } elseif ( $field->type === 'hidden' || $field->type === 'user_id' ) { |
| 535 | 495 | $prev_opts = $field->field_options; |
| 536 | 496 | } |
| 537 | 497 | |
| @@ -536,10 +496,8 @@ | ||
| 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,12 +512,11 @@ | ||
| 561 | 512 | 'description' => '', |
| 562 | 513 | 'options' => '', |
| 563 | 514 | 'name' => '', |
| 564 | 515 | ); |
| 565 | - | |
| 566 | 516 | foreach ( $field_cols as $col => $default ) { |
| 567 | 517 | $default = $default === '' ? $field->{$col} : $default; |
| 568 | - $new_field[ $col ] = $values['field_options'][ $col . '_' . $field->id ] ?? $default; | |
| 518 | + $new_field[ $col ] = isset( $values['field_options'][ $col . '_' . $field->id ] ) ? $values['field_options'][ $col . '_' . $field->id ] : $default; | |
| 569 | 519 | } |
| 570 | 520 | |
| 571 | 521 | if ( $field->type === 'submit' && isset( $new_field['field_order'] ) && (int) $new_field['field_order'] === FrmSubmitHelper::DEFAULT_ORDER ) { |
| 572 | 522 | $new_field['field_order'] = $field->field_order; |
| @@ -582,12 +532,9 @@ | ||
| 582 | 532 | * Get a list of all form settings that should be translated |
| 583 | 533 | * on a multilingual site. |
| 584 | 534 | * |
| 585 | 535 | * @since 3.06.01 |
| 586 | - * | |
| 587 | 536 | * @param object $form The form object. |
| 588 | - * | |
| 589 | - * @return array | |
| 590 | 537 | */ |
| 591 | 538 | public static function translatable_strings( $form ) { |
| 592 | 539 | $strings = array( |
| 593 | 540 | 'name', |
| @@ -610,14 +557,13 @@ | ||
| 610 | 557 | * |
| 611 | 558 | * @return bool|int |
| 612 | 559 | */ |
| 613 | 560 | public static function set_status( $id, $status ) { |
| 614 | - if ( 'trash' === $status ) { | |
| 561 | + if ( 'trash' == $status ) { | |
| 615 | 562 | return self::trash( $id ); |
| 616 | 563 | } |
| 617 | 564 | |
| 618 | 565 | $statuses = array( 'published', 'draft', 'trash' ); |
| 619 | - | |
| 620 | 566 | if ( ! in_array( $status, $statuses, true ) ) { |
| 621 | 567 | return false; |
| 622 | 568 | } |
| 623 | 569 | |
| @@ -631,9 +577,9 @@ | ||
| 631 | 577 | ); |
| 632 | 578 | FrmDb::get_where_clause_and_values( $where ); |
| 633 | 579 | array_unshift( $where['values'], $status ); |
| 634 | 580 | |
| 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 | |
| 581 | + $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 | 582 | } else { |
| 637 | 583 | $query_results = $wpdb->update( $wpdb->prefix . 'frm_forms', array( 'status' => $status ), array( 'id' => $id ) ); |
| 638 | 584 | $wpdb->update( $wpdb->prefix . 'frm_forms', array( 'status' => $status ), array( 'parent_form_id' => $id ) ); |
| 639 | 585 | } |
| @@ -645,10 +591,8 @@ | ||
| 645 | 591 | return $query_results; |
| 646 | 592 | } |
| 647 | 593 | |
| 648 | 594 | /** |
| 649 | - * @param int|string $id Form ID. | |
| 650 | - * | |
| 651 | 595 | * @return bool|int |
| 652 | 596 | */ |
| 653 | 597 | public static function trash( $id ) { |
| 654 | 598 | if ( ! EMPTY_TRASH_DAYS ) { |
| @@ -655,9 +599,8 @@ | ||
| 655 | 599 | return self::destroy( $id ); |
| 656 | 600 | } |
| 657 | 601 | |
| 658 | 602 | $form = self::getOne( $id ); |
| 659 | - | |
| 660 | 603 | if ( ! $form ) { |
| 661 | 604 | return false; |
| 662 | 605 | } |
| 663 | 606 | |
| @@ -698,10 +641,8 @@ | ||
| 698 | 641 | return $query_results; |
| 699 | 642 | } |
| 700 | 643 | |
| 701 | 644 | /** |
| 702 | - * @param int|string $id Form ID. | |
| 703 | - * | |
| 704 | 645 | * @return bool|int |
| 705 | 646 | */ |
| 706 | 647 | public static function destroy( $id ) { |
| 707 | 648 | global $wpdb; |
| @@ -706,18 +647,15 @@ | ||
| 706 | 647 | public static function destroy( $id ) { |
| 707 | 648 | global $wpdb; |
| 708 | 649 | |
| 709 | 650 | $form = self::getOne( $id ); |
| 710 | - | |
| 711 | 651 | if ( ! $form ) { |
| 712 | 652 | return false; |
| 713 | 653 | } |
| 714 | - | |
| 715 | 654 | $id = $form->id; |
| 716 | 655 | |
| 717 | 656 | // Disconnect the entries from this form |
| 718 | 657 | $entries = FrmDb::get_col( $wpdb->prefix . 'frm_items', array( 'form_id' => $id ) ); |
| 719 | - | |
| 720 | 658 | foreach ( $entries as $entry_id ) { |
| 721 | 659 | FrmEntry::destroy( $entry_id ); |
| 722 | 660 | unset( $entry_id ); |
| 723 | 661 | } |
| @@ -722,12 +660,11 @@ | ||
| 722 | 660 | unset( $entry_id ); |
| 723 | 661 | } |
| 724 | 662 | |
| 725 | 663 | // 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 | |
| 664 | + $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 | 665 | |
| 728 | 666 | $query_results = $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . 'frm_forms WHERE id=%d OR parent_form_id=%d', $id, $id ) ); |
| 729 | - | |
| 730 | 667 | if ( $query_results ) { |
| 731 | 668 | // Delete all form actions linked to this form |
| 732 | 669 | /** |
| 733 | 670 | * @var FrmFormAction |
| @@ -747,10 +684,8 @@ | ||
| 747 | 684 | |
| 748 | 685 | /** |
| 749 | 686 | * Delete trashed forms based on how long they have been trashed |
| 750 | 687 | * |
| 751 | - * @param int|string $delete_timestamp Timestamp cutoff for deletion. | |
| 752 | - * | |
| 753 | 688 | * @return int The number of forms deleted |
| 754 | 689 | */ |
| 755 | 690 | public static function scheduled_delete( $delete_timestamp = '' ) { |
| 756 | 691 | global $wpdb; |
| @@ -760,20 +695,17 @@ | ||
| 760 | 695 | if ( ! $trash_forms ) { |
| 761 | 696 | return 0; |
| 762 | 697 | } |
| 763 | 698 | |
| 764 | - if ( ! $delete_timestamp ) { | |
| 699 | + if ( empty( $delete_timestamp ) ) { | |
| 765 | 700 | $delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS ); |
| 766 | 701 | } |
| 767 | 702 | |
| 768 | 703 | $count = 0; |
| 769 | - | |
| 770 | 704 | foreach ( $trash_forms as $form ) { |
| 771 | 705 | FrmAppHelper::unserialize_or_decode( $form->options ); |
| 772 | - | |
| 773 | 706 | if ( ! isset( $form->options['trash_time'] ) || $form->options['trash_time'] < $delete_timestamp ) { |
| 774 | 707 | self::destroy( $form->id ); |
| 775 | - | |
| 776 | 708 | if ( empty( $form->parent_form_id ) ) { |
| 777 | 709 | ++$count; |
| 778 | 710 | } |
| 779 | 711 | } |
| @@ -784,17 +716,16 @@ | ||
| 784 | 716 | return $count; |
| 785 | 717 | } |
| 786 | 718 | |
| 787 | 719 | /** |
| 788 | - * @param int|string $id Form ID or key. | |
| 789 | - * | |
| 790 | 720 | * @return string form name |
| 791 | 721 | */ |
| 792 | 722 | public static function getName( $id ) { |
| 793 | 723 | $form = FrmDb::check_cache( $id, 'frm_form' ); |
| 724 | + if ( $form ) { | |
| 725 | + $r = stripslashes( $form->name ); | |
| 794 | 726 | |
| 795 | - if ( $form ) { | |
| 796 | - return stripslashes( $form->name ); | |
| 727 | + return $r; | |
| 797 | 728 | } |
| 798 | 729 | |
| 799 | 730 | $query_key = is_numeric( $id ) ? 'id' : 'form_key'; |
| 800 | 731 | $r = FrmDb::get_var( 'frm_forms', array( $query_key => $id ), 'name' ); |
| @@ -799,9 +730,11 @@ | ||
| 799 | 730 | $query_key = is_numeric( $id ) ? 'id' : 'form_key'; |
| 800 | 731 | $r = FrmDb::get_var( 'frm_forms', array( $query_key => $id ), 'name' ); |
| 801 | 732 | |
| 802 | 733 | // An empty form name can result in a null value. |
| 803 | - return is_null( $r ) ? '' : stripslashes( $r ); | |
| 734 | + $r = is_null( $r ) ? '' : stripslashes( $r ); | |
| 735 | + | |
| 736 | + return $r; | |
| 804 | 737 | } |
| 805 | 738 | |
| 806 | 739 | /** |
| 807 | 740 | * @since 3.0 |
| @@ -816,9 +749,9 @@ | ||
| 816 | 749 | |
| 817 | 750 | /** |
| 818 | 751 | * @since 3.0 |
| 819 | 752 | * |
| 820 | - * @param int|string $id | |
| 753 | + * @param int $id | |
| 821 | 754 | * |
| 822 | 755 | * @return string form key |
| 823 | 756 | */ |
| 824 | 757 | public static function get_key_by_id( $id ) { |
| @@ -823,14 +756,15 @@ | ||
| 823 | 756 | */ |
| 824 | 757 | public static function get_key_by_id( $id ) { |
| 825 | 758 | $id = (int) $id; |
| 826 | 759 | $cache = FrmDb::check_cache( $id, 'frm_form' ); |
| 827 | - | |
| 828 | 760 | if ( $cache ) { |
| 829 | 761 | return $cache->form_key; |
| 830 | 762 | } |
| 831 | 763 | |
| 832 | - return FrmDb::get_var( 'frm_forms', array( 'id' => $id ), 'form_key' ); | |
| 764 | + $key = FrmDb::get_var( 'frm_forms', array( 'id' => $id ), 'form_key' ); | |
| 765 | + | |
| 766 | + return $key; | |
| 833 | 767 | } |
| 834 | 768 | |
| 835 | 769 | /** |
| 836 | 770 | * If $form is numeric, get the form object |
| @@ -835,12 +769,9 @@ | ||
| 835 | 769 | /** |
| 836 | 770 | * If $form is numeric, get the form object |
| 837 | 771 | * |
| 838 | 772 | * @since 2.0.9 |
| 839 | - * | |
| 840 | 773 | * @param int|object $form |
| 841 | - * | |
| 842 | - * @return void | |
| 843 | 774 | */ |
| 844 | 775 | public static function maybe_get_form( &$form ) { |
| 845 | 776 | if ( ! is_object( $form ) && ! is_array( $form ) && ! empty( $form ) ) { |
| 846 | 777 | $form = self::getOne( $form ); |
| @@ -849,9 +780,8 @@ | ||
| 849 | 780 | |
| 850 | 781 | /** |
| 851 | 782 | * @param int|string $id |
| 852 | 783 | * @param false|int $blog_id |
| 853 | - * | |
| 854 | 784 | * @return stdClass|null |
| 855 | 785 | */ |
| 856 | 786 | public static function getOne( $id, $blog_id = false ) { |
| 857 | 787 | global $wpdb; |
| @@ -856,24 +786,29 @@ | ||
| 856 | 786 | public static function getOne( $id, $blog_id = false ) { |
| 857 | 787 | global $wpdb; |
| 858 | 788 | |
| 859 | 789 | if ( $blog_id && is_multisite() ) { |
| 860 | - $prefix = $wpdb->get_blog_prefix( $blog_id ); | |
| 790 | + global $wpmuBaseTablePrefix; | |
| 791 | + $prefix = $wpmuBaseTablePrefix ? $wpmuBaseTablePrefix . $blog_id . '_' : $wpdb->get_blog_prefix( $blog_id ); | |
| 792 | + | |
| 861 | 793 | $table_name = $prefix . 'frm_forms'; |
| 862 | 794 | } else { |
| 863 | 795 | $table_name = $wpdb->prefix . 'frm_forms'; |
| 864 | 796 | $cache = wp_cache_get( $id, 'frm_form' ); |
| 865 | - | |
| 866 | 797 | if ( $cache ) { |
| 867 | 798 | if ( isset( $cache->options ) ) { |
| 868 | 799 | FrmAppHelper::unserialize_or_decode( $cache->options ); |
| 869 | 800 | } |
| 870 | - | |
| 871 | 801 | return self::prepare_form_row_data( $cache ); |
| 872 | 802 | } |
| 873 | 803 | } |
| 874 | 804 | |
| 875 | - $where = is_numeric( $id ) ? array( 'id' => $id ) : array( 'form_key' => $id ); | |
| 805 | + if ( is_numeric( $id ) ) { | |
| 806 | + $where = array( 'id' => $id ); | |
| 807 | + } else { | |
| 808 | + $where = array( 'form_key' => $id ); | |
| 809 | + } | |
| 810 | + | |
| 876 | 811 | $results = FrmDb::get_row( $table_name, $where ); |
| 877 | 812 | |
| 878 | 813 | if ( isset( $results->options ) ) { |
| 879 | 814 | FrmDb::set_cache( $results->id, $results, 'frm_form' ); |
| @@ -888,14 +823,12 @@ | ||
| 888 | 823 | * |
| 889 | 824 | * @since 6.8.3 |
| 890 | 825 | * |
| 891 | 826 | * @param stdClass|null $row The database row for a target form. |
| 892 | - * | |
| 893 | 827 | * @return stdClass|null |
| 894 | 828 | */ |
| 895 | 829 | private static function prepare_form_row_data( $row ) { |
| 896 | 830 | $row = wp_unslash( $row ); |
| 897 | - | |
| 898 | 831 | if ( ! is_object( $row ) ) { |
| 899 | 832 | return $row; |
| 900 | 833 | } |
| 901 | 834 | |
| @@ -911,16 +844,12 @@ | ||
| 911 | 844 | return apply_filters( 'frm_form_object', $row ); |
| 912 | 845 | } |
| 913 | 846 | |
| 914 | 847 | /** |
| 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 | 848 | * @return array|object of objects |
| 920 | 849 | */ |
| 921 | 850 | public static function getAll( $where = array(), $order_by = '', $limit = '' ) { |
| 922 | - if ( is_array( $where ) && $where ) { | |
| 851 | + if ( is_array( $where ) && ! empty( $where ) ) { | |
| 923 | 852 | if ( ! empty( $where['is_template'] ) && ! isset( $where['status'] ) && ! isset( $where['status !'] ) ) { |
| 924 | 853 | // don't get trashed templates |
| 925 | 854 | $where['status'] = array( null, '', 'published' ); |
| 926 | 855 | } |
| @@ -929,9 +858,9 @@ | ||
| 929 | 858 | } else { |
| 930 | 859 | global $wpdb; |
| 931 | 860 | |
| 932 | 861 | // 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 | |
| 862 | + $query = 'SELECT * FROM ' . $wpdb->prefix . 'frm_forms' . FrmDb::prepend_and_or_where( ' WHERE ', $where ) . FrmDb::esc_order( $order_by ) . FrmDb::esc_limit( $limit ); | |
| 934 | 863 | $results = $wpdb->get_results( $query ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared |
| 935 | 864 | } |
| 936 | 865 | |
| 937 | 866 | if ( $results ) { |
| @@ -940,9 +869,9 @@ | ||
| 940 | 869 | FrmAppHelper::unserialize_or_decode( $result->options ); |
| 941 | 870 | } |
| 942 | 871 | } |
| 943 | 872 | |
| 944 | - if ( $limit === ' LIMIT 1' || (int) $limit === 1 ) { | |
| 873 | + if ( $limit === ' LIMIT 1' || $limit == 1 ) { | |
| 945 | 874 | // return the first form object if we are only getting one form |
| 946 | 875 | $results = reset( $results ); |
| 947 | 876 | } |
| 948 | 877 | |
| @@ -956,20 +885,20 @@ | ||
| 956 | 885 | * |
| 957 | 886 | * @param array $query |
| 958 | 887 | * @param int $limit |
| 959 | 888 | * @param string $inc_children |
| 960 | - * | |
| 961 | 889 | * @return array|object of forms A single form object would be passed if $limit was set to 1. |
| 962 | 890 | */ |
| 963 | 891 | public static function get_published_forms( $query = array(), $limit = 999, $inc_children = 'exclude' ) { |
| 964 | 892 | $query['is_template'] = 0; |
| 965 | 893 | $query['status'] = array( null, '', 'published' ); |
| 966 | - | |
| 967 | 894 | if ( $inc_children === 'exclude' ) { |
| 968 | 895 | $query['parent_form_id'] = array( null, 0 ); |
| 969 | 896 | } |
| 970 | 897 | |
| 971 | - return self::getAll( $query, 'name', $limit ); | |
| 898 | + $forms = self::getAll( $query, 'name', $limit ); | |
| 899 | + | |
| 900 | + return $forms; | |
| 972 | 901 | } |
| 973 | 902 | |
| 974 | 903 | /** |
| 975 | 904 | * @return object count of forms |
| @@ -974,16 +903,18 @@ | ||
| 974 | 903 | /** |
| 975 | 904 | * @return object count of forms |
| 976 | 905 | */ |
| 977 | 906 | public static function get_count() { |
| 907 | + global $wpdb; | |
| 908 | + | |
| 978 | 909 | $cache_key = 'frm_form_counts'; |
| 979 | - $counts = wp_cache_get( $cache_key, 'frm_form' ); | |
| 980 | 910 | |
| 911 | + $counts = wp_cache_get( $cache_key, 'frm_form' ); | |
| 981 | 912 | if ( false !== $counts ) { |
| 982 | 913 | return $counts; |
| 983 | 914 | } |
| 984 | 915 | |
| 985 | - $results = FrmDb::get_results( | |
| 916 | + $results = (array) FrmDb::get_results( | |
| 986 | 917 | 'frm_forms', |
| 987 | 918 | array( |
| 988 | 919 | 'or' => 1, |
| 989 | 920 | 'parent_form_id' => null, |
| @@ -995,9 +926,9 @@ | ||
| 995 | 926 | $statuses = array( 'published', 'draft', 'template', 'trash' ); |
| 996 | 927 | $counts = array_fill_keys( $statuses, 0 ); |
| 997 | 928 | |
| 998 | 929 | foreach ( $results as $row ) { |
| 999 | - if ( 'trash' !== $row->status ) { | |
| 930 | + if ( 'trash' != $row->status ) { | |
| 1000 | 931 | if ( $row->is_template ) { |
| 1001 | 932 | ++$counts['template']; |
| 1002 | 933 | } else { |
| 1003 | 934 | ++$counts['published']; |
| @@ -1005,9 +936,9 @@ | ||
| 1005 | 936 | } else { |
| 1006 | 937 | ++$counts['trash']; |
| 1007 | 938 | } |
| 1008 | 939 | |
| 1009 | - if ( 'draft' === $row->status ) { | |
| 940 | + if ( 'draft' == $row->status ) { | |
| 1010 | 941 | ++$counts['draft']; |
| 1011 | 942 | } |
| 1012 | 943 | |
| 1013 | 944 | unset( $row ); |
| @@ -1024,10 +955,8 @@ | ||
| 1024 | 955 | * Called when a form is created, updated, duplicated, or deleted |
| 1025 | 956 | * or when the form status is changed |
| 1026 | 957 | * |
| 1027 | 958 | * @since 2.0.4 |
| 1028 | - * | |
| 1029 | - * @return void | |
| 1030 | 959 | */ |
| 1031 | 960 | public static function clear_form_cache() { |
| 1032 | 961 | FrmDb::cache_delete_group( 'frm_form' ); |
| 1033 | 962 | } |
| @@ -1032,22 +961,16 @@ | ||
| 1032 | 961 | FrmDb::cache_delete_group( 'frm_form' ); |
| 1033 | 962 | } |
| 1034 | 963 | |
| 1035 | 964 | /** |
| 1036 | - * @param array $values Form values to validate. | |
| 1037 | - * | |
| 1038 | 965 | * @return array of errors |
| 1039 | 966 | */ |
| 1040 | 967 | public static function validate( $values ) { |
| 1041 | 968 | $errors = array(); |
| 969 | + | |
| 1042 | 970 | return apply_filters( 'frm_validate_form', $errors, $values ); |
| 1043 | 971 | } |
| 1044 | 972 | |
| 1045 | - /** | |
| 1046 | - * @param object|null $form | |
| 1047 | - * | |
| 1048 | - * @return array | |
| 1049 | - */ | |
| 1050 | 973 | public static function get_params( $form = null ) { |
| 1051 | 974 | global $frm_vars; |
| 1052 | 975 | |
| 1053 | 976 | if ( ! $form ) { |
| @@ -1077,14 +1000,12 @@ | ||
| 1077 | 1000 | ); |
| 1078 | 1001 | |
| 1079 | 1002 | $values = array(); |
| 1080 | 1003 | $values['posted_form_id'] = FrmAppHelper::get_param( 'form_id', '', 'get', 'absint' ); |
| 1081 | - | |
| 1082 | 1004 | if ( ! $values['posted_form_id'] ) { |
| 1083 | 1005 | $values['posted_form_id'] = FrmAppHelper::get_param( 'form', '', 'get', 'absint' ); |
| 1084 | 1006 | } |
| 1085 | 1007 | |
| 1086 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 1087 | 1008 | if ( $form->id == $values['posted_form_id'] ) { |
| 1088 | 1009 | // If there are two forms on the same page, make sure not to submit both. |
| 1089 | 1010 | foreach ( $default_values as $var => $default ) { |
| 1090 | 1011 | if ( $var === 'action' ) { |
| @@ -1100,9 +1021,9 @@ | ||
| 1100 | 1021 | unset( $var, $default ); |
| 1101 | 1022 | } |
| 1102 | 1023 | } |
| 1103 | 1024 | |
| 1104 | - if ( in_array( $values['action'], array( 'create', 'update' ), true ) && | |
| 1025 | + if ( in_array( $values['action'], array( 'create', 'update' ) ) && | |
| 1105 | 1026 | ( ! $_POST || ( ! isset( $_POST['action'] ) && ! isset( $_POST['frm_action'] ) ) ) // phpcs:ignore WordPress.Security.NonceVerification.Missing |
| 1106 | 1027 | ) { |
| 1107 | 1028 | $values['action'] = 'new'; |
| 1108 | 1029 | } |
| @@ -1109,11 +1030,8 @@ | ||
| 1109 | 1030 | |
| 1110 | 1031 | return $values; |
| 1111 | 1032 | } |
| 1112 | 1033 | |
| 1113 | - /** | |
| 1114 | - * @return array | |
| 1115 | - */ | |
| 1116 | 1034 | public static function list_page_params() { |
| 1117 | 1035 | $values = array(); |
| 1118 | 1036 | $defaults = array( |
| 1119 | 1037 | 'template' => 0, |
| @@ -1123,9 +1041,8 @@ | ||
| 1123 | 1041 | 'search' => '', |
| 1124 | 1042 | 'sort' => '', |
| 1125 | 1043 | 'sdir' => '', |
| 1126 | 1044 | ); |
| 1127 | - | |
| 1128 | 1045 | foreach ( $defaults as $var => $default ) { |
| 1129 | 1046 | $values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' ); |
| 1130 | 1047 | } |
| 1131 | 1048 | |
| @@ -1131,16 +1048,10 @@ | ||
| 1131 | 1048 | |
| 1132 | 1049 | return $values; |
| 1133 | 1050 | } |
| 1134 | 1051 | |
| 1135 | - /** | |
| 1136 | - * @param int|object|string|null $form | |
| 1137 | - * | |
| 1138 | - * @return array | |
| 1139 | - */ | |
| 1140 | 1052 | public static function get_admin_params( $form = null ) { |
| 1141 | 1053 | $form_id = $form; |
| 1142 | - | |
| 1143 | 1054 | if ( $form === null ) { |
| 1144 | 1055 | $form_id = self::get_current_form_id(); |
| 1145 | 1056 | } elseif ( $form && is_object( $form ) ) { |
| 1146 | 1057 | $form_id = $form->id; |
| @@ -1158,9 +1069,8 @@ | ||
| 1158 | 1069 | 'sdir' => '', |
| 1159 | 1070 | 'fid' => '', |
| 1160 | 1071 | 'keep_post' => '', |
| 1161 | 1072 | ); |
| 1162 | - | |
| 1163 | 1073 | foreach ( $defaults as $var => $default ) { |
| 1164 | 1074 | $values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' ); |
| 1165 | 1075 | } |
| 1166 | 1076 | |
| @@ -1166,32 +1076,27 @@ | ||
| 1166 | 1076 | |
| 1167 | 1077 | return $values; |
| 1168 | 1078 | } |
| 1169 | 1079 | |
| 1170 | - /** | |
| 1171 | - * @param string $default_form | |
| 1172 | - * | |
| 1173 | - * @return int|string | |
| 1174 | - */ | |
| 1175 | 1080 | 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; | |
| 1081 | + if ( 'first' === $default_form ) { | |
| 1082 | + $form = self::get_current_form(); | |
| 1083 | + } else { | |
| 1084 | + $form = self::maybe_get_current_form(); | |
| 1085 | + } | |
| 1086 | + $form_id = $form ? $form->id : 0; | |
| 1087 | + | |
| 1088 | + return $form_id; | |
| 1178 | 1089 | } |
| 1179 | 1090 | |
| 1180 | - /** | |
| 1181 | - * @param int|string $form_id | |
| 1182 | - * | |
| 1183 | - * @return false|int|object|string | |
| 1184 | - */ | |
| 1185 | 1091 | public static function maybe_get_current_form( $form_id = 0 ) { |
| 1186 | 1092 | global $frm_vars; |
| 1187 | 1093 | |
| 1188 | - if ( ! empty( $frm_vars['current_form'] ) && ( ! $form_id || (int) $form_id === (int) $frm_vars['current_form']->id ) ) { | |
| 1094 | + if ( ! empty( $frm_vars['current_form'] ) && ( ! $form_id || $form_id == $frm_vars['current_form']->id ) ) { | |
| 1189 | 1095 | return $frm_vars['current_form']; |
| 1190 | 1096 | } |
| 1191 | 1097 | |
| 1192 | 1098 | $form_id = FrmAppHelper::get_param( 'form', $form_id, 'get', 'absint' ); |
| 1193 | - | |
| 1194 | 1099 | if ( $form_id ) { |
| 1195 | 1100 | $form_id = self::set_current_form( $form_id ); |
| 1196 | 1101 | } |
| 1197 | 1102 | |
| @@ -1197,16 +1102,10 @@ | ||
| 1197 | 1102 | |
| 1198 | 1103 | return $form_id; |
| 1199 | 1104 | } |
| 1200 | 1105 | |
| 1201 | - /** | |
| 1202 | - * @param int $form_id | |
| 1203 | - * | |
| 1204 | - * @return false|object | |
| 1205 | - */ | |
| 1206 | 1106 | public static function get_current_form( $form_id = 0 ) { |
| 1207 | 1107 | $form = self::maybe_get_current_form( $form_id ); |
| 1208 | - | |
| 1209 | 1108 | if ( is_numeric( $form ) ) { |
| 1210 | 1109 | $form = self::set_current_form( $form ); |
| 1211 | 1110 | } |
| 1212 | 1111 | |
| @@ -1212,18 +1111,12 @@ | ||
| 1212 | 1111 | |
| 1213 | 1112 | return $form; |
| 1214 | 1113 | } |
| 1215 | 1114 | |
| 1216 | - /** | |
| 1217 | - * @param int $form_id | |
| 1218 | - * | |
| 1219 | - * @return false|object | |
| 1220 | - */ | |
| 1221 | 1115 | public static function set_current_form( $form_id ) { |
| 1222 | 1116 | global $frm_vars; |
| 1223 | 1117 | |
| 1224 | 1118 | $query = array(); |
| 1225 | - | |
| 1226 | 1119 | if ( $form_id ) { |
| 1227 | 1120 | $query['id'] = $form_id; |
| 1228 | 1121 | } |
| 1229 | 1122 | |
| @@ -1231,19 +1124,11 @@ | ||
| 1231 | 1124 | |
| 1232 | 1125 | return $frm_vars['current_form']; |
| 1233 | 1126 | } |
| 1234 | 1127 | |
| 1235 | - /** | |
| 1236 | - * @param object $form | |
| 1237 | - * @param int|string $this_load | |
| 1238 | - * @param bool $global_load | |
| 1239 | - * | |
| 1240 | - * @return bool | |
| 1241 | - */ | |
| 1242 | 1128 | public static function is_form_loaded( $form, $this_load, $global_load ) { |
| 1243 | 1129 | global $frm_vars; |
| 1244 | 1130 | $small_form = new stdClass(); |
| 1245 | - | |
| 1246 | 1131 | foreach ( array( 'id', 'form_key', 'name' ) as $var ) { |
| 1247 | 1132 | $small_form->{$var} = $form->{$var}; |
| 1248 | 1133 | unset( $var ); |
| 1249 | 1134 | } |
| @@ -1271,41 +1156,26 @@ | ||
| 1271 | 1156 | } else { |
| 1272 | 1157 | $visible = true; |
| 1273 | 1158 | } |
| 1274 | 1159 | |
| 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 | 1160 | return $visible; |
| 1284 | 1161 | } |
| 1285 | 1162 | |
| 1286 | - /** | |
| 1287 | - * @param object $form | |
| 1288 | - * | |
| 1289 | - * @return bool | |
| 1290 | - */ | |
| 1291 | 1163 | 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 ); | |
| 1164 | + $show = ( ! $form->is_template && $form->status === 'published' && ! FrmAppHelper::is_admin() ); | |
| 1165 | + $show = apply_filters( 'frm_show_submit_button', $show, $form ); | |
| 1166 | + | |
| 1167 | + return $show; | |
| 1294 | 1168 | } |
| 1295 | 1169 | |
| 1296 | 1170 | /** |
| 1297 | 1171 | * @since 2.3 |
| 1298 | - * | |
| 1299 | - * @param array $atts Attributes including form, option, and default. | |
| 1300 | - * | |
| 1301 | - * @return mixed | |
| 1302 | 1172 | */ |
| 1303 | 1173 | public static function get_option( $atts ) { |
| 1304 | 1174 | $form = $atts['form']; |
| 1305 | - $default = $atts['default'] ?? ''; | |
| 1175 | + $default = isset( $atts['default'] ) ? $atts['default'] : ''; | |
| 1306 | 1176 | |
| 1307 | - return $form->options[ $atts['option'] ] ?? $default; | |
| 1177 | + return isset( $form->options[ $atts['option'] ] ) ? $form->options[ $atts['option'] ] : $default; | |
| 1308 | 1178 | } |
| 1309 | 1179 | |
| 1310 | 1180 | /** |
| 1311 | 1181 | * Get the link to edit this form. |
| @@ -1310,12 +1180,9 @@ | ||
| 1310 | 1180 | /** |
| 1311 | 1181 | * Get the link to edit this form. |
| 1312 | 1182 | * |
| 1313 | 1183 | * @since 4.0 |
| 1314 | - * | |
| 1315 | 1184 | * @param int $form_id The id of the form. |
| 1316 | - * | |
| 1317 | - * @return string | |
| 1318 | 1185 | */ |
| 1319 | 1186 | public static function get_edit_link( $form_id ) { |
| 1320 | 1187 | return admin_url( 'admin.php?page=formidable&frm_action=edit&id=' . $form_id ); |
| 1321 | 1188 | } |
| @@ -1325,9 +1192,8 @@ | ||
| 1325 | 1192 | * |
| 1326 | 1193 | * @since 6.2 |
| 1327 | 1194 | * |
| 1328 | 1195 | * @param stdClass $form |
| 1329 | - * | |
| 1330 | 1196 | * @return bool |
| 1331 | 1197 | */ |
| 1332 | 1198 | public static function is_ajax_on( $form ) { |
| 1333 | 1199 | return ! empty( $form->options['ajax_submit'] ); |
| @@ -1336,12 +1202,12 @@ | ||
| 1336 | 1202 | /** |
| 1337 | 1203 | * Get the latest form available. |
| 1338 | 1204 | * |
| 1339 | 1205 | * @since 6.8 |
| 1340 | - * | |
| 1341 | 1206 | * @return object |
| 1342 | 1207 | */ |
| 1343 | 1208 | public static function get_latest_form() { |
| 1209 | + | |
| 1344 | 1210 | $args = array( |
| 1345 | 1211 | array( |
| 1346 | 1212 | 'or' => 1, |
| 1347 | 1213 | 'parent_form_id' => null, |
| @@ -1357,12 +1223,12 @@ | ||
| 1357 | 1223 | /** |
| 1358 | 1224 | * Count and return total forms. |
| 1359 | 1225 | * |
| 1360 | 1226 | * @since 6.8 |
| 1361 | - * | |
| 1362 | 1227 | * @return int |
| 1363 | 1228 | */ |
| 1364 | 1229 | public static function get_forms_count() { |
| 1230 | + | |
| 1365 | 1231 | $args = array( |
| 1366 | 1232 | array( |
| 1367 | 1233 | 'or' => 1, |
| 1368 | 1234 | 'parent_form_id' => null, |
| @@ -1376,13 +1242,11 @@ | ||
| 1376 | 1242 | } |
| 1377 | 1243 | |
| 1378 | 1244 | /** |
| 1379 | 1245 | * @deprecated 2.03.05 This is still referenced in a few add ons (API, locations). |
| 1380 | - * | |
| 1381 | 1246 | * @codeCoverageIgnore |
| 1382 | 1247 | * |
| 1383 | 1248 | * @param string $key |
| 1384 | - * | |
| 1385 | 1249 | * @return int form id |
| 1386 | 1250 | */ |
| 1387 | 1251 | public static function getIdByKey( $key ) { |
| 1388 | 1252 | _deprecated_function( __FUNCTION__, '2.03.05', 'FrmForm::get_id_by_key' ); |
| @@ -1390,13 +1254,11 @@ | ||
| 1390 | 1254 | } |
| 1391 | 1255 | |
| 1392 | 1256 | /** |
| 1393 | 1257 | * @deprecated 2.03.05 This is still referenced in the API add on as of v1.13. |
| 1394 | - * | |
| 1395 | 1258 | * @codeCoverageIgnore |
| 1396 | 1259 | * |
| 1397 | 1260 | * @param int|string $id |
| 1398 | - * | |
| 1399 | 1261 | * @return string |
| 1400 | 1262 | */ |
| 1401 | 1263 | public static function getKeyById( $id ) { |
| 1402 | 1264 | _deprecated_function( __FUNCTION__, '2.03.05', 'FrmForm::get_key_by_id' ); |
