Completed
Pull Request — master (#659)
by Burhan
46s
created
classes/models/FrmEntryShortcodeFormatter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -285,7 +285,7 @@
 block discarded – undo
285 285
 			'type'  => $field->type,
286 286
 		);
287 287
 
288
-		$this->array_content[ $field->id ] = apply_filters( 'frm_field_shortcodes_for_default_html_email', $array, $field );
288
+		$this->array_content[$field->id] = apply_filters( 'frm_field_shortcodes_for_default_html_email', $array, $field );
289 289
 	}
290 290
 
291 291
 	/**
Please login to merge, or discard this patch.
classes/views/xml/xml.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -7,17 +7,17 @@  discard block
 block discarded – undo
7 7
 <?php
8 8
 foreach ( $type as $tb_type ) {
9 9
 
10
-	if ( ! isset( $tables[ $tb_type ] ) ) {
10
+	if ( ! isset( $tables[$tb_type] ) ) {
11 11
 		do_action( 'frm_xml_import_' . $tb_type, $args );
12 12
 		continue;
13 13
 	}
14 14
 
15 15
 	//no records
16
-	if ( ! isset( $records[ $tb_type ] ) ) {
16
+	if ( ! isset( $records[$tb_type] ) ) {
17 17
 		continue;
18 18
 	}
19 19
 
20
-	$item_ids = $records[ $tb_type ];
20
+	$item_ids = $records[$tb_type];
21 21
 	if ( in_array( $tb_type, array( 'styles', 'actions' ), true ) ) {
22 22
 		include( dirname( __FILE__ ) . '/posts_xml.php' );
23 23
 	} elseif ( file_exists( dirname( __FILE__ ) . '/' . $tb_type . '_xml.php' ) ) {
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 		include( FrmProAppHelper::plugin_path() . '/classes/views/xml/' . $tb_type . '_xml.php' );
27 27
 	}
28 28
 
29
-	unset( $item_ids, $records[ $tb_type ], $tb_type );
29
+	unset( $item_ids, $records[$tb_type], $tb_type );
30 30
 }
31 31
 
32 32
 ?>
Please login to merge, or discard this patch.
classes/models/FrmEntryValues.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -136,12 +136,12 @@  discard block
 block discarded – undo
136 136
 	 * @return array
137 137
 	 */
