| @@ -88,13 +88,12 @@ | ||
| 88 | 88 | * Echo the settings update form |
| 89 | 89 | * |
| 90 | 90 | * @param WP_Post $instance Current settings. |
| 91 | 91 | * @param array $args |
| 92 | - * | |
| 93 | - * @return string | |
| 94 | 92 | */ |
| 95 | 93 | public function form( $instance, $args = array() ) { |
| 96 | 94 | echo '<p class="no-options-widget">' . esc_html__( 'There are no options for this action.', 'formidable' ) . '</p>'; |
| 95 | + | |
| 97 | 96 | return 'noform'; |
| 98 | 97 | } |
| 99 | 98 | |
| 100 | 99 | /** |
| @@ -110,14 +109,8 @@ | ||
| 110 | 109 | public function get_switch_fields() { |
| 111 | 110 | return array(); |
| 112 | 111 | } |
| 113 | 112 | |
| 114 | - /** | |
| 115 | - * @param object $action | |
| 116 | - * @param object $form | |
| 117 | - * | |
| 118 | - * @return object | |
| 119 | - */ | |
| 120 | 113 | public function migrate_values( $action, $form ) { |
| 121 | 114 | return $action; |
| 122 | 115 | } |
| 123 | 116 | |
| @@ -170,11 +163,10 @@ | ||
| 170 | 163 | $action_options['color'] = 'var(--' . reset( $colors ) . ')'; |
| 171 | 164 | } |
| 172 | 165 | |
| 173 | 166 | $upgrade_class = isset( $action_options['classes'] ) && $action_options['classes'] === 'frm_show_upgrade'; |
| 174 | - | |
| 175 | 167 | if ( $action_options['group'] === $id_base ) { |
| 176 | - $upgrade_class = str_contains( $action_options['classes'], 'frm_show_upgrade' ); | |
| 168 | + $upgrade_class = strpos( $action_options['classes'], 'frm_show_upgrade' ) !== false; | |
| 177 | 169 | $action_options['classes'] = $group['icon']; |
| 178 | 170 | } elseif ( empty( $action_options['classes'] ) || $upgrade_class ) { |
| 179 | 171 | $action_options['classes'] = $group['icon']; |
| 180 | 172 | } |
| @@ -188,13 +180,8 @@ | ||
| 188 | 180 | } |
| 189 | 181 | |
| 190 | 182 | /** |
| 191 | 183 | * @param string $id_base |
| 192 | - * @param string $name | |
| 193 | - * @param array $action_options | |
| 194 | - * @param array $control_options | |
| 195 | - * | |
| 196 | - * @return void | |
| 197 | 184 | */ |
| 198 | 185 | public function FrmFormAction( $id_base, $name, $action_options = array(), $control_options = array() ) { |
| 199 | 186 | self::__construct( $id_base, $name, $action_options, $control_options ); |
| 200 | 187 | } |
| @@ -207,22 +194,16 @@ | ||
| 207 | 194 | * @return string |
| 208 | 195 | */ |
| 209 | 196 | public function maybe_switch_field_ids( $action ) { |
| 210 | 197 | $updated_action = apply_filters( 'frm_maybe_switch_field_ids', $action ); |
| 211 | - | |
| 212 | 198 | if ( $updated_action === $action ) { |
| 213 | - return FrmFieldsHelper::switch_field_ids( $action ); | |
| 199 | + $updated_action = FrmFieldsHelper::switch_field_ids( $action ); | |
| 214 | 200 | } |
| 215 | - | |
| 216 | 201 | return $updated_action; |
| 217 | 202 | } |
| 218 | 203 | |
| 219 | 204 | /** |
| 220 | 205 | * @since 4.0 |
| 221 | - * | |
| 222 | - * @param array $action_options | |
| 223 | - * | |
| 224 | - * @return array | |
| 225 | 206 | */ |
| 226 | 207 | protected function get_group( $action_options ) { |
| 227 | 208 | $groups = FrmFormActionsController::form_action_groups(); |
| 228 | 209 | $group = 'misc'; |
| @@ -232,9 +213,9 @@ | ||
| 232 | 213 | } elseif ( isset( $groups[ $this->id_base ] ) ) { |
| 233 | 214 | $group = $this->id_base; |
| 234 | 215 | } else { |
| 235 | 216 | foreach ( $groups as $name => $check_group ) { |
| 236 | - if ( isset( $check_group['actions'] ) && in_array( $this->id_base, $check_group['actions'], true ) ) { | |
| 217 | + if ( isset( $check_group['actions'] ) && in_array( $this->id_base, $check_group['actions'] ) ) { | |
| 237 | 218 | $group = $name; |
| 238 | 219 | break; |
| 239 | 220 | } |
| 240 | 221 | } |
| @@ -249,17 +230,17 @@ | ||
| 249 | 230 | * |
| 250 | 231 | * This function should be used in form() methods to create name attributes for fields to be saved by update() |
| 251 | 232 | * |
| 252 | 233 | * @param string $field_name Field name. |
| 253 | - * @param string $post_field | |
| 254 | 234 | * |
| 255 | 235 | * @return string Name attribute for $field_name |
| 256 | 236 | */ |
| 257 | 237 | public function get_field_name( $field_name, $post_field = 'post_content' ) { |
| 258 | 238 | $name = $this->option_name . '[' . $this->number . ']'; |
| 259 | - $name .= $post_field ? '[' . $post_field . ']' : ''; | |
| 239 | + $name .= ( empty( $post_field ) ? '' : '[' . $post_field . ']' ); | |
| 240 | + $name .= '[' . $field_name . ']'; | |
| 260 | 241 | |
| 261 | - return $name . ( '[' . $field_name . ']' ); | |
| 242 | + return $name; | |
| 262 | 243 | } |
| 263 | 244 | |
| 264 | 245 | /** |
| 265 | 246 | * Constructs id attributes for use in form() fields |
| @@ -275,9 +256,8 @@ | ||
| 275 | 256 | } |
| 276 | 257 | |
| 277 | 258 | /** |
| 278 | 259 | * @param int|string $number |
| 279 | - * | |
| 280 | 260 | * @return void |
| 281 | 261 | */ |
| 282 | 262 | public function _set( $number ) { |
| 283 | 263 | $this->number = $number; |
| @@ -284,10 +264,8 @@ | ||
| 284 | 264 | $this->id = $this->id_base . '-' . $number; |
| 285 | 265 | } |
| 286 | 266 | |
| 287 | 267 | /** |
| 288 | - * @param false|int|string $form_id | |
| 289 | - * | |
| 290 | 268 | * @return object |
| 291 | 269 | */ |
| 292 | 270 | public function prepare_new( $form_id = false ) { |
| 293 | 271 | if ( $form_id ) { |
| @@ -296,9 +274,9 @@ | ||
| 296 | 274 | |
| 297 | 275 | $post_content = array(); |
| 298 | 276 | $default_values = $this->get_global_defaults(); |
| 299 | 277 | |
| 300 | - // Fill default values | |
| 278 | + // fill default values | |
| 301 | 279 | $post_content = wp_parse_args( $post_content, $default_values ); |
| 302 | 280 | |
| 303 | 281 | if ( ! isset( $post_content['event'] ) && ! $this->action_options['force_event'] ) { |
| 304 | 282 | $post_content['event'] = array( reset( $this->action_options['event'] ) ); |
| @@ -313,17 +291,13 @@ | ||
| 313 | 291 | 'post_type' => FrmFormActionsController::$action_post_type, |
| 314 | 292 | 'post_name' => $this->form_id . '_' . $this->id_base . '_' . $this->number, |
| 315 | 293 | 'menu_order' => $this->form_id, |
| 316 | 294 | ); |
| 295 | + unset( $post_content ); | |
| 317 | 296 | |
| 318 | 297 | return (object) $form_action; |
| 319 | 298 | } |
| 320 | 299 | |
| 321 | - /** | |
| 322 | - * @param int|string $form_id | |
| 323 | - * | |
| 324 | - * @return int|WP_Error | |
| 325 | - */ | |
| 326 | 300 | public function create( $form_id ) { |
| 327 | 301 | $this->form_id = $form_id; |
| 328 | 302 | |
| 329 | 303 | $action = $this->prepare_new(); |
| @@ -331,17 +305,13 @@ | ||
| 331 | 305 | return $this->save_settings( $action ); |
| 332 | 306 | } |
| 333 | 307 | |
| 334 | 308 | /** |
| 335 | - * @param int|string $form_id | |
| 336 | - * @param int|string $old_id | |
| 337 | - * | |
| 338 | 309 | * @return void |
| 339 | 310 | */ |
| 340 | 311 | public function duplicate_form_actions( $form_id, $old_id ) { |
| 341 | - // phpcs:ignore Universal.Operators.StrictComparisons | |
| 342 | 312 | if ( $form_id == $old_id ) { |
| 343 | - // Don't duplicate the actions if this is a template getting updated | |
| 313 | + // don't duplicate the actions if this is a template getting updated | |
| 344 | 314 | return; |
| 345 | 315 | } |
| 346 | 316 | |
| 347 | 317 | $this->form_id = $old_id; |
| @@ -347,9 +317,8 @@ | ||
| 347 | 317 | $this->form_id = $old_id; |
| 348 | 318 | $actions = $this->get_all( $old_id ); |
| 349 | 319 | |
| 350 | 320 | $this->form_id = $form_id; |
| 351 | - | |
| 352 | 321 | foreach ( $actions as $action ) { |
| 353 | 322 | $this->duplicate_one( $action, $form_id ); |
| 354 | 323 | unset( $action ); |
| 355 | 324 | } |
| @@ -360,28 +329,26 @@ | ||
| 360 | 329 | * |
| 361 | 330 | * @since 2.0 |
| 362 | 331 | * |
| 363 | 332 | * @param array $action |
| 364 | - * @param array $forms | |
| 365 | - * | |
| 366 | - * @return int Post ID. | |
| 333 | + * @return int $post_id | |
| 367 | 334 | */ |
| 368 | 335 | public function maybe_create_action( $action, $forms ) { |
| 369 | 336 | if ( isset( $action['ID'] ) && is_numeric( $action['ID'] ) && isset( $forms[ $action['menu_order'] ] ) && $forms[ $action['menu_order'] ] === 'updated' ) { |
| 370 | 337 | // Update action only |
| 371 | 338 | $action['post_content'] = FrmAppHelper::maybe_json_decode( $action['post_content'] ); |
| 372 | - return $this->save_settings( $action ); | |
| 339 | + $post_id = $this->save_settings( $action ); | |
| 340 | + } else { | |
| 341 | + // Create action | |
| 342 | + $action['post_content'] = FrmAppHelper::maybe_json_decode( $action['post_content'] ); | |
| 343 | + $post_id = $this->duplicate_one( (object) $action, $action['menu_order'] ); | |
| 373 | 344 | } |
| 374 | - // Create action | |
| 375 | - $action['post_content'] = FrmAppHelper::maybe_json_decode( $action['post_content'] ); | |
| 376 | - return $this->duplicate_one( (object) $action, $action['menu_order'] ); | |
| 345 | + | |
| 346 | + return $post_id; | |
| 377 | 347 | } |
| 378 | 348 | |
| 379 | 349 | /** |
| 380 | - * @param object $action | |
| 381 | - * @param int|string $form_id | |
| 382 | - * | |
| 383 | - * @return int|WP_Error | |
| 350 | + * @param object $action | |
| 384 | 351 | */ |
| 385 | 352 | public function duplicate_one( $action, $form_id ) { |
| 386 | 353 | global $frm_duplicate_ids; |
| 387 | 354 | |
| @@ -393,9 +360,9 @@ | ||
| 393 | 360 | $action->post_content[ $key ] = $frm_duplicate_ids[ $val ]; |
| 394 | 361 | } elseif ( ! is_array( $val ) ) { |
| 395 | 362 | $action->post_content[ $key ] = FrmFieldsHelper::switch_field_ids( $val ); |
| 396 | 363 | } elseif ( isset( $switch[ $key ] ) && is_array( $switch[ $key ] ) ) { |
| 397 | - // Loop through each value if empty | |
| 364 | + // loop through each value if empty | |
| 398 | 365 | if ( empty( $switch[ $key ] ) ) { |
| 399 | 366 | $switch[ $key ] = array_keys( $val ); |
| 400 | 367 | } |
| 401 | 368 | |
| @@ -410,15 +377,8 @@ | ||
| 410 | 377 | |
| 411 | 378 | return $this->save_settings( $action ); |
| 412 | 379 | } |
| 413 | 380 | |
| 414 | - /** | |
| 415 | - * @param array $action | |
| 416 | - * @param array|string $subkey | |
| 417 | - * @param mixed $val | |
| 418 | - * | |
| 419 | - * @return array | |
| 420 | - */ | |
| 421 | 381 | private function duplicate_array_walk( $action, $subkey, $val ) { |
| 422 | 382 | global $frm_duplicate_ids; |
| 423 | 383 | |
| 424 | 384 | if ( is_array( $subkey ) ) { |
| @@ -434,11 +394,11 @@ | ||
| 434 | 394 | } else { |
| 435 | 395 | foreach ( (array) $val as $ck => $cv ) { |
| 436 | 396 | if ( is_array( $cv ) ) { |
| 437 | 397 | $action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey, $cv ); |
| 438 | - } elseif ( $ck == $subkey && isset( $frm_duplicate_ids[ $cv ] ) ) { // phpcs:ignore Universal.Operators.StrictComparisons | |
| 398 | + } elseif ( $ck == $subkey && isset( $frm_duplicate_ids[ $cv ] ) ) { | |
| 439 | 399 | $action[ $ck ] = $frm_duplicate_ids[ $cv ]; |
| 440 | - } elseif ( $ck == $subkey ) { // phpcs:ignore Universal.Operators.StrictComparisons | |
| 400 | + } elseif ( $ck == $subkey ) { | |
| 441 | 401 | $action[ $ck ] = $this->maybe_switch_field_ids( $action[ $ck ] ); |
| 442 | 402 | } |
| 443 | 403 | } |
| 444 | 404 | }//end if |
| @@ -449,12 +409,8 @@ | ||
| 449 | 409 | /** |
| 450 | 410 | * Deal with changed settings. |
| 451 | 411 | * |
| 452 | 412 | * Do NOT over-ride this function |
| 453 | - * | |
| 454 | - * @param int|string $form_id | |
| 455 | - * | |
| 456 | - * @return array|null | |
| 457 | 413 | */ |
| 458 | 414 | public function update_callback( $form_id ) { |
| 459 | 415 | $this->form_id = $form_id; |
| 460 | 416 | |
| @@ -461,32 +417,32 @@ | ||
| 461 | 417 | $all_instances = $this->get_settings(); |
| 462 | 418 | |
| 463 | 419 | // We need to update the data |
| 464 | 420 | if ( $this->updated ) { |
| 465 | - return null; | |
| 421 | + return; | |
| 466 | 422 | } |
| 467 | 423 | |
| 468 | 424 | // phpcs:ignore WordPress.Security.NonceVerification.Missing |
| 469 | - if ( ! isset( $_POST[ $this->option_name ] ) || ! is_array( $_POST[ $this->option_name ] ) ) { | |
| 470 | - return null; | |
| 425 | + if ( isset( $_POST[ $this->option_name ] ) && is_array( $_POST[ $this->option_name ] ) ) { | |
| 426 | + // Sanitizing removes scripts and <email> type of values. | |
| 427 | + // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing | |
| 428 | + $settings = wp_unslash( $_POST[ $this->option_name ] ); | |
| 429 | + } else { | |
| 430 | + return; | |
| 471 | 431 | } |
| 472 | 432 | |
| 473 | - // Sanitizing removes scripts and <email> type of values. | |
| 474 | - // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing | |
| 475 | - $settings = wp_unslash( $_POST[ $this->option_name ] ); | |
| 476 | - | |
| 477 | 433 | $action_ids = array(); |
| 478 | 434 | |
| 479 | 435 | foreach ( $settings as $number => $new_instance ) { |
| 480 | 436 | $this->_set( $number ); |
| 481 | 437 | |
| 482 | - $old_instance = $all_instances[ $number ] ?? array(); | |
| 438 | + $old_instance = isset( $all_instances[ $number ] ) ? $all_instances[ $number ] : array(); | |
| 483 | 439 | |
| 484 | 440 | if ( ! isset( $new_instance['post_status'] ) ) { |
| 485 | 441 | $new_instance['post_status'] = 'draft'; |
| 486 | 442 | } |
| 487 | 443 | |
| 488 | - // Settings were never opened, so don't update | |
| 444 | + // settings were never opened, so don't update | |
| 489 | 445 | if ( ! isset( $new_instance['post_title'] ) ) { |
| 490 | 446 | $this->maybe_update_status( $new_instance, $old_instance ); |
| 491 | 447 | $action_ids[] = $new_instance['ID']; |
| 492 | 448 | $this->updated = true; |
| @@ -495,9 +451,9 @@ | ||
| 495 | 451 | |
| 496 | 452 | $new_instance['post_type'] = FrmFormActionsController::$action_post_type; |
| 497 | 453 | $new_instance['post_name'] = $this->form_id . '_' . $this->id_base . '_' . $this->number; |
| 498 | 454 | $new_instance['menu_order'] = $this->form_id; |
| 499 | - $new_instance['post_date'] = $old_instance->post_date ?? ''; | |
| 455 | + $new_instance['post_date'] = isset( $old_instance->post_date ) ? $old_instance->post_date : ''; | |
| 500 | 456 | $instance = $this->update( $new_instance, $old_instance ); |
| 501 | 457 | |
| 502 | 458 | /** |
| 503 | 459 | * Filter an action's settings before saving. |
| @@ -535,9 +491,8 @@ | ||
| 535 | 491 | * @since 3.04 |
| 536 | 492 | * |
| 537 | 493 | * @param array $new_instance |
| 538 | 494 | * @param array|stdClass $old_instance |
| 539 | - * | |
| 540 | 495 | * @return void |
| 541 | 496 | */ |
| 542 | 497 | protected function maybe_update_status( $new_instance, $old_instance ) { |
| 543 | 498 | if ( ! is_object( $old_instance ) || $new_instance['post_status'] === $old_instance->post_status ) { |
| @@ -554,24 +509,18 @@ | ||
| 554 | 509 | } |
| 555 | 510 | |
| 556 | 511 | /** |
| 557 | 512 | * @param array $settings |
| 558 | - * | |
| 559 | 513 | * @return int|WP_Error |
| 560 | 514 | */ |
| 561 | 515 | public function save_settings( $settings ) { |
| 562 | 516 | self::clear_cache(); |
| 517 | + | |
| 563 | 518 | return FrmDb::save_settings( $settings, 'frm_actions' ); |
| 564 | 519 | } |
| 565 | 520 | |
| 566 | - /** | |
| 567 | - * @param int $id | |
| 568 | - * | |
| 569 | - * @return object|null | |
| 570 | - */ | |
| 571 | 521 | public function get_single_action( $id ) { |
| 572 | 522 | $action = get_post( $id ); |
| 573 | - | |
| 574 | 523 | if ( $action ) { |
| 575 | 524 | $action = $this->prepare_action( $action ); |
| 576 | 525 | $this->_set( $id ); |
| 577 | 526 | } |
| @@ -578,29 +527,16 @@ | ||
| 578 | 527 | |
| 579 | 528 | return $action; |
| 580 | 529 | } |
| 581 | 530 | |
| 582 | - /** | |
| 583 | - * @param int|string $form_id | |
| 584 | - * | |
| 585 | - * @return array | |
| 586 | - */ | |
| 587 | 531 | public function get_one( $form_id ) { |
| 588 | 532 | return $this->get_all( $form_id, 1 ); |
| 589 | 533 | } |
| 590 | 534 | |
| 591 | - /** | |
| 592 | - * @param int|string $form_id | |
| 593 | - * @param string $type | |
| 594 | - * @param array $atts | |
| 595 | - * | |
| 596 | - * @return array | |
| 597 | - */ | |
| 598 | 535 | public static function get_action_for_form( $form_id, $type = 'all', $atts = array() ) { |
| 599 | 536 | $action_controls = FrmFormActionsController::get_form_actions( $type ); |
| 600 | - | |
| 601 | - if ( ! $action_controls ) { | |
| 602 | - // Don't continue if there are no available actions | |
| 537 | + if ( empty( $action_controls ) ) { | |
| 538 | + // don't continue if there are no available actions | |
| 603 | 539 | return array(); |
| 604 | 540 | } |
| 605 | 541 | |
| 606 | 542 | if ( 'all' !== $type ) { |
| @@ -606,15 +542,15 @@ | ||
| 606 | 542 | if ( 'all' !== $type ) { |
| 607 | 543 | if ( is_array( $action_controls ) ) { |
| 608 | 544 | return array(); |
| 609 | 545 | } |
| 610 | - | |
| 611 | 546 | return $action_controls->get_all( $form_id, $atts ); |
| 612 | 547 | } |
| 613 | 548 | |
| 614 | 549 | self::prepare_get_action( $atts ); |
| 615 | 550 | |
| 616 | - $limit = self::get_action_limit( $form_id, $atts['limit'] ); | |
| 551 | + $limit = self::get_action_limit( $form_id, $atts['limit'] ); | |
| 552 | + | |
| 617 | 553 | $args = self::action_args( $form_id, $limit ); |
| 618 | 554 | $args['post_status'] = $atts['post_status']; |
| 619 | 555 | $actions = FrmDb::check_cache( json_encode( $args ), 'frm_actions', $args, 'get_posts' ); |
| 620 | 556 | |
| @@ -622,11 +558,10 @@ | ||
| 622 | 558 | return array(); |
| 623 | 559 | } |
| 624 | 560 | |
| 625 | 561 | $settings = array(); |
| 626 | - | |
| 627 | 562 | foreach ( $actions as $action ) { |
| 628 | - // Some plugins/themes are formatting the post_excerpt | |
| 563 | + // some plugins/themes are formatting the post_excerpt | |
| 629 | 564 | $action->post_excerpt = sanitize_title( $action->post_excerpt ); |
| 630 | 565 | |
| 631 | 566 | if ( ! isset( $action_controls[ $action->post_excerpt ] ) ) { |
| 632 | 567 | continue; |
| @@ -639,9 +574,13 @@ | ||
| 639 | 574 | break; |
| 640 | 575 | } |
| 641 | 576 | } |
| 642 | 577 | |
| 643 | - return 1 === $limit ? reset( $settings ) : $settings; | |
| 578 | + if ( 1 === $limit ) { | |
| 579 | + $settings = reset( $settings ); | |
| 580 | + } | |
| 581 | + | |
| 582 | + return $settings; | |
| 644 | 583 | } |
| 645 | 584 | |
| 646 | 585 | /** |
| 647 | 586 | * Get the limit for the number of actions for a single form. By default, this is 99, but |
| @@ -654,9 +593,9 @@ | ||
| 654 | 593 | * |
| 655 | 594 | * @return int The filtered limit value. |
| 656 | 595 | */ |
| 657 | 596 | public static function get_action_limit( $form_id, $limit = 99 ) { |
| 658 | - $type = 'all'; | |
| 597 | + $type = 'all'; | |
| 659 | 598 | return (int) apply_filters( 'frm_form_action_limit', (int) $limit, compact( 'type', 'form_id' ) ); |
| 660 | 599 | } |
| 661 | 600 | |
| 662 | 601 | /** |
| @@ -661,21 +600,20 @@ | ||
| 661 | 600 | |
| 662 | 601 | /** |
| 663 | 602 | * @since 3.04 |
| 664 | 603 | * |
| 665 | - * @param array|string $args | |
| 666 | - * @param string $default_status | |
| 604 | + * @param array $args | |
| 605 | + * @param string $default_status | |
| 667 | 606 | * |
| 668 | 607 | * @return void |
| 669 | 608 | */ |
| 670 | 609 | protected static function prepare_get_action( &$args, $default_status = 'publish' ) { |
| 671 | 610 | if ( is_numeric( $args ) ) { |
| 672 | - // For reverse compatibility. $limit was changed to $args | |
| 611 | + // for reverse compatibility. $limit was changed to $args | |
| 673 | 612 | $args = array( |
| 674 | 613 | 'limit' => $args, |
| 675 | 614 | ); |
| 676 | 615 | } |
| 677 | - | |
| 678 | 616 | $defaults = array( |
| 679 | 617 | 'limit' => 99, |
| 680 | 618 | 'post_status' => $default_status, |
| 681 | 619 | ); |
| @@ -682,12 +620,9 @@ | ||
| 682 | 620 | $args = wp_parse_args( $args, $defaults ); |
| 683 | 621 | } |
| 684 | 622 | |
| 685 | 623 | /** |
| 686 | - * @param int $action_id | |
| 687 | - * @param string $type | |
| 688 | - * | |
| 689 | - * @return bool|object | |
| 624 | + * @param int $action_id | |
| 690 | 625 | */ |
| 691 | 626 | public static function get_single_action_type( $action_id, $type ) { |
| 692 | 627 | if ( ! $type ) { |
| 693 | 628 | return false; |
| @@ -701,24 +636,18 @@ | ||
| 701 | 636 | return $action_control->get_single_action( $action_id ); |
| 702 | 637 | } |
| 703 | 638 | |
| 704 | 639 | /** |
| 705 | - * @param int $form_id | |
| 706 | - * @param string $type | |
| 640 | + * @param int $form_id | |
| 707 | 641 | * |
| 708 | 642 | * @return bool |
| 709 | 643 | */ |
| 710 | 644 | public static function form_has_action_type( $form_id, $type ) { |
| 711 | - $actions = self::get_action_for_form( $form_id, $type ); | |
| 712 | - return ! empty( $actions ); | |
| 645 | + $payment_actions = self::get_action_for_form( $form_id, $type ); | |
| 646 | + | |
| 647 | + return ! empty( $payment_actions ); | |
| 713 | 648 | } |
| 714 | 649 | |
| 715 | - /** | |
| 716 | - * @param false|int|string $form_id | |
| 717 | - * @param array $atts | |
| 718 | - * | |
| 719 | - * @return array | |
| 720 | - */ | |
| 721 | 650 | public function get_all( $form_id = false, $atts = array() ) { |
| 722 | 651 | if ( is_array( $atts ) && ! isset( $atts['limit'] ) && $this->action_options['limit'] > 99 ) { |
| 723 | 652 | $atts['limit'] = $this->action_options['limit']; |
| 724 | 653 | } |
| @@ -745,30 +674,31 @@ | ||
| 745 | 674 | unset( $query ); |
| 746 | 675 | |
| 747 | 676 | remove_filter( 'posts_where', 'FrmFormActionsController::limit_by_type' ); |
| 748 | 677 | |
| 749 | - if ( ! $actions ) { | |
| 678 | + if ( empty( $actions ) ) { | |
| 750 | 679 | return array(); |
| 751 | 680 | } |
| 752 | 681 | |
| 753 | 682 | $settings = array(); |
| 754 | - | |
| 755 | 683 | foreach ( $actions as $action ) { |
| 756 | 684 | if ( count( $settings ) >= $limit ) { |
| 757 | 685 | continue; |
| 758 | 686 | } |
| 759 | 687 | |
| 760 | - $action = $this->prepare_action( $action ); | |
| 688 | + $action = $this->prepare_action( $action ); | |
| 689 | + | |
| 761 | 690 | $settings[ $action->ID ] = $action; |
| 762 | 691 | } |
| 763 | 692 | |
| 764 | - return 1 === $limit ? reset( $settings ) : $settings; | |
| 693 | + if ( 1 === $limit ) { | |
| 694 | + $settings = reset( $settings ); | |
| 695 | + } | |
| 696 | + | |
| 697 | + return $settings; | |
| 765 | 698 | } |
| 766 | 699 | |
| 767 | 700 | /** |
| 768 | - * @param int|string $form_id | |
| 769 | - * @param int $limit | |
| 770 | - * | |
| 771 | 701 | * @return array |
| 772 | 702 | */ |
| 773 | 703 | public static function action_args( $form_id = 0, $limit = 99 ) { |
| 774 | 704 | $args = array( |
| @@ -778,9 +708,9 @@ | ||
| 778 | 708 | 'orderby' => 'title', |
| 779 | 709 | 'order' => 'ASC', |
| 780 | 710 | ); |
| 781 | 711 | |
| 782 | - if ( $form_id && $form_id !== 'all' ) { | |
| 712 | + if ( $form_id && $form_id != 'all' ) { | |
| 783 | 713 | $args['menu_order'] = $form_id; |
| 784 | 714 | } |
| 785 | 715 | |
| 786 | 716 | return $args; |
| @@ -786,11 +716,9 @@ | ||
| 786 | 716 | return $args; |
| 787 | 717 | } |
| 788 | 718 | |
| 789 | 719 | /** |
| 790 | - * @param WP_Post $action | |
| 791 | - * | |
| 792 | - * @return WP_Post | |
| 720 | + * @param array|WP_Post $action | |
| 793 | 721 | */ |
| 794 | 722 | public function prepare_action( $action ) { |
| 795 | 723 | $action->post_content = (array) FrmAppHelper::maybe_json_decode( $action->post_content ); |
| 796 | 724 | $action->post_excerpt = sanitize_title( $action->post_excerpt ); |
| @@ -796,13 +724,13 @@ | ||
| 796 | 724 | $action->post_excerpt = sanitize_title( $action->post_excerpt ); |
| 797 | 725 | |
| 798 | 726 | $default_values = $this->get_global_defaults(); |
| 799 | 727 | |
| 800 | - // Fill default values | |
| 728 | + // fill default values | |
| 801 | 729 | $action->post_content += $default_values; |
| 802 | 730 | |
| 803 | 731 | foreach ( $default_values as $k => $vals ) { |
| 804 | - if ( is_array( $vals ) && $vals ) { | |
| 732 | + if ( is_array( $vals ) && ! empty( $vals ) ) { | |
| 805 | 733 | if ( 'event' === $k && ! $this->action_options['force_event'] && ! empty( $action->post_content[ $k ] ) ) { |
| 806 | 734 | continue; |
| 807 | 735 | } |
| 808 | 736 | $action->post_content[ $k ] = wp_parse_args( $action->post_content[ $k ], $vals ); |
| @@ -816,11 +744,8 @@ | ||
| 816 | 744 | return $action; |
| 817 | 745 | } |
| 818 | 746 | |
| 819 | 747 | /** |
| 820 | - * @param false|int|string $form_id | |
| 821 | - * @param string $type | |
| 822 | - * | |
| 823 | 748 | * @return void |
| 824 | 749 | */ |
| 825 | 750 | public function destroy( $form_id = false, $type = 'default' ) { |
| 826 | 751 | global $wpdb; |
| @@ -827,14 +752,12 @@ | ||
| 827 | 752 | |
| 828 | 753 | $this->form_id = $form_id; |
| 829 | 754 | |
| 830 | 755 | $query = array( 'post_type' => FrmFormActionsController::$action_post_type ); |
| 831 | - | |
| 832 | 756 | if ( $form_id ) { |
| 833 | 757 | $query['menu_order'] = $form_id; |
| 834 | 758 | } |
| 835 | - | |
| 836 | - if ( 'all' !== $type ) { | |
| 759 | + if ( 'all' != $type ) { | |
| 837 | 760 | $query['post_excerpt'] = $this->id_base; |
| 838 | 761 | } |
| 839 | 762 | |
| 840 | 763 | $post_ids = FrmDb::get_col( $wpdb->posts, $query, 'ID' ); |
| @@ -855,11 +778,8 @@ | ||
| 855 | 778 | public static function clear_cache() { |
| 856 | 779 | FrmDb::cache_delete_group( 'frm_actions' ); |
| 857 | 780 | } |
| 858 | 781 | |
| 859 | - /** | |
| 860 | - * @return array | |
| 861 | - */ | |
| 862 | 782 | public function get_settings() { |
| 863 | 783 | return self::get_action_for_form( $this->form_id, $this->id_base ); |
| 864 | 784 | } |
| 865 | 785 | |
| @@ -882,31 +802,25 @@ | ||
| 882 | 802 | |
| 883 | 803 | return $defaults; |
| 884 | 804 | } |
| 885 | 805 | |
| 886 | - /** | |
| 887 | - * @return array | |
| 888 | - */ | |
| 889 | 806 | public function get_global_switch_fields() { |
| 890 | 807 | $switch = $this->get_switch_fields(); |
| 891 | 808 | $switch['conditions'] = array( 'hide_field' ); |
| 892 | 809 | |
| 893 | - return apply_filters( 'frm_global_switch_fields', $switch ); | |
| 810 | + $switch = apply_filters( 'frm_global_switch_fields', $switch ); | |
| 811 | + | |
| 812 | + return $switch; | |
| 894 | 813 | } |
| 895 | 814 | |
| 896 | 815 | /** |
| 897 | 816 | * Migrate settings from form->options into new action. |
| 898 | - * | |
| 899 | - * @param object $form | |
| 900 | - * @param string $update | |
| 901 | - * | |
| 902 | - * @return int|WP_Error | |
| 903 | 817 | */ |
| 904 | 818 | public function migrate_to_2( $form, $update = 'update' ) { |
| 905 | 819 | $action = $this->prepare_new( $form->id ); |
| 906 | 820 | FrmAppHelper::unserialize_or_decode( $form->options ); |
| 907 | 821 | |
| 908 | - // Fill with existing options | |
| 822 | + // fill with existing options | |
| 909 | 823 | foreach ( $action->post_content as $name => $val ) { |
| 910 | 824 | if ( isset( $form->options[ $name ] ) ) { |
| 911 | 825 | $action->post_content[ $name ] = $form->options[ $name ]; |
| 912 | 826 | unset( $form->options[ $name ] ); |
| @@ -914,9 +828,9 @@ | ||
| 914 | 828 | } |
| 915 | 829 | |
| 916 | 830 | $action = $this->migrate_values( $action, $form ); |
| 917 | 831 | |
| 918 | - // Check if action already exists | |
| 832 | + // check if action already exists | |
| 919 | 833 | $post_id = get_posts( |
| 920 | 834 | array( |
| 921 | 835 | 'name' => $action->post_name, |
| 922 | 836 | 'post_type' => FrmFormActionsController::$action_post_type, |
| @@ -924,24 +838,22 @@ | ||
| 924 | 838 | 'numberposts' => 1, |
| 925 | 839 | ) |
| 926 | 840 | ); |
| 927 | 841 | |
| 928 | - if ( ! $post_id ) { | |
| 929 | - // Create action now | |
| 842 | + if ( empty( $post_id ) ) { | |
| 843 | + // create action now | |
| 930 | 844 | $post_id = $this->save_settings( $action ); |
| 931 | 845 | } |
| 932 | 846 | |
| 933 | - if ( ! $post_id || 'update' !== $update ) { | |
| 934 | - return $post_id; | |
| 847 | + if ( $post_id && 'update' == $update ) { | |
| 848 | + global $wpdb; | |
| 849 | + $form->options = maybe_serialize( $form->options ); | |
| 850 | + | |
| 851 | + // update form options | |
| 852 | + $wpdb->update( $wpdb->prefix . 'frm_forms', array( 'options' => $form->options ), array( 'id' => $form->id ) ); | |
| 853 | + FrmForm::clear_form_cache(); | |
| 935 | 854 | } |
| 936 | 855 | |
| 937 | - global $wpdb; | |
| 938 | - $form->options = maybe_serialize( $form->options ); | |
| 939 | - | |
| 940 | - // Update form options | |
| 941 | - $wpdb->update( $wpdb->prefix . 'frm_forms', array( 'options' => $form->options ), array( 'id' => $form->id ) ); | |
| 942 | - FrmForm::clear_form_cache(); | |
| 943 | - | |
| 944 | 856 | return $post_id; |
| 945 | 857 | } |
| 946 | 858 | |
| 947 | 859 | /** |
| @@ -946,9 +858,8 @@ | ||
| 946 | 858 | |
| 947 | 859 | /** |
| 948 | 860 | * @param WP_Post $action |
| 949 | 861 | * @param stdClass $entry |
| 950 | - * | |
| 951 | 862 | * @return bool |
| 952 | 863 | */ |
| 953 | 864 | public static function action_conditions_met( $action, $entry ) { |
| 954 | 865 | if ( is_callable( 'FrmProFormActionsController::action_conditions_met' ) ) { |
| @@ -953,12 +864,44 @@ | ||
| 953 | 864 | public static function action_conditions_met( $action, $entry ) { |
| 954 | 865 | if ( is_callable( 'FrmProFormActionsController::action_conditions_met' ) ) { |
| 955 | 866 | return FrmProFormActionsController::action_conditions_met( $action, $entry ); |
| 956 | 867 | } |
| 957 | - return false; | |
| 868 | + | |
| 869 | + $stop = false; | |
| 870 | + return $stop; | |
| 958 | 871 | } |
| 959 | 872 | |
| 960 | 873 | /** |
| 874 | + * Get the value from a specific field and entry | |
| 875 | + * | |
| 876 | + * @since 2.01.02 | |
| 877 | + * | |
| 878 | + * @param object $entry | |
| 879 | + * @param int $field_id | |
| 880 | + * | |
| 881 | + * @return array|bool|mixed|string | |
| 882 | + */ | |
| 883 | + private static function get_value_from_entry( $entry, $field_id ) { | |
| 884 | + $observed_value = ''; | |
| 885 | + | |
| 886 | + if ( isset( $entry->metas[ $field_id ] ) ) { | |
| 887 | + $observed_value = $entry->metas[ $field_id ]; | |
| 888 | + } elseif ( $entry->post_id && FrmAppHelper::pro_is_installed() ) { | |
| 889 | + $field = FrmField::getOne( $field_id ); | |
| 890 | + $observed_value = FrmProEntryMetaHelper::get_post_or_meta_value( | |
| 891 | + $entry, | |
| 892 | + $field, | |
| 893 | + array( | |
| 894 | + 'links' => false, | |
| 895 | + 'truncate' => false, | |
| 896 | + ) | |
| 897 | + ); | |
| 898 | + } | |
| 899 | + | |
| 900 | + return $observed_value; | |
| 901 | + } | |
| 902 | + | |
| 903 | + /** | |
| 961 | 904 | * @param string $class |
| 962 | 905 | * |
| 963 | 906 | * @return array |
| 964 | 907 | */ |
| @@ -963,17 +906,14 @@ | ||
| 963 | 906 | * @return array |
| 964 | 907 | */ |
| 965 | 908 | public static function default_action_opts( $class = '' ) { |
| 966 | 909 | return array( |
| 967 | - 'classes' => 'frmfont ' . $class, | |
| 910 | + 'classes' => 'frm_icon_font ' . $class, | |
| 968 | 911 | 'active' => false, |
| 969 | 912 | 'limit' => 0, |
| 970 | 913 | ); |
| 971 | 914 | } |
| 972 | 915 | |
| 973 | - /** | |
| 974 | - * @return array | |
| 975 | - */ | |
| 976 | 916 | public static function trigger_labels() { |
| 977 | 917 | $triggers = array( |
| 978 | 918 | 'draft' => __( 'Draft is saved', 'formidable' ), |
| 979 | 919 | 'create' => __( 'Entry is created', 'formidable' ), |
| @@ -988,17 +928,15 @@ | ||
| 988 | 928 | /** |
| 989 | 929 | * @return void |
| 990 | 930 | */ |
| 991 | 931 | public function render_conditional_logic_call_to_action() { |
| 992 | - // phpcs:disable Generic.WhiteSpace.ScopeIndent | |
| 993 | 932 | ?> |
| 994 | 933 | <h3> |
| 995 | - <a href="javascript:void(0)" class="frm_show_upgrade frm_noallow" data-upgrade="<?php echo esc_attr( $this->get_upgrade_text() ); ?>" data-medium="conditional-<?php echo esc_attr( $this->id_base ); ?>"><?php // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong ?> | |
| 934 | + <a href="javascript:void(0)" class="frm_show_upgrade frm_noallow" data-upgrade="<?php echo esc_attr( $this->get_upgrade_text() ); ?>" data-medium="conditional-<?php echo esc_attr( $this->id_base ); ?>"> | |
| 996 | 935 | <?php esc_html_e( 'Use Conditional Logic', 'formidable' ); ?> |
| 997 | 936 | </a> |
| 998 | 937 | </h3> |
| 999 | 938 | <?php |
| 1000 | - // phpcs:enable Generic.WhiteSpace.ScopeIndent | |
| 1001 | 939 | } |
| 1002 | 940 | |
| 1003 | 941 | /** |
| 1004 | 942 | * @return string |
| @@ -1012,9 +950,8 @@ | ||
| 1012 | 950 | * |
| 1013 | 951 | * @since 6.10 |
| 1014 | 952 | * |
| 1015 | 953 | * @param int $form_id Form ID. |
| 1016 | - * | |
| 1017 | 954 | * @return object[] |
| 1018 | 955 | */ |
| 1019 | 956 | protected function get_form_fields( $form_id ) { |
| 1020 | 957 | // Get form fields, include embedded and repeater child fields. |
