Completed
Push — develop ( 31c9ca...168da6 )
by Zack
38:08 queued 17:59
created
includes/extensions/delete-entry/fields/delete_link.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,11 +12,11 @@
 block discarded – undo
12 12
 extract( $gravityview_view->getCurrentField() );
13 13
 
14 14
 // Only show the link to logged-in users with the right caps.
15
-if( !GravityView_Delete_Entry::check_user_cap_delete_entry( $entry, $field_settings ) ) {
15
+if ( ! GravityView_Delete_Entry::check_user_cap_delete_entry( $entry, $field_settings ) ) {
16 16
 	return;
17 17
 }
18 18
 
19
-$link_text = empty( $field_settings['delete_link'] ) ? __('Delete Entry', 'gravityview') : $field_settings['delete_link'];
19
+$link_text = empty( $field_settings[ 'delete_link' ] ) ? __( 'Delete Entry', 'gravityview' ) : $field_settings[ 'delete_link' ];
20 20
 
21 21
 $link_text = apply_filters( 'gravityview_entry_link', GravityView_API::replace_variables( $link_text, $form, $entry ) );
22 22
 
Please login to merge, or discard this patch.
includes/extensions/delete-entry/class-delete-entry-admin.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -83,9 +83,9 @@  discard block
 block discarded – undo
83 83
 		if ( $field_id === 'delete_link' ) {
84 84
 
85 85
 			// Remove other built-in caps.
86
-			unset( $caps['publish_posts'], $caps['gravityforms_view_entries'], $caps['delete_others_posts'] );
86
+			unset( $caps[ 'publish_posts' ], $caps[ 'gravityforms_view_entries' ], $caps[ 'delete_others_posts' ] );
87 87
 
88
-			$caps['read'] = _x( 'Entry Creator', 'User capability', 'gravityview' );
88
+			$caps[ 'read' ] = _x( 'Entry Creator', 'User capability', 'gravityview' );
89 89
 		}
90 90
 
91 91
 		return $caps;
@@ -108,12 +108,12 @@  discard block
 block discarded – undo
108 108
 	public function delete_link_field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
109 109
 
110 110
 		// Always a link, never a filter
111
-		unset( $field_options['show_as_link'], $field_options['search_filter'] );
111
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
112 112
 
113 113
 		// Delete Entry link should only appear to visitors capable of editing entries
114
-		unset( $field_options['only_loggedin'], $field_options['only_loggedin_cap'] );
114
+		unset( $field_options[ 'only_loggedin' ], $field_options[ 'only_loggedin_cap' ] );
115 115
 
116
-		$add_option['delete_link'] = array(
116
+		$add_option[ 'delete_link' ] = array(
117 117
 			'type'       => 'text',
118 118
 			'label'      => __( 'Delete Link Text', 'gravityview' ),
119 119
 			'desc'       => null,
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 			'merge_tags' => true,
122 122
 		);
123 123
 
124
-		$field_options['allow_edit_cap'] = array(
124
+		$field_options[ 'allow_edit_cap' ] = array(
125 125
 			'type'    => 'select',
126 126
 			'label'   => __( 'Allow the following users to delete the entry:', 'gravityview' ),
127 127
 			'choices' => GravityView_Render_Settings::get_cap_choices( $template_id, $field_id, $context, $input_type ),
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 	 */
147 147
 	public function add_available_field( $available_fields = array() ) {
148 148
 
149
-		$available_fields['delete_link'] = array(
149
+		$available_fields[ 'delete_link' ] = array(
150 150
 			'label_text'    => __( 'Delete Entry', 'gravityview' ),
151 151
 			'field_id'      => 'delete_link',
152 152
 			'label_type'    => 'field',
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 	public function add_default_field( $entry_default_fields, $form = array(), $zone = '' ) {
189 189
 
190 190
 		if ( 'edit' !== $zone ) {
191
-			$entry_default_fields['delete_link'] = array(
191
+			$entry_default_fields[ 'delete_link' ] = array(
192 192
 				'label' => __( 'Delete Entry', 'gravityview' ),
193 193
 				'type'  => 'delete_link',
194 194
 				'desc'  => __( 'A link to delete the entry. Respects the Delete Entry permissions.', 'gravityview' ),
Please login to merge, or discard this patch.
class-gravityview-plugin-hooks-gravityformspartialentries.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 
54 54
 		$partial_entries_addon = GF_Partial_Entries::get_instance();
55 55
 
56
-		$feed_settings = $partial_entries_addon->get_feed_settings( $form['id'] );
56
+		$feed_settings = $partial_entries_addon->get_feed_settings( $form[ 'id' ] );
57 57
 
58 58
 		$is_enabled = \GV\Utils::get( $feed_settings, 'enable', 0 );
59 59
 
@@ -70,14 +70,14 @@  discard block
 block discarded – undo
70 70
 		}
71 71
 
72 72
 		// Set the expected $_POST key for the Add-On to use
73
-		$_POST['partial_entry_id'] = $partial_entry_id;
73
+		$_POST[ 'partial_entry_id' ] = $partial_entry_id;
74 74
 
75 75
 		gravityview()->log->debug( 'Saving partial entry (ID #{partial_entry_id}) for Entry #{entry_id}', array(
76 76
 			'partial_entry_id' => $partial_entry_id,
77 77
 			'entry_id'         => $entry_id
78 78
 		) );
79 79
 
80
-		$partial_entries_addon->maybe_save_partial_entry( $form['id'] );
80
+		$partial_entries_addon->maybe_save_partial_entry( $form[ 'id' ] );
81 81
 	}
82 82
 }
83 83
 
Please login to merge, or discard this patch.
includes/admin/class-gravityview-support-port.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 	 */
54 54
 	public function maybe_add_article_to_tooltip( $tooltip = '', $article = array(), $url = '', $atts = '', $css_class = '', $anchor_text = '' ) {
55 55
 
56
-		if ( empty( $article['id'] ) ) {
56
+		if ( empty( $article[ 'id' ] ) ) {
57 57
 			return $tooltip;
58 58
 		}
59 59
 
@@ -69,10 +69,10 @@  discard block
 block discarded – undo
69 69
 
70 70
 		$css_class .= ' gv_tooltip';
71 71
 
72
-		if ( ! empty( $article['type'] ) ) {
73
-			$atts = sprintf( 'data-beacon-article-%s="%s"', $article['type'], $article['id'] );
72
+		if ( ! empty( $article[ 'type' ] ) ) {
73
+			$atts = sprintf( 'data-beacon-article-%s="%s"', $article[ 'type' ], $article[ 'id' ] );
74 74
 		} else {
75
-			$atts = sprintf( 'data-beacon-article="%s"', $article['id'] );
75
+			$atts = sprintf( 'data-beacon-article="%s"', $article[ 'id' ] );
76 76
 		}
77 77
 
78 78
 		$url = \GV\Utils::get( $article, 'url', '#' );
@@ -172,9 +172,9 @@  discard block
 block discarded – undo
172 172
 		) );
173 173
 
174 174
 		// This is just HTML we don't need.
175
-		unset( $response['message'] );
175
+		unset( $response[ 'message' ] );
176 176
 
177
-		switch ( intval( $response['price_id'] ) ) {
177
+		switch ( intval( $response[ 'price_id' ] ) ) {
178 178
 			default:
179 179
 			case 1:
180 180
 				$package = 'Core';
@@ -202,12 +202,12 @@  discard block
 block discarded – undo
202 202
 			'signature'             => hash_hmac( 'sha256', $current_user->user_email, self::beacon_key ),
203 203
 			'affiliate_id'			=> gravityview()->plugin->settings->get( 'affiliate_id' ),
204 204
 			'is_super_admin'		=> is_super_admin(),
205
-			'License Key'           => $response['license_key'] . ' (' . ucwords( $response['license'] ) . ')',
205
+			'License Key'           => $response[ 'license_key' ] . ' (' . ucwords( $response[ 'license' ] ) . ')',
206 206
 			'License Level'         => $package,
207 207
 			'Alt Emails'            => sprintf( "Admin: %s, GV Support: %s", get_bloginfo( 'admin_email' ), gravityview()->plugin->settings->get( 'support-email' ) ),
208
-			'Payment Details'       => $response['customer_name'] . ' ' . $response['customer_email'],
208
+			'Payment Details'       => $response[ 'customer_name' ] . ' ' . $response[ 'customer_email' ],
209 209
 			'WordPress Version'     => get_bloginfo( 'version', 'display' ),
210
-			'PHP Version'           => phpversion() . ' on ' . esc_html( $_SERVER['SERVER_SOFTWARE'] ),
210
+			'PHP Version'           => phpversion() . ' on ' . esc_html( $_SERVER[ 'SERVER_SOFTWARE' ] ),
211 211
 			'No-Conflict Mode'      => empty( $no_conflict_mode ) ? 'Disabled' : 'Enabled',
212 212
 			'GravityView Version'   => \GV\Plugin::$version,
213 213
 			'Gravity Forms Version' => GFForms::$version,
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 		ob_get_clean();
218 218
 
219 219
 		// Help Scout length limit is 200 characters
220
-		foreach( $data as $key => $value ) {
220
+		foreach ( $data as $key => $value ) {
221 221
 			if ( ! is_string( $value ) ) {
222 222
                 continue;
223 223
 			}
Please login to merge, or discard this patch.
includes/extensions/entry-notes/class-gravityview-field-notes.php 1 patch
Spacing   +76 added lines, -76 removed lines patch added patch discarded remove patch
@@ -63,19 +63,19 @@  discard block
 block discarded – undo
63 63
 
64 64
 		add_shortcode( 'gv_note_add', array( 'GravityView_Field_Notes', 'get_add_note_part' ) );
65 65
 
66
-		add_action( 'wp', array( $this, 'maybe_delete_notes'), 1000 );
67
-		add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes') );
68
-		add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes') );
66
+		add_action( 'wp', array( $this, 'maybe_delete_notes' ), 1000 );
67
+		add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes' ) );
68
+		add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes' ) );
69 69
 
70
-		add_action( 'wp', array( $this, 'maybe_add_note'), 1000 );
71
-		add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note') );
72
-		add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note') );
70
+		add_action( 'wp', array( $this, 'maybe_add_note' ), 1000 );
71
+		add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note' ) );
72
+		add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note' ) );
73 73
 
74 74
 		// add template path to check for field
75 75
 		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
76 76
 		add_filter( 'gravityview/template/fields_template_paths', array( $this, 'add_template_path' ) );
77 77
 
78
-		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') );
78
+		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) );
79 79
 		add_action( 'gravityview/field/notes/scripts', array( $this, 'enqueue_scripts' ) );
80 80
 
81 81
 		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_entry_default_field' ), 10, 3 );
@@ -97,8 +97,8 @@  discard block
 block discarded – undo
97 97
 	 */
98 98
 	public function add_entry_default_field( $entry_default_fields, $form, $zone ) {
99 99
 
100
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
101
-			$entry_default_fields['notes'] = array(
100
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
101
+			$entry_default_fields[ 'notes' ] = array(
102 102
 				'label' => __( 'Entry Notes', 'gravityview' ),
103 103
 				'type'  => 'notes',
104 104
 				'desc'  => __( 'Display, add, and delete notes for an entry.', 'gravityview' ),
@@ -131,23 +131,23 @@  discard block
 block discarded – undo
131 131
 	public function enqueue_scripts() {
132 132
 		global $wp_actions;
133 133
 
134
-		if( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
134
+		if ( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
135 135
 			wp_enqueue_style( 'gravityview-notes' );
136 136
 			wp_enqueue_script( 'gravityview-notes' );
137 137
 		}
138 138
 
139
-		if( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
139
+		if ( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
140 140
 
141 141
 			$strings = self::strings();
142 142
 
143 143
 			wp_localize_script( 'gravityview-notes', 'GVNotes', array(
144 144
 				'ajaxurl' => admin_url( 'admin-ajax.php' ),
145 145
 				'text' => array(
146
-					'processing' => $strings['processing'],
147
-					'delete_confirm' => $strings['delete-confirm'],
148
-					'note_added' => $strings['added-note'],
149
-					'error_invalid' => $strings['error-invalid'],
150
-					'error_empty_note' => $strings['error-empty-note'],
146
+					'processing' => $strings[ 'processing' ],
147
+					'delete_confirm' => $strings[ 'delete-confirm' ],
148
+					'note_added' => $strings[ 'added-note' ],
149
+					'error_invalid' => $strings[ 'error-invalid' ],
150
+					'error_empty_note' => $strings[ 'error-empty-note' ],
151 151
 				),
152 152
 			) );
153 153
 		}
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 	 * @return void
164 164
 	 */
165 165
 	function maybe_add_note() {
166
-		if ( ! isset( $_POST['action'] ) || 'gv_note_add' !== $_POST['action'] ) {
166
+		if ( ! isset( $_POST[ 'action' ] ) || 'gv_note_add' !== $_POST[ 'action' ] ) {
167 167
 			return;
168 168
 		}
169 169
 
@@ -176,12 +176,12 @@  discard block
 block discarded – undo
176 176
 		$post = wp_unslash( $_POST );
177 177
 
178 178
 		if ( $this->doing_ajax ) {
179
-			parse_str( $post['data'], $data );
179
+			parse_str( $post[ 'data' ], $data );
180 180
 		} else {
181 181
 			$data = $post;
182 182
 		}
183 183
 
184
-		$this->process_add_note( (array) $data );
184
+		$this->process_add_note( (array)$data );
185 185
 	}
186 186
 
187 187
 	/**
@@ -207,23 +207,23 @@  discard block
 block discarded – undo
207 207
 		$error = false;
208 208
 		$success = false;
209 209
 
210
-		if( empty( $data['entry-slug'] ) ) {
210
+		if ( empty( $data[ 'entry-slug' ] ) ) {
211 211
 
212
-			$error = self::strings('error-invalid');
212
+			$error = self::strings( 'error-invalid' );
213 213
 			gravityview()->log->error( 'The note is missing an Entry ID.' );
214 214
 
215 215
 		} else {
216 216
 
217
-			$valid = wp_verify_nonce( $data['gv_note_add'], 'gv_note_add_' . $data['entry-slug'] );
217
+			$valid = wp_verify_nonce( $data[ 'gv_note_add' ], 'gv_note_add_' . $data[ 'entry-slug' ] );
218 218
 
219 219
 			$has_cap = GVCommon::has_cap( 'gravityview_add_entry_notes' );
220 220
 
221
-			if( ! $has_cap ) {
221
+			if ( ! $has_cap ) {
222 222
 				$error = self::strings( 'error-cap-add' );
223 223
 				gravityview()->log->error( 'Adding a note failed: the user does not have the "gravityview_add_entry_notes" capability.' );
224 224
 			} elseif ( $valid ) {
225 225
 
226
-				$entry = gravityview_get_entry( $data['entry-slug'], true, false );
226
+				$entry = gravityview_get_entry( $data[ 'entry-slug' ], true, false );
227 227
 
228 228
 				$added = $this->add_note( $entry, $data );
229 229
 
@@ -241,22 +241,22 @@  discard block
 block discarded – undo
241 241
 					$this->maybe_send_entry_notes( $note, $entry, $data );
242 242
 
243 243
 					if ( $note ) {
244
-						$success = self::display_note( $note, ! empty( $data['show-delete'] ) );
244
+						$success = self::display_note( $note, ! empty( $data[ 'show-delete' ] ) );
245 245
 						gravityview()->log->debug( 'The note was successfully created', array( 'data' => compact( 'note', 'data' ) ) );
246 246
 					} else {
247
-						$error = self::strings('error-add-note');
247
+						$error = self::strings( 'error-add-note' );
248 248
 						gravityview()->log->error( 'The note was not successfully created', array( 'data' => compact( 'note', 'data' ) ) );
249 249
 					}
250 250
 				}
251 251
 			} else {
252
-				$error = self::strings('error-invalid');
252
+				$error = self::strings( 'error-invalid' );
253 253
 				gravityview()->log->error( 'Nonce validation failed; the note was not created' );
254 254
 			}
255 255
 		}
256 256
 
257 257
 
258
-		if( $this->doing_ajax ) {
259
-			if( $success ) {
258
+		if ( $this->doing_ajax ) {
259
+			if ( $success ) {
260 260
 				wp_send_json_success( array( 'html' => $success ) );
261 261
 			} else {
262 262
 				$error = $error ? $error : self::strings( 'error-invalid' );
@@ -282,11 +282,11 @@  discard block
 block discarded – undo
282 282
 			return;
283 283
 		}
284 284
 
285
-		if ( isset( $_POST['action'] ) && 'gv_delete_notes' === $_POST['action'] ) {
285
+		if ( isset( $_POST[ 'action' ] ) && 'gv_delete_notes' === $_POST[ 'action' ] ) {
286 286
 
287 287
 			$post = wp_unslash( $_POST );
288 288
 			if ( $this->doing_ajax ) {
289
-				parse_str( $post['data'], $data );
289
+				parse_str( $post[ 'data' ], $data );
290 290
 			} else {
291 291
 				$data = $post;
292 292
 			}
@@ -317,18 +317,18 @@  discard block
 block discarded – undo
317 317
 	 */
318 318
 	function process_delete_notes( $data ) {
319 319
 
320
-		$valid = wp_verify_nonce( $data['gv_delete_notes'], 'gv_delete_notes_' . $data['entry-slug'] );
320
+		$valid = wp_verify_nonce( $data[ 'gv_delete_notes' ], 'gv_delete_notes_' . $data[ 'entry-slug' ] );
321 321
 		$has_cap = GVCommon::has_cap( 'gravityview_delete_entry_notes' );
322 322
 		$success = false;
323 323
 
324 324
 		if ( $valid && $has_cap ) {
325
-			GravityView_Entry_Notes::delete_notes( $data['note'] );
325
+			GravityView_Entry_Notes::delete_notes( $data[ 'note' ] );
326 326
 			$success = true;
327 327
 		}
328 328
 
329
-		if( $this->doing_ajax ) {
329
+		if ( $this->doing_ajax ) {
330 330
 
331
-			if( $success ) {
331
+			if ( $success ) {
332 332
 				wp_send_json_success();
333 333
 			} else {
334 334
 				if ( ! $valid ) {
@@ -361,13 +361,13 @@  discard block
 block discarded – undo
361 361
 
362 362
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
363 363
 
364
-		unset( $field_options['show_as_link'] );
364
+		unset( $field_options[ 'show_as_link' ] );
365 365
 
366 366
 		$notes_options = array(
367 367
 			'notes' => array(
368 368
 				'type' => 'checkboxes',
369
-				'label' => __('Note Settings', 'gravityview'),
370
-				'desc' => sprintf( _x('Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ),
369
+				'label' => __( 'Note Settings', 'gravityview' ),
370
+				'desc' => sprintf( _x( 'Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ),
371 371
 				'options' => array(
372 372
 					'view' => array(
373 373
 						'label' => __( 'Display notes?', 'gravityview' ),
@@ -419,7 +419,7 @@  discard block
 block discarded – undo
419 419
 			'processing' => __( 'Processing&hellip;', 'gravityview' ),
420 420
 			'other-email' => __( 'Other email address', 'gravityview' ),
421 421
 			'email-label' => __( 'Email address', 'gravityview' ),
422
-			'email-placeholder' => _x('[email protected]', 'Example email address used as a placeholder', 'gravityview'),
422
+			'email-placeholder' => _x( '[email protected]', 'Example email address used as a placeholder', 'gravityview' ),
423 423
 			'subject-label' => __( 'Subject', 'gravityview' ),
424 424
 			'subject' => __( 'Email subject', 'gravityview' ),
425 425
 			'default-email-subject' => __( 'New entry note', 'gravityview' ),
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
439 439
 		 */
440 440
 		$strings = gv_map_deep( apply_filters( 'gravityview/field/notes/strings', $strings ), 'esc_html' );
441 441
 
442
-		if( $key ) {
442
+		if ( $key ) {
443 443
 			return isset( $strings[ $key ] ) ? $strings[ $key ] : '';
444 444
 		}
445 445
 
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
 	 */
462 462
 	static public function display_note( $note, $show_delete = false, $context = null ) {
463 463
 
464
-		if( ! is_object( $note ) ) {
464
+		if ( ! is_object( $note ) ) {
465 465
 			return '';
466 466
 		}
467 467
 
@@ -516,7 +516,7 @@  discard block
 block discarded – undo
516 516
 		}
517 517
 
518 518
 		$replacements = array(
519
-			'{note_id}' => $note_content['note_id'],
519
+			'{note_id}' => $note_content[ 'note_id' ],
520 520
 			'{row_class}' => 'gv-note',
521 521
 			'{note_detail}' => $note_detail_html
522 522
 		);
@@ -548,13 +548,13 @@  discard block
 block discarded – undo
548 548
 
549 549
 		$user_data = get_userdata( $current_user->ID );
550 550
 
551
-		$note_content = trim( $data['gv-note-content'] );
551
+		$note_content = trim( $data[ 'gv-note-content' ] );
552 552
 
553
-		if( empty( $note_content ) ) {
553
+		if ( empty( $note_content ) ) {
554 554
 			return new WP_Error( 'gv-add-note-empty', __( 'The note is empty.', 'gravityview' ) );
555 555
 		}
556 556
 
557
-		$return = GravityView_Entry_Notes::add_note( $entry['id'], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
557
+		$return = GravityView_Entry_Notes::add_note( $entry[ 'id' ], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
558 558
 
559 559
 		return $return;
560 560
 	}
@@ -574,7 +574,7 @@  discard block
 block discarded – undo
574 574
 
575 575
 		$atts = shortcode_atts( array( 'entry' => null ), $atts );
576 576
 
577
-		if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
577
+		if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
578 578
 			gravityview()->log->error( 'User does not have permission to add entry notes ("gravityview_add_entry_notes").' );
579 579
 			return '';
580 580
 		}
@@ -596,8 +596,8 @@  discard block
 block discarded – undo
596 596
 
597 597
 			$visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' );
598 598
 
599
-			if ( $atts['entry'] ) {
600
-				$entry = GFAPI::get_entry( $atts['entry'] );
599
+			if ( $atts[ 'entry' ] ) {
600
+				$entry = GFAPI::get_entry( $atts[ 'entry' ] );
601 601
 			}
602 602
 
603 603
 			if ( ! isset( $entry ) || ! $entry ) {
@@ -615,14 +615,14 @@  discard block
 block discarded – undo
615 615
 
616 616
 		// Only generate the dropdown if the field settings allow it
617 617
 		$email_fields = '';
618
-		if( ! empty( $visibility_settings['email'] ) ) {
618
+		if ( ! empty( $visibility_settings[ 'email' ] ) ) {
619 619
 			$email_fields = self::get_note_email_fields( $entry_slug );
620 620
 		}
621 621
 
622 622
 		$add_note_html = str_replace( '{entry_slug}', $entry_slug, $add_note_html );
623 623
 		$add_note_html = str_replace( '{nonce_field}', $nonce_field, $add_note_html );
624
-		$add_note_html = str_replace( '{show_delete}', intval( empty( $visibility_settings['delete'] ) ? 0 : $visibility_settings['delete'] ), $add_note_html );
625
-		$add_note_html   = str_replace( '{email_fields}', $email_fields, $add_note_html );
624
+		$add_note_html = str_replace( '{show_delete}', intval( empty( $visibility_settings[ 'delete' ] ) ? 0 : $visibility_settings[ 'delete' ] ), $add_note_html );
625
+		$add_note_html = str_replace( '{email_fields}', $email_fields, $add_note_html );
626 626
 		$add_note_html = str_replace( '{url}', esc_url_raw( add_query_arg( array() ) ), $add_note_html );
627 627
 
628 628
 		return $add_note_html;
@@ -647,8 +647,8 @@  discard block
 block discarded – undo
647 647
 		$note_emails = array();
648 648
 
649 649
 		foreach ( $email_fields as $email_field ) {
650
-			if ( ! empty( $entry["{$email_field->id}"] ) && is_email( $entry["{$email_field->id}"] ) ) {
651
-				$note_emails[] = $entry["{$email_field->id}"];
650
+			if ( ! empty( $entry[ "{$email_field->id}" ] ) && is_email( $entry[ "{$email_field->id}" ] ) ) {
651
+				$note_emails[ ] = $entry[ "{$email_field->id}" ];
652 652
 			}
653 653
 		}
654 654
 
@@ -660,7 +660,7 @@  discard block
 block discarded – undo
660 660
 		 */
661 661
 		$note_emails = apply_filters( 'gravityview/field/notes/emails', $note_emails, $entry );
662 662
 
663
-		return (array) $note_emails;
663
+		return (array)$note_emails;
664 664
 	}
665 665
 
666 666
 	/**
@@ -676,7 +676,7 @@  discard block
 block discarded – undo
676 676
 	 */
677 677
 	private static function get_note_email_fields( $entry_slug = '' ) {
678 678
 
679
-		if( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
679
+		if ( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
680 680
 			gravityview()->log->error( 'User does not have permission to email entry notes ("gravityview_email_entry_notes").' );
681 681
 			return '';
682 682
 		}
@@ -698,27 +698,27 @@  discard block
 block discarded – undo
698 698
 
699 699
 		if ( ! empty( $note_emails ) || $include_custom ) { ?>
700 700
 			<div class="gv-note-email-container">
701
-				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings['also-email'];  ?></label>
701
+				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings[ 'also-email' ]; ?></label>
702 702
 				<select class="gv-note-email-to" name="gv-note-to" id="gv-note-email-to-<?php echo $entry_slug_esc; ?>">
703
-					<option value=""><?php echo $strings['also-email'];  ?></option>
703
+					<option value=""><?php echo $strings[ 'also-email' ]; ?></option>
704 704
 					<?php foreach ( $note_emails as  $email ) {
705 705
 						?>
706 706
 						<option value="<?php echo esc_attr( $email ); ?>"><?php echo esc_html( $email ); ?></option>
707 707
 					<?php }
708
-					if( $include_custom ) { ?>
709
-					<option value="custom"><?php echo self::strings('other-email'); ?></option>
708
+					if ( $include_custom ) { ?>
709
+					<option value="custom"><?php echo self::strings( 'other-email' ); ?></option>
710 710
 					<?php } ?>
711 711
 				</select>
712 712
 				<fieldset class="gv-note-to-container">
713
-					<?php if( $include_custom ) { ?>
713
+					<?php if ( $include_custom ) { ?>
714 714
 					<div class='gv-note-to-custom-container'>
715
-						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings['email-label']; ?></label>
716
-						<input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings['email-placeholder']; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" />
715
+						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'email-label' ]; ?></label>
716
+						<input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings[ 'email-placeholder' ]; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" />
717 717
 					</div>
718 718
 					<?php } ?>
719 719
 		            <div class='gv-note-subject-container'>
720
-		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings['subject-label']; ?></label>
721
-		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings['subject']; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
720
+		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'subject-label' ]; ?></label>
721
+		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings[ 'subject' ]; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
722 722
 		            </div>
723 723
 				</fieldset>
724 724
 			</div>
@@ -741,7 +741,7 @@  discard block
 block discarded – undo
741 741
 	 */
742 742
 	private function maybe_send_entry_notes( $note = false, $entry, $data ) {
743 743
 
744
-		if( ! $note || ! GVCommon::has_cap('gravityview_email_entry_notes') ) {
744
+		if ( ! $note || ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
745 745
 			gravityview()->log->debug( 'User doesn\'t have "gravityview_email_entry_notes" cap, or $note is empty', array( 'data' => $note ) );
746 746
 			return;
747 747
 		}
@@ -749,7 +749,7 @@  discard block
 block discarded – undo
749 749
 		gravityview()->log->debug( '$data', array( 'data' => $data ) );
750 750
 
751 751
 		//emailing notes if configured
752
-		if ( ! empty( $data['gv-note-to'] ) ) {
752
+		if ( ! empty( $data[ 'gv-note-to' ] ) ) {
753 753
 
754 754
 			$default_data = array(
755 755
 				'gv-note-to' => '',
@@ -759,11 +759,11 @@  discard block
 block discarded – undo
759 759
                 'current-url' => '',
760 760
 			);
761 761
 
762
-			$current_user  = wp_get_current_user();
762
+			$current_user = wp_get_current_user();
763 763
 			$email_data = wp_parse_args( $data, $default_data );
764 764
 
765
-			$from    = $current_user->user_email;
766
-			$to = $email_data['gv-note-to'];
765
+			$from = $current_user->user_email;
766
+			$to = $email_data[ 'gv-note-to' ];
767 767
 
768 768
 			/**
769 769
 			 * Documented in get_note_email_fields
@@ -771,8 +771,8 @@  discard block
 block discarded – undo
771 771
 			 */
772 772
 			$include_custom = apply_filters( 'gravityview/field/notes/custom-email', true );
773 773
 
774
-			if( 'custom' === $to && $include_custom ) {
775
-				$to = $email_data['gv-note-to-custom'];
774
+			if ( 'custom' === $to && $include_custom ) {
775
+				$to = $email_data[ 'gv-note-to-custom' ];
776 776
 				gravityview()->log->debug( 'Sending note to a custom email address: {to}' . array( 'to' => $to ) );
777 777
 			}
778 778
 
@@ -783,13 +783,13 @@  discard block
 block discarded – undo
783 783
 
784 784
 			$bcc = false;
785 785
 			$reply_to = $from;
786
-			$subject = trim( $email_data['gv-note-subject'] );
786
+			$subject = trim( $email_data[ 'gv-note-subject' ] );
787 787
 
788 788
 			// We use empty() here because GF uses empty to check against, too. `0` isn't a valid subject to GF
789 789
 			$subject = empty( $subject ) ? self::strings( 'default-email-subject' ) : $subject;
790
-			$message = $email_data['gv-note-content'];
790
+			$message = $email_data[ 'gv-note-content' ];
791 791
 			$email_footer = self::strings( 'email-footer' );
792
-			$from_name     = $current_user->display_name;
792
+			$from_name = $current_user->display_name;
793 793
 			$message_format = 'html';
794 794
 
795 795
 			/**
@@ -820,7 +820,7 @@  discard block
 block discarded – undo
820 820
 
821 821
 			GVCommon::send_email( $from, $to, $bcc, $reply_to, $subject, $message, $from_name, $message_format, '', $entry, false );
822 822
 
823
-			$form  = isset( $entry['form_id'] ) ? GFAPI::get_form( $entry['form_id'] ) : array();
823
+			$form = isset( $entry[ 'form_id' ] ) ? GFAPI::get_form( $entry[ 'form_id' ] ) : array();
824 824
 
825 825
 			/**
826 826
 			 * @see https://www.gravityhelp.com/documentation/article/10146-2/ It's here for compatibility with Gravity Forms
@@ -846,7 +846,7 @@  discard block
 block discarded – undo
846 846
 
847 847
 	    $output = '';
848 848
 
849
-		if( ! empty( $email_footer ) ) {
849
+		if ( ! empty( $email_footer ) ) {
850 850
 		    $url = \GV\Utils::get( $email_data, 'current-url' );
851 851
 			$url = html_entity_decode( $url );
852 852
 			$url = site_url( $url );
Please login to merge, or discard this patch.
includes/class-gravityview-compatibility.php 1 patch
Spacing   +35 added lines, -35 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;
@@ -138,10 +138,10 @@  discard block
 block discarded – undo
138 138
 		// If Gravity Forms doesn't exist or is outdated, load the admin view class to
139 139
 		// show the notice, but not load any post types or process shortcodes.
140 140
 		// Without Gravity Forms, there is no GravityView. Beautiful, really.
141
-		if( ! self::is_valid() ) {
141
+		if ( ! self::is_valid() ) {
142 142
 
143 143
 			// If the plugin's not loaded, might as well hide the shortcode for people.
144
-			add_shortcode( 'gravityview', array( $this, '_shortcode_gf_notice') );
144
+			add_shortcode( 'gravityview', array( $this, '_shortcode_gf_notice' ) );
145 145
 
146 146
 		}
147 147
 	}
@@ -167,15 +167,15 @@  discard block
 block discarded – undo
167 167
 	 */
168 168
 	public function _shortcode_gf_notice( $atts = array(), $content = null, $shortcode = 'gravityview' ) {
169 169
 
170
-		if( ! GVCommon::has_cap( 'activate_plugins' ) ) {
170
+		if ( ! GVCommon::has_cap( 'activate_plugins' ) ) {
171 171
 			return null;
172 172
 		}
173 173
 
174 174
 		$notices = self::get_notices();
175 175
 
176
-		$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>';
177
-		foreach( (array)$notices as $notice ) {
178
-			$message .= wpautop( $notice['message'] );
176
+		$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>';
177
+		foreach ( (array)$notices as $notice ) {
178
+			$message .= wpautop( $notice[ 'message' ] );
179 179
 		}
180 180
 		$message .= '</div>';
181 181
 
@@ -195,9 +195,9 @@  discard block
 block discarded – undo
195 195
 
196 196
 		if ( ! gravityview()->plugin->is_compatible_php() ) {
197 197
 
198
-			self::$notices['php_version'] = array(
198
+			self::$notices[ 'php_version' ] = array(
199 199
 				'class' => 'error',
200
-				'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>' ),
200
+				'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>' ),
201 201
 				'cap' => 'manage_options',
202 202
 				'dismiss' => 'php_version',
203 203
 			);
@@ -208,11 +208,11 @@  discard block
 block discarded – undo
208 208
 		if ( ! gravityview()->plugin->is_compatible_future_php() ) {
209 209
 
210 210
 			// Show the notice on every update. Yes, annoying, but not as annoying as a plugin breaking.
211
-			$key = sprintf('php_%s_%s', GV_FUTURE_MIN_PHP_VERSION, GravityView_Plugin::version );
211
+			$key = sprintf( 'php_%s_%s', GV_FUTURE_MIN_PHP_VERSION, GravityView_Plugin::version );
212 212
 
213 213
 			self::$notices[ $key ] = array(
214 214
 				'class' => 'error',
215
-				'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>' ),
215
+				'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>' ),
216 216
 				'cap' => 'manage_options',
217 217
 				'dismiss' => $key,
218 218
 			);
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
 
238 238
 		if ( ! gravityview()->plugin->is_compatible_wordpress() ) {
239 239
 
240
-			self::$notices['wp_version'] = array(
240
+			self::$notices[ 'wp_version' ] = array(
241 241
 				'class' => 'error',
242 242
 				'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>' ),
243 243
 			    'cap' => 'update_core',
@@ -271,17 +271,17 @@  discard block
 block discarded – undo
271 271
 	public static function check_gravityforms() {
272 272
 
273 273
 		// Bypass other checks: if the class exists
274
-		if( class_exists( 'GFCommon' ) ) {
274
+		if ( class_exists( 'GFCommon' ) ) {
275 275
 
276 276
 			// Does the version meet future requirements?
277
-			if( true === gravityview()->plugin->is_compatible_future_gravityforms() ) {
277
+			if ( true === gravityview()->plugin->is_compatible_future_gravityforms() ) {
278 278
 				return true;
279 279
 			}
280 280
 
281 281
 			// Does it meet minimum requirements?
282 282
 			$meets_minimum = gravityview()->plugin->is_compatible_gravityforms();
283 283
 
284
-			if( $meets_minimum ) {
284
+			if ( $meets_minimum ) {
285 285
 				/* translators: first placeholder is the future required version of Gravity Forms. The second placeholder is the current version of Gravity Forms. */
286 286
 				$title = __( 'In the future, GravityView will require Gravity Forms Version %s or newer.', 'gravityview' );
287 287
 				$version = GV_FUTURE_MIN_GF_VERSION;
@@ -296,14 +296,14 @@  discard block
 block discarded – undo
296 296
 			$message = '<h3>' . esc_html( sprintf( $title, $version ) ) . '</h3>';
297 297
 
298 298
 			/* translators: the placeholder is the current version of Gravity Forms. */
299
-			$message .= '<p>' . sprintf( esc_html__( "You're using Version %s. Please update your Gravity Forms or purchase a license.", 'gravityview' ), '<span style="font-family: Consolas, Courier, monospace;">'.GFCommon::$version.'</span>' ) . '</p>';
299
+			$message .= '<p>' . sprintf( esc_html__( "You're using Version %s. Please update your Gravity Forms or purchase a license.", 'gravityview' ), '<span style="font-family: Consolas, Courier, monospace;">' . GFCommon::$version . '</span>' ) . '</p>';
300 300
 
301 301
 			/* translators: In this context, "get" means purchase */
302 302
 			$message .= '<p><a href="https://gravityview.co/gravityforms/" class="button button-secondary button-large button-hero">' . esc_html__( 'Get the Latest Gravity Forms', 'gravityview' ) . '</a></p>';
303 303
 
304 304
 
305 305
 			// Show the notice even if the future version requirements aren't met
306
-			self::$notices['gf_version'] = array(
306
+			self::$notices[ 'gf_version' ] = array(
307 307
 				'class' => $class,
308 308
 				'message' => $message,
309 309
 				'cap' => 'update_plugins',
@@ -321,42 +321,42 @@  discard block
 block discarded – undo
321 321
 		 * OR
322 322
 		 * It's the Network Admin and we just don't know whether the sites have GF activated themselves.
323 323
 		 */
324
-		if( true === $gf_status || is_network_admin() ) {
324
+		if ( true === $gf_status || is_network_admin() ) {
325 325
 			return true;
326 326
 		}
327 327
 
328 328
 		// If GFCommon doesn't exist, assume GF not active
329 329
 		$return = false;
330 330
 
331
-		switch( $gf_status ) {
331
+		switch ( $gf_status ) {
332 332
 			case 'inactive':
333 333
 
334 334
 				// Required for multisite
335
-				if( ! function_exists('wp_create_nonce') ) {
335
+				if ( ! function_exists( 'wp_create_nonce' ) ) {
336 336
 					require_once ABSPATH . WPINC . '/pluggable.php';
337 337
 				}
338 338
 
339 339
 				// Otherwise, throws an error on activation & deactivation "Use of undefined constant LOGGED_IN_COOKIE"
340
-				if( is_multisite() ) {
340
+				if ( is_multisite() ) {
341 341
 					wp_cookie_constants();
342 342
 				}
343 343
 
344 344
 				$return = false;
345 345
 
346
-				$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">';
346
+				$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">';
347 347
 
348
-				self::$notices['gf_inactive'] = array(
348
+				self::$notices[ 'gf_inactive' ] = array(
349 349
 					'class' => 'error',
350
-					'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>' ),
350
+					'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>' ),
351 351
 					'cap' => 'activate_plugins',
352 352
 					'dismiss' => 'gf_inactive',
353 353
 				);
354 354
 
355 355
 				break;
356 356
 			default:
357
-				self::$notices['gf_installed'] = array(
357
+				self::$notices[ 'gf_installed' ] = array(
358 358
 					'class' => 'error',
359
-					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be installed in order to run properly. %sGet Gravity Forms%s - starting at $59%s%s', 'gravityview' ), '<h3>', "</h3>\n\n".'<a href="https://gravityview.co/gravityforms/" class="button button-secondary button-large button-hero">' , '<em>', '</em>', '</a>'),
359
+					'message' => sprintf( __( '%sGravityView requires Gravity Forms to be installed in order to run properly. %sGet Gravity Forms%s - starting at $59%s%s', 'gravityview' ), '<h3>', "</h3>\n\n" . '<a href="https://gravityview.co/gravityforms/" class="button button-secondary button-large button-hero">', '<em>', '</em>', '</a>' ),
360 360
 					'cap' => 'install_plugins',
361 361
 					'dismiss' => 'gf_installed',
362 362
 				);
@@ -373,10 +373,10 @@  discard block
 block discarded – undo
373 373
 	 */
374 374
 	private static function check_gf_directory() {
375 375
 
376
-		if( class_exists( 'GFDirectory' ) ) {
377
-			self::$notices['gf_directory'] = array(
376
+		if ( class_exists( 'GFDirectory' ) ) {
377
+			self::$notices[ 'gf_directory' ] = array(
378 378
 				'class' => 'error is-dismissible',
379
-				'title' => __('Potential Conflict', 'gravityview' ),
379
+				'title' => __( 'Potential Conflict', 'gravityview' ),
380 380
 				'message' => __( 'GravityView and Gravity Forms Directory are both active. This may cause problems. If you experience issues, disable the Gravity Forms Directory plugin.', 'gravityview' ),
381 381
 				'dismiss' => 'gf_directory',
382 382
 				'cap' => 'activate_plugins',
@@ -394,21 +394,21 @@  discard block
 block discarded – undo
394 394
 	 */
395 395
 	public static function get_plugin_status( $location = '' ) {
396 396
 
397
-		if( ! function_exists('is_plugin_active') ) {
397
+		if ( ! function_exists( 'is_plugin_active' ) ) {
398 398
 			include_once( ABSPATH . '/wp-admin/includes/plugin.php' );
399 399
 		}
400 400
 
401
-		if( is_network_admin() && is_plugin_active_for_network( $location ) ) {
401
+		if ( is_network_admin() && is_plugin_active_for_network( $location ) ) {
402 402
 			return true;
403 403
 		}
404 404
 
405
-		if( ! is_network_admin() && is_plugin_active( $location ) ) {
405
+		if ( ! is_network_admin() && is_plugin_active( $location ) ) {
406 406
 			return true;
407 407
 		}
408 408
 
409
-		if(
410
-			!file_exists( trailingslashit( WP_PLUGIN_DIR ) . $location ) &&
411
-			!file_exists( trailingslashit( WPMU_PLUGIN_DIR ) . $location )
409
+		if (
410
+			! file_exists( trailingslashit( WP_PLUGIN_DIR ) . $location ) &&
411
+			! file_exists( trailingslashit( WPMU_PLUGIN_DIR ) . $location )
412 412
 		) {
413 413
 			return false;
414 414
 		}
Please login to merge, or discard this patch.
future/includes/class-gv-widget.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 		$enable_custom_class = apply_filters( 'gravityview/widget/enable_custom_class', false, $this );
154 154
 
155 155
 		if ( $enable_custom_class ) {
156
-			$settings['custom_class'] = array(
156
+			$settings[ 'custom_class' ] = array(
157 157
 				'type'       => 'text',
158 158
 				'label'      => __( 'Custom CSS Class:', 'gravityview' ),
159 159
 				'desc'       => __( 'This class will be added to the widget container', 'gravityview' ),
@@ -206,8 +206,8 @@  discard block
 block discarded – undo
206 206
 	 */
207 207
 	public static function get_default_widget_areas() {
208 208
 		$default_areas = array(
209
-			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ) , 'subtitle' => '' ) ) ),
210
-			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ) , 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ) , 'subtitle' => '' ) ) ),
209
+			array( '1-1' => array( array( 'areaid' => 'top', 'title' => __( 'Top', 'gravityview' ), 'subtitle' => '' ) ) ),
210
+			array( '1-2' => array( array( 'areaid' => 'left', 'title' => __( 'Left', 'gravityview' ), 'subtitle' => '' ) ), '2-2' => array( array( 'areaid' => 'right', 'title' => __( 'Right', 'gravityview' ), 'subtitle' => '' ) ) ),
211 211
 		);
212 212
 
213 213
 		/**
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 		}
239 239
 
240 240
 		$widgets[ $this->get_widget_id() ] = array(
241
-			'label' => $this->widget_label ,
241
+			'label' => $this->widget_label,
242 242
 			'description' => $this->widget_description,
243 243
 			'subtitle' => $this->widget_subtitle,
244 244
 			'icon' => $this->icon,
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 	 */
261 261
 	public function assign_widget_options( $options = array(), $template = '', $widget = '' ) {
262 262
 		if ( $this->get_widget_id() === $widget ) {
263
-			if( $settings = $this->get_settings() ) {
263
+			if ( $settings = $this->get_settings() ) {
264 264
 				$options = array_merge( $options, $settings );
265 265
 			}
266 266
 		}
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
 			return;
315 315
 		}
316 316
 
317
-		add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode') );
317
+		add_shortcode( $this->shortcode_name, array( $this, 'render_shortcode' ) );
318 318
 	}
319 319
 
320 320
 	/**
Please login to merge, or discard this patch.
future/includes/class-gv-license-handler.php 1 patch
Spacing   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 		);
103 103
 
104 104
 		if ( ! empty( $action ) ) {
105
-			$settings['edd_action'] = esc_attr( $action );
105
+			$settings[ 'edd_action' ] = esc_attr( $action );
106 106
 		}
107 107
 
108 108
 		return array_map( 'urlencode', $settings );
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 			'format' => 'json',
159 159
 		) );
160 160
 
161
-		if ( $is_ajax && empty( $data['license'] ) ) {
161
+		if ( $is_ajax && empty( $data[ 'license' ] ) ) {
162 162
 			die( -1 );
163 163
 		}
164 164
 
@@ -186,11 +186,11 @@  discard block
 block discarded – undo
186 186
 
187 187
 			$json = json_encode( $license_data );
188 188
 
189
-			$update_license = Utils::get( $data, 'update' ) || 'gravityview_license' === Utils::_POST('action');
189
+			$update_license = Utils::get( $data, 'update' ) || 'gravityview_license' === Utils::_POST( 'action' );
190 190
 
191 191
 			$is_check_action_button = ( 'check_license' === Utils::get( $data, 'edd_action' ) && defined( 'DOING_AJAX' ) && DOING_AJAX );
192 192
 
193
-			do_action('gravityview/admin_installer/delete_downloads_data', true );
193
+			do_action( 'gravityview/admin_installer/delete_downloads_data', true );
194 194
 
195 195
 			if ( $is_check_action_button ) {
196 196
 				delete_transient( self::status_transient_key );
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 			// most likely a mistake.
202 202
 			} else if ( $license_data->license !== 'failed' && $update_license ) {
203 203
 
204
-				if ( ! empty( $data['field_id'] ) ) {
204
+				if ( ! empty( $data[ 'field_id' ] ) ) {
205 205
 					set_transient( self::status_transient_key, $license_data, DAY_IN_SECONDS );
206 206
 				}
207 207
 
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
 			$class   = 'hide';
230 230
 			$message = '';
231 231
 		} else {
232
-			if( ! empty( $license_data->error ) ) {
232
+			if ( ! empty( $license_data->error ) ) {
233 233
 				$class = 'error';
234 234
 				$string_key = $license_data->error;
235 235
 			} else { $class = $license_data->license;
@@ -253,12 +253,12 @@  discard block
 block discarded – undo
253 253
 	 */
254 254
 	public function license_details( $response = array() ) {
255 255
 
256
-		$response = (array) $response;
256
+		$response = (array)$response;
257 257
 
258 258
 		$return  = '';
259 259
 		$wrapper = '<span class="gv-license-details" aria-live="polite" aria-busy="false">%s</span>';
260 260
 
261
-		if ( ! empty( $response['license_key'] ) ) {
261
+		if ( ! empty( $response[ 'license_key' ] ) ) {
262 262
 			$return .= '<h3>' . rtrim( esc_html__( 'License Details:', 'gravityview' ), ':' ) . '</h3>';
263 263
 
264 264
 			if ( in_array( Utils::get( $response, 'license' ), array( 'invalid', 'deactivated' ) ) ) {
@@ -267,8 +267,8 @@  discard block
 block discarded – undo
267 267
 				}
268 268
 
269 269
 
270
-				$return .= $this->strings( $response['license'], $response );
271
-			} elseif ( ! empty( $response['license_name'] ) ) {
270
+				$return .= $this->strings( $response[ 'license' ], $response );
271
+			} elseif ( ! empty( $response[ 'license_name' ] ) ) {
272 272
 				$response_keys = array(
273 273
 					'license_name'   => '',
274 274
 					'license_limit'  => '',
@@ -283,22 +283,22 @@  discard block
 block discarded – undo
283 283
 				$response = wp_parse_args( $response, $response_keys );
284 284
 
285 285
 				$login_link_class = gravityview()->plugin->is_GF_25() ? 'button button-outline outline' : 'text-link';
286
-				$renews_on = ( 'lifetime' === $response['expires'] ) ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response['expires'] ) - DAY_IN_SECONDS ) );
287
-				$login_link       = sprintf( '<a href="%s" class="gv-access-account ' . $login_link_class . '" rel="external">%s</a>', esc_url( sprintf( 'https://gravityview.co/wp-login.php?username=%s', $response['customer_email'] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) );
288
-				$local_text       = ( ! empty( $response['is_local'] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
289
-				$license_limit    = empty( $response['license_limit'] ) ? __( 'Unlimited', 'gravityview' ) : (int) $response['license_limit'];
286
+				$renews_on = ( 'lifetime' === $response[ 'expires' ] ) ? '' : sprintf( esc_html__( 'Renew on: %s', 'gravityview' ), date_i18n( get_option( 'date_format' ), strtotime( $response[ 'expires' ] ) - DAY_IN_SECONDS ) );
287
+				$login_link       = sprintf( '<a href="%s" class="gv-access-account ' . $login_link_class . '" rel="external">%s</a>', esc_url( sprintf( 'https://gravityview.co/wp-login.php?username=%s', $response[ 'customer_email' ] ) ), esc_html__( 'Access your GravityView account', 'gravityview' ) );
288
+				$local_text       = ( ! empty( $response[ 'is_local' ] ) ? '<span class="howto">' . __( 'This development site does not count toward license activation limits', 'gravityview' ) . '</span>' : '' );
289
+				$license_limit    = empty( $response[ 'license_limit' ] ) ? __( 'Unlimited', 'gravityview' ) : (int)$response[ 'license_limit' ];
290 290
 
291 291
 
292 292
 				$details = array(
293
-					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), '<span class="gv-license-detail">' . esc_html( $response['license_name'] ) . '</span>' ),
294
-					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), '<span class="gv-license-detail">' . esc_html__( $response['customer_name'], 'gravityview' ), esc_html__( $response['customer_email'], 'gravityview' ) ) . '</span>' . $renews_on . $login_link,
295
-					'activations' => sprintf( str_replace( '%d', '%s', esc_html__( 'Activations: %d of %s sites', 'gravityview' ) ), '<span class="gv-license-detail">' . intval( $response['site_count'] ), esc_html( $license_limit ) ) . '</span>' . $local_text,
296
-					'upgrade'     => $this->get_upgrade_html( $response['upgrades'] ),
293
+					'license'     => sprintf( esc_html__( 'License level: %s', 'gravityview' ), '<span class="gv-license-detail">' . esc_html( $response[ 'license_name' ] ) . '</span>' ),
294
+					'licensed_to' => sprintf( esc_html_x( 'Licensed to: %1$s (%2$s)', '1: Customer name; 2: Customer email', 'gravityview' ), '<span class="gv-license-detail">' . esc_html__( $response[ 'customer_name' ], 'gravityview' ), esc_html__( $response[ 'customer_email' ], 'gravityview' ) ) . '</span>' . $renews_on . $login_link,
295
+					'activations' => sprintf( str_replace( '%d', '%s', esc_html__( 'Activations: %d of %s sites', 'gravityview' ) ), '<span class="gv-license-detail">' . intval( $response[ 'site_count' ] ), esc_html( $license_limit ) ) . '</span>' . $local_text,
296
+					'upgrade'     => $this->get_upgrade_html( $response[ 'upgrades' ] ),
297 297
 				);
298 298
 
299
-				if ( ! empty( $response['error'] ) && 'expired' === $response['error'] ) {
300
-					unset( $details['upgrade'] );
301
-					$details['licensed_to'] .= '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
299
+				if ( ! empty( $response[ 'error' ] ) && 'expired' === $response[ 'error' ] ) {
300
+					unset( $details[ 'upgrade' ] );
301
+					$details[ 'licensed_to' ] .= '<div class="error inline"><p>' . $this->strings( 'expired', $response ) . '</p></div>';
302 302
 				}
303 303
 
304 304
 				$return .= '<ul>';
@@ -330,20 +330,20 @@  discard block
 block discarded – undo
330 330
 		if ( ! empty( $upgrades ) ) {
331 331
 
332 332
 			$locale_parts = explode( '_', get_locale() );
333
-			$is_english = ( 'en' === $locale_parts[0] );
333
+			$is_english = ( 'en' === $locale_parts[ 0 ] );
334 334
 
335 335
 			$output .= '<h4>' . esc_html__( 'Upgrades available:', 'gravityview' ) . '</h4>';
336 336
 			$output .= '<ul>';
337 337
 
338 338
 			foreach ( $upgrades as $upgrade_id => $upgrade ) {
339
-				$upgrade = (object) $upgrade;
339
+				$upgrade = (object)$upgrade;
340 340
 
341 341
 				$anchor_text = sprintf( esc_html_x( 'Upgrade to %1$s for %2$s', '1: GravityView upgrade name, 2: Cost of upgrade', 'gravityview' ), esc_attr( $upgrade->name ), esc_attr( $upgrade->price ) );
342 342
 
343 343
 				if ( $is_english && isset( $upgrade->description ) ) {
344 344
 					$message = esc_html( $upgrade->description );
345 345
 				} else {
346
-					switch( $upgrade->price_id ) {
346
+					switch ( $upgrade->price_id ) {
347 347
 						// Interstellar
348 348
 						case 1:
349 349
 						default:
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
 			'invalid_item_id' => esc_html__( 'This license key does not have access to this plugin.', 'gravityview' ),
423 423
 			'missing' => esc_html__( 'The license key entered is invalid.', 'gravityview' ), // Missing is "the license couldn't be found", not "you submitted an empty license"
424 424
 			'revoked' => esc_html__( 'This license key has been revoked.', 'gravityview' ),
425
-			'expired' => sprintf( esc_html__( 'This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview' ), '<a href="'. esc_url( $this->get_license_renewal_url( $license_data ) ) .'">', '</a>' ),
425
+			'expired' => sprintf( esc_html__( 'This license key has expired. %sRenew your license on the GravityView website%s to receive updates and support.', 'gravityview' ), '<a href="' . esc_url( $this->get_license_renewal_url( $license_data ) ) . '">', '</a>' ),
426 426
 			'capability' => esc_html__( 'You don\'t have the ability to edit plugin settings.', 'gravityview' ),
427 427
 			'verifying_license' => esc_html__( 'Verifying license&hellip;', 'gravityview' ),
428 428
 			'activate_license' => esc_html__( 'Activate License', 'gravityview' ),
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
450 450
 
451 451
 		if ( ! empty( $license_data->renewal_url ) ) {
452 452
 			$renew_license_url = $license_data->renewal_url;
453
-		} elseif( ! empty( $license_data->license_key ) ) {
453
+		} elseif ( ! empty( $license_data->license_key ) ) {
454 454
 			$renew_license_url = sprintf( 'https://gravityview.co/checkout/?download_id=17&edd_license_key=%s', $license_data->license_key );
455 455
 		} else {
456 456
 			$renew_license_url = 'https://gravityview.co/account/';
@@ -467,7 +467,7 @@  discard block
 block discarded – undo
467 467
 	 * @return array|\WP_Error
468 468
 	 */
469 469
 	private function _license_get_remote_response( $data, $license = '' ) {
470
-		$api_params = $this->_get_edd_settings( $data['edd_action'], $license );
470
+		$api_params = $this->_get_edd_settings( $data[ 'edd_action' ], $license );
471 471
 
472 472
 		$url = add_query_arg( $api_params, self::url );
473 473
 
@@ -507,9 +507,9 @@  discard block
 block discarded – undo
507 507
 	private function license_call_update_settings( $license_data, $data ) {
508 508
 		$settings = array();
509 509
 
510
-        $settings['license_key'] = $license_data->license_key = trim( $data['license'] );
511
-		$settings['license_key_status'] = $license_data->license;
512
-		$settings['license_key_response'] = (array)$license_data;
510
+        $settings[ 'license_key' ] = $license_data->license_key = trim( $data[ 'license' ] );
511
+		$settings[ 'license_key_status' ] = $license_data->license;
512
+		$settings[ 'license_key_response' ] = (array)$license_data;
513 513
 
514 514
 		$this->settings->set( $settings );
515 515
 	}
@@ -529,9 +529,9 @@  discard block
 block discarded – undo
529 529
 		$status = trim( $this->settings->get( 'license_key_status' ) );
530 530
 		$key = trim( $this->settings->get( 'license_key' ) );
531 531
 
532
-		if (  !empty( $key ) ) {
532
+		if ( ! empty( $key ) ) {
533 533
 			$response = $this->settings->get( 'license_key_response' );
534
-			$response = is_array( $response ) ? (object) $response : json_decode( $response );
534
+			$response = is_array( $response ) ? (object)$response : json_decode( $response );
535 535
 		} else {
536 536
 			$response = array();
537 537
 		}
@@ -574,11 +574,11 @@  discard block
 block discarded – undo
574 574
 
575 575
 		$submit = '<div class="gv-edd-button-wrapper">';
576 576
 		foreach ( $fields as $field ) {
577
-			$field['type'] = 'button';
578
-			$field['class'] = isset( $field['class'] ) ? $field['class'] . ' '. $class : $class;
579
-			$field['style'] = 'margin-left: 10px;';
580
-			if( $disabled_attribute ) {
581
-				$field['disabled'] = $disabled_attribute;
577
+			$field[ 'type' ] = 'button';
578
+			$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] . ' ' . $class : $class;
579
+			$field[ 'style' ] = 'margin-left: 10px;';
580
+			if ( $disabled_attribute ) {
581
+				$field[ 'disabled' ] = $disabled_attribute;
582 582
 			}
583 583
 			$submit .= $this->settings->as_html( $field, $echo );
584 584
 		}
@@ -657,7 +657,7 @@  discard block
 block discarded – undo
657 657
 				    'url'        => home_url(),
658 658
 				    'site_data'  => $this->get_site_data(),
659 659
 			    ),
660
-			));
660
+			) );
661 661
 
662 662
 			// make sure the response came back okay
663 663
 			if ( is_wp_error( $response ) ) {
@@ -687,45 +687,45 @@  discard block
 block discarded – undo
687 687
 		$theme_data = wp_get_theme();
688 688
 		$theme      = $theme_data->Name . ' ' . $theme_data->Version;
689 689
 
690
-		$data['gv_version']  = Plugin::$version;
691
-		$data['php_version']  = phpversion();
692
-		$data['wp_version']   = get_bloginfo( 'version' );
693
-		$data['gf_version']  = \GFForms::$version;
694
-		$data['server']       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
695
-		$data['multisite']    = is_multisite();
696
-		$data['theme']        = $theme;
697
-		$data['url']          = home_url();
698
-		$data['license_key']  = $this->settings->get( 'license_key' );
699
-		$data['beta']         = $this->settings->get( 'beta' );
690
+		$data[ 'gv_version' ]  = Plugin::$version;
691
+		$data[ 'php_version' ]  = phpversion();
692
+		$data[ 'wp_version' ]   = get_bloginfo( 'version' );
693
+		$data[ 'gf_version' ]  = \GFForms::$version;
694
+		$data[ 'server' ]       = Utils::get( $_SERVER, 'SERVER_SOFTWARE' );
695
+		$data[ 'multisite' ]    = is_multisite();
696
+		$data[ 'theme' ]        = $theme;
697
+		$data[ 'url' ]          = home_url();
698
+		$data[ 'license_key' ]  = $this->settings->get( 'license_key' );
699
+		$data[ 'beta' ]         = $this->settings->get( 'beta' );
700 700
 
701 701
 		// View Data
702 702
 		$gravityview_posts = wp_count_posts( 'gravityview', 'readable' );
703 703
 
704
-		$data['view_count'] = null;
705
-		$data['view_first'] = null;
706
-		$data['view_latest'] = null;
704
+		$data[ 'view_count' ] = null;
705
+		$data[ 'view_first' ] = null;
706
+		$data[ 'view_latest' ] = null;
707 707
 
708 708
 		if ( $gravityview_posts->publish ) {
709
-			$data['view_count'] = $gravityview_posts->publish;
709
+			$data[ 'view_count' ] = $gravityview_posts->publish;
710 710
 
711 711
 			$first = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=ASC' );
712 712
 			$latest = get_posts( 'numberposts=1&post_type=gravityview&post_status=publish&order=DESC' );
713 713
 
714 714
 			if ( $first = array_shift( $first ) ) {
715
-				$data['view_first'] = $first->post_date;
715
+				$data[ 'view_first' ] = $first->post_date;
716 716
 			}
717 717
 			if ( $latest = array_pop( $latest ) ) {
718
-				$data['view_latest'] = $latest->post_date;
718
+				$data[ 'view_latest' ] = $latest->post_date;
719 719
 			}
720 720
 		}
721 721
 
722 722
 		// Form counts
723 723
 		if ( class_exists( 'GFFormsModel' ) ) {
724 724
 			$form_data = \GFFormsModel::get_form_count();
725
-			$data['forms_total'] = Utils::get( $form_data, 'total', 0 );
726
-			$data['forms_active'] = Utils::get( $form_data, 'active', 0 );
727
-			$data['forms_inactive'] = Utils::get( $form_data, 'inactive', 0 );
728
-			$data['forms_trash'] = Utils::get( $form_data, 'inactive', 0 );
725
+			$data[ 'forms_total' ] = Utils::get( $form_data, 'total', 0 );
726
+			$data[ 'forms_active' ] = Utils::get( $form_data, 'active', 0 );
727
+			$data[ 'forms_inactive' ] = Utils::get( $form_data, 'inactive', 0 );
728
+			$data[ 'forms_trash' ] = Utils::get( $form_data, 'inactive', 0 );
729 729
 		}
730 730
 
731 731
 		// Retrieve current plugin information
@@ -733,13 +733,13 @@  discard block
 block discarded – undo
733 733
 			include ABSPATH . '/wp-admin/includes/plugin.php';
734 734
 		}
735 735
 
736
-		$data['integrations']     = self::get_related_plugins_and_extensions();
737
-		$data['active_plugins']   = get_option( 'active_plugins', array() );
738
-		$data['inactive_plugins'] = array();
739
-		$data['locale']           = get_locale();
736
+		$data[ 'integrations' ]     = self::get_related_plugins_and_extensions();
737
+		$data[ 'active_plugins' ]   = get_option( 'active_plugins', array() );
738
+		$data[ 'inactive_plugins' ] = array();
739
+		$data[ 'locale' ]           = get_locale();
740 740
 
741 741
 		// Validate request on the GV server
742
-		$data['hash']             = 'gv_version.url.locale:' . sha1( $data['gv_version'] . $data['url'] . $data['locale'] );
742
+		$data[ 'hash' ]             = 'gv_version.url.locale:' . sha1( $data[ 'gv_version' ] . $data[ 'url' ] . $data[ 'locale' ] );
743 743
 
744 744
 		return $data;
745 745
 	}
@@ -769,7 +769,7 @@  discard block
 block discarded – undo
769 769
 
770 770
 				$plugin_data = get_plugin_data( $active_plugin );
771 771
 
772
-				$extensions[] = sprintf( '%s %s', $plugin_data['Name'], $plugin_data['Version'] );
772
+				$extensions[ ] = sprintf( '%s %s', $plugin_data[ 'Name' ], $plugin_data[ 'Version' ] );
773 773
 			}
774 774
 
775 775
 			if ( ! empty( $extensions ) ) {
Please login to merge, or discard this patch.
includes/fields/class-gravityview-fields.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
 	 * @return GravityView_Field | bool
43 43
 	 */
44 44
 	public static function create( $properties ) {
45
-		$type = isset( $properties['type'] ) ? $properties['type'] : '';
46
-		$type = empty( $properties['inputType'] ) ? $type : $properties['inputType'];
45
+		$type = isset( $properties[ 'type' ] ) ? $properties[ 'type' ] : '';
46
+		$type = empty( $properties[ 'inputType' ] ) ? $type : $properties[ 'inputType' ];
47 47
 		if ( empty( $type ) || ! isset( self::$_fields[ $type ] ) ) {
48 48
 			return new GravityView_Field( $properties );
49 49
 		}
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 	 * @return bool True: yes, it exists; False: nope
63 63
 	 */
64 64
 	public static function exists( $field_name ) {
65
-		return isset( self::$_fields["{$field_name}"] );
65
+		return isset( self::$_fields[ "{$field_name}" ] );
66 66
 	}
67 67
 
68 68
 	/**
@@ -96,8 +96,8 @@  discard block
 block discarded – undo
96 96
 
97 97
 		$field_type = is_a( $gf_field, 'GF_Field' ) ? get_class( $gf_field ) : $gf_field;
98 98
 
99
-		foreach( self::$_fields as $field ) {
100
-			if( $field_type === $field->_gf_field_class_name ) {
99
+		foreach ( self::$_fields as $field ) {
100
+			if ( $field_type === $field->_gf_field_class_name ) {
101 101
 				return $field;
102 102
 			}
103 103
 		}
@@ -116,13 +116,13 @@  discard block
 block discarded – undo
116 116
 	 */
117 117
 	public static function get_all( $groups = '' ) {
118 118
 
119
-		if( '' !== $groups ) {
119
+		if ( '' !== $groups ) {
120 120
 			$return_fields = self::$_fields;
121 121
 
122
-			$groups = (array) $groups;
122
+			$groups = (array)$groups;
123 123
 
124 124
 			foreach ( $return_fields as $key => $field ) {
125
-				if( ! in_array( $field->group, $groups, true ) ) {
125
+				if ( ! in_array( $field->group, $groups, true ) ) {
126 126
 					unset( $return_fields[ $key ] );
127 127
 				}
128 128
 			}
Please login to merge, or discard this patch.