diff --git a/classes/controllers/FrmAppController.php b/classes/controllers/FrmAppController.php index 7a797d7bb5..1ad315dc3f 100644 --- a/classes/controllers/FrmAppController.php +++ b/classes/controllers/FrmAppController.php @@ -3,7 +3,7 @@ class FrmAppController { public static function menu() { - add_filter( 'plugin_action_links_'. FrmAppHelper::plugin_folder() .'/formidable.php', 'FrmAppController::settings_link' ); + add_filter( 'plugin_action_links_' . FrmAppHelper::plugin_folder() . '/formidable.php', 'FrmAppController::settings_link' ); add_filter( 'admin_body_class', 'FrmAppController::wp_admin_body_class' ); FrmAppHelper::maybe_add_permissions(); @@ -17,18 +17,18 @@ public static function menu() { $pos = apply_filters( 'frm_menu_position', $pos ); $frm_settings = FrmAppHelper::get_settings(); - add_menu_page( 'Formidable', $frm_settings->menu, 'frm_view_forms', 'formidable', 'FrmFormsController::route', FrmAppHelper::plugin_url() .'/images/form_16.png', $pos ); + add_menu_page( 'Formidable', $frm_settings->menu, 'frm_view_forms', 'formidable', 'FrmFormsController::route', FrmAppHelper::plugin_url() . '/images/form_16.png', $pos ); } public static function load_wp_admin_style() { - wp_enqueue_style( 'frm_fonts', FrmAppHelper::plugin_url() .'/css/frm_fonts.css', array(), FrmAppHelper::plugin_version() ); + wp_enqueue_style( 'frm_fonts', FrmAppHelper::plugin_url() . '/css/frm_fonts.css', array(), FrmAppHelper::plugin_version() ); } public static function get_form_nav( $form, $show_nav = '', $title = 'show' ) { global $pagenow, $frm_vars; $show_nav = FrmAppHelper::get_param( 'show_nav', $show_nav, 'get', 'absint' ); - if ( empty($show_nav) ) { + if ( empty( $show_nav ) ) { return; } @@ -42,15 +42,15 @@ public static function get_form_nav( $form, $show_nav = '', $title = 'show' ) { } } - if ( ! isset($id) ) { + if ( ! isset( $id ) ) { $form = $id = false; } - include(FrmAppHelper::plugin_path() .'/classes/views/shared/form-nav.php'); + include( FrmAppHelper::plugin_path() . '/classes/views/shared/form-nav.php' ); } // Adds a settings link to the plugins page - public static function settings_link($links) { + public static function settings_link( $links ) { $settings = '' . __( 'Settings', 'formidable' ) . ''; array_unshift( $links, $settings ); @@ -133,11 +133,11 @@ public static function admin_js() { 'jquery-ui-sortable', 'bootstrap_tooltip', 'bootstrap-multiselect', ), $version, true ); - wp_register_style( 'formidable-admin', FrmAppHelper::plugin_url() .'/css/frm_admin.css', array(), $version ); - wp_register_script( 'bootstrap_tooltip', FrmAppHelper::plugin_url() .'/js/bootstrap.min.js', array( 'jquery' ), '3.3.4' ); + wp_register_style( 'formidable-admin', FrmAppHelper::plugin_url() . '/css/frm_admin.css', array(), $version ); + wp_register_script( 'bootstrap_tooltip', FrmAppHelper::plugin_url() . '/js/bootstrap.min.js', array( 'jquery' ), '3.3.4' ); // load multselect js - wp_register_script( 'bootstrap-multiselect', FrmAppHelper::plugin_url() .'/js/bootstrap-multiselect.js', array( 'jquery', 'bootstrap_tooltip' ), '0.9.8', true ); + wp_register_script( 'bootstrap-multiselect', FrmAppHelper::plugin_url() . '/js/bootstrap-multiselect.js', array( 'jquery', 'bootstrap_tooltip' ), '0.9.8', true ); $page = FrmAppHelper::simple_get( 'page', 'sanitize_title' ); $post_type = FrmAppHelper::simple_get( 'post_type', 'sanitize_title' ); @@ -154,10 +154,10 @@ public static function admin_js() { wp_enqueue_style( 'formidable-admin' ); add_thickbox(); - wp_register_script( 'formidable-editinplace', FrmAppHelper::plugin_url() .'/js/jquery/jquery.editinplace.packed.js', array( 'jquery' ), '2.3.0' ); + wp_register_script( 'formidable-editinplace', FrmAppHelper::plugin_url() . '/js/jquery/jquery.editinplace.packed.js', array( 'jquery' ), '2.3.0' ); } else if ( $pagenow == 'post.php' || ( $pagenow == 'post-new.php' && $post_type == 'frm_display' ) ) { - if ( isset($_REQUEST['post_type']) ) { + if ( isset( $_REQUEST['post_type'] ) ) { $post_type = sanitize_title( $_REQUEST['post_type'] ); } else if ( isset( $_REQUEST['post'] ) && absint( $_REQUEST['post'] ) ) { $post = get_post( absint( $_REQUEST['post'] ) ); @@ -191,7 +191,7 @@ public static function wp_admin_body_class( $classes ) { } public static function load_lang() { - load_plugin_textdomain( 'formidable', false, FrmAppHelper::plugin_folder() .'/languages/' ); + load_plugin_textdomain( 'formidable', false, FrmAppHelper::plugin_folder() . '/languages/' ); } /** @@ -219,7 +219,7 @@ public static function front_head() { $version = FrmAppHelper::plugin_version(); wp_register_script( 'formidable', FrmAppHelper::plugin_url() . '/js/formidable.min.js', array( 'jquery' ), $version, true ); - wp_register_script( 'jquery-placeholder', FrmAppHelper::plugin_url() .'/js/jquery/jquery.placeholder.js', array( 'jquery' ), '2.0.7', true ); + wp_register_script( 'jquery-placeholder', FrmAppHelper::plugin_url() . '/js/jquery/jquery.placeholder.js', array( 'jquery' ), '2.0.7', true ); if ( FrmAppHelper::is_admin() ) { // don't load this in back-end @@ -251,20 +251,20 @@ public static function front_head() { /** * @param string $location */ - public static function localize_script($location) { - wp_localize_script('formidable', 'frm_js', array( + public static function localize_script( $location ) { + wp_localize_script( 'formidable', 'frm_js', array( 'ajax_url' => admin_url( 'admin-ajax.php' ), - 'images_url' => FrmAppHelper::plugin_url() .'/images', + 'images_url' => FrmAppHelper::plugin_url() . '/images', 'loading' => __( 'Loading…' ), 'remove' => __( 'Remove', 'formidable' ), 'offset' => apply_filters( 'frm_scroll_offset', 4 ), 'nonce' => wp_create_nonce( 'frm_ajax' ), 'id' => __( 'ID', 'formidable' ), - )); + ) ); if ( $location == 'admin' ) { $frm_settings = FrmAppHelper::get_settings(); - wp_localize_script('formidable_admin', 'frm_admin_js', array( + wp_localize_script( 'formidable_admin', 'frm_admin_js', array( 'confirm_uninstall' => __( 'Are you sure you want to do this? Clicking OK will delete all forms, form data, and all other Formidable data. There is no Undo.', 'formidable' ), 'desc' => __( '(Click to add description)', 'formidable' ), 'blank' => __( '(blank)', 'formidable' ), @@ -301,17 +301,17 @@ public static function custom_stylesheet() { global $frm_vars; $css_file = array(); - if ( ! isset($frm_vars['css_loaded']) || ! $frm_vars['css_loaded'] ) { + if ( ! isset( $frm_vars['css_loaded'] ) || ! $frm_vars['css_loaded'] ) { //include css in head $uploads = FrmStylesHelper::get_upload_base(); - if ( is_readable( $uploads['basedir'] .'/formidable/css/formidablepro.css' ) ) { - $css_file['formidable'] = $uploads['baseurl'] .'/formidable/css/formidablepro.css'; + if ( is_readable( $uploads['basedir'] . '/formidable/css/formidablepro.css' ) ) { + $css_file['formidable'] = $uploads['baseurl'] . '/formidable/css/formidablepro.css'; } else { $css_file['formidable'] = admin_url( 'admin-ajax.php' ) . '?action=frmpro_css'; } } - if ( isset($frm_vars['datepicker_loaded']) && ! empty($frm_vars['datepicker_loaded']) ) { + if ( isset( $frm_vars['datepicker_loaded'] ) && ! empty( $frm_vars['datepicker_loaded'] ) ) { FrmStylesHelper::enqueue_jquery_css(); } @@ -321,7 +321,7 @@ public static function custom_stylesheet() { public static function load_css() { $css = get_transient( 'frmpro_css' ); - include(FrmAppHelper::plugin_path() .'/css/custom_theme.css.php'); + include( FrmAppHelper::plugin_path() . '/css/custom_theme.css.php' ); wp_die(); } @@ -404,8 +404,8 @@ public static function uninstall() { $frmdb->uninstall(); //disable the plugin and redirect after uninstall so the tables don't get added right back - deactivate_plugins( FrmAppHelper::plugin_folder() .'/formidable.php', false, false ); - echo esc_url( admin_url('plugins.php?deactivate=true') ); + deactivate_plugins( FrmAppHelper::plugin_folder() . '/formidable.php', false, false ); + echo esc_url( admin_url( 'plugins.php?deactivate=true' ) ); } else { $frm_settings = FrmAppHelper::get_settings(); wp_die( $frm_settings->admin_permission ); @@ -413,28 +413,28 @@ public static function uninstall() { wp_die(); } - public static function drop_tables($tables) { + public static function drop_tables( $tables ) { global $wpdb; - $tables[] = $wpdb->prefix .'frm_fields'; - $tables[] = $wpdb->prefix .'frm_forms'; - $tables[] = $wpdb->prefix .'frm_items'; - $tables[] = $wpdb->prefix .'frm_item_metas'; + $tables[] = $wpdb->prefix . 'frm_fields'; + $tables[] = $wpdb->prefix . 'frm_forms'; + $tables[] = $wpdb->prefix . 'frm_items'; + $tables[] = $wpdb->prefix . 'frm_item_metas'; return $tables; } // Routes for wordpress pages -- we're just replacing content here folks. - public static function page_route($content) { + public static function page_route( $content ) { global $post; $frm_settings = FrmAppHelper::get_settings(); - if ( $post && $post->ID == $frm_settings->preview_page_id && isset($_GET['form']) ) { + if ( $post && $post->ID == $frm_settings->preview_page_id && isset( $_GET['form'] ) ) { $content = FrmFormsController::page_preview(); } return $content; } - public static function update_message($features) { + public static function update_message( $features ) { _deprecated_function( __FUNCTION__, '2.0', 'FrmAppHelper::update_message' ); return FrmAppHelper::update_message( $features ); } diff --git a/classes/controllers/FrmHooksController.php b/classes/controllers/FrmHooksController.php index 6bbe458273..572fc2f6bf 100644 --- a/classes/controllers/FrmHooksController.php +++ b/classes/controllers/FrmHooksController.php @@ -24,9 +24,9 @@ public static function trigger_load_hook( $hooks = 'load_hooks' ) { } } else { // Make sure the hooks are only triggered once - add_filter('frm'. str_replace('load', '', $trigger_hooks) .'_loaded', '__return_true'); + add_filter( 'frm' . str_replace( 'load', '', $trigger_hooks ) . '_loaded', '__return_true' ); } - unset($trigger_hooks); + unset( $trigger_hooks ); // Instansiate Controllers foreach ( $controllers as $c ) { @@ -41,156 +41,156 @@ public static function trigger_load_hook( $hooks = 'load_hooks' ) { public static function load_hooks() { if ( ! is_admin() ) { - add_filter('the_content', 'FrmAppController::page_route', 10); + add_filter( 'the_content', 'FrmAppController::page_route', 10 ); } - add_action('plugins_loaded', 'FrmAppController::load_lang' ); - add_action('init', 'FrmAppController::front_head' ); - add_filter('widget_text', 'FrmAppController::widget_text_filter', 8 ); - add_action('wp_footer', 'FrmAppController::footer_js', 1, 0); + add_action( 'plugins_loaded', 'FrmAppController::load_lang' ); + add_action( 'init', 'FrmAppController::front_head' ); + add_filter( 'widget_text', 'FrmAppController::widget_text_filter', 8 ); + add_action( 'wp_footer', 'FrmAppController::footer_js', 1, 0 ); // Entries controller - add_action('wp', 'FrmEntriesController::process_entry', 10, 0); - add_action('frm_wp', 'FrmEntriesController::process_entry', 10, 0); - add_filter('frm_redirect_url', 'FrmEntriesController::delete_entry_before_redirect', 50, 3); - add_action('frm_after_entry_processed', 'FrmEntriesController::delete_entry_after_save', 100); - add_filter('frm_email_value', 'FrmEntriesController::filter_email_value', 10, 3); - add_filter('frmpro_fields_replace_shortcodes', 'FrmEntriesController::filter_shortcode_value', 10, 4); + add_action( 'wp', 'FrmEntriesController::process_entry', 10, 0 ); + add_action( 'frm_wp', 'FrmEntriesController::process_entry', 10, 0 ); + add_filter( 'frm_redirect_url', 'FrmEntriesController::delete_entry_before_redirect', 50, 3 ); + add_action( 'frm_after_entry_processed', 'FrmEntriesController::delete_entry_after_save', 100 ); + add_filter( 'frm_email_value', 'FrmEntriesController::filter_email_value', 10, 3 ); + add_filter( 'frmpro_fields_replace_shortcodes', 'FrmEntriesController::filter_shortcode_value', 10, 4 ); // Form Actions Controller - add_action('init', 'FrmFormActionsController::register_post_types', 1); + add_action( 'init', 'FrmFormActionsController::register_post_types', 1 ); add_action( 'frm_after_create_entry', 'FrmFormActionsController::trigger_create_actions', 20, 3 ); // Forms Controller - add_action('widgets_init', 'FrmFormsController::register_widgets' ); - add_filter('frm_content', 'FrmFormsController::filter_content', 10, 3); - add_filter('frm_replace_content_shortcodes', 'FrmFormsController::replace_content_shortcodes', 20, 3); - add_action('admin_bar_init', 'FrmFormsController::admin_bar_css' ); - add_action('wp_before_admin_bar_render', 'FrmFormsController::admin_bar_configure' ); - add_action('wp_scheduled_delete', 'FrmFormsController::scheduled_delete' ); + add_action( 'widgets_init', 'FrmFormsController::register_widgets' ); + add_filter( 'frm_content', 'FrmFormsController::filter_content', 10, 3 ); + add_filter( 'frm_replace_content_shortcodes', 'FrmFormsController::replace_content_shortcodes', 20, 3 ); + add_action( 'admin_bar_init', 'FrmFormsController::admin_bar_css' ); + add_action( 'wp_before_admin_bar_render', 'FrmFormsController::admin_bar_configure' ); + add_action( 'wp_scheduled_delete', 'FrmFormsController::scheduled_delete' ); // Form Shortcodes - add_shortcode('formidable', 'FrmFormsController::get_form_shortcode' ); + add_shortcode( 'formidable', 'FrmFormsController::get_form_shortcode' ); // Styles Controller - add_action('init', 'FrmStylesController::register_post_types', 0); - add_filter('frm_get_style_opts', 'FrmStylesController::get_style_opts'); - add_filter('frm_add_form_style_class', 'FrmStylesController::get_form_style_class', 10, 2); - add_filter('frm_show_entry_styles', 'FrmStylesController::show_entry_styles'); + add_action( 'init', 'FrmStylesController::register_post_types', 0 ); + add_filter( 'frm_get_style_opts', 'FrmStylesController::get_style_opts' ); + add_filter( 'frm_add_form_style_class', 'FrmStylesController::get_form_style_class', 10, 2 ); + add_filter( 'frm_show_entry_styles', 'FrmStylesController::show_entry_styles' ); } public static function load_admin_hooks() { - add_action('admin_menu', 'FrmAppController::menu', 1); - add_action('admin_enqueue_scripts', 'FrmAppController::load_wp_admin_style' ); - add_action('admin_notices', 'FrmAppController::pro_get_started_headline' ); + add_action( 'admin_menu', 'FrmAppController::menu', 1 ); + add_action( 'admin_enqueue_scripts', 'FrmAppController::load_wp_admin_style' ); + add_action( 'admin_notices', 'FrmAppController::pro_get_started_headline' ); add_action( 'admin_init', 'FrmAppController::admin_init', 11 ); - register_activation_hook(FrmAppHelper::plugin_path().'/formidable.php', 'FrmAppController::activation_install' ); + register_activation_hook( FrmAppHelper::plugin_path() . '/formidable.php', 'FrmAppController::activation_install' ); // Entries Controller - add_action('admin_menu', 'FrmEntriesController::menu', 12); - add_filter('contextual_help', 'FrmEntriesController::contextual_help', 10, 3 ); - add_filter('set-screen-option', 'FrmEntriesController::save_per_page', 10, 3); - add_filter('update_user_metadata', 'FrmEntriesController::check_hidden_cols', 10, 5); - add_action('updated_user_meta', 'FrmEntriesController::update_hidden_cols', 10, 4); + add_action( 'admin_menu', 'FrmEntriesController::menu', 12 ); + add_filter( 'contextual_help', 'FrmEntriesController::contextual_help', 10, 3 ); + add_filter( 'set-screen-option', 'FrmEntriesController::save_per_page', 10, 3 ); + add_filter( 'update_user_metadata', 'FrmEntriesController::check_hidden_cols', 10, 5 ); + add_action( 'updated_user_meta', 'FrmEntriesController::update_hidden_cols', 10, 4 ); // Fields Controller - add_filter('frm_display_field_options', 'FrmFieldsController::display_field_options'); - add_action('frm_field_options_form', 'FrmFieldsController::add_conditional_update_msg', 50); + add_filter( 'frm_display_field_options', 'FrmFieldsController::display_field_options' ); + add_action( 'frm_field_options_form', 'FrmFieldsController::add_conditional_update_msg', 50 ); // Form Actions Controller - if ( FrmAppHelper::is_admin_page('formidable' ) ) { - add_action('frm_before_update_form_settings', 'FrmFormActionsController::update_settings'); + if ( FrmAppHelper::is_admin_page( 'formidable' ) ) { + add_action( 'frm_before_update_form_settings', 'FrmFormActionsController::update_settings' ); } - add_action('frm_after_duplicate_form', 'FrmFormActionsController::duplicate_form_actions', 20, 3); + add_action( 'frm_after_duplicate_form', 'FrmFormActionsController::duplicate_form_actions', 20, 3 ); // Forms Controller - add_action('admin_menu', 'FrmFormsController::menu', 10); - add_action('admin_head-toplevel_page_formidable', 'FrmFormsController::head' ); + add_action( 'admin_menu', 'FrmFormsController::menu', 10 ); + add_action( 'admin_head-toplevel_page_formidable', 'FrmFormsController::head' ); - add_filter('set-screen-option', 'FrmFormsController::save_per_page', 10, 3); - add_action('admin_footer', 'FrmFormsController::insert_form_popup' ); - add_filter('media_buttons_context', 'FrmFormsController::insert_form_button' ); + add_filter( 'set-screen-option', 'FrmFormsController::save_per_page', 10, 3 ); + add_action( 'admin_footer', 'FrmFormsController::insert_form_popup' ); + add_filter( 'media_buttons_context', 'FrmFormsController::insert_form_button' ); // Forms Model - add_action('frm_after_duplicate_form', 'FrmForm::after_duplicate', 10, 2); + add_action( 'frm_after_duplicate_form', 'FrmForm::after_duplicate', 10, 2 ); // Settings Controller - add_action('admin_menu', 'FrmSettingsController::menu', 45); - add_action('frm_before_settings', 'FrmSettingsController::license_box'); + add_action( 'admin_menu', 'FrmSettingsController::menu', 45 ); + add_action( 'frm_before_settings', 'FrmSettingsController::license_box' ); // Stats Controller - add_action('admin_menu', 'FrmStatisticsController::menu', 24); - add_action('frm_form_action_reports', 'FrmStatisticsController::list_reports'); + add_action( 'admin_menu', 'FrmStatisticsController::menu', 24 ); + add_action( 'frm_form_action_reports', 'FrmStatisticsController::list_reports' ); // Styles Controller - add_action('admin_menu', 'FrmStylesController::menu', 14); - add_action('admin_init', 'FrmStylesController::admin_init'); + add_action( 'admin_menu', 'FrmStylesController::menu', 14 ); + add_action( 'admin_init', 'FrmStylesController::admin_init' ); // XML Controller - add_action('admin_menu', 'FrmXMLController::menu', 41); + add_action( 'admin_menu', 'FrmXMLController::menu', 41 ); } public static function load_ajax_hooks() { add_action( 'wp_ajax_frm_silent_upgrade', 'FrmAppController::ajax_install' ); add_action( 'wp_ajax_nopriv_frm_silent_upgrade', 'FrmAppController::ajax_install' ); add_action( 'wp_ajax_frm_install', 'FrmAppController::ajax_install' ); - add_action('wp_ajax_frm_uninstall', 'FrmAppController::uninstall' ); - add_action('wp_ajax_frm_deauthorize', 'FrmAppController::deauthorize' ); + add_action( 'wp_ajax_frm_uninstall', 'FrmAppController::uninstall' ); + add_action( 'wp_ajax_frm_deauthorize', 'FrmAppController::deauthorize' ); - add_action('wp_ajax_frmpro_css', 'FrmAppController::load_css' ); - add_action('wp_ajax_nopriv_frmpro_css', 'FrmAppController::load_css' ); + add_action( 'wp_ajax_frmpro_css', 'FrmAppController::load_css' ); + add_action( 'wp_ajax_nopriv_frmpro_css', 'FrmAppController::load_css' ); // Fields Controller - add_action('wp_ajax_frm_load_field', 'FrmFieldsController::load_field'); - add_action('wp_ajax_frm_insert_field', 'FrmFieldsController::create'); - add_action('wp_ajax_frm_update_field_form_id', 'FrmFieldsController::update_form_id'); - add_action('wp_ajax_frm_field_name_in_place_edit', 'FrmFieldsController::edit_name'); - add_action('wp_ajax_frm_update_ajax_option', 'FrmFieldsController::update_ajax_option'); - add_action('wp_ajax_frm_duplicate_field', 'FrmFieldsController::duplicate'); - add_action('wp_ajax_frm_delete_field', 'FrmFieldsController::destroy'); - add_action('wp_ajax_frm_add_field_option', 'FrmFieldsController::add_option'); - add_action('wp_ajax_frm_field_option_ipe', 'FrmFieldsController::edit_option'); - add_action('wp_ajax_frm_delete_field_option', 'FrmFieldsController::delete_option'); - add_action('wp_ajax_frm_import_choices', 'FrmFieldsController::import_choices'); - add_action('wp_ajax_frm_import_options', 'FrmFieldsController::import_options'); - add_action('wp_ajax_frm_update_field_order', 'FrmFieldsController::update_order'); + add_action( 'wp_ajax_frm_load_field', 'FrmFieldsController::load_field' ); + add_action( 'wp_ajax_frm_insert_field', 'FrmFieldsController::create' ); + add_action( 'wp_ajax_frm_update_field_form_id', 'FrmFieldsController::update_form_id' ); + add_action( 'wp_ajax_frm_field_name_in_place_edit', 'FrmFieldsController::edit_name' ); + add_action( 'wp_ajax_frm_update_ajax_option', 'FrmFieldsController::update_ajax_option' ); + add_action( 'wp_ajax_frm_duplicate_field', 'FrmFieldsController::duplicate' ); + add_action( 'wp_ajax_frm_delete_field', 'FrmFieldsController::destroy' ); + add_action( 'wp_ajax_frm_add_field_option', 'FrmFieldsController::add_option' ); + add_action( 'wp_ajax_frm_field_option_ipe', 'FrmFieldsController::edit_option' ); + add_action( 'wp_ajax_frm_delete_field_option', 'FrmFieldsController::delete_option' ); + add_action( 'wp_ajax_frm_import_choices', 'FrmFieldsController::import_choices' ); + add_action( 'wp_ajax_frm_import_options', 'FrmFieldsController::import_options' ); + add_action( 'wp_ajax_frm_update_field_order', 'FrmFieldsController::update_order' ); // Form Actions Controller - add_action('wp_ajax_frm_add_form_action', 'FrmFormActionsController::add_form_action'); - add_action('wp_ajax_frm_form_action_fill', 'FrmFormActionsController::fill_action'); + add_action( 'wp_ajax_frm_add_form_action', 'FrmFormActionsController::add_form_action' ); + add_action( 'wp_ajax_frm_form_action_fill', 'FrmFormActionsController::fill_action' ); // Forms Controller add_action( 'wp_ajax_frm_create_from_template', 'FrmFormsController::_create_from_template' ); add_action( 'wp_ajax_frm_save_form', 'FrmFormsController::route' ); add_action( 'wp_ajax_frm_form_key_in_place_edit', 'FrmFormsController::edit_key' ); add_action( 'wp_ajax_frm_form_desc_in_place_edit', 'FrmFormsController::edit_description' ); - add_action('wp_ajax_frm_get_default_html', 'FrmFormsController::get_email_html' ); - add_action('wp_ajax_frm_get_shortcode_opts', 'FrmFormsController::get_shortcode_opts' ); - add_action('wp_ajax_frm_forms_preview', 'FrmFormsController::preview' ); - add_action('wp_ajax_nopriv_frm_forms_preview', 'FrmFormsController::preview' ); + add_action( 'wp_ajax_frm_get_default_html', 'FrmFormsController::get_email_html' ); + add_action( 'wp_ajax_frm_get_shortcode_opts', 'FrmFormsController::get_shortcode_opts' ); + add_action( 'wp_ajax_frm_forms_preview', 'FrmFormsController::preview' ); + add_action( 'wp_ajax_nopriv_frm_forms_preview', 'FrmFormsController::preview' ); // Styles Controller - add_action('wp_ajax_frm_settings_reset', 'FrmStylesController::reset_styling'); - add_action('wp_ajax_frm_change_styling', 'FrmStylesController::change_styling'); - add_action('wp_ajax_frmpro_load_css', 'FrmStylesController::load_css'); - add_action('wp_ajax_nopriv_frmpro_load_css', 'FrmStylesController::load_css'); + add_action( 'wp_ajax_frm_settings_reset', 'FrmStylesController::reset_styling' ); + add_action( 'wp_ajax_frm_change_styling', 'FrmStylesController::change_styling' ); + add_action( 'wp_ajax_frmpro_load_css', 'FrmStylesController::load_css' ); + add_action( 'wp_ajax_nopriv_frmpro_load_css', 'FrmStylesController::load_css' ); // XML Controller - add_action('wp_ajax_frm_export_xml', 'FrmXMLController::export_xml'); + add_action( 'wp_ajax_frm_export_xml', 'FrmXMLController::export_xml' ); } public static function load_form_hooks() { // Fields Controller - add_filter('frm_field_type', 'FrmFieldsController::change_type'); - add_action('frm_field_input_html', 'FrmFieldsController::input_html'); - add_filter('frm_field_value_saved', 'FrmFieldsController::check_value', 50, 3); - add_filter('frm_field_label_seen', 'FrmFieldsController::check_label'); + add_filter( 'frm_field_type', 'FrmFieldsController::change_type' ); + add_action( 'frm_field_input_html', 'FrmFieldsController::input_html' ); + add_filter( 'frm_field_value_saved', 'FrmFieldsController::check_value', 50, 3 ); + add_filter( 'frm_field_label_seen', 'FrmFieldsController::check_label' ); // Forms Controller add_filter( 'frm_form_classes', 'FrmFormsController::form_classes' ); // Styles Controller - add_filter('frm_use_important_width', 'FrmStylesController::important_style', 10, 2 ); + add_filter( 'frm_use_important_width', 'FrmStylesController::important_style', 10, 2 ); } public static function load_view_hooks() { diff --git a/classes/controllers/FrmSettingsController.php b/classes/controllers/FrmSettingsController.php index 1b36fb9f4c..a459ad1cc5 100644 --- a/classes/controllers/FrmSettingsController.php +++ b/classes/controllers/FrmSettingsController.php @@ -12,12 +12,12 @@ public static function menu() { } } - add_submenu_page('formidable', 'Formidable | '. __( 'Global Settings', 'formidable' ), __( 'Global Settings', 'formidable' ), 'frm_change_settings', 'formidable-settings', 'FrmSettingsController::route'); + add_submenu_page( 'formidable', 'Formidable | ' . __( 'Global Settings', 'formidable' ), __( 'Global Settings', 'formidable' ), 'frm_change_settings', 'formidable-settings', 'FrmSettingsController::route' ); } public static function license_box() { $a = FrmAppHelper::simple_get( 't', 'sanitize_title', 'general_settings' ); - include(FrmAppHelper::plugin_path() .'/classes/views/frm-settings/license_box.php'); + include( FrmAppHelper::plugin_path() . '/classes/views/frm-settings/license_box.php' ); } public static function display_form( $errors = array(), $message = '' ) { @@ -28,11 +28,11 @@ public static function display_form( $errors = array(), $message = '' ) { $uploads = wp_upload_dir(); $target_path = $uploads['basedir'] . '/formidable/css'; - $sections = apply_filters('frm_add_settings_section', array()); + $sections = apply_filters( 'frm_add_settings_section', array() ); - $captcha_lang = FrmAppHelper::locales('captcha'); + $captcha_lang = FrmAppHelper::locales( 'captcha' ); - require(FrmAppHelper::plugin_path() .'/classes/views/frm-settings/form.php'); + require( FrmAppHelper::plugin_path() . '/classes/views/frm-settings/form.php' ); } public static function process_form( $stop_load = false ) { diff --git a/classes/controllers/FrmStatisticsController.php b/classes/controllers/FrmStatisticsController.php index 9428bd1e86..adf0f17b17 100644 --- a/classes/controllers/FrmStatisticsController.php +++ b/classes/controllers/FrmStatisticsController.php @@ -3,18 +3,18 @@ class FrmStatisticsController { public static function menu() { - add_submenu_page( 'formidable', 'Formidable | '. __( 'Views', 'formidable' ), ''. __( 'Views', 'formidable' ) .'', 'administrator', 'formidable-entry-templates', 'FrmStatisticsController::list_displays' ); + add_submenu_page( 'formidable', 'Formidable | ' . __( 'Views', 'formidable' ), '' . __( 'Views', 'formidable' ) . '', 'administrator', 'formidable-entry-templates', 'FrmStatisticsController::list_displays' ); } public static function list_reports() { - add_filter('frm_form_stop_action_reports', '__return_true'); + add_filter( 'frm_form_stop_action_reports', '__return_true' ); $form = FrmAppHelper::get_param( 'form', false, 'get', 'absint' ); - require(FrmAppHelper::plugin_path() .'/classes/views/frm-statistics/list.php'); + require( FrmAppHelper::plugin_path() . '/classes/views/frm-statistics/list.php' ); } public static function list_displays() { $form = FrmAppHelper::get_param( 'form', false, 'get', 'sanitize_title' ); - require(FrmAppHelper::plugin_path() .'/classes/views/frm-statistics/list_displays.php'); + require( FrmAppHelper::plugin_path() . '/classes/views/frm-statistics/list_displays.php' ); } } diff --git a/classes/models/FrmField.php b/classes/models/FrmField.php index 5b311668d1..cb9d9e0ecc 100644 --- a/classes/models/FrmField.php +++ b/classes/models/FrmField.php @@ -3,7 +3,7 @@ die( 'You are not allowed to call this page directly.' ); } -class FrmField{ +class FrmField { static $use_cache = true; static $transient_size = 200; diff --git a/classes/models/FrmForm.php b/classes/models/FrmForm.php index 9b8c8f7847..11e8872080 100644 --- a/classes/models/FrmForm.php +++ b/classes/models/FrmForm.php @@ -3,7 +3,7 @@ die('You are not allowed to call this page directly.'); } -class FrmForm{ +class FrmForm { /** * @return int|boolean id on success or false on failure diff --git a/classes/models/FrmNotification.php b/classes/models/FrmNotification.php index 1ba8b54fa5..60417dfa60 100644 --- a/classes/models/FrmNotification.php +++ b/classes/models/FrmNotification.php @@ -1,6 +1,6 @@