138 138
 	private function prepare_array_property( $index, $atts ) {
139
-		if ( isset( $atts[ $index ] ) && ! empty( $atts[ $index ] ) ) {
139
+		if ( isset( $atts[$index] ) && ! empty( $atts[$index] ) ) {
140 140
 
141
-			if ( is_array( $atts[ $index ] ) ) {
142
-				$property = $atts[ $index ];
141
+			if ( is_array( $atts[$index] ) ) {
142
+				$property = $atts[$index];
143 143
 			} else {
144
-				$property = explode( ',', $atts[ $index ] );
144
+				$property = explode( ',', $atts[$index] );
145 145
 			}
146 146
 		} else {
147 147
 			$property = array();
@@ -274,6 +274,6 @@  discard block
 block discarded – undo
274 274
 	 * @param stdClass $field
275 275
 	 */
276 276
 	protected function add_field_values( $field ) {
277
-		$this->field_values[ $field->id ] = new FrmFieldValue( $field, $this->entry );
277
+		$this->field_values[$field->id] = new FrmFieldValue( $field, $this->entry );
278 278
 	}
279 279
 }
Please login to merge, or discard this patch.
classes/models/fields/FrmFieldNumber.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 
44 44
 		//validate the number format
45 45
 		if ( ! is_numeric( $args['value'] ) && '' !== $args['value'] ) {
46
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
46
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
47 47
 		}
48 48
 
49 49
 		// validate number settings
@@ -55,9 +55,9 @@  discard block
 block discarded – undo
55 55
 			if ( $frm_settings->use_html && $maxnum !== '' && $minnum !== '' ) {
56 56
 				$value = (float) $args['value'];
57 57
 				if ( $value < $minnum ) {
58
-					$errors[ 'field' . $args['id'] ] = __( 'Please select a higher number', 'formidable' );
58
+					$errors['field' . $args['id']] = __( 'Please select a higher number', 'formidable' );
59 59
 				} elseif ( $value > $maxnum ) {
60
-					$errors[ 'field' . $args['id'] ] = __( 'Please select a lower number', 'formidable' );
60
+					$errors['field' . $args['id']] = __( 'Please select a lower number', 'formidable' );
61 61
 				}
62 62
 			}
63 63
 		}
Please login to merge, or discard this patch.
classes/models/FrmInstallerSkin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 	 */
22 22
 	public function set_upgrader( &$upgrader ) {
23 23
 		if ( is_object( $upgrader ) ) {
24
-			$this->upgrader =& $upgrader;
24
+			$this->upgrader = & $upgrader;
25 25
 		}
26 26
 	}
27 27
 
Please login to merge, or discard this patch.
deprecated/FrmEntryFormat.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -98,15 +98,15 @@  discard block
 block discarded – undo
98 98
 		self::prepare_field_output( $atts, $val );
99 99
 
100 100
 		if ( $atts['format'] != 'text' ) {
101
-			$values[ $f->field_key ] = $val;
101
+			$values[$f->field_key] = $val;
102 102
 			if ( $atts['entry'] && $f->type != 'textarea' ) {
103
-				$prev_val = maybe_unserialize( $atts['entry']->metas[ $f->id ] );
103
+				$prev_val = maybe_unserialize( $atts['entry']->metas[$f->id] );
104 104
 				if ( $prev_val != $val ) {
105
-					$values[ $f->field_key . '-value' ] = $prev_val;
105
+					$values[$f->field_key . '-value'] = $prev_val;
106 106
 				}
107 107
 			}
108 108
 		} else {
109
-			$values[ $f->id ] = array(
109
+			$values[$f->id] = array(
110 110
 				'label' => $f->name,
111 111
 				'val'   => $val,
112 112
 				'type'  => $f->type,
@@ -120,9 +120,9 @@  discard block
 block discarded – undo
120 120
 	private static function fill_missing_fields( $atts, &$values ) {
121 121
 		_deprecated_function( __FUNCTION__, '2.04', 'instance of FrmEntryValues or FrmProEntryValues' );
122 122
 
123
-		if ( $atts['entry'] && ! isset( $atts['entry']->metas[ $atts['field']->id ] ) ) {
123
+		if ( $atts['entry'] && ! isset( $atts['entry']->metas[$atts['field']->id] ) ) {
124 124
 			// In case include_blank is set
125
-			$atts['entry']->metas[ $atts['field']->id ] = '';
125
+			$atts['entry']->metas[$atts['field']->id] = '';
126 126
 			$atts['entry'] = apply_filters( 'frm_prepare_entry_content', $atts['entry'], array( 'field' => $atts['field'] ) );
127 127
 			self::fill_values_from_entry( $atts, $values );
128 128
 		}
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 			'type'  => $f->type,
151 151
 		);
152 152
 
153
-		$values[ $f->id ] = apply_filters( 'frm_field_shortcodes_for_default_html_email', $field_shortcodes, $f );
153
+		$values[$f->id] = apply_filters( 'frm_field_shortcodes_for_default_html_email', $field_shortcodes, $f );
154 154
 	}
155 155
 
156 156
 	/**
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
 
162 162
 		$f = $atts['field'];
163 163
 		if ( $atts['entry'] ) {
164
-			$prev_val = maybe_unserialize( $atts['entry']->metas[ $f->id ] );
164
+			$prev_val = maybe_unserialize( $atts['entry']->metas[$f->id] );
165 165
 			$meta = array(
166 166
 				'item_id'    => $atts['id'],
167 167
 				'field_id'   => $f->id,
Please login to merge, or discard this patch.
classes/models/fields/FrmFieldEmail.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
 	public function validate( $args ) {
37 37
 		$errors = array();
38 38
 		if ( $args['value'] != '' && ! is_email( $args['value'] ) ) {
39
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
39
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
40 40
 		}
41 41
 
42 42
 		return $errors;
Please login to merge, or discard this patch.
classes/models/fields/FrmFieldUrl.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 			'sep'  => ', ',
40 40
 			'html' => false,
41 41
 		);
42
-		$atts     = wp_parse_args( $atts, $defaults );
42
+		$atts = wp_parse_args( $atts, $defaults );
43 43
 
44 44
 		if ( $atts['html'] ) {
45 45
 			$atts['sep'] = ' ';
@@ -61,9 +61,9 @@  discard block
 block discarded – undo
61 61
 
62 62
 		// validate the url format
63 63
 		if ( ! empty( $value ) && ! preg_match( '/^http(s)?:\/\/(?:localhost|(?:[\da-z\.-]+\.[\da-z\.-]+))/i', $value ) ) {
64
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
64
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $this->field, 'invalid' );
65 65
 		} elseif ( $this->field->required == '1' && empty( $value ) ) {
66
-			$errors[ 'field' . $args['id'] ] = FrmFieldsHelper::get_error_msg( $this->field, 'blank' );
66
+			$errors['field' . $args['id']] = FrmFieldsHelper::get_error_msg( $this->field, 'blank' );
67 67
 		}
68 68
 
69 69
 		return $errors;
Please login to merge, or discard this patch.
classes/models/FrmDb.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 		}
62 62
 
63 63
 		foreach ( $args as $key => $value ) {
64
-			$where          .= empty( $where ) ? $base_where : $condition;
64
+			$where .= empty( $where ) ? $base_where : $condition;
65 65
 			$array_inc_null = ( ! is_numeric( $key ) && is_array( $value ) && in_array( null, $value ) );
66 66
 			if ( is_numeric( $key ) || $array_inc_null ) {
67 67
 				$where        .= ' ( ';
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 
97 97
 		if ( strpos( $key, 'created_at' ) !== false || strpos( $key, 'updated_at' ) !== false ) {
98 98
 			$k        = explode( ' ', $key );
99
-			$where    .= ' DATE_FORMAT(' . reset( $k ) . ', %s) ' . str_replace( reset( $k ), '', $key );
99
+			$where .= ' DATE_FORMAT(' . reset( $k ) . ', %s) ' . str_replace( reset( $k ), '', $key );
100 100
 			$values[] = '%Y-%m-%d %H:%i:%s';
101 101
 		} else {
102 102
 			$where .= ' ' . $key;
@@ -116,12 +116,12 @@  discard block
 block discarded – undo
116 116
 						$where .= ' OR ';
117 117
 					}
118 118
 					$start    = false;
119
-					$where    .= $key . ' %s';
119
+					$where .= $key . ' %s';
120 120
 					$values[] = '%' . self::esc_like( $v ) . '%';
121 121
 				}
122 122
 				$where .= ')';
123 123
 			} elseif ( ! empty( $value ) ) {
124
-				$where  .= ' in (' . self::prepare_array_values( $value, '%s' ) . ')';
124
+				$where .= ' in (' . self::prepare_array_values( $value, '%s' ) . ')';
125 125
 				$values = array_merge( $values, $value );
126 126
 			}
127 127
 		} elseif ( strpos( $lowercase_key, 'like' ) !== false ) {
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 				$where .= 'like';
142 142
 			}
143 143
 
144
-			$where    .= ' %s';
144
+			$where .= ' %s';
145 145
 			$values[] = $start . self::esc_like( $value ) . $end;
146 146
 
147 147
 		} elseif ( $value === null ) {
@@ -306,8 +306,8 @@  discard block
 block discarded – undo
306 306
 		);
307 307
 
308 308
 		$where_is = strtolower( $where_is );
309
-		if ( isset( $switch_to[ $where_is ] ) ) {
310
-			return ' ' . $switch_to[ $where_is ];
309
+		if ( isset( $switch_to[$where_is] ) ) {
310
+			return ' ' . $switch_to[$where_is];
311 311
 		}
312 312
 
313 313
 		// > and < need a little more work since we don't want them switched to >= and <=
@@ -360,13 +360,13 @@  discard block
 block discarded – undo
360 360
 		$temp_args = $args;
361 361
 		foreach ( $temp_args as $k => $v ) {
362 362
 			if ( $v == '' ) {
363
-				unset( $args[ $k ] );
363
+				unset( $args[$k] );
364 364
 				continue;
365 365
 			}
366 366
 
367 367
 			$db_name = strtoupper( str_replace( '_', ' ', $k ) );
368 368
 			if ( strpos( $v, $db_name ) === false ) {
369
-				$args[ $k ] = $db_name . ' ' . $v;
369
+				$args[$k] = $db_name . ' ' . $v;
370 370
 			}
371 371
 		}
372 372
 
@@ -440,13 +440,13 @@  discard block
 block discarded – undo
440 440
 	private static function esc_query_args( &$args ) {
441 441
 		foreach ( $args as $param => $value ) {
442 442
 			if ( $param == 'order_by' ) {
443
-				$args[ $param ] = self::esc_order( $value );
443
+				$args[$param] = self::esc_order( $value );
444 444
 			} elseif ( $param == 'limit' ) {
445
-				$args[ $param ] = self::esc_limit( $value );
445
+				$args[$param] = self::esc_limit( $value );
446 446
 			}
447 447
 
448
-			if ( $args[ $param ] == '' ) {
449
-				unset( $args[ $param ] );
448
+			if ( $args[$param] == '' ) {
449
+				unset( $args[$param] );
450 450
 			}
451 451
 		}
452 452
 	}
@@ -529,7 +529,7 @@  discard block
 block discarded – undo
529 529
 		$limit = explode( ',', trim( $limit ) );
530 530
 		foreach ( $limit as $k => $l ) {
531 531
 			if ( is_numeric( $l ) ) {
532
-				$limit[ $k ] = $l;
532
+				$limit[$k] = $l;
533 533
 			}
534 534
 		}
535 535
 
@@ -665,7 +665,7 @@  discard block
 block discarded – undo
665 665
 	 */
666 666
 	public static function add_key_to_group_cache( $key, $group ) {
667 667
 		$cached         = self::get_group_cached_keys( $group );
668
-		$cached[ $key ] = $key;
668
+		$cached[$key] = $key;
669 669
 		wp_cache_set( 'cached_keys', $cached, $group, 300 );
670 670
 	}
671 671
 
Please login to merge, or discard this patch.