Skip to content

Enforce more early exits #2982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Crabcyborg merged 2 commits into from
Feb 26, 2026
Merged

Enforce more early exits #2982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2ab032
Enforce more early exits
Crabcyborg Feb 26, 2026
83057e9
Fix a couple more early returns
Crabcyborg Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions classes/controllers/FrmAddonsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,12 @@ protected static function organize_and_get_categories() {

// Extract the elements to move
foreach ( $plans as $plan ) {
if ( isset( self::$categories[ $plan ] ) ) {
$bottom_categories[ $plan ] = self::$categories[ $plan ];
unset( self::$categories[ $plan ] );
if ( ! isset( self::$categories[ $plan ] ) ) {
continue;
}

$bottom_categories[ $plan ] = self::$categories[ $plan ];
unset( self::$categories[ $plan ] );
}

$special_categories = array();
Expand Down
20 changes: 12 additions & 8 deletions classes/controllers/FrmAppController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,10 +874,12 @@ private static function enqueue_builder_assets( $plugin_url, $version ) {
* @return void
*/
private static function enqueue_global_settings_scripts( $page ) {
if ( 'formidable-settings' === $page ) {
wp_enqueue_style( 'wp-color-picker' );
wp_enqueue_script( 'formidable_settings' );
if ( 'formidable-settings' !== $page ) {
return;
}

wp_enqueue_style( 'wp-color-picker' );
wp_enqueue_script( 'formidable_settings' );
}

/**
Expand Down Expand Up @@ -1182,12 +1184,14 @@ public static function network_upgrade_site( $blog_id = 0 ) {
* @return void
*/
private static function maybe_add_wp_site_health() {
if ( ! class_exists( 'WP_Site_Health' ) ) {
$wp_site_health_path = ABSPATH . 'wp-admin/includes/class-wp-site-health.php';
if ( class_exists( 'WP_Site_Health' ) ) {
return;
}

if ( file_exists( $wp_site_health_path ) ) {
require_once $wp_site_health_path;
}
$wp_site_health_path = ABSPATH . 'wp-admin/includes/class-wp-site-health.php';

if ( file_exists( $wp_site_health_path ) ) {
require_once $wp_site_health_path;
}
}

Expand Down
11 changes: 7 additions & 4 deletions classes/controllers/FrmDashboardController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,12 +428,15 @@ private static function view_args_inbox() {
*/
private static function inbox_prepare_messages( $data ) {
foreach ( $data as $key => $messages ) {
if ( in_array( $key, array( 'unread', 'dismissed' ), true ) ) {
foreach ( $messages as $key_msg => $message ) {
$data[ $key ][ $key_msg ]['cta'] = self::inbox_clean_messages_cta( $message['cta'] );
}
if ( ! in_array( $key, array( 'unread', 'dismissed' ), true ) ) {
continue;
}

foreach ( $messages as $key_msg => $message ) {
$data[ $key ][ $key_msg ]['cta'] = self::inbox_clean_messages_cta( $message['cta'] );
}
}

return $data;
}

Expand Down
28 changes: 16 additions & 12 deletions classes/controllers/FrmEntriesController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,15 +553,17 @@ private static function user_hidden_columns_for_form( $form_id, $result ) {
$hidden = array();

foreach ( (array) $result as $r ) {
if ( $r ) {
list( $form_prefix, $field_key ) = explode( '_', $r );
if ( ! $r ) {
continue;
}

if ( (int) $form_prefix === (int) $form_id ) {
$hidden[] = $r;
}
list( $form_prefix, $field_key ) = explode( '_', $r );

unset( $form_prefix );
if ( (int) $form_prefix === (int) $form_id ) {
$hidden[] = $r;
}

unset( $form_prefix );
}

return $hidden;
Expand Down Expand Up @@ -654,13 +656,15 @@ public static function display_list( $message = '', $errors = array() ) {
* @return void
*/
private static function get_delete_form_time( $form, &$errors ) {
if ( 'trash' === $form->status ) {
$delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
$time_to_delete = FrmAppHelper::human_time_diff( $delete_timestamp, $form->options['trash_time'] ?? time() );

/* translators: %1$s: Time string */
$errors['trash'] = sprintf( __( 'This form is in the trash and is scheduled to be deleted permanently in %s along with any entries.', 'formidable' ), $time_to_delete );
if ( 'trash' !== $form->status ) {
return;
}

$delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
$time_to_delete = FrmAppHelper::human_time_diff( $delete_timestamp, $form->options['trash_time'] ?? time() );

/* translators: %1$s: Time string */
$errors['trash'] = sprintf( __( 'This form is in the trash and is scheduled to be deleted permanently in %s along with any entries.', 'formidable' ), $time_to_delete );
}

/**
Expand Down
13 changes: 8 additions & 5 deletions classes/controllers/FrmFormActionsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,12 +600,15 @@ public static function update_settings( $form_id ) {
* @return void
*/
public static function delete_missing_actions( $old_actions ) {
if ( $old_actions ) {
foreach ( $old_actions as $old_id ) {
wp_delete_post( $old_id );
}
FrmDb::cache_delete_group( 'frm_actions' );
if ( ! $old_actions ) {
return;
}

foreach ( $old_actions as $old_id ) {
wp_delete_post( $old_id );
}

FrmDb::cache_delete_group( 'frm_actions' );
}

/**
Expand Down
8 changes: 5 additions & 3 deletions classes/controllers/FrmFormTemplatesController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,10 +592,12 @@ private static function organize_and_set_categories() {
*/
private static function assign_featured_templates() {
foreach ( self::FEATURED_TEMPLATES_IDS as $key ) {
if ( isset( self::$templates[ $key ] ) ) {
self::$templates[ $key ]['is_featured'] = true;
self::$featured_templates[] = self::$templates[ $key ];
if ( ! isset( self::$templates[ $key ] ) ) {
continue;
}

self::$templates[ $key ]['is_featured'] = true;
self::$featured_templates[] = self::$templates[ $key ];
}
}

Expand Down
28 changes: 16 additions & 12 deletions classes/controllers/FrmFormsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,14 +765,16 @@ private static function load_direct_preview() {
* @return void
*/
public static function maybe_block_preview( $form_key ) {
if ( FrmFormsHelper::should_block_preview( $form_key ) ) {
$error = __( 'You do not have permission to view this form', 'formidable' );
wp_die(
'<h1>' . esc_html( $error ) . '</h1>',
'<p>' . esc_html( $error ) . '</p>',
403
);
if ( ! FrmFormsHelper::should_block_preview( $form_key ) ) {
return;
}

$error = __( 'You do not have permission to view this form', 'formidable' );
wp_die(
'<h1>' . esc_html( $error ) . '</h1>',
'<p>' . esc_html( $error ) . '</p>',
403
);
}

/**
Expand Down Expand Up @@ -1996,13 +1998,15 @@ public static function replace_form_name_shortcodes( $string, $form ) {
* @return void
*/
private static function get_entry_by_param( &$entry ) {
if ( ! $entry || ! is_object( $entry ) ) {
if ( ! $entry || ! is_numeric( $entry ) ) {
$entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
}
if ( $entry && is_object( $entry ) ) {
return;
}

FrmEntry::maybe_get_entry( $entry );
if ( ! $entry || ! is_numeric( $entry ) ) {
$entry = FrmAppHelper::get_post_param( 'id', false, 'sanitize_title' );
}

FrmEntry::maybe_get_entry( $entry );
}

/**
Expand Down
8 changes: 5 additions & 3 deletions classes/controllers/FrmInboxController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,11 @@ private static function add_tracking_request() {
* @return void
*/
private static function remove_free_template_message() {
if ( ! FrmAppHelper::pro_is_installed() ) {
$message = new FrmInbox();
$message->dismiss( 'free_templates' );
if ( FrmAppHelper::pro_is_installed() ) {
return;
}

$message = new FrmInbox();
$message->dismiss( 'free_templates' );
}
}
8 changes: 5 additions & 3 deletions classes/controllers/FrmSettingsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,12 @@ private static function remove_payments_sections( &$sections ) {
$payment_section_keys = array( 'paypal', 'square', 'stripe', 'authorize_net' );

foreach ( $sections as $key => $section ) {
if ( in_array( $key, $payment_section_keys, true ) ) {
self::$removed_payments_sections[ $key ] = $section;
unset( $sections[ $key ] );
if ( ! in_array( $key, $payment_section_keys, true ) ) {
continue;
}

self::$removed_payments_sections[ $key ] = $section;
unset( $sections[ $key ] );
}

uksort( self::$removed_payments_sections, array( self::class, 'payment_sections_sort_callback' ) );
Expand Down
24 changes: 14 additions & 10 deletions classes/helpers/FrmAppHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1514,10 +1514,12 @@ public static function include_svg() {
*/
public static function array_to_html_params( $atts, $echo = false ) {
$callback = function () use ( $atts ) {
if ( $atts ) {
foreach ( $atts as $key => $value ) {
echo ' ' . esc_attr( $key ) . '="' . esc_attr( $value ) . '"';
}
if ( ! $atts ) {
return;
}

foreach ( $atts as $key => $value ) {
echo ' ' . esc_attr( $key ) . '="' . esc_attr( $value ) . '"';
}
};
return self::clip( $callback, $echo );
Expand Down Expand Up @@ -2355,13 +2357,15 @@ public static function maybe_add_permissions() {
* @return void
*/
public static function force_capability( $cap = 'frm_change_settings' ) {
if ( current_user_can( 'administrator' ) && ! current_user_can( $cap ) ) {
$role = get_role( 'administrator' );
$frm_roles = self::frm_capabilities();
if ( ! current_user_can( 'administrator' ) || current_user_can( $cap ) ) {
return;
}

foreach ( $frm_roles as $frm_role => $frm_role_description ) {
$role->add_cap( $frm_role );
}
$role = get_role( 'administrator' );
$frm_roles = self::frm_capabilities();

foreach ( $frm_roles as $frm_role => $frm_role_description ) {
$role->add_cap( $frm_role );
}
}

Expand Down
14 changes: 8 additions & 6 deletions classes/helpers/FrmCSVExportHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,15 +618,17 @@ private static function fill_missing_repeater_metas( $metas, &$entries ) {
}

foreach ( self::$fields_by_repeater_id[ $repeater_id ] as $repeater_child ) {
if ( ! isset( $metas[ $repeater_child->id ] ) ) {
$metas[ $repeater_child->id ] = '';
if ( isset( $metas[ $repeater_child->id ] ) ) {
continue;
}

if ( ! isset( $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] ) || ! is_array( $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] ) ) { // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
$entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] = array();
}
$metas[ $repeater_child->id ] = '';

$entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ][] = '';
if ( ! isset( $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] ) || ! is_array( $entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] ) ) { // phpcs:ignore SlevomatCodingStandard.Files.LineLength.LineTooLong
$entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ] = array();
Comment thread
Crabcyborg marked this conversation as resolved.
}

$entries[ self::$entry->parent_item_id ]->metas[ $repeater_child->id ][] = '';
}

return $metas;
Expand Down
16 changes: 9 additions & 7 deletions classes/helpers/FrmFieldsHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1825,16 +1825,18 @@ public static function switch_field_ids( $val ) {
}

foreach ( $val as $k => $v ) {
if ( is_string( $v ) ) {
if ( 'custom_html' === $k ) {
$val[ $k ] = self::switch_ids_except_strings( $replace, $replace_with, array( '[if description]', '[description]', '[/if description]' ), $v );
unset( $k, $v );
continue;
}
if ( ! is_string( $v ) ) {
continue;
}

$val[ $k ] = str_replace( $replace, $replace_with, $v );
if ( 'custom_html' === $k ) {
$val[ $k ] = self::switch_ids_except_strings( $replace, $replace_with, array( '[if description]', '[description]', '[/if description]' ), $v );
unset( $k, $v );
continue;
}

$val[ $k ] = str_replace( $replace, $replace_with, $v );
unset( $k, $v );
}

return $val;
Expand Down
8 changes: 5 additions & 3 deletions classes/helpers/FrmListHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,10 +305,12 @@ public function search_box( $text, $input_id ) {
* @return void
*/
private function hidden_search_inputs( $param_name ) {
if ( ! empty( $_REQUEST[ $param_name ] ) ) {
$value = sanitize_text_field( wp_unslash( $_REQUEST[ $param_name ] ) );
echo '<input type="hidden" name="' . esc_attr( $param_name ) . '" value="' . esc_attr( $value ) . '" />';
if ( empty( $_REQUEST[ $param_name ] ) ) {
return;
}

$value = sanitize_text_field( wp_unslash( $_REQUEST[ $param_name ] ) );
echo '<input type="hidden" name="' . esc_attr( $param_name ) . '" value="' . esc_attr( $value ) . '" />';
}

/**
Expand Down
Loading
Loading