Strategy11 / formidable-forms

classes/controllers/FrmAddonsController.php

Spacing +13 added lines, -13 removed lines

@@ -74,7 +74,7 @@ 
 		} else {
 			foreach ( $addons as $k => $addon ) {
 				if ( empty( $addon['excerpt'] ) && $k !== 'error' ) {
-					unset( $addons[ $k ] );
+					unset( $addons[$k] );
 				}
 			}
 		}
@@ -170,7 +170,7 @@ 
 
 		foreach ( $list as $k => $info ) {
 			$info['slug'] = $k;
-			$list[ $k ]   = array_merge( $defaults, $info );
+			$list[$k]   = array_merge( $defaults, $info );
 		}
 		return $list;
 	}
@@ -349,16 +349,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;
 
 		}
 
@@ -381,7 +381,7 @@ 
 
 		$all_plugins = get_plugins();
 
-		return isset( $all_plugins[ $plugin ] );
+		return isset( $all_plugins[$plugin] );
 	}
 
 	/**
@@ -420,13 +420,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 = $api->get_api_info();
 
-				$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'],
 					);
@@ -520,8 +520,8 @@ 
 					return $addon;
 				}
 			}
-		} elseif ( isset( $addons[ $download_id ] ) ) {
-			$plugin = $addons[ $download_id ];
+		} elseif ( isset( $addons[$download_id] ) ) {
+			$plugin = $addons[$download_id];
 		}
 
 		return $plugin;
@@ -575,7 +575,7 @@ 
 			self::prepare_addon_link( $addon['link'] );
 
 			self::set_addon_status( $addon );
-			$addons[ $id ] = $addon;
+			$addons[$id] = $addon;
 		}
 	}
 
@@ -593,7 +593,7 @@ 
 			'utm_medium'   => 'addons',
 			'utm_campaign' => 'liteplugin',
 		);
-		$link       = add_query_arg( $query_args, $link );
+		$link = add_query_arg( $query_args, $link );
 	}
 
 	/**

Doc Comments +1 added lines, -4 removed lines

@@ -564,6 +564,7 @@ 
 
 	/**
 	 * @since 3.04.02
+	 * @param string $link
 	 */
 	protected static function prepare_addon_link( &$link ) {
 		$site_url = 'https://formidableforms.com/';
@@ -1100,10 +1101,6 @@ 
 	 * Render a conditional action button for an add on
 	 *
 	 * @since 4.09.01
-	 * @param array $addon
-	 * @param string|false $license_type
-	 * @param string $plan_required
-	 * @param string $upgrade_link
 	 */
 	public static function show_conditional_action_button( $atts ) {
 		if ( is_callable( 'FrmProAddonsController::show_conditional_action_button' ) ) {

classes/helpers/FrmCSVExportHelper.php

Spacing +38 added lines, -38 removed lines

@@ -40,7 +40,7 @@ 
 		self::print_file_headers( $filename );
 		unset( $filename );
 
-		$comment_count       = FrmDb::get_count(
+		$comment_count = FrmDb::get_count(
 			'frm_item_metas',
 			array(
 				'item_id'         => $atts['entry_ids'],
@@ -106,7 +106,7 @@ 
 	private static function prepare_csv_headings() {
 		$headings = array();
 		self::csv_headings( $headings );
-		$headings       = apply_filters(
+		$headings = apply_filters(
 			'frm_csv_columns',
 			$headings,
 			self::$form_id,
@@ -123,10 +123,10 @@ 
 		$field_headings  = array();
 		$separate_values = array( 'user_id', 'file', 'data', 'date' );
 		if ( isset( $col->field_options['separate_value'] ) && $col->field_options['separate_value'] && ! in_array( $col->type, $separate_values, true ) ) {
-			$field_headings[ $col->id . '_label' ] = strip_tags( $col->name . ' ' . __( '(label)', 'formidable' ) );
+			$field_headings[$col->id . '_label'] = strip_tags( $col->name . ' ' . __( '(label)', 'formidable' ) );
 		}
 
-		$field_headings[ $col->id ] = strip_tags( $col->name );
+		$field_headings[$col->id] = strip_tags( $col->name );
 		$field_headings             = apply_filters(
 			'frm_csv_field_columns',
 			$field_headings,
@@ -145,14 +145,14 @@ 
 		foreach ( self::$fields as $col ) {
 			if ( self::is_the_child_of_a_repeater( $col ) ) {
 				$repeater_id                           = $col->field_options['in_section'];
-				$headings[ 'repeater' . $repeater_id ] = array(); // set a placeholder to maintain order for repeater fields
+				$headings['repeater' . $repeater_id] = array(); // set a placeholder to maintain order for repeater fields
 
-				if ( ! isset( $fields_by_repeater_id[ $repeater_id ] ) ) {
-					$fields_by_repeater_id[ $repeater_id ] = array();
+				if ( ! isset( $fields_by_repeater_id[$repeater_id] ) ) {
+					$fields_by_repeater_id[$repeater_id] = array();
 					$repeater_ids[]                        = $repeater_id;
 				}
 
-				$fields_by_repeater_id[ $repeater_id ][] = $col;
+				$fields_by_repeater_id[$repeater_id][] = $col;
 			} else {
 				$headings += self::field_headings( $col );
 			}
@@ -169,8 +169,8 @@ 
 				$end    = strpos( $row->meta_value, ':{' );
 				$length = substr( $row->meta_value, $start, $end - $start );
 
-				if ( $length > $max[ $row->field_id ] ) {
-					$max[ $row->field_id ] = $length;
+				if ( $length > $max[$row->field_id] ) {
+					$max[$row->field_id] = $length;
 				}
 			}
 			unset( $start, $end, $length, $row, $repeater_meta, $where );
@@ -181,17 +181,17 @@ 
 					$repeater_id = str_replace( 'repeater', '', $key );
 
 					$repeater_headings = array();
-					foreach ( $fields_by_repeater_id[ $repeater_id ] as $col ) {
+					foreach ( $fields_by_repeater_id[$repeater_id] as $col ) {
 						$repeater_headings += self::field_headings( $col );
 					}
 
-					for ( $i = 0; $i < $max[ $repeater_id ]; $i ++ ) {
+					for ( $i = 0; $i < $max[$repeater_id]; $i ++ ) {
 						foreach ( $repeater_headings as $repeater_key => $repeater_name ) {
-							$flat[ $repeater_key . '[' . $i . ']' ] = $repeater_name;
+							$flat[$repeater_key . '[' . $i . ']'] = $repeater_name;
 						}
 					}
 				} else {
-					$flat[ $key ] = $heading;
+					$flat[$key] = $heading;
 				}
 			}
 			unset( $key, $heading, $max, $repeater_headings, $repeater_id );
@@ -202,9 +202,9 @@ 
 
 		if ( self::$comment_count ) {
 			for ( $i = 0; $i < self::$comment_count; $i ++ ) {
-				$headings[ 'comment' . $i ]            = __( 'Comment', 'formidable' );
-				$headings[ 'comment_user_id' . $i ]    = __( 'Comment User', 'formidable' );
-				$headings[ 'comment_created_at' . $i ] = __( 'Comment Date', 'formidable' );
+				$headings['comment' . $i]            = __( 'Comment', 'formidable' );
+				$headings['comment_user_id' . $i]    = __( 'Comment User', 'formidable' );
+				$headings['comment_created_at' . $i] = __( 'Comment Date', 'formidable' );
 			}
 			unset( $i );
 		}
@@ -247,7 +247,7 @@ 
 
 	private static function prepare_next_csv_rows( $next_set ) {
 		// order by parent_item_id so children will be first
-		$where   = array(
+		$where = array(
 			'or'             => 1,
 			'id'             => $next_set,
 			'parent_item_id' => $next_set,
@@ -292,30 +292,30 @@ 
 					continue;
 				}
 
-				if ( ! isset( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) {
-					$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = array();
-				} elseif ( ! is_array( $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] ) ) {
+				if ( ! isset( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) {
+					$entries[self::$entry->parent_item_id]->metas[$meta_id] = array();
+				} elseif ( ! is_array( $entries[self::$entry->parent_item_id]->metas[$meta_id] ) ) {
 					// if the data is here, it should be an array but if this field has collected data
 					// both while inside and outside of the repeating section, it's possible this is a string
-					$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ] = (array) $entries[ self::$entry->parent_item_id ]->metas[ $meta_id ];
+					$entries[self::$entry->parent_item_id]->metas[$meta_id] = (array) $entries[self::$entry->parent_item_id]->metas[$meta_id];
 				}
 
 				//add the repeated values
-				$entries[ self::$entry->parent_item_id ]->metas[ $meta_id ][] = $meta_value;
+				$entries[self::$entry->parent_item_id]->metas[$meta_id][] = $meta_value;
 			}
-			$entries[ self::$entry->parent_item_id ]->metas += self::$entry->metas;
+			$entries[self::$entry->parent_item_id]->metas += self::$entry->metas;
 		}
 
 		// add the embedded form id
-		if ( ! isset( $entries[ self::$entry->parent_item_id ]->embedded_fields ) ) {
-			$entries[ self::$entry->parent_item_id ]->embedded_fields = array();
+		if ( ! isset( $entries[self::$entry->parent_item_id]->embedded_fields ) ) {
+			$entries[self::$entry->parent_item_id]->embedded_fields = array();
 		}
-		$entries[ self::$entry->parent_item_id ]->embedded_fields[ self::$entry->id ] = self::$entry->form_id;
+		$entries[self::$entry->parent_item_id]->embedded_fields[self::$entry->id] = self::$entry->form_id;
 	}
 
 	private static function add_field_values_to_csv( &$row ) {
 		foreach ( self::$fields as $col ) {
-			$field_value = isset( self::$entry->metas[ $col->id ] ) ? self::$entry->metas[ $col->id ] : false;
+			$field_value = isset( self::$entry->metas[$col->id] ) ? self::$entry->metas[$col->id] : false;
 
 			FrmAppHelper::unserialize_or_decode( $field_value );
 			self::add_array_values_to_columns( $row, compact( 'col', 'field_value' ) );
@@ -340,15 +340,15 @@ 
 						'show_icon'         => false,
 						'entry_id'          => self::$entry->id,
 						'sep'               => self::$separator,
-						'embedded_field_id' => ( isset( self::$entry->embedded_fields ) && isset( self::$entry->embedded_fields[ self::$entry->id ] ) ) ? 'form' . self::$entry->embedded_fields[ self::$entry->id ] : 0,
+						'embedded_field_id' => ( isset( self::$entry->embedded_fields ) && isset( self::$entry->embedded_fields[self::$entry->id] ) ) ? 'form' . self::$entry->embedded_fields[self::$entry->id] : 0,
 					)
 				);
 
-				$row[ $col->id . '_label' ] = $sep_value;
+				$row[$col->id . '_label'] = $sep_value;
 				unset( $sep_value );
 			}
 
-			$row[ $col->id ] = $field_value;
+			$row[$col->id] = $field_value;
 
 			unset( $col, $field_value );
 		}
@@ -361,8 +361,8 @@ 
 		if ( is_array( $atts['field_value'] ) ) {
 			foreach ( $atts['field_value'] as $key => $sub_value ) {
 				$column_key = $atts['col']->id . '_' . $key;
-				if ( ! is_numeric( $key ) && isset( self::$headings[ $column_key ] ) ) {
-					$row[ $column_key ] = $sub_value;
+				if ( ! is_numeric( $key ) && isset( self::$headings[$column_key] ) ) {
+					$row[$column_key] = $sub_value;
 				}
 			}
 		}
@@ -386,18 +386,18 @@ 
 		$sep = '';
 
 		foreach ( self::$headings as $k => $heading ) {
-			if ( isset( $rows[ $k ] ) ) {
-				$row = $rows[ $k ];
+			if ( isset( $rows[$k] ) ) {
+				$row = $rows[$k];
 			} else {
 				$row = '';
 				// array indexed data is not at $rows[ $k ]
-				if ( $k[ strlen( $k ) - 1 ] === ']' ) {
+				if ( $k[strlen( $k ) - 1] === ']' ) {
 					$start = strrpos( $k, '[' );
 					$key   = substr( $k, 0, $start ++ );
 					$index = substr( $k, $start, strlen( $k ) - 1 - $start );
 
-					if ( isset( $rows[ $key ] ) && isset( $rows[ $key ][ $index ] ) ) {
-						$row = $rows[ $key ][ $index ];
+					if ( isset( $rows[$key] ) && isset( $rows[$key][$index] ) ) {
+						$row = $rows[$key][$index];
 					}
 
 					unset( $start, $key, $index );

classes/helpers/FrmEntriesListHelper.php

Spacing +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@ 
 			$s_query['it.form_id'] = $form_id;
 			$join_form_in_query    = false;
 		} else {
-			$s_query[]          = array(
+			$s_query[] = array(
 				'or'               => 1,
 				'parent_form_id'   => null,
 				'parent_form_id <' => 1,
@@ -56,7 +56,7 @@ 
 
 		if ( strpos( $orderby, 'meta' ) !== false ) {
 			$order_field_type = FrmField::get_type( str_replace( 'meta_', '', $orderby ) );
-			$orderby          .= in_array( $order_field_type, array( 'number', 'scale', 'star' ) ) ? '+0' : '';
+			$orderby .= in_array( $order_field_type, array( 'number', 'scale', 'star' ) ) ? '+0' : '';
 		}
 
 		$order = self::get_param(
@@ -189,7 +189,7 @@ 
 
 		$r = "<tr id='item-action-{$item->id}'$style>";
 
-		list( $columns, $hidden, , $primary ) = $this->get_column_info();
+		list( $columns, $hidden,, $primary ) = $this->get_column_info();
 		$action_col                           = false;
 		$action_columns                       = $this->get_action_columns();