Completed
Pull Request — master (#659)
by Burhan
46s
created
classes/models/FrmInbox.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 			return;
94 94
 		}
95 95
 
96
-		if ( isset( self::$messages[ $message['key'] ] ) && ! isset( $message['force'] ) ) {
96
+		if ( isset( self::$messages[$message['key']] ) && ! isset( $message['force'] ) ) {
97 97
 			// Don't replace messages unless required.
98 98
 			return;
99 99
 		}
@@ -102,13 +102,13 @@  discard block
 block discarded – undo
102 102
 			return;
103 103
 		}
104 104
 
105
-		if ( isset( self::$messages[ $message['key'] ] ) ) {
105
+		if ( isset( self::$messages[$message['key']] ) ) {
106 106
 			// Move up and mark as new.
107
-			unset( self::$messages[ $message['key'] ] );
107
+			unset( self::$messages[$message['key']] );
108 108
 		}
109 109
 
110 110
 		$this->fill_message( $message );
111
-		self::$messages[ $message['key'] ] = $message;
111
+		self::$messages[$message['key']] = $message;
112 112
 
113 113
 		$this->update_list();
114 114
 
@@ -136,11 +136,11 @@  discard block
 block discarded – undo
136 136
 	private function clean_messages() {
137 137
 		$removed = false;
138 138
 		foreach ( self::$messages as $t => $message ) {
139
-			$read      = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][ get_current_user_id() ] ) && $message['read'][ get_current_user_id() ] < strtotime( '-1 month' );
140
-			$dismissed = isset( $message['dismissed'] ) && ! empty( $message['dismissed'] ) && isset( $message['dismissed'][ get_current_user_id() ] ) && $message['dismissed'][ get_current_user_id() ] < strtotime( '-1 week' );
139
+			$read      = isset( $message['read'] ) && ! empty( $message['read'] ) && isset( $message['read'][get_current_user_id()] ) && $message['read'][get_current_user_id()] < strtotime( '-1 month' );
140
+			$dismissed = isset( $message['dismissed'] ) && ! empty( $message['dismissed'] ) && isset( $message['dismissed'][get_current_user_id()] ) && $message['dismissed'][get_current_user_id()] < strtotime( '-1 week' );
141 141
 			$expired   = $this->is_expired( $message );
142 142
 			if ( $read || $expired || $dismissed ) {
143
-				unset( self::$messages[ $t ] );
143
+				unset( self::$messages[$t] );
144 144
 				$removed = true;
145 145
 			}
146 146
 		}
@@ -153,11 +153,11 @@  discard block
 block discarded – undo
153 153
 	private function filter_messages( &$messages ) {
154 154
 		$user_id = get_current_user_id();
155 155
 		foreach ( $messages as $k => $message ) {
156
-			$dismissed = isset( $message['dismissed'] ) && isset( $message['dismissed'][ $user_id ] );
156
+			$dismissed = isset( $message['dismissed'] ) && isset( $message['dismissed'][$user_id] );
157 157
 			if ( empty( $k ) || $this->is_expired( $message ) || $dismissed ) {
158
-				unset( $messages[ $k ] );
158
+				unset( $messages[$k] );
159 159
 			} elseif ( ! $this->is_for_user( $message ) ) {
160
-				unset( $messages[ $k ] );
160
+				unset( $messages[$k] );
161 161
 			}
162 162
 		}
163 163
 		$messages = apply_filters( 'frm_filter_inbox', $messages );
@@ -196,14 +196,14 @@  discard block
 block discarded – undo
196 196
 	 * @param string $key
197 197
 	 */
198 198
 	public function mark_read( $key ) {
199
-		if ( ! $key || ! isset( self::$messages[ $key ] ) ) {
199
+		if ( ! $key || ! isset( self::$messages[$key] ) ) {
200 200
 			return;
201 201
 		}
202 202
 
203
-		if ( ! isset( self::$messages[ $key ]['read'] ) ) {
204
-			self::$messages[ $key ]['read'] = array();
203
+		if ( ! isset( self::$messages[$key]['read'] ) ) {
204
+			self::$messages[$key]['read'] = array();
205 205
 		}
206
-		self::$messages[ $key ]['read'][ get_current_user_id() ] = time();
206
+		self::$messages[$key]['read'][get_current_user_id()] = time();
207 207
 
208 208
 		$this->update_list();
209 209
 	}
@@ -214,9 +214,9 @@  discard block
 block discarded – undo
214 214
 	 * @since 4.05.02
215 215
 	 */
216 216
 	public function mark_unread( $key ) {
217
-		$is_read = isset( self::$messages[ $key ] ) && isset( self::$messages[ $key ]['read'] ) && isset( self::$messages[ $key ]['read'][ get_current_user_id() ] );
217
+		$is_read = isset( self::$messages[$key] ) && isset( self::$messages[$key]['read'] ) && isset( self::$messages[$key]['read'][get_current_user_id()] );
218 218
 		if ( $is_read ) {
219
-			unset( self::$messages[ $key ]['read'][ get_current_user_id() ] );
219
+			unset( self::$messages[$key]['read'][get_current_user_id()] );
220 220
 			$this->update_list();
221 221
 		}
222 222
 	}
@@ -230,14 +230,14 @@  discard block
 block discarded – undo
230 230
 			return;
231 231
 		}
232 232
 
233
-		if ( ! isset( self::$messages[ $key ] ) ) {
233
+		if ( ! isset( self::$messages[$key] ) ) {
234 234
 			return;
235 235
 		}
236 236
 
237
-		if ( ! isset( self::$messages[ $key ]['dismissed'] ) ) {
238
-			self::$messages[ $key ]['dismissed'] = array();
237
+		if ( ! isset( self::$messages[$key]['dismissed'] ) ) {
238
+			self::$messages[$key]['dismissed'] = array();
239 239
 		}
240
-		self::$messages[ $key ]['dismissed'][ get_current_user_id() ] = time();
240
+		self::$messages[$key]['dismissed'][get_current_user_id()] = time();
241 241
 
242 242
 		$this->update_list();
243 243
 	}
@@ -249,11 +249,11 @@  discard block
 block discarded – undo
249 249
 		$user_id = get_current_user_id();
250 250
 		foreach ( self::$messages as $key => $message ) {
251 251
 			if ( ! isset( $message['dismissed'] ) ) {
252
-				self::$messages[ $key ]['dismissed'] = array();
252
+				self::$messages[$key]['dismissed'] = array();
253 253
 			}
254 254
 
255
-			if ( ! isset( $message['dismissed'][ $user_id ] ) ) {
256
-				self::$messages[ $key ]['dismissed'][ $user_id ] = time();
255
+			if ( ! isset( $message['dismissed'][$user_id] ) ) {
256
+				self::$messages[$key]['dismissed'][$user_id] = time();
257 257
 			}
258 258
 		}
259 259
 		$this->update_list();
@@ -263,8 +263,8 @@  discard block
 block discarded – undo
263 263
 		$messages = $this->get_messages( 'filter' );
264 264
 		$user_id  = get_current_user_id();
265 265
 		foreach ( $messages as $t => $message ) {
266
-			if ( isset( $message['read'] ) && isset( $message['read'][ $user_id ] ) ) {
267
-				unset( $messages[ $t ] );
266
+			if ( isset( $message['read'] ) && isset( $message['read'][$user_id] ) ) {
267
+				unset( $messages[$t] );
268 268
 			}
269 269
 		}
270 270
 		return $messages;
@@ -288,8 +288,8 @@  discard block
 block discarded – undo
288 288
 	 * @since 4.05.02
289 289
 	 */
290 290
 	public function remove( $key ) {
291
-		if ( isset( self::$messages[ $key ] ) ) {
292
-			unset( self::$messages[ $key ] );
291
+		if ( isset( self::$messages[$key] ) ) {
292
+			unset( self::$messages[$key] );
293 293
 			$this->update_list();
294 294
 		}
295 295
 	}
Please login to merge, or discard this patch.
classes/models/FrmFormApi.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
 			}
97 97
 			$cats = array_intersect( $this->skip_categories(), $addon['categories'] );
98 98
 			if ( ! empty( $cats ) ) {
99
-				unset( $addons[ $k ] );
99
+				unset( $addons[$k] );
100 100
 			}
101 101
 		}
102 102
 
@@ -138,8 +138,8 @@  discard block
 block discarded – undo
138 138
 					return $addon;
139 139
 				}
140 140
 			}
141
-		} elseif ( isset( $addons[ $download_id ] ) ) {
142
-			$plugin = $addons[ $download_id ];
141
+		} elseif ( isset( $addons[$download_id] ) ) {
142
+			$plugin = $addons[$download_id];
143 143
 		}
144 144
 
145 145
 		return $plugin;
Please login to merge, or discard this patch.
classes/controllers/FrmWelcomeController.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -42,7 +42,8 @@
 block discarded – undo
42 42
 		}
43 43
 
44 44
 		// Only do this for single site installs.
