Completed
Pull Request — master (#132)
by Stephanie
02:26
created
classes/models/FrmField.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 		$new_values['field_key'] = FrmAppHelper::get_unique_key( $key, $wpdb->prefix . 'frm_fields', 'field_key' );
218 218
 
219 219
 		foreach ( array( 'name', 'description', 'type', 'default_value' ) as $col ) {
220
-			$new_values[ $col ] = $values[ $col ];
220
+			$new_values[$col] = $values[$col];
221 221
 		}
222 222
 
223 223
 		$new_values['options'] = $values['options'];
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
 		$new_values['created_at']    = current_time( 'mysql', 1 );
230 230
 
231 231
 		if ( isset( $values['id'] ) ) {
232
-			$frm_duplicate_ids[ $values['field_key'] ] = $new_values['field_key'];
232
+			$frm_duplicate_ids[$values['field_key']] = $new_values['field_key'];
233 233
 			$new_values                                = apply_filters( 'frm_duplicated_field', $new_values );
234 234
 		}
235 235
 
@@ -238,9 +238,9 @@  discard block
 block discarded – undo
238 238
 		foreach ( $new_values as $k => $v ) {
239 239
 			if ( is_array( $v ) ) {
240 240
 				if ( $k === 'default_value' ) {
241
-					$new_values[ $k ] = FrmAppHelper::maybe_json_encode( $v );
241
+					$new_values[$k] = FrmAppHelper::maybe_json_encode( $v );
242 242
 				} else {
243
-					$new_values[ $k ] = serialize( $v );
243
+					$new_values[$k] = serialize( $v );
244 244
 				}
245 245
 			}
246 246
 			unset( $k, $v );
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
 
263 263
 		if ( $query_results ) {
264 264
 			if ( isset( $values['id'] ) ) {
265
-				$frm_duplicate_ids[ $values['id'] ] = $new_id;
265
+				$frm_duplicate_ids[$values['id']] = $new_id;
266 266
 			}
267 267
 
268 268
 			return $new_id;
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
 	public static function duplicate( $old_form_id, $form_id, $copy_keys = false, $blog_id = false ) {
275 275
 		global $frm_duplicate_ids;
276 276
 
277
-		$where  = array(
277
+		$where = array(
278 278
 			array(
279 279
 				'or'                => 1,
280 280
 				'fi.form_id'        => $old_form_id,
@@ -320,8 +320,8 @@  discard block
 block discarded – undo
320 320
 
321 321
 			$values                                 = apply_filters( 'frm_duplicated_field', $values );
322 322
 			$new_id                                 = self::create( $values );
323
-			$frm_duplicate_ids[ $field->id ]        = $new_id;
324
-			$frm_duplicate_ids[ $field->field_key ] = $new_id;
323
+			$frm_duplicate_ids[$field->id]        = $new_id;
324
+			$frm_duplicate_ids[$field->field_key] = $new_id;
325 325
 			unset( $field );
326 326
 		}
327 327
 	}
@@ -352,8 +352,8 @@  discard block
 block discarded – undo
352 352
 
353 353
 		// serialize array values
354 354
 		foreach ( array( 'field_options', 'options' ) as $opt ) {
355
-			if ( isset( $values[ $opt ] ) && is_array( $values[ $opt ] ) ) {
356
-				$values[ $opt ] = serialize( $values[ $opt ] );
355
+			if ( isset( $values[$opt] ) && is_array( $values[$opt] ) ) {
356
+				$values[$opt] = serialize( $values[$opt] );
357 357
 			}
358 358
 		}
359 359
 		if ( isset( $values['default_value'] ) && is_array( $values['default_value'] ) ) {
@@ -505,7 +505,7 @@  discard block
 block discarded – undo
505 505
 				'id'        => $id,
506 506
 				'field_key' => $id,
507 507
 			);
508
-			$type  = FrmDb::get_var( 'frm_fields', $where, $col );
508
+			$type = FrmDb::get_var( 'frm_fields', $where, $col );
509 509
 		}
510 510
 
511 511
 		return $type;
@@ -531,7 +531,7 @@  discard block
 block discarded – undo
531 531
 					continue;
532 532
 				}
533 533
 
534
-				$fields[ $result->id ] = $result;
534
+				$fields[$result->id] = $result;
535 535
 				$count ++;
536 536
 				if ( $limit == 1 ) {
537 537
 					$fields = $result;
@@ -577,7 +577,7 @@  discard block
 block discarded – undo
577 577
 			$count  = 0;
578 578
 			foreach ( $results as $result ) {
579 579
 				$count ++;
580
-				$fields[ $result->id ] = $result;
580
+				$fields[$result->id] = $result;
581 581
 				if ( ! empty( $limit ) && $count >= $limit ) {
582 582
 					break;
583 583
 				}
@@ -646,7 +646,7 @@  discard block
 block discarded – undo
646 646
 			}
647 647
 
648 648
 			if ( ! empty( $sub_fields ) ) {
649
-				$index        = $k + $index_offset;
649
+				$index = $k + $index_offset;
650 650
 				$index_offset += count( $sub_fields );
651 651
 				array_splice( $results, $index, 0, $sub_fields );
652 652
 			}
@@ -691,7 +691,7 @@  discard block
 block discarded – undo
691 691
 		$query_type = ( $limit == ' LIMIT 1' || $limit == 1 ) ? 'row' : 'results';
692 692
 
693 693
 		if ( is_array( $where ) ) {
694
-			$args    = array(
694
+			$args = array(
695 695
 				'order_by' => $order_by,
696 696
 				'limit'    => $limit,
697 697
 			);
@@ -722,9 +722,9 @@  discard block
 block discarded – undo
722 722
 				FrmDb::set_cache( $result->field_key, $result, 'frm_field' );
723 723
 
724 724
 				self::prepare_options( $result );
725
-				$results[ $r_key ]->field_options = $result->field_options;
726
-				$results[ $r_key ]->options       = $result->options;
727
-				$results[ $r_key ]->default_value = $result->default_value;
725
+				$results[$r_key]->field_options = $result->field_options;
726
+				$results[$r_key]->options       = $result->options;
727
+				$results[$r_key]->default_value = $result->default_value;
728 728
 
729 729
 				unset( $r_key, $result );
730 730
 			}
@@ -926,23 +926,23 @@  discard block
 block discarded – undo
926 926
 	}
927 927
 
928 928
 	public static function is_option_true_in_array( $field, $option ) {
929
-		return isset( $field[ $option ] ) && $field[ $option ];
929
+		return isset( $field[$option] ) && $field[$option];
930 930
 	}
931 931
 
932 932
 	public static function is_option_true_in_object( $field, $option ) {
933
-		return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ];
933
+		return isset( $field->field_options[$option] ) && $field->field_options[$option];
934 934
 	}
935 935
 
936 936
 	public static function is_option_empty_in_array( $field, $option ) {
937
-		return ! isset( $field[ $option ] ) || empty( $field[ $option ] );
937
+		return ! isset( $field[$option] ) || empty( $field[$option] );
938 938
 	}
939 939
 
940 940
 	public static function is_option_empty_in_object( $field, $option ) {
941
-		return ! isset( $field->field_options[ $option ] ) || empty( $field->field_options[ $option ] );
941
+		return ! isset( $field->field_options[$option] ) || empty( $field->field_options[$option] );
942 942
 	}
943 943
 
944 944
 	public static function is_option_value_in_object( $field, $option ) {
945
-		return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ] != '';
945
+		return isset( $field->field_options[$option] ) && $field->field_options[$option] != '';
946 946
 	}
947 947
 
948 948
 	/**
@@ -961,17 +961,17 @@  discard block
 block discarded – undo
961 961
 	public static function get_option_in_array( $field, $option ) {
962 962
 		$this_option = '';
963 963
 
964
-		if ( isset( $field[ $option ] ) && ! empty( $field[ $option ] ) ) {
965
-			$this_option = $field[ $option ];
964
+		if ( isset( $field[$option] ) && ! empty( $field[$option] ) ) {
965
+			$this_option = $field[$option];
966 966
 		} elseif ( isset( $field['field_options'] ) && is_array( $field['field_options'] ) ) {
967
-			$this_option = isset( $field['field_options'][ $option ] ) ? $field['field_options'][ $option ] : '';
967
+			$this_option = isset( $field['field_options'][$option] ) ? $field['field_options'][$option] : '';
968 968
 		}
969 969
 
970 970
 		return $this_option;
971 971
 	}
972 972
 
973 973
 	public static function get_option_in_object( $field, $option ) {
974
-		return isset( $field->field_options[ $option ] ) ? $field->field_options[ $option ] : '';
974
+		return isset( $field->field_options[$option] ) ? $field->field_options[$option] : '';
975 975
 	}
976 976
 
977 977
 	/**
Please login to merge, or discard this patch.
classes/views/frm-forms/add_field_links.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -49,10 +49,10 @@
 block discarded – undo
49 49
 foreach ( $pro_fields as $field_key => $field_type ) {
50 50
 
51 51
 	if ( isset( $field_type['section'] ) ) {
52
-		if ( ! isset( $field_sections[ $field_type['section'] ] ) ) {
53
-			$field_sections[ $field_type['section'] ] = array();
52
+		if ( ! isset( $field_sections[$field_type['section']] ) ) {
53
+			$field_sections[$field_type['section']] = array();
54 54
 		}
55
-		$field_sections[ $field_type['section'] ][ $field_key ] = $field_type;
55
+		$field_sections[$field_type['section']][$field_key] = $field_type;
56 56
 		continue;
57 57
 	}
58 58
 
Please login to merge, or discard this patch.