Completed
Push — develop ( 31c9ca...168da6 )
by Zack
38:08 queued 17:59
created
includes/admin/metaboxes/views/view-configuration.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -31,11 +31,11 @@  discard block
 block discarded – undo
31 31
 
32 32
 			<?php
33 33
 
34
-                do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
34
+				do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
35 35
 
36
-    			do_action('gravityview_render_field_pickers', 'directory' );
36
+				do_action('gravityview_render_field_pickers', 'directory' );
37 37
 
38
-            ?>
38
+			?>
39 39
 
40 40
 			<?php // list of available widgets to be shown in the popup ?>
41 41
             <div id="directory-available-widgets" class="hide-if-js gv-tooltip">
@@ -60,13 +60,13 @@  discard block
 block discarded – undo
60 60
 
61 61
 			<div id="single-active-fields" class="gv-grid">
62 62
 				<?php
63
-                if(!empty( $curr_template ) ) {
64
-				    do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
65
-                }
66
-			    ?>
63
+				if(!empty( $curr_template ) ) {
64
+					do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
65
+				}
66
+				?>
67 67
 			</div>
68 68
             <?php
69
-                do_action('gravityview_render_field_pickers', 'single' );
69
+				do_action('gravityview_render_field_pickers', 'single' );
70 70
 			?>
71 71
 		</div>
72 72
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 			</div>
86 86
 
87 87
 			<?php
88
-			    do_action('gravityview_render_field_pickers', 'edit' );
88
+				do_action('gravityview_render_field_pickers', 'edit' );
89 89
 			?>
90 90
 
91 91
 		</div>
Please login to merge, or discard this patch.
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -15,25 +15,25 @@  discard block
 block discarded – undo
15 15
 
16 16
 		<div id="directory-fields" class="gv-section">
17 17
 
18
-			<h4><?php esc_html_e( 'Top Widgets', 'gravityview'); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview'); ?></span></h4>
18
+			<h4><?php esc_html_e( 'Top Widgets', 'gravityview' ); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview' ); ?></span></h4>
19 19
 
