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;
 		}
 	}
 

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 +5 added lines, -5 removed lines

@@ -24,7 +24,7 @@ 
 		FrmAppHelper::permission_check( 'frm_edit_forms' );
 
 		$action = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action';
-		$action = empty( $values ) ? FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' ) : $values[ $action ];
+		$action = empty( $values ) ? FrmAppHelper::get_param( $action, '', 'get', 'sanitize_title' ) : $values[$action];
 
 		if ( $action === 'create' ) {
 			FrmFormsController::update( $values );
@@ -32,7 +32,7 @@ 
 		}
 
 		$values = FrmFormsHelper::setup_new_vars( $values );
-		$id   = FrmForm::create( $values );
+		$id = FrmForm::create( $values );
 		$values['id'] = $id;
 
 		FrmFormsController::edit( $values );
@@ -457,8 +457,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;
@@ -473,7 +473,7 @@ 
 			$values['is_template'] = $template;
 			$values['status'] = 'published';
 
-			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 ) {
 

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;
 		}
 

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;
 		}
 
@@ -120,12 +120,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;
 
 		}
 
@@ -189,7 +189,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;
@@ -199,7 +199,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;
@@ -316,7 +316,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 );

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

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;
 		}
 

Spacing +14 added lines, -14 removed lines

@@ -41,7 +41,7 @@ 
 	}
 
 	public function insert_installed_addon( $plugins ) {
-		$plugins[ $this->plugin_slug ] = $this;
+		$plugins[$this->plugin_slug] = $this;
 
 		return $plugins;
 	}
@@ -49,8 +49,8 @@ 
 	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;
@@ -109,7 +109,7 @@ 
 		} else {
 			$api     = new FrmFormApi( $this->license );
 			$plugins = $api->get_api_info();
-			$_data   = $plugins[ $item_id ];
+			$_data   = $plugins[$item_id];
 		}
 
 		$_data['sections'] = array(
@@ -301,19 +301,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] );
 			}
 		}
 
@@ -401,7 +401,7 @@ 
 	}
 
 	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;
 		}
 
@@ -410,7 +410,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() {
@@ -491,8 +491,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' ) );
 			}

Doc Comments +8 added lines

@@ -234,6 +234,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();
@@ -352,6 +355,7 @@ 
 	 * Get the API info for this plugin
 	 *
 	 * @since 3.04.03
+	 * @param string $license
 	 */
 	protected function get_api_info( $license ) {
 		$api   = new FrmFormApi( $license );
@@ -483,6 +487,7 @@ 
 
 	/**
 	 * @since 4.08
+	 * @param string $license
 	 */
 	public static function activate_license_for_plugin( $license, $plugin_slug ) {
 		$this_plugin = self::get_addon( $plugin_slug );
@@ -619,6 +624,9 @@ 
 		return $this_plugin;
 	}
 
+	/**
+	 * @param string $action
+	 */
 	public function send_mothership_request( $action ) {
 		$api_params = array(
 			'edd_action' => $action,

classes/models/FrmFormApi.php

Spacing +3 added lines, -3 removed lines

@@ -77,7 +77,7 @@ 
 					}
 					$cats = array_intersect( $this->skip_categories(), $addon['categories'] );
 					if ( ! empty( $cats ) ) {
-						unset( $addons[ $k ] );
+						unset( $addons[$k] );
 					}
 				}
 
@@ -119,8 +119,8 @@ 
 					return $addon;
 				}
 			}
-		} elseif ( isset( $addons[ $download_id ] ) ) {
-			$plugin = $addons[ $download_id ];
+		} elseif ( isset( $addons[$download_id] ) ) {
+			$plugin = $addons[$download_id];
 		}
 
 		return $plugin;

classes/models/fields/FrmFieldType.php

Doc Comments +9 added lines

@@ -299,6 +299,9 @@ 
 		return $this->alter_builder_classes( $classes );
 	}
 
+	/**
+	 * @param string $classes
+	 */
 	protected function alter_builder_classes( $classes ) {
 		return $classes;
 	}
@@ -493,6 +496,11 @@ 
 		return $html;
 	}
 
+	/**
+	 * @param string $html
+	 *
+	 * @return string
+	 */
 	protected function after_replace_html_shortcodes( $args, $html ) {
 		return $html;
 	}
@@ -788,6 +796,7 @@ 
 	 * Link input to field description for screen readers
 	 *
 	 * @since 3.0
