Completed
Pull Request — master (#2326)
by
unknown
50s
created
classes/controllers/FrmEntriesController.php 1 patch
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -147,20 +147,20 @@  discard block
 block discarded – undo
147 147
 		global $frm_vars;
148 148
 		$form_id = FrmForm::get_current_form_id();
149 149
 
150
-		$columns[ $form_id . '_id' ]       = 'ID';
151
-		$columns[ $form_id . '_item_key' ] = esc_html__( 'Entry Key', 'formidable' );
150
+		$columns[$form_id . '_id']       = 'ID';
151
+		$columns[$form_id . '_item_key'] = esc_html__( 'Entry Key', 'formidable' );
152 152
 
153 153
 		if ( $form_id ) {
154 154
 			self::get_columns_for_form( $form_id, $columns );
155 155
 		} else {
156
-			$columns[ $form_id . '_form_id' ] = esc_html__( 'Form', 'formidable' );
157
-			$columns[ $form_id . '_name' ]    = esc_html__( 'Entry Name', 'formidable' );
158
-			$columns[ $form_id . '_user_id' ] = esc_html__( 'Created By', 'formidable' );
156
+			$columns[$form_id . '_form_id'] = esc_html__( 'Form', 'formidable' );
157
+			$columns[$form_id . '_name']    = esc_html__( 'Entry Name', 'formidable' );
158
+			$columns[$form_id . '_user_id'] = esc_html__( 'Created By', 'formidable' );
159 159
 		}
160 160
 
161
-		$columns[ $form_id . '_is_draft' ]   = esc_html__( 'Entry Status', 'formidable' );
162
-		$columns[ $form_id . '_created_at' ] = __( 'Entry creation date', 'formidable' );
163
-		$columns[ $form_id . '_updated_at' ] = __( 'Entry update date', 'formidable' );
161
+		$columns[$form_id . '_is_draft']   = esc_html__( 'Entry Status', 'formidable' );
162
+		$columns[$form_id . '_created_at'] = __( 'Entry creation date', 'formidable' );
163
+		$columns[$form_id . '_updated_at'] = __( 'Entry update date', 'formidable' );
164 164
 		self::maybe_add_ip_col( $form_id, $columns );
165 165
 
166 166
 		$frm_vars['cols'] = $columns;
@@ -218,10 +218,10 @@  discard block
 block discarded – undo
218 218
 
219 219
 		foreach ( $sub_form_cols as $k => $sub_form_col ) {
220 220
 			if ( FrmField::is_no_save_field( $sub_form_col->type ) ) {
221
-				unset( $sub_form_cols[ $k ] );
221
+				unset( $sub_form_cols[$k] );
222 222
 				continue;
223 223
 			}
224
-			$columns[ $form_id . '_' . $sub_form_col->field_key . '-_-' . $field->id ] = FrmAppHelper::truncate( $sub_form_col->name, 35 );
224
+			$columns[$form_id . '_' . $sub_form_col->field_key . '-_-' . $field->id] = FrmAppHelper::truncate( $sub_form_col->name, 35 );
225 225
 			unset( $sub_form_col );
226 226
 		}
227 227
 	}
@@ -239,10 +239,10 @@  discard block
 block discarded – undo
239 239
 		$is_post_status             = FrmField::is_option_true( $field, 'post_field' ) && $field->field_options['post_field'] === 'post_status';
240 240
 		$include_column_for_sep_val = $has_separate_value && ! $is_post_status;
241 241
 		if ( $include_column_for_sep_val ) {
242
-			$columns[ $form_id . '_frmsep_' . $col_id ] = self::maybe_format_field_name_for_column_title( $field, $include_column_for_sep_val );
242
+			$columns[$form_id . '_frmsep_' . $col_id] = self::maybe_format_field_name_for_column_title( $field, $include_column_for_sep_val );
243 243
 		}
244 244
 
245
-		$columns[ $form_id . '_' . $col_id ] = self::maybe_format_field_name_for_column_title( $field, $include_column_for_sep_val, false );
245
+		$columns[$form_id . '_' . $col_id] = self::maybe_format_field_name_for_column_title( $field, $include_column_for_sep_val, false );
246 246
 	}
247 247
 
