@@ -49,7 +49,7 @@ |
||
| 49 | 49 | } |
| 50 | 50 | $errors = array(); |
| 51 | 51 | if ( false !== strpos( $args['value'], '.@' ) || ! is_email( $args['value'] ) ) { |
| 52 | - $errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' ); |
|
| 52 | + $errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' ); |
|
| 53 | 53 | } |
| 54 | 54 | return $errors; |
| 55 | 55 | } |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | '<span class="frm-upgrade-submenu">' . esc_html( $cta_text ) . '</span>', |
| 117 | 117 | 'frm_view_forms', |
| 118 | 118 | 'formidable-pro-upgrade', |
| 119 | - function () { |
|
| 119 | + function() { |
|
| 120 | 120 | // This function doesn't need to do anything. |
| 121 | 121 | // The redirect is handled earlier to avoid issues with the headers being sent. |
| 122 | 122 | } |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | unset( $addons['error'] ); |
| 148 | 148 | } |
| 149 | 149 | |
| 150 | - $pro = array( |
|
| 150 | + $pro = array( |
|
| 151 | 151 | 'pro' => array( |
| 152 | 152 | 'title' => 'Formidable Forms Pro', |
| 153 | 153 | 'slug' => 'formidable-pro', |
@@ -189,9 +189,9 @@ discard block |
||
| 189 | 189 | |
| 190 | 190 | // Extract the elements to move |
| 191 | 191 | foreach ( $plans as $plan ) { |
| 192 | - if ( isset( self::$categories[ $plan ] ) ) { |
|
| 193 | - $bottom_categories[ $plan ] = self::$categories[ $plan ]; |
|
| 194 | - unset( self::$categories[ $plan ] ); |
|
| 192 | + if ( isset( self::$categories[$plan] ) ) { |
|
| 193 | + $bottom_categories[$plan] = self::$categories[$plan]; |
|
| 194 | + unset( self::$categories[$plan] ); |
|
| 195 | 195 | } |
| 196 | 196 | } |
| 197 | 197 | |
@@ -245,14 +245,12 @@ discard block |
||
| 245 | 245 | // Add the slug to the new array. |
| 246 | 246 | $addon['category-slugs'][] = $category_slug; |
| 247 | 247 | |
| 248 | - if ( ! isset( self::$categories[ $category_slug ] ) ) { |
|
| 249 | - self::$categories[ $category_slug ] = array( |
|
| 248 | + if ( ! isset( self::$categories[$category_slug] ) ) { |
|
| 249 | + self::$categories[$category_slug] = array( |
|
| 250 | 250 | 'name' => $category, |
| 251 | 251 | 'count' => 0, |
| 252 | 252 | ); |
| 253 | - } |
|
| 254 | - |
|
| 255 | - ++self::$categories[ $category_slug ]['count']; |
|
| 253 | + } ++self::$categories[$category_slug]['count']; |
|
| 256 | 254 | } |
| 257 | 255 | } |
| 258 | 256 | |
@@ -284,7 +282,7 @@ discard block |
||
| 284 | 282 | } else { |
| 285 | 283 | foreach ( $addons as $k => $addon ) { |
| 286 | 284 | if ( empty( $addon['excerpt'] ) && $k !== 'error' ) { |
| 287 | - unset( $addons[ $k ] ); |
|
| 285 | + unset( $addons[$k] ); |
|
| 288 | 286 | } |
| 289 | 287 | } |
| 290 | 288 | } |
@@ -398,7 +396,7 @@ discard block |
||
| 398 | 396 | |
| 399 | 397 | foreach ( $list as $k => $info ) { |
| 400 | 398 | $info['slug'] = $k; |
| 401 | - $list[ $k ] = array_merge( $defaults, $info ); |
|
| 399 | + $list[$k] = array_merge( $defaults, $info ); |
|
| 402 | 400 | } |
| 403 | 401 | return $list; |
| 404 | 402 | } |
@@ -549,17 +547,17 @@ discard block |
||
| 549 | 547 | continue; |
| 550 | 548 | } |
| 551 | 549 | |
| 552 | - $wp_plugin = isset( $wp_plugins[ $folder ] ) ? $wp_plugins[ $folder ] : array(); |
|
| 550 | + $wp_plugin = isset( $wp_plugins[$folder] ) ? $wp_plugins[$folder] : array(); |
|
| 553 | 551 | $wp_version = isset( $wp_plugin['Version'] ) ? $wp_plugin['Version'] : '1.0'; |
| 554 | 552 | $plugin->slug = explode( '/', $folder )[0]; |
| 555 | 553 | |
| 556 | 554 | if ( version_compare( $wp_version, $plugin->new_version, '<' ) ) { |
| 557 | - $transient->response[ $folder ] = $plugin; |
|
| 555 | + $transient->response[$folder] = $plugin; |
|
| 558 | 556 | } else { |
| 559 | - $transient->no_update[ $folder ] = $plugin; |
|
| 557 | + $transient->no_update[$folder] = $plugin; |
|
| 560 | 558 | } |
| 561 | 559 | |
| 562 | - $transient->checked[ $folder ] = $wp_version; |
|
| 560 | + $transient->checked[$folder] = $wp_version; |
|
| 563 | 561 | |
| 564 | 562 | }//end foreach |
| 565 | 563 | |
@@ -592,7 +590,7 @@ discard block |
||
| 592 | 590 | */ |
| 593 | 591 | protected static function is_installed( $plugin ) { |
| 594 | 592 | $all_plugins = self::get_plugins(); |
| 595 | - return isset( $all_plugins[ $plugin ] ); |
|
| 593 | + return isset( $all_plugins[$plugin] ); |
|
| 596 | 594 | } |
| 597 | 595 | |
| 598 | 596 | /** |
@@ -631,13 +629,13 @@ discard block |
||
| 631 | 629 | } |
| 632 | 630 | |
| 633 | 631 | $download_id = isset( $plugin['id'] ) ? $plugin['id'] : 0; |
| 634 | - if ( ! empty( $download_id ) && ! isset( $version_info[ $download_id ]['package'] ) ) { |
|
| 632 | + if ( ! empty( $download_id ) && ! isset( $version_info[$download_id]['package'] ) ) { |
|
| 635 | 633 | // if this addon is using its own license, get the update url |
| 636 | 634 | $addon_info = $api->get_api_info(); |
| 637 | 635 | |
| 638 | - $version_info[ $download_id ] = $addon_info[ $download_id ]; |
|
| 636 | + $version_info[$download_id] = $addon_info[$download_id]; |
|
| 639 | 637 | if ( isset( $addon_info['error'] ) ) { |
| 640 | - $version_info[ $download_id ]['error'] = array( |
|
| 638 | + $version_info[$download_id]['error'] = array( |
|
| 641 | 639 | 'message' => $addon_info['error']['message'], |
| 642 | 640 | 'code' => $addon_info['error']['code'], |
| 643 | 641 | ); |
@@ -736,8 +734,8 @@ discard block |
||
| 736 | 734 | return $addon; |
| 737 | 735 | } |
| 738 | 736 | } |
| 739 | - } elseif ( isset( $addons[ $download_id ] ) ) { |
|
| 740 | - $plugin = $addons[ $download_id ]; |
|
| 737 | + } elseif ( isset( $addons[$download_id] ) ) { |
|
| 738 | + $plugin = $addons[$download_id]; |
|
| 741 | 739 | } |
| 742 | 740 | |
| 743 | 741 | return $plugin; |
@@ -803,7 +801,7 @@ discard block |
||
| 803 | 801 | self::set_addon_status( $addon ); |
| 804 | 802 | self::set_categories( $addon ); |
| 805 | 803 | |
| 806 | - $addons[ $id ] = $addon; |
|
| 804 | + $addons[$id] = $addon; |
|
| 807 | 805 | }//end foreach |
| 808 | 806 | } |
| 809 | 807 | |
@@ -844,7 +842,7 @@ discard block |
||
| 844 | 842 | 'utm_medium' => 'addons', |
| 845 | 843 | 'utm_campaign' => 'liteplugin', |
| 846 | 844 | ); |
| 847 | - $link = add_query_arg( $query_args, $link ); |
|
| 845 | + $link = add_query_arg( $query_args, $link ); |
|
| 848 | 846 | } |
| 849 | 847 | |
| 850 | 848 | /** |
@@ -1062,7 +1060,7 @@ discard block |
||
| 1062 | 1060 | */ |
| 1063 | 1061 | public static function ajax_activate_addon() { |
| 1064 | 1062 | self::process_addon_action( |
| 1065 | - function ( $plugin ) { |
|
| 1063 | + function( $plugin ) { |
|
| 1066 | 1064 | return self::handle_addon_action( $plugin, 'activate' ); |
| 1067 | 1065 | }, |
| 1068 | 1066 | array( 'FrmAddonsController', 'get_addon_activation_response' ) |
@@ -1087,7 +1085,7 @@ discard block |
||
| 1087 | 1085 | */ |
| 1088 | 1086 | public static function ajax_deactivate_addon() { |
| 1089 | 1087 | self::process_addon_action( |
| 1090 | - function ( $plugin ) { |
|
| 1088 | + function( $plugin ) { |
|
| 1091 | 1089 | return self::handle_addon_action( $plugin, 'deactivate' ); |
| 1092 | 1090 | } |
| 1093 | 1091 | ); |
@@ -1102,7 +1100,7 @@ discard block |
||
| 1102 | 1100 | */ |
| 1103 | 1101 | public static function ajax_uninstall_addon() { |
| 1104 | 1102 | self::process_addon_action( |
| 1105 | - function ( $plugin ) { |
|
| 1103 | + function( $plugin ) { |
|
| 1106 | 1104 | return self::handle_addon_action( $plugin, 'uninstall' ); |
| 1107 | 1105 | } |
| 1108 | 1106 | ); |
@@ -1500,7 +1498,7 @@ discard block |
||
| 1500 | 1498 | $addons = $api->get_api_info(); |
| 1501 | 1499 | |
| 1502 | 1500 | if ( is_array( $addons ) && array_key_exists( $addon_id, $addons ) ) { |
| 1503 | - $dates = $addons[ $addon_id ]; |
|
| 1501 | + $dates = $addons[$addon_id]; |
|
| 1504 | 1502 | $requires = FrmFormsHelper::get_plan_required( $dates ); |
| 1505 | 1503 | } |
| 1506 | 1504 | |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | return; |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | - self::$sales[ $sale['key'] ] = $this->fill_sale( $sale ); |
|
| 92 | + self::$sales[$sale['key']] = $this->fill_sale( $sale ); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | /** |
@@ -187,7 +187,7 @@ discard block |
||
| 187 | 187 | |
| 188 | 188 | $sale = self::$instance->get_best_sale(); |
| 189 | 189 | |
| 190 | - return is_array( $sale ) && ! empty( $sale[ $key ] ) ? $sale[ $key ] : false; |
|
| 190 | + return is_array( $sale ) && ! empty( $sale[$key] ) ? $sale[$key] : false; |
|
| 191 | 191 | } |
| 192 | 192 | |
| 193 | 193 | /** |
@@ -36,7 +36,7 @@ |
||
| 36 | 36 | public static function load_admin_hooks() { |
| 37 | 37 | add_action( |
| 38 | 38 | 'admin_init', |
| 39 | - function () { |
|
| 39 | + function() { |
|
| 40 | 40 | self::fix_addon_hooks(); |
| 41 | 41 | } |
| 42 | 42 | ); |
@@ -127,7 +127,7 @@ |
||
| 127 | 127 | * @return bool |
| 128 | 128 | */ |
| 129 | 129 | private static function check_free_segments( $who ) { |
| 130 | - $segments = array( |
|
| 130 | + $segments = array( |
|
| 131 | 131 | 'free_first_1', |
| 132 | 132 | 'free_first_2_3', |
| 133 | 133 | 'free_first_4_7', |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | // Validate the number format. |
| 64 | 64 | if ( ! is_numeric( $args['value'] ) && '' !== $args['value'] ) { |
| 65 | - $errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' ); |
|
| 65 | + $errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' ); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | if ( $args['value'] === '' ) { |
@@ -74,9 +74,9 @@ discard block |
||
| 74 | 74 | $maxnum = FrmField::get_option( $this->field, 'maxnum' ); |
| 75 | 75 | |
| 76 | 76 | if ( $minnum !== '' && $value < $minnum ) { |
| 77 | - $errors[ 'field' . $args['id'] ] = __( 'Please select a higher number', 'formidable' ); |
|
| 77 | + $errors['field' . $args['id']] = __( 'Please select a higher number', 'formidable' ); |
|
| 78 | 78 | } elseif ( $maxnum !== '' && $value > $maxnum ) { |
| 79 | - $errors[ 'field' . $args['id'] ] = __( 'Please select a lower number', 'formidable' ); |
|
| 79 | + $errors['field' . $args['id']] = __( 'Please select a lower number', 'formidable' ); |
|
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | $this->validate_step( $errors, $args ); |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | * @return void |
| 96 | 96 | */ |
| 97 | 97 | protected function validate_step( &$errors, $args ) { |
| 98 | - if ( isset( $errors[ 'field' . $args['id'] ] ) ) { |
|
| 98 | + if ( isset( $errors['field' . $args['id']] ) ) { |
|
| 99 | 99 | // Don't need to check if value is invalid before. |
| 100 | 100 | return; |
| 101 | 101 | } |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | return; |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | - $errors[ 'field' . $args['id'] ] = sprintf( |
|
| 113 | + $errors['field' . $args['id']] = sprintf( |
|
| 114 | 114 | // Translators: %1$s: the first nearest value; %2$s: the second nearest value. |
| 115 | 115 | __( 'Please enter a valid value. Two nearest valid values are %1$s and %2$s', 'formidable' ), |
| 116 | 116 | is_numeric( $result[0] ) ? floatval( $result[0] ) : $result[0], |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | $page = $this->get_pagenum(); |
| 29 | 29 | $per_page = $this->get_items_per_page( 'formidable_page_formidable_per_page' ); |
| 30 | 30 | |
| 31 | - $mode = self::get_param( |
|
| 31 | + $mode = self::get_param( |
|
| 32 | 32 | array( |
| 33 | 33 | 'param' => 'mode', |
| 34 | 34 | 'default' => 'list', |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | 'default' => 'name', |
| 41 | 41 | ) |
| 42 | 42 | ); |
| 43 | - $order = self::get_param( |
|
| 43 | + $order = self::get_param( |
|
| 44 | 44 | array( |
| 45 | 45 | 'param' => 'order', |
| 46 | 46 | 'default' => 'ASC', |
@@ -49,7 +49,7 @@ discard block |
||
| 49 | 49 | |
| 50 | 50 | FrmAppController::apply_saved_sort_preference( $orderby, $order ); |
| 51 | 51 | |
| 52 | - $start = self::get_param( |
|
| 52 | + $start = self::get_param( |
|
| 53 | 53 | array( |
| 54 | 54 | 'param' => 'start', |
| 55 | 55 | 'default' => ( $page - 1 ) * $per_page, |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | $counts = FrmForm::get_count(); |
| 182 | 182 | $form_type = FrmAppHelper::simple_get( 'form_type', 'sanitize_title', 'published' ); |
| 183 | 183 | |
| 184 | - if ( isset( $statuses[ $form_type ] ) ) { |
|
| 184 | + if ( isset( $statuses[$form_type] ) ) { |
|
| 185 | 185 | $counts->$form_type = $this->total_items; |
| 186 | 186 | } |
| 187 | 187 | |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | |
| 203 | 203 | if ( $counts->{$status} || 'draft' !== $status ) { |
| 204 | 204 | /* translators: %1$s: Status, %2$s: Number of items */ |
| 205 | - $links[ $status ] = '<a href="' . esc_url( '?page=formidable&form_type=' . $status ) . '" ' . $class . '>' . sprintf( __( '%1$s <span class="count">(%2$s)</span>', 'formidable' ), $name, number_format_i18n( $counts->{$status} ) ) . '</a>'; |
|
| 205 | + $links[$status] = '<a href="' . esc_url( '?page=formidable&form_type=' . $status ) . '" ' . $class . '>' . sprintf( __( '%1$s <span class="count">(%2$s)</span>', 'formidable' ), $name, number_format_i18n( $counts->{$status} ) ) . '</a>'; |
|
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | unset( $status, $name ); |
@@ -404,7 +404,7 @@ discard block |
||
| 404 | 404 | private function get_actions( &$actions, $item, $edit_link ) { |
| 405 | 405 | $new_actions = FrmFormsHelper::get_action_links( $item->id, $item ); |
| 406 | 406 | foreach ( $new_actions as $link => $action ) { |
| 407 | - $new_actions[ $link ] = FrmFormsHelper::format_link_html( $action, 'short' ); |
|
| 407 | + $new_actions[$link] = FrmFormsHelper::format_link_html( $action, 'short' ); |
|
| 408 | 408 | } |
| 409 | 409 | |
| 410 | 410 | if ( 'trash' === $this->status ) { |
@@ -53,7 +53,7 @@ |
||
| 53 | 53 | * @return array |
| 54 | 54 | */ |
| 55 | 55 | public static function add_gdpr_field( $fields ) { |
| 56 | - $fields[ self::FIELD_TYPE ] = array( |
|
| 56 | + $fields[self::FIELD_TYPE] = array( |
|
| 57 | 57 | 'name' => __( 'GDPR', 'formidable' ), |
| 58 | 58 | 'icon' => 'frm_icon_font frm-gdpr-icon', |
| 59 | 59 | ); |
@@ -1356,15 +1356,15 @@ discard block |
||
| 1356 | 1356 | global $wp_filter; |
| 1357 | 1357 | |
| 1358 | 1358 | foreach ( $actions as $action ) { |
| 1359 | - if ( empty( $wp_filter[ $action ]->callbacks ) ) { |
|
| 1359 | + if ( empty( $wp_filter[$action]->callbacks ) ) { |
|
| 1360 | 1360 | continue; |
| 1361 | 1361 | } |
| 1362 | - foreach ( $wp_filter[ $action ]->callbacks as $priority => $callbacks ) { |
|
| 1362 | + foreach ( $wp_filter[$action]->callbacks as $priority => $callbacks ) { |
|
| 1363 | 1363 | foreach ( $callbacks as $callback_name => $callback ) { |
| 1364 | 1364 | if ( self::is_our_callback_string( $callback_name ) || self::is_our_callback_array( $callback ) ) { |
| 1365 | 1365 | continue; |
| 1366 | 1366 | } |
| 1367 | - unset( $wp_filter[ $action ]->callbacks[ $priority ][ $callback_name ] ); |
|
| 1367 | + unset( $wp_filter[$action]->callbacks[$priority][$callback_name] ); |
|
| 1368 | 1368 | } |
| 1369 | 1369 | } |
| 1370 | 1370 | } |
@@ -1376,7 +1376,7 @@ discard block |
||
| 1376 | 1376 | * @return void |
| 1377 | 1377 | */ |
| 1378 | 1378 | private static function remember_custom_sort() { |
| 1379 | - $screen = get_current_screen(); |
|
| 1379 | + $screen = get_current_screen(); |
|
| 1380 | 1380 | if ( ! $screen ) { |
| 1381 | 1381 | return; |
| 1382 | 1382 | } |