Completed
Pull Request — master (#1580)
by Stephanie
36s
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/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.
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/FrmCreateFile.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -146,7 +146,7 @@
 block discarded – undo
146 146
 
147 147
 		$next_dir = '';
148 148
 		foreach ( $dir_names as $dir ) {
149
-			$next_dir      .= '/' . $dir;
149
+			$next_dir .= '/' . $dir;
150 150
 			$needed_dirs[] = $this->uploads['basedir'] . $next_dir;
151 151
 		}
152 152
 
Please login to merge, or discard this patch.
classes/models/FrmFieldValue.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -59,8 +59,8 @@
 block discarded – undo
59 59
 	protected function init_saved_value( $entry ) {
60 60
 		if ( $this->field->type === 'html' ) {
61 61
 			$this->saved_value = $this->field->description;
62
-		} elseif ( isset( $entry->metas[ $this->field->id ] ) ) {
63
-			$this->saved_value = $entry->metas[ $this->field->id ];
62
+		} elseif ( isset( $entry->metas[$this->field->id] ) ) {
63
+			$this->saved_value = $entry->metas[$this->field->id];
64 64
 		} else {
65 65
 			$this->saved_value = '';
66 66
 		}
Please login to merge, or discard this patch.
classes/views/frm-form-actions/_action_inside.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
 	$event_labels = FrmFormAction::trigger_labels();
37 37
 	foreach ( $action_control->action_options['event'] as $event ) {
38 38
 		?>
39
-		<option value="<?php echo esc_attr( $event ); ?>" <?php echo in_array( $event, (array) $form_action->post_content['event'] ) ? ' selected="selected"' : ''; ?> ><?php echo esc_html( isset( $event_labels[ $event ] ) ? $event_labels[ $event ] : $event ); ?></option>
39
+		<option value="<?php echo esc_attr( $event ); ?>" <?php echo in_array( $event, (array) $form_action->post_content['event'] ) ? ' selected="selected"' : ''; ?> ><?php echo esc_html( isset( $event_labels[$event] ) ? $event_labels[$event] : $event ); ?></option>
40 40
 <?php } ?>
41 41
 		</select>
42 42
 	</p>
Please login to merge, or discard this patch.
classes/helpers/FrmShortcodeHelper.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -61,8 +61,8 @@  discard block
 block discarded – undo
61 61
 		}
62 62
 
63 63
 		$with_tags = $args['conditional_check'] ? 3 : 2;
64
-		if ( ! empty( $shortcodes[ $with_tags ][ $short_key ] ) ) {
65
-			$tag  = str_replace( '[' . $prefix, '', $shortcodes[0][ $short_key ] );
64
+		if ( ! empty( $shortcodes[$with_tags][$short_key] ) ) {
65
+			$tag  = str_replace( '[' . $prefix, '', $shortcodes[0][$short_key] );
66 66
 			$tag  = str_replace( ']', '', $tag );
67 67
 			$tag  = str_replace( chr( 194 ) . chr( 160 ), ' ', $tag );
68 68
 			$tags = preg_split( '/\s+/', $tag, 2 );
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 				$tag = $tags[0];
71 71
 			}
72 72
 		} else {
73
-			$tag = $shortcodes[ $with_tags - 1 ][ $short_key ];
73
+			$tag = $shortcodes[$with_tags - 1][$short_key];
74 74
 		}
75 75
 
76 76
 		return $tag;
Please login to merge, or discard this patch.
classes/models/FrmUsage.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 
140 140
 		foreach ( $pass_settings as $setting ) {
141 141
 			if ( isset( $settings_list->$setting ) ) {
142
-				$settings[ $setting ] = $this->maybe_json( $settings_list->$setting );
142
+				$settings[$setting] = $this->maybe_json( $settings_list->$setting );
143 143
 			}
144 144
 		}
145 145
 
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 
172 172
 		$message_settings = array();
173 173
 		foreach ( $messages as $message ) {
174
-			$message_settings[ $message ] = $settings_list->$message;
174
+			$message_settings[$message] = $settings_list->$message;
175 175
 		}
176 176
 
177 177
 		return $message_settings;
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 
190 190
 		foreach ( $frm_roles as $frm_role => $frm_role_description ) {
191 191
 			if ( isset( $settings_list->$frm_role ) ) {
192
-				$permissions[ $frm_role ] = $settings_list->$frm_role;
192
+				$permissions[$frm_role] = $settings_list->$frm_role;
193 193
 			}
194 194
 		}
195 195
 
@@ -256,8 +256,8 @@  discard block
 block discarded – undo
256 256
 			);
257 257
 
258 258
 			foreach ( $settings as $setting ) {
259
-				if ( isset( $form->options[ $setting ] ) ) {
260
-					$new_form[ $setting ] = $this->maybe_json( $form->options[ $setting ] );
259
+				if ( isset( $form->options[$setting] ) ) {
260
+					$new_form[$setting] = $this->maybe_json( $form->options[$setting] );
261 261
 				}
262 262
 			}
263 263
 
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
 	 * @return array
309 309
 	 */
310 310
 	private function fields() {
311
-		$args   = array(
311
+		$args = array(
312 312
 			'limit'    => 50,
313 313
 			'order_by' => 'id DESC',
314 314
 		);
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 		$fields = FrmDb::get_results( 'frm_fields', array(), 'form_id, name, type, field_options', $args );
317 317
 		foreach ( $fields as $k => $field ) {
318 318
 			FrmAppHelper::unserialize_or_decode( $field->field_options );
319
-			$fields[ $k ]->field_options = json_encode( $field->field_options );
319
+			$fields[$k]->field_options = json_encode( $field->field_options );
320 320
 		}
321 321
 		return $fields;
322 322
 	}
Please login to merge, or discard this patch.