+	 * @param string $input_html
 	 */
 	protected function add_aria_description( $args, &$input_html ) {
 		$describedby = '';

Spacing +20 added lines, -20 removed lines

@@ -132,8 +132,8 @@ 
 		$field_val = '';
 		if ( is_object( $this->field ) ) {
 			$field_val = $this->field->{$column};
-		} elseif ( is_array( $this->field ) && isset( $this->field[ $column ] ) ) {
-			$field_val = $this->field[ $column ];
+		} elseif ( is_array( $this->field ) && isset( $this->field[$column] ) ) {
+			$field_val = $this->field[$column];
 		}
 
 		return $field_val;
@@ -147,7 +147,7 @@ 
 		if ( is_object( $this->field ) ) {
 			$this->field->{$column} = $value;
 		} elseif ( is_array( $this->field ) ) {
-			$this->field[ $column ] = $value;
+			$this->field[$column] = $value;
 		}
 	}
 
@@ -469,7 +469,7 @@ 
 			printf(
 				/* translators: %s: Field type */
 				esc_html__( '%s Options', 'formidable' ),
-				esc_html( $all_field_types[ $args['display']['type'] ]['name'] )
+				esc_html( $all_field_types[$args['display']['type']]['name'] )
 			);
 			?>
 			<i class="frm_icon_font frm_arrowdown6_icon"></i>
@@ -592,8 +592,8 @@ 
 		$fields = FrmField::field_selection();
 		$fields = array_merge( $fields, FrmField::pro_field_selection() );
 