45
-		if ( isset( $_GET['activate-multi'] ) || is_network_admin() ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
45
+		if ( isset( $_GET['activate-multi'] ) || is_network_admin() ) {
46
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
46 47
 			return;
47 48
 		}
48 49
 
Please login to merge, or discard this patch.
classes/controllers/FrmFormsController.php 2 patches
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -443,11 +443,11 @@  discard block
 block discarded – undo
443 443
 			),
444 444
 		);
445 445
 
446
-		if ( ! isset( $available_status[ $status ] ) ) {
446
+		if ( ! isset( $available_status[$status] ) ) {
447 447
 			return;
448 448
 		}
449 449
 
450
-		FrmAppHelper::permission_check( $available_status[ $status ]['permission'] );
450
+		FrmAppHelper::permission_check( $available_status[$status]['permission'] );
451 451
 
452 452
 		$params = FrmForm::list_page_params();
453 453
 
@@ -455,7 +455,7 @@  discard block
 block discarded – undo
455 455
 		check_admin_referer( $status . '_form_' . $params['id'] );
456 456
 
457 457
 		$count = 0;
458
-		if ( FrmForm::set_status( $params['id'], $available_status[ $status ]['new_status'] ) ) {
458
+		if ( FrmForm::set_status( $params['id'], $available_status[$status]['new_status'] ) ) {
459 459
 			$count ++;
460 460
 		}
461 461
 
@@ -472,7 +472,7 @@  discard block
 block discarded – undo
472 472
 		/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
473 473
 		$available_status['trash']['message']   = sprintf( _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '<a href="' . esc_url( wp_nonce_url( '?page=formidable&frm_action=untrash&form_type=' . $form_type . '&id=' . $params['id'], 'untrash_form_' . $params['id'] ) ) . '">', '</a>' );
474 474
 
475
-		$message = $available_status[ $status ]['message'];
475
+		$message = $available_status[$status]['message'];
476 476
 
477 477
 		self::display_forms_list( $params, $message );
478 478
 	}
@@ -493,7 +493,7 @@  discard block
 block discarded – undo
493 493
 				'type'  => 'request',
494 494
 			)
495 495
 		);
496
-		$message      = sprintf(
496
+		$message = sprintf(
497 497
 			/* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */
498 498
 			_n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ),
499 499
 			$count,
@@ -861,11 +861,11 @@  discard block
 block discarded – undo
861 861
 			}
862 862
 
863 863
 			foreach ( $template['categories'] as $category ) {
864
-				if ( ! isset( $templates_by_category[ $category ] ) ) {
865
-					$templates_by_category[ $category ] = array();
864
+				if ( ! isset( $templates_by_category[$category] ) ) {
865
+					$templates_by_category[$category] = array();
866 866
 				}
867 867
 
868
-				$templates_by_category[ $category ][] = $template;
868
+				$templates_by_category[$category][] = $template;
869 869
 			}
870 870
 		}
871 871
 		unset( $template );
@@ -894,7 +894,7 @@  discard block
 block discarded – undo
894 894
 		$forms                    = FrmForm::get_published_forms( $where );
895 895
 		$view_path                = FrmAppHelper::plugin_path() . '/classes/views/frm-forms/';
896 896
 
897
-		$templates_by_category[ $my_templates_translation ] = $custom_templates;
897
+		$templates_by_category[$my_templates_translation] = $custom_templates;
898 898
 
899 899
 		unset( $pricing, $license_type, $where );
900 900
 		wp_enqueue_script( 'accordion' ); // register accordion for template groups
@@ -1128,7 +1128,7 @@  discard block
 block discarded – undo
1128 1128
 				$section['id'] = $section['anchor'];
1129 1129
 			}
1130 1130
 
1131
-			$sections[ $key ] = $section;
1131
+			$sections[$key] = $section;
1132 1132
 		}
1133 1133
 
1134 1134
 		return $sections;
@@ -1231,7 +1231,7 @@  discard block
 block discarded – undo
1231 1231
 		if ( ! empty( $user_fields ) ) {
1232 1232
 			$user_helpers = array();
1233 1233
 			foreach ( $user_fields as $uk => $uf ) {
1234
-				$user_helpers[ '|user_id| show="' . $uk . '"' ] = $uf;
1234
+				$user_helpers['|user_id| show="' . $uk . '"'] = $uf;
1235 1235
 				unset( $uk, $uf );
1236 1236
 			}
1237 1237
 
@@ -1361,7 +1361,7 @@  discard block
 block discarded – undo
1361 1361
 		if ( ! isset( $frm_vars['js_validate_forms'] ) ) {
1362 1362
 			$frm_vars['js_validate_forms'] = array();
1363 1363
 		}
1364
-		$frm_vars['js_validate_forms'][ $form->id ] = $form;
1364
+		$frm_vars['js_validate_forms'][$form->id] = $form;
1365 1365
 	}
1366 1366
 
1367 1367
 	public static function get_email_html() {
@@ -1482,7 +1482,7 @@  discard block
 block discarded – undo
1482 1482
 				add_filter( 'frm_validate_form', 'FrmFormsController::json_error' );
1483 1483
 			} else {
1484 1484
 				$vars   = FrmAppHelper::json_to_array( $json_vars );
1485
-				$action = $vars[ $action ];
1485
+				$action = $vars[$action];
1486 1486
 				unset( $_REQUEST['frm_compact_fields'], $_POST['frm_compact_fields'] ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1487 1487
 				$_REQUEST = array_merge( $_REQUEST, $vars ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1488 1488
 				$_POST    = array_merge( $_POST, $_REQUEST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
@@ -1608,7 +1608,7 @@  discard block
 block discarded – undo
1608 1608
 		$actions = array();
1609 1609
 		foreach ( $frm_vars['forms_loaded'] as $form ) {
1610 1610
 			if ( is_object( $form ) ) {
1611
-				$actions[ $form->id ] = $form->name;
1611
+				$actions[$form->id] = $form->name;
1612 1612
 			}
1613 1613
 			unset( $form );
1614 1614
 		}
@@ -1817,8 +1817,8 @@  discard block
 block discarded – undo
1817 1817
 	private static function get_saved_errors( $form, $params ) {
1818 1818
 		global $frm_vars;
1819 1819
 
1820
-		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
1821
-			$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
1820
+		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][$form->id] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
1821
+			$errors = $frm_vars['created_entries'][$form->id]['errors'];
1822 1822
 		} else {
1823 1823
 			$errors = array();
1824 1824
 		}
@@ -1832,7 +1832,7 @@  discard block
 block discarded – undo
1832 1832
 	public static function just_created_entry( $form_id ) {
1833 1833
 		global $frm_vars;
1834 1834
 
1835
-		return ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][ $form_id ] ) && isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) ? $frm_vars['created_entries'][ $form_id ]['entry_id'] : 0;
1835
+		return ( isset( $frm_vars['created_entries'] ) && isset( $frm_vars['created_entries'][$form_id] ) && isset( $frm_vars['created_entries'][$form_id]['entry_id'] ) ) ? $frm_vars['created_entries'][$form_id]['entry_id'] : 0;
1836 1836
 	}
1837 1837
 
1838 1838
 	/**
@@ -1840,7 +1840,7 @@  discard block
 block discarded – undo
1840 1840
 	 */
