Completed
Pull Request — develop (#1726)
by
unknown
19:16
created
plugin-and-theme-hooks/class-gravityview-plugin-hooks-gravity-perks.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
 	public function edit_entry_fix_uid_fields( $fields ) {
51 51
 
52 52
 		/** @type \GF_Field $field */
53
-		foreach( $fields as &$field ) {
53
+		foreach ( $fields as &$field ) {
54 54
 			if ( 'uid' === $field->type ) {
55 55
 
56 56
 				// Replace GF_Field with GF_Field_Text, copying all the data from $field
Please login to merge, or discard this patch.
future/includes/class-gv-field.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 	 * @return \GV\Field The field implementation from configuration (\GV\GF_Field, \GV\Internal_Field).
167 167
 	 */
168 168
 	public static function from_configuration( $configuration ) {
169
-		if ( empty( $configuration['id'] ) ) {
169
+		if ( empty( $configuration[ 'id' ] ) ) {
170 170
 			$field = new self();
171 171
 			gravityview()->log->error( 'Trying to get field from configuration without a field ID.', array( 'data' => $configuration ) );
172 172
 			$field->update_configuration( $configuration );
@@ -179,8 +179,8 @@  discard block
 block discarded – undo
179 179
 		} else {
180 180
 			$trace = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS );
181 181
 		}
182
-		$trace = $trace[1];
183
-		if ( $trace['function'] == 'from_configuration' && $trace['class'] == __CLASS__ ) {
182
+		$trace = $trace[ 1 ];
183
+		if ( $trace[ 'function' ] == 'from_configuration' && $trace[ 'class' ] == __CLASS__ ) {
184 184
 			$field = new self();
185 185
 			gravityview()->log->error( 'Infinite loop protection tripped. Returning default class here.' );
186 186
 			$field->update_configuration( $configuration );
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 		}
189 189
 
190 190
 		/** @type \GV\GF_Field|\GV\Internal_Field $field_class Determine the field implementation to use, and try to use. */
191
-		$field_class = is_numeric( $configuration['id'] ) ? '\GV\GF_Field' : '\GV\Internal_Field';
191
+		$field_class = is_numeric( $configuration[ 'id' ] ) ? '\GV\GF_Field' : '\GV\Internal_Field';
192 192
 
193 193
 		/**
194 194
 		 * @filter `gravityview/field/class` Filter the field class about to be created from the configuration.
@@ -227,24 +227,24 @@  discard block
 block discarded – undo
227 227
 	public function update_configuration( $configuration ) {
228 228
 		$configuration = wp_parse_args( $configuration, $this->as_configuration() );
229 229
 
230
-		if ( $this->ID != $configuration['id'] ) {
230
+		if ( $this->ID != $configuration[ 'id' ] ) {
231 231
 			/** Smelling trouble here... */
232 232
 			gravityview()->log->warning( 'ID is being changed for {field_class} instance, but implementation is not. Use ::from_configuration instead', array( 'field_class', __CLASS__ ) );
233 233
 		}
234 234
 
235
-		$this->ID = $configuration['id'];
236
-		$this->label = $configuration['label'];
237
-		$this->show_label = $configuration['show_label'] == '1';
238
-		$this->custom_label = $configuration['custom_label'];
239
-		$this->custom_class = $configuration['custom_class'];
240
-		$this->cap = $configuration['only_loggedin'] == '1' ? $configuration['only_loggedin_cap'] : '';
241
-		$this->search_filter = $configuration['search_filter'] == '1';
242
-		$this->show_as_link = $configuration['show_as_link'] == '1';
235
+		$this->ID = $configuration[ 'id' ];
236
+		$this->label = $configuration[ 'label' ];
237
+		$this->show_label = $configuration[ 'show_label' ] == '1';
238
+		$this->custom_label = $configuration[ 'custom_label' ];
239
+		$this->custom_class = $configuration[ 'custom_class' ];
240
+		$this->cap = $configuration[ 'only_loggedin' ] == '1' ? $configuration[ 'only_loggedin_cap' ] : '';
241
+		$this->search_filter = $configuration[ 'search_filter' ] == '1';
242
+		$this->show_as_link = $configuration[ 'show_as_link' ] == '1';
243 243
 
244 244
 		/** Shared among all field types (sort of). */
245 245
 		$shared_configuration_keys = array(
246 246
 			'id', 'label', 'show_label', 'custom_label', 'custom_class',
247
-			'only_loggedin' ,'only_loggedin_cap', 'search_filter', 'show_as_link',
247
+			'only_loggedin', 'only_loggedin_cap', 'search_filter', 'show_as_link',
248 248
 		);
249 249
 
250 250
 		/** Everything else goes into the properties for now. @todo subclasses! */
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
 
274 274
 		/** A custom label is available. */
275 275
 		if ( ! empty( $this->custom_label ) ) {
276
-			return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ? : null : null, $entry ? $entry->as_entry() : null );
276
+			return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ?: null : null, $entry ? $entry->as_entry() : null );
277 277
 		}
278 278
 
279 279
 		return '';
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
 	 * @return mixed|null The value for the given configuration key, null if doesn't exist.
360 360
 	 */
361 361
 	public function __get( $key ) {
362
-		switch( $key ) {
362
+		switch ( $key ) {
363 363
 			default:
364 364
 				if ( isset( $this->configuration[ $key ] ) ) {
365 365
 					return $this->configuration[ $key ];
@@ -377,7 +377,7 @@  discard block
 block discarded – undo
377 377
 	 * @return boolean Whether this $key is set or not.
378 378
 	 */
379 379
 	public function __isset( $key ) {
380
-		switch( $key ) {
380
+		switch ( $key ) {
381 381
 			default:
382 382
 				return isset( $this->configuration[ $key ] );
383 383
 		}
Please login to merge, or discard this patch.
includes/admin/metaboxes/class-gravityview-admin-metaboxes.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -52,13 +52,13 @@  discard block
 block discarded – undo
52 52
 	function update_priority() {
53 53
 		global $wp_meta_boxes;
54 54
 
55
-		if ( ! empty( $wp_meta_boxes['gravityview'] ) ) {
55
+		if ( ! empty( $wp_meta_boxes[ 'gravityview' ] ) ) {
56 56
 			foreach ( array( 'high', 'core', 'low' ) as $position ) {
57
-				if ( isset( $wp_meta_boxes['gravityview']['normal'][ $position ] ) ) {
58
-					foreach ( $wp_meta_boxes['gravityview']['normal'][ $position ] as $key => $meta_box ) {
57
+				if ( isset( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ] ) ) {
58
+					foreach ( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ] as $key => $meta_box ) {
59 59
 						if ( ! preg_match( '/^gravityview_/ism', $key ) ) {
60
-							$wp_meta_boxes['gravityview']['advanced'][ $position ][ $key ] = $meta_box;
61
-							unset( $wp_meta_boxes['gravityview']['normal'][ $position ][ $key ] );
60
+							$wp_meta_boxes[ 'gravityview' ][ 'advanced' ][ $position ][ $key ] = $meta_box;
61
+							unset( $wp_meta_boxes[ 'gravityview' ][ 'normal' ][ $position ][ $key ] );
62 62
 						}
63 63
 					}
64 64
 				}
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 
192 192
 		foreach ( $metaboxes as $m ) {
193 193
 
194
-			$tab = new GravityView_Metabox_Tab( $m['id'], $m['title'], $m['file'], $m['icon-class'], $m['callback'], $m['callback_args'] );
194
+			$tab = new GravityView_Metabox_Tab( $m[ 'id' ], $m[ 'title' ], $m[ 'file' ], $m[ 'icon-class' ], $m[ 'callback' ], $m[ 'callback_args' ] );
195 195
 
196 196
 			GravityView_Metabox_Tabs::add( $tab );
197 197
 
@@ -261,13 +261,13 @@  discard block
 block discarded – undo
261 261
 
262 262
 		$form = gravityview_get_form( $curr_form );
263 263
 
264
-		$get_id_backup = isset( $_GET['id'] ) ? $_GET['id'] : null;
264
+		$get_id_backup = isset( $_GET[ 'id' ] ) ? $_GET[ 'id' ] : null;
265 265
 
266
-		if ( isset( $form['id'] ) ) {
266
+		if ( isset( $form[ 'id' ] ) ) {
267 267
 			$form_script = 'var form = ' . GFCommon::json_encode( $form ) . ';';
268 268
 
269 269
 			// The `gf_vars()` method needs a $_GET[id] variable set with the form ID.
270
-			$_GET['id'] = $form['id'];
270
+			$_GET[ 'id' ] = $form[ 'id' ];
271 271
 
272 272
 		} else {
273 273
 			$form_script = 'var form = new Form();';
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
 		$output = '<script type="text/javascript" data-gv-merge-tags="1">' . $form_script . "\n" . GFCommon::gf_vars( false ) . '</script>';
277 277
 
278 278
 		// Restore previous $_GET setting
279
-		$_GET['id'] = $get_id_backup;
279
+		$_GET[ 'id' ] = $get_id_backup;
280 280
 
281 281
 		return $output;
282 282
 	}
Please login to merge, or discard this patch.
includes/extensions/delete-entry/class-delete-entry.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -532,7 +532,7 @@
 block discarded – undo
532 532
 				 * @since 1.16.4
533 533
 				 * @param  int $entry_id ID of the Gravity Forms entry
534 534
 				 * @param  array $entry Deleted entry array
535
-				*/
535
+				 */
536 536
 				do_action( 'gravityview/delete-entry/deleted', $entry_id, $entry );
537 537
 			}
538 538
 
Please login to merge, or discard this patch.
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 	 */
113 113
 	public function add_reserved_arg( $args ) {
114 114
 
115
-		$args[] = 'delete';
115
+		$args[ ] = 'delete';
116 116
 
117 117
 		return $args;
118 118
 	}
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 
183 183
 		// Index 100 is the default GravityView template path.
184 184
 		// Index 110 is Edit Entry link
185
-		$file_paths[115] = self::$file;
185
+		$file_paths[ 115 ] = self::$file;
186 186
 
187 187
 		return $file_paths;
188 188
 	}
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
 
287 287
 		$attributes = array(
288 288
 			'class' => 'btn btn-sm button button-small alignright pull-right btn-danger gv-button-delete',
289
-			'tabindex' => ( GFCommon::$tab_index ++ ),
289
+			'tabindex' => ( GFCommon::$tab_index++ ),
290 290
 			'onclick' => self::get_confirm_dialog(),
291 291
 		);
292 292
 
@@ -322,12 +322,12 @@  discard block
 block discarded – undo
322 322
 		);
323 323
 
324 324
 		// If the form is not submitted, return early
325
-		if ( 'delete' !== $get_fields['action'] || empty( $get_fields['entry_id'] ) ) {
325
+		if ( 'delete' !== $get_fields[ 'action' ] || empty( $get_fields[ 'entry_id' ] ) ) {
326 326
 			return;
327 327
 		}
328 328
 
329 329
 		// Make sure it's a GravityView request
330
-		$valid_nonce_key = wp_verify_nonce( $get_fields['delete'], self::get_nonce_key( $get_fields['entry_id'] ) );
330
+		$valid_nonce_key = wp_verify_nonce( $get_fields[ 'delete' ], self::get_nonce_key( $get_fields[ 'entry_id' ] ) );
331 331
 
332 332
 		if ( ! $valid_nonce_key ) {
333 333
 			gravityview()->log->debug( 'Delete entry not processed: nonce validation failed.' );
@@ -336,10 +336,10 @@  discard block
 block discarded – undo
336 336
 		}
337 337
 
338 338
 		// Get the entry slug
339
-		$entry_slug = esc_attr( $get_fields['entry_id'] );
339
+		$entry_slug = esc_attr( $get_fields[ 'entry_id' ] );
340 340
 
341 341
 		// Redirect after deleting the entry.
342
-		$view = \GV\View::by_id( $get_fields['view_id'] );
342
+		$view = \GV\View::by_id( $get_fields[ 'view_id' ] );
343 343
 
344 344
 		// See if there's an entry there
345 345
 		$entry = gravityview_get_entry( $entry_slug, true, false, $view );
@@ -366,9 +366,9 @@  discard block
 block discarded – undo
366 366
 			$this->_redirect_and_exit( $delete_redirect_base, $delete_response->get_error_message(), 'error' );
367 367
 		}
368 368
 
369
-		if ( (int) $view->settings->get( 'delete_redirect' ) === self::REDIRECT_TO_URL_VALUE ) {
369
+		if ( (int)$view->settings->get( 'delete_redirect' ) === self::REDIRECT_TO_URL_VALUE ) {
370 370
 
371
-			$form                 = GFAPI::get_form( $entry['form_id'] );
371
+			$form                 = GFAPI::get_form( $entry[ 'form_id' ] );
372 372
 			$redirect_url_setting = $view->settings->get( 'delete_redirect_url' );
373 373
 			$redirect_url         = GFCommon::replace_variables( $redirect_url_setting, $form, $entry, false, false, false, 'text' );
374 374
 
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
444 444
 	 */
445 445
 	private function delete_or_trash_entry( $entry ) {
446 446
 
447
-		$entry_id = $entry['id'];
447
+		$entry_id = $entry[ 'id' ];
448 448
 
449 449
 		$mode = $this->get_delete_mode();
450 450
 
@@ -508,7 +508,7 @@  discard block
 block discarded – undo
508 508
 	public function process_connected_posts( $entry_id = 0, $entry = array() ) {
509 509
 
510 510
 		// The entry had no connected post
511
-		if ( empty( $entry['post_id'] ) ) {
511
+		if ( empty( $entry[ 'post_id' ] ) ) {
512 512
 			return;
513 513
 		}
514 514
 
@@ -526,9 +526,9 @@  discard block
 block discarded – undo
526 526
 		$action = current_action();
527 527
 
528 528
 		if ( 'gravityview/delete-entry/deleted' === $action ) {
529
-			$result = wp_delete_post( $entry['post_id'], true );
529
+			$result = wp_delete_post( $entry[ 'post_id' ], true );
530 530
 		} else {
531
-			$result = wp_trash_post( $entry['post_id'] );
531
+			$result = wp_trash_post( $entry[ 'post_id' ] );
532 532
 		}
533 533
 
534 534
 		if ( false === $result ) {
@@ -559,13 +559,13 @@  discard block
 block discarded – undo
559 559
 	public function verify_nonce() {
560 560
 
561 561
 		// No delete entry request was made
562
-		if ( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) {
562
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'delete' ] ) ) {
563 563
 			return false;
564 564
 		}
565 565
 
566
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
566
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
567 567
 
568
-		$valid = wp_verify_nonce( $_GET['delete'], $nonce_key );
568
+		$valid = wp_verify_nonce( $_GET[ 'delete' ], $nonce_key );
569 569
 
570 570
 		/**
571 571
 		 * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid.
@@ -621,7 +621,7 @@  discard block
 block discarded – undo
621 621
 			$error = __( 'You do not have permission to delete this entry.', 'gravityview' );
622 622
 		}
623 623
 
624
-		if ( $entry['status'] === 'trash' ) {
624
+		if ( $entry[ 'status' ] === 'trash' ) {
625 625
 			if ( 'trash' === $this->get_delete_mode() ) {
626 626
 				$error = __( 'The entry is already in the trash.', 'gravityview' );
627 627
 			} else {
@@ -665,7 +665,7 @@  discard block
 block discarded – undo
665 665
 
666 666
 		$current_user = wp_get_current_user();
667 667
 
668
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : null;
668
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : null;
669 669
 
670 670
 		// Or if they can delete any entries (as defined in Gravity Forms), we're good.
671 671
 		if ( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
@@ -679,17 +679,17 @@  discard block
 block discarded – undo
679 679
 		if ( ! empty( $field ) ) {
680 680
 
681 681
 			// If capability is not defined, something is not right!
682
-			if ( empty( $field['allow_edit_cap'] ) ) {
682
+			if ( empty( $field[ 'allow_edit_cap' ] ) ) {
683 683
 
684 684
 				gravityview()->log->error( 'Cannot read delete entry field caps', array( 'data' => $field ) );
685 685
 
686 686
 				return false;
687 687
 			}
688 688
 
689
-			if ( GVCommon::has_cap( $field['allow_edit_cap'] ) ) {
689
+			if ( GVCommon::has_cap( $field[ 'allow_edit_cap' ] ) ) {
690 690
 
691 691
 				// Do not return true if cap is read, as we need to check if the current user created the entry
692
-				if ( $field['allow_edit_cap'] !== 'read' ) {
692
+				if ( $field[ 'allow_edit_cap' ] !== 'read' ) {
693 693
 					return true;
694 694
 				}
695 695
 			} else {
@@ -700,7 +700,7 @@  discard block
 block discarded – undo
700 700
 			}
701 701
 		}
702 702
 
703
-		if ( ! isset( $entry['created_by'] ) ) {
703
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
704 704
 
705 705
 			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' );
706 706
 
@@ -716,7 +716,7 @@  discard block
 block discarded – undo
716 716
 		}
717 717
 
718 718
 		// If the logged-in user is the same as the user who created the entry, we're good.
719
-		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
719
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
720 720
 
721 721
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
722 722
 
@@ -741,12 +741,12 @@  discard block
 block discarded – undo
741 741
 	 */
742 742
 	public function maybe_display_message( $current_view_id = 0 ) {
743 743
 
744
-		if ( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
744
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
745 745
 			return;
746 746
 		}
747 747
 
748 748
 		// Entry wasn't deleted from current View
749
-		if ( isset( $_GET['view_id'] ) && intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) {
749
+		if ( isset( $_GET[ 'view_id' ] ) && intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) {
750 750
 			return;
751 751
 		}
752 752
 
@@ -755,11 +755,11 @@  discard block
 block discarded – undo
755 755
 
756 756
 	public function display_message() {
757 757
 
758
-		if ( empty( $_GET['status'] ) || empty( $_GET['delete'] ) ) {
758
+		if ( empty( $_GET[ 'status' ] ) || empty( $_GET[ 'delete' ] ) ) {
759 759
 			return;
760 760
 		}
761 761
 
762
-		$status = esc_attr( $_GET['status'] );
762
+		$status = esc_attr( $_GET[ 'status' ] );
763 763
 		$message_from_url = \GV\Utils::_GET( 'message' );
764 764
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
765 765
 		$class = '';
Please login to merge, or discard this patch.
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/extensions/entry-notes/class-gravityview-field-notes.php 2 patches
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 	 *
271 271
 	 * Verify permissions. Check expected $_POST. Parse args, then send to process_delete_notes
272 272
 	 *
273
-  	 * @since 1.17
273
+	 * @since 1.17
274 274
 	 *
275 275
 	 * @see process_delete_notes
276 276
 	 *
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
423 423
 			'subject-label' => __( 'Subject', 'gravityview' ),
424 424
 			'subject' => __( 'Email subject', 'gravityview' ),
425 425
 			'default-email-subject' => __( 'New entry note', 'gravityview' ),
426
-            'email-footer' => __( 'This note was sent from {url}', 'gravityview' ),
426
+			'email-footer' => __( 'This note was sent from {url}', 'gravityview' ),
427 427
 			'also-email' => __( 'Also email this note to', 'gravityview' ),
428 428
 			'error-add-note' => __( 'There was an error adding the note.', 'gravityview' ),
429 429
 			'error-invalid' => __( 'The request was invalid. Refresh the page and try again.', 'gravityview' ),
@@ -493,11 +493,11 @@  discard block
 block discarded – undo
493 493
 
494 494
 		if ( $context instanceof \GV\Template_Context ) {
495 495
 
496
-		    ob_start();
497
-		    $context->template->get_template_part( 'note', 'detail', true );
498
-            $note_detail_html = ob_get_clean();
496
+			ob_start();
497
+			$context->template->get_template_part( 'note', 'detail', true );
498
+			$note_detail_html = ob_get_clean();
499 499
 
500
-            ob_start();
500
+			ob_start();
501 501
 			$context->template->get_template_part( 'note', $note_row_template, true );
502 502
 			$note_row = ob_get_clean();
503 503
 		} else {
@@ -756,7 +756,7 @@  discard block
 block discarded – undo
756 756
 				'gv-note-to-custom' => '',
757 757
 				'gv-note-subject' => '',
758 758
 				'gv-note-content' => '',
759
-                'current-url' => '',
759
+				'current-url' => '',
760 760
 			);
761 761
 
762 762
 			$current_user  = wp_get_current_user();
@@ -808,9 +808,9 @@  discard block
 block discarded – undo
808 808
 			$message .= $this->get_email_footer( $email_footer, $is_html, $email_data );
809 809
 
810 810
 			/**
811
-             * @filter `gravityview/field/notes/wpautop_email` Should the message content have paragraphs added automatically, if using HTML message format
811
+			 * @filter `gravityview/field/notes/wpautop_email` Should the message content have paragraphs added automatically, if using HTML message format
812 812
 			 * @since 1.18
813
-             * @param bool $wpautop_email True: Apply wpautop() to the email message if using; False: Leave as entered (Default: true)
813
+			 * @param bool $wpautop_email True: Apply wpautop() to the email message if using; False: Leave as entered (Default: true)
814 814
 			 */
815 815
 			$wpautop_email = apply_filters( 'gravityview/field/notes/wpautop_email', true );
816 816
 
@@ -830,12 +830,12 @@  discard block
 block discarded – undo
830 830
 	}
831 831
 
832 832
 	/**
833
-     * Get the footer for Entry Note emails
834
-     *
835
-     * `{url}` is replaced by the URL of the page where the note form was embedded
836
-     *
837
-     * @since 1.18
838
-     * @see GravityView_Field_Notes::strings The default value of $message_footer is set here, with the key 'email-footer'
833
+	 * Get the footer for Entry Note emails
834
+	 *
835
+	 * `{url}` is replaced by the URL of the page where the note form was embedded
836
+	 *
837
+	 * @since 1.18
838
+	 * @see GravityView_Field_Notes::strings The default value of $message_footer is set here, with the key 'email-footer'
839 839
 	 *
840 840
 	 * @param string $email_footer The message footer value
841 841
 	 * @param bool $is_html True: Email is being sent as HTML; False: sent as text
@@ -844,10 +844,10 @@  discard block
 block discarded – undo
844 844
 	 */
845 845
 	private function get_email_footer( $email_footer = '', $is_html = true, $email_data = array() ) {
846 846
 
847
-	    $output = '';
847
+		$output = '';
848 848
 
849 849
 		if( ! empty( $email_footer ) ) {
850
-		    $url = \GV\Utils::get( $email_data, 'current-url' );
850
+			$url = \GV\Utils::get( $email_data, 'current-url' );
851 851
 			$url = html_entity_decode( $url );
852 852
 			$url = site_url( $url );
853 853
 
Please login to merge, or discard this patch.
Spacing   +76 added lines, -76 removed lines patch added patch discarded remove patch
@@ -65,19 +65,19 @@  discard block
 block discarded – undo
65 65
 
66 66
 		add_shortcode( 'gv_note_add', array( 'GravityView_Field_Notes', 'get_add_note_part' ) );
67 67
 
68
-		add_action( 'wp', array( $this, 'maybe_delete_notes'), 1000 );
69
-		add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes') );
70
-		add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes') );
68
+		add_action( 'wp', array( $this, 'maybe_delete_notes' ), 1000 );
69
+		add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes' ) );
70
+		add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes' ) );
71 71
 
72
-		add_action( 'wp', array( $this, 'maybe_add_note'), 1000 );
73
-		add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note') );
74
-		add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note') );
72
+		add_action( 'wp', array( $this, 'maybe_add_note' ), 1000 );
73
+		add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note' ) );
74
+		add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note' ) );
75 75
 
76 76
 		// add template path to check for field
77 77
 		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
78 78
 		add_filter( 'gravityview/template/fields_template_paths', array( $this, 'add_template_path' ) );
79 79
 
80
-		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') );
80
+		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) );
81 81
 		add_action( 'gravityview/field/notes/scripts', array( $this, 'enqueue_scripts' ) );
82 82
 
83 83
 		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_entry_default_field' ), 10, 3 );
@@ -99,8 +99,8 @@  discard block
 block discarded – undo
99 99
 	 */
100 100
 	public function add_entry_default_field( $entry_default_fields, $form, $zone ) {
101 101
 
102
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
103
-			$entry_default_fields['notes'] = array(
102
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
103
+			$entry_default_fields[ 'notes' ] = array(
104 104
 				'label' => __( 'Entry Notes', 'gravityview' ),
105 105
 				'type'  => 'notes',
106 106
 				'desc'  => __( 'Display, add, and delete notes for an entry.', 'gravityview' ),
@@ -134,23 +134,23 @@  discard block
 block discarded – undo
134 134
 	public function enqueue_scripts() {
135 135
 		global $wp_actions;
136 136
 
137
-		if( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
137
+		if ( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
138 138
 			wp_enqueue_style( 'gravityview-notes' );
139 139
 			wp_enqueue_script( 'gravityview-notes' );
140 140
 		}
141 141
 
142
-		if( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
142
+		if ( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
143 143
 
144 144
 			$strings = self::strings();
145 145
 
146 146
 			wp_localize_script( 'gravityview-notes', 'GVNotes', array(
147 147
 				'ajaxurl' => admin_url( 'admin-ajax.php' ),
148 148
 				'text' => array(
149
-					'processing' => $strings['processing'],
150
-					'delete_confirm' => $strings['delete-confirm'],
151
-					'note_added' => $strings['added-note'],
152
-					'error_invalid' => $strings['error-invalid'],
153
-					'error_empty_note' => $strings['error-empty-note'],
149
+					'processing' => $strings[ 'processing' ],
150
+					'delete_confirm' => $strings[ 'delete-confirm' ],
151
+					'note_added' => $strings[ 'added-note' ],
152
+					'error_invalid' => $strings[ 'error-invalid' ],
153
+					'error_empty_note' => $strings[ 'error-empty-note' ],
154 154
 				),
155 155
 			) );
156 156
 		}
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 	 * @return void
167 167
 	 */
168 168
 	function maybe_add_note() {
169
-		if ( ! isset( $_POST['action'] ) || 'gv_note_add' !== $_POST['action'] ) {
169
+		if ( ! isset( $_POST[ 'action' ] ) || 'gv_note_add' !== $_POST[ 'action' ] ) {
170 170
 			return;
171 171
 		}
172 172
 
@@ -179,12 +179,12 @@  discard block
 block discarded – undo
179 179
 		$post = wp_unslash( $_POST );
180 180
 
181 181
 		if ( $this->doing_ajax ) {
182
-			parse_str( $post['data'], $data );
182
+			parse_str( $post[ 'data' ], $data );
183 183
 		} else {
184 184
 			$data = $post;
185 185
 		}
186 186
 
187
-		$this->process_add_note( (array) $data );
187
+		$this->process_add_note( (array)$data );
188 188
 	}
189 189
 
190 190
 	/**
@@ -210,23 +210,23 @@  discard block
 block discarded – undo
210 210
 		$error = false;
211 211
 		$success = false;
212 212
 
213
-		if( empty( $data['entry-slug'] ) ) {
213
+		if ( empty( $data[ 'entry-slug' ] ) ) {
214 214
 
215
-			$error = self::strings('error-invalid');
215
+			$error = self::strings( 'error-invalid' );
216 216
 			gravityview()->log->error( 'The note is missing an Entry ID.' );
217 217
 
218 218
 		} else {
219 219
 
220
-			$valid = wp_verify_nonce( $data['gv_note_add'], 'gv_note_add_' . $data['entry-slug'] );
220
+			$valid = wp_verify_nonce( $data[ 'gv_note_add' ], 'gv_note_add_' . $data[ 'entry-slug' ] );
221 221
 
222 222
 			$has_cap = GVCommon::has_cap( 'gravityview_add_entry_notes' );
223 223
 
224
-			if( ! $has_cap ) {
224
+			if ( ! $has_cap ) {
225 225
 				$error = self::strings( 'error-cap-add' );
226 226
 				gravityview()->log->error( 'Adding a note failed: the user does not have the "gravityview_add_entry_notes" capability.' );
227 227
 			} elseif ( $valid ) {
228 228
 
229
-				$entry = gravityview_get_entry( $data['entry-slug'], true, false );
229
+				$entry = gravityview_get_entry( $data[ 'entry-slug' ], true, false );
230 230
 
231 231
 				$added = $this->add_note( $entry, $data );
232 232
 
@@ -244,22 +244,22 @@  discard block
 block discarded – undo
244 244
 					$this->maybe_send_entry_notes( $note, $entry, $data );
245 245
 
246 246
 					if ( $note ) {
247
-						$success = self::display_note( $note, ! empty( $data['show-delete'] ) );
247
+						$success = self::display_note( $note, ! empty( $data[ 'show-delete' ] ) );
248 248
 						gravityview()->log->debug( 'The note was successfully created', array( 'data' => compact( 'note', 'data' ) ) );
249 249
 					} else {
250
-						$error = self::strings('error-add-note');
250
+						$error = self::strings( 'error-add-note' );
251 251
 						gravityview()->log->error( 'The note was not successfully created', array( 'data' => compact( 'note', 'data' ) ) );
252 252
 					}
253 253
 				}
254 254
 			} else {
255
-				$error = self::strings('error-invalid');
255
+				$error = self::strings( 'error-invalid' );
256 256
 				gravityview()->log->error( 'Nonce validation failed; the note was not created' );
257 257
 			}
258 258
 		}
259 259
 
260 260
 
261
-		if( $this->doing_ajax ) {
262
-			if( $success ) {
261
+		if ( $this->doing_ajax ) {
262
+			if ( $success ) {
263 263
 				wp_send_json_success( array( 'html' => $success ) );
264 264
 			} else {
265 265
 				$error = $error ? $error : self::strings( 'error-invalid' );
@@ -285,11 +285,11 @@  discard block
 block discarded – undo
285 285
 			return;
286 286
 		}
287 287
 
288
-		if ( isset( $_POST['action'] ) && 'gv_delete_notes' === $_POST['action'] ) {
288
+		if ( isset( $_POST[ 'action' ] ) && 'gv_delete_notes' === $_POST[ 'action' ] ) {
289 289
 
290 290
 			$post = wp_unslash( $_POST );
291 291
 			if ( $this->doing_ajax ) {
292
-				parse_str( $post['data'], $data );
292
+				parse_str( $post[ 'data' ], $data );
293 293
 			} else {
294 294
 				$data = $post;
295 295
 			}
@@ -320,18 +320,18 @@  discard block
 block discarded – undo
320 320
 	 */
321 321
 	function process_delete_notes( $data ) {
322 322
 
323
-		$valid = wp_verify_nonce( $data['gv_delete_notes'], 'gv_delete_notes_' . $data['entry-slug'] );
323
+		$valid = wp_verify_nonce( $data[ 'gv_delete_notes' ], 'gv_delete_notes_' . $data[ 'entry-slug' ] );
324 324
 		$has_cap = GVCommon::has_cap( 'gravityview_delete_entry_notes' );
325 325
 		$success = false;
326 326
 
327 327
 		if ( $valid && $has_cap ) {
328
-			GravityView_Entry_Notes::delete_notes( $data['note'] );
328
+			GravityView_Entry_Notes::delete_notes( $data[ 'note' ] );
329 329
 			$success = true;
330 330
 		}
331 331
 
332
-		if( $this->doing_ajax ) {
332
+		if ( $this->doing_ajax ) {
333 333
 
334
-			if( $success ) {
334
+			if ( $success ) {
335 335
 				wp_send_json_success();
336 336
 			} else {
337 337
 				if ( ! $valid ) {
@@ -364,13 +364,13 @@  discard block
 block discarded – undo
364 364
 
365 365
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
366 366
 
367
-		unset( $field_options['show_as_link'] );
367
+		unset( $field_options[ 'show_as_link' ] );
368 368
 
369 369
 		$notes_options = array(
370 370
 			'notes' => array(
371 371
 				'type' => 'checkboxes',
372
-				'label' => __('Note Settings', 'gravityview'),
373
-				'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>' ),
372
+				'label' => __( 'Note Settings', 'gravityview' ),
373
+				'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>' ),
374 374
 				'options' => array(
375 375
 					'view' => array(
376 376
 						'label' => __( 'Display notes?', 'gravityview' ),
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
 			'processing' => __( 'Processing&hellip;', 'gravityview' ),
423 423
 			'other-email' => __( 'Other email address', 'gravityview' ),
424 424
 			'email-label' => __( 'Email address', 'gravityview' ),
425
-			'email-placeholder' => _x('[email protected]', 'Example email address used as a placeholder', 'gravityview'),
425
+			'email-placeholder' => _x( '[email protected]', 'Example email address used as a placeholder', 'gravityview' ),
426 426
 			'subject-label' => __( 'Subject', 'gravityview' ),
427 427
 			'subject' => __( 'Email subject', 'gravityview' ),
428 428
 			'default-email-subject' => __( 'New entry note', 'gravityview' ),
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
 		 */
443 443
 		$strings = gv_map_deep( apply_filters( 'gravityview/field/notes/strings', $strings ), 'esc_html' );
444 444
 
445
-		if( $key ) {
445
+		if ( $key ) {
446 446
 			return isset( $strings[ $key ] ) ? $strings[ $key ] : '';
447 447
 		}
448 448
 
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
 	 */
465 465
 	static public function display_note( $note, $show_delete = false, $context = null ) {
466 466
 
467
-		if( ! is_object( $note ) ) {
467
+		if ( ! is_object( $note ) ) {
468 468
 			return '';
469 469
 		}
470 470
 
@@ -519,7 +519,7 @@  discard block
 block discarded – undo
519 519
 		}
520 520
 
521 521
 		$replacements = array(
522
-			'{note_id}' => $note_content['note_id'],
522
+			'{note_id}' => $note_content[ 'note_id' ],
523 523
 			'{row_class}' => 'gv-note',
524 524
 			'{note_detail}' => $note_detail_html
525 525
 		);
@@ -551,13 +551,13 @@  discard block
 block discarded – undo
551 551
 
552 552
 		$user_data = get_userdata( $current_user->ID );
553 553
 
554
-		$note_content = trim( $data['gv-note-content'] );
554
+		$note_content = trim( $data[ 'gv-note-content' ] );
555 555
 
556
-		if( empty( $note_content ) ) {
556
+		if ( empty( $note_content ) ) {
557 557
 			return new WP_Error( 'gv-add-note-empty', __( 'The note is empty.', 'gravityview' ) );
558 558
 		}
559 559
 
560
-		$return = GravityView_Entry_Notes::add_note( $entry['id'], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
560
+		$return = GravityView_Entry_Notes::add_note( $entry[ 'id' ], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
561 561
 
562 562
 		return $return;
563 563
 	}
@@ -577,7 +577,7 @@  discard block
 block discarded – undo
577 577
 
578 578
 		$atts = shortcode_atts( array( 'entry' => null ), $atts );
579 579
 
580
-		if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
580
+		if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
581 581
 			gravityview()->log->error( 'User does not have permission to add entry notes ("gravityview_add_entry_notes").' );
582 582
 			return '';
583 583
 		}
@@ -599,8 +599,8 @@  discard block
 block discarded – undo
599 599
 
600 600
 			$visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' );
601 601
 
602
-			if ( $atts['entry'] ) {
603
-				$entry = GFAPI::get_entry( $atts['entry'] );
602
+			if ( $atts[ 'entry' ] ) {
603
+				$entry = GFAPI::get_entry( $atts[ 'entry' ] );
604 604
 			}
605 605
 
606 606
 			if ( ! isset( $entry ) || ! $entry ) {
@@ -618,14 +618,14 @@  discard block
 block discarded – undo
618 618
 
619 619
 		// Only generate the dropdown if the field settings allow it
620 620
 		$email_fields = '';
621
-		if( ! empty( $visibility_settings['email'] ) ) {
621
+		if ( ! empty( $visibility_settings[ 'email' ] ) ) {
622 622
 			$email_fields = self::get_note_email_fields( $entry_slug );
623 623
 		}
624 624
 
625 625
 		$add_note_html = str_replace( '{entry_slug}', $entry_slug, $add_note_html );
626 626
 		$add_note_html = str_replace( '{nonce_field}', $nonce_field, $add_note_html );
627
-		$add_note_html = str_replace( '{show_delete}', intval( empty( $visibility_settings['delete'] ) ? 0 : $visibility_settings['delete'] ), $add_note_html );
628
-		$add_note_html   = str_replace( '{email_fields}', $email_fields, $add_note_html );
627
+		$add_note_html = str_replace( '{show_delete}', intval( empty( $visibility_settings[ 'delete' ] ) ? 0 : $visibility_settings[ 'delete' ] ), $add_note_html );
628
+		$add_note_html = str_replace( '{email_fields}', $email_fields, $add_note_html );
629 629
 		$add_note_html = str_replace( '{url}', esc_url_raw( add_query_arg( array() ) ), $add_note_html );
630 630
 
631 631
 		return $add_note_html;
@@ -650,8 +650,8 @@  discard block
 block discarded – undo
650 650
 		$note_emails = array();
651 651
 
652 652
 		foreach ( $email_fields as $email_field ) {
653
-			if ( ! empty( $entry["{$email_field->id}"] ) && is_email( $entry["{$email_field->id}"] ) ) {
654
-				$note_emails[] = $entry["{$email_field->id}"];
653
+			if ( ! empty( $entry[ "{$email_field->id}" ] ) && is_email( $entry[ "{$email_field->id}" ] ) ) {
654
+				$note_emails[ ] = $entry[ "{$email_field->id}" ];
655 655
 			}
656 656
 		}
657 657
 
@@ -663,7 +663,7 @@  discard block
 block discarded – undo
663 663
 		 */
664 664
 		$note_emails = apply_filters( 'gravityview/field/notes/emails', $note_emails, $entry );
665 665
 
666
-		return (array) $note_emails;
666
+		return (array)$note_emails;
667 667
 	}
668 668
 
669 669
 	/**
@@ -679,7 +679,7 @@  discard block
 block discarded – undo
679 679
 	 */
680 680
 	private static function get_note_email_fields( $entry_slug = '' ) {
681 681
 
682
-		if( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
682
+		if ( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
683 683
 			gravityview()->log->error( 'User does not have permission to email entry notes ("gravityview_email_entry_notes").' );
684 684
 			return '';
685 685
 		}
@@ -701,27 +701,27 @@  discard block
 block discarded – undo
701 701
 
702 702
 		if ( ! empty( $note_emails ) || $include_custom ) { ?>
703 703
 			<div class="gv-note-email-container">
704
-				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings['also-email'];  ?></label>
704
+				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings[ 'also-email' ]; ?></label>
705 705
 				<select class="gv-note-email-to" name="gv-note-to" id="gv-note-email-to-<?php echo $entry_slug_esc; ?>">
706
-					<option value=""><?php echo $strings['also-email'];  ?></option>
706
+					<option value=""><?php echo $strings[ 'also-email' ]; ?></option>
707 707
 					<?php foreach ( $note_emails as  $email ) {
708 708
 						?>
709 709
 						<option value="<?php echo esc_attr( $email ); ?>"><?php echo esc_html( $email ); ?></option>
710 710
 					<?php }
711
-					if( $include_custom ) { ?>
712
-					<option value="custom"><?php echo self::strings('other-email'); ?></option>
711
+					if ( $include_custom ) { ?>
712
+					<option value="custom"><?php echo self::strings( 'other-email' ); ?></option>
713 713
 					<?php } ?>
714 714
 				</select>
715 715
 				<fieldset class="gv-note-to-container">
716
-					<?php if( $include_custom ) { ?>
716
+					<?php if ( $include_custom ) { ?>
717 717
 					<div class='gv-note-to-custom-container'>
718
-						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings['email-label']; ?></label>
719
-						<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="" />
718
+						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'email-label' ]; ?></label>
719
+						<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="" />
720 720
 					</div>
721 721
 					<?php } ?>
722 722
 		            <div class='gv-note-subject-container'>
723
-		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings['subject-label']; ?></label>
724
-		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings['subject']; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
723
+		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'subject-label' ]; ?></label>
724
+		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings[ 'subject' ]; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
725 725
 		            </div>
726 726
 				</fieldset>
727 727
 			</div>
@@ -744,7 +744,7 @@  discard block
 block discarded – undo
744 744
 	 */
745 745
 	private function maybe_send_entry_notes( $note = false, $entry = array(), $data = array() ) {
746 746
 
747
-		if( ! $note || ! GVCommon::has_cap('gravityview_email_entry_notes') ) {
747
+		if ( ! $note || ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
748 748
 			gravityview()->log->debug( 'User doesn\'t have "gravityview_email_entry_notes" cap, or $note is empty', array( 'data' => $note ) );
749 749
 			return;
750 750
 		}
@@ -752,7 +752,7 @@  discard block
 block discarded – undo
752 752
 		gravityview()->log->debug( '$data', array( 'data' => $data ) );
753 753
 
754 754
 		//emailing notes if configured
755
-		if ( ! empty( $data['gv-note-to'] ) ) {
755
+		if ( ! empty( $data[ 'gv-note-to' ] ) ) {
756 756
 
757 757
 			$default_data = array(
758 758
 				'gv-note-to' => '',
@@ -762,11 +762,11 @@  discard block
 block discarded – undo
762 762
                 'current-url' => '',
763 763
 			);
764 764
 
765
-			$current_user  = wp_get_current_user();
765
+			$current_user = wp_get_current_user();
766 766
 			$email_data = wp_parse_args( $data, $default_data );
767 767
 
768
-			$from    = $current_user->user_email;
769
-			$to = $email_data['gv-note-to'];
768
+			$from = $current_user->user_email;
769
+			$to = $email_data[ 'gv-note-to' ];
770 770
 
771 771
 			/**
772 772
 			 * Documented in get_note_email_fields
@@ -774,8 +774,8 @@  discard block
 block discarded – undo
774 774
 			 */
775 775
 			$include_custom = apply_filters( 'gravityview/field/notes/custom-email', true );
776 776
 
777
-			if( 'custom' === $to && $include_custom ) {
778
-				$to = $email_data['gv-note-to-custom'];
777
+			if ( 'custom' === $to && $include_custom ) {
778
+				$to = $email_data[ 'gv-note-to-custom' ];
779 779
 				gravityview()->log->debug( 'Sending note to a custom email address: {to}', array( 'to' => $to ) );
780 780
 			}
781 781
 
@@ -786,13 +786,13 @@  discard block
 block discarded – undo
786 786
 
787 787
 			$bcc = false;
788 788
 			$reply_to = $from;
789
-			$subject = trim( $email_data['gv-note-subject'] );
789
+			$subject = trim( $email_data[ 'gv-note-subject' ] );
790 790
 
791 791
 			// We use empty() here because GF uses empty to check against, too. `0` isn't a valid subject to GF
792 792
 			$subject = empty( $subject ) ? self::strings( 'default-email-subject' ) : $subject;
793
-			$message = $email_data['gv-note-content'];
793
+			$message = $email_data[ 'gv-note-content' ];
794 794
 			$email_footer = self::strings( 'email-footer' );
795
-			$from_name     = $current_user->display_name;
795
+			$from_name = $current_user->display_name;
796 796
 			$message_format = 'html';
797 797
 
798 798
 			/**
@@ -823,7 +823,7 @@  discard block
 block discarded – undo
823 823
 
824 824
 			GVCommon::send_email( $from, $to, $bcc, $reply_to, $subject, $message, $from_name, $message_format, '', $entry, false );
825 825
 
826
-			$form  = isset( $entry['form_id'] ) ? GFAPI::get_form( $entry['form_id'] ) : array();
826
+			$form = isset( $entry[ 'form_id' ] ) ? GFAPI::get_form( $entry[ 'form_id' ] ) : array();
827 827
 
828 828
 			/**
829 829
 			 * @see https://www.gravityhelp.com/documentation/article/10146-2/ It's here for compatibility with Gravity Forms
@@ -849,7 +849,7 @@  discard block
 block discarded – undo
849 849
 
850 850
 	    $output = '';
851 851
 
852
-		if( ! empty( $email_footer ) ) {
852
+		if ( ! empty( $email_footer ) ) {
853 853
 		    $url = \GV\Utils::get( $email_data, 'current-url' );
854 854
 			$url = html_entity_decode( $url );
855 855
 			$url = site_url( $url );
Please login to merge, or discard this patch.
includes/class-gravityview-compatibility.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -240,7 +240,7 @@
 block discarded – undo
240 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
-			    'cap' => 'update_core',
243
+				'cap' => 'update_core',
244 244
 				'dismiss' => 'wp_version',
245 245
 			);
246 246
 
Please login to merge, or discard this 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.