-		if ( isset( $fields[ $this->type ] ) ) {
-			$name = is_array( $fields[ $this->type ] ) ? $fields[ $this->type ]['name'] : $fields[ $this->type ];
+		if ( isset( $fields[$this->type] ) ) {
+			$name = is_array( $fields[$this->type] ) ? $fields[$this->type]['name'] : $fields[$this->type];
 		}
 
 		return $name;
@@ -604,7 +604,7 @@ 
 	}
 
 	public function get_default_field_options() {
-		$opts       = array(
+		$opts = array(
 			'size'               => '',
 			'max'                => '',
 			'label'              => '',
@@ -942,7 +942,7 @@ 
 			}
 		} else {
 			$args['save_array'] = $this->is_readonly_array();
-			$hidden             .= $this->show_single_hidden( $selected_value, $args );
+			$hidden .= $this->show_single_hidden( $selected_value, $args );
 		}
 
 		return $hidden;
@@ -951,7 +951,7 @@ 
 	protected function show_single_hidden( $selected, $args ) {
 		if ( $args['save_array'] ) {
 			$args['field_name'] .= '[]';
-			$id                 = '';
+			$id = '';
 		} else {
 			$id = ' id="' . esc_attr( $args['html_id'] ) . '"';
 		}
@@ -967,8 +967,8 @@ 
 		$selected = $values['field_value'];
 
 		if ( isset( $values['combo_name'] ) ) {
-			$options  = $options[ $values['combo_name'] ];
-			$selected = ( is_array( $selected ) && isset( $selected[ $values['combo_name'] ] ) ) ? $selected[ $values['combo_name'] ] : '';
+			$options  = $options[$values['combo_name']];
+			$selected = ( is_array( $selected ) && isset( $selected[$values['combo_name']] ) ) ? $selected[$values['combo_name']] : '';
 		}
 
 		$input = $this->select_tag( $values );
@@ -1019,7 +1019,7 @@ 
 	}
 
 	protected function fill_display_field_values( $args = array() ) {
-		$defaults        = array(
+		$defaults = array(
 			'field_name'    => 'item_meta[' . $this->get_field_column( 'id' ) . ']',
 			'field_id'      => $this->get_field_column( 'id' ),
 			'field_plus_id' => '',
@@ -1057,7 +1057,7 @@ 
 			$describedby = 'frm_desc_' . $args['html_id'];
 		}
 
-		if ( isset( $args['errors'][ 'field' . $args['field_id'] ] ) ) {
+		if ( isset( $args['errors']['field' . $args['field_id']] ) ) {
 			$describedby .= ' frm_error_' . $args['html_id'];
 		}
 
@@ -1116,11 +1116,11 @@ 
 
 		$field_id = $this->get_field_column( 'id' );
 		if ( ! array_key_exists( $field_id, $frm_validated_unique_values ) ) {
-			$frm_validated_unique_values[ $field_id ] = array();
+			$frm_validated_unique_values[$field_id] = array();
 			return false;
 		}
 
-		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[ $field_id ], true );
+		$already_validated_this_value = in_array( $value, $frm_validated_unique_values[$field_id], true );
 		return $already_validated_this_value;
 	}
 
@@ -1145,7 +1145,7 @@ 
 	private function value_validated_as_unique( $value ) {
 		global $frm_validated_unique_values;
 		$field_id                                   = $this->get_field_column( 'id' );
-		$frm_validated_unique_values[ $field_id ][] = $value;
+		$frm_validated_unique_values[$field_id][] = $value;
 	}
 
 	public function get_value_to_save( $value, $atts ) {
@@ -1177,8 +1177,8 @@ 
 		$value = $this->prepare_display_value( $value, $atts );
 
 		if ( is_array( $value ) ) {
-			if ( isset( $atts['show'] ) && $atts['show'] && isset( $value[ $atts['show'] ] ) ) {
-				$value = $value[ $atts['show'] ];
+			if ( isset( $atts['show'] ) && $atts['show'] && isset( $value[$atts['show']] ) ) {
+				$value = $value[$atts['show']];
 			} elseif ( ! isset( $atts['return_array'] ) || ! $atts['return_array'] ) {
 				$sep   = isset( $atts['sep'] ) ? $atts['sep'] : ', ';
 				$value = implode( $sep, $value );
@@ -1247,8 +1247,8 @@ 
 		$saved_entries = $atts['ids'];
 		$new_value     = array();
 		foreach ( (array) $value as $old_child_id ) {
-			if ( isset( $saved_entries[ $old_child_id ] ) ) {
-				$new_value[] = $saved_entries[ $old_child_id ];
+			if ( isset( $saved_entries[$old_child_id] ) ) {
+				$new_value[] = $saved_entries[$old_child_id];
 			}
 		}
 

classes/models/FrmUsage.php

Doc Comments +2 added lines

@@ -147,6 +147,7 @@ 
 	 * Include the permissions settings for each capability.
 	 *
 	 * @since 3.06.04
+	 * @param FrmSettings $settings_list
 	 * @return array
 	 */
 	private function messages( $settings_list ) {
@@ -173,6 +174,7 @@ 
 	 * Include the permissions settings for each capability.
 	 *
 	 * @since 3.06.04
+	 * @param FrmSettings $settings_list
 	 * @return array
 	 */
 	private function permissions( $settings_list ) {

Spacing +7 added lines, -7 removed lines

@@ -139,7 +139,7 @@ 
 
 		foreach ( $pass_settings as $setting ) {
 			if ( isset( $settings_list->$setting ) ) {
-				$settings[ $setting ] = $this->maybe_json( $settings_list->$setting );
+				$settings[$setting] = $this->maybe_json( $settings_list->$setting );
 			}
 		}
 
@@ -171,7 +171,7 @@ 
 
 		$message_settings = array();
 		foreach ( $messages as $message ) {
-			$message_settings[ $message ] = $settings_list->$message;
+			$message_settings[$message] = $settings_list->$message;
 		}
 
 		return $message_settings;
@@ -189,7 +189,7 @@ 
 
 		foreach ( $frm_roles as $frm_role => $frm_role_description ) {
 			if ( isset( $settings_list->$frm_role ) ) {
-				$permissions[ $frm_role ] = $settings_list->$frm_role;
+				$permissions[$frm_role] = $settings_list->$frm_role;
 			}
 		}
 
@@ -256,8 +256,8 @@ 
 			);
 
 			foreach ( $settings as $setting ) {
-				if ( isset( $form->options[ $setting ] ) ) {
-					$new_form[ $setting ] = $this->maybe_json( $form->options[ $setting ] );
+				if ( isset( $form->options[$setting] ) ) {
+					$new_form[$setting] = $this->maybe_json( $form->options[$setting] );
 				}
 			}
 
@@ -308,7 +308,7 @@ 
 	 * @return array
 	 */
 	private function fields() {
-		$args   = array(
+		$args = array(
 			'limit'    => 50,
 			'order_by' => 'id DESC',
 		);
@@ -316,7 +316,7 @@ 
 		$fields = FrmDb::get_results( 'frm_fields', array(), 'form_id, name, type, field_options', $args );
 		foreach ( $fields as $k => $field ) {
 			FrmAppHelper::unserialize_or_decode( $field->field_options );
-			$fields[ $k ]->field_options = json_encode( $field->field_options );
+			$fields[$k]->field_options = json_encode( $field->field_options );
 		}
 		return $fields;
 	}