Completed
Push — develop ( 31c9ca...168da6 )
by Zack
38:08 queued 17:59
created
includes/fields/class-gravityview-field-source-url.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -29,24 +29,24 @@
 block discarded – undo
29 29
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
30 30
 
31 31
 		// Don't link to entry; doesn't make sense.
32
-		unset( $field_options['show_as_link'] );
32
+		unset( $field_options[ 'show_as_link' ] );
33 33
 
34
-		if( 'edit' === $context ) {
34
+		if ( 'edit' === $context ) {
35 35
 			return $field_options;
36 36
 		}
37 37
 
38 38
 		$add_options = array();
39
-		$add_options['link_to_source'] = array(
39
+		$add_options[ 'link_to_source' ] = array(
40 40
 			'type' => 'checkbox',
41 41
 			'label' => __( 'Link to URL:', 'gravityview' ),
42
-			'desc' => __('Display as a link to the Source URL', 'gravityview'),
42
+			'desc' => __( 'Display as a link to the Source URL', 'gravityview' ),
43 43
 			'value' => false,
44 44
 			'merge_tags' => false,
45 45
 		);
46
-		$add_options['source_link_text'] = array(
46
+		$add_options[ 'source_link_text' ] = array(
47 47
 			'type' => 'text',
48 48
 			'label' => __( 'Link Text:', 'gravityview' ),
49
-			'desc' => __('Customize the link text. If empty, the link text will be the URL.', 'gravityview'),
49
+			'desc' => __( 'Customize the link text. If empty, the link text will be the URL.', 'gravityview' ),
50 50
 			'value' => NULL,
51 51
 			'merge_tags' => true,
52 52
 			'requires' => 'link_to_source',
Please login to merge, or discard this patch.
future/includes/class-gv-settings-addon.php 1 patch
Spacing   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 		$setting_tabs = parent::get_app_settings_tabs();
119 119
 
120 120
 		foreach ( $setting_tabs as &$tab ) {
121
-			if ( 'uninstall' !== $tab['name'] ) {
121
+			if ( 'uninstall' !== $tab[ 'name' ] ) {
122 122
 				continue;
123 123
 			}
124 124
 
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 			}
130 130
 
131 131
 			// Add trash can icon to resemble the look and feel of the GF Settings page
132
-			$tab['icon'] = 'dashicons-trash';
132
+			$tab[ 'icon' ] = 'dashicons-trash';
133 133
 		}
134 134
 
135 135
 		return array_filter( $setting_tabs );
@@ -144,8 +144,8 @@  discard block
 block discarded – undo
144 144
 	 */
145 145
 	public function register_no_conflict( $items ) {
146 146
 
147
-		$items[] = 'gform_settings';
148
-		$items[] = 'gv-admin-edd-license';
147
+		$items[ ] = 'gform_settings';
148
+		$items[ ] = 'gv-admin-edd-license';
149 149
 
150 150
 		return $items;
151 151
 	}
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 
197 197
 		$href = add_query_arg( array( 'post_type' => 'gravityview', 'page' => 'gravityview_settings', 'view' => 'uninstall' ), admin_url( 'edit.php' ) );
198 198
 
199
-		$uninstall_button = '<a href="' . esc_url( $href ) . '" class="' . gravityview_sanitize_html_class( $html_class ). '">' . esc_html__( 'Uninstall GravityView', 'gravityview' ) . '</a>';
199
+		$uninstall_button = '<a href="' . esc_url( $href ) . '" class="' . gravityview_sanitize_html_class( $html_class ) . '">' . esc_html__( 'Uninstall GravityView', 'gravityview' ) . '</a>';
200 200
 
201 201
 		$html .= $uninstall_button;
202 202
 
@@ -215,10 +215,10 @@  discard block
 block discarded – undo
215 215
 	 */
216 216
 	public function settings_save( $field, $echo = true ) {
217 217
 
218
-		$field['type']  = 'submit';
219
-		$field['name']  = 'gform-settings-save';
220
-		$field['class'] = 'button button-primary primary button-hero';
221
-		$field['value'] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
218
+		$field[ 'type' ]  = 'submit';
219
+		$field[ 'name' ]  = 'gform-settings-save';
220
+		$field[ 'class' ] = 'button button-primary primary button-hero';
221
+		$field[ 'value' ] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
222 222
 
223 223
 		$html = $this->as_html( $field, false );
224 224
 
@@ -240,8 +240,8 @@  discard block
 block discarded – undo
240 240
 	 */
241 241
 	public function modify_app_settings_menu_title( $setting_tabs ) {
242 242
 
243
-		$setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview' );
244
-		$setting_tabs[0]['icon']  = 'dashicons-admin-settings';
243
+		$setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' );
244
+		$setting_tabs[ 0 ][ 'icon' ]  = 'dashicons-admin-settings';
245 245
 
246 246
 		return $setting_tabs;
247 247
 	}
@@ -489,7 +489,7 @@  discard block
 block discarded – undo
489 489
 					$i = 0;
490 490
 					while ( $i < 11 ) {
491 491
 						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_' . $i . '" value="' . $i . '" type="radio"> ' . $i . '</label></li>';
492
-						$i ++;
492
+						$i++;
493 493
 					}
494 494
 					?>
495 495
 				</ul>
@@ -694,14 +694,14 @@  discard block
 block discarded – undo
694 694
 	 */
695 695
 	public function as_html( $field, $echo = true ) {
696 696
 
697
-		$field['type'] = ( isset( $field['type'] ) && in_array( $field['type'], array( 'submit', 'reset', 'button' ) ) ) ? $field['type'] : 'submit';
697
+		$field[ 'type' ] = ( isset( $field[ 'type' ] ) && in_array( $field[ 'type' ], array( 'submit', 'reset', 'button' ) ) ) ? $field[ 'type' ] : 'submit';
698 698
 
699 699
 		$attributes    = $this->get_field_attributes( $field );
700 700
 		$default_value = Utils::get( $field, 'value', Utils::get( $field, 'default_value' ) );
701
-		$value         = $this->get( $field['name'], $default_value );
701
+		$value         = $this->get( $field[ 'name' ], $default_value );
702 702
 
703
-		$attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary primary gfbutton';
704
-		$name                = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_' . $field['name'];
703
+		$attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary primary gfbutton';
704
+		$name                = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ];
705 705
 
706 706
 		if ( empty( $value ) ) {
707 707
 			$value = __( 'Update Settings', 'gravityview' );
@@ -710,7 +710,7 @@  discard block
 block discarded – undo
710 710
 		$attributes = $this->get_field_attributes( $field );
711 711
 
712 712
 		$html = '<input
713
-                    type="' . $field['type'] . '"
713
+                    type="' . $field[ 'type' ] . '"
714 714
                     name="' . esc_attr( $name ) . '"
715 715
                     value="' . $value . '" ' .
716 716
 				implode( ' ', $attributes ) .
@@ -744,7 +744,7 @@  discard block
 block discarded – undo
744 744
 	 */
745 745
 	public function is_save_postback() {
746 746
 
747
-		return isset( $_POST['gform-settings-save'] ) && isset( $_POST['_gravityview_save_settings_nonce'] );
747
+		return isset( $_POST[ 'gform-settings-save' ] ) && isset( $_POST[ '_gravityview_save_settings_nonce' ] );
748 748
 	}
749 749
 
750 750
 	/**
@@ -856,7 +856,7 @@  discard block
 block discarded – undo
856 856
 
857 857
 		$scripts = parent::scripts();
858 858
 
859
-		$scripts[] = array(
859
+		$scripts[ ] = array(
860 860
 				'handle'  => 'gform_tooltip_init',
861 861
 				'enqueue' => array(
862 862
 						array(
@@ -884,11 +884,11 @@  discard block
 block discarded – undo
884 884
 		);
885 885
 
886 886
 		// This file was removed from 2.5
887
-		if( ! gravityview()->plugin->is_GF_25() ) {
888
-			$deps[] = 'gform_tooltip';
887
+		if ( ! gravityview()->plugin->is_GF_25() ) {
888
+			$deps[ ] = 'gform_tooltip';
889 889
 		}
890 890
 
891
-		$styles[] = array(
891
+		$styles[ ] = array(
892 892
 			'handle'  => 'gravityview_settings',
893 893
 			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
894 894
 			'version' => Plugin::$version,
@@ -975,7 +975,7 @@  discard block
 block discarded – undo
975 975
 						'name'          => 'support-email',
976 976
 						'type'          => 'text',
977 977
 						'validate'      => 'email',
978
-						'default_value' => $default_settings['support-email'],
978
+						'default_value' => $default_settings[ 'support-email' ],
979 979
 						'label'         => __( 'Support Email', 'gravityview' ),
980 980
 						'description'   => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ),
981 981
 						'class'         => 'code regular-text',
@@ -987,7 +987,7 @@  discard block
 block discarded – undo
987 987
 						'name'          => 'support_port',
988 988
 						'type'          => 'radio',
989 989
 						'label'         => __( 'Show Support Port?', 'gravityview' ),
990
-						'default_value' => $default_settings['support_port'],
990
+						'default_value' => $default_settings[ 'support_port' ],
991 991
 						'horizontal'    => 1,
992 992
 						'choices'       => array(
993 993
 								array(
@@ -1006,7 +1006,7 @@  discard block
 block discarded – undo
1006 1006
 						'name'          => 'no-conflict-mode',
1007 1007
 						'type'          => 'radio',
1008 1008
 						'label'         => __( 'No-Conflict Mode', 'gravityview' ),
1009
-						'default_value' => $default_settings['no-conflict-mode'],
1009
+						'default_value' => $default_settings[ 'no-conflict-mode' ],
1010 1010
 						'horizontal'    => 1,
1011 1011
 						'choices'       => array(
1012 1012
 								array(
@@ -1028,7 +1028,7 @@  discard block
 block discarded – undo
1028 1028
 								'name'          => 'rest_api',
1029 1029
 								'type'          => 'radio',
1030 1030
 								'label'         => __( 'REST API', 'gravityview' ),
1031
-								'default_value' => $default_settings['rest_api'],
1031
+								'default_value' => $default_settings[ 'rest_api' ],
1032 1032
 								'horizontal'    => 1,
1033 1033
 								'choices'       => array(
1034 1034
 										array(
@@ -1047,7 +1047,7 @@  discard block
 block discarded – undo
1047 1047
 					'name' => 'powered_by',
1048 1048
 					'type' => 'checkbox',
1049 1049
 					'label' => __( 'Display "Powered By" Link', 'gravityview' ),
1050
-					'default_value' => $default_settings['powered_by'],
1050
+					'default_value' => $default_settings[ 'powered_by' ],
1051 1051
 					'choices' => array(
1052 1052
 						array(
1053 1053
 							'label' => esc_html__( 'Display a "Powered by GravityView" link', 'gravityview' ),
@@ -1072,7 +1072,7 @@  discard block
 block discarded – undo
1072 1072
 						'name'          => 'beta',
1073 1073
 						'type'          => 'checkbox',
1074 1074
 						'label'         => __( 'Become a Beta Tester', 'gravityview' ),
1075
-						'default_value' => $default_settings['beta'],
1075
+						'default_value' => $default_settings[ 'beta' ],
1076 1076
 						'horizontal'    => 1,
1077 1077
 						'choices'       => array(
1078 1078
 								array(
@@ -1106,17 +1106,17 @@  discard block
 block discarded – undo
1106 1106
 		 * @since 1.7.4
1107 1107
 		 */
1108 1108
 		foreach ( $fields as &$field ) {
1109
-			$field['name']          = isset( $field['name'] ) ? $field['name'] : Utils::get( $field, 'id' );
1110
-			$field['label']         = isset( $field['label'] ) ? $field['label'] : Utils::get( $field, 'title' );
1111
-			$field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : Utils::get( $field, 'default' );
1112
-			$field['description']   = isset( $field['description'] ) ? $field['description'] : Utils::get( $field, 'subtitle' );
1109
+			$field[ 'name' ]          = isset( $field[ 'name' ] ) ? $field[ 'name' ] : Utils::get( $field, 'id' );
1110
+			$field[ 'label' ]         = isset( $field[ 'label' ] ) ? $field[ 'label' ] : Utils::get( $field, 'title' );
1111
+			$field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : Utils::get( $field, 'default' );
1112
+			$field[ 'description' ]   = isset( $field[ 'description' ] ) ? $field[ 'description' ] : Utils::get( $field, 'subtitle' );
1113 1113
 
1114 1114
 			if ( $disabled_attribute ) {
1115
-				$field['disabled'] = $disabled_attribute;
1115
+				$field[ 'disabled' ] = $disabled_attribute;
1116 1116
 			}
1117 1117
 
1118
-			if ( empty( $field['disabled'] ) ) {
1119
-				unset( $field['disabled'] );
1118
+			if ( empty( $field[ 'disabled' ] ) ) {
1119
+				unset( $field[ 'disabled' ] );
1120 1120
 			}
1121 1121
 		}
1122 1122
 
@@ -1128,23 +1128,23 @@  discard block
 block discarded – undo
1128 1128
 					'description' => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview' ),
1129 1129
 					'type' => 'edd_license',
1130 1130
 					'data-pending-text' => __( 'Verifying license&hellip;', 'gravityview' ),
1131
-					'default_value' => $default_settings['license_key'],
1131
+					'default_value' => $default_settings[ 'license_key' ],
1132 1132
 					'class' => ( '' == $this->get( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
1133 1133
 			),
1134 1134
 			array(
1135 1135
 					'name' => 'license_key_response',
1136
-					'default_value' => $default_settings['license_key_response'],
1136
+					'default_value' => $default_settings[ 'license_key_response' ],
1137 1137
 					'type' => 'hidden',
1138 1138
 			),
1139 1139
 			array(
1140 1140
 					'name' => 'license_key_status',
1141
-					'default_value' => $default_settings['license_key_status'],
1141
+					'default_value' => $default_settings[ 'license_key_status' ],
1142 1142
 					'type' => 'hidden',
1143 1143
 			),
1144 1144
 		);
1145 1145
 
1146 1146
 		if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
1147
-			$license_fields[0] = array_merge( $license_fields[0], array(
1147
+			$license_fields[ 0 ] = array_merge( $license_fields[ 0 ], array(
1148 1148
 				'disabled' => true,
1149 1149
 				'title'    => __( 'The license key is defined by your site\'s configuration file.', 'gravityview' ),
1150 1150
 			) );
@@ -1155,7 +1155,7 @@  discard block
 block discarded – undo
1155 1155
 
1156 1156
 		if ( \gravityview()->plugin->is_GF_25() ) {
1157 1157
 
1158
-			$sections[] = array(
1158
+			$sections[ ] = array(
1159 1159
 					'title'       => __( 'GravityView License', 'gravityview' ),
1160 1160
 					'class'       => 'gform-settings-panel--full gv-settings-panel--license',
1161 1161
 					'description' => $version_info,
@@ -1173,7 +1173,7 @@  discard block
 block discarded – undo
1173 1173
 			) );
1174 1174
 		}
1175 1175
 
1176
-		$sections[] = array(
1176
+		$sections[ ] = array(
1177 1177
 			'title' => ( gravityview()->plugin->is_GF_25() ? __( 'GravityView Settings', 'gravityview' ) : null ),
1178 1178
 			'class' => 'gform-settings-panel--full gv-settings-panel--core',
1179 1179
 			'fields'      => $fields,
@@ -1197,8 +1197,8 @@  discard block
 block discarded – undo
1197 1197
 
1198 1198
 			if ( $disabled_attribute ) {
1199 1199
 				foreach ( $extension_sections as &$section ) {
1200
-					foreach ( $section['fields'] as &$field ) {
1201
-						$field['disabled'] = $disabled_attribute;
1200
+					foreach ( $section[ 'fields' ] as &$field ) {
1201
+						$field[ 'disabled' ] = $disabled_attribute;
1202 1202
 					}
1203 1203
 				}
1204 1204
 			}
@@ -1264,7 +1264,7 @@  discard block
 block discarded – undo
1264 1264
 	public function settings_edd_license( $field, $echo = true ) {
1265 1265
 
1266 1266
 		if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
1267
-			$field['input_type'] = 'password';
1267
+			$field[ 'input_type' ] = 'password';
1268 1268
 		}
1269 1269
 
1270 1270
 		$text = $this->settings_text( $field, false );
@@ -1316,7 +1316,7 @@  discard block
 block discarded – undo
1316 1316
 
1317 1317
 		?>
1318 1318
 
1319
-		<tr id="gaddon-setting-row-<?php echo esc_attr( $field['name'] ); ?>">
1319
+		<tr id="gaddon-setting-row-<?php echo esc_attr( $field[ 'name' ] ); ?>">
1320 1320
 			<td colspan="2">
1321 1321
 				<?php $this->single_setting( $field ); ?>
1322 1322
 			</td>
@@ -1342,8 +1342,8 @@  discard block
 block discarded – undo
1342 1342
 	 */
1343 1343
 	public function single_setting_row( $field ) {
1344 1344
 
1345
-		$field['gv_description'] = Utils::get( $field, 'description' );
1346
-		$field['description']    = Utils::get( $field, 'subtitle' );
1345
+		$field[ 'gv_description' ] = Utils::get( $field, 'description' );
1346
+		$field[ 'description' ]    = Utils::get( $field, 'subtitle' );
1347 1347
 		parent::single_setting_row( $field );
1348 1348
 	}
1349 1349
 
@@ -1404,8 +1404,8 @@  discard block
 block discarded – undo
1404 1404
 		// then we assume it's changed. If it's changed, unset the status and the previous response.
1405 1405
 		if ( ! $added_message && ( $local_key !== $response_key ) ) {
1406 1406
 
1407
-			unset( $posted_settings['license_key_response'] );
1408
-			unset( $posted_settings['license_key_status'] );
1407
+			unset( $posted_settings[ 'license_key_response' ] );
1408
+			unset( $posted_settings[ 'license_key_status' ] );
1409 1409
 
1410 1410
 			\GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
1411 1411
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-custom.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 	 */
57 57
 	public function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
58 58
 
59
-		$entry_default_fields['custom']	= array(
59
+		$entry_default_fields[ 'custom' ] = array(
60 60
 			'label'	=> $this->label,
61 61
 			'type'	=> $this->name,
62 62
 			'desc'	=> $this->description,
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 
70 70
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
71 71
 
72
-		unset ( $field_options['search_filter'], $field_options['show_as_link'], $field_options['new_window'] );
72
+		unset ( $field_options[ 'search_filter' ], $field_options[ 'show_as_link' ], $field_options[ 'new_window' ] );
73 73
 
74 74
 		$new_fields = array(
75 75
 			'content' => array(
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 		);
109 109
 
110 110
 		if ( 'edit' === $context ) {
111
-			unset( $field_options['custom_label'], $field_options['show_label'], $field_options['allow_edit_cap'], $new_fields['wpautop'], $new_fields['oembed'] );
111
+			unset( $field_options[ 'custom_label' ], $field_options[ 'show_label' ], $field_options[ 'allow_edit_cap' ], $new_fields[ 'wpautop' ], $new_fields[ 'oembed' ] );
112 112
 		}
113 113
 
114 114
 		return $new_fields + $field_options;
@@ -142,9 +142,9 @@  discard block
 block discarded – undo
142 142
 
143 143
 		// Loop through the configured Edit Entry fields and add Custom Content fields if there are any
144 144
 		// TODO: Make this available to other custom GV field types
145
-		foreach ( (array) $edit_fields as $edit_field ) {
145
+		foreach ( (array)$edit_fields as $edit_field ) {
146 146
 
147
-			if( 'custom' === \GV\Utils::get( $edit_field, 'id') ) {
147
+			if ( 'custom' === \GV\Utils::get( $edit_field, 'id' ) ) {
148 148
 
149 149
 				$field_data = array(
150 150
 					'label' => \GV\Utils::get( $edit_field, 'custom_label' ),
@@ -157,13 +157,13 @@  discard block
 block discarded – undo
157 157
 					$field_data[ $key ] = GravityView_Merge_Tags::replace_variables( $field_datum, $form, $entry->as_entry(), false, false );
158 158
 				}
159 159
 
160
-				$field_data['cssClass'] = \GV\Utils::get( $edit_field, 'custom_class' );
160
+				$field_data[ 'cssClass' ] = \GV\Utils::get( $edit_field, 'custom_class' );
161 161
 
162
-				$new_fields[] = new GF_Field_HTML( $field_data );
162
+				$new_fields[ ] = new GF_Field_HTML( $field_data );
163 163
 
164 164
 			} else {
165
-				if( isset( $fields[ $i ] ) ) {
166
-					$new_fields[] =  $fields[ $i ];
165
+				if ( isset( $fields[ $i ] ) ) {
166
+					$new_fields[ ] = $fields[ $i ];
167 167
 				}
168 168
 				$i++;
169 169
 			}
Please login to merge, or discard this patch.
includes/admin/metaboxes/views/view-configuration.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -15,25 +15,25 @@  discard block
 block discarded – undo
15 15
 
16 16
 		<div id="directory-fields" class="gv-section">
17 17
 
18
-			<h4><?php esc_html_e( 'Top Widgets', 'gravityview'); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview'); ?></span></h4>
18
+			<h4><?php esc_html_e( 'Top Widgets', 'gravityview' ); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview' ); ?></span></h4>
19 19
 
20
-			<?php do_action('gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID ); ?>
20
+			<?php do_action( 'gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID ); ?>
21 21
 
22
-			<h4><?php esc_html_e( 'Entries Fields', 'gravityview'); ?> <span><?php esc_html_e( 'These fields will be shown for each entry.', 'gravityview'); ?></span></h4>
22
+			<h4><?php esc_html_e( 'Entries Fields', 'gravityview' ); ?> <span><?php esc_html_e( 'These fields will be shown for each entry.', 'gravityview' ); ?></span></h4>
23 23
 
24 24
 			<div id="directory-active-fields" class="gv-grid">
25
-				<?php if(!empty( $curr_template ) ) {
26
-					do_action('gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true );
25
+				<?php if ( ! empty( $curr_template ) ) {
26
+					do_action( 'gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true );
27 27
 				} ?>
28 28
 			</div>
29 29
 
30
-			<h4><?php esc_html_e( 'Bottom Widgets', 'gravityview'); ?> <i class="gf_tooltip gv_tooltip" title="<?php esc_attr_e( 'These widgets will be shown below entries.', 'gravityview'); ?>"></i></h4>
30
+			<h4><?php esc_html_e( 'Bottom Widgets', 'gravityview' ); ?> <i class="gf_tooltip gv_tooltip" title="<?php esc_attr_e( 'These widgets will be shown below entries.', 'gravityview' ); ?>"></i></h4>
31 31
 
32 32
 			<?php
33 33
 
34
-                do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
34
+                do_action( 'gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
35 35
 
36
-    			do_action('gravityview_render_field_pickers', 'directory' );
36
+    			do_action( 'gravityview_render_field_pickers', 'directory' );
37 37
 
38 38
             ?>
39 39
 
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
             <div id="directory-available-widgets" class="hide-if-js gv-tooltip">
42 42
 				<div aria-live="polite" role="listbox" class="gv-items-picker-container gv-widget-picker-container" data-layout="grid" data-cols="2">
43 43
                 	<button class="close" role="button" aria-label="<?php esc_html_e( 'Close', 'gravityview' ); ?>"><i class="dashicons dashicons-dismiss"></i></button>
44
-					<?php do_action('gravityview_render_available_widgets' ); ?>
44
+					<?php do_action( 'gravityview_render_available_widgets' ); ?>
45 45
 				</div>
46 46
             </div>
47 47
 
@@ -59,21 +59,21 @@  discard block
 block discarded – undo
59 59
 		<div id="single-fields" class="gv-section">
60 60
 
61 61
 			<div class="notice notice-warning inline is-dismissible">
62
-				<h3><?php printf( esc_html__( 'Note: %s', 'gravityview' ), sprintf( esc_html__( 'No fields link to the %s layout.', 'gravityview'), esc_html__( 'Single Entry', 'gravityview' ) ) ); ?></h3>
62
+				<h3><?php printf( esc_html__( 'Note: %s', 'gravityview' ), sprintf( esc_html__( 'No fields link to the %s layout.', 'gravityview' ), esc_html__( 'Single Entry', 'gravityview' ) ) ); ?></h3>
63 63
 				<p><a data-beacon-article-modal="54c67bbae4b0512429885516" href="https://docs.gravityview.co/article/70-linking-to-a-single-entry"><?php printf( esc_html__( 'Learn how to link to %s', 'gravityview' ), esc_html__( 'Single Entry', 'gravityview' ) ); ?></a></p>
64 64
 			</div>
65 65
 
66
-			<h4><?php esc_html_e( 'These fields will be shown in Single Entry layout.', 'gravityview'); ?></h4>
66
+			<h4><?php esc_html_e( 'These fields will be shown in Single Entry layout.', 'gravityview' ); ?></h4>
67 67
 
68 68
 			<div id="single-active-fields" class="gv-grid">
69 69
 				<?php
70
-                if(!empty( $curr_template ) ) {
71
-				    do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
70
+                if ( ! empty( $curr_template ) ) {
71
+				    do_action( 'gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
72 72
                 }
73 73
 			    ?>
74 74
 			</div>
75 75
             <?php
76
-                do_action('gravityview_render_field_pickers', 'single' );
76
+                do_action( 'gravityview_render_field_pickers', 'single' );
77 77
 			?>
78 78
 		</div>
79 79
 
@@ -84,20 +84,20 @@  discard block
 block discarded – undo
84 84
 		<div id="edit-fields" class="gv-section">
85 85
 
86 86
 			<div class="notice notice-warning inline is-dismissible">
87
-				<h3><?php printf( esc_html__( 'Note: %s', 'gravityview' ), sprintf( esc_html__( 'No fields link to the %s layout.', 'gravityview'), esc_html__( 'Edit Entry', 'gravityview' ) ) ); ?></h3>
87
+				<h3><?php printf( esc_html__( 'Note: %s', 'gravityview' ), sprintf( esc_html__( 'No fields link to the %s layout.', 'gravityview' ), esc_html__( 'Edit Entry', 'gravityview' ) ) ); ?></h3>
88 88
 				<p><a data-beacon-article-modal="54c67bb9e4b0512429885513" href="https://docs.gravityview.co/article/67-configuring-the-edit-entry-screen"><?php printf( esc_html__( 'Learn how to link to %s', 'gravityview' ), esc_html__( 'Edit Entry', 'gravityview' ) ); ?></a></p>
89 89
 			</div>
90 90
 
91
-			<h4><?php esc_html_e( 'Fields shown when editing an entry.', 'gravityview'); ?> <span><?php esc_html_e('If not configured, all form fields will be displayed.', 'gravityview'); ?></span></h4>
91
+			<h4><?php esc_html_e( 'Fields shown when editing an entry.', 'gravityview' ); ?> <span><?php esc_html_e( 'If not configured, all form fields will be displayed.', 'gravityview' ); ?></span></h4>
92 92
 
93 93
 			<div id="edit-active-fields" class="gv-grid">
94 94
 				<?php
95
-				do_action('gravityview_render_directory_active_areas', apply_filters( 'gravityview/template/edit', 'default_table_edit' ), 'edit', $post->ID, true );
95
+				do_action( 'gravityview_render_directory_active_areas', apply_filters( 'gravityview/template/edit', 'default_table_edit' ), 'edit', $post->ID, true );
96 96
 				?>
97 97
 			</div>
98 98
 
99 99
 			<?php
100
-			    do_action('gravityview_render_field_pickers', 'edit' );
100
+			    do_action( 'gravityview_render_field_pickers', 'edit' );
101 101
 			?>
102 102
 
103 103
 		</div>
Please login to merge, or discard this patch.
includes/admin/class.render.settings.php 1 patch
Spacing   +85 added lines, -85 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 
54 54
 		$is_table_layout = preg_match( '/table/ism', $template_id );
55 55
 
56
-		if( 'field' === $field_type ) {
56
+		if ( 'field' === $field_type ) {
57 57
 
58 58
 			// Default options - fields
59 59
 			$field_options = array(
@@ -105,11 +105,11 @@  discard block
 block discarded – undo
105 105
 			);
106 106
 
107 107
 			// Match Table as well as DataTables
108
-			if( $is_table_layout && 'directory' === $context ) {
109
-				$field_options['width'] = array(
108
+			if ( $is_table_layout && 'directory' === $context ) {
109
+				$field_options[ 'width' ] = array(
110 110
 					'type' => 'number',
111
-					'label' => __('Percent Width', 'gravityview'),
112
-					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview'),
111
+					'label' => __( 'Percent Width', 'gravityview' ),
112
+					'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview' ),
113 113
 					'class' => 'code widefat',
114 114
 					'value' => '',
115 115
 					'priority' => 200,
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 
122 122
 		// Remove suffix ":" from the labels to standardize style. Using trim() instead of rtrim() for i18n.
123 123
 		foreach ( $field_options as $key => $field_option ) {
124
-			$field_options[ $key ]['label'] = trim( $field_options[ $key ]['label'], ':' );
124
+			$field_options[ $key ][ 'label' ] = trim( $field_options[ $key ][ 'label' ], ':' );
125 125
 		}
126 126
 
127 127
 		/**
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 				switch ( $key ) {
157 157
 					case 'show_as_link':
158 158
 						$_group = 'display';
159
-						$field_option['priority'] = 100;
159
+						$field_option[ 'priority' ] = 100;
160 160
 						break;
161 161
 					default:
162 162
 						$_group = \GV\Utils::get( $field_option, 'group', 'display' );
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 			}
172 172
 
173 173
 			$field_options = array();
174
-			foreach ( self::get_field_groups() as $group_key => $group_name  ) {
174
+			foreach ( self::get_field_groups() as $group_key => $group_name ) {
175 175
 				$field_options[ $group_key ] = \GV\Utils::get( $option_groups, $group_key, array() );
176 176
 			}
177 177
 
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 			return 0;
203 203
 		}
204 204
 
205
-		return ( $a_priority < $b_priority ) ? - 1 : 1;
205
+		return ( $a_priority < $b_priority ) ? -1 : 1;
206 206
 	}
207 207
 
208 208
 	/**
@@ -227,8 +227,8 @@  discard block
 block discarded – undo
227 227
 			'manage_options' => __( 'Administrator', 'gravityview' ),
228 228
 		);
229 229
 
230
-		if( is_multisite() ) {
231
-			$select_cap_choices['manage_network'] = __('Multisite Super Admin', 'gravityview' );
230
+		if ( is_multisite() ) {
231
+			$select_cap_choices[ 'manage_network' ] = __( 'Multisite Super Admin', 'gravityview' );
232 232
 		}
233 233
 
234 234
 		/**
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
241 241
 		 * @param  string $context     Optional. What context are we in? Example: `single` or `directory`
242 242
 		 * @param  string $input_type  Optional. (textarea, list, select, etc.)
243 243
 		 */
244
-		$select_cap_choices = apply_filters('gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
244
+		$select_cap_choices = apply_filters( 'gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );
245 245
 
246 246
 		return $select_cap_choices;
247 247
 	}
@@ -268,9 +268,9 @@  discard block
 block discarded – undo
268 268
 	 */
269 269
 	public static function render_field_options( $form_id, $field_type, $template_id, $field_id, $field_label, $area, $input_type = NULL, $uniqid = '', $current = '', $context = 'single', $item = array() ) {
270 270
 
271
-		if( empty( $uniqid ) ) {
271
+		if ( empty( $uniqid ) ) {
272 272
 			//generate a unique field id
273
-			$uniqid = uniqid('', false);
273
+			$uniqid = uniqid( '', false );
274 274
 		}
275 275
 
276 276
 		$grouped = ( 'field' === $field_type );
@@ -278,24 +278,24 @@  discard block
 block discarded – undo
278 278
 		// get field/widget options
279 279
 		$option_groups = self::get_default_field_options( $field_type, $template_id, $field_id, $context, $input_type, $form_id, $grouped );
280 280
 
281
-		if( ! $grouped ) {
281
+		if ( ! $grouped ) {
282 282
 			$option_groups = array( $option_groups );
283 283
 		}
284 284
 
285 285
 		$option_groups = array_filter( $option_groups );
286 286
 
287 287
 		// two different post arrays, depending of the field type
288
-		$name_prefix = $field_type .'s' .'['. $area .']['. $uniqid .']';
288
+		$name_prefix = $field_type . 's' . '[' . $area . '][' . $uniqid . ']';
289 289
 
290 290
 		// build output
291
-		$hidden_fields  = '<input type="hidden" class="field-key" name="'. $name_prefix .'[id]" value="'. esc_attr( $field_id ) .'">';
292
-		$hidden_fields .= '<input type="hidden" class="field-label" name="'. $name_prefix .'[label]" value="'. esc_attr( $field_label ) .'">';
291
+		$hidden_fields  = '<input type="hidden" class="field-key" name="' . $name_prefix . '[id]" value="' . esc_attr( $field_id ) . '">';
292
+		$hidden_fields .= '<input type="hidden" class="field-label" name="' . $name_prefix . '[label]" value="' . esc_attr( $field_label ) . '">';
293 293
 
294 294
 		$form_title = '';
295 295
 		if ( $form_id ) {
296
-			$hidden_fields .= '<input type="hidden" class="field-form-id" name="'. $name_prefix .'[form_id]" value="'. esc_attr( $form_id ) .'">';
296
+			$hidden_fields .= '<input type="hidden" class="field-form-id" name="' . $name_prefix . '[form_id]" value="' . esc_attr( $form_id ) . '">';
297 297
 			$form = GVCommon::get_form( $form_id );
298
-			$form_title = $form['title'];
298
+			$form_title = $form[ 'title' ];
299 299
 		}
300 300
 
301 301
 		// If there are no options, return what we got.
@@ -303,14 +303,14 @@  discard block
 block discarded – undo
303 303
 			return $hidden_fields . '<!-- No Options -->'; // The HTML comment is here for checking if the output is empty in render_label()
304 304
 		}
305 305
 
306
-		$settings_title = esc_attr( sprintf( __( '%s Settings', 'gravityview' ) , strip_tags( html_entity_decode( $field_label ) ) ) );
306
+		$settings_title = esc_attr( sprintf( __( '%s Settings', 'gravityview' ), strip_tags( html_entity_decode( $field_label ) ) ) );
307 307
 
308 308
 		$field_details = '';
309 309
 
310 310
 		// Get the pretty name for the input type
311 311
 		$gv_field = GravityView_Fields::get( $input_type );
312 312
 
313
-		if( $gv_field ) {
313
+		if ( $gv_field ) {
314 314
 			$input_type_label = $gv_field->label;
315 315
 		} else {
316 316
 			$input_type_label = $input_type;
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 			}
325 325
 
326 326
 			if ( $grouped ) {
327
-				$group_name     = rgar( self::get_field_groups(), $group_key, '' );
327
+				$group_name = rgar( self::get_field_groups(), $group_key, '' );
328 328
 				$field_settings .= '<fieldset class="item-settings-group item-settings-group-' . esc_attr( $group_key ) . '">';
329 329
 				$field_settings .= '<legend>' . esc_attr( $group_name ) . '</legend>';
330 330
 			}
@@ -341,15 +341,15 @@  discard block
 block discarded – undo
341 341
 				}
342 342
 
343 343
 				$show_if = '';
344
-				if ( ! empty( $option['requires'] ) ) {
345
-					$show_if .= sprintf( ' data-requires="%s"', $option['requires'] );
344
+				if ( ! empty( $option[ 'requires' ] ) ) {
345
+					$show_if .= sprintf( ' data-requires="%s"', $option[ 'requires' ] );
346 346
 				}
347 347
 
348
-				if ( ! empty( $option['requires_not'] ) ) {
349
-					$show_if .= sprintf( ' data-requires-not="%s"', $option['requires_not'] );
348
+				if ( ! empty( $option[ 'requires_not' ] ) ) {
349
+					$show_if .= sprintf( ' data-requires-not="%s"', $option[ 'requires_not' ] );
350 350
 				}
351 351
 
352
-				switch ( $option['type'] ) {
352
+				switch ( $option[ 'type' ] ) {
353 353
 					// Hide hidden fields
354 354
 					case 'hidden':
355 355
 						$field_settings .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . ' screen-reader-text">' . $field_output . '</div>';
@@ -367,30 +367,30 @@  discard block
 block discarded – undo
367 367
 		$item_details = '';
368 368
 		$subtitle = '';
369 369
 
370
-		if( 'field' === $field_type ) {
371
-			$subtitle = ! empty( $item['subtitle'] ) ? '<div class="subtitle">' . $item['subtitle'] . '</div>' : '';
370
+		if ( 'field' === $field_type ) {
371
+			$subtitle = ! empty( $item[ 'subtitle' ] ) ? '<div class="subtitle">' . $item[ 'subtitle' ] . '</div>' : '';
372 372
 
373 373
 			$item_details .= '
374 374
 			<div class="gv-field-details--container">
375
-				<label class="gv-field-details--toggle">' . esc_html__( 'Field Details', 'gravityview' ) .' <i class="dashicons dashicons-arrow-down"></i></label>
375
+				<label class="gv-field-details--toggle">' . esc_html__( 'Field Details', 'gravityview' ) . ' <i class="dashicons dashicons-arrow-down"></i></label>
376 376
 				<section class="gv-field-details gv-field-details--closed">';
377 377
 
378 378
 				if ( $field_id && is_numeric( $field_id ) ) {
379 379
 				$item_details .= '
380 380
 					<div class="gv-field-detail gv-field-detail--field">
381
-						<span class="gv-field-detail--label">' . esc_html__( 'Field ID', 'gravityview' ) .'</span><span class="gv-field-detail--value">#{{field_id}}</span>
381
+						<span class="gv-field-detail--label">' . esc_html__( 'Field ID', 'gravityview' ) . '</span><span class="gv-field-detail--value">#{{field_id}}</span>
382 382
 					</div>';
383 383
 			    }
384 384
 
385 385
 				$item_details .= '
386 386
 					<div class="gv-field-detail gv-field-detail--type">
387
-						<span class="gv-field-detail--label">' . esc_html_x( 'Type', 'The type of field being configured (eg: "Single Line Text")', 'gravityview' ) .'</span><span class="gv-field-detail--value">{{input_type_label}}</span>
387
+						<span class="gv-field-detail--label">' . esc_html_x( 'Type', 'The type of field being configured (eg: "Single Line Text")', 'gravityview' ) . '</span><span class="gv-field-detail--value">{{input_type_label}}</span>
388 388
 					</div>';
389 389
 
390
-				if( $form_id ) {
390
+				if ( $form_id ) {
391 391
 					$item_details .= '
392 392
 					<div class="gv-field-detail gv-field-detail--form">
393
-						<span class="gv-field-detail--label">' . esc_html__( 'Form', 'gravityview' ) .'</span><span class="gv-field-detail--value">{{form_title}} (#{{form_id}})</span>
393
+						<span class="gv-field-detail--label">' . esc_html__( 'Form', 'gravityview' ) . '</span><span class="gv-field-detail--value">{{form_title}} (#{{form_id}})</span>
394 394
 					</div>';
395 395
 				}
396 396
 				$item_details .= '
@@ -398,8 +398,8 @@  discard block
 block discarded – undo
398 398
 			</div>';
399 399
 		} else {
400 400
 			$widget_details_content = rgar( $item, 'description', '' );
401
-			if ( ! empty( $item['subtitle'] ) ) {
402
-				$widget_details_content .= ( '' !== $widget_details_content ) ? "\n\n" . $item['subtitle'] : $item['subtitle'];
401
+			if ( ! empty( $item[ 'subtitle' ] ) ) {
402
+				$widget_details_content .= ( '' !== $widget_details_content ) ? "\n\n" . $item[ 'subtitle' ] : $item[ 'subtitle' ];
403 403
 			}
404 404
 
405 405
 			// Intentionally not escaping to allow HTML.
@@ -455,17 +455,17 @@  discard block
 block discarded – undo
455 455
 		 * @deprecated setting index 'default' was replaced by 'value'
456 456
 		 * @see GravityView_FieldType::get_field_defaults
457 457
 		 */
458
-		if( !empty( $option['default'] ) && empty( $option['value'] ) ) {
459
-			$option['value'] = $option['default'];
460
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting '. $name .' details' );
458
+		if ( ! empty( $option[ 'default' ] ) && empty( $option[ 'value' ] ) ) {
459
+			$option[ 'value' ] = $option[ 'default' ];
460
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting ' . $name . ' details' );
461 461
 		}
462 462
 
463 463
 		// prepare to render option field type
464
-		if( isset( $option['type'] ) ) {
464
+		if ( isset( $option[ 'type' ] ) ) {
465 465
 
466 466
 			$type_class = self::load_type_class( $option );
467 467
 
468
-			if( class_exists( $type_class ) ) {
468
+			if ( class_exists( $type_class ) ) {
469 469
 
470 470
 				/** @type GravityView_FieldType $render_type */
471 471
 				$render_type = new $type_class( $name, $option, $curr_value );
@@ -482,7 +482,7 @@  discard block
 block discarded – undo
482 482
 				 * @param[in,out] string $output field class name
483 483
 				 * @param[in] array $option  option field data
484 484
 				 */
485
-				$output = apply_filters( "gravityview/option/output/{$option['type']}" , $output, $option );
485
+				$output = apply_filters( "gravityview/option/output/{$option[ 'type' ]}", $output, $option );
486 486
 			}
487 487
 
488 488
 		} // isset option[type]
@@ -517,27 +517,27 @@  discard block
 block discarded – undo
517 517
 		 * @deprecated setting index 'name' was replaced by 'label'
518 518
 		 * @see GravityView_FieldType::get_field_defaults
519 519
 		 */
520
-		if( isset( $setting['name'] ) && empty( $setting['label'] ) ) {
521
-			$setting['label'] = $setting['name'];
522
-			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting '. $key .' details' );
520
+		if ( isset( $setting[ 'name' ] ) && empty( $setting[ 'label' ] ) ) {
521
+			$setting[ 'label' ] = $setting[ 'name' ];
522
+			_deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting ' . $key . ' details' );
523 523
 		}
524 524
 
525 525
 		$name = esc_attr( sprintf( $name, $key ) );
526
-		$setting['id'] = esc_attr( sprintf( $id, $key ) );
527
-		$setting['tooltip'] = 'gv_' . $key;
526
+		$setting[ 'id' ] = esc_attr( sprintf( $id, $key ) );
527
+		$setting[ 'tooltip' ] = 'gv_' . $key;
528 528
 
529 529
 		// Use default if current setting isn't set.
530
-		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting['value'];
530
+		$curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting[ 'value' ];
531 531
 
532 532
 		// default setting type = text
533
-		$setting['type'] = empty( $setting['type'] ) ? 'text' : $setting['type'];
533
+		$setting[ 'type' ] = empty( $setting[ 'type' ] ) ? 'text' : $setting[ 'type' ];
534 534
 
535 535
 		// merge tags
536
-		if( !isset( $setting['merge_tags'] ) ) {
537
-			if( $setting['type'] === 'text' ) {
538
-				$setting['merge_tags'] = true;
536
+		if ( ! isset( $setting[ 'merge_tags' ] ) ) {
537
+			if ( $setting[ 'type' ] === 'text' ) {
538
+				$setting[ 'merge_tags' ] = true;
539 539
 			} else {
540
-				$setting['merge_tags'] = false;
540
+				$setting[ 'merge_tags' ] = false;
541 541
 			}
542 542
 		}
543 543
 
@@ -545,7 +545,7 @@  discard block
 block discarded – undo
545 545
 
546 546
 		// render the setting
547 547
 		$type_class = self::load_type_class( $setting );
548
-		if( class_exists( $type_class ) ) {
548
+		if ( class_exists( $type_class ) ) {
549 549
 			/** @type GravityView_FieldType $render_type */
550 550
 			$render_type = new $type_class( $name, $setting, $curr_value );
551 551
 			ob_start();
@@ -554,25 +554,25 @@  discard block
 block discarded – undo
554 554
 		}
555 555
 
556 556
 		// Check if setting is specific for a template
557
-		if( !empty( $setting['show_in_template'] ) ) {
558
-			if( !is_array( $setting['show_in_template'] ) ) {
559
-				$setting['show_in_template'] = array( $setting['show_in_template'] );
557
+		if ( ! empty( $setting[ 'show_in_template' ] ) ) {
558
+			if ( ! is_array( $setting[ 'show_in_template' ] ) ) {
559
+				$setting[ 'show_in_template' ] = array( $setting[ 'show_in_template' ] );
560 560
 			}
561
-			$show_if = ' data-show-if="'. implode( ' ', $setting['show_in_template'] ).'"';
561
+			$show_if = ' data-show-if="' . implode( ' ', $setting[ 'show_in_template' ] ) . '"';
562 562
 		} else {
563 563
 			$show_if = '';
564 564
 		}
565 565
 
566
-		if( ! empty( $setting['requires'] ) ) {
567
-			$show_if .= sprintf( ' data-requires="%s"', $setting['requires'] );
566
+		if ( ! empty( $setting[ 'requires' ] ) ) {
567
+			$show_if .= sprintf( ' data-requires="%s"', $setting[ 'requires' ] );
568 568
 		}
569 569
 
570
-		if( ! empty( $setting['requires_not'] ) ) {
571
-			$show_if .= sprintf( ' data-requires-not="%s"', $setting['requires_not'] );
570
+		if ( ! empty( $setting[ 'requires_not' ] ) ) {
571
+			$show_if .= sprintf( ' data-requires-not="%s"', $setting[ 'requires_not' ] );
572 572
 		}
573 573
 
574 574
 		// output
575
-		echo '<tr style="vertical-align: top;" '. $show_if .'>' . $output . '</tr>';
575
+		echo '<tr style="vertical-align: top;" ' . $show_if . '>' . $output . '</tr>';
576 576
 
577 577
 	}
578 578
 
@@ -584,7 +584,7 @@  discard block
 block discarded – undo
584 584
 	 */
585 585
 	public static function load_type_class( $field = NULL ) {
586 586
 
587
-		if( empty( $field['type'] ) ) {
587
+		if ( empty( $field[ 'type' ] ) ) {
588 588
 			return NULL;
589 589
 		}
590 590
 
@@ -593,9 +593,9 @@  discard block
 block discarded – undo
593 593
 		 * @param string $class_suffix  field class suffix; `GravityView_FieldType_{$class_suffix}`
594 594
 		 * @param array $field   field data
595 595
 		 */
596
-		$type_class = apply_filters( "gravityview/setting/class/{$field['type']}", 'GravityView_FieldType_' . $field['type'], $field );
596
+		$type_class = apply_filters( "gravityview/setting/class/{$field[ 'type' ]}", 'GravityView_FieldType_' . $field[ 'type' ], $field );
597 597
 
598
-		if( class_exists( $type_class ) ) {
598
+		if ( class_exists( $type_class ) ) {
599 599
 			return $type_class;
600 600
 		}
601 601
 
@@ -604,9 +604,9 @@  discard block
 block discarded – undo
604 604
 		 * @param string  $field_type_include_path field class file path
605 605
 		 * @param array $field  field data
606 606
 		 */
607
-		$class_file = apply_filters( "gravityview/setting/class_file/{$field['type']}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field['type']}.php", $field );
607
+		$class_file = apply_filters( "gravityview/setting/class_file/{$field[ 'type' ]}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field[ 'type' ]}.php", $field );
608 608
 
609
-		if( $class_file && file_exists( $class_file ) ) {
609
+		if ( $class_file && file_exists( $class_file ) ) {
610 610
 			require_once( $class_file );
611 611
 		}
612 612
 
@@ -628,8 +628,8 @@  discard block
 block discarded – undo
628 628
 
629 629
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_checkbox::render_input' );
630 630
 
631
-		$output  = '<input name="'. esc_attr( $name ) .'" type="hidden" value="0">';
632
-		$output .= '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="checkbox" value="1" '. checked( $current, '1', false ) .' >';
631
+		$output  = '<input name="' . esc_attr( $name ) . '" type="hidden" value="0">';
632
+		$output .= '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="checkbox" value="1" ' . checked( $current, '1', false ) . ' >';
633 633
 
634 634
 		return $output;
635 635
 	}
@@ -649,22 +649,22 @@  discard block
 block discarded – undo
649 649
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_text::render_input' );
650 650
 
651 651
 		// Show the merge tags if the field is a list view
652
-		$is_list = ( preg_match( '/_list-/ism', $name ));
652
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
653 653
 
654 654
 		// Or is a single entry view
655
-		$is_single = ( preg_match( '/single_/ism', $name ));
655
+		$is_single = ( preg_match( '/single_/ism', $name ) );
656 656
 		$show = ( $is_single || $is_list );
657 657
 
658 658
 		$class = '';
659 659
 		// and $add_merge_tags is not false
660
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
660
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
661 661
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
662 662
 		}
663 663
 
664
-		$class .= !empty( $args['class'] ) ? $args['class'] : 'widefat';
665
-		$type = !empty( $args['type'] ) ? $args['type'] : 'text';
664
+		$class .= ! empty( $args[ 'class' ] ) ? $args[ 'class' ] : 'widefat';
665
+		$type = ! empty( $args[ 'type' ] ) ? $args[ 'type' ] : 'text';
666 666
 
667
-		return '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="'.esc_attr($type).'" value="'. esc_attr( $current ) .'" class="'.esc_attr( $class ).'">';
667
+		return '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="' . esc_attr( $type ) . '" value="' . esc_attr( $current ) . '" class="' . esc_attr( $class ) . '">';
668 668
 	}
669 669
 
670 670
 	/**
@@ -681,21 +681,21 @@  discard block
 block discarded – undo
681 681
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_textarea::render_input' );
682 682
 
683 683
 		// Show the merge tags if the field is a list view
684
-		$is_list = ( preg_match( '/_list-/ism', $name ));
684
+		$is_list = ( preg_match( '/_list-/ism', $name ) );
685 685
 
686 686
 		// Or is a single entry view
687
-		$is_single = ( preg_match( '/single_/ism', $name ));
687
+		$is_single = ( preg_match( '/single_/ism', $name ) );
688 688
 		$show = ( $is_single || $is_list );
689 689
 
690 690
 		$class = '';
691 691
 		// and $add_merge_tags is not false
692
-		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
692
+		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) {
693 693
 			$class = 'merge-tag-support mt-position-right mt-hide_all_fields ';
694 694
 		}
695 695
 
696
-		$class .= !empty( $args['class'] ) ? 'widefat '.$args['class'] : 'widefat';
696
+		$class .= ! empty( $args[ 'class' ] ) ? 'widefat ' . $args[ 'class' ] : 'widefat';
697 697
 
698
-		return '<textarea name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" class="'.esc_attr( $class ).'">'. esc_textarea( $current ) .'</textarea>';
698
+		return '<textarea name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" class="' . esc_attr( $class ) . '">' . esc_textarea( $current ) . '</textarea>';
699 699
 	}
700 700
 
701 701
 	/**
@@ -711,9 +711,9 @@  discard block
 block discarded – undo
711 711
 
712 712
 		_deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_select::render_input' );
713 713
 
714
-		$output = '<select name="'. $name .'" id="'. $id .'">';
715
-		foreach( $choices as $value => $label ) {
716
-			$output .= '<option value="'. esc_attr( $value ) .'" '. selected( $value, $current, false ) .'>'. esc_html( $label ) .'</option>';
714
+		$output = '<select name="' . $name . '" id="' . $id . '">';
715
+		foreach ( $choices as $value => $label ) {
716
+			$output .= '<option value="' . esc_attr( $value ) . '" ' . selected( $value, $current, false ) . '>' . esc_html( $label ) . '</option>';
717 717
 		}
718 718
 		$output .= '</select>';
719 719
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-address.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -68,8 +68,8 @@  discard block
 block discarded – undo
68 68
 				continue;
69 69
 			}
70 70
 
71
-			$field_id = intval( floor( $search_field['key'] ) );
72
-			$input_id = gravityview_get_input_id_from_id( $search_field['key'] );
71
+			$field_id = intval( floor( $search_field[ 'key' ] ) );
72
+			$input_id = gravityview_get_input_id_from_id( $search_field[ 'key' ] );
73 73
 			$form = GravityView_View::getInstance()->getForm();
74 74
 
75 75
 			/** @type GF_Field_Address $address_field */
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 			$choices = array();
79 79
 
80 80
 			$method_name = 'get_choices_' . self::get_input_type_from_input_id( $input_id );
81
-			if( method_exists( $this, $method_name ) ) {
81
+			if ( method_exists( $this, $method_name ) ) {
82 82
 				/**
83 83
 				 * @uses GravityView_Field_Address::get_choices_country()
84 84
 				 * @uses GravityView_Field_Address::get_choices_state()
@@ -86,12 +86,12 @@  discard block
 block discarded – undo
86 86
 				$choices = $this->{$method_name}( $address_field, $form );
87 87
 			}
88 88
 
89
-			if( ! empty( $choices ) ) {
90
-				$search_field['choices'] = $choices;
91
-				$search_field['type'] = \GV\Utils::get( $search_field, 'input');
89
+			if ( ! empty( $choices ) ) {
90
+				$search_field[ 'choices' ] = $choices;
91
+				$search_field[ 'type' ] = \GV\Utils::get( $search_field, 'input' );
92 92
 			} else {
93
-				$search_field['type'] = 'text';
94
-				$search_field['input'] = 'input_text';
93
+				$search_field[ 'type' ] = 'text';
94
+				$search_field[ 'input' ] = 'input_text';
95 95
 			}
96 96
 		}
97 97
 
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 		$country_choices = array();
117 117
 
118 118
 		foreach ( $countries as $key => $country ) {
119
-			$country_choices[] = array(
119
+			$country_choices[ ] = array(
120 120
 				'value' => $country,
121 121
 				'text' => $country,
122 122
 			);
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 	 */
142 142
 	private function get_choices_state( $address_field, $form ) {
143 143
 
144
-		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form['id'] ) : $address_field->addressType;
144
+		$address_type = empty( $address_field->addressType ) ? $address_field->get_default_address_type( $form[ 'id' ] ) : $address_field->addressType;
145 145
 
146 146
 		$state_choices = array();
147 147
 
@@ -153,8 +153,8 @@  discard block
 block discarded – undo
153 153
 				$states = GFCommon::get_canadian_provinces();
154 154
 				break;
155 155
 			default:
156
-				$address_types = $address_field->get_address_types( $form['id'] );
157
-				$states = empty( $address_types[ $address_type ]['states'] ) ? array() : $address_types[ $address_type ]['states'];
156
+				$address_types = $address_field->get_address_types( $form[ 'id' ] );
157
+				$states = empty( $address_types[ $address_type ][ 'states' ] ) ? array() : $address_types[ $address_type ][ 'states' ];
158 158
 				break;
159 159
 		}
160 160
 
@@ -163,19 +163,19 @@  discard block
 block discarded – undo
163 163
 				$state_subchoices = array();
164 164
 
165 165
 				foreach ( $state as $key => $substate ) {
166
-					$state_subchoices[] = array(
166
+					$state_subchoices[ ] = array(
167 167
 						'value' => is_numeric( $key ) ? $substate : $key,
168 168
 						'text' => $substate,
169 169
 					);
170 170
 				}
171 171
 
172
-				$state_choices[] = array(
172
+				$state_choices[ ] = array(
173 173
 					'text' => $key,
174 174
 					'value' => $state_subchoices,
175 175
 				);
176 176
 
177 177
 			} else {
178
-				$state_choices[] = array(
178
+				$state_choices[ ] = array(
179 179
 					'value' => is_numeric( $key ) ? $state : $key,
180 180
 					'text' => $state,
181 181
 				);
@@ -199,13 +199,13 @@  discard block
 block discarded – undo
199 199
 		// Use the same inputs as the "text" input type allows
200 200
 		$text_inputs = \GV\Utils::get( $input_types, 'text' );
201 201
 
202
-		$input_types['street'] = $text_inputs;
203
-		$input_types['street2'] = $text_inputs;
204
-		$input_types['city'] = $text_inputs;
202
+		$input_types[ 'street' ] = $text_inputs;
203
+		$input_types[ 'street2' ] = $text_inputs;
204
+		$input_types[ 'city' ] = $text_inputs;
205 205
 
206
-		$input_types['state'] = array( 'select', 'radio', 'link' ) + $text_inputs;
207
-		$input_types['zip'] = array( 'input_text' );
208
-		$input_types['country'] = array( 'select', 'radio', 'link' ) + $text_inputs;
206
+		$input_types[ 'state' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
207
+		$input_types[ 'zip' ] = array( 'input_text' );
208
+		$input_types[ 'country' ] = array( 'select', 'radio', 'link' ) + $text_inputs;
209 209
 
210 210
 		return $input_types;
211 211
 	}
@@ -226,12 +226,12 @@  discard block
 block discarded – undo
226 226
 		// Is this search field for an input (eg: 4.2) or the whole address field (eg: 4)?
227 227
 		$input_id = gravityview_get_input_id_from_id( $field_id );
228 228
 
229
-		if( 'address' !== $field_type && $input_id ) {
229
+		if ( 'address' !== $field_type && $input_id ) {
230 230
 			return $input_type;
231 231
 		}
232 232
 
233 233
 		// If the input ID matches an expected address input, set to that. Otherwise, keep existing input type.
234
-		if( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
234
+		if ( $address_field_name = self::get_input_type_from_input_id( $input_id ) ) {
235 235
 			$input_type = $address_field_name;
236 236
 		}
237 237
 
@@ -279,17 +279,17 @@  discard block
 block discarded – undo
279 279
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
280 280
 
281 281
 		// If this is NOT the full address field, return default options.
282
-		if( floor( $field_id ) !== floatval( $field_id ) ) {
282
+		if ( floor( $field_id ) !== floatval( $field_id ) ) {
283 283
 			return $field_options;
284 284
 		}
285 285
 
286
-		if( 'edit' === $context ) {
286
+		if ( 'edit' === $context ) {
287 287
 			return $field_options;
288 288
 		}
289 289
 
290 290
 		$add_options = array();
291 291
 
292
-		$add_options['show_map_link'] = array(
292
+		$add_options[ 'show_map_link' ] = array(
293 293
 			'type'       => 'checkbox',
294 294
 			'label'      => __( 'Show Map Link:', 'gravityview' ),
295 295
 			'desc'       => __( 'Display a "Map It" link below the address', 'gravityview' ),
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
 
302 302
 		$this->add_field_support( 'new_window', $add_options );
303 303
 
304
-		$add_options['new_window']['requires'] = 'show_map_link';
304
+		$add_options[ 'new_window' ][ 'requires' ] = 'show_map_link';
305 305
 
306 306
 		return $add_options + $field_options;
307 307
 	}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-gravatar.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 	static public function get_email( $field_settings, $entry ) {
75 75
 
76 76
 		// There was no logged in user.
77
-		switch ( $field_settings['email_field'] ) {
77
+		switch ( $field_settings[ 'email_field' ] ) {
78 78
 			case 'created_by_email':
79 79
 
80 80
 				$created_by = \GV\Utils::get( $entry, 'created_by', null );
@@ -105,9 +105,9 @@  discard block
 block discarded – undo
105 105
 			return $field_options;
106 106
 		}
107 107
 
108
-		unset( $field_options['new_window'] );
108
+		unset( $field_options[ 'new_window' ] );
109 109
 
110
-		$field_options['email_field'] = array(
110
+		$field_options[ 'email_field' ] = array(
111 111
 			'type'    => 'select',
112 112
 			'label'   => __( 'Email to Use', 'gravityview' ),
113 113
 			'value'   => 'created_by_email',
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 			'group' => 'display',
117 117
 		);
118 118
 
119
-		$field_options['default'] = array(
119
+		$field_options[ 'default' ] = array(
120 120
 			'type'    => 'select',
121 121
 			'label'   => __( 'Default Image', 'gravityview' ),
122 122
 			'desc'    => __( 'Choose the default image to be shown when an email has no Gravatar.', 'gravityview' ) . ' <a href="https://en.gravatar.com/site/implement/images/">' . esc_html( sprintf( __( 'Read more about %s', 'gravityview' ), __( 'Default Image', 'gravityview' ) ) ) . '</a>',
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
 			'group' => 'display',
134 134
 		);
135 135
 
136
-		$field_options['size'] = array(
136
+		$field_options[ 'size' ] = array(
137 137
 			'type'  => 'number',
138 138
 			'label' => __( 'Size in Pixels', 'gravityview' ),
139 139
 			'value' => 80,
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
 		$email_fields = GFAPI::get_fields_by_type( $form, array( 'email' ) );
169 169
 
170 170
 		foreach ( $email_fields as $email_field ) {
171
-			$email_field_id                   = $email_field['id'];
171
+			$email_field_id                   = $email_field[ 'id' ];
172 172
 			$email_field_label                = GVCommon::get_field_label( $form, $email_field_id );
173 173
 			$email_field_label                = sprintf( __( 'Field: %s', 'gravityview' ), $email_field_label );
174 174
 			$field_choices[ $email_field_id ] = esc_html( $email_field_label );
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-post-category.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 
12 12
 	var $is_searchable = true;
13 13
 
14
-	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains');
14
+	var $search_operators = array( 'is', 'in', 'not in', 'isnot', 'contains' );
15 15
 
16 16
 	var $_gf_field_class_name = 'GF_Field_Post_Category';
17 17
 
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 		$entry = GFAPI::get_entry( $entry_id );
47 47
 		$post_id = \GV\Utils::get( $entry, 'post_id' );
48 48
 
49
-		if( empty( $post_id ) ) {
49
+		if ( empty( $post_id ) ) {
50 50
 			return false;
51 51
 		}
52 52
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 
55 55
 		$post_category_fields = GFAPI::get_fields_by_type( $form, 'post_category' );
56 56
 
57
-		if( $post_category_fields ) {
57
+		if ( $post_category_fields ) {
58 58
 
59 59
 			$updated_categories = array();
60 60
 
@@ -121,18 +121,18 @@  discard block
 block discarded – undo
121 121
 	 *
122 122
 	 * @return mixed
123 123
 	 */
124
-	function edit_entry_post_category_choices( $choices, $field, $form_id  ) {
124
+	function edit_entry_post_category_choices( $choices, $field, $form_id ) {
125 125
 
126
-		$entry = GravityView_Edit_Entry::getInstance()->instances['render']->get_entry();
126
+		$entry = GravityView_Edit_Entry::getInstance()->instances[ 'render' ]->get_entry();
127 127
 
128 128
 		// $entry['post_id'] should always be set, but we check to make sure.
129
-		if( $entry && isset( $entry['post_id'] ) && $post_id = $entry['post_id'] ) {
129
+		if ( $entry && isset( $entry[ 'post_id' ] ) && $post_id = $entry[ 'post_id' ] ) {
130 130
 
131 131
 			$post_categories = wp_get_post_categories( $post_id, array( 'fields' => 'ids' ) );
132 132
 
133 133
 			// Always use the live value
134 134
 			foreach ( $choices as &$choice ) {
135
-				$choice['isSelected'] = in_array( $choice['value'], array_values( $post_categories ) );
135
+				$choice[ 'isSelected' ] = in_array( $choice[ 'value' ], array_values( $post_categories ) );
136 136
 			}
137 137
 		}
138 138
 
@@ -141,15 +141,15 @@  discard block
 block discarded – undo
141 141
 
142 142
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
143 143
 
144
-		if( 'edit' === $context ) {
144
+		if ( 'edit' === $context ) {
145 145
 			return $field_options;
146 146
 		}
147 147
 
148
-		$this->add_field_support('dynamic_data', $field_options );
149
-		$this->add_field_support('link_to_term', $field_options );
150
-		$this->add_field_support('new_window', $field_options );
148
+		$this->add_field_support( 'dynamic_data', $field_options );
149
+		$this->add_field_support( 'link_to_term', $field_options );
150
+		$this->add_field_support( 'new_window', $field_options );
151 151
 
152
-		$field_options['new_window']['requires'] = 'link_to_term';
152
+		$field_options[ 'new_window' ][ 'requires' ] = 'link_to_term';
153 153
 
154 154
 		return $field_options;
155 155
 	}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-number.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -33,18 +33,18 @@
 block discarded – undo
33 33
 
34 34
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
35 35
 
36
-		$field_options['number_format'] = array(
36
+		$field_options[ 'number_format' ] = array(
37 37
 			'type' => 'checkbox',
38 38
 			'label' => __( 'Format number?', 'gravityview' ),
39
-			'desc' => __('Display numbers with thousands separators.', 'gravityview'),
39
+			'desc' => __( 'Display numbers with thousands separators.', 'gravityview' ),
40 40
 			'value' => false,
41 41
 			'group' => 'field',
42 42
 		);
43 43
 
44
-		$field_options['decimals'] = array(
44
+		$field_options[ 'decimals' ] = array(
45 45
 			'type' => 'number',
46 46
 			'label' => __( 'Decimals', 'gravityview' ),
47
-			'desc' => __('Precision of the number of decimal places. Leave blank to use existing precision.', 'gravityview'),
47
+			'desc' => __( 'Precision of the number of decimal places. Leave blank to use existing precision.', 'gravityview' ),
48 48
 			'value' => '',
49 49
 			'merge_tags' => false,
50 50
 			'group' => 'field',
Please login to merge, or discard this patch.