Completed
Push — develop ( 732857...9f2630 )
by Zack
11:50
created
includes/class-gravityview-roles-capabilities.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 	 */
34 34
 	public static function get_instance() {
35 35
 
36
-		if( ! self::$instance ) {
36
+		if ( ! self::$instance ) {
37 37
 			self::$instance = new self;
38 38
 		}
39 39
 
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 		add_filter( 'members_get_capabilities', array( 'GravityView_Roles_Capabilities', 'merge_with_all_caps' ) );
57 57
 		add_action( 'members_register_cap_groups', array( $this, 'members_register_cap_group' ), 20 );
58 58
 		add_filter( 'user_has_cap', array( $this, 'filter_user_has_cap' ), 10, 4 );
59
-        add_action( 'admin_init', array( $this, 'add_caps') );
59
+        add_action( 'admin_init', array( $this, 'add_caps' ) );
60 60
 	}
61 61
 
62 62
 
@@ -77,18 +77,18 @@  discard block
 block discarded – undo
77 77
 	public function filter_user_has_cap( $usercaps = array(), $caps = array(), $args = array(), $user = NULL ) {
78 78
 
79 79
 		// Empty caps_to_check array
80
-		if( ! $usercaps || ! $caps ) {
80
+		if ( ! $usercaps || ! $caps ) {
81 81
 			return $usercaps;
82 82
 		}
83 83
 
84 84
 		/**
85 85
 		 * Enable all GravityView caps_to_check if `gravityview_full_access` is enabled
86 86
 		 */
87
-		if( ! empty( $usercaps['gravityview_full_access'] ) ) {
87
+		if ( ! empty( $usercaps[ 'gravityview_full_access' ] ) ) {
88 88
 
89 89
 			$all_gravityview_caps = self::all_caps();
90 90
 
91
-			foreach( $all_gravityview_caps as $gv_cap ) {
91
+			foreach ( $all_gravityview_caps as $gv_cap ) {
92 92
 				$usercaps[ $gv_cap ] = true;
93 93
 			}
94 94
 
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 		$all = $administrator;
307 307
 
308 308
 		// If role is set, return caps_to_check for just that role.
309
-		if( $single_role ) {
309
+		if ( $single_role ) {
310 310
 			$caps = isset( ${$single_role} ) ? ${$single_role} : false;
311 311
 			return $flat_array ? $caps : array( $single_role => $caps );
312 312
 		}
@@ -364,13 +364,13 @@  discard block
 block discarded – undo
364 364
 		$caps_to_check = self::maybe_add_full_access_caps( $caps_to_check );
365 365
 
366 366
 		foreach ( $caps_to_check as $cap ) {
367
-			if( ! is_null( $object_id ) ) {
367
+			if ( ! is_null( $object_id ) ) {
368 368
 				$has_cap = $user_id ? user_can( $user_id, $cap, $object_id ) : current_user_can( $cap, $object_id );
369 369
 			} else {
370 370
 				$has_cap = $user_id ? user_can( $user_id, $cap ) : current_user_can( $cap );
371 371
 			}
372 372
 			// At the first successful response, stop checking
373
-			if( $has_cap ) {
373
+			if ( $has_cap ) {
374 374
 				break;
375 375
 			}
376 376
 		}
@@ -394,15 +394,15 @@  discard block
 block discarded – undo
394 394
 		$all_gravityview_caps = self::all_caps();
395 395
 
396 396
 		// Are there any $caps_to_check that are from GravityView?
397
-		if( $has_gravityview_caps = array_intersect( $caps_to_check, $all_gravityview_caps ) ) {
398
-			$caps_to_check[] = 'gravityview_full_access';
397
+		if ( $has_gravityview_caps = array_intersect( $caps_to_check, $all_gravityview_caps ) ) {
398
+			$caps_to_check[ ] = 'gravityview_full_access';
399 399
 		}
400 400
 
401 401
 		$all_gravity_forms_caps = class_exists( 'GFCommon' ) ? GFCommon::all_caps() : array();
402 402
 
403 403
 		// Are there any $caps_to_check that are from Gravity Forms?
404
-		if( $all_gravity_forms_caps = array_intersect( $caps_to_check, $all_gravity_forms_caps ) ) {
405
-			$caps_to_check[] = 'gform_full_access';
404
+		if ( $all_gravity_forms_caps = array_intersect( $caps_to_check, $all_gravity_forms_caps ) ) {
405
+			$caps_to_check[ ] = 'gform_full_access';
406 406
 		}
407 407
 
408 408
 		return array_unique( $caps_to_check );
@@ -424,7 +424,7 @@  discard block
 block discarded – undo
424 424
 			$capabilities = self::all_caps();
425 425
 
426 426
 			// Loop through each role and remove GV caps_to_check
427
-			foreach( $wp_roles->get_names() as $role_slug => $role_name ) {
427
+			foreach ( $wp_roles->get_names() as $role_slug => $role_name ) {
428 428
 				foreach ( $capabilities as $cap ) {
429 429
 					$wp_roles->remove_cap( $role_slug, $cap );
430 430
 				}
Please login to merge, or discard this patch.
future/includes/class-gv-settings-view.php 1 patch
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 		 */
40 40
 		$default_settings = apply_filters( 'gravityview_default_args', array(
41 41
 			'id' => array(
42
-				'label' => __('View ID', 'gravityview'),
42
+				'label' => __( 'View ID', 'gravityview' ),
43 43
 				'type' => 'number',
44 44
 				'group'	=> 'default',
45 45
 				'value' => NULL,
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 				'show_in_shortcode' => false,
48 48
 			),
49 49
 			'page_size' => array(
50
-				'label' 	=> __('Number of entries per page', 'gravityview'),
50
+				'label' 	=> __( 'Number of entries per page', 'gravityview' ),
51 51
 				'type' => 'number',
52 52
 				'class'	=> 'small-text',
53 53
 				'group'	=> 'default',
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 				'show_in_shortcode' => true,
56 56
 			),
57 57
 			'offset' => array(
58
-				'label' 	=> __('Offset entries starting from', 'gravityview'),
58
+				'label' 	=> __( 'Offset entries starting from', 'gravityview' ),
59 59
 				'type' => 'number',
60 60
 				'class'	=> 'small-text',
61 61
 				'group'	=> 'default',
@@ -79,8 +79,8 @@  discard block
 block discarded – undo
79 79
 			),
80 80
 			'admin_show_all_statuses' => array(
81 81
 				'label' => __( 'Show all entries to administrators', 'gravityview' ),
82
-				'desc'	=> __('Administrators will be able to see entries with any approval status.', 'gravityview'),
83
-				'tooltip' => __('Logged-out visitors and non-administrators will only see approved entries, while administrators will see entries with all statuses. This makes it easier for administrators to moderate entries from a View.', 'gravityview'),
82
+				'desc'	=> __( 'Administrators will be able to see entries with any approval status.', 'gravityview' ),
83
+				'tooltip' => __( 'Logged-out visitors and non-administrators will only see approved entries, while administrators will see entries with all statuses. This makes it easier for administrators to moderate entries from a View.', 'gravityview' ),
84 84
 				'requires' => 'show_only_approved',
85 85
 				'type' => 'checkbox',
86 86
 				'group'	=> 'default',
@@ -105,40 +105,40 @@  discard block
 block discarded – undo
105 105
 			'user_edit' => array(
106 106
 				'label'	=> __( 'Allow User Edit', 'gravityview' ),
107 107
 				'group'	=> 'default',
108
-				'desc'	=> __('Allow logged-in users to edit entries they created.', 'gravityview'),
108
+				'desc'	=> __( 'Allow logged-in users to edit entries they created.', 'gravityview' ),
109 109
 				'value'	=> 0,
110
-				'tooltip' => __('Display "Edit Entry" fields to non-administrator users if they created the entry. Edit Entry fields will always be displayed to site administrators.', 'gravityview'),
110
+				'tooltip' => __( 'Display "Edit Entry" fields to non-administrator users if they created the entry. Edit Entry fields will always be displayed to site administrators.', 'gravityview' ),
111 111
 				'type'	=> 'checkbox',
112 112
 				'show_in_shortcode' => true,
113 113
 			),
114 114
 			'user_delete' => array(
115 115
 				'label'	=> __( 'Allow User Delete', 'gravityview' ),
116 116
 				'group'	=> 'default',
117
-				'desc'	=> __('Allow logged-in users to delete entries they created.', 'gravityview'),
117
+				'desc'	=> __( 'Allow logged-in users to delete entries they created.', 'gravityview' ),
118 118
 				'value'	=> 0,
119
-				'tooltip' => __('Display "Delete Entry" fields to non-administrator users if they created the entry. Delete Entry fields will always be displayed to site administrators.', 'gravityview'),
119
+				'tooltip' => __( 'Display "Delete Entry" fields to non-administrator users if they created the entry. Delete Entry fields will always be displayed to site administrators.', 'gravityview' ),
120 120
 				'type'	=> 'checkbox',
121 121
 				'show_in_shortcode' => true,
122 122
 			),
123 123
 			'sort_field' => array(
124
-				'label'	=> __('Sort by field', 'gravityview'),
124
+				'label'	=> __( 'Sort by field', 'gravityview' ),
125 125
 				'type' => 'select',
126 126
 				'value' => '',
127 127
 				'group'	=> 'sort',
128 128
 				'options' => array(
129
-					'' => __( 'Default', 'gravityview'),
130
-					'date_created' => __( 'Date Created', 'gravityview'),
129
+					'' => __( 'Default', 'gravityview' ),
130
+					'date_created' => __( 'Date Created', 'gravityview' ),
131 131
 				),
132 132
 				'show_in_shortcode' => true,
133 133
 			),
134 134
 			'sort_direction' => array(
135
-				'label' 	=> __('Sort direction', 'gravityview'),
135
+				'label' 	=> __( 'Sort direction', 'gravityview' ),
136 136
 				'type' => 'select',
137 137
 				'value' => 'ASC',
138 138
 				'group'	=> 'sort',
139 139
 				'options' => array(
140
-					'ASC' => __('ASC', 'gravityview'),
141
-					'DESC' => __('DESC', 'gravityview'),
140
+					'ASC' => __( 'ASC', 'gravityview' ),
141
+					'DESC' => __( 'DESC', 'gravityview' ),
142 142
 					//'RAND' => __('Random', 'gravityview'),
143 143
 				),
144 144
 				'show_in_shortcode' => true,
@@ -154,69 +154,69 @@  discard block
 block discarded – undo
154 154
 				'show_in_template' => array( 'default_table', 'preset_business_data', 'preset_issue_tracker', 'preset_resume_board', 'preset_job_board' ),
155 155
 			),
156 156
 			'start_date' => array(
157
-				'label' 	=> __('Filter by Start Date', 'gravityview'),
157
+				'label' 	=> __( 'Filter by Start Date', 'gravityview' ),
158 158
 				'class'	=> 'gv-datepicker',
159
-				'desc'	=> __('Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
159
+				'desc'	=> __( 'Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
160 160
 				'type' => 'text',
161 161
 				'value' => '',
162 162
 				'group'	=> 'filter',
163 163
 				'show_in_shortcode' => true,
164 164
 			),
165 165
 			'end_date' => array(
166
-				'label' 	=> __('Filter by End Date', 'gravityview'),
166
+				'label' 	=> __( 'Filter by End Date', 'gravityview' ),
167 167
 				'class'	=> 'gv-datepicker',
168
-				'desc'	=> __('Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
168
+				'desc'	=> __( 'Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
169 169
 				'type' => 'text',
170 170
 				'value' => '',
171 171
 				'group'	=> 'filter',
172 172
 				'show_in_shortcode' => true,
173 173
 			),
174 174
 			'class' => array(
175
-				'label' 	=> __('CSS Class', 'gravityview'),
176
-				'desc'	=> __('CSS class to add to the wrapping HTML container.', 'gravityview'),
175
+				'label' 	=> __( 'CSS Class', 'gravityview' ),
176
+				'desc'	=> __( 'CSS class to add to the wrapping HTML container.', 'gravityview' ),
177 177
 				'group'	=> 'default',
178 178
 				'type' => 'text',
179 179
 				'value' => '',
180 180
 				'show_in_shortcode' => false,
181 181
 			),
182 182
 			'search_value' => array(
183
-				'label' 	=> __('Search Value', 'gravityview'),
184
-				'desc'	=> __('Define a default search value for the View', 'gravityview'),
183
+				'label' 	=> __( 'Search Value', 'gravityview' ),
184
+				'desc'	=> __( 'Define a default search value for the View', 'gravityview' ),
185 185
 				'type' => 'text',
186 186
 				'value' => '',
187 187
 				'group'	=> 'filter',
188 188
 				'show_in_shortcode' => false,
189 189
 			),
190 190
 			'search_field' => array(
191
-				'label' 	=> __('Search Field', 'gravityview'),
192
-				'desc'	=> __('If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview'),
191
+				'label' 	=> __( 'Search Field', 'gravityview' ),
192
+				'desc'	=> __( 'If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview' ),
193 193
 				'type' => 'number',
194 194
 				'value' => '',
195 195
 				'group'	=> 'filter',
196 196
 				'show_in_shortcode' => false,
197 197
 			),
198 198
 			'single_title' => array(
199
-				'label'	=> __('Single Entry Title', 'gravityview'),
199
+				'label'	=> __( 'Single Entry Title', 'gravityview' ),
200 200
 				'type'	=> 'text',
201
-				'desc'	=> __('When viewing a single entry, change the title of the page to this setting. Otherwise, the title will not change between the Multiple Entries and Single Entry views.', 'gravityview'),
201
+				'desc'	=> __( 'When viewing a single entry, change the title of the page to this setting. Otherwise, the title will not change between the Multiple Entries and Single Entry views.', 'gravityview' ),
202 202
 				'group'	=> 'default',
203 203
 				'value'	=> '',
204 204
 				'show_in_shortcode' => false,
205 205
 				'full_width' => true,
206 206
 			),
207 207
 			'back_link_label' => array(
208
-				'label'	=> __('Back Link Label', 'gravityview'),
208
+				'label'	=> __( 'Back Link Label', 'gravityview' ),
209 209
 				'group'	=> 'default',
210
-				'desc'	=> __('The text of the link that returns to the multiple entries view.', 'gravityview'),
210
+				'desc'	=> __( 'The text of the link that returns to the multiple entries view.', 'gravityview' ),
211 211
 				'type'	=> 'text',
212 212
 				'value'	=> '',
213 213
 				'show_in_shortcode' => false,
214 214
 				'full_width' => true,
215 215
 			),
216 216
 			'embed_only' => array(
217
-				'label'	=> __('Prevent Direct Access', 'gravityview'),
217
+				'label'	=> __( 'Prevent Direct Access', 'gravityview' ),
218 218
 				'group'	=> 'default',
219
-				'desc'	=> __('Only allow access to this View when embedded using the shortcode.', 'gravityview'),
219
+				'desc'	=> __( 'Only allow access to this View when embedded using the shortcode.', 'gravityview' ),
220 220
 				'type'	=> 'checkbox',
221 221
 				'value'	=> '',
222 222
 				'tooltip' => false,
@@ -239,19 +239,19 @@  discard block
 block discarded – undo
239 239
 		// By default, we only want the key => value pairing, not the whole array.
240 240
 		if ( ! $detailed ) {
241 241
 			$defaults = array();
242
-			foreach( $default_settings as $key => $value ) {
243
-				$defaults[ $key ] = $value['value'];
242
+			foreach ( $default_settings as $key => $value ) {
243
+				$defaults[ $key ] = $value[ 'value' ];
244 244
 			}
245 245
 			return $defaults;
246 246
 
247 247
 		// But sometimes, we want all the details.
248 248
 		} else {
249
-			foreach ($default_settings as $key => $value) {
249
+			foreach ( $default_settings as $key => $value ) {
250 250
 
251 251
 				// If the $group argument is set for the method,
252 252
 				// ignore any settings that aren't in that group.
253 253
 				if ( ! empty( $group ) && is_string( $group ) ) {
254
-					if ( empty( $value['group'] ) || $value['group'] !== $group ) {
254
+					if ( empty( $value[ 'group' ] ) || $value[ 'group' ] !== $group ) {
255 255
 						unset( $default_settings[ $key ] );
256 256
 					}
257 257
 				}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-source-url.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -26,24 +26,24 @@
 block discarded – undo
26 26
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
27 27
 
28 28
 		// Don't link to entry; doesn't make sense.
29
-		unset( $field_options['show_as_link'] );
29
+		unset( $field_options[ 'show_as_link' ] );
30 30
 
31
-		if( 'edit' === $context ) {
31
+		if ( 'edit' === $context ) {
32 32
 			return $field_options;
33 33
 		}
34 34
 
35 35
 		$add_options = array();
36
-		$add_options['link_to_source'] = array(
36
+		$add_options[ 'link_to_source' ] = array(
37 37
 			'type' => 'checkbox',
38 38
 			'label' => __( 'Link to URL:', 'gravityview' ),
39
-			'desc' => __('Display as a link to the Source URL', 'gravityview'),
39
+			'desc' => __( 'Display as a link to the Source URL', 'gravityview' ),
40 40
 			'value' => false,
41 41
 			'merge_tags' => false,
42 42
 		);
43
-		$add_options['source_link_text'] = array(
43
+		$add_options[ 'source_link_text' ] = array(
44 44
 			'type' => 'text',
45 45
 			'label' => __( 'Link Text:', 'gravityview' ),
46
-			'desc' => __('Customize the link text. If empty, the link text will be the URL.', 'gravityview'),
46
+			'desc' => __( 'Customize the link text. If empty, the link text will be the URL.', 'gravityview' ),
47 47
 			'value' => NULL,
48 48
 			'merge_tags' => true,
49 49
 		);
Please login to merge, or discard this patch.
includes/class-data.php 1 patch
Spacing   +129 added lines, -129 removed lines patch added patch discarded remove patch
@@ -21,12 +21,12 @@  discard block
 block discarded – undo
21 21
 			gravityview()->request = new \GV\Dummy_Request();
22 22
 		}
23 23
 
24
-		if( !empty( $passed_post ) ) {
24
+		if ( ! empty( $passed_post ) ) {
25 25
 
26 26
 			$id_or_id_array = $this->maybe_get_view_id( $passed_post );
27 27
 
28 28
 			if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) {
29
-				foreach( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) {
29
+				foreach ( is_array( $id_or_id_array ) ? $id_or_id_array : array( $id_or_id_array ) as $view_id ) {
30 30
 					if ( \GV\View::exists( $view_id ) && ! gravityview()->views->contains( $view_id ) ) {
31 31
 						gravityview()->views->add( \GV\View::by_id( $view_id ) );
32 32
 					}
@@ -73,24 +73,24 @@  discard block
 block discarded – undo
73 73
 	public function maybe_get_view_id( $passed_post ) {
74 74
 		$ids = array();
75 75
 
76
-		if( ! empty( $passed_post ) ) {
76
+		if ( ! empty( $passed_post ) ) {
77 77
 
78
-			if( is_numeric( $passed_post ) ) {
78
+			if ( is_numeric( $passed_post ) ) {
79 79
 				$passed_post = get_post( $passed_post );
80 80
 			}
81 81
 
82 82
 			// Convert WP_Posts into WP_Posts[] array
83
-			if( $passed_post instanceof WP_Post ) {
83
+			if ( $passed_post instanceof WP_Post ) {
84 84
 				$passed_post = array( $passed_post );
85 85
 			}
86 86
 
87
-			if( is_array( $passed_post ) ) {
87
+			if ( is_array( $passed_post ) ) {
88 88
 
89
-				foreach ( $passed_post as &$post) {
89
+				foreach ( $passed_post as &$post ) {
90 90
 					if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) && $post instanceof WP_Post ) {
91 91
 						$views = \GV\View_Collection::from_post( $post );
92 92
 						foreach ( $views->all() as $view ) {
93
-							$ids []= $view->ID;
93
+							$ids [ ] = $view->ID;
94 94
 
95 95
 							/** And as a side-effect... add each view to the global scope. */
96 96
 							if ( ! gravityview()->views->contains( $view->ID ) ) {
@@ -99,19 +99,19 @@  discard block
 block discarded – undo
99 99
 						}
100 100
 					} else {
101 101
 						/** Deprecated, see \GV\View_Collection::from_post */
102
-						if( ( get_post_type( $post ) === 'gravityview' ) ) {
103
-							$ids[] = $post->ID;
104
-						} else{
102
+						if ( ( get_post_type( $post ) === 'gravityview' ) ) {
103
+							$ids[ ] = $post->ID;
104
+						} else {
105 105
 							// Parse the Post Content
106 106
 							$id = $this->parse_post_content( $post->post_content );
107
-							if( $id ) {
108
-								$ids = array_merge( $ids, (array) $id );
107
+							if ( $id ) {
108
+								$ids = array_merge( $ids, (array)$id );
109 109
 							}
110 110
 
111 111
 							// Parse the Post Meta
112 112
 							$id = $this->parse_post_meta( $post->ID );
113
-							if( $id ) {
114
-								$ids = array_merge( $ids, (array) $id );
113
+							if ( $id ) {
114
+								$ids = array_merge( $ids, (array)$id );
115 115
 							}
116 116
 						}
117 117
 					}
@@ -125,37 +125,37 @@  discard block
 block discarded – undo
125 125
 					if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) {
126 126
 						$shortcodes = \GV\Shortcode::parse( $passed_post );
127 127
 						foreach ( $shortcodes as $shortcode ) {
128
-							if ( $shortcode->name == 'gravityview' && !empty( $shortcode->atts['id'] ) ) {
129
-								$ids []= $shortcode->atts['id'];
128
+							if ( $shortcode->name == 'gravityview' && ! empty( $shortcode->atts[ 'id' ] ) ) {
129
+								$ids [ ] = $shortcode->atts[ 'id' ];
130 130
 
131 131
 								/** And as a side-effect... add each view to the global scope. */
132
-								if ( ! gravityview()->views->contains( $shortcode->atts['id'] ) && \GV\View::exists( $shortcode->atts['id'] ) ) {
133
-									gravityview()->views->add( $shortcode->atts['id'] );
132
+								if ( ! gravityview()->views->contains( $shortcode->atts[ 'id' ] ) && \GV\View::exists( $shortcode->atts[ 'id' ] ) ) {
133
+									gravityview()->views->add( $shortcode->atts[ 'id' ] );
134 134
 								}
135 135
 							}
136 136
 						}
137 137
 					} else {
138 138
 						/** Deprecated, use \GV\Shortcode::parse. */
139 139
 						$id = $this->parse_post_content( $passed_post );
140
-						if( $id ) {
141
-							$ids = array_merge( $ids, (array) $id );
140
+						if ( $id ) {
141
+							$ids = array_merge( $ids, (array)$id );
142 142
 						}
143 143
 					}
144 144
 
145 145
 				} else {
146 146
 					$id = $this->get_id_from_atts( $passed_post );
147
-					$ids[] = intval( $id );
147
+					$ids[ ] = intval( $id );
148 148
 				}
149 149
 			}
150 150
 		}
151 151
 
152
-		if( empty($ids) ) {
152
+		if ( empty( $ids ) ) {
153 153
 			return NULL;
154 154
 		}
155 155
 
156 156
 		// If it's just one ID, return that.
157 157
 		// Otherwise, return array of IDs
158
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
158
+		return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
159 159
 	}
160 160
 
161 161
 	/**
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 	 */
164 164
 	public static function getInstance( $passed_post = NULL ) {
165 165
 
166
-		if( empty( self::$instance ) ) {
166
+		if ( empty( self::$instance ) ) {
167 167
 			self::$instance = new GravityView_View_Data( $passed_post );
168 168
 		}
169 169
 
@@ -180,8 +180,8 @@  discard block
 block discarded – undo
180 180
 				return array();
181 181
 			}
182 182
 			return array_combine(
183
-				array_map( function ( $view ) { return $view->ID; }, gravityview()->views->all() ),
184
-				array_map( function ( $view ) { return $view->as_data(); }, gravityview()->views->all() )
183
+				array_map( function( $view ) { return $view->ID; }, gravityview()->views->all() ),
184
+				array_map( function( $view ) { return $view->as_data(); }, gravityview()->views->all() )
185 185
 			);
186 186
 		}
187 187
 		return $this->views;
@@ -208,19 +208,19 @@  discard block
 block discarded – undo
208 208
 			return $view->as_data();
209 209
 		}
210 210
 
211
-		if( ! is_numeric( $view_id) ) {
212
-			do_action('gravityview_log_error', sprintf('GravityView_View_Data[get_view] $view_id passed is not numeric.', $view_id) );
211
+		if ( ! is_numeric( $view_id ) ) {
212
+			do_action( 'gravityview_log_error', sprintf( 'GravityView_View_Data[get_view] $view_id passed is not numeric.', $view_id ) );
213 213
 			return false;
214 214
 		}
215 215
 
216 216
 		// Backup: the view hasn't been fetched yet. Doing it now.
217 217
 		if ( ! isset( $this->views[ $view_id ] ) ) {
218
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] View #%s not set yet.', $view_id) );
218
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[get_view] View #%s not set yet.', $view_id ) );
219 219
 			return $this->add_view( $view_id, $atts );
220 220
 		}
221 221
 
222 222
 		if ( empty( $this->views[ $view_id ] ) ) {
223
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[get_view] Returning; View #%s was empty.', $view_id) );
223
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[get_view] Returning; View #%s was empty.', $view_id ) );
224 224
 			return false;
225 225
 		}
226 226
 
@@ -265,8 +265,8 @@  discard block
 block discarded – undo
265 265
 		}
266 266
 
267 267
 		// Handle array of IDs
268
-		if( is_array( $view_id ) ) {
269
-			foreach( $view_id as $id ) {
268
+		if ( is_array( $view_id ) ) {
269
+			foreach ( $view_id as $id ) {
270 270
 
271 271
 				$this->add_view( $id, $atts );
272 272
 			}
@@ -275,21 +275,21 @@  discard block
 block discarded – undo
275 275
 		}
276 276
 
277 277
 		// The view has been set already; returning stored view.
278
-		if ( !empty( $this->views[ $view_id ] ) ) {
279
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s already exists.', $view_id) );
278
+		if ( ! empty( $this->views[ $view_id ] ) ) {
279
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Returning; View #%s already exists.', $view_id ) );
280 280
 			return $this->views[ $view_id ];
281 281
 		}
282 282
 
283
-		if( ! $this->view_exists( $view_id ) ) {
284
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; View #%s does not exist.', $view_id) );
283
+		if ( ! $this->view_exists( $view_id ) ) {
284
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Returning; View #%s does not exist.', $view_id ) );
285 285
 			return false;
286 286
 		}
287 287
 
288 288
 		$form_id = gravityview_get_form_id( $view_id );
289 289
 
290
-		if( empty( $form_id ) ) {
290
+		if ( empty( $form_id ) ) {
291 291
 
292
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Returning; Post ID #%s does not have a connected form.', $view_id) );
292
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Returning; Post ID #%s does not have a connected form.', $view_id ) );
293 293
 
294 294
 			return false;
295 295
 		}
@@ -297,21 +297,21 @@  discard block
 block discarded – undo
297 297
 		// Get the settings for the View ID
298 298
 		$view_settings = gravityview_get_template_settings( $view_id );
299 299
 
300
-		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] Settings pulled in from View #%s', $view_id), $view_settings );
300
+		do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] Settings pulled in from View #%s', $view_id ), $view_settings );
301 301
 
302 302
 		// Merge the view settings with the defaults
303 303
 		$view_defaults = wp_parse_args( $view_settings, defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ? \GV\View_Settings::defaults() : self::get_default_args() );
304 304
 
305
-		do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] View Defaults after merging View Settings with the default args.', $view_defaults );
305
+		do_action( 'gravityview_log_debug', 'GravityView_View_Data[add_view] View Defaults after merging View Settings with the default args.', $view_defaults );
306 306
 
307
-		if( ! empty( $atts ) && is_array( $atts ) ) {
307
+		if ( ! empty( $atts ) && is_array( $atts ) ) {
308 308
 
309
-			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts before merging  with the $view_defaults', $atts );
309
+			do_action( 'gravityview_log_debug', 'GravityView_View_Data[add_view] $atts before merging  with the $view_defaults', $atts );
310 310
 
311 311
 			// Get the settings from the shortcode and merge them with defaults.
312 312
 			$atts = shortcode_atts( $view_defaults, $atts );
313 313
 
314
-			do_action('gravityview_log_debug', 'GravityView_View_Data[add_view] $atts after merging  with the $view_defaults', $atts );
314
+			do_action( 'gravityview_log_debug', 'GravityView_View_Data[add_view] $atts after merging  with the $view_defaults', $atts );
315 315
 
316 316
 		} else {
317 317
 
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
 
321 321
 		}
322 322
 
323
-		unset( $atts['id'], $view_defaults, $view_settings );
323
+		unset( $atts[ 'id' ], $view_defaults, $view_settings );
324 324
 
325 325
 		$data = array(
326 326
 			'id' => $view_id,
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
 			'form' => gravityview_get_form( $form_id ),
334 334
 		);
335 335
 
336
-		do_action('gravityview_log_debug', sprintf('GravityView_View_Data[add_view] View #%s being added.', $view_id), $data );
336
+		do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[add_view] View #%s being added.', $view_id ), $data );
337 337
 
338 338
 		$this->views[ $view_id ] = $data;
339 339
 
@@ -383,15 +383,15 @@  discard block
 block discarded – undo
383 383
 			throw new Exception( __METHOD__ . ' should not be called anymore. Why was it?' );
384 384
 		}
385 385
 
386
-		if( empty( $dir_fields ) || !is_array( $dir_fields ) ) {
386
+		if ( empty( $dir_fields ) || ! is_array( $dir_fields ) ) {
387 387
 			return $dir_fields;
388 388
 		}
389 389
 
390
-		foreach( $dir_fields as $area => $fields ) {
390
+		foreach ( $dir_fields as $area => $fields ) {
391 391
 
392
-			foreach( (array)$fields as $uniqid => $properties ) {
392
+			foreach ( (array)$fields as $uniqid => $properties ) {
393 393
 
394
-				if( $this->hide_field_check_conditions( $properties ) ) {
394
+				if ( $this->hide_field_check_conditions( $properties ) ) {
395 395
 					unset( $dir_fields[ $area ][ $uniqid ] );
396 396
 				}
397 397
 
@@ -418,7 +418,7 @@  discard block
 block discarded – undo
418 418
 		}
419 419
 
420 420
 		// logged-in visibility
421
-		if( ! empty( $properties['only_loggedin'] ) && ! GVCommon::has_cap( $properties['only_loggedin_cap'] ) ) {
421
+		if ( ! empty( $properties[ 'only_loggedin' ] ) && ! GVCommon::has_cap( $properties[ 'only_loggedin_cap' ] ) ) {
422 422
 			return true;
423 423
 		}
424 424
 
@@ -449,14 +449,14 @@  discard block
 block discarded – undo
449 449
 		// Get the settings from the shortcode and merge them with defaults.
450 450
 		$atts = wp_parse_args( $atts, defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ? \GV\View_Settings::defaults() : self::get_default_args() );
451 451
 
452
-		$view_id = ! empty( $atts['view_id'] ) ? (int)$atts['view_id'] : NULL;
452
+		$view_id = ! empty( $atts[ 'view_id' ] ) ? (int)$atts[ 'view_id' ] : NULL;
453 453
 
454
-		if( empty( $view_id ) && !empty( $atts['id'] ) ) {
455
-			$view_id = (int)$atts['id'];
454
+		if ( empty( $view_id ) && ! empty( $atts[ 'id' ] ) ) {
455
+			$view_id = (int)$atts[ 'id' ];
456 456
 		}
457 457
 
458
-		if( empty( $view_id ) ) {
459
-			do_action('gravityview_log_error', 'GravityView_View_Data[get_id_from_atts] Returning; no ID defined (Atts)', $atts );
458
+		if ( empty( $view_id ) ) {
459
+			do_action( 'gravityview_log_error', 'GravityView_View_Data[get_id_from_atts] Returning; no ID defined (Atts)', $atts );
460 460
 			return;
461 461
 		}
462 462
 
@@ -480,68 +480,68 @@  discard block
 block discarded – undo
480 480
 		if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ) {
481 481
 			$ids = array();
482 482
 			foreach ( \GV\Shortcode::parse( $content ) as $shortcode ) {
483
-				if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts['id'] ) ) {
484
-					if ( \GV\View::exists( $shortcode->atts['id'] ) && ! gravityview()->views->contains( $shortcode->atts['id'] ) ) {
485
-						gravityview()->views->add( \GV\View::by_id( $shortcode->atts['id'] ) );
483
+				if ( $shortcode->name == 'gravityview' && is_numeric( $shortcode->atts[ 'id' ] ) ) {
484
+					if ( \GV\View::exists( $shortcode->atts[ 'id' ] ) && ! gravityview()->views->contains( $shortcode->atts[ 'id' ] ) ) {
485
+						gravityview()->views->add( \GV\View::by_id( $shortcode->atts[ 'id' ] ) );
486 486
 					}
487 487
 					/**
488 488
 					 * The original function outputs the ID even though it wasn't added by ::add_view()
489 489
 					 * Wether this is a bug or not remains a mystery. But we need to emulate this behavior
490 490
 					 * until better times.
491 491
 					 */
492
-					$ids []= $shortcode->atts['id'];
492
+					$ids [ ] = $shortcode->atts[ 'id' ];
493 493
 				}
494 494
 			}
495 495
 			if ( empty ( $ids ) ) {
496 496
 				return null;
497 497
 			}
498
-			return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
498
+			return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
499 499
 		}
500 500
 
501 501
 		/**
502 502
 		 * @hack This is so that the shortcode is registered for the oEmbed preview in the Admin
503 503
 		 * @since 1.6
504 504
 		 */
505
-		if( ! shortcode_exists('gravityview') && class_exists( 'GravityView_Shortcode' ) ) {
505
+		if ( ! shortcode_exists( 'gravityview' ) && class_exists( 'GravityView_Shortcode' ) ) {
506 506
 			new GravityView_Shortcode;
507 507
 		}
508 508
 
509 509
 		$shortcodes = gravityview_has_shortcode_r( $content, 'gravityview' );
510 510
 
511
-		if( empty( $shortcodes ) ) {
511
+		if ( empty( $shortcodes ) ) {
512 512
 			return NULL;
513 513
 		}
514 514
 
515
-		do_action('gravityview_log_debug', 'GravityView_View_Data[parse_post_content] Parsing content, found shortcodes:', $shortcodes );
515
+		do_action( 'gravityview_log_debug', 'GravityView_View_Data[parse_post_content] Parsing content, found shortcodes:', $shortcodes );
516 516
 
517 517
 		$ids = array();
518 518
 
519
-		foreach ($shortcodes as $key => $shortcode) {
519
+		foreach ( $shortcodes as $key => $shortcode ) {
520 520
 
521
-			$shortcode[3] = htmlspecialchars_decode( $shortcode[3], ENT_QUOTES );
521
+			$shortcode[ 3 ] = htmlspecialchars_decode( $shortcode[ 3 ], ENT_QUOTES );
522 522
 
523
-			$args = shortcode_parse_atts( $shortcode[3] );
523
+			$args = shortcode_parse_atts( $shortcode[ 3 ] );
524 524
 
525
-			if( empty( $args['id'] ) ) {
526
-				do_action('gravityview_log_error', 'GravityView_View_Data[parse_post_content] Returning; no ID defined in shortcode atts', $shortcode );
525
+			if ( empty( $args[ 'id' ] ) ) {
526
+				do_action( 'gravityview_log_error', 'GravityView_View_Data[parse_post_content] Returning; no ID defined in shortcode atts', $shortcode );
527 527
 				continue;
528 528
 			}
529 529
 
530
-			do_action('gravityview_log_debug', sprintf('GravityView_View_Data[parse_post_content] Adding view #%s with shortcode args', $args['id']), $args );
530
+			do_action( 'gravityview_log_debug', sprintf( 'GravityView_View_Data[parse_post_content] Adding view #%s with shortcode args', $args[ 'id' ] ), $args );
531 531
 
532 532
 			// Store the View to the object for later fetching.
533
-			$this->add_view( $args['id'], $args );
533
+			$this->add_view( $args[ 'id' ], $args );
534 534
 
535
-			$ids[] = $args['id'];
535
+			$ids[ ] = $args[ 'id' ];
536 536
 		}
537 537
 
538
-		if( empty($ids) ) {
538
+		if ( empty( $ids ) ) {
539 539
 			return NULL;
540 540
 		}
541 541
 
542 542
 		// If it's just one ID, return that.
543 543
 		// Otherwise, return array of IDs
544
-		return ( sizeof( $ids ) === 1 ) ? $ids[0] : $ids;
544
+		return ( sizeof( $ids ) === 1 ) ? $ids[ 0 ] : $ids;
545 545
 
546 546
 	}
547 547
 
@@ -570,7 +570,7 @@  discard block
 block discarded – undo
570 570
 		 */
571 571
 		$meta_keys = (array)apply_filters( 'gravityview/data/parse/meta_keys', array(), $post_id );
572 572
 
573
-		if( empty( $meta_keys ) ) {
573
+		if ( empty( $meta_keys ) ) {
574 574
 			return NULL;
575 575
 		}
576 576
 
@@ -578,16 +578,16 @@  discard block
 block discarded – undo
578 578
 
579 579
 		$meta_content = '';
580 580
 
581
-		foreach( $meta_keys as $key ) {
582
-			$meta = get_post_meta( $post_id, $key , true );
583
-			if( ! is_string( $meta ) ) {
581
+		foreach ( $meta_keys as $key ) {
582
+			$meta = get_post_meta( $post_id, $key, true );
583
+			if ( ! is_string( $meta ) ) {
584 584
 				continue;
585 585
 			}
586 586
 			$meta_content .= $meta . ' ';
587 587
 		}
588 588
 
589
-		if( empty( $meta_content ) ) {
590
-			do_action('gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_meta] Returning; Empty custom fields for Post #%s (Custom fields keys:)', $post_id ), $meta_keys );
589
+		if ( empty( $meta_content ) ) {
590
+			do_action( 'gravityview_log_error', sprintf( 'GravityView_View_Data[parse_post_meta] Returning; Empty custom fields for Post #%s (Custom fields keys:)', $post_id ), $meta_keys );
591 591
 			return NULL;
592 592
 		}
593 593
 
@@ -615,16 +615,16 @@  discard block
 block discarded – undo
615 615
 		$message = NULL;
616 616
 
617 617
 		// Not invalid if not set!
618
-		if( empty( $post_id ) || empty( $view_id ) ) {
618
+		if ( empty( $post_id ) || empty( $view_id ) ) {
619 619
 
620
-			if( $empty_is_valid ) {
620
+			if ( $empty_is_valid ) {
621 621
 				return true;
622 622
 			}
623 623
 
624 624
 			$message = esc_html__( 'The ID is required.', 'gravityview' );
625 625
 		}
626 626
 
627
-		if( ! $message ) {
627
+		if ( ! $message ) {
628 628
 			$status = get_post_status( $post_id );
629 629
 
630 630
 			// Nothing exists with that post ID.
@@ -636,7 +636,7 @@  discard block
 block discarded – undo
636 636
 			}
637 637
 		}
638 638
 
639
-		if( ! $message ) {
639
+		if ( ! $message ) {
640 640
 
641 641
 			// Nothing exists with that post ID.
642 642
 			if ( empty( $status ) || in_array( $status, array( 'revision', 'attachment' ) ) ) {
@@ -645,8 +645,8 @@  discard block
 block discarded – undo
645 645
 
646 646
 		}
647 647
 
648
-		if( ! $message ) {
649
-			if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) && $post = get_post( $post_id ) )  {
648
+		if ( ! $message ) {
649
+			if ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) && $post = get_post( $post_id ) ) {
650 650
 				$views = GV\View_Collection::from_post( $post );
651 651
 				$view_ids_in_post = array_map( function( $view ) { return $view->ID; }, $views->all() );
652 652
 			} else {
@@ -655,21 +655,21 @@  discard block
 block discarded – undo
655 655
 			}
656 656
 
657 657
 			// The post or page specified does not contain the shortcode.
658
-			if ( false === in_array( $view_id, (array) $view_ids_in_post ) ) {
658
+			if ( false === in_array( $view_id, (array)$view_ids_in_post ) ) {
659 659
 				$message = sprintf( esc_html__( 'The Post ID entered is not valid. You may have entered a post or page that does not contain the selected View. Make sure the post contains the following shortcode: %s', 'gravityview' ), '<br /><code>[gravityview id="' . intval( $view_id ) . '"]</code>' );
660 660
 			}
661 661
 		}
662 662
 
663
-		if( ! $message ) {
663
+		if ( ! $message ) {
664 664
 
665 665
 			// It's a View
666 666
 			if ( ( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) && \GV\View::exists( $post_id ) )
667 667
 				|| 'gravityview' === get_post_type( $post_id ) ) {
668
-				$message = esc_html__( 'The ID is already a View.', 'gravityview' );;
668
+				$message = esc_html__( 'The ID is already a View.', 'gravityview' ); ;
669 669
 			}
670 670
 		}
671 671
 
672
-		if( $message ) {
672
+		if ( $message ) {
673 673
 			return new WP_Error( 'invalid_embed_id', $message );
674 674
 		}
675 675
 
@@ -686,7 +686,7 @@  discard block
 block discarded – undo
686 686
 
687 687
 		$args = defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) ? \GV\View_Settings::defaults( $with_details ) : self::get_default_args( $with_details );
688 688
 
689
-		if( !isset( $args[ $key ] ) ) { return NULL; }
689
+		if ( ! isset( $args[ $key ] ) ) { return NULL; }
690 690
 
691 691
 		return $args[ $key ];
692 692
 	}
@@ -723,7 +723,7 @@  discard block
 block discarded – undo
723 723
 		 */
724 724
 		$default_settings = apply_filters( 'gravityview_default_args', array(
725 725
 			'id' => array(
726
-				'label' => __('View ID', 'gravityview'),
726
+				'label' => __( 'View ID', 'gravityview' ),
727 727
 				'type' => 'number',
728 728
 				'group'	=> 'default',
729 729
 				'value' => NULL,
@@ -731,7 +731,7 @@  discard block
 block discarded – undo
731 731
 				'show_in_shortcode' => false,
732 732
 			),
733 733
 			'page_size' => array(
734
-				'label' 	=> __('Number of entries per page', 'gravityview'),
734
+				'label' 	=> __( 'Number of entries per page', 'gravityview' ),
735 735
 				'type' => 'number',
736 736
 				'class'	=> 'small-text',
737 737
 				'group'	=> 'default',
@@ -739,7 +739,7 @@  discard block
 block discarded – undo
739 739
 				'show_in_shortcode' => true,
740 740
 			),
741 741
 			'offset' => array(
742
-				'label' 	=> __('Offset entries starting from', 'gravityview'),
742
+				'label' 	=> __( 'Offset entries starting from', 'gravityview' ),
743 743
 				'type' => 'number',
744 744
 				'class'	=> 'small-text',
745 745
 				'group'	=> 'default',
@@ -763,8 +763,8 @@  discard block
 block discarded – undo
763 763
 			),
764 764
 			'admin_show_all_statuses' => array(
765 765
 				'label' => __( 'Show all entries to administrators', 'gravityview' ),
766
-				'desc'	=> __('Administrators will be able to see entries with any approval status.', 'gravityview'),
767
-				'tooltip' => __('Logged-out visitors and non-administrators will only see approved entries, while administrators will see entries with all statuses. This makes it easier for administrators to moderate entries from a View.', 'gravityview'),
766
+				'desc'	=> __( 'Administrators will be able to see entries with any approval status.', 'gravityview' ),
767
+				'tooltip' => __( 'Logged-out visitors and non-administrators will only see approved entries, while administrators will see entries with all statuses. This makes it easier for administrators to moderate entries from a View.', 'gravityview' ),
768 768
 				'requires' => 'show_only_approved',
769 769
 				'type' => 'checkbox',
770 770
 				'group'	=> 'default',
@@ -789,40 +789,40 @@  discard block
 block discarded – undo
789 789
 			'user_edit' => array(
790 790
 				'label'	=> __( 'Allow User Edit', 'gravityview' ),
791 791
 				'group'	=> 'default',
792
-				'desc'	=> __('Allow logged-in users to edit entries they created.', 'gravityview'),
792
+				'desc'	=> __( 'Allow logged-in users to edit entries they created.', 'gravityview' ),
793 793
 				'value'	=> 0,
794
-				'tooltip' => __('Display "Edit Entry" fields to non-administrator users if they created the entry. Edit Entry fields will always be displayed to site administrators.', 'gravityview'),
794
+				'tooltip' => __( 'Display "Edit Entry" fields to non-administrator users if they created the entry. Edit Entry fields will always be displayed to site administrators.', 'gravityview' ),
795 795
 				'type'	=> 'checkbox',
796 796
 				'show_in_shortcode' => true,
797 797
 			),
798 798
 			'user_delete' => array(
799 799
 				'label'	=> __( 'Allow User Delete', 'gravityview' ),
800 800
 				'group'	=> 'default',
801
-				'desc'	=> __('Allow logged-in users to delete entries they created.', 'gravityview'),
801
+				'desc'	=> __( 'Allow logged-in users to delete entries they created.', 'gravityview' ),
802 802
 				'value'	=> 0,
803
-				'tooltip' => __('Display "Delete Entry" fields to non-administrator users if they created the entry. Delete Entry fields will always be displayed to site administrators.', 'gravityview'),
803
+				'tooltip' => __( 'Display "Delete Entry" fields to non-administrator users if they created the entry. Delete Entry fields will always be displayed to site administrators.', 'gravityview' ),
804 804
 				'type'	=> 'checkbox',
805 805
 				'show_in_shortcode' => true,
806 806
 			),
807 807
 			'sort_field' => array(
808
-				'label'	=> __('Sort by field', 'gravityview'),
808
+				'label'	=> __( 'Sort by field', 'gravityview' ),
809 809
 				'type' => 'select',
810 810
 				'value' => '',
811 811
 				'group'	=> 'sort',
812 812
 				'options' => array(
813
-					'' => __( 'Default', 'gravityview'),
814
-					'date_created' => __( 'Date Created', 'gravityview'),
813
+					'' => __( 'Default', 'gravityview' ),
814
+					'date_created' => __( 'Date Created', 'gravityview' ),
815 815
 				),
816 816
 				'show_in_shortcode' => true,
817 817
 			),
818 818
 			'sort_direction' => array(
819
-				'label' 	=> __('Sort direction', 'gravityview'),
819
+				'label' 	=> __( 'Sort direction', 'gravityview' ),
820 820
 				'type' => 'select',
821 821
 				'value' => 'ASC',
822 822
 				'group'	=> 'sort',
823 823
 				'options' => array(
824
-					'ASC' => __('ASC', 'gravityview'),
825
-					'DESC' => __('DESC', 'gravityview'),
824
+					'ASC' => __( 'ASC', 'gravityview' ),
825
+					'DESC' => __( 'DESC', 'gravityview' ),
826 826
 					//'RAND' => __('Random', 'gravityview'),
827 827
 				),
828 828
 				'show_in_shortcode' => true,
@@ -838,69 +838,69 @@  discard block
 block discarded – undo
838 838
 				'show_in_template' => array( 'default_table', 'preset_business_data', 'preset_issue_tracker', 'preset_resume_board', 'preset_job_board' ),
839 839
 			),
840 840
 			'start_date' => array(
841
-				'label' 	=> __('Filter by Start Date', 'gravityview'),
841
+				'label' 	=> __( 'Filter by Start Date', 'gravityview' ),
842 842
 				'class'	=> 'gv-datepicker',
843
-				'desc'	=> __('Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
843
+				'desc'	=> __( 'Show entries submitted after this date. Supports relative dates, such as "-1 week" or "-1 month".', 'gravityview' ),
844 844
 				'type' => 'text',
845 845
 				'value' => '',
846 846
 				'group'	=> 'filter',
847 847
 				'show_in_shortcode' => true,
848 848
 			),
849 849
 			'end_date' => array(
850
-				'label' 	=> __('Filter by End Date', 'gravityview'),
850
+				'label' 	=> __( 'Filter by End Date', 'gravityview' ),
851 851
 				'class'	=> 'gv-datepicker',
852
-				'desc'	=> __('Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
852
+				'desc'	=> __( 'Show entries submitted before this date. Supports relative dates, such as "now" or "-3 days".', 'gravityview' ),
853 853
 				'type' => 'text',
854 854
 				'value' => '',
855 855
 				'group'	=> 'filter',
856 856
 				'show_in_shortcode' => true,
857 857
 			),
858 858
 			'class' => array(
859
-				'label' 	=> __('CSS Class', 'gravityview'),
860
-				'desc'	=> __('CSS class to add to the wrapping HTML container.', 'gravityview'),
859
+				'label' 	=> __( 'CSS Class', 'gravityview' ),
860
+				'desc'	=> __( 'CSS class to add to the wrapping HTML container.', 'gravityview' ),
861 861
 				'group'	=> 'default',
862 862
 				'type' => 'text',
863 863
 				'value' => '',
864 864
 				'show_in_shortcode' => false,
865 865
 			),
866 866
 			'search_value' => array(
867
-				'label' 	=> __('Search Value', 'gravityview'),
868
-				'desc'	=> __('Define a default search value for the View', 'gravityview'),
867
+				'label' 	=> __( 'Search Value', 'gravityview' ),
868
+				'desc'	=> __( 'Define a default search value for the View', 'gravityview' ),
869 869
 				'type' => 'text',
870 870
 				'value' => '',
871 871
 				'group'	=> 'filter',
872 872
 				'show_in_shortcode' => false,
873 873
 			),
874 874
 			'search_field' => array(
875
-				'label' 	=> __('Search Field', 'gravityview'),
876
-				'desc'	=> __('If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview'),
875
+				'label' 	=> __( 'Search Field', 'gravityview' ),
876
+				'desc'	=> __( 'If Search Value is set, you can define a specific field to search in. Otherwise, all fields will be searched.', 'gravityview' ),
877 877
 				'type' => 'number',
878 878
 				'value' => '',
879 879
 				'group'	=> 'filter',
880 880
 				'show_in_shortcode' => false,
881 881
 			),
882 882
 			'single_title' => array(
883
-				'label'	=> __('Single Entry Title', 'gravityview'),
883
+				'label'	=> __( 'Single Entry Title', 'gravityview' ),
884 884
 				'type'	=> 'text',
885
-				'desc'	=> __('When viewing a single entry, change the title of the page to this setting. Otherwise, the title will not change between the Multiple Entries and Single Entry views.', 'gravityview'),
885
+				'desc'	=> __( 'When viewing a single entry, change the title of the page to this setting. Otherwise, the title will not change between the Multiple Entries and Single Entry views.', 'gravityview' ),
886 886
 				'group'	=> 'default',
887 887
 				'value'	=> '',
888 888
 				'show_in_shortcode' => false,
889 889
 				'full_width' => true,
890 890
 			),
891 891
 			'back_link_label' => array(
892
-				'label'	=> __('Back Link Label', 'gravityview'),
892
+				'label'	=> __( 'Back Link Label', 'gravityview' ),
893 893
 				'group'	=> 'default',
894
-				'desc'	=> __('The text of the link that returns to the multiple entries view.', 'gravityview'),
894
+				'desc'	=> __( 'The text of the link that returns to the multiple entries view.', 'gravityview' ),
895 895
 				'type'	=> 'text',
896 896
 				'value'	=> '',
897 897
 				'show_in_shortcode' => false,
898 898
 				'full_width' => true,
899 899
 			),
900 900
 			'embed_only' => array(
901
-				'label'	=> __('Prevent Direct Access', 'gravityview'),
901
+				'label'	=> __( 'Prevent Direct Access', 'gravityview' ),
902 902
 				'group'	=> 'default',
903
-				'desc'	=> __('Only allow access to this View when embedded using the shortcode.', 'gravityview'),
903
+				'desc'	=> __( 'Only allow access to this View when embedded using the shortcode.', 'gravityview' ),
904 904
 				'type'	=> 'checkbox',
905 905
 				'value'	=> '',
906 906
 				'tooltip' => false,
@@ -912,15 +912,15 @@  discard block
 block discarded – undo
912 912
 				'value' => '',
913 913
 				'show_in_shortcode' => false,
914 914
 			),
915
-		));
915
+		) );
916 916
 
917 917
 		// By default, we only want the key => value pairing, not the whole array.
918
-		if( empty( $with_details ) ) {
918
+		if ( empty( $with_details ) ) {
919 919
 
920 920
 			$defaults = array();
921 921
 
922
-			foreach( $default_settings as $key => $value ) {
923
-				$defaults[ $key ] = $value['value'];
922
+			foreach ( $default_settings as $key => $value ) {
923
+				$defaults[ $key ] = $value[ 'value' ];
924 924
 			}
925 925
 
926 926
 			return $defaults;
@@ -929,12 +929,12 @@  discard block
 block discarded – undo
929 929
 		// But sometimes, we want all the details.
930 930
 		else {
931 931
 
932
-			foreach ($default_settings as $key => $value) {
932
+			foreach ( $default_settings as $key => $value ) {
933 933
 
934 934
 				// If the $group argument is set for the method,
935 935
 				// ignore any settings that aren't in that group.
936
-				if( !empty( $group ) && is_string( $group ) ) {
937
-					if( empty( $value['group'] ) || $value['group'] !== $group ) {
936
+				if ( ! empty( $group ) && is_string( $group ) ) {
937
+					if ( empty( $value[ 'group' ] ) || $value[ 'group' ] !== $group ) {
938 938
 						unset( $default_settings[ $key ] );
939 939
 					}
940 940
 				}
Please login to merge, or discard this patch.
future/includes/class-gv-entry-gravityforms.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 */
41 41
 	public static function by_id( $entry_id ) {
42 42
 		$entry = \GFAPI::get_entry( $entry_id );
43
-		if ( !$entry ) {
43
+		if ( ! $entry ) {
44 44
 			return null;
45 45
 		}
46 46
 
@@ -55,14 +55,14 @@  discard block
 block discarded – undo
55 55
 	 * @return \GV\Entry|null An instance of this entry or null if not found.
56 56
 	 */
57 57
 	public static function from_entry( $entry ) {
58
-		if ( empty( $entry['id'] ) ) {
58
+		if ( empty( $entry[ 'id' ] ) ) {
59 59
 			return null;
60 60
 		}
61 61
 
62 62
 		$self = new self();
63 63
 		$self->entry = $entry;
64 64
 
65
-		$self->ID = $self->entry['id'];
65
+		$self->ID = $self->entry[ 'id' ];
66 66
 
67 67
 		return $self;
68 68
 	}
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	 * @return bool Whether the offset exists or not.
77 77
 	 */
78 78
 	public function offsetExists( $offset ) {
79
-		return isset( $this->entry[$offset] );
79
+		return isset( $this->entry[ $offset ] );
80 80
 	}
81 81
 
82 82
 	/**
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 	 * @return mixed The value of the requested entry data.
92 92
 	 */
93 93
 	public function offsetGet( $offset ) {
94
-		return $this->entry[$offset];
94
+		return $this->entry[ $offset ];
95 95
 	}
96 96
 
97 97
 	/**
Please login to merge, or discard this patch.
future/includes/class-gv-form-gravityforms.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -40,14 +40,14 @@  discard block
 block discarded – undo
40 40
 	 */
41 41
 	public static function by_id( $form_id ) {
42 42
 		$form = \GFAPI::get_form( $form_id );
43
-		if ( !$form ) {
43
+		if ( ! $form ) {
44 44
 			return null;
45 45
 		}
46 46
 
47 47
 		$self = new self();
48 48
 		$self->form = $form;
49 49
 
50
-		$self->ID = $self->form['id'];
50
+		$self->ID = $self->form[ 'id' ];
51 51
 
52 52
 		return $self;
53 53
 	}
@@ -90,11 +90,11 @@  discard block
 block discarded – undo
90 90
 
91 91
 			/** The offset and limit */
92 92
 			if ( ! empty( $offset->limit ) ) {
93
-				$paging['page_size'] = $offset->limit;
93
+				$paging[ 'page_size' ] = $offset->limit;
94 94
 			}
95 95
 
96 96
 			if ( ! empty( $offset->offset ) ) {
97
-				$paging['offset'] = $offset->offset;
97
+				$paging[ 'offset' ] = $offset->offset;
98 98
 			}
99 99
 
100 100
 			foreach ( \GFAPI::get_entries( $form->ID, $search_criteria, $sorting, $paging ) as $entry ) {
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 	 * @return bool Whether the offset exists or not.
131 131
 	 */
132 132
 	public function offsetExists( $offset ) {
133
-		return isset( $this->form[$offset] );
133
+		return isset( $this->form[ $offset ] );
134 134
 	}
135 135
 
136 136
 	/**
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 	 * @return mixed The value of the requested form data.
146 146
 	 */
147 147
 	public function offsetGet( $offset ) {
148
-		return $this->form[$offset];
148
+		return $this->form[ $offset ];
149 149
 	}
150 150
 
151 151
 	/**
Please login to merge, or discard this patch.
includes/class-gravityview-logging.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -7,9 +7,9 @@  discard block
 block discarded – undo
7 7
 
8 8
 	function __construct() {
9 9
 
10
-		add_action( 'gravityview_log_error', array( $this, 'log_error'), 10, 2 );
10
+		add_action( 'gravityview_log_error', array( $this, 'log_error' ), 10, 2 );
11 11
 
12
-		add_action( 'gravityview_log_debug', array( $this, 'log_debug'), 10, 2 );
12
+		add_action( 'gravityview_log_debug', array( $this, 'log_debug' ), 10, 2 );
13 13
 
14 14
 		// Enable debug with Gravity Forms Logging Add-on
15 15
 	    add_filter( 'gform_logging_supported', array( $this, 'enable_gform_logging' ) );
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 			include_once( GRAVITYVIEW_DIR . 'includes/class-debug-bar.php' );
35 35
 		}
36 36
 
37
-		$panels[] = new GravityView_Debug_Bar;
37
+		$panels[ ] = new GravityView_Debug_Bar;
38 38
 
39 39
 		return $panels;
40 40
 	}
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 	 * @param array $supported_plugins List of plugins
45 45
 	 */
46 46
 	public function enable_gform_logging( $supported_plugins ) {
47
-	    $supported_plugins['gravityview'] = 'GravityView';
47
+	    $supported_plugins[ 'gravityview' ] = 'GravityView';
48 48
 	    return $supported_plugins;
49 49
 	}
50 50
 
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	 * @return string "print_r" or "var_export"
73 73
 	 */
74 74
 	static function get_print_function() {
75
-		if( ob_get_level() > 0 ) {
75
+		if ( ob_get_level() > 0 ) {
76 76
 			$function = 'var_export';
77 77
 		} else {
78 78
 			$function = 'print_r';
@@ -90,17 +90,17 @@  discard block
 block discarded – undo
90 90
 			'data' => $data,
91 91
 		);
92 92
 
93
-		if( !in_array( $notice, self::$notices ) ) {
94
-			self::$notices[] = $notice;
93
+		if ( ! in_array( $notice, self::$notices ) ) {
94
+			self::$notices[ ] = $notice;
95 95
 		}
96 96
 
97
-		if ( class_exists("GFLogging") ) {
97
+		if ( class_exists( "GFLogging" ) ) {
98 98
 			GFLogging::include_logger();
99
-	        GFLogging::log_message( 'gravityview', $function( $message, true ) . $function($data, true), KLogger::DEBUG );
99
+	        GFLogging::log_message( 'gravityview', $function( $message, true ) . $function( $data, true ), KLogger::DEBUG );
100 100
 	    }
101 101
 	}
102 102
 
103
-	static function log_error( $message = '', $data = null  ) {
103
+	static function log_error( $message = '', $data = null ) {
104 104
 
105 105
 		$function = self::get_print_function();
106 106
 
@@ -110,13 +110,13 @@  discard block
 block discarded – undo
110 110
 			'backtrace' => function_exists( 'wp_debug_backtrace_summary' ) ? wp_debug_backtrace_summary( null, 3 ) : '',
111 111
 		);
112 112
 
113
-		if( !in_array( $error, self::$errors ) ) {
114
-			self::$errors[] = $error;
113
+		if ( ! in_array( $error, self::$errors ) ) {
114
+			self::$errors[ ] = $error;
115 115
 		}
116 116
 
117
-		if ( class_exists("GFLogging") ) {
117
+		if ( class_exists( "GFLogging" ) ) {
118 118
 		    GFLogging::include_logger();
119
-		    GFLogging::log_message( 'gravityview', $function ( $message, true ) . $function ( $error, true), KLogger::ERROR );
119
+		    GFLogging::log_message( 'gravityview', $function( $message, true ) . $function( $error, true ), KLogger::ERROR );
120 120
 		}
121 121
 	}
122 122
 
Please login to merge, or discard this patch.
includes/class-gravityview-compatibility.php 1 patch
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	 * @return GravityView_Compatibility
77 77
 	 */
78 78
 	public static function getInstance() {
79
-		if( self::$instance ) {
79
+		if ( self::$instance ) {
80 80
 			return self::$instance;
81 81
 		}
82 82
 		return new self;
@@ -154,10 +154,10 @@  discard block
 block discarded – undo
154 154
 		// If Gravity Forms doesn't exist or is outdated, load the admin view class to
155 155
 		// show the notice, but not load any post types or process shortcodes.
156 156
 		// Without Gravity Forms, there is no GravityView. Beautiful, really.
157
-		if( ! self::is_valid() ) {
157
+		if ( ! self::is_valid() ) {
158 158
 
159 159
 			// If the plugin's not loaded, might as well hide the shortcode for people.
160
-			add_shortcode( 'gravityview', array( $this, '_shortcode_gf_notice') );
160
+			add_shortcode( 'gravityview', array( $this, '_shortcode_gf_notice' ) );
161 161
 
162 162
 		}
163 163
 	}
@@ -183,15 +183,15 @@  discard block
 block discarded – undo
183 183
 	 */
184 184
 	public function _shortcode_gf_notice( $atts = array(), $content = null, $shortcode = 'gravityview' ) {
185 185
 
186
-		if( ! GVCommon::has_cap( 'activate_plugins' ) ) {
186
+		if ( ! GVCommon::has_cap( 'activate_plugins' ) ) {
187 187
 			return null;
188 188
 		}
189 189
 
190 190
 		$notices = self::get_notices();
191 191
 
192
-		$message = '<div style="border:1px solid red; padding: 15px;"><p style="text-align:center;"><em>' . esc_html__( 'You are seeing this notice because you are an administrator. Other users of the site will see nothing.', 'gravityview') . '</em></p>';
193
-		foreach( (array)$notices as $notice ) {
194
-			$message .= wpautop( $notice['message'] );
192
+		$message = '<div style="border:1px solid red; padding: 15px;"><p style="text-align:center;"><em>' . esc_html__( 'You are seeing this notice because you are an administrator. Other users of the site will see nothing.', 'gravityview' ) . '</em></p>';
193
+		foreach ( (array)$notices as $notice ) {
194
+			$message .= wpautop( $notice[ 'message' ] );
195 195
 		}
196 196
 		$message .= '</div>';
197 197
 
@@ -211,12 +211,12 @@  discard block
 block discarded – undo
211 211
 
212 212
 		if (
213 213
 			( defined( 'GRAVITYVIEW_FUTURE_CORE_LOADED' ) && ! gravityview()->plugin->is_compatible_php() )
214
-			|| ( false === version_compare( phpversion(), GV_MIN_PHP_VERSION , '>=' ) )
214
+			|| ( false === version_compare( phpversion(), GV_MIN_PHP_VERSION, '>=' ) )
215 215
 		) {
216 216
 
217
-			self::$notices['php_version'] = array(
217
+			self::$notices[ 'php_version' ] = array(
218 218
 				'class' => 'error',
219
-				'message' => sprintf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.phpversion().'</span>' ),
219
+				'message' => sprintf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . phpversion() . '</span>' ),
220 220
 				'cap' => 'manage_options',
221 221
 				'dismiss' => 'php_version',
222 222
 			);
@@ -224,14 +224,14 @@  discard block
 block discarded – undo
224 224
 			return false;
225 225
 		}
226 226
 
227
-		if( false === version_compare( phpversion(), GV_FUTURE_MIN_PHP_VERSION , '>=' ) ) {
227
+		if ( false === version_compare( phpversion(), GV_FUTURE_MIN_PHP_VERSION, '>=' ) ) {
228 228
 
229 229
 			// Show the notice on every update. Yes, annoying, but not as annoying as a plugin breaking.
230
-			$key = sprintf('php_%s_%s', GV_FUTURE_MIN_PHP_VERSION, GravityView_Plugin::version );
230
+			$key = sprintf( 'php_%s_%s', GV_FUTURE_MIN_PHP_VERSION, GravityView_Plugin::version );
231 231
 
232 232
 			self::$notices[ $key ] = array(
233 233
 				'class' => 'error',
234
-				'message' => sprintf( __( "%sGravityView will soon require PHP Version %s.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_FUTURE_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.phpversion().'</span>' ),
234
+				'message' => sprintf( __( "%sGravityView will soon require PHP Version %s.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), '<h3>', GV_FUTURE_MIN_PHP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . phpversion() . '</span>' ),
235 235
 				'cap' => 'manage_options',
236 236
 				'dismiss' => $key,
237 237
 			);
@@ -255,9 +255,9 @@  discard block
 block discarded – undo
255 255
 			|| ( false === version_compare( $wp_version, GV_MIN_WP_VERSION, '>=' ) )
256 256
 		) {
257 257
 
258
-			self::$notices['wp_version'] = array(
258
+			self::$notices[ 'wp_version' ] = array(
259 259
 				'class' => 'error',
260
-				'message' => sprintf( __( "%sGravityView requires WordPress %s or newer.%s \n\nYou're using Version %s. Please upgrade your WordPress installation.", 'gravityview' ), '<h3>', GV_MIN_WP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.$wp_version.'</span>' ),
260
+				'message' => sprintf( __( "%sGravityView requires WordPress %s or newer.%s \n\nYou're using Version %s. Please upgrade your WordPress installation.", 'gravityview' ), '<h3>', GV_MIN_WP_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . $wp_version . '</span>' ),
261 261
 			    'cap' => 'update_core',
262 262
 				'dismiss' => 'wp_version',
263 263
 			);
@@ -280,10 +280,10 @@  discard block
 block discarded – undo
280 280
 	public static function check_gravityforms() {
281 281
 
282 282
 		// Bypass other checks: if the class exists
283
-		if( class_exists( 'GFCommon' ) ) {
283
+		if ( class_exists( 'GFCommon' ) ) {
284 284
 
285 285
 			// Does the version meet future requirements?
286
-			if( true === version_compare( GFCommon::$version, GV_FUTURE_MIN_GF_VERSION, ">=" ) ) {
286
+			if ( true === version_compare( GFCommon::$version, GV_FUTURE_MIN_GF_VERSION, ">=" ) ) {
287 287
 				return true;
288 288
 			}
289 289
 
@@ -297,9 +297,9 @@  discard block
 block discarded – undo
297 297
 			$class = $meets_minimum ? 'notice-warning' : 'error';
298 298
 
299 299
 			// Show the notice even if the future version requirements aren't met
300
-			self::$notices['gf_version'] = array(
300
+			self::$notices[ 'gf_version' ] = array(
301 301
 				'class' => $class,
302
-				'message' => sprintf( __( "%sGravityView requires Gravity Forms Version %s or newer.%s \n\nYou're using Version %s. Please update your Gravity Forms or purchase a license. %sGet Gravity Forms%s - starting at $39%s%s", 'gravityview' ), '<h3>', GV_FUTURE_MIN_GF_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">'.GFCommon::$version.'</span>', "\n\n".'<a href="https://gravityview.co/gravityforms/" class="button button-secondary button-large button-hero">' , '<em>', '</em>', '</a>'),
302
+				'message' => sprintf( __( "%sGravityView requires Gravity Forms Version %s or newer.%s \n\nYou're using Version %s. Please update your Gravity Forms or purchase a license. %sGet Gravity Forms%s - starting at $39%s%s", 'gravityview' ), '<h3>', GV_FUTURE_MIN_GF_VERSION, "</h3>\n\n", '<span style="font-family: Consolas, Courier, monospace;">' . GFCommon::$version . '</span>', "\n\n" . '<a href="https://gravityview.co/gravityforms/" class="button button-secondary button-large button-hero">', '<em>', '</em>', '</a>' ),
303 303
 				'cap' => 'update_plugins',
304 304
 				'dismiss' => 'gf_version_' . GV_FUTURE_MIN_GF_VERSION,
305 305
 			);
@@ -315,42 +315,42 @@  discard block
 block discarded – undo
315 315
 		 * OR
316 316
 		 * It's the Network Admin and we just don't know whether the sites have GF activated themselves.
317 317
 		 */
318
-		if( true === $gf_status || is_network_admin() ) {
318
+		if ( true === $gf_status || is_network_admin() ) {
319 319
 			return true;
320 320
 		}
321 321
 
322 322
 		// If GFCommon doesn't exist, assume GF not active
323 323
 		$return = false;
324 324
 
325
-		switch( $gf_status ) {
325
+		switch ( $gf_status ) {
326 326
 			case 'inactive':
327 327
 
328 328
 				// Required for multisite
329
-				if( ! function_exists('wp_create_nonce') ) {
329
+				if ( ! function_exists( 'wp_create_nonce' ) ) {
330 330
 					require_once ABSPATH . WPINC . '/pluggable.php';
331 331
 				}
332 332
 
333 333
 				// Otherwise, throws an error on activation & deactivation "Use of undefined constant LOGGED_IN_COOKIE"
334
-				if( is_multisite() ) {
334
+				if ( is_multisite() ) {
335 335
 					wp_cookie_constants();
336 336
 				}
337 337
 
338 338
 				$return = false;
339 339
 
340
-				$button = function_exists('is_network_admin') && is_network_admin() ? '<strong><a href="#gravity-forms">' : '<strong><a href="'. wp_nonce_url( admin_url( 'plugins.php?action=activate&plugin=gravityforms/gravityforms.php' ), 'activate-plugin_gravityforms/gravityforms.php') . '" class="button button-large">';
340
+				$button = function_exists( 'is_network_admin' ) && is_network_admin() ? '<strong><a href="#gravity-forms">' : '<strong><a href="' . wp_nonce_url( admin_url( 'plugins.php?action=activate&plugin=gravityforms/gravityforms.php' ), 'activate-plugin_gravityforms/gravityforms.php' ) . '" class="button button-large">';
341 341
 
342
-				self::$notices['gf_inactive'] = array(
342
+				self::$notices[ 'gf_inactive' ] = array(
343 343
 					'class' => 'error',
344
-					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be active. %sActivate Gravity Forms%s to use the GravityView plugin.', 'gravityview' ), '<h3>', "</h3>\n\n". $button, '</a></strong>' ),
344
+					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be active. %sActivate Gravity Forms%s to use the GravityView plugin.', 'gravityview' ), '<h3>', "</h3>\n\n" . $button, '</a></strong>' ),
345 345
 					'cap' => 'activate_plugins',
346 346
 					'dismiss' => 'gf_inactive',
347 347
 				);
348 348
 
349 349
 				break;
350 350
 			default:
351
-				self::$notices['gf_installed'] = array(
351
+				self::$notices[ 'gf_installed' ] = array(
352 352
 					'class' => 'error',
353
-					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be installed in order to run properly. %sGet Gravity Forms%s - starting at $39%s%s', 'gravityview' ), '<h3>', "</h3>\n\n".'<a href="http://katz.si/gravityforms" class="button button-secondary button-large button-hero">' , '<em>', '</em>', '</a>'),
353
+					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be installed in order to run properly. %sGet Gravity Forms%s - starting at $39%s%s', 'gravityview' ), '<h3>', "</h3>\n\n" . '<a href="http://katz.si/gravityforms" class="button button-secondary button-large button-hero">', '<em>', '</em>', '</a>' ),
354 354
 					'cap' => 'install_plugins',
355 355
 					'dismiss' => 'gf_installed',
356 356
 				);
@@ -367,10 +367,10 @@  discard block
 block discarded – undo
367 367
 	 */
368 368
 	private static function check_gf_directory() {
369 369
 
370
-		if( class_exists( 'GFDirectory' ) ) {
371
-			self::$notices['gf_directory'] = array(
370
+		if ( class_exists( 'GFDirectory' ) ) {
371
+			self::$notices[ 'gf_directory' ] = array(
372 372
 				'class' => 'error is-dismissible',
373
-				'title' => __('Potential Conflict', 'gravityview' ),
373
+				'title' => __( 'Potential Conflict', 'gravityview' ),
374 374
 				'message' => __( 'GravityView and Gravity Forms Directory are both active. This may cause problems. If you experience issues, disable the Gravity Forms Directory plugin.', 'gravityview' ),
375 375
 				'dismiss' => 'gf_directory',
376 376
 				'cap' => 'activate_plugins',
@@ -389,21 +389,21 @@  discard block
 block discarded – undo
389 389
 	 */
390 390
 	public static function get_plugin_status( $location = '' ) {
391 391
 
392
-		if( ! function_exists('is_plugin_active') ) {
392
+		if ( ! function_exists( 'is_plugin_active' ) ) {
393 393
 			include_once( ABSPATH . '/wp-admin/includes/plugin.php' );
394 394
 		}
395 395
 
396
-		if( is_network_admin() && is_plugin_active_for_network( $location ) ) {
396
+		if ( is_network_admin() && is_plugin_active_for_network( $location ) ) {
397 397
 			return true;
398 398
 		}
399 399
 
400
-		if( !is_network_admin() && is_plugin_active( $location ) ) {
400
+		if ( ! is_network_admin() && is_plugin_active( $location ) ) {
401 401
 			return true;
402 402
 		}
403 403
 
404
-		if(
405
-			!file_exists( trailingslashit( WP_PLUGIN_DIR ) . $location ) &&
406
-			!file_exists( trailingslashit( WPMU_PLUGIN_DIR ) . $location )
404
+		if (
405
+			! file_exists( trailingslashit( WP_PLUGIN_DIR ) . $location ) &&
406
+			! file_exists( trailingslashit( WPMU_PLUGIN_DIR ) . $location )
407 407
 		) {
408 408
 			return false;
409 409
 		}
Please login to merge, or discard this patch.
includes/class-gravityview-settings.php 1 patch
Spacing   +87 added lines, -87 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if( ! class_exists('GFAddOn') ) {
3
+if ( ! class_exists( 'GFAddOn' ) ) {
4 4
 	return;
5 5
 }
6 6
 
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 	 */
76 76
 	public function __construct( $prevent_multiple_instances = '' ) {
77 77
 
78
-		if( $prevent_multiple_instances === 'get_instance' ) {
78
+		if ( $prevent_multiple_instances === 'get_instance' ) {
79 79
 			return parent::__construct();
80 80
 		}
81 81
 
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	 */
88 88
 	public static function get_instance() {
89 89
 
90
-		if( empty( self::$instance ) ) {
90
+		if ( empty( self::$instance ) ) {
91 91
 			self::$instance = new self( 'get_instance' );
92 92
 		}
93 93
 
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 	 */
107 107
 	public function current_user_can_any( $caps ) {
108 108
 
109
-		if( empty( $caps ) ) {
109
+		if ( empty( $caps ) ) {
110 110
 			$caps = array( 'gravityview_full_access' );
111 111
 		}
112 112
 
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
             ),
168 168
 			'found-other' => array(
169 169
                 'label' => esc_html__( 'I found a better plugin', 'gravityview' ),
170
-                'followup' => esc_attr__('What plugin you are using, and why?', 'gravityview'),
170
+                'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ),
171 171
             ),
172 172
 			'other' => array(
173 173
                 'label' => esc_html__( 'Other', 'gravityview' ),
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
                 });
255 255
 
256 256
                 function gv_feedback_append_error_message() {
257
-                    $('#gv-uninstall-thanks').append('<div class="notice error"><?php echo esc_js( __('There was an error sharing your feedback. Sorry! Please email us at [email protected]', 'gravityview' ) ) ?></div>');
257
+                    $('#gv-uninstall-thanks').append('<div class="notice error"><?php echo esc_js( __( 'There was an error sharing your feedback. Sorry! Please email us at [email protected]', 'gravityview' ) ) ?></div>');
258 258
                 }
259 259
             });
260 260
         </script>
@@ -271,15 +271,15 @@  discard block
 block discarded – undo
271 271
             </ul>
272 272
             <div class="gv-followup widefat">
273 273
                 <p><strong><label for="gv-reason-details"><?php esc_html_e( 'Comments', 'gravityview' ); ?></label></strong></p>
274
-                <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview') ?>" placeholder="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview'); ?>" class="large-text"></textarea>
274
+                <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ) ?>" placeholder="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ); ?>" class="large-text"></textarea>
275 275
             </div>
276 276
             <div class="scale-description">
277
-                <p><strong><?php esc_html_e('How likely are you to recommend GravityView?', 'gravityview' ); ?></strong></p>
277
+                <p><strong><?php esc_html_e( 'How likely are you to recommend GravityView?', 'gravityview' ); ?></strong></p>
278 278
                 <ul class="inline">
279 279
 					<?php
280 280
 					$i = 0;
281
-					while( $i < 11 ) {
282
-						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_'.$i.'" value="'.$i.'" type="radio"> '.$i.'</label></li>';
281
+					while ( $i < 11 ) {
282
+						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_' . $i . '" value="' . $i . '" type="radio"> ' . $i . '</label></li>';
283 283
 						$i++;
284 284
 					}
285 285
 					?>
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
             </div>
289 289
 
290 290
             <div class="gv-form-field-wrapper">
291
-                <label><input type="checkbox" class="checkbox" name="follow_up_with_me" value="1" /> <?php esc_html_e('Please follow up with me about my feedback', 'gravityview'); ?></label>
291
+                <label><input type="checkbox" class="checkbox" name="follow_up_with_me" value="1" /> <?php esc_html_e( 'Please follow up with me about my feedback', 'gravityview' ); ?></label>
292 292
             </div>
293 293
 
294 294
             <div class="submit">
@@ -302,7 +302,7 @@  discard block
 block discarded – undo
302 302
         <div id="gv-uninstall-thanks" class="notice notice-large notice-updated below-h2" style="display:none;">
303 303
             <h3 class="notice-title"><?php esc_html_e( 'Thank you for using GravityView!', 'gravityview' ); ?></h3>
304 304
             <p><?php echo gravityview_get_floaty(); ?>
305
-				<?php echo make_clickable( esc_html__('Your feedback helps us improve GravityView. If you have any questions or comments, email us: [email protected]', 'gravityview' ) ); ?>
305
+				<?php echo make_clickable( esc_html__( 'Your feedback helps us improve GravityView. If you have any questions or comments, email us: [email protected]', 'gravityview' ) ); ?>
306 306
             </p>
307 307
             <div class="wp-clearfix"></div>
308 308
         </div>
@@ -376,7 +376,7 @@  discard block
 block discarded – undo
376 376
 		add_filter( 'gform_addon_app_settings_menu_gravityview', array( $this, 'modify_app_settings_menu_title' ) );
377 377
 
378 378
 		/** @since 1.7.6 */
379
-		add_action('network_admin_menu', array( $this, 'add_network_menu' ) );
379
+		add_action( 'network_admin_menu', array( $this, 'add_network_menu' ) );
380 380
 
381 381
 		parent::init_admin();
382 382
 	}
@@ -390,7 +390,7 @@  discard block
 block discarded – undo
390 390
 	 */
391 391
 	public function modify_app_settings_menu_title( $setting_tabs ) {
392 392
 
393
-		$setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview');
393
+		$setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' );
394 394
 
395 395
 		return $setting_tabs;
396 396
 	}
@@ -407,11 +407,11 @@  discard block
 block discarded – undo
407 407
 	 */
408 408
 	private function _load_license_handler() {
409 409
 
410
-		if( !empty( $this->License_Handler ) ) {
410
+		if ( ! empty( $this->License_Handler ) ) {
411 411
 			return;
412 412
 		}
413 413
 
414
-		require_once( GRAVITYVIEW_DIR . 'includes/class-gv-license-handler.php');
414
+		require_once( GRAVITYVIEW_DIR . 'includes/class-gv-license-handler.php' );
415 415
 
416 416
 		$this->License_Handler = GV_License_Handler::get_instance( $this );
417 417
 	}
@@ -422,21 +422,21 @@  discard block
 block discarded – undo
422 422
 	 */
423 423
 	function license_key_notice() {
424 424
 
425
-		$license_status = self::getSetting('license_key_status');
426
-		$license_key = self::getSetting('license_key');
427
-		if( '' === $license_key ) {
425
+		$license_status = self::getSetting( 'license_key_status' );
426
+		$license_key = self::getSetting( 'license_key' );
427
+		if ( '' === $license_key ) {
428 428
 			$license_status = 'inactive';
429 429
         }
430 430
 		$license_id = empty( $license_key ) ? 'license' : $license_key;
431 431
 
432
-		$message = esc_html__('Your GravityView license %s. This means you&rsquo;re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview');
432
+		$message = esc_html__( 'Your GravityView license %s. This means you&rsquo;re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview' );
433 433
 
434 434
 		/**
435 435
 		 * I wanted to remove the period from after the buttons in the string,
436 436
 		 * but didn't want to mess up the translation strings for the translators.
437 437
 		 */
438 438
 		$message = mb_substr( $message, 0, mb_strlen( $message ) - 1 );
439
-		$title = __('Inactive License', 'gravityview');
439
+		$title = __( 'Inactive License', 'gravityview' );
440 440
 		$status = '';
441 441
 		$update_below = false;
442 442
 		$primary_button_link = admin_url( 'edit.php?post_type=gravityview&amp;page=gravityview_settings' );
@@ -444,17 +444,17 @@  discard block
 block discarded – undo
444 444
         switch ( $license_status ) {
445 445
 			/** @since 1.17 */
446 446
 			case 'expired':
447
-				$title = __('Expired License', 'gravityview');
447
+				$title = __( 'Expired License', 'gravityview' );
448 448
 				$status = 'expired';
449
-				$message = $this->get_license_handler()->strings( 'expired', self::getSetting('license_key_response') );
449
+				$message = $this->get_license_handler()->strings( 'expired', self::getSetting( 'license_key_response' ) );
450 450
 				break;
451 451
 			case 'invalid':
452
-				$title = __('Invalid License', 'gravityview');
453
-				$status = __('is invalid', 'gravityview');
452
+				$title = __( 'Invalid License', 'gravityview' );
453
+				$status = __( 'is invalid', 'gravityview' );
454 454
 				break;
455 455
 			case 'deactivated':
456
-				$status = __('is inactive', 'gravityview');
457
-				$update_below = __('Activate your license key below.', 'gravityview');
456
+				$status = __( 'is inactive', 'gravityview' );
457
+				$update_below = __( 'Activate your license key below.', 'gravityview' );
458 458
 				break;
459 459
 			/** @noinspection PhpMissingBreakStatementInspection */
460 460
 			case '':
@@ -462,20 +462,20 @@  discard block
 block discarded – undo
462 462
 				// break intentionally left blank
463 463
 			case 'inactive':
464 464
 			case 'site_inactive':
465
-				$status = __('has not been activated', 'gravityview');
466
-				$update_below = __('Activate your license key below.', 'gravityview');
465
+				$status = __( 'has not been activated', 'gravityview' );
466
+				$update_below = __( 'Activate your license key below.', 'gravityview' );
467 467
 				break;
468 468
 		}
469
-		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content='.$license_status.'&utm_campaign=Admin%20Notice';
469
+		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content=' . $license_status . '&utm_campaign=Admin%20Notice';
470 470
 
471 471
 		// Show a different notice on settings page for inactive licenses (hide the buttons)
472
-		if( $update_below && gravityview_is_admin_page( '', 'settings' ) ) {
472
+		if ( $update_below && gravityview_is_admin_page( '', 'settings' ) ) {
473 473
 			$message = sprintf( $message, $status, '<div class="hidden">', '', '', '</div><a href="#" onclick="jQuery(\'#license_key\').focus(); return false;">' . $update_below . '</a>' );
474 474
 		} else {
475 475
 			$message = sprintf( $message, $status, "\n\n" . '<a href="' . esc_url( $primary_button_link ) . '" class="button button-primary">', '</a>', '<a href="' . esc_url( $url ) . '" class="button button-secondary">', '</a>' );
476 476
 		}
477 477
 
478
-		if( !empty( $status ) ) {
478
+		if ( ! empty( $status ) ) {
479 479
 			GravityView_Admin_Notices::add_notice( array(
480 480
 				'message' => $message,
481 481
 				'class'   => 'updated',
@@ -498,7 +498,7 @@  discard block
 block discarded – undo
498 498
 	public function scripts() {
499 499
 		$scripts = parent::scripts();
500 500
 
501
-		$scripts[] = array(
501
+		$scripts[ ] = array(
502 502
 			'handle'  => 'gform_tooltip_init',
503 503
 			'enqueue' => array(
504 504
                 array(
@@ -518,7 +518,7 @@  discard block
 block discarded – undo
518 518
 
519 519
 		$styles = parent::styles();
520 520
 
521
-		$styles[] = array(
521
+		$styles[ ] = array(
522 522
 			'handle'  => 'gravityview_settings',
523 523
 			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
524 524
 			'version' => GravityView_Plugin::version,
@@ -544,7 +544,7 @@  discard block
 block discarded – undo
544 544
 	 * @return void
545 545
 	 */
546 546
 	public function add_network_menu() {
547
-		if( GravityView_Plugin::is_network_activated() ) {
547
+		if ( GravityView_Plugin::is_network_activated() ) {
548 548
 			add_menu_page( __( 'Settings', 'gravityview' ), __( 'GravityView', 'gravityview' ), $this->_capabilities_app_settings, "{$this->_slug}_settings", array( $this, 'app_tab_page' ), 'none' );
549 549
 		}
550 550
 	}
@@ -561,7 +561,7 @@  discard block
 block discarded – undo
561 561
 		 * If multisite and not network admin, we don't want the settings to show.
562 562
 		 * @since 1.7.6
563 563
 		 */
564
-		$show_submenu = !is_multisite() ||  is_main_site() || !GravityView_Plugin::is_network_activated() || ( is_network_admin() && GravityView_Plugin::is_network_activated() );
564
+		$show_submenu = ! is_multisite() || is_main_site() || ! GravityView_Plugin::is_network_activated() || ( is_network_admin() && GravityView_Plugin::is_network_activated() );
565 565
 
566 566
 		/**
567 567
 		 * Override whether to show the Settings menu on a per-blog basis.
@@ -570,7 +570,7 @@  discard block
 block discarded – undo
570 570
 		 */
571 571
 		$show_submenu = apply_filters( 'gravityview/show-settings-menu', $show_submenu );
572 572
 
573
-		if( $show_submenu ) {
573
+		if ( $show_submenu ) {
574 574
 			add_submenu_page( 'edit.php?post_type=gravityview', __( 'Settings', 'gravityview' ), __( 'Settings', 'gravityview' ), $this->_capabilities_app_settings, $this->_slug . '_settings', array( $this, 'app_tab_page' ) );
575 575
 		}
576 576
 	}
@@ -609,7 +609,7 @@  discard block
 block discarded – undo
609 609
 		/**
610 610
 		 * Backward compatibility with Redux
611 611
 		 */
612
-		if( $setting_name === 'license' ) {
612
+		if ( $setting_name === 'license' ) {
613 613
 			return array(
614 614
 				'license' => parent::get_app_setting( 'license_key' ),
615 615
 				'status' => parent::get_app_setting( 'license_key_status' ),
@@ -673,7 +673,7 @@  discard block
 block discarded – undo
673 673
 
674 674
 		$return = $text . $activation;
675 675
 
676
-		if( $echo ) {
676
+		if ( $echo ) {
677 677
 			echo $return;
678 678
 		}
679 679
 
@@ -700,15 +700,15 @@  discard block
 block discarded – undo
700 700
 	 */
701 701
 	public function settings_submit( $field, $echo = true ) {
702 702
 
703
-		$field['type']  = ( isset($field['type']) && in_array( $field['type'], array('submit','reset','button') ) ) ? $field['type'] : 'submit';
703
+		$field[ 'type' ] = ( isset( $field[ 'type' ] ) && in_array( $field[ 'type' ], array( 'submit', 'reset', 'button' ) ) ) ? $field[ 'type' ] : 'submit';
704 704
 
705 705
 		$attributes    = $this->get_field_attributes( $field );
706 706
 		$default_value = rgar( $field, 'value' ) ? rgar( $field, 'value' ) : rgar( $field, 'default_value' );
707
-		$value         = $this->get_setting( $field['name'], $default_value );
707
+		$value         = $this->get_setting( $field[ 'name' ], $default_value );
708 708
 
709 709
 
710
-		$attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary gfbutton';
711
-		$name    = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_'.$field['name'];
710
+		$attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary gfbutton';
711
+		$name = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ];
712 712
 
713 713
 		if ( empty( $value ) ) {
714 714
 			$value = __( 'Update Settings', 'gravityview' );
@@ -717,7 +717,7 @@  discard block
 block discarded – undo
717 717
 		$attributes = $this->get_field_attributes( $field );
718 718
 
719 719
 		$html = '<input
720
-                    type="' . $field['type'] . '"
720
+                    type="' . $field[ 'type' ] . '"
721 721
                     name="' . esc_attr( $name ) . '"
722 722
                     value="' . $value . '" ' .
723 723
 		        implode( ' ', $attributes ) .
@@ -739,12 +739,12 @@  discard block
 block discarded – undo
739 739
 	 * @return string
740 740
 	 */
741 741
 	public function settings_save( $field, $echo = true ) {
742
-		$field['type']  = 'submit';
743
-		$field['name']  = 'gform-settings-save';
744
-		$field['class'] = isset( $field['class'] ) ? $field['class'] : 'button-primary gfbutton';
742
+		$field[ 'type' ]  = 'submit';
743
+		$field[ 'name' ]  = 'gform-settings-save';
744
+		$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] : 'button-primary gfbutton';
745 745
 
746 746
 		if ( ! rgar( $field, 'value' ) ) {
747
-			$field['value'] = __( 'Update Settings', 'gravityview' );
747
+			$field[ 'value' ] = __( 'Update Settings', 'gravityview' );
748 748
 		}
749 749
 
750 750
 		$output = $this->settings_submit( $field, false );
@@ -753,7 +753,7 @@  discard block
 block discarded – undo
753 753
 		$this->app_settings_uninstall_tab();
754 754
 		$output .= ob_get_clean();
755 755
 
756
-		if( $echo ) {
756
+		if ( $echo ) {
757 757
 			echo $output;
758 758
 		}
759 759
 
@@ -778,8 +778,8 @@  discard block
 block discarded – undo
778 778
 	 */
779 779
 	public function single_setting_row( $field ) {
780 780
 
781
-		$field['gv_description'] = rgar( $field, 'description' );
782
-		$field['description']    = rgar( $field, 'subtitle' );
781
+		$field[ 'gv_description' ] = rgar( $field, 'description' );
782
+		$field[ 'description' ]    = rgar( $field, 'subtitle' );
783 783
 
784 784
 		parent::single_setting_row( $field );
785 785
 	}
@@ -794,7 +794,7 @@  discard block
 block discarded – undo
794 794
 		parent::single_setting_label( $field );
795 795
 
796 796
 		if ( $description = rgar( $field, 'gv_description' ) ) {
797
-			echo '<span class="description">'. $description .'</span>';
797
+			echo '<span class="description">' . $description . '</span>';
798 798
 		}
799 799
 	}
800 800
 
@@ -856,11 +856,11 @@  discard block
 block discarded – undo
856 856
 
857 857
 		// If the posted key doesn't match the activated/deactivated key (set using the Activate License button, AJAX response),
858 858
 		// then we assume it's changed. If it's changed, unset the status and the previous response.
859
-		if( $local_key !== $response_key ) {
859
+		if ( $local_key !== $response_key ) {
860 860
 
861
-			unset( $posted_settings['license_key_response'] );
862
-			unset( $posted_settings['license_key_status'] );
863
-			GFCommon::add_error_message( __('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
861
+			unset( $posted_settings[ 'license_key_response' ] );
862
+			unset( $posted_settings[ 'license_key_status' ] );
863
+			GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
864 864
 		}
865 865
 
866 866
 		return $posted_settings;
@@ -895,25 +895,25 @@  discard block
 block discarded – undo
895 895
 				'label'             => __( 'License Key', 'gravityview' ),
896 896
 				'description'          => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview' ) . $this->get_license_handler()->license_details( $this->get_app_setting( 'license_key_response' ) ),
897 897
 				'type'              => 'edd_license',
898
-				'data-pending-text' => __('Verifying license&hellip;', 'gravityview'),
899
-				'default_value'           => $default_settings['license_key'],
898
+				'data-pending-text' => __( 'Verifying license&hellip;', 'gravityview' ),
899
+				'default_value'           => $default_settings[ 'license_key' ],
900 900
 				'class'             => ( '' == $this->get_app_setting( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
901 901
 			),
902 902
 			array(
903 903
 				'name'       => 'license_key_response',
904
-				'default_value'  => $default_settings['license_key_response'],
904
+				'default_value'  => $default_settings[ 'license_key_response' ],
905 905
 				'type'     => 'hidden',
906 906
 			),
907 907
 			array(
908 908
 				'name'       => 'license_key_status',
909
-				'default_value'  => $default_settings['license_key_status'],
909
+				'default_value'  => $default_settings[ 'license_key_status' ],
910 910
 				'type'     => 'hidden',
911 911
 			),
912 912
 			array(
913 913
 				'name'       => 'support-email',
914 914
 				'type'     => 'text',
915 915
 				'validate' => 'email',
916
-				'default_value'  => $default_settings['support-email'],
916
+				'default_value'  => $default_settings[ 'support-email' ],
917 917
 				'label'    => __( 'Support Email', 'gravityview' ),
918 918
 				'description' => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ),
919 919
 				'class'    => 'code regular-text',
@@ -925,53 +925,53 @@  discard block
 block discarded – undo
925 925
 				'name'         => 'support_port',
926 926
 				'type'       => 'radio',
927 927
 				'label'      => __( 'Show Support Port?', 'gravityview' ),
928
-				'default_value'    => $default_settings['support_port'],
928
+				'default_value'    => $default_settings[ 'support_port' ],
929 929
 				'horizontal' => 1,
930 930
 				'choices'    => array(
931 931
 					array(
932
-						'label' => _x('Show', 'Setting: Show or Hide', 'gravityview'),
932
+						'label' => _x( 'Show', 'Setting: Show or Hide', 'gravityview' ),
933 933
 						'value' => '1',
934 934
 					),
935 935
 					array(
936
-						'label' => _x('Hide', 'Setting: Show or Hide', 'gravityview'),
936
+						'label' => _x( 'Hide', 'Setting: Show or Hide', 'gravityview' ),
937 937
 						'value' => '0',
938 938
 					),
939 939
 				),
940
-				'tooltip' => '<p><img src="' . esc_url_raw( plugins_url('assets/images/beacon.png', GRAVITYVIEW_FILE ) ) . '" alt="' . esc_attr__( 'The Support Port looks like this.', 'gravityview' ) . '" class="alignright" style="max-width:40px; margin:.5em;" />' . esc_html__('The Support Port provides quick access to how-to articles and tutorials. For administrators, it also makes it easy to contact support.', 'gravityview') . '</p>',
940
+				'tooltip' => '<p><img src="' . esc_url_raw( plugins_url( 'assets/images/beacon.png', GRAVITYVIEW_FILE ) ) . '" alt="' . esc_attr__( 'The Support Port looks like this.', 'gravityview' ) . '" class="alignright" style="max-width:40px; margin:.5em;" />' . esc_html__( 'The Support Port provides quick access to how-to articles and tutorials. For administrators, it also makes it easy to contact support.', 'gravityview' ) . '</p>',
941 941
 				'description'   => __( 'Show the Support Port on GravityView pages?', 'gravityview' ),
942 942
 			),
943 943
 			array(
944 944
 				'name'         => 'no-conflict-mode',
945 945
 				'type'       => 'radio',
946 946
 				'label'      => __( 'No-Conflict Mode', 'gravityview' ),
947
-				'default_value'    => $default_settings['no-conflict-mode'],
947
+				'default_value'    => $default_settings[ 'no-conflict-mode' ],
948 948
 				'horizontal' => 1,
949 949
 				'choices'    => array(
950 950
 					array(
951
-						'label' => _x('On', 'Setting: On or off', 'gravityview'),
951
+						'label' => _x( 'On', 'Setting: On or off', 'gravityview' ),
952 952
 						'value' => '1',
953 953
 					),
954 954
 					array(
955
-						'label' => _x('Off', 'Setting: On or off', 'gravityview'),
955
+						'label' => _x( 'Off', 'Setting: On or off', 'gravityview' ),
956 956
 						'value' => '0',
957 957
 					),
958 958
 				),
959
-				'description'   => __( 'Set this to ON to prevent extraneous scripts and styles from being printed on GravityView admin pages, reducing conflicts with other plugins and themes.', 'gravityview' ) . ' ' . __('If your Edit View tabs are ugly, enable this setting.', 'gravityview'),
959
+				'description'   => __( 'Set this to ON to prevent extraneous scripts and styles from being printed on GravityView admin pages, reducing conflicts with other plugins and themes.', 'gravityview' ) . ' ' . __( 'If your Edit View tabs are ugly, enable this setting.', 'gravityview' ),
960 960
 			),
961 961
 			array(
962 962
 				'name'       => 'beta',
963 963
 				'type'       => 'checkbox',
964 964
 				'label'      => __( 'Become a Beta Tester', 'gravityview' ),
965
-				'default_value'    => $default_settings['beta'],
965
+				'default_value'    => $default_settings[ 'beta' ],
966 966
 				'horizontal' => 1,
967 967
 				'choices'    => array(
968 968
 					array(
969
-						'label' => _x('Show me beta versions if they are available.', 'gravityview'),
969
+						'label' => _x( 'Show me beta versions if they are available.', 'gravityview' ),
970 970
 						'value' => '1',
971 971
                         'name'  => 'beta',
972 972
 					),
973 973
 				),
974
-				'description'   => __( 'You will have early access to the latest GravityView features and improvements. There may be bugs! If you encounter an issue, help make GravityView better by reporting it!', 'gravityview'),
974
+				'description'   => __( 'You will have early access to the latest GravityView features and improvements. There may be bugs! If you encounter an issue, help make GravityView better by reporting it!', 'gravityview' ),
975 975
 			),
976 976
 		) );
977 977
 
@@ -982,20 +982,20 @@  discard block
 block discarded – undo
982 982
 		 * @since 1.7.4
983 983
 		 */
984 984
 		foreach ( $fields as &$field ) {
985
-			$field['name']          = isset( $field['name'] ) ? $field['name'] : rgget('id', $field );
986
-			$field['label']         = isset( $field['label'] ) ? $field['label'] : rgget('title', $field );
987
-			$field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : rgget('default', $field );
988
-			$field['description']   = isset( $field['description'] ) ? $field['description'] : rgget('subtitle', $field );
985
+			$field[ 'name' ]          = isset( $field[ 'name' ] ) ? $field[ 'name' ] : rgget( 'id', $field );
986
+			$field[ 'label' ]         = isset( $field[ 'label' ] ) ? $field[ 'label' ] : rgget( 'title', $field );
987
+			$field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : rgget( 'default', $field );
988
+			$field[ 'description' ]   = isset( $field[ 'description' ] ) ? $field[ 'description' ] : rgget( 'subtitle', $field );
989 989
 
990
-			if( $disabled_attribute ) {
991
-				$field['disabled']  = $disabled_attribute;
990
+			if ( $disabled_attribute ) {
991
+				$field[ 'disabled' ] = $disabled_attribute;
992 992
 			}
993 993
 		}
994 994
 
995 995
 
996 996
         $sections = array(
997 997
             array(
998
-                'description' =>      sprintf( '<span class="version-info description">%s</span>', sprintf( __('You are running GravityView version %s', 'gravityview'), GravityView_Plugin::version ) ),
998
+                'description' =>      sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), GravityView_Plugin::version ) ),
999 999
                 'fields'      => $fields,
1000 1000
             )
1001 1001
         );
@@ -1006,8 +1006,8 @@  discard block
 block discarded – undo
1006 1006
             'type'     => 'save',
1007 1007
         );
1008 1008
 
1009
-		if( $disabled_attribute ) {
1010
-			$button['disabled'] = $disabled_attribute;
1009
+		if ( $disabled_attribute ) {
1010
+			$button[ 'disabled' ] = $disabled_attribute;
1011 1011
 		}
1012 1012
 
1013 1013
 
@@ -1027,20 +1027,20 @@  discard block
 block discarded – undo
1027 1027
 		// If there are extensions, add a section for them
1028 1028
 		if ( ! empty( $extension_sections ) ) {
1029 1029
 
1030
-			if( $disabled_attribute ) {
1030
+			if ( $disabled_attribute ) {
1031 1031
 				foreach ( $extension_sections as &$section ) {
1032
-					foreach ( $section['fields'] as &$field ) {
1033
-						$field['disabled'] = $disabled_attribute;
1032
+					foreach ( $section[ 'fields' ] as &$field ) {
1033
+						$field[ 'disabled' ] = $disabled_attribute;
1034 1034
 					}
1035 1035
 				}
1036 1036
 			}
1037 1037
 
1038
-            $k = count( $extension_sections ) - 1 ;
1039
-            $extension_sections[ $k ]['fields'][] = $button;
1038
+            $k = count( $extension_sections ) - 1;
1039
+            $extension_sections[ $k ][ 'fields' ][ ] = $button;
1040 1040
 			$sections = array_merge( $sections, $extension_sections );
1041 1041
 		} else {
1042 1042
             // add the 'update settings' button to the general section
1043
-            $sections[0]['fields'][] = $button;
1043
+            $sections[ 0 ][ 'fields' ][ ] = $button;
1044 1044
         }
1045 1045
 
1046 1046
 		return $sections;
Please login to merge, or discard this patch.