248 248
 	/**
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
 
269 269
 	private static function maybe_add_ip_col( $form_id, &$columns ) {
270 270
 		if ( FrmAppHelper::ips_saved() ) {
271
-			$columns[ $form_id . '_ip' ] = 'IP';
271
+			$columns[$form_id . '_ip'] = 'IP';
272 272
 		}
273 273
 	}
274 274
 
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
 		foreach ( $meta_value as $mk => $mv ) {
308 308
 			// Remove blank values.
309 309
 			if ( empty( $mv ) ) {
310
-				unset( $meta_value[ $mk ] );
310
+				unset( $meta_value[$mk] );
311 311
 			}
312 312
 		}
313 313
 
@@ -384,14 +384,14 @@  discard block
 block discarded – undo
384 384
 		);
385 385
 
386 386
 		if ( ! $form_id ) {
387
-			$columns[ $form_id . '_user_id' ] = 'user_id';
388
-			$columns[ $form_id . '_name' ]    = 'name';
389
-			$columns[ $form_id . '_form_id' ] = 'form_id';
387
+			$columns[$form_id . '_user_id'] = 'user_id';
388
+			$columns[$form_id . '_name']    = 'name';
389
+			$columns[$form_id . '_form_id'] = 'form_id';
390 390
 		}
391 391
 
392 392
 		foreach ( $fields as $field ) {
393 393
 			if ( self::field_supports_sorting( $field ) ) {
394
-				$columns[ $form_id . '_' . $field->field_key ] = 'meta_' . $field->id;
394
+				$columns[$form_id . '_' . $field->field_key] = 'meta_' . $field->id;
395 395
 			}
396 396
 		}
397 397
 
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
 			$atts['form_id'] . '_item_key' => '',
479 479
 			$atts['form_id'] . '_id'       => '',
480 480
 		);
481
-		$cols         = $remove_first + array_reverse( $frm_vars['cols'], true );
481
+		$cols = $remove_first + array_reverse( $frm_vars['cols'], true );
482 482
 
483 483
 		$i = $atts['i'];
484 484
 
@@ -489,7 +489,7 @@  discard block
 block discarded – undo
489 489
 
490 490
 			if ( empty( $result ) || ! in_array( $col_key, $result, true ) ) {
491 491
 				$result[] = $col_key;
492
-				--$i;
492
+				-- $i;
493 493
 			}
494 494
 
495 495
 			unset( $col_key, $col );
@@ -637,9 +637,9 @@  discard block
 block discarded – undo
637 637
 		if ( ! isset( $frm_vars['form_params'] ) ) {
638 638
 			$frm_vars['form_params'] = array();
639 639
 		}
640
-		$frm_vars['form_params'][ $form->id ] = $params;
640
+		$frm_vars['form_params'][$form->id] = $params;
641 641
 
642
-		if ( isset( $frm_vars['created_entries'][ $form_id ] ) ) {
642
+		if ( isset( $frm_vars['created_entries'][$form_id] ) ) {
643 643
 			return;
644 644
 		}
645 645
 
@@ -655,16 +655,16 @@  discard block
 block discarded – undo
655 655
 		 */
656 656
 		$errors = apply_filters( 'frm_entries_before_create', $errors, $form );
657 657
 
658
-		$frm_vars['created_entries'][ $form_id ] = array( 'errors' => $errors );
658
+		$frm_vars['created_entries'][$form_id] = array( 'errors' => $errors );
659 659
 
660 660
 		if ( empty( $errors ) ) {
661 661
 			$_POST['frm_skip_cookie'] = 1;
662 662
 			$do_success               = false;
663 663
 			if ( $params['action'] === 'create' ) {
664
-				if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) {
665
-					$frm_vars['created_entries'][ $form_id ]['entry_id'] = FrmEntry::create( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
664
+				if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][$form_id]['entry_id'] ) ) {
665
+					$frm_vars['created_entries'][$form_id]['entry_id'] = FrmEntry::create( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
666 666
 
667
-					$params['id'] = $frm_vars['created_entries'][ $form_id ]['entry_id'];
667
+					$params['id'] = $frm_vars['created_entries'][$form_id]['entry_id'];
668 668
 					$do_success   = true;
669 669
 				}
670 670
 			}
Please login to merge, or discard this patch.