20
-			<?php do_action('gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID ); ?>
20
+			<?php do_action( 'gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID ); ?>
21 21
 
22
-			<h4><?php esc_html_e( 'Entries Fields', 'gravityview'); ?> <span><?php esc_html_e( 'These fields will be shown for each entry.', 'gravityview'); ?></span></h4>
22
+			<h4><?php esc_html_e( 'Entries Fields', 'gravityview' ); ?> <span><?php esc_html_e( 'These fields will be shown for each entry.', 'gravityview' ); ?></span></h4>
23 23
 
24 24
 			<div id="directory-active-fields" class="gv-grid">
25
-				<?php if(!empty( $curr_template ) ) {
26
-					do_action('gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true );
25
+				<?php if ( ! empty( $curr_template ) ) {
26
+					do_action( 'gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true );
27 27
 				} ?>
28 28
 			</div>
29 29
 
30
-			<h4><?php esc_html_e( 'Bottom Widgets', 'gravityview'); ?> <i class="gf_tooltip gv_tooltip" title="<?php esc_attr_e( 'These widgets will be shown below entries.', 'gravityview'); ?>"></i></h4>
30
+			<h4><?php esc_html_e( 'Bottom Widgets', 'gravityview' ); ?> <i class="gf_tooltip gv_tooltip" title="<?php esc_attr_e( 'These widgets will be shown below entries.', 'gravityview' ); ?>"></i></h4>
31 31
 
32 32
 			<?php
33 33
 
34
-                do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
34
+                do_action( 'gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
35 35
 
36
-    			do_action('gravityview_render_field_pickers', 'directory' );
36
+    			do_action( 'gravityview_render_field_pickers', 'directory' );
37 37
 
38 38
             ?>
39 39
 
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
             <div id="directory-available-widgets" class="hide-if-js gv-tooltip">
42 42
 				<div aria-live="polite" role="listbox" class="gv-items-picker-container gv-widget-picker-container" data-layout="grid" data-cols="2">
43 43
                 	<button class="close" role="button" aria-label="<?php esc_html_e( 'Close', 'gravityview' ); ?>"><i class="dashicons dashicons-dismiss"></i></button>
44
-					<?php do_action('gravityview_render_available_widgets' ); ?>
44
+					<?php do_action( 'gravityview_render_available_widgets' ); ?>
45 45
 				</div>
46 46
             </div>
47 47
 
@@ -59,21 +59,21 @@  discard block
 block discarded – undo
59 59
 		<div id="single-fields" class="gv-section">
60 60
 
61 61
 			<div class="notice notice-warning inline is-dismissible">
62
-				<h3><?php printf( esc_html__( 'Note: %s', 'gravityview' ), sprintf( esc_html__( 'No fields link to the %s layout.', 'gravityview'), esc_html__( 'Single Entry', 'gravityview' ) ) ); ?></h3>
62
+				<h3><?php printf( esc_html__( 'Note: %s', 'gravityview' ), sprintf( esc_html__( 'No fields link to the %s layout.', 'gravityview' ), esc_html__( 'Single Entry', 'gravityview' ) ) ); ?></h3>
63 63
 				<p><a data-beacon-article-modal="54c67bbae4b0512429885516" href="https://docs.gravityview.co/article/70-linking-to-a-single-entry"><?php printf( esc_html__( 'Learn how to link to %s', 'gravityview' ), esc_html__( 'Single Entry', 'gravityview' ) ); ?></a></p>
64 64
 			</div>
65 65
 
66
-			<h4><?php esc_html_e( 'These fields will be shown in Single Entry layout.', 'gravityview'); ?></h4>
66
+			<h4><?php esc_html_e( 'These fields will be shown in Single Entry layout.', 'gravityview' ); ?></h4>
67 67
 
68 68
 			<div id="single-active-fields" class="gv-grid">
69 69
 				<?php
70
-                if(!empty( $curr_template ) ) {
71
-				    do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
70
+                if ( ! empty( $curr_template ) ) {
71
+				    do_action( 'gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
72 72
                 }
73 73
 			    ?>
74 74
 			</div>
75 75
             <?php
76
-                do_action('gravityview_render_field_pickers', 'single' );
76
+                do_action( 'gravityview_render_field_pickers', 'single' );
77 77
 			?>
78 78
 		</div>
79 79
 
@@ -84,20 +84,20 @@  discard block
 block discarded – undo
84 84
 		<div id="edit-fields" class="gv-section">
85 85
 
86 86
 			<div class="notice notice-warning inline is-dismissible">
87
-				<h3><?php printf( esc_html__( 'Note: %s', 'gravityview' ), sprintf( esc_html__( 'No fields link to the %s layout.', 'gravityview'), esc_html__( 'Edit Entry', 'gravityview' ) ) ); ?></h3>
87
+				<h3><?php printf( esc_html__( 'Note: %s', 'gravityview' ), sprintf( esc_html__( 'No fields link to the %s layout.', 'gravityview' ), esc_html__( 'Edit Entry', 'gravityview' ) ) ); ?></h3>
88 88
 				<p><a data-beacon-article-modal="54c67bb9e4b0512429885513" href="https://docs.gravityview.co/article/67-configuring-the-edit-entry-screen"><?php printf( esc_html__( 'Learn how to link to %s', 'gravityview' ), esc_html__( 'Edit Entry', 'gravityview' ) ); ?></a></p>
89 89
 			</div>
90 90
 
91
-			<h4><?php esc_html_e( 'Fields shown when editing an entry.', 'gravityview'); ?> <span><?php esc_html_e('If not configured, all form fields will be displayed.', 'gravityview'); ?></span></h4>
91
+			<h4><?php esc_html_e( 'Fields shown when editing an entry.', 'gravityview' ); ?> <span><?php esc_html_e( 'If not configured, all form fields will be displayed.', 'gravityview' ); ?></span></h4>
92 92
 
93 93
 			<div id="edit-active-fields" class="gv-grid">
94 94
 				<?php
95
-				do_action('gravityview_render_directory_active_areas', apply_filters( 'gravityview/template/edit', 'default_table_edit' ), 'edit', $post->ID, true );
95
+				do_action( 'gravityview_render_directory_active_areas', apply_filters( 'gravityview/template/edit', 'default_table_edit' ), 'edit', $post->ID, true );
96 96
 				?>
97 97
 			</div>
98 98
 
99 99
 			<?php
100
-			    do_action('gravityview_render_field_pickers', 'edit' );
100
+			    do_action( 'gravityview_render_field_pickers', 'edit' );
101 101
 			?>
102 102
 
103 103
 		</div>
Please login to merge, or discard this patch.
includes/class-gravityview-powered-by.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@
 block discarded – undo
69 69
 
70 70
 		$url = add_query_arg( array(
71 71
 			'utm_source' => 'powered_by',
72
-            'utm_term' => get_bloginfo('name' ),
72
+			'utm_term' => get_bloginfo('name' ),
73 73
 		), $url );
74 74
 
75 75
 		/**
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 
33 33
 		$powered_by = gravityview()->plugin->settings->get( 'powered_by', '0' );
34 34
 
35
-		if( empty( $powered_by ) ) {
35
+		if ( empty( $powered_by ) ) {
36 36
 			return;
37 37
 		}
38 38
 
@@ -59,17 +59,17 @@  discard block
 block discarded – undo
59 59
 	 */
60 60
 	protected function get_url() {
61 61
 
62
-		$url = sprintf( self::url, get_bloginfo('name' ) );
62
+		$url = sprintf( self::url, get_bloginfo( 'name' ) );
63 63
 
64 64
 		$affiliate_id = gravityview()->plugin->settings->get( 'affiliate_id', '' );
65 65
 
66
-		if( $affiliate_id && is_numeric( $affiliate_id ) ) {
66
+		if ( $affiliate_id && is_numeric( $affiliate_id ) ) {
67 67
 			$url = add_query_arg( array( 'ref' => $affiliate_id ), $url );
68 68
 		}
69 69
 
70 70
 		$url = add_query_arg( array(
71 71
 			'utm_source' => 'powered_by',
72
-            'utm_term' => get_bloginfo('name' ),
72
+            'utm_term' => get_bloginfo( 'name' ),
73 73
 		), $url );
74 74
 
75 75
 		/**
Please login to merge, or discard this patch.
future/includes/class-gv-oembed.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 		wp_embed_register_handler( 'gravityview_entry', self::get_entry_regex(), array( __CLASS__, 'render' ), 20000 );
27 27
 		wp_oembed_add_provider( self::get_entry_regex(), self::$provider_url, true );
28 28
 
29
-		if ( ! empty( $_GET['gv_oembed_provider'] ) && ! empty( $_GET['url'] ) ) {
29
+		if ( ! empty( $_GET[ 'gv_oembed_provider' ] ) && ! empty( $_GET[ 'url' ] ) ) {
30 30
 			add_action( 'template_redirect', array( __CLASS__, 'render_provider_request' ) );
31 31
 		}
32 32
 
@@ -43,8 +43,8 @@  discard block
 block discarded – undo
43 43
 	 * @return void
44 44
 	 */
45 45
 	public static function render_provider_request() {
46
-		if ( ! empty( $_GET['url'] ) ) {
47
-			$url = $_GET['url'];
46
+		if ( ! empty( $_GET[ 'url' ] ) ) {
47
+			$url = $_GET[ 'url' ];
48 48
 		} else {
49 49
 			header( 'HTTP/1.0 404 Not Found' );
50 50
 			exit;
@@ -111,18 +111,18 @@  discard block
 block discarded – undo
111 111
 	 */
112 112
 	private static function parse_matches( $matches, $url ) {
113 113
 		// If not using permalinks, re-assign values for matching groups
114
-		if ( ! empty( $matches['entry_slug2'] ) ) {
115
-			$matches['is_cpt'] = $matches['is_cpt2'];
116
-			$matches['slug'] = $matches['slug2'];
117
-			$matches['entry_slug'] = $matches['entry_slug2'];
118
-			unset( $matches['is_cpt2'], $matches['slug2'], $matches['entry_slug2'] );
114
+		if ( ! empty( $matches[ 'entry_slug2' ] ) ) {
115
+			$matches[ 'is_cpt' ] = $matches[ 'is_cpt2' ];
116
+			$matches[ 'slug' ] = $matches[ 'slug2' ];
117
+			$matches[ 'entry_slug' ] = $matches[ 'entry_slug2' ];
118
+			unset( $matches[ 'is_cpt2' ], $matches[ 'slug2' ], $matches[ 'entry_slug2' ] );
119 119
 		}
120 120
 
121
-		if ( empty( $matches['entry_slug'] ) ) {
121
+		if ( empty( $matches[ 'entry_slug' ] ) ) {
122 122
 			gravityview()->log->error( 'Entry slug not parsed by regex.', array( 'data' => $matches ) );
123 123
 			return null;
124 124
 		} else {
125
-			$entry_id = $matches['entry_slug'];
125
+			$entry_id = $matches[ 'entry_slug' ];
126 126
 		}
127 127
 
128 128
 		if ( ! $entry = \GV\GF_Entry::by_id( $entry_id ) ) {
@@ -140,12 +140,12 @@  discard block
 block discarded – undo
140 140
 		if ( ! $view ) {
141 141
 
142 142
 			// If the slug doesn't work, maybe using Plain permalinks and not the slug, only ID
143
-			if( is_numeric( $matches['slug'] ) ) {
144
-				$view = \GV\View::by_id( $matches['slug'] );
143
+			if ( is_numeric( $matches[ 'slug' ] ) ) {
144
+				$view = \GV\View::by_id( $matches[ 'slug' ] );
145 145
 			}
146 146
 
147
-			if( ! $view ) {
148
-				$view = \GV\View::from_post( get_page_by_path( $matches['slug'], OBJECT, 'gravityview' ) );
147
+			if ( ! $view ) {
148
+				$view = \GV\View::from_post( get_page_by_path( $matches[ 'slug' ], OBJECT, 'gravityview' ) );
149 149
 			}
150 150
 		}
151 151
 
@@ -176,9 +176,9 @@  discard block
 block discarded – undo
176 176
 
177 177
 		return '
178 178
 		<div class="loading-placeholder" style="background-color:#e6f0f5;">
179
-			<h3 style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">'.$image.$embed_heading.'</h3>
179
+			<h3 style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">'.$image . $embed_heading . '</h3>
180 180
 			<p style="margin:0; padding:0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">
181
-				'.$embed_text.'
181
+				'.$embed_text . '
182 182
 			</p>
183 183
 			<br style="clear: both;">
184 184
 		</div>';
@@ -192,8 +192,8 @@  discard block
 block discarded – undo
192 192
 	private static function render_preview_notice() {
193 193
 		$floaty = \GravityView_Admin::get_floaty();
194 194
 		$title = esc_html__( 'This will look better when it is embedded.', 'gravityview' );
195
-		$message = esc_html__( 'Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview');
196
-		return '<div class="updated notice">'.$floaty.'<h3>'.$title.'</h3><p>'.$message.'</p><br style="clear:both;" /></div>';
195
+		$message = esc_html__( 'Styles don\'t get loaded when being previewed, so the content below will look strange. Don\'t be concerned!', 'gravityview' );
196
+		return '<div class="updated notice">' . $floaty . '<h3>' . $title . '</h3><p>' . $message . '</p><br style="clear:both;" /></div>';
197 197
 	}
198 198
 
199 199
 	/**
@@ -212,13 +212,13 @@  discard block
 block discarded – undo
212 212
 			return __( 'You are not allowed to view this content.', 'gravityview' );
213 213
 		}
214 214
 
215
-		if ( $entry && 'active' !== $entry['status'] ) {
215
+		if ( $entry && 'active' !== $entry[ 'status' ] ) {
216 216
 			gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
217 217
 			return __( 'You are not allowed to view this content.', 'gravityview' );
218 218
 		}
219 219
 
220 220
 		if ( $view->settings->get( 'show_only_approved' ) ) {
221
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
221
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
222 222
 				gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
223 223
 				return __( 'You are not allowed to view this content.', 'gravityview' );
224 224
 			}
@@ -249,9 +249,9 @@  discard block
 block discarded – undo
249 249
 			 * Mocks old context, etc.
250 250
 			 */
251 251
 			$loader = \GravityView_Edit_Entry::getInstance();
252
-			$render = $loader->instances['render'];
252
+			$render = $loader->instances[ 'render' ];
253 253
 
254
-			$form = \GFAPI::get_form( $entry['form_id'] );
254
+			$form = \GFAPI::get_form( $entry[ 'form_id' ] );
255 255
 
256 256
 			// @todo We really need to rewrite Edit Entry soon
257 257
 			\GravityView_View::$instance = null;
@@ -260,13 +260,13 @@  discard block
 block discarded – undo
260 260
 			$data = \GravityView_View_Data::getInstance( get_post( $view->ID ) );
261 261
 			$template = \GravityView_View::getInstance( array(
262 262
 				'form' => $form,
263
-				'form_id' => $form['id'],
263
+				'form_id' => $form[ 'id' ],
264 264
 				'view_id' => $view->ID,
265 265
 				'entries' => array( $entry->as_entry() ),
266 266
 				'atts' => \GVCommon::get_template_settings( $view->ID ),
267 267
 			) );
268 268
 
269
-			ob_start() && $render->init( $data, \GV\Entry::by_id( $entry['id'] ), $view );
269
+			ob_start() && $render->init( $data, \GV\Entry::by_id( $entry[ 'id' ] ), $view );
270 270
 			$output = ob_get_clean(); // Render :)
271 271
 		} else {
272 272
 			/** Remove the back link. */
@@ -310,7 +310,7 @@  discard block
 block discarded – undo
310 310
 		// Catch either
311 311
 		$match_regex = "(?:{$using_permalinks}|{$not_using_permalinks})";
312 312
 
313
-		return '#'.$match_regex.'#i';
313
+		return '#' . $match_regex . '#i';
314 314
 	}
315 315
 
316 316
 	/**
Please login to merge, or discard this patch.
includes/extensions/entry-notes/class-gravityview-field-notes.php 3 patches
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -357,7 +357,7 @@  discard block
 block discarded – undo
357 357
 	 *
358 358
 	 * @param array $file_paths List of template paths ordered
359 359
 	 *
360
-	 * @return array File paths with `./` and `./partials/` paths added
360
+	 * @return string[] File paths with `./` and `./partials/` paths added
361 361
 	 */
362 362
 	public function add_template_path( $file_paths ) {
363 363
 
@@ -549,7 +549,7 @@  discard block
 block discarded – undo
549 549
 	 * @param array $entry
550 550
 	 * @param array $data Note details array
551 551
 	 *
552
-	 * @return int|WP_Error
552
+	 * @return integer
553 553
 	 */
554 554
 	private function add_note( $entry, $data ) {
555 555
 		global $current_user, $wpdb;
Please login to merge, or discard this patch.
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
@@ -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/extensions/edit-entry/class-edit-entry-locking.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -67,20 +67,20 @@  discard block
 block discarded – undo
67 67
 		$result = array();
68 68
 		if ( ! $lock_holder_user_id ) {
69 69
 			$this->set_lock( $object_id );
70
-			$result['html']   = __( 'You now have control', 'gravityview' );
71
-			$result['status'] = 'lock_obtained';
70
+			$result[ 'html' ]   = __( 'You now have control', 'gravityview' );
71
+			$result[ 'status' ] = 'lock_obtained';
72 72
 		} else {
73 73
 
74
-			if( GVCommon::has_cap( 'gravityforms_edit_entries' ) ) {
74
+			if ( GVCommon::has_cap( 'gravityforms_edit_entries' ) ) {
75 75
 				$user = get_userdata( $lock_holder_user_id );
76
-				$result['html']   = sprintf( __( 'Your request has been sent to %s.', 'gravityview' ), $user->display_name );
76
+				$result[ 'html' ]   = sprintf( __( 'Your request has been sent to %s.', 'gravityview' ), $user->display_name );
77 77
 			} else {
78
-				$result['html']   = __( 'Your request has been sent.', 'gravityview' );
78
+				$result[ 'html' ]   = __( 'Your request has been sent.', 'gravityview' );
79 79
 			}
80 80
 
81 81
 			$this->update_lock_request_meta( $object_id, $user_id );
82 82
 
83
-			$result['status'] = 'lock_requested';
83
+			$result[ 'status' ] = 'lock_requested';
84 84
 		}
85 85
 
86 86
 		return $result;
@@ -122,19 +122,19 @@  discard block
 block discarded – undo
122 122
 		$continue_enqueuing = false;
123 123
 
124 124
 		// If any Views being loaded have entry locking, enqueue the scripts
125
-		foreach( $views->all() as $view ) {
125
+		foreach ( $views->all() as $view ) {
126 126
 
127 127
 			// Make sure the View has edit locking enabled
128
-			if( ! $view->settings->get( 'edit_locking' ) ) {
128
+			if ( ! $view->settings->get( 'edit_locking' ) ) {
129 129
 				continue;
130 130
 			}
131 131
 
132 132
 			// Make sure that the entry belongs to one of the forms connected to one of the Views in this request
133 133
 			$joined_forms = $view::get_joined_forms( $view->ID );
134 134
 
135
-			$entry_form_id = $entry_array['form_id'];
135
+			$entry_form_id = $entry_array[ 'form_id' ];
136 136
 
137
-			if( ! isset( $joined_forms[ $entry_form_id ] ) ) {
137
+			if ( ! isset( $joined_forms[ $entry_form_id ] ) ) {
138 138
 				continue;
139 139
 			}
140 140
 
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 			break;
144 144
 		}
145 145
 
146
-		if( ! $continue_enqueuing ) {
146
+		if ( ! $continue_enqueuing ) {
147 147
 			return;
148 148
 		}
149 149
 
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 	 */
164 164
 	protected function enqueue_scripts( $entry ) {
165 165
 
166
-		$min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG || isset( $_GET['gform_debug'] ) ? '' : '.min';
166
+		$min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG || isset( $_GET[ 'gform_debug' ] ) ? '' : '.min';
167 167
 		$locking_path = GFCommon::get_base_url() . '/includes/locking/';
168 168
 
169 169
 		wp_enqueue_script( 'gforms_locking', $locking_path . "js/locking{$min}.js", array( 'jquery', 'heartbeat' ), GFCommon::$version );
@@ -172,20 +172,20 @@  discard block
 block discarded – undo
172 172
 		$translations = array_map( 'wp_strip_all_tags', $this->get_strings() );
173 173
 
174 174
 		$strings = array(
175
-			'noResponse'    => $translations['no_response'],
176
-			'requestAgain'  => $translations['request_again'],
177
-			'requestError'  => $translations['request_error'],
178
-			'gainedControl' => $translations['gained_control'],
179
-			'rejected'      => $translations['request_rejected'],
180
-			'pending'       => $translations['request_pending'],
175
+			'noResponse'    => $translations[ 'no_response' ],
176
+			'requestAgain'  => $translations[ 'request_again' ],
177
+			'requestError'  => $translations[ 'request_error' ],
178
+			'gainedControl' => $translations[ 'gained_control' ],
179
+			'rejected'      => $translations[ 'request_rejected' ],
180
+			'pending'       => $translations[ 'request_pending' ],
181 181
 		);
182 182
 
183
-		$lock_user_id = $this->check_lock( $entry['id'] );
183
+		$lock_user_id = $this->check_lock( $entry[ 'id' ] );
184 184
 
185 185
 		$vars = array(
186 186
 			'hasLock'    => ! $lock_user_id ? 1 : 0,
187 187
 			'lockUI'     => $this->get_lock_ui( $lock_user_id ),
188
-			'objectID'   => $entry['id'],
188
+			'objectID'   => $entry[ 'id' ],
189 189
 			'objectType' => 'entry',
190 190
 			'strings'    => $strings,
191 191
 		);
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 		$hidden = $locked ? '' : ' hidden';
216 216
 		if ( $locked ) {
217 217
 
218
-			if( GVCommon::has_cap( 'gravityforms_edit_entries' ) ) {
218
+			if ( GVCommon::has_cap( 'gravityforms_edit_entries' ) ) {
219 219
 				$avatar = get_avatar( $user->ID, 64 );
220 220
 				$person_editing_text = $user->display_name;
221 221
 			} else {
@@ -322,11 +322,11 @@  discard block
 block discarded – undo
322 322
 
323 323
 		$current_url = add_query_arg( $wp->query_string, '', home_url( $wp->request ) );
324 324
 
325
-		if ( isset( $_GET['get-edit-lock'] ) ) {
325
+		if ( isset( $_GET[ 'get-edit-lock' ] ) ) {
326 326
 			$this->set_lock( $entry_id );
327 327
 			echo '<script>window.location = ' . json_encode( remove_query_arg( 'get-edit-lock', $current_url ) ) . ';</script>';
328 328
 			exit();
329
-		} else if ( isset( $_GET['release-edit-lock'] ) ) {
329
+		} else if ( isset( $_GET[ 'release-edit-lock' ] ) ) {
330 330
 			$this->delete_lock_meta( $entry_id );
331 331
 			$current_url = remove_query_arg( 'edit', $current_url );
332 332
 			echo '<script>window.location = ' . json_encode( remove_query_arg( 'release-edit-lock', $current_url ) ) . ';</script>';
Please login to merge, or discard this patch.
includes/class-gravityview-admin-bar.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 		/** @var WP_Admin_Bar $wp_admin_bar */
39 39
 		global $wp_admin_bar;
40 40
 
41
-		if( is_admin() || ! GVCommon::has_cap( array( 'edit_gravityviews', 'gravityview_edit_entry', 'gravityforms_edit_forms' ) ) ) {
41
+		if ( is_admin() || ! GVCommon::has_cap( array( 'edit_gravityviews', 'gravityview_edit_entry', 'gravityforms_edit_forms' ) ) ) {
42 42
 			return;
43 43
 		}
44 44
 
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 				'meta' => array(
104 104
 					'title' => sprintf( __( 'Edit Entry %s', 'gravityview' ), $entry->get_slug() ),
105 105
 				),
106
-				'href' => esc_url_raw( admin_url( sprintf( 'admin.php?page=gf_entries&amp;screen_mode=edit&amp;view=entry&amp;id=%d&lid=%d', $entry['form_id'], $entry['id'] ) ) ),
106
+				'href' => esc_url_raw( admin_url( sprintf( 'admin.php?page=gf_entries&amp;screen_mode=edit&amp;view=entry&amp;id=%d&lid=%d', $entry[ 'form_id' ], $entry[ 'id' ] ) ) ),
107 107
 			) );
108 108
 
109 109
 		}
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 		/** @var WP_Admin_Bar $wp_admin_bar */
120 120
 		global $wp_admin_bar;
121 121
 
122
-		if( GVCommon::has_cap( array( 'edit_gravityviews', 'edit_gravityview', 'gravityforms_edit_forms' ) ) ) {
122
+		if ( GVCommon::has_cap( array( 'edit_gravityviews', 'edit_gravityview', 'gravityforms_edit_forms' ) ) ) {
123 123
 
124 124
 			$view_data = GravityView_View_Data::getInstance();
125 125
 			$views = $view_data->get_views();
@@ -131,21 +131,21 @@  discard block
 block discarded – undo
131 131
 				$added_views = array();
132 132
 
133 133
 				foreach ( $views as $view ) {
134
-					$view = \GV\View::by_id( $view['id'] );
134
+					$view = \GV\View::by_id( $view[ 'id' ] );
135 135
 					$view_id = $view->ID;
136 136
 					$form_id = $view->form ? $view->form->ID : null;
137 137
 
138 138
 					$edit_view_title = __( 'Edit View', 'gravityview' );
139 139
 					$edit_form_title = __( 'Edit Form', 'gravityview' );
140 140
 
141
-					if( sizeof( $views ) > 1 ) {
141
+					if ( sizeof( $views ) > 1 ) {
142 142
 						$edit_view_title = sprintf( _x( 'Edit View #%d', 'Edit View with the ID of %d', 'gravityview' ), $view_id );
143 143
 						$edit_form_title = sprintf( __( 'Edit Form #%d', 'Edit Form with the ID of %d', 'gravityview' ), $form_id );
144 144
 					}
145 145
 
146
-					if( GVCommon::has_cap( 'edit_gravityview', $view_id ) && ! in_array( $view_id, $added_views ) ) {
146
+					if ( GVCommon::has_cap( 'edit_gravityview', $view_id ) && ! in_array( $view_id, $added_views ) ) {
147 147
 
148
-						$added_views[] = $view_id;
148
+						$added_views[ ] = $view_id;
149 149
 
150 150
 						$wp_admin_bar->add_menu( array(
151 151
 							'id'    => 'edit-view-' . $view_id,
@@ -155,9 +155,9 @@  discard block
 block discarded – undo
155 155
 						) );
156 156
 					}
157 157
 
158
-					if ( ! empty( $form_id ) && GVCommon::has_cap( array( 'gravityforms_edit_forms' ), $form_id ) && ! in_array( $form_id, $added_forms )  ) {
158
+					if ( ! empty( $form_id ) && GVCommon::has_cap( array( 'gravityforms_edit_forms' ), $form_id ) && ! in_array( $form_id, $added_forms ) ) {
159 159
 
160
-						$added_forms[] = $form_id;
160
+						$added_forms[ ] = $form_id;
161 161
 
162 162
 						$wp_admin_bar->add_menu( array(
163 163
 							'id'    => 'edit-form-' . $form_id,
Please login to merge, or discard this patch.
future/includes/class-gv-entry.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 
114 114
 		$args = array();
115 115
 
116
-		$view_id = is_null ( $view ) ? null : $view->ID;
116
+		$view_id = is_null( $view ) ? null : $view->ID;
117 117
 
118 118
 		$permalink = null;
119 119
 
@@ -126,8 +126,8 @@  discard block
 block discarded – undo
126 126
 
127 127
 				$view_collection = View_Collection::from_post( $post );
128 128
 
129
-				if( 1 < $view_collection->count() ) {
130
-					$args['gvid'] = $view_id;
129
+				if ( 1 < $view_collection->count() ) {
130
+					$args[ 'gvid' ] = $view_id;
131 131
 				}
132 132
 			}
133 133
 		}
@@ -157,21 +157,21 @@  discard block
 block discarded – undo
157 157
 			 */
158 158
 			$link_parts = explode( '?', $permalink );
159 159
 
160
-			$query = ! empty( $link_parts[1] ) ? '?' . $link_parts[1] : '';
160
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
161 161
 
162
-			$permalink = trailingslashit( $link_parts[0] ) . $entry_endpoint_name . '/'. $entry_slug .'/' . $query;
162
+			$permalink = trailingslashit( $link_parts[ 0 ] ) . $entry_endpoint_name . '/' . $entry_slug . '/' . $query;
163 163
 		} else {
164 164
 			$args[ $entry_endpoint_name ] = $entry_slug;
165 165
 		}
166 166
 
167 167
 		if ( $track_directory ) {
168
-			if ( ! empty( $_GET['pagenum'] ) ) {
169
-				$args['pagenum'] = intval( $_GET['pagenum'] );
168
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
169
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
170 170
 			}
171 171
 
172 172
 			if ( $sort = Utils::_GET( 'sort' ) ) {
173
-				$args['sort'] = $sort;
174
-				$args['dir'] = Utils::_GET( 'dir' );
173
+				$args[ 'sort' ] = $sort;
174
+				$args[ 'dir' ] = Utils::_GET( 'dir' );
175 175
 			}
176 176
 		}
177 177
 
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 
210 210
 		$entry_slug = \GravityView_API::get_entry_slug( $this->ID, $this->as_entry() );
211 211
 
212
-		if( ! $apply_filter ) {
212
+		if ( ! $apply_filter ) {
213 213
 			return $entry_slug;
214 214
 		}
215 215
 
Please login to merge, or discard this patch.
future/includes/class-gv-entry-gravityforms.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -106,14 +106,14 @@  discard block
 block discarded – undo
106 106
 	 * @return \GV\GF_Entry|null An instance of this entry or null if not found.
107 107
 	 */
108 108
 	public static function from_entry( $entry ) {
109
-		if ( empty( $entry['id'] ) ) {
109
+		if ( empty( $entry[ 'id' ] ) ) {
110 110
 			return null;
111 111
 		}
112 112
 
113 113
 		$self = new self();
114 114
 		$self->entry = $entry;
115 115
 
116
-		$self->ID = $self->entry['id'];
116
+		$self->ID = $self->entry[ 'id' ];
117 117
 		$self->slug = $self->get_slug();
118 118
 
119 119
 		return $self;
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 	 * @return bool Whether the offset exists or not.
129 129
 	 */
130 130
 	public function offsetExists( $offset ) {
131
-		return isset( $this->entry[$offset] );
131
+		return isset( $this->entry[ $offset ] );
132 132
 	}
133 133
 
134 134
 	/**
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
 	 * @return mixed The value of the requested entry data.
144 144
 	 */
145 145
 	public function offsetGet( $offset ) {
146
-		return $this->entry[$offset];
146
+		return $this->entry[ $offset ];
147 147
 	}
148 148
 
149 149
 	/**
Please login to merge, or discard this patch.
includes/admin/metaboxes/views/data-source.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -10,13 +10,13 @@  discard block
 block discarded – undo
10 10
 wp_nonce_field( 'gravityview_select_form', 'gravityview_select_form_nonce' );
11 11
 
12 12
 //current value
13
-$current_form = (int) \GV\Utils::_GET( 'form_id', gravityview_get_form_id( $post->ID ) );
13
+$current_form = (int)\GV\Utils::_GET( 'form_id', gravityview_get_form_id( $post->ID ) );
14 14
 
15 15
 // If form is in trash or not existing, show error
16 16
 GravityView_Admin::connected_form_warning( $current_form );
17 17
 
18 18
 // check for available gravity forms
19
-$forms = gravityview_get_forms('any', false, 'title' );
19
+$forms = gravityview_get_forms( 'any', false, 'title' );
20 20
 
21 21
 /**
22 22
  * @param int $current_form Form currently selected in the View (0 if none selected)
@@ -35,24 +35,24 @@  discard block
 block discarded – undo
35 35
 		?>
36 36
 		<a class="button button-primary" href="#gv_start_fresh" title="<?php esc_attr_e( 'Use a Form Preset', 'gravityview' ); ?>"><?php esc_html_e( 'Use a Form Preset', 'gravityview' ); ?></a>
37 37
 
38
-		<?php if( !empty( $forms ) ) { ?>
38
+		<?php if ( ! empty( $forms ) ) { ?>
39 39
 			<span>&nbsp;<?php esc_html_e( 'or use an existing form', 'gravityview' ); ?>&nbsp;</span>
40 40
 		<?php }
41 41
 	}
42 42
 
43 43
 	// If there are no forms to select, show no forms.
44
-	if( !empty( $forms ) ) { ?>
44
+	if ( ! empty( $forms ) ) { ?>
45 45
 		<select name="gravityview_form_id" id="gravityview_form_id">
46 46
 			<option value="" <?php selected( '', $current_form, true ); ?>>&mdash; <?php esc_html_e( 'list of forms', 'gravityview' ); ?> &mdash;</option>
47
-			<?php foreach( $forms as $form ) { ?>
48
-				<option value="<?php echo $form['id']; ?>" <?php selected( $form['id'], $current_form, true ); ?>><?php echo esc_html( $form['title'] ); ?></option>
47
+			<?php foreach ( $forms as $form ) { ?>
48
+				<option value="<?php echo $form[ 'id' ]; ?>" <?php selected( $form[ 'id' ], $current_form, true ); ?>><?php echo esc_html( $form[ 'title' ] ); ?></option>
49 49
 			<?php } ?>
50 50
 		</select>
51 51
 	<?php } else { ?>
52 52
 		<select name="gravityview_form_id" id="gravityview_form_id" class="hidden"><option selected="selected" value=""></option></select>
53 53
 	<?php } ?>
54 54
 
55
-	&nbsp;<button class="button button-primary" <?php if( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></button>
55
+	&nbsp;<button class="button button-primary" <?php if ( empty( $current_form ) ) { echo 'style="display:none;"'; } ?> id="gv_switch_view_button" title="<?php esc_attr_e( 'Switch View', 'gravityview' ); ?>"><?php esc_html_e( 'Switch View Type', 'gravityview' ); ?></button>
56 56
 </p>
57 57
 
58 58
 <?php // confirm dialog box ?>
Please login to merge, or discard this patch.