Strategy11 / formidable-forms

classes/models/FrmInstallerSkin.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 	 */
 	public function set_upgrader( &$upgrader ) {
 		if ( is_object( $upgrader ) ) {
-			$this->upgrader =& $upgrader;
+			$this->upgrader = & $upgrader;
 		}
 	}
 

classes/controllers/FrmAddonsController.php

Doc Comments +1 added lines

@@ -430,6 +430,7 @@
 
 	/**
 	 * @since 3.04.02
+	 * @param string $link
 	 */
 	private static function prepare_addon_link( &$link ) {
 		$site_url = 'https://formidableforms.com/';

Indentation +1 added lines, -1 removed lines

@@ -167,7 +167,7 @@
 
 		$response = wp_remote_get( $url );
 		if ( is_array( $response ) && ! is_wp_error( $response ) ) {
-		    $addons = $response['body'];
+			$addons = $response['body'];
 			if ( ! empty( $addons ) ) {
 				$addons = json_decode( $addons, true );
 

Spacing +11 added lines, -11 removed lines

@@ -51,7 +51,7 @@ 
 		} else {
 			foreach ( $addons as $k => $addon ) {
 				if ( empty( $addon['excerpt'] ) && $k !== 'error' ) {
-					unset( $addons[ $k ] );
+					unset( $addons[$k] );
 				}
 			}
 		}
@@ -178,7 +178,7 @@ 
 					}
 					$cats = array_intersect( $skip_categories, $addon['categories'] );
 					if ( ! empty( $cats ) ) {
-						unset( $addons[ $k ] );
+						unset( $addons[$k] );
 					}
 				}
 
@@ -289,16 +289,16 @@ 
 				continue;
 			}
 
-			$wp_plugin  = isset( $wp_plugins[ $folder ] ) ? $wp_plugins[ $folder ] : array();
+			$wp_plugin  = isset( $wp_plugins[$folder] ) ? $wp_plugins[$folder] : array();
 			$wp_version = isset( $wp_plugin['Version'] ) ? $wp_plugin['Version'] : '1.0';
 
 			if ( version_compare( $wp_version, $plugin->new_version, '<' ) ) {
 				$slug = explode( '/', $folder );
 				$plugin->slug = $slug[0];
-				$transient->response[ $folder ] = $plugin;
+				$transient->response[$folder] = $plugin;
 			}
 
-			$transient->checked[ $folder ] = $wp_version;
+			$transient->checked[$folder] = $wp_version;
 
 		}
 
@@ -340,13 +340,13 @@ 
 			}
 
 			$download_id = isset( $plugin['id'] ) ? $plugin['id'] : 0;
-			if ( ! empty( $download_id ) && ! isset( $version_info[ $download_id ]['package'] ) ) {
+			if ( ! empty( $download_id ) && ! isset( $version_info[$download_id]['package'] ) ) {
 				// if this addon is using its own license, get the update url
 				$addon_info = self::get_addon_info( $new_license );
 
-				$version_info[ $download_id ] = $addon_info[ $download_id ];
+				$version_info[$download_id] = $addon_info[$download_id];
 				if ( isset( $addon_info['error'] ) ) {
-					$version_info[ $download_id ]['error'] = array(
+					$version_info[$download_id]['error'] = array(
 						'message' => $addon_info['error']['message'],
 						'code'    => $addon_info['error']['code'],
 					);
@@ -372,8 +372,8 @@ 
 					return $addon;
 				}
 			}
-		} elseif ( isset( $addons[ $download_id ] ) ) {
-			$plugin = $addons[ $download_id ];
+		} elseif ( isset( $addons[$download_id] ) ) {
+			$plugin = $addons[$download_id];
 		}
 
 		return $plugin;
@@ -424,7 +424,7 @@ 
 			self::prepare_addon_link( $addon['link'] );
 
 			self::set_addon_status( $addon );
-			$addons[ $id ] = $addon;
+			$addons[$id] = $addon;
 		}
 	}
 

deprecated/FrmDeprecated.php

Doc Comments +5 added lines

