Completed
Pull Request — master (#2326)
by
unknown
42s
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
 	}
@@ -238,10 +238,10 @@  discard block
 block discarded – undo
238 238
 		$has_separate_value = ! FrmField::is_option_empty( $field, 'separate_value' );
239 239
 		$is_post_status     = FrmField::is_option_true( $field, 'post_field' ) && $field->field_options['post_field'] === 'post_status';
240 240
 		if ( $has_separate_value && ! $is_post_status ) {
241
-			$columns[ $form_id . '_frmsep_' . $col_id ] = self::maybe_format_field_name_for_title( $field, $has_separate_value );
241
+			$columns[$form_id . '_frmsep_' . $col_id] = self::maybe_format_field_name_for_title( $field, $has_separate_value );
242 242
 		}
243 243
 
244
-		$columns[ $form_id . '_' . $col_id ] = self::maybe_format_field_name_for_title( $field, $has_separate_value, false );
244
+		$columns[$form_id . '_' . $col_id] = self::maybe_format_field_name_for_title( $field, $has_separate_value, false );
245 245
 	}
246 246
 
247 247
 	/**
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
 
268 268
 	private static function maybe_add_ip_col( $form_id, &$columns ) {
269 269
 		if ( FrmAppHelper::ips_saved() ) {
270
-			$columns[ $form_id . '_ip' ] = 'IP';
270
+			$columns[$form_id . '_ip'] = 'IP';
271 271
 		}
272 272
 	}
273 273
 
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 		foreach ( $meta_value as $mk => $mv ) {
307 307
 			// Remove blank values.
308 308
 			if ( empty( $mv ) ) {
309
-				unset( $meta_value[ $mk ] );
309
+				unset( $meta_value[$mk] );
310 310
 			}
311 311
 		}
312 312
 
@@ -383,14 +383,14 @@  discard block
 block discarded – undo
383 383
 		);
384 384
 
385 385
 		if ( ! $form_id ) {
386
-			$columns[ $form_id . '_user_id' ] = 'user_id';
387
-			$columns[ $form_id . '_name' ]    = 'name';
388
-			$columns[ $form_id . '_form_id' ] = 'form_id';
386
+			$columns[$form_id . '_user_id'] = 'user_id';
387
+			$columns[$form_id . '_name']    = 'name';
388
+			$columns[$form_id . '_form_id'] = 'form_id';
389 389
 		}
390 390
 
391 391
 		foreach ( $fields as $field ) {
392 392
 			if ( self::field_supports_sorting( $field ) ) {
393
-				$columns[ $form_id . '_' . $field->field_key ] = 'meta_' . $field->id;
393
+				$columns[$form_id . '_' . $field->field_key] = 'meta_' . $field->id;
394 394
 			}
395 395
 		}
396 396
 
@@ -477,7 +477,7 @@  discard block
 block discarded – undo
477 477
 			$atts['form_id'] . '_item_key' => '',
478 478
 			$atts['form_id'] . '_id'       => '',
479 479
 		);
480
-		$cols         = $remove_first + array_reverse( $frm_vars['cols'], true );
480
+		$cols = $remove_first + array_reverse( $frm_vars['cols'], true );
481 481
 
482 482
 		$i = $atts['i'];
483 483
 
@@ -488,7 +488,7 @@  discard block
 block discarded – undo
488 488
 
489 489
 			if ( empty( $result ) || ! in_array( $col_key, $result, true ) ) {
490 490
 				$result[] = $col_key;
491
-				--$i;
491
+				-- $i;
492 492
 			}
493 493
 
494 494
 			unset( $col_key, $col );
@@ -636,9 +636,9 @@  discard block
 block discarded – undo
636 636
 		if ( ! isset( $frm_vars['form_params'] ) ) {
637 637
 			$frm_vars['form_params'] = array();
638 638
 		}
639
-		$frm_vars['form_params'][ $form->id ] = $params;
639
+		$frm_vars['form_params'][$form->id] = $params;
640 640
 
641
-		if ( isset( $frm_vars['created_entries'][ $form_id ] ) ) {
641
+		if ( isset( $frm_vars['created_entries'][$form_id] ) ) {
642 642
 			return;
643 643
 		}
644 644
 
@@ -654,16 +654,16 @@  discard block
 block discarded – undo
654 654
 		 */
655 655
 		$errors = apply_filters( 'frm_entries_before_create', $errors, $form );
656 656
 
657
-		$frm_vars['created_entries'][ $form_id ] = array( 'errors' => $errors );
657
+		$frm_vars['created_entries'][$form_id] = array( 'errors' => $errors );
658 658
 
659 659
 		if ( empty( $errors ) ) {
660 660
 			$_POST['frm_skip_cookie'] = 1;
661 661
 			$do_success               = false;
662 662
 			if ( $params['action'] === 'create' ) {
663
-				if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) {
664
-					$frm_vars['created_entries'][ $form_id ]['entry_id'] = FrmEntry::create( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
663
+				if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][$form_id]['entry_id'] ) ) {
664
+					$frm_vars['created_entries'][$form_id]['entry_id'] = FrmEntry::create( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
665 665
 
666
-					$params['id'] = $frm_vars['created_entries'][ $form_id ]['entry_id'];
666
+					$params['id'] = $frm_vars['created_entries'][$form_id]['entry_id'];
667 667
 					$do_success   = true;
668 668
 				}
669 669
 			}
Please login to merge, or discard this patch.