1841 1841
 	private static function get_confirmation_method( $atts ) {
1842 1842
 		$opt    = 'success_action';
1843
-		$method = ( isset( $atts['form']->options[ $opt ] ) && ! empty( $atts['form']->options[ $opt ] ) ) ? $atts['form']->options[ $opt ] : 'message';
1843
+		$method = ( isset( $atts['form']->options[$opt] ) && ! empty( $atts['form']->options[$opt] ) ) ? $atts['form']->options[$opt] : 'message';
1844 1844
 		$method = apply_filters( 'frm_success_filter', $method, $atts['form'], 'create' );
1845 1845
 
1846 1846
 		if ( $method != 'message' && ( ! $atts['entry_id'] || ! is_numeric( $atts['entry_id'] ) ) ) {
@@ -1853,7 +1853,7 @@  discard block
 block discarded – undo
1853 1853
 	public static function maybe_trigger_redirect( $form, $params, $args ) {
1854 1854
 		if ( ! isset( $params['id'] ) ) {
1855 1855
 			global $frm_vars;
1856
-			$params['id'] = $frm_vars['created_entries'][ $form->id ]['entry_id'];
1856
+			$params['id'] = $frm_vars['created_entries'][$form->id]['entry_id'];
1857 1857
 		}
1858 1858
 
1859 1859
 		$conf_method = self::get_confirmation_method(
@@ -1897,7 +1897,7 @@  discard block
 block discarded – undo
1897 1897
 		$opt = ( ! isset( $args['action'] ) || $args['action'] === 'create' ) ? 'success' : 'edit';
1898 1898
 
1899 1899
 		$args['success_opt'] = $opt;
1900
-		if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[ $opt . '_page_id' ] ) ) {
1900
+		if ( $args['conf_method'] === 'page' && is_numeric( $args['form']->options[$opt . '_page_id'] ) ) {
1901 1901
 			self::load_page_after_submit( $args );
1902 1902
 		} elseif ( $args['conf_method'] === 'redirect' ) {
1903 1903
 			self::redirect_after_submit( $args );
@@ -1912,8 +1912,8 @@  discard block
 block discarded – undo
1912 1912
 	private static function load_page_after_submit( $args ) {
1913 1913
 		global $post;
1914 1914
 		$opt = $args['success_opt'];
1915
-		if ( ! $post || $args['form']->options[ $opt . '_page_id' ] != $post->ID ) {
1916
-			$page     = get_post( $args['form']->options[ $opt . '_page_id' ] );
1915
+		if ( ! $post || $args['form']->options[$opt . '_page_id'] != $post->ID ) {
1916
+			$page     = get_post( $args['form']->options[$opt . '_page_id'] );
1917 1917
 			$old_post = $post;
1918 1918
 			$post     = $page;
1919 1919
 			$content  = apply_filters( 'frm_content', $page->post_content, $args['form'], $args['entry_id'] );
@@ -1931,11 +1931,11 @@  discard block
 block discarded – undo
1931 1931
 		add_filter( 'frm_use_wpautop', '__return_false' );
1932 1932
 
1933 1933
 		$opt         = $args['success_opt'];
1934
-		$success_url = trim( $args['form']->options[ $opt . '_url' ] );
1934
+		$success_url = trim( $args['form']->options[$opt . '_url'] );
1935 1935
 		$success_url = apply_filters( 'frm_content', $success_url, $args['form'], $args['entry_id'] );
1936 1936
 		$success_url = do_shortcode( $success_url );
1937 1937
 
1938
-		$success_msg = isset( $args['form']->options[ $opt . '_msg' ] ) ? $args['form']->options[ $opt . '_msg' ] : __( 'Please wait while you are redirected.', 'formidable' );
1938
+		$success_msg = isset( $args['form']->options[$opt . '_msg'] ) ? $args['form']->options[$opt . '_msg'] : __( 'Please wait while you are redirected.', 'formidable' );
1939 1939
 
1940 1940
 		$redirect_msg = self::get_redirect_message( $success_url, $success_msg, $args );
1941 1941
 
@@ -2073,7 +2073,7 @@  discard block
 block discarded – undo
2073 2073
 			'description' => false,
2074 2074
 			'reset'       => false,
2075 2075
 		);
2076
-		$args     = wp_parse_args( $args, $defaults );
2076
+		$args = wp_parse_args( $args, $defaults );
2077 2077
 	}
2078 2078
 
2079 2079
 	/**
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1465,7 +1465,8 @@  discard block
 block discarded – undo
1465 1465
 		$vars   = array();
1466 1466
 		FrmAppHelper::include_svg();
1467 1467
 
1468
-		if ( isset( $_POST['frm_compact_fields'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
1468
+		if ( isset( $_POST['frm_compact_fields'] ) ) {
1469
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
1469 1470
 			FrmAppHelper::permission_check( 'frm_edit_forms' );
1470 1471
 
1471 1472
 			// Javascript needs to be allowed in some field settings.
@@ -1735,7 +1736,8 @@  discard block
 block discarded – undo
1735 1736
 	private static function maybe_get_form_to_show( $id ) {
1736 1737
 		$form = false;
1737 1738
 
1738
-		if ( ! empty( $id ) ) { // no form id or key set
1739
+		if ( ! empty( $id ) ) {
1740
+// no form id or key set
1739 1741
 			$form = FrmForm::getOne( $id );
1740 1742
 			if ( ! $form || $form->parent_form_id || $form->status == 'trash' ) {
1741 1743
 				$form = false;
@@ -1817,7 +1819,8 @@  discard block
 block discarded – undo
1817 1819
 	private static function get_saved_errors( $form, $params ) {
1818 1820
 		global $frm_vars;
1819 1821
 
1820
-		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
1822
+		if ( $params['posted_form_id'] == $form->id && $_POST && isset( $frm_vars['created_entries'][ $form->id ] ) ) {
1823
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
1821 1824
 			$errors = $frm_vars['created_entries'][ $form->id ]['errors'];
1822 1825
 		} else {
1823 1826
 			$errors = array();
Please login to merge, or discard this patch.
classes/controllers/FrmEntriesController.php 2 patches
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -75,19 +75,19 @@  discard block
 block discarded – undo
75 75
 		global $frm_vars;
76 76
 		$form_id = FrmForm::get_current_form_id();
77 77
 
78
-		$columns[ $form_id . '_id' ]       = 'ID';
79
-		$columns[ $form_id . '_item_key' ] = esc_html__( 'Entry Key', 'formidable' );
78
+		$columns[$form_id . '_id']       = 'ID';
79
+		$columns[$form_id . '_item_key'] = esc_html__( 'Entry Key', 'formidable' );
80 80
 
81 81
 		if ( $form_id ) {
82 82
 			self::get_columns_for_form( $form_id, $columns );
83 83
 		} else {
84
-			$columns[ $form_id . '_form_id' ] = __( 'Form', 'formidable' );
85
-			$columns[ $form_id . '_name' ]    = __( 'Entry Name', 'formidable' );
86
-			$columns[ $form_id . '_user_id' ] = __( 'Created By', 'formidable' );
84
+			$columns[$form_id . '_form_id'] = __( 'Form', 'formidable' );
85
+			$columns[$form_id . '_name']    = __( 'Entry Name', 'formidable' );
86
+			$columns[$form_id . '_user_id'] = __( 'Created By', 'formidable' );
87 87
 		}
88 88
 
89
-		$columns[ $form_id . '_created_at' ] = __( 'Entry creation date', 'formidable' );
90
-		$columns[ $form_id . '_updated_at' ] = __( 'Entry update date', 'formidable' );
89
+		$columns[$form_id . '_created_at'] = __( 'Entry creation date', 'formidable' );
90
+		$columns[$form_id . '_updated_at'] = __( 'Entry update date', 'formidable' );
91 91
 		self::maybe_add_ip_col( $form_id, $columns );
92 92
 
93 93
 		$frm_vars['cols'] = $columns;
@@ -145,10 +145,10 @@  discard block
 block discarded – undo
145 145
 
146 146
 		foreach ( $sub_form_cols as $k => $sub_form_col ) {
147 147
 			if ( FrmField::is_no_save_field( $sub_form_col->type ) ) {
148
-				unset( $sub_form_cols[ $k ] );
148
+				unset( $sub_form_cols[$k] );
149 149
 				continue;
150 150
 			}
151
-			$columns[ $form_id . '_' . $sub_form_col->field_key . '-_-' . $field->id ] = FrmAppHelper::truncate( $sub_form_col->name, 35 );
151
+			$columns[$form_id . '_' . $sub_form_col->field_key . '-_-' . $field->id] = FrmAppHelper::truncate( $sub_form_col->name, 35 );
152 152
 			unset( $sub_form_col );
153 153
 		}
154 154
 	}
@@ -165,15 +165,15 @@  discard block
 block discarded – undo
165 165
 		$has_separate_value = ! FrmField::is_option_empty( $field, 'separate_value' );
166 166
 		$is_post_status     = FrmField::is_option_true( $field, 'post_field' ) && $field->field_options['post_field'] == 'post_status';
167 167
 		if ( $has_separate_value && ! $is_post_status ) {
168
-			$columns[ $form_id . '_frmsep_' . $col_id ] = FrmAppHelper::truncate( $field->name, 35 );
168
+			$columns[$form_id . '_frmsep_' . $col_id] = FrmAppHelper::truncate( $field->name, 35 );
169 169
 		}
170 170
 
171
-		$columns[ $form_id . '_' . $col_id ] = FrmAppHelper::truncate( $field->name, 35 );
171
+		$columns[$form_id . '_' . $col_id] = FrmAppHelper::truncate( $field->name, 35 );
172 172
 	}
173 173
 
174 174
 	private static function maybe_add_ip_col( $form_id, &$columns ) {
175 175
 		if ( FrmAppHelper::ips_saved() ) {
176
-			$columns[ $form_id . '_ip' ] = 'IP';
176
+			$columns[$form_id . '_ip'] = 'IP';
177 177
 		}
178 178
 	}
179 179
 
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 		foreach ( $meta_value as $mk => $mv ) {
212 212
 			// Remove blank values.
213 213
 			if ( empty( $mv ) ) {
214
-				unset( $meta_value[ $mk ] );
214
+				unset( $meta_value[$mk] );
215 215
 			}
216 216
 		}
217 217
 
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
 
288 288
 		foreach ( $fields as $field ) {
289 289
 			if ( self::field_supports_sorting( $field ) ) {
290
-				$columns[ $form_id . '_' . $field->field_key ] = 'meta_' . $field->id;
290
+				$columns[$form_id . '_' . $field->field_key] = 'meta_' . $field->id;
291 291
 			}
292 292
 		}
293 293
 
@@ -363,7 +363,7 @@  discard block
 block discarded – undo
363 363
 			$atts['form_id'] . '_item_key' => '',
364 364
 			$atts['form_id'] . '_id'       => '',
365 365
 		);
366
-		$cols         = $remove_first + array_reverse( $frm_vars['cols'], true );
366
+		$cols = $remove_first + array_reverse( $frm_vars['cols'], true );
367 367
 
368 368
 		$i = $atts['i'];
369 369
 
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
 
375 375
 			if ( empty( $result ) || ! in_array( $col_key, $result, true ) ) {
376 376
 				$result[] = $col_key;
377
-				$i--;
377
+				$i --;
378 378
 			}
379 379
 
380 380
 			unset( $col_key, $col );
@@ -507,9 +507,9 @@  discard block
 block discarded – undo
507 507
 		if ( ! isset( $frm_vars['form_params'] ) ) {
508 508
 			$frm_vars['form_params'] = array();
509 509
 		}
510
-		$frm_vars['form_params'][ $form->id ] = $params;
510
+		$frm_vars['form_params'][$form->id] = $params;
511 511
 
512
-		if ( isset( $frm_vars['created_entries'][ $form_id ] ) ) {
512
+		if ( isset( $frm_vars['created_entries'][$form_id] ) ) {
513 513
 			return;
514 514
 		}
515 515
 
@@ -525,16 +525,16 @@  discard block
 block discarded – undo
525 525
 		 */
526 526
 		$errors = apply_filters( 'frm_entries_before_create', $errors, $form );
527 527
 
528
-		$frm_vars['created_entries'][ $form_id ] = array( 'errors' => $errors );
528
+		$frm_vars['created_entries'][$form_id] = array( 'errors' => $errors );
529 529
 
530 530
 		if ( empty( $errors ) ) {
531 531
 			$_POST['frm_skip_cookie'] = 1;
532 532
 			$do_success               = false;
533 533
 			if ( $params['action'] === 'create' ) {
534
-				if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][ $form_id ]['entry_id'] ) ) {
535
-					$frm_vars['created_entries'][ $form_id ]['entry_id'] = FrmEntry::create( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
534
+				if ( apply_filters( 'frm_continue_to_create', true, $form_id ) && ! isset( $frm_vars['created_entries'][$form_id]['entry_id'] ) ) {
535
+					$frm_vars['created_entries'][$form_id]['entry_id'] = FrmEntry::create( $_POST ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
536 536
 
537
-					$params['id'] = $frm_vars['created_entries'][ $form_id ]['entry_id'];
537
+					$params['id'] = $frm_vars['created_entries'][$form_id]['entry_id'];
538 538
 					$do_success   = true;
539 539
 				}
540 540
 			}
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -491,7 +491,8 @@
 block discarded – undo
491 491
 
492 492
 	public static function process_entry( $errors = '', $ajax = false ) {
493 493
 		$form_id = FrmAppHelper::get_post_param( 'form_id', '', 'absint' );
494
-		if ( FrmAppHelper::is_admin() || empty( $_POST ) || empty( $form_id ) || ! isset( $_POST['item_key'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
494
+		if ( FrmAppHelper::is_admin() || empty( $_POST ) || empty( $form_id ) || ! isset( $_POST['item_key'] ) ) {
495
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
495 496
 			return;
496 497
 		}
497 498
 
Please login to merge, or discard this patch.
classes/models/FrmForm.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 
154 154
 		foreach ( $values as $value_key => $value ) {
155 155
 			if ( $value_key && in_array( $value_key, $form_fields ) ) {
156
-				$new_values[ $value_key ] = $value;
156
+				$new_values[$value_key] = $value;
157 157
 			}
158 158
 		}
159 159
 
@@ -224,15 +224,15 @@  discard block
 block discarded – undo
224 224
 		$existing_keys = array_keys( $values['item_meta'] );
225 225
 		foreach ( $all_fields as $fid ) {
226 226
 			if ( ! in_array( $fid->id, $existing_keys ) && ( isset( $values['frm_fields_submitted'] ) && in_array( $fid->id, $values['frm_fields_submitted'] ) ) || isset( $values['options'] ) ) {
227
-				$values['item_meta'][ $fid->id ] = '';
227
+				$values['item_meta'][$fid->id] = '';
228 228
 			}
229
-			$field_array[ $fid->id ] = $fid;
229
+			$field_array[$fid->id] = $fid;
230 230
 		}
231 231
 		unset( $all_fields );
232 232
 
233 233
 		foreach ( $values['item_meta'] as $field_id => $default_value ) {
234
-			if ( isset( $field_array[ $field_id ] ) ) {
235
-				$field = $field_array[ $field_id ];
234
+			if ( isset( $field_array[$field_id] ) ) {
235
+				$field = $field_array[$field_id];
236 236
 			} else {
237 237
 				$field = FrmField::getOne( $field_id );
238 238
 			}
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
 				continue;
242 242
 			}
243 243
 
244
-			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options'][ 'custom_html_' . $field_id ] ) );
244
+			$is_settings_page = ( isset( $values['options'] ) || isset( $values['field_options']['custom_html_' . $field_id] ) );
245 245
 			if ( $is_settings_page ) {
246 246
 				self::get_settings_page_html( $values, $field );
247 247
 
@@ -256,15 +256,15 @@  discard block
 block discarded – undo
256 256
 			$update_options = apply_filters( 'frm_field_options_to_update', $update_options );
257 257
 
258 258
 			foreach ( $update_options as $opt => $default ) {
259
-				$field->field_options[ $opt ] = isset( $values['field_options'][ $opt . '_' . $field_id ] ) ? $values['field_options'][ $opt . '_' . $field_id ] : $default;
260
-				self::sanitize_field_opt( $opt, $field->field_options[ $opt ] );
259
+				$field->field_options[$opt] = isset( $values['field_options'][$opt . '_' . $field_id] ) ? $values['field_options'][$opt . '_' . $field_id] : $default;
260
+				self::sanitize_field_opt( $opt, $field->field_options[$opt] );
261 261
 			}
262 262
 
263 263
 			$field->field_options = apply_filters( 'frm_update_field_options', $field->field_options, $field, $values );
264 264
 
265 265
 			$new_field = array(
266 266
 				'field_options' => $field->field_options,
267
-				'default_value' => isset( $values[ 'default_value_' . $field_id ] ) ? FrmAppHelper::maybe_json_encode( $values[ 'default_value_' . $field_id ] ) : '',
267
+				'default_value' => isset( $values['default_value_' . $field_id] ) ? FrmAppHelper::maybe_json_encode( $values['default_value_' . $field_id] ) : '',
268 268
 			);
269 269
 
270 270
 			self::prepare_field_update_values( $field, $values, $new_field );
@@ -326,11 +326,11 @@  discard block
 block discarded – undo
326 326
 	 * Updating the settings page
327 327
 	 */
328 328
 	private static function get_settings_page_html( $values, &$field ) {
329
-		if ( isset( $values['field_options'][ 'custom_html_' . $field->id ] ) ) {
329
+		if ( isset( $values['field_options']['custom_html_' . $field->id] ) ) {
330 330
 			$prev_opts     = array();
331 331
 			$fallback_html = isset( $field->field_options['custom_html'] ) ? $field->field_options['custom_html'] : FrmFieldsHelper::get_default_html( $field->type );
332 332
 
333
-			$field->field_options['custom_html'] = isset( $values['field_options'][ 'custom_html_' . $field->id ] ) ? $values['field_options'][ 'custom_html_' . $field->id ] : $fallback_html;
333
+			$field->field_options['custom_html'] = isset( $values['field_options']['custom_html_' . $field->id] ) ? $values['field_options']['custom_html_' . $field->id] : $fallback_html;
334 334
 		} elseif ( $field->type == 'hidden' || $field->type == 'user_id' ) {
335 335
 			$prev_opts = $field->field_options;
336 336
 		}
@@ -356,7 +356,7 @@  discard block
 block discarded – undo
356 356
 		foreach ( $field_cols as $col => $default ) {
357 357
 			$default = ( $default === '' ) ? $field->{$col} : $default;
358 358
 
359
-			$new_field[ $col ] = isset( $values['field_options'][ $col . '_' . $field->id ] ) ? $values['field_options'][ $col . '_' . $field->id ] : $default;
359
+			$new_field[$col] = isset( $values['field_options'][$col . '_' . $field->id] ) ? $values['field_options'][$col . '_' . $field->id] : $default;
360 360
 		}
361 361
 
362 362
 		// Don't save the template option.
@@ -770,8 +770,8 @@  discard block
 block discarded – undo
770 770
 			self::maybe_get_form( $form );
771 771
 		}
772 772
 
773
-		if ( isset( $frm_vars['form_params'] ) && is_array( $frm_vars['form_params'] ) && isset( $frm_vars['form_params'][ $form->id ] ) ) {
774
-			return $frm_vars['form_params'][ $form->id ];
773
+		if ( isset( $frm_vars['form_params'] ) && is_array( $frm_vars['form_params'] ) && isset( $frm_vars['form_params'][$form->id] ) ) {
774
+			return $frm_vars['form_params'][$form->id];
775 775
 		}
776 776
 
777 777
 		$action_var = isset( $_REQUEST['frm_action'] ) ? 'frm_action' : 'action'; // phpcs:ignore WordPress.Security.NonceVerification.Missing
@@ -800,15 +800,15 @@  discard block
 block discarded – undo
800 800
 			//if there are two forms on the same page, make sure not to submit both
801 801
 			foreach ( $default_values as $var => $default ) {
802 802
 				if ( $var == 'action' ) {
803
-					$values[ $var ] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
803
+					$values[$var] = FrmAppHelper::get_param( $action_var, $default, 'get', 'sanitize_title' );
804 804
 				} else {
805
-					$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
805
+					$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
806 806
 				}
807 807
 				unset( $var, $default );
808 808
 			}
809 809
 		} else {
810 810
 			foreach ( $default_values as $var => $default ) {
811
-				$values[ $var ] = $default;
811
+				$values[$var] = $default;
812 812
 				unset( $var, $default );
813 813
 			}
814 814
 		}
@@ -834,7 +834,7 @@  discard block
 block discarded – undo
834 834
 			'sdir'     => '',
835 835
 		);
836 836
 		foreach ( $defaults as $var => $default ) {
837
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
837
+			$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
838 838
 		}
839 839
 
840 840
 		return $values;
@@ -862,7 +862,7 @@  discard block
 block discarded – undo
862 862
 			'keep_post' => '',
863 863
 		);
864 864
 		foreach ( $defaults as $var => $default ) {
865
-			$values[ $var ] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
865
+			$values[$var] = FrmAppHelper::get_param( $var, $default, 'get', 'sanitize_text_field' );
866 866
 		}
867 867
 
868 868
 		return $values;
@@ -965,7 +965,7 @@  discard block
 block discarded – undo
965 965
 		$form = $atts['form'];
966 966
 		$default = isset( $atts['default'] ) ? $atts['default'] : '';
967 967
 
968
-		return isset( $form->options[ $atts['option'] ] ) ? $form->options[ $atts['option'] ] : $default;
968
+		return isset( $form->options[$atts['option']] ) ? $form->options[$atts['option']] : $default;
969 969
 	}
970 970
 
971 971
 	/**
Please login to merge, or discard this patch.
classes/models/fields/FrmFieldUserID.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
 	protected function get_field_value( $args ) {
53 53
 		$user_ID      = get_current_user_id();
54 54
 		$user_ID      = ( $user_ID ? $user_ID : '' );
55
-		$posted_value = ( FrmAppHelper::is_admin() && $_POST && isset( $_POST['item_meta'][ $this->field['id'] ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
55
+		$posted_value = ( FrmAppHelper::is_admin() && $_POST && isset( $_POST['item_meta'][$this->field['id']] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
56 56
 		$action       = ( isset( $args['action'] ) ? $args['action'] : ( isset( $args['form_action'] ) ? $args['form_action'] : '' ) );
57 57
 		$updating     = $action == 'update';
58 58
 		return ( is_numeric( $this->field['value'] ) || $posted_value || $updating ) ? $this->field['value'] : $user_ID;
Please login to merge, or discard this patch.
classes/models/FrmFormAction.php 1 patch
Spacing   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -5,15 +5,15 @@  discard block
 block discarded – undo
5 5
 
6 6
 class FrmFormAction {
7 7
 
8
-	public $id_base;         // Root id for all actions of this type.
9
-	public $name;            // Name for this action type.
8
+	public $id_base; // Root id for all actions of this type.
9
+	public $name; // Name for this action type.
10 10
 	public $option_name;
11
-	public $action_options;  // Option array passed to wp_register_sidebar_widget()
11
+	public $action_options; // Option array passed to wp_register_sidebar_widget()
12 12
 	public $control_options; // Option array passed to wp_register_widget_control()
13 13
 
14
-	public $form_id;         // The ID of the form to evaluate
15
-	public $number = false;  // Unique ID number of the current instance.
16
-	public $id = '';         // Unique ID string of the current instance (id_base-number)
14
+	public $form_id; // The ID of the form to evaluate
15
+	public $number = false; // Unique ID number of the current instance.
16
+	public $id = ''; // Unique ID string of the current instance (id_base-number)
17 17
 	public $updated = false; // Set true when we update the data after a POST submit - makes sure we don't do it twice.
18 18
 
19 19
 	// Member functions that you must over-ride.
@@ -151,9 +151,9 @@  discard block
 block discarded – undo
151 151
 		$groups = FrmFormActionsController::form_action_groups();
152 152
 		$group  = 'misc';
153 153
 
154
-		if ( isset( $action_options['group'] ) && isset( $groups[ $action_options['group'] ] ) ) {
154
+		if ( isset( $action_options['group'] ) && isset( $groups[$action_options['group']] ) ) {
155 155
 			$group = $action_options['group'];
156
-		} elseif ( isset( $groups[ $this->id_base ] ) ) {
156
+		} elseif ( isset( $groups[$this->id_base] ) ) {
157 157
 			$group = $this->id_base;
158 158
 		} else {
159 159
 			foreach ( $groups as $name => $check_group ) {
@@ -164,8 +164,8 @@  discard block
 block discarded – undo
164 164
 			}
165 165
 		}
166 166
 
167
-		$groups[ $group ]['id'] = $group;
168
-		return $groups[ $group ];
167
+		$groups[$group]['id'] = $group;
168
+		return $groups[$group];
169 169
 	}
170 170
 
171 171
 	/**
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
 	 * @return integer $post_id
268 268
 	 */
269 269
 	public function maybe_create_action( $action, $forms ) {
270
-		if ( isset( $action['ID'] ) && is_numeric( $action['ID'] ) && isset( $forms[ $action['menu_order'] ] ) && $forms[ $action['menu_order'] ] == 'updated' ) {
270
+		if ( isset( $action['ID'] ) && is_numeric( $action['ID'] ) && isset( $forms[$action['menu_order']] ) && $forms[$action['menu_order']] == 'updated' ) {
271 271
 			// Update action only
272 272
 			$action['post_content'] = FrmAppHelper::maybe_json_decode( $action['post_content'] );
273 273
 			$post_id                = $this->save_settings( $action );
@@ -287,18 +287,18 @@  discard block
 block discarded – undo
287 287
 		$switch             = $this->get_global_switch_fields();
288 288
 
289 289
 		foreach ( (array) $action->post_content as $key => $val ) {
290
-			if ( is_numeric( $val ) && isset( $frm_duplicate_ids[ $val ] ) ) {
291
-				$action->post_content[ $key ] = $frm_duplicate_ids[ $val ];
290
+			if ( is_numeric( $val ) && isset( $frm_duplicate_ids[$val] ) ) {
291
+				$action->post_content[$key] = $frm_duplicate_ids[$val];
292 292
 			} elseif ( ! is_array( $val ) ) {
293
-				$action->post_content[ $key ] = FrmFieldsHelper::switch_field_ids( $val );
294
-			} elseif ( isset( $switch[ $key ] ) && is_array( $switch[ $key ] ) ) {
293
+				$action->post_content[$key] = FrmFieldsHelper::switch_field_ids( $val );
294
+			} elseif ( isset( $switch[$key] ) && is_array( $switch[$key] ) ) {
295 295
 				// loop through each value if empty
296
-				if ( empty( $switch[ $key ] ) ) {
297
-					$switch[ $key ] = array_keys( $val );
296
+				if ( empty( $switch[$key] ) ) {
297
+					$switch[$key] = array_keys( $val );
298 298
 				}
299 299
 
300
-				foreach ( $switch[ $key ] as $subkey ) {
301
-					$action->post_content[ $key ] = $this->duplicate_array_walk( $action->post_content[ $key ], $subkey, $val );
300
+				foreach ( $switch[$key] as $subkey ) {
301
+					$action->post_content[$key] = $this->duplicate_array_walk( $action->post_content[$key], $subkey, $val );
302 302
 				}
303 303
 			}
304 304
 
@@ -316,20 +316,20 @@  discard block
 block discarded – undo
316 316
 			foreach ( $subkey as $subkey2 ) {
317 317
 				foreach ( (array) $val as $ck => $cv ) {
318 318
 					if ( is_array( $cv ) ) {
319
-						$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey2, $cv );
320
-					} elseif ( isset( $cv[ $subkey ] ) && is_numeric( $cv[ $subkey ] ) && isset( $frm_duplicate_ids[ $cv[ $subkey ] ] ) ) {
321
-						$action[ $ck ][ $subkey ] = $frm_duplicate_ids[ $cv[ $subkey ] ];
319
+						$action[$ck] = $this->duplicate_array_walk( $action[$ck], $subkey2, $cv );
320
+					} elseif ( isset( $cv[$subkey] ) && is_numeric( $cv[$subkey] ) && isset( $frm_duplicate_ids[$cv[$subkey]] ) ) {
321
+						$action[$ck][$subkey] = $frm_duplicate_ids[$cv[$subkey]];
322 322
 					}
323 323
 				}
324 324
 			}
325 325
 		} else {
326 326
 			foreach ( (array) $val as $ck => $cv ) {
327 327
 				if ( is_array( $cv ) ) {
328
-					$action[ $ck ] = $this->duplicate_array_walk( $action[ $ck ], $subkey, $cv );
329
-				} elseif ( $ck == $subkey && isset( $frm_duplicate_ids[ $cv ] ) ) {
330
-					$action[ $ck ] = $frm_duplicate_ids[ $cv ];
328
+					$action[$ck] = $this->duplicate_array_walk( $action[$ck], $subkey, $cv );
329
+				} elseif ( $ck == $subkey && isset( $frm_duplicate_ids[$cv] ) ) {
330
+					$action[$ck] = $frm_duplicate_ids[$cv];
331 331
 				} elseif ( $ck == $subkey ) {
332
-					$action[ $ck ] = $this->maybe_switch_field_ids( $action[ $ck ] );
332
+					$action[$ck] = $this->maybe_switch_field_ids( $action[$ck] );
333 333
 				}
334 334
 			}
335 335
 		}
@@ -353,10 +353,10 @@  discard block
 block discarded – undo
353 353
 		}
354 354
 
355 355
 		// phpcs:ignore WordPress.Security.NonceVerification.Missing
356
-		if ( isset( $_POST[ $this->option_name ] ) && is_array( $_POST[ $this->option_name ] ) ) {
356
+		if ( isset( $_POST[$this->option_name] ) && is_array( $_POST[$this->option_name] ) ) {
357 357
 			// Sanitizing removes scripts and <email> type of values.
358 358
 			// phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
359
-			$settings = wp_unslash( $_POST[ $this->option_name ] );
359
+			$settings = wp_unslash( $_POST[$this->option_name] );
360 360
 		} else {
361 361
 			return;
362 362
 		}
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
 		foreach ( $settings as $number => $new_instance ) {
367 367
 			$this->_set( $number );
368 368
 
369
-			$old_instance = isset( $all_instances[ $number ] ) ? $all_instances[ $number ] : array();
369
+			$old_instance = isset( $all_instances[$number] ) ? $all_instances[$number] : array();
370 370
 
371 371
 			if ( ! isset( $new_instance['post_status'] ) ) {
372 372
 				$new_instance['post_status'] = 'draft';
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
 			$instance['post_content'] = apply_filters( 'frm_before_save_' . $this->id_base . '_action', $new_instance['post_content'], $instance, $new_instance, $old_instance, $this );
407 407
 
408 408
 			if ( false !== $instance ) {
409
-				$all_instances[ $number ] = $instance;
409
+				$all_instances[$number] = $instance;
410 410
 			}
411 411
 
412 412
 			$action_ids[] = $this->save_settings( $instance );
@@ -482,12 +482,12 @@  discard block
 block discarded – undo
482 482
 			// some plugins/themes are formatting the post_excerpt
483 483
 			$action->post_excerpt = sanitize_title( $action->post_excerpt );
484 484
 
485
-			if ( ! isset( $action_controls[ $action->post_excerpt ] ) ) {
485
+			if ( ! isset( $action_controls[$action->post_excerpt] ) ) {
486 486
 				continue;
487 487
 			}
488 488
 
489
-			$action                  = $action_controls[ $action->post_excerpt ]->prepare_action( $action );
490
-			$settings[ $action->ID ] = $action;
489
+			$action                  = $action_controls[$action->post_excerpt]->prepare_action( $action );
490
+			$settings[$action->ID] = $action;
491 491
 
492 492
 			if ( count( $settings ) >= $limit ) {
493 493
 				break;
@@ -517,7 +517,7 @@  discard block
 block discarded – undo
517 517
 			'limit'       => 99,
518 518
 			'post_status' => $default_status,
519 519
 		);
520
-		$args     = wp_parse_args( $args, $defaults );
520
+		$args = wp_parse_args( $args, $defaults );
521 521
 	}
522 522
 
523 523
 	/**
@@ -578,7 +578,7 @@  discard block
 block discarded – undo
578 578
 
579 579
 			$action = $this->prepare_action( $action );
580 580
 
581
-			$settings[ $action->ID ] = $action;
581
+			$settings[$action->ID] = $action;
582 582
 		}
583 583
 
584 584
 		if ( 1 === $limit ) {
@@ -615,10 +615,10 @@  discard block
 block discarded – undo
615 615
 
616 616
 		foreach ( $default_values as $k => $vals ) {
617 617
 			if ( is_array( $vals ) && ! empty( $vals ) ) {
618
-				if ( 'event' == $k && ! $this->action_options['force_event'] && ! empty( $action->post_content[ $k ] ) ) {
618
+				if ( 'event' == $k && ! $this->action_options['force_event'] && ! empty( $action->post_content[$k] ) ) {
619 619
 					continue;
620 620
 				}
621
-				$action->post_content[ $k ] = wp_parse_args( $action->post_content[ $k ], $vals );
621
+				$action->post_content[$k] = wp_parse_args( $action->post_content[$k], $vals );
622 622
 			}
623 623
 		}
624 624
 
@@ -693,14 +693,14 @@  discard block
 block discarded – undo
693 693
 	 * Migrate settings from form->options into new action.
694 694
 	 */
695 695
 	public function migrate_to_2( $form, $update = 'update' ) {
696
-		$action        = $this->prepare_new( $form->id );
696
+		$action = $this->prepare_new( $form->id );
697 697
 		FrmAppHelper::unserialize_or_decode( $form->options );
698 698
 
699 699
 		// fill with existing options
700 700
 		foreach ( $action->post_content as $name => $val ) {
701
-			if ( isset( $form->options[ $name ] ) ) {
702
-				$action->post_content[ $name ] = $form->options[ $name ];
703
-				unset( $form->options[ $name ] );
701
+			if ( isset( $form->options[$name] ) ) {
702
+				$action->post_content[$name] = $form->options[$name];
703
+				unset( $form->options[$name] );
704 704
 			}
705 705
 		}
706 706
 
@@ -766,7 +766,7 @@  discard block
 block discarded – undo
766 766
 				$stop = $stop ? false : true;
767 767
 			}
768 768
 
769
-			$met[ $stop ] = $stop;
769
+			$met[$stop] = $stop;
770 770
 		}
771 771
 
772 772
 		if ( $notification['conditions']['any_all'] == 'all' && ! empty( $met ) && isset( $met[0] ) && isset( $met[1] ) ) {
@@ -817,8 +817,8 @@  discard block
 block discarded – undo
817 817
 	private static function get_value_from_entry( $entry, $field_id ) {
818 818
 		$observed_value = '';
819 819
 
820
-		if ( isset( $entry->metas[ $field_id ] ) ) {
821
-			$observed_value = $entry->metas[ $field_id ];
820
+		if ( isset( $entry->metas[$field_id] ) ) {
821
+			$observed_value = $entry->metas[$field_id];
822 822
 		} elseif ( $entry->post_id && FrmAppHelper::pro_is_installed() ) {
823 823
 			$field          = FrmField::getOne( $field_id );
824 824
 			$observed_value = FrmProEntryMetaHelper::get_post_or_meta_value(
Please login to merge, or discard this patch.
classes/helpers/FrmFieldsHelper.php 2 patches
Spacing   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 			if ( in_array( $type, array( 'data', 'lookup' ) ) ) {
27 27
 				$values['field_options']['data_type'] = $setting;
28 28
 			} else {
29
-				$values['field_options'][ $setting ] = 1;
29
+				$values['field_options'][$setting] = 1;
30 30
 			}
31 31
 		}
32 32
 
@@ -133,10 +133,10 @@  discard block
 block discarded – undo
133 133
 		}
134 134
 
135 135
 		foreach ( $defaults as $opt => $default ) {
136
-			$values[ $opt ] = isset( $field->field_options[ $opt ] ) ? $field->field_options[ $opt ] : $default;
136
+			$values[$opt] = isset( $field->field_options[$opt] ) ? $field->field_options[$opt] : $default;
137 137
 
138 138
 			if ( $check_post ) {
139
-				self::get_posted_field_setting( $opt . '_' . $field->id, $values[ $opt ] );
139
+				self::get_posted_field_setting( $opt . '_' . $field->id, $values[$opt] );
140 140
 			}
141 141
 
142 142
 			unset( $opt, $default );
@@ -180,18 +180,18 @@  discard block
 block discarded – undo
180 180
 	 * @param mixed $value
181 181
 	 */
182 182
 	private static function get_posted_field_setting( $setting, &$value ) {
183
-		if ( ! isset( $_POST['field_options'][ $setting ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
183
+		if ( ! isset( $_POST['field_options'][$setting] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
184 184
 			return;
185 185
 		}
186 186
 
187 187
 		if ( strpos( $setting, 'html' ) !== false ) {
188 188
 			// Strip slashes from HTML but not regex or script tags.
189
-			$value = wp_unslash( $_POST['field_options'][ $setting ] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
189
+			$value = wp_unslash( $_POST['field_options'][$setting] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
190 190
 		} elseif ( strpos( $setting, 'format_' ) === 0 ) {
191 191
 			// TODO: Remove stripslashes on output, and use on input only.
192
-			$value = sanitize_text_field( $_POST['field_options'][ $setting ] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash, WordPress.Security.NonceVerification.Missing
192
+			$value = sanitize_text_field( $_POST['field_options'][$setting] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.MissingUnslash, WordPress.Security.NonceVerification.Missing
193 193
 		} else {
194
-			$value = wp_unslash( $_POST['field_options'][ $setting ] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
194
+			$value = wp_unslash( $_POST['field_options'][$setting] ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized, WordPress.Security.NonceVerification.Missing
195 195
 			FrmAppHelper::sanitize_value( 'wp_kses_post', $value );
196 196
 		}
197 197
 	}
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
 		$values['default_value'] = FrmAppHelper::maybe_json_encode( $field->default_value );
265 265
 
266 266
 		foreach ( array( 'name', 'description', 'type', 'field_order', 'field_options', 'required' ) as $col ) {
267
-			$values[ $col ] = $field->{$col};
267
+			$values[$col] = $field->{$col};
268 268
 		}
269 269
 	}
270 270
 
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
304 304
 		);
305 305
 
306 306
 		$msg = FrmField::get_option( $field, $error );
307
-		$msg = empty( $msg ) ? $defaults[ $error ]['part'] : $msg;
307
+		$msg = empty( $msg ) ? $defaults[$error]['part'] : $msg;
308 308
 		$msg = do_shortcode( $msg );
309 309
 
310 310
 		return $msg;
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
 		}
415 415
 
416 416
 		$base_name = 'default_value_' . $field['id'];
417
-		$html_id    = isset( $field['html_id'] ) ? $field['html_id'] : self::get_html_id( $field );
417
+		$html_id = isset( $field['html_id'] ) ? $field['html_id'] : self::get_html_id( $field );
418 418
 
419 419
 		$default_type = self::get_default_value_type( $field );
420 420
 
@@ -738,7 +738,7 @@  discard block
 block discarded – undo
738 738
 				continue;
739 739
 			}
740 740
 
741
-			$atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[3][ $short_key ] );
741
+			$atts = FrmShortcodeHelper::get_shortcode_attribute_array( $shortcodes[3][$short_key] );
742 742
 			$tag  = FrmShortcodeHelper::get_shortcode_tag( $shortcodes, $short_key );
743 743
 
744 744
 			$atts['entry'] = $entry;
@@ -747,7 +747,7 @@  discard block
 block discarded – undo
747 747
 
748 748
 			if ( $replace_with !== null ) {
749 749
 				self::sanitize_embedded_shortcodes( compact( 'entry' ), $replace_with );
750
-				$content = str_replace( $shortcodes[0][ $short_key ], $replace_with, $content );
750
+				$content = str_replace( $shortcodes[0][$short_key], $replace_with, $content );
751 751
 			}
752 752
 
753 753
 			unset( $atts, $replace_with );
@@ -790,8 +790,8 @@  discard block
 block discarded – undo
790 790
 
791 791
 		$dynamic_default = array( 'admin_email', 'siteurl', 'frmurl', 'sitename', 'get' );
792 792
 
793
-		if ( isset( $shortcode_values[ $atts['tag'] ] ) ) {
794
-			$replace_with = $shortcode_values[ $atts['tag'] ];
793
+		if ( isset( $shortcode_values[$atts['tag']] ) ) {
794
+			$replace_with = $shortcode_values[$atts['tag']];
795 795
 		} elseif ( in_array( $atts['tag'], $dynamic_default ) ) {
796 796
 			$replace_with = self::dynamic_default_values( $atts['tag'], $atts );
797 797
 		} elseif ( $clean_tag == 'user_agent' ) {
@@ -1002,8 +1002,8 @@  discard block
 block discarded – undo
1002 1002
 			self::field_types_for_input( $single_input, $field_selection, $field_types );
1003 1003
 		} elseif ( in_array( $type, $multiple_input ) ) {
1004 1004
 			self::field_types_for_input( $multiple_input, $field_selection, $field_types );
1005
-		} elseif ( isset( $field_selection[ $type ] ) ) {
1006
-			$field_types[ $type ] = $field_selection[ $type ];
1005
+		} elseif ( isset( $field_selection[$type] ) ) {
1006
+			$field_types[$type] = $field_selection[$type];
1007 1007
 		}
1008 1008
 
1009 1009
 		$field_types = apply_filters( 'frm_switch_field_types', $field_types, compact( 'type', 'field_selection' ) );
@@ -1036,7 +1036,7 @@  discard block
 block discarded – undo
1036 1036
 
1037 1037
 	private static function field_types_for_input( $inputs, $fields, &$field_types ) {
1038 1038
 		foreach ( $inputs as $input ) {
1039
-			$field_types[ $input ] = $fields[ $input ];
1039
+			$field_types[$input] = $fields[$input];
1040 1040
 			unset( $input );
1041 1041
 		}
1042 1042
 	}
@@ -1068,7 +1068,7 @@  discard block
 block discarded – undo
1068 1068
 			'parent'  => false,
1069 1069
 			'pointer' => false,
1070 1070
 		);
1071
-		$args     = wp_parse_args( $args, $defaults );
1071
+		$args = wp_parse_args( $args, $defaults );
1072 1072
 
1073 1073
 		$opt_key   = $args['opt_key'];
1074 1074
 		$field     = $args['field'];
@@ -1084,24 +1084,24 @@  discard block
 block discarded – undo
1084 1084
 
1085 1085
 		// Check posted vals before checking saved values
1086 1086
 		// For fields inside repeating sections - note, don't check if $pointer is true because it will often be zero
1087
-		if ( $parent && isset( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
1087
+		if ( $parent && isset( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
1088 1088
 			if ( FrmField::is_field_with_multiple_values( $field ) ) {
1089 1089
 				// phpcs:ignore WordPress.Security.NonceVerification.Missing
1090
-				$other_val = isset( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ][ $opt_key ] ) ? sanitize_text_field( wp_unslash( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ][ $opt_key ] ) ) : '';
1090
+				$other_val = isset( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']][$opt_key] ) ? sanitize_text_field( wp_unslash( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']][$opt_key] ) ) : '';
1091 1091
 			} else {
1092
-				$other_val = sanitize_text_field( wp_unslash( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1092
+				$other_val = sanitize_text_field( wp_unslash( $_POST['item_meta'][$parent][$pointer]['other'][$field['id']] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1093 1093
 			}
1094 1094
 
1095 1095
 			return $other_val;
1096 1096
 
1097
-		} elseif ( isset( $field['id'] ) && isset( $_POST['item_meta']['other'][ $field['id'] ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
1097
+		} elseif ( isset( $field['id'] ) && isset( $_POST['item_meta']['other'][$field['id']] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
1098 1098
 			// For normal fields
1099 1099
 
1100 1100
 			if ( FrmField::is_field_with_multiple_values( $field ) ) {
1101 1101
 				// phpcs:ignore WordPress.Security.NonceVerification.Missing
1102
-				$other_val = isset( $_POST['item_meta']['other'][ $field['id'] ][ $opt_key ] ) ? sanitize_text_field( wp_unslash( $_POST['item_meta']['other'][ $field['id'] ][ $opt_key ] ) ) : '';
1102
+				$other_val = isset( $_POST['item_meta']['other'][$field['id']][$opt_key] ) ? sanitize_text_field( wp_unslash( $_POST['item_meta']['other'][$field['id']][$opt_key] ) ) : '';
1103 1103
 			} else {
1104
-				$other_val = sanitize_text_field( wp_unslash( $_POST['item_meta']['other'][ $field['id'] ] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1104
+				$other_val = sanitize_text_field( wp_unslash( $_POST['item_meta']['other'][$field['id']] ) ); // phpcs:ignore WordPress.Security.NonceVerification.Missing
1105 1105
 			}
1106 1106
 
1107 1107
 			return $other_val;
@@ -1111,8 +1111,8 @@  discard block
 block discarded – undo
1111 1111
 		if ( $field['type'] === 'checkbox' && is_array( $field['value'] ) ) {
1112 1112
 			// Check if there is an "other" val in saved value and make sure the
1113 1113
 			// "other" val is not equal to the Other checkbox option
1114
-			if ( isset( $field['value'][ $opt_key ] ) && $field['options'][ $opt_key ] != $field['value'][ $opt_key ] ) {
1115
-				$other_val = $field['value'][ $opt_key ];
1114
+			if ( isset( $field['value'][$opt_key] ) && $field['options'][$opt_key] != $field['value'][$opt_key] ) {
1115
+				$other_val = $field['value'][$opt_key];
1116 1116
 			}
1117 1117
 		} else {
1118 1118
 			/**
@@ -1124,8 +1124,8 @@  discard block
 block discarded – undo
1124 1124
 				// Multi-select dropdowns - key is not preserved
1125 1125
 				if ( is_array( $field['value'] ) ) {
1126 1126
 					$o_key = array_search( $temp_val, $field['value'] );
1127
-					if ( isset( $field['value'][ $o_key ] ) ) {
1128
-						unset( $field['value'][ $o_key ], $o_key );
1127
+					if ( isset( $field['value'][$o_key] ) ) {
1128
+						unset( $field['value'][$o_key], $o_key );
1129 1129
 					}
1130 1130
 				} elseif ( $temp_val == $field['value'] ) {
1131 1131
 					// For radio and regular dropdowns
@@ -1167,7 +1167,7 @@  discard block
 block discarded – undo
1167 1167
 			return $other_args;
1168 1168
 		}
1169 1169
 
1170
-		$other_opt  = true;
1170
+		$other_opt = true;
1171 1171
 
1172 1172
 		self::set_other_name( $args, $other_args );
1173 1173
 		self::set_other_value( $args, $other_args );
@@ -1317,7 +1317,7 @@  discard block
 block discarded – undo
1317 1317
 		if ( is_array( $val ) ) {
1318 1318
 			foreach ( $val as $k => $v ) {
1319 1319
 				if ( is_string( $v ) ) {
1320
-					$val[ $k ] = str_replace( $replace, $replace_with, $v );
1320
+					$val[$k] = str_replace( $replace, $replace_with, $v );
1321 1321
 					unset( $k, $v );
1322 1322
 				}
1323 1323
 			}
@@ -1670,7 +1670,7 @@  discard block
 block discarded – undo
1670 1670
 			$countries['class'] = 'frm-countries-opts';
1671 1671
 		}
1672 1672
 
1673
-		$prepop[ __( 'Countries', 'formidable' ) ] = $countries;
1673
+		$prepop[__( 'Countries', 'formidable' )] = $countries;
1674 1674
 
1675 1675
 		// State abv.
1676 1676
 		$states    = self::get_us_states();
@@ -1680,7 +1680,7 @@  discard block
 block discarded – undo
1680 1680
 			$state_abv['class'] = 'frm-state-abv-opts';
1681 1681
 		}
1682 1682
 
1683
-		$prepop[ __( 'U.S. State Abbreviations', 'formidable' ) ] = $state_abv;
1683
+		$prepop[__( 'U.S. State Abbreviations', 'formidable' )] = $state_abv;
1684 1684
 
1685 1685
 		// States.
1686 1686
 		$states = array_values( $states );
@@ -1689,7 +1689,7 @@  discard block
 block discarded – undo
1689 1689
 			$states['class'] = 'frm-states-opts';
1690 1690
 		}
1691 1691
 
1692
-		$prepop[ __( 'U.S. States', 'formidable' ) ] = $states;
1692
+		$prepop[__( 'U.S. States', 'formidable' )] = $states;
1693 1693
 		unset( $state_abv, $states );
1694 1694
 
1695 1695
 		// Age.
@@ -1707,7 +1707,7 @@  discard block
 block discarded – undo
1707 1707
 			$ages['class'] = 'frm-age-opts';
1708 1708
 		}
1709 1709
 
1710
-		$prepop[ __( 'Age', 'formidable' ) ] = $ages;
1710
+		$prepop[__( 'Age', 'formidable' )] = $ages;
1711 1711
 
1712 1712
 		// Satisfaction.
1713 1713
 		$satisfaction = array(
@@ -1722,7 +1722,7 @@  discard block
 block discarded – undo
1722 1722
 			$satisfaction['class'] = 'frm-satisfaction-opts';
1723 1723
 		}
1724 1724
 
1725
-		$prepop[ __( 'Satisfaction', 'formidable' ) ] = $satisfaction;
1725
+		$prepop[__( 'Satisfaction', 'formidable' )] = $satisfaction;
1726 1726
 
1727 1727
 		// Importance.
1728 1728
 		$importance = array(
@@ -1737,7 +1737,7 @@  discard block
 block discarded – undo
1737 1737
 			$importance['class'] = 'frm-importance-opts';
1738 1738
 		}
1739 1739
 
1740
-		$prepop[ __( 'Importance', 'formidable' ) ] = $importance;
1740
+		$prepop[__( 'Importance', 'formidable' )] = $importance;
1741 1741
 
1742 1742
 		// Agreement.
1743 1743
 		$agreement = array(
@@ -1752,7 +1752,7 @@  discard block
 block discarded – undo
1752 1752
 			$agreement['class'] = 'frm-agreement-opts';
1753 1753
 		}
1754 1754
 
1755
-		$prepop[ __( 'Agreement', 'formidable' ) ] = $agreement;
1755
+		$prepop[__( 'Agreement', 'formidable' )] = $agreement;
1756 1756
 
1757 1757
 		// Likely.
1758 1758
 		$likely = array(
@@ -1767,7 +1767,7 @@  discard block
 block discarded – undo
1767 1767
 			$likely['class'] = 'frm-likely-opts';
1768 1768
 		}
1769 1769
 
1770
-		$prepop[ __( 'Likely', 'formidable' ) ] = $likely;
1770
+		$prepop[__( 'Likely', 'formidable' )] = $likely;
1771 1771
 
1772 1772
 		$prepop = apply_filters( 'frm_bulk_field_choices', $prepop );
1773 1773
 	}
@@ -1942,16 +1942,16 @@  discard block
 block discarded – undo
1942 1942
 	 */
1943 1943
 	private static function fill_image_setting_options( $options, &$args ) {
1944 1944
 		foreach ( $options as $key => $option ) {
1945
-			$args['options'][ $key ] = $option;
1945
+			$args['options'][$key] = $option;
1946 1946
 
1947 1947
 			if ( ! empty( $option['addon'] ) ) {
1948
-				$args['options'][ $key ]['custom_attrs'] = self::fill_image_setting_addon_link( $option );
1948
+				$args['options'][$key]['custom_attrs'] = self::fill_image_setting_addon_link( $option );
1949 1949
 			}
1950 1950
 
1951
-			unset( $args['options'][ $key ]['addon'] );
1951
+			unset( $args['options'][$key]['addon'] );
1952 1952
 			$fill = array( 'upgrade', 'message', 'content' );
1953 1953
 			foreach ( $fill as $f ) {
1954
-				unset( $args['options'][ $key ][ $f ], $f );
1954
+				unset( $args['options'][$key][$f], $f );
1955 1955
 			}
1956 1956
 		}
1957 1957
 	}
@@ -1972,8 +1972,8 @@  discard block
 block discarded – undo
1972 1972
 
1973 1973
 		$fill = array( 'upgrade', 'message', 'content' );
1974 1974
 		foreach ( $fill as $f ) {
1975
-			if ( isset( $option[ $f ] ) ) {
1976
-				$custom_attrs[ 'data-' . $f ] = $option[ $f ];
1975
+			if ( isset( $option[$f] ) ) {
1976
+				$custom_attrs['data-' . $f] = $option[$f];
1977 1977
 			}
1978 1978
 		}
1979 1979
 
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -180,7 +180,8 @@  discard block
 block discarded – undo
180 180
 	 * @param mixed $value
181 181
 	 */
182 182
 	private static function get_posted_field_setting( $setting, &$value ) {
183
-		if ( ! isset( $_POST['field_options'][ $setting ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
183
+		if ( ! isset( $_POST['field_options'][ $setting ] ) ) {
184
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
184 185
 			return;
185 186
 		}
186 187
 
@@ -1084,7 +1085,8 @@  discard block
 block discarded – undo
1084 1085
 
1085 1086
 		// Check posted vals before checking saved values
1086 1087
 		// For fields inside repeating sections - note, don't check if $pointer is true because it will often be zero
1087
-		if ( $parent && isset( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
1088
+		if ( $parent && isset( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ] ) ) {
1089
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
1088 1090
 			if ( FrmField::is_field_with_multiple_values( $field ) ) {
1089 1091
 				// phpcs:ignore WordPress.Security.NonceVerification.Missing
1090 1092
 				$other_val = isset( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ][ $opt_key ] ) ? sanitize_text_field( wp_unslash( $_POST['item_meta'][ $parent ][ $pointer ]['other'][ $field['id'] ][ $opt_key ] ) ) : '';
@@ -1094,7 +1096,8 @@  discard block
 block discarded – undo
1094 1096
 
1095 1097
 			return $other_val;
1096 1098
 
1097
-		} elseif ( isset( $field['id'] ) && isset( $_POST['item_meta']['other'][ $field['id'] ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing
1099
+		} elseif ( isset( $field['id'] ) && isset( $_POST['item_meta']['other'][ $field['id'] ] ) ) {
1100
+// phpcs:ignore WordPress.Security.NonceVerification.Missing
1098 1101
 			// For normal fields
1099 1102
 
1100 1103
 			if ( FrmField::is_field_with_multiple_values( $field ) ) {
Please login to merge, or discard this patch.