@@ -10,6 +10,8 @@ 
 
 	/**
 	 * @deprecated 2.3
+	 * @param string $function
+	 * @param string $version
 	 */
 	public static function deprecated( $function, $version ) {
 		_deprecated_function( $function, $version );
@@ -68,6 +70,7 @@ 
 
 	/**
 	 * @deprecated 3.04.03
+	 * @param string $url
 	 */
 	private static function send_api_request( $url, $transient = array() ) {
 		$data = get_transient( $transient['name'] );
@@ -318,6 +321,7 @@ 
 
 	/**
 	 * @deprecated 3.0
+	 * @param string $field
 	 */
 	private static function edit_in_place_value( $field ) {
 		_deprecated_function( __FUNCTION__, '3.0' );
@@ -714,6 +718,7 @@ 
 
 	/**
 	 * @deprecated 3.02.03
+	 * @return string
 	 */
 	public static function get_form_for_page() {
 		_deprecated_function( __FUNCTION__, '3.02.03' );

Indentation +48 added lines, -48 removed lines

@@ -624,8 +624,8 @@ 
 	 */
 	public static function get_shortcode_tag( $shortcodes, $short_key, $args ) {
 		_deprecated_function( __FUNCTION__, '3.0', 'FrmShortcodeHelper::get_shortcode_tag' );
-        return FrmShortcodeHelper::get_shortcode_tag( $shortcodes, $short_key, $args );
-    }
+		return FrmShortcodeHelper::get_shortcode_tag( $shortcodes, $short_key, $args );
+	}
 
 	/**
 	 * @deprecated 3.01
@@ -638,52 +638,52 @@ 
 	/**
 	 * @deprecated 3.02.03
 	 */
-    public static function jquery_themes() {
+	public static function jquery_themes() {
 		_deprecated_function( __FUNCTION__, '3.02.03', 'FrmProStylesController::jquery_themes' );
 
-        $themes = array(
-            'ui-lightness'  => 'UI Lightness',
-            'ui-darkness'   => 'UI Darkness',
-            'smoothness'    => 'Smoothness',
-            'start'         => 'Start',
-            'redmond'       => 'Redmond',
-            'sunny'         => 'Sunny',
-            'overcast'      => 'Overcast',
-            'le-frog'       => 'Le Frog',
-            'flick'         => 'Flick',
+		$themes = array(
+			'ui-lightness'  => 'UI Lightness',
+			'ui-darkness'   => 'UI Darkness',
+			'smoothness'    => 'Smoothness',
+			'start'         => 'Start',
+			'redmond'       => 'Redmond',
+			'sunny'         => 'Sunny',
+			'overcast'      => 'Overcast',
+			'le-frog'       => 'Le Frog',
+			'flick'         => 'Flick',
 			'pepper-grinder' => 'Pepper Grinder',
-            'eggplant'      => 'Eggplant',
-            'dark-hive'     => 'Dark Hive',
-            'cupertino'     => 'Cupertino',
-            'south-street'  => 'South Street',
-            'blitzer'       => 'Blitzer',
-            'humanity'      => 'Humanity',
-            'hot-sneaks'    => 'Hot Sneaks',
-            'excite-bike'   => 'Excite Bike',
-            'vader'         => 'Vader',
-            'dot-luv'       => 'Dot Luv',
-            'mint-choc'     => 'Mint Choc',
-            'black-tie'     => 'Black Tie',
-            'trontastic'    => 'Trontastic',
-            'swanky-purse'  => 'Swanky Purse',
-        );
+			'eggplant'      => 'Eggplant',
+			'dark-hive'     => 'Dark Hive',
+			'cupertino'     => 'Cupertino',
+			'south-street'  => 'South Street',
+			'blitzer'       => 'Blitzer',
+			'humanity'      => 'Humanity',
+			'hot-sneaks'    => 'Hot Sneaks',
+			'excite-bike'   => 'Excite Bike',
+			'vader'         => 'Vader',
+			'dot-luv'       => 'Dot Luv',
+			'mint-choc'     => 'Mint Choc',
+			'black-tie'     => 'Black Tie',
+			'trontastic'    => 'Trontastic',
+			'swanky-purse'  => 'Swanky Purse',
+		);
 
 		$themes = apply_filters( 'frm_jquery_themes', $themes );
-        return $themes;
-    }
+		return $themes;
+	}
 
 	/**
 	 * @deprecated 3.02.03
 	 */
-    public static function enqueue_jquery_css() {
+	public static function enqueue_jquery_css() {
 		_deprecated_function( __FUNCTION__, '3.02.03', 'FrmProStylesController::enqueue_jquery_css' );
 
 		$form = self::get_form_for_page();
 		$theme_css = FrmStylesController::get_style_val( 'theme_css', $form );
-        if ( $theme_css != -1 ) {
+		if ( $theme_css != -1 ) {
 			wp_enqueue_style( 'jquery-theme', self::jquery_css_url( $theme_css ), array(), FrmAppHelper::plugin_version() );
-        }
-    }
+		}
+	}
 
 	/**
 	 * @deprecated 3.02.03
@@ -691,26 +691,26 @@ 
 	public static function jquery_css_url( $theme_css ) {
 		_deprecated_function( __FUNCTION__, '3.02.03', 'FrmProStylesController::jquery_css_url' );
 
-        if ( $theme_css == -1 ) {
-            return;
-        }
+		if ( $theme_css == -1 ) {
+			return;
+		}
 
-        if ( ! $theme_css || $theme_css == '' || $theme_css == 'ui-lightness' ) {
-            $css_file = FrmAppHelper::plugin_url() . '/css/ui-lightness/jquery-ui.css';
+		if ( ! $theme_css || $theme_css == '' || $theme_css == 'ui-lightness' ) {
+			$css_file = FrmAppHelper::plugin_url() . '/css/ui-lightness/jquery-ui.css';
 		} elseif ( preg_match( '/^http.?:\/\/.*\..*$/', $theme_css ) ) {
-            $css_file = $theme_css;
-        } else {
-            $uploads = FrmStylesHelper::get_upload_base();
+			$css_file = $theme_css;
+		} else {
+			$uploads = FrmStylesHelper::get_upload_base();
 			$file_path = '/formidable/css/' . $theme_css . '/jquery-ui.css';
 			if ( file_exists( $uploads['basedir'] . $file_path ) ) {
-                $css_file = $uploads['baseurl'] . $file_path;
-            } else {
+				$css_file = $uploads['baseurl'] . $file_path;
+			} else {
 				$css_file = FrmAppHelper::jquery_ui_base_url() . '/themes/' . $theme_css . '/jquery-ui.min.css';
-            }
-        }
+			}
+		}
 
-        return $css_file;
-    }
+		return $css_file;
+	}
 
 	/**
 	 * @deprecated 3.02.03

Spacing +3 added lines, -3 removed lines

@@ -343,8 +343,8 @@ 
 		$path = untrailingslashit( trim( $path ) );
 		$templates = glob( $path . '/*.php' );
 
-		for ( $i = count( $templates ) - 1; $i >= 0; $i-- ) {
-			$filename = str_replace( '.php', '', str_replace( $path . '/', '', $templates[ $i ] ) );
+		for ( $i = count( $templates ) - 1; $i >= 0; $i -- ) {
+			$filename = str_replace( '.php', '', str_replace( $path . '/', '', $templates[$i] ) );
 			$template_query = array( 'form_key' => $filename );
 			if ( $template ) {
 				$template_query['is_template'] = 1;
@@ -362,7 +362,7 @@ 
 				$values['default_template'] = 1;
 			}
 
-			include( $templates[ $i ] );
+			include( $templates[$i] );
 
 			//get updated form
 			if ( isset( $form ) && ! empty( $form ) ) {

deprecated/FrmEDD_SL_Plugin_Updater.php

Doc Comments +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
 	 * @uses api_request()
 	 *
 	 * @param array   $_transient_data Update array build by WordPress.
-	 * @return array Modified update array with custom plugin data.
+	 * @return stdClass Modified update array with custom plugin data.
 	 */
 	public function check_update( $_transient_data ) {
 
@@ -219,7 +219,7 @@ 
 	 *
 	 * @param string  $_action The requested action.
 	 * @param array   $_data   Parameters for the API action.
-	 * @return false|object
+	 * @return string
 	 */
 	private function api_request( $_action, $_data ) {
 

Spacing +7 added lines, -7 removed lines

@@ -44,7 +44,7 @@ 
 		$this->beta        = ! empty( $this->api_data['beta'] ) ? true : false;
 		$this->cache_key   = md5( serialize( $this->slug . $this->version . $this->api_data['license'] . $this->beta ) );
 
-		$frm_edd_plugin_data[ $this->slug ] = $this->api_data;
+		$frm_edd_plugin_data[$this->slug] = $this->api_data;
 
 		/**
 		 * Fires after the $frm_edd_plugin_data is setup.
@@ -93,7 +93,7 @@ 
 			$_transient_data = new stdClass;
 		}
 
-		if ( ! empty( $_transient_data->response ) && ! empty( $_transient_data->response[ $this->name ] ) && false === $this->wp_override ) {
+		if ( ! empty( $_transient_data->response ) && ! empty( $_transient_data->response[$this->name] ) && false === $this->wp_override ) {
 			return $_transient_data;
 		}
 
@@ -117,12 +117,12 @@ 
 					$version_info->plugin = $this->name;
 				}
 
-				$_transient_data->response[ $this->name ] = $version_info;
+				$_transient_data->response[$this->name] = $version_info;
 
 			}
 
 			$_transient_data->last_checked           = time();
-			$_transient_data->checked[ $this->name ] = $this->version;
+			$_transient_data->checked[$this->name] = $this->version;
 
 		}
 
@@ -186,7 +186,7 @@ 
 		if ( isset( $_data->sections ) && ! is_array( $_data->sections ) ) {
 			$new_sections = array();
 			foreach ( $_data->sections as $key => $value ) {
-				$new_sections[ $key ] = $value;
+				$new_sections[$key] = $value;
 			}
 
 			$_data->sections = $new_sections;
@@ -196,7 +196,7 @@ 
 		if ( isset( $_data->banners ) && ! is_array( $_data->banners ) ) {
 			$new_banners = array();
 			foreach ( $_data->banners as $key => $value ) {
-				$new_banners[ $key ] = $value;
+				$new_banners[$key] = $value;
 			}
 
 			$_data->banners = $new_banners;
@@ -310,7 +310,7 @@ 
 		}
 
 		$slug         = sanitize_text_field( $_REQUEST['slug'] ); // WPCS: CSRF ok.
-		$data         = $frm_edd_plugin_data[ $slug ];
+		$data         = $frm_edd_plugin_data[$slug];
 		$beta         = ! empty( $data['beta'] ) ? true : false;
 		$cache_key    = md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_' . $beta . '_version_info' ); // WPCS: CSRF ok.
 		$version_info = $this->get_cached_version_info( $cache_key );

Braces +4 added lines, -2 removed lines

@@ -297,11 +297,13 @@
 
 		global $frm_edd_plugin_data;
 
-		if ( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' !== $_REQUEST['edd_sl_action'] ) { // WPCS: CSRF ok.
+		if ( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' !== $_REQUEST['edd_sl_action'] ) {
+// WPCS: CSRF ok.
 			return;
 		}
 
-		if ( empty( $_REQUEST['plugin'] ) || empty( $_REQUEST['slug'] ) ) { // WPCS: CSRF ok.
+		if ( empty( $_REQUEST['plugin'] ) || empty( $_REQUEST['slug'] ) ) {
+// WPCS: CSRF ok.
 			return;
 		}
 

deprecated/FrmEntryFormat.php

Doc Comments +1 added lines

@@ -151,6 +151,7 @@
 
 	/**
 	 * @deprecated 2.04
+	 * @param string $val
 	 */
 	private static function get_field_value( $atts, &$val ) {
 		_deprecated_function( __FUNCTION__, '2.04', 'instance of FrmEntryValues or FrmProEntryValues' );

Spacing +8 added lines, -8 removed lines

@@ -98,15 +98,15 @@ 
 		self::prepare_field_output( $atts, $val );
 
 		if ( $atts['format'] != 'text' ) {
-			$values[ $f->field_key ] = $val;
+			$values[$f->field_key] = $val;
 			if ( $atts['entry'] && $f->type != 'textarea' ) {
-				$prev_val = maybe_unserialize( $atts['entry']->metas[ $f->id ] );
+				$prev_val = maybe_unserialize( $atts['entry']->metas[$f->id] );
 				if ( $prev_val != $val ) {
-					$values[ $f->field_key . '-value' ] = $prev_val;
+					$values[$f->field_key . '-value'] = $prev_val;
 				}
 			}
 		} else {
-			$values[ $f->id ] = array(
+			$values[$f->id] = array(
 				'label' => $f->name,
 				'val'   => $val,
 				'type'  => $f->type,
@@ -120,9 +120,9 @@ 
 	private static function fill_missing_fields( $atts, &$values ) {
 		_deprecated_function( __FUNCTION__, '2.04', 'instance of FrmEntryValues or FrmProEntryValues' );
 
-		if ( $atts['entry'] && ! isset( $atts['entry']->metas[ $atts['field']->id ] ) ) {
+		if ( $atts['entry'] && ! isset( $atts['entry']->metas[$atts['field']->id] ) ) {
 			// In case include_blank is set
-			$atts['entry']->metas[ $atts['field']->id ] = '';
+			$atts['entry']->metas[$atts['field']->id] = '';
 			$atts['entry'] = apply_filters( 'frm_prepare_entry_content', $atts['entry'], array( 'field' => $atts['field'] ) );
 			self::fill_values_from_entry( $atts, $values );
 		}
@@ -150,7 +150,7 @@ 
 			'type'  => $f->type,
 		);
 
-		$values[ $f->id ] = apply_filters( 'frm_field_shortcodes_for_default_html_email', $field_shortcodes, $f );
+		$values[$f->id] = apply_filters( 'frm_field_shortcodes_for_default_html_email', $field_shortcodes, $f );
 	}
 
 	/**
@@ -161,7 +161,7 @@ 
 
 		$f = $atts['field'];
 		if ( $atts['entry'] ) {
-			$prev_val = maybe_unserialize( $atts['entry']->metas[ $f->id ] );
+			$prev_val = maybe_unserialize( $atts['entry']->metas[$f->id] );
 			$meta = array(
 				'item_id'    => $atts['id'],
 				'field_id'   => $f->id,

deprecated/FrmPointers.php

Doc Comments +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 	/**
 	 * Get the singleton instance of this class
 	 *
-	 * @return object
+	 * @return FrmPointers
 	 */
 	public static function get_instance() {
 		_deprecated_function( __FUNCTION__, '3.01.03' );

classes/models/FrmAddon.php

Spacing +15 added lines, -15 removed lines

@@ -41,15 +41,15 @@ 
 	}
 
 	public function insert_installed_addon( $plugins ) {
-		$plugins[ $this->plugin_slug ] = $this;
+		$plugins[$this->plugin_slug] = $this;
 		return $plugins;
 	}
 
 	public static function get_addon( $plugin_slug ) {
 		$plugins = apply_filters( 'frm_installed_addons', array() );
 		$plugin = false;
-		if ( isset( $plugins[ $plugin_slug ] ) ) {
-			$plugin = $plugins[ $plugin_slug ];
+		if ( isset( $plugins[$plugin_slug] ) ) {
+			$plugin = $plugins[$plugin_slug];
 		}
 		return $plugin;
 	}
@@ -105,7 +105,7 @@ 
 			);
 		} else {
 			$plugins = FrmAddonsController::get_addon_info( $this->license );
-			$_data = $plugins[ $item_id ];
+			$_data = $plugins[$item_id];
 		}
 
 		$_data['sections'] = array(
@@ -272,19 +272,19 @@ 
 
 		if ( $this->is_current_version( $transient ) ) {
 			//make sure it doesn't show there is an update if plugin is up-to-date
-			if ( isset( $transient->response[ $this->plugin_folder ] ) ) {
-				unset( $transient->response[ $this->plugin_folder ] );
+			if ( isset( $transient->response[$this->plugin_folder] ) ) {
+				unset( $transient->response[$this->plugin_folder] );
 			}
-		} elseif ( isset( $transient->response ) && isset( $transient->response[ $this->plugin_folder ] ) ) {
-			$this->prepare_update_details( $transient->response[ $this->plugin_folder ] );
+		} elseif ( isset( $transient->response ) && isset( $transient->response[$this->plugin_folder] ) ) {
+			$this->prepare_update_details( $transient->response[$this->plugin_folder] );
 
 			// if the transient has expired, clear the update and trigger it again
-			if ( $transient->response[ $this->plugin_folder ] === false ) {
+			if ( $transient->response[$this->plugin_folder] === false ) {
 				if ( ! $this->has_been_cleared() ) {
 					$this->cleared_plugins();
 					$this->manually_queue_update();
 				}
-				unset( $transient->response[ $this->plugin_folder ] );
+				unset( $transient->response[$this->plugin_folder] );
 			}
 		}
 
@@ -365,13 +365,13 @@ 
 			$version_info->new_version = $version_info->beta['version'];
 			$version_info->package     = $version_info->beta['package'];
 			if ( isset( $version_info->plugin ) && ! empty( $version_info->plugin ) ) {
-				$version_info->plugin  = $version_info->beta['plugin'];
+				$version_info->plugin = $version_info->beta['plugin'];
 			}
 		}
 	}
 
 	private function is_current_version( $transient ) {
-		if ( empty( $transient->checked ) || ! isset( $transient->checked[ $this->plugin_folder ] ) ) {
+		if ( empty( $transient->checked ) || ! isset( $transient->checked[$this->plugin_folder] ) ) {
 			return false;
 		}
 
@@ -380,7 +380,7 @@ 
 			return true;
 		}
 
-		return isset( $transient->response ) && isset( $transient->response[ $this->plugin_folder ] ) && $transient->checked[ $this->plugin_folder ] === $transient->response[ $this->plugin_folder ]->new_version;
+		return isset( $transient->response ) && isset( $transient->response[$this->plugin_folder] ) && $transient->checked[$this->plugin_folder] === $transient->response[$this->plugin_folder]->new_version;
 	}
 
 	private function has_been_cleared() {
@@ -460,8 +460,8 @@ 
 			$response['message'] = $response['status'];
 		} else {
 			$messages = $this->get_messages();
-			if ( is_string( $response['status'] ) && isset( $messages[ $response['status'] ] ) ) {
-				$response['message'] = $messages[ $response['status'] ];
+			if ( is_string( $response['status'] ) && isset( $messages[$response['status']] ) ) {
+				$response['message'] = $messages[$response['status']];
 			} else {
 				$response['message'] = FrmAppHelper::kses( $response['status'], array( 'a' ) );
 			}

Braces +4 added lines, -2 removed lines

@@ -306,7 +306,8 @@ 
 
 		if ( isset( $version_info->new_version ) && ! empty( $version_info->new_version ) ) {
 			$this->clear_old_plugin_version( $version_info );
-			if ( $version_info === false ) { // was cleared with timeout
+			if ( $version_info === false ) {
+// was cleared with timeout
 				$transient = false;
 			} else {
 				$this->maybe_use_beta_url( $version_info );
@@ -393,7 +394,8 @@ 
 	}
 
 	private function is_license_revoked() {
-		if ( empty( $this->license ) || empty( $this->plugin_slug ) || isset( $_POST['license'] ) ) { // WPCS: CSRF ok.
+		if ( empty( $this->license ) || empty( $this->plugin_slug ) || isset( $_POST['license'] ) ) {
+// WPCS: CSRF ok.
 			return;
 		}
 

Doc Comments +6 added lines

@@ -222,6 +222,9 @@ 
 		$this->delete_cache();
 	}
 
+	/**
+	 * @param string|false $is_active
+	 */
 	public function set_active( $is_active ) {
 		update_option( $this->option_name . 'active', $is_active );
 		$this->delete_cache();
@@ -560,6 +563,9 @@ 
 		wp_die();
 	}
 
+	/**
+	 * @param string $action
+	 */
 	public function send_mothership_request( $action ) {
 		$api_params = array(
 			'edd_action' => $action,

classes/controllers/FrmHooksController.php

Indentation +131 added lines, -131 removed lines

@@ -2,86 +2,86 @@ 
 
 class FrmHooksController {
 
-    /**
-     * Trigger plugin-wide hook loading
-     */
-    public static function trigger_load_hook( $hooks = 'load_hooks' ) {
-        $controllers = apply_filters( 'frm_load_controllers', array( 'FrmHooksController' ) );
-
-        $trigger_hooks = $hooks;
-        $hooks = (array) $hooks;
-
-        if ( 'load_hooks' == $trigger_hooks ) {
-            if ( is_admin() ) {
-                $hooks[] = 'load_admin_hooks';
-                if ( defined( 'DOING_AJAX' ) ) {
-                    $hooks[] = 'load_ajax_hooks';
-                    $hooks[] = 'load_form_hooks';
-                }
-            }
-
-            if ( is_multisite() ) {
-                $hooks[] = 'load_multisite_hooks';
-            }
-        } else {
-            // Make sure the hooks are only triggered once
-            add_filter( 'frm' . str_replace( 'load', '', $trigger_hooks ) . '_loaded', '__return_true' );
-        }
-        unset( $trigger_hooks );
-
-        // Instansiate Controllers
-        foreach ( $controllers as $c ) {
-            foreach ( $hooks as $hook ) {
+	/**
+	 * Trigger plugin-wide hook loading
+	 */
+	public static function trigger_load_hook( $hooks = 'load_hooks' ) {
+		$controllers = apply_filters( 'frm_load_controllers', array( 'FrmHooksController' ) );
+
+		$trigger_hooks = $hooks;
+		$hooks = (array) $hooks;
+
+		if ( 'load_hooks' == $trigger_hooks ) {
+			if ( is_admin() ) {
+				$hooks[] = 'load_admin_hooks';
+				if ( defined( 'DOING_AJAX' ) ) {
+					$hooks[] = 'load_ajax_hooks';
+					$hooks[] = 'load_form_hooks';
+				}
+			}
+
+			if ( is_multisite() ) {
+				$hooks[] = 'load_multisite_hooks';
+			}
+		} else {
+			// Make sure the hooks are only triggered once
+			add_filter( 'frm' . str_replace( 'load', '', $trigger_hooks ) . '_loaded', '__return_true' );
+		}
+		unset( $trigger_hooks );
+
+		// Instansiate Controllers
+		foreach ( $controllers as $c ) {
+			foreach ( $hooks as $hook ) {
 				call_user_func( array( $c, $hook ) );
 				unset( $hook );
-            }
+			}
 			unset( $c );
-        }
+		}
 
-    }
+	}
 
-    public static function trigger_load_form_hooks() {
-        self::trigger_load_hook( 'load_form_hooks' );
-    }
+	public static function trigger_load_form_hooks() {
+		self::trigger_load_hook( 'load_form_hooks' );
+	}
 
 	public static function load_hooks() {
 		add_action( 'rest_api_init', 'FrmAppController::create_rest_routes', 0 );
-        add_action( 'plugins_loaded', 'FrmAppController::load_lang' );
+		add_action( 'plugins_loaded', 'FrmAppController::load_lang' );
 		add_filter( 'widget_text', 'do_shortcode' );
 
-        // Entries controller
-        add_action( 'wp_loaded', 'FrmEntriesController::process_entry', 10, 0 );
-        add_action( 'frm_after_entry_processed', 'FrmEntriesController::delete_entry_after_save', 100 );
+		// Entries controller
+		add_action( 'wp_loaded', 'FrmEntriesController::process_entry', 10, 0 );
+		add_action( 'frm_after_entry_processed', 'FrmEntriesController::delete_entry_after_save', 100 );
 
-        // Form Actions Controller
-        add_action( 'init', 'FrmFormActionsController::register_post_types', 1 );
+		// Form Actions Controller
+		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' );
+		// Forms Controller
+		add_action( 'widgets_init', 'FrmFormsController::register_widgets' );
 		add_action( 'init', 'FrmFormsController::front_head' );
-        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_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_footer', 'FrmFormsController::footer_js', 1, 0 );
 
 		add_action( 'wp_scheduled_delete', 'FrmForm::scheduled_delete' );
 
-        // Form Shortcodes
-        add_shortcode( 'formidable', 'FrmFormsController::get_form_shortcode' );
+		// Form Shortcodes
+		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' );
-    }
+		// 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' );
+	}
 
 	public static function load_admin_hooks() {
-        add_action( 'admin_menu', 'FrmAppController::menu', 1 );
+		add_action( 'admin_menu', 'FrmAppController::menu', 1 );
 		add_filter( 'admin_body_class', 'FrmAppController::add_admin_class', 999 );
-        add_action( 'admin_enqueue_scripts', 'FrmAppController::load_wp_admin_style' );
-        add_action( 'admin_notices', 'FrmAppController::pro_get_started_headline' );
+		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 );
 		add_filter( 'plugin_action_links_' . FrmAppHelper::plugin_folder() . '/formidable.php', 'FrmAppController::settings_link' );
 		add_filter( 'admin_footer_text', 'FrmAppController::set_footer_text' );
@@ -90,117 +90,117 @@ 
 		add_action( 'admin_menu', 'FrmAddonsController::menu', 100 );
 		add_filter( 'pre_set_site_transient_update_plugins', 'FrmAddonsController::check_update' );
 
-        // 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 );
-
-        // Form Actions Controller
-        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 );
-
-        // Forms Controller
-        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' );
+		// 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 );
+
+		// Form Actions Controller
+		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 );
+
+		// Forms Controller
+		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_action( 'media_buttons', 'FrmFormsController::insert_form_button' );
 		add_action( 'et_pb_admin_excluded_shortcodes', 'FrmFormsController::prevent_divi_conflict' );
 
-        // Forms Model
-        add_action( 'frm_after_duplicate_form', 'FrmForm::after_duplicate', 10, 2 );
+		// Forms Model
+		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' );
+		// Settings Controller
+		add_action( 'admin_menu', 'FrmSettingsController::menu', 45 );
+		add_action( 'frm_before_settings', 'FrmSettingsController::license_box' );
 		add_action( 'frm_after_settings', 'FrmSettingsController::settings_cta' );
 		add_action( 'wp_ajax_frm_settings_tab', 'FrmSettingsController::load_settings_tab' );
 
-        // Styles Controller
-        add_action( 'admin_menu', 'FrmStylesController::menu', 14 );
-        add_action( 'admin_init', 'FrmStylesController::admin_init' );
+		// Styles Controller
+		add_action( 'admin_menu', 'FrmStylesController::menu', 14 );
+		add_action( 'admin_init', 'FrmStylesController::admin_init' );
 
-        // XML Controller
-        add_action( 'admin_menu', 'FrmXMLController::menu', 41 );
-    }
+		// XML Controller
+		add_action( 'admin_menu', 'FrmXMLController::menu', 41 );
+	}
 
 	public static function load_ajax_hooks() {
 		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' );
 
 		// Addons
 		add_action( 'wp_ajax_frm_addon_activate', 'FrmAddon::activate' );
 		add_action( 'wp_ajax_frm_addon_deactivate', 'FrmAddon::deactivate' );
 		add_action( 'wp_ajax_frm_install_addon', 'FrmAddonsController::ajax_install_addon' );
 
-        // 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_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_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' );
-
-        // Forms Controller
+		// 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_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_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' );
+
+		// 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_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' );
 
 		// Settings
 		add_action( 'wp_ajax_frm_lite_settings_upgrade', 'FrmSettingsController::settings_cta_dismiss' );
 
-        // 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' );
+		// 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_frmpro_css', 'FrmStylesController::load_saved_css' );
 		add_action( 'wp_ajax_nopriv_frmpro_css', 'FrmStylesController::load_saved_css' );
 
-        // XML Controller
+		// XML Controller
 		add_action( 'wp_ajax_frm_entries_csv', 'FrmXMLController::csv' );
 		add_action( 'wp_ajax_nopriv_frm_entries_csv', 'FrmXMLController::csv' );
-        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' );
+		// 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' );
 
 		// Forms Controller
 		add_filter( 'frm_form_classes', 'FrmFormsController::form_classes' );
 
-        // Styles Controller
-        add_filter( 'frm_use_important_width', 'FrmStylesController::important_style', 10, 2 );
-    }
+		// Styles Controller
+		add_filter( 'frm_use_important_width', 'FrmStylesController::important_style', 10, 2 );
+	}
 
 	public static function load_view_hooks() {
-        // Hooks go here when a view is loaded
-    }
+		// Hooks go here when a view is loaded
+	}
 
 	public static function load_multisite_hooks() {
 		add_action( 'wpmu_upgrade_site', 'FrmAppController::network_upgrade_site' );
 
-        // drop tables when mu site is deleted
-        add_filter( 'wpmu_drop_tables', 'FrmAppController::drop_tables' );
-    }
+		// drop tables when mu site is deleted
+		add_filter( 'wpmu_drop_tables', 'FrmAppController::drop_tables' );
+	}
 }

classes/models/FrmReviews.php

Doc Comments -1 removed lines

@@ -62,7 +62,6 @@
 	 * Maybe show review request
 	 *
 	 * @since 3.04.03
-	 * @param int $asked
 	 */
 	private function review() {
 

Spacing +2 added lines, -2 removed lines

@@ -70,12 +70,12 @@
 		$show_intervals = array( 50, 200, 500 );
 		$asked = $this->review_status['asked'];
 
-		if ( ! isset( $show_intervals[ $asked ] ) ) {
+		if ( ! isset( $show_intervals[$asked] ) ) {
 			return;
 		}
 
 		$entries = FrmEntry::getRecordCount();
-		$count   = $show_intervals[ $asked ];
+		$count   = $show_intervals[$asked];
 		$user    = wp_get_current_user();
 
 		// Only show review request if the site has collected enough entries