Completed
Push — develop ( cd2a17...34177c )
by Zack
54:29 queued 34:32
created
includes/admin/metaboxes/views/view-configuration.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -26,11 +26,11 @@  discard block
 block discarded – undo
26 26
 
27 27
 			<?php
28 28
 
29
-                do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
29
+				do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
30 30
 
31
-    			do_action('gravityview_render_field_pickers', 'directory' );
31
+				do_action('gravityview_render_field_pickers', 'directory' );
32 32
 
33
-            ?>
33
+			?>
34 34
 
35 35
 			<?php // list of available widgets to be shown in the popup ?>
36 36
             <div id="directory-available-widgets" class="hide-if-js gv-tooltip">
@@ -55,13 +55,13 @@  discard block
 block discarded – undo
55 55
 
56 56
 			<div id="single-active-fields" class="gv-grid gv-grid-pad gv-grid-border">
57 57
 				<?php
58
-                if(!empty( $curr_template ) ) {
59
-				    do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
60
-                }
61
-			    ?>
58
+				if(!empty( $curr_template ) ) {
59
+					do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
60
+				}
61
+				?>
62 62
 			</div>
63 63
             <?php
64
-                do_action('gravityview_render_field_pickers', 'single' );
64
+				do_action('gravityview_render_field_pickers', 'single' );
65 65
 			?>
66 66
 		</div>
67 67
 
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 			</div>
81 81
 
82 82
 			<?php
83
-			    do_action('gravityview_render_field_pickers', 'edit' );
83
+				do_action('gravityview_render_field_pickers', 'edit' );
84 84
 			?>
85 85
 
86 86
 		</div>
Please login to merge, or discard this patch.
includes/extensions/edit-entry/partials/form-buttons.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -7,15 +7,15 @@  discard block
 block discarded – undo
7 7
 <div id="publishing-action">
8 8
 	<?php
9 9
 
10
-    /**
11
-     * @filter `gravityview/edit_entry/cancel_link` Modify the cancel button link URL
12
-     * @since 1.11.1
13
-     * @param string $back_link Existing URL of the Cancel link
14
-     * @param array $form The Gravity Forms form
15
-     * @param array $entry The Gravity Forms entry
16
-     * @param int $view_id The current View ID
17
-     */
18
-    $back_link = apply_filters( 'gravityview/edit_entry/cancel_link', remove_query_arg( array( 'page', 'view', 'edit' ) ), $object->form, $object->entry, $object->view_id );
10
+	/**
11
+	 * @filter `gravityview/edit_entry/cancel_link` Modify the cancel button link URL
12
+	 * @since 1.11.1
13
+	 * @param string $back_link Existing URL of the Cancel link
14
+	 * @param array $form The Gravity Forms form
15
+	 * @param array $entry The Gravity Forms entry
16
+	 * @param int $view_id The current View ID
17
+	 */
18
+	$back_link = apply_filters( 'gravityview/edit_entry/cancel_link', remove_query_arg( array( 'page', 'view', 'edit' ) ), $object->form, $object->entry, $object->view_id );
19 19
 
20 20
 	/**
21 21
 	 * @action `gravityview/edit-entry/publishing-action/before` Triggered before the submit buttons in the Edit Entry screen, inside the `<div id="publishing-action">` container.
@@ -53,11 +53,11 @@  discard block
 block discarded – undo
53 53
 	/**
54 54
 	 * @action `gravityview/edit-entry/publishing-action/after` Triggered after the submit buttons in the Edit Entry screen, inside the `<div id="publishing-action">` container.
55 55
 	 * @since 1.5.1
56
-     * @since 2.0.13 Added $post_id
56
+	 * @since 2.0.13 Added $post_id
57 57
 	 * @param array $form The Gravity Forms form
58 58
 	 * @param array $entry The Gravity Forms entry
59 59
 	 * @param int $view_id The current View ID
60
-     * @param int $post_id The current Post ID
60
+	 * @param int $post_id The current Post ID
61 61
 	 */
62 62
 	do_action( 'gravityview/edit-entry/publishing-action/after', $object->form, $object->entry, $object->view_id, $object->post_id );
63 63
 
Please login to merge, or discard this patch.
includes/class-admin.php 1 patch
Indentation   +2 added lines, -3 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	 * @return void
93 93
 	 */
94 94
 	public static function connected_form_warning( $form_id = 0 ) {
95
-        global $pagenow;
95
+		global $pagenow;
96 96
 
97 97
 		if ( empty( $form_id ) || $pagenow === 'post-new.php' ) {
98 98
 			return;
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
 			7  => sprintf(__( 'View saved. %sView on website.%s', 'gravityview' ), '<a href="'.get_permalink( $post_id ).'">', '</a>') . $new_form_text,
239 239
 			8  => __( 'View submitted.', 'gravityview' ),
240 240
 			9  => sprintf(
241
-		        /* translators: Date and time the View is scheduled to be published */
241
+				/* translators: Date and time the View is scheduled to be published */
242 242
 				__( 'View scheduled for: %1$s.', 'gravityview' ),
243 243
 				// translators: Publish box date format, see http://php.net/date
244 244
 				date_i18n( __( 'M j, Y @ G:i', 'gravityview' ), strtotime( ( isset( $post->post_date ) ? $post->post_date : NULL )  ) )
@@ -295,7 +295,6 @@  discard block
 block discarded – undo
295 295
 	 *
296 296
 	 * @deprecated since 1.12
297 297
 	 * @see GravityView_Compatibility::get_plugin_status()
298
-
299 298
 	 * @return boolean|string True: plugin is active; False: plugin file doesn't exist at path; 'inactive' it's inactive
300 299
 	 */
301 300
 	static function get_plugin_status( $location = '' ) {
Please login to merge, or discard this patch.
includes/class-admin-installer.php 1 patch
Indentation   +94 added lines, -94 removed lines patch added patch discarded remove patch
@@ -66,9 +66,9 @@  discard block
 block discarded – undo
66 66
 	 */
67 67
 	public function add_downloads_data_filters() {
68 68
 
69
-	    $downloads_data = get_site_transient( self::DOWNLOADS_DATA_TRANSIENT );
69
+		$downloads_data = get_site_transient( self::DOWNLOADS_DATA_TRANSIENT );
70 70
 
71
-	    if ( ! $downloads_data ) {
71
+		if ( ! $downloads_data ) {
72 72
 			return;
73 73
 		}
74 74
 
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 	 */
98 98
 	public function add_admin_menu() {
99 99
 
100
-	    $menu_text = _x( 'Extensions', 'Extensions are WordPress plugins that add functionality to GravityView and Gravity Forms', 'gravityview' );
100
+		$menu_text = _x( 'Extensions', 'Extensions are WordPress plugins that add functionality to GravityView and Gravity Forms', 'gravityview' );
101 101
 
102 102
 		$menu_text = sprintf( '<span title="%s">%s</span>', esc_attr__( 'Plugins that extend GravityView and Gravity Forms functionality.', 'gravityview' ), $menu_text );
103 103
 
@@ -112,8 +112,8 @@  discard block
 block discarded – undo
112 112
 	}
113 113
 
114 114
 	/**
115
-     * When on the Installer page, show a different notice than on the Settings page
116
-     *
115
+	 * When on the Installer page, show a different notice than on the Settings page
116
+	 *
117 117
 	 * @param array $notice
118 118
 	 *
119 119
 	 * @return string License notice
@@ -121,10 +121,10 @@  discard block
 block discarded – undo
121 121
 	public function maybe_modify_license_notice( $notice = '' ) {
122 122
 
123 123
 		if ( ! gravityview()->request->is_admin( '', 'downloads' ) ) {
124
-            return $notice;
125
-        }
124
+			return $notice;
125
+		}
126 126
 
127
-        return esc_html__( 'Your license %s. Do you want access to these plugins? %sActivate your license%s or %sget a license here%s.', 'gravityview' );
127
+		return esc_html__( 'Your license %s. Do you want access to these plugins? %sActivate your license%s or %sget a license here%s.', 'gravityview' );
128 128
 	}
129 129
 
130 130
 	/**
@@ -162,43 +162,43 @@  discard block
 block discarded – undo
162 162
 	 * Get downloads data from transient or from API; save transient after getting data from API
163 163
 	 *
164 164
 	 * @return WP_Error|array If error, returns WP_Error. If not valid JSON, empty array. Otherwise, this structure: {
165
-     *   @type array  $info {
166
-     *       @type string $id int 17
167
-     *       @type string $slug Extension slug
168
-     *       @type string $title Extension title
169
-     *       @type string $create_date in '2018-07-19 20:03:10' format
170
-     *       @type string $modified_date
171
-     *       @type string $status
172
-     *       @type string $link URL to public plugin page
173
-     *       @type string $content
174
-     *       @type string $excerpt
175
-     *       @type string $thumbnail URL to thumbnail
176
-     *       @type array  $category Taxonomy details for the plugin's category {
177
-     *         @type int $term_id => int 30
178
-     *         @type string $name => string 'Plugins' (length=7)
179
-     *         @type string $slug => string 'plugins' (length=7)
180
-     *         @type int $term_group => int 0
181
-     *         @type int $term_taxonomy_id => int 30
182
-     *         @type string $taxonomy => string 'download_category' (length=17)
183
-     *         @type string $description => string '' (length=0)
184
-     *         @type int $parent => int 0
185
-     *         @type int $count => int 4
186
-     *         @type string $filter => string 'raw' (length=3)
187
-     *       }
188
-     *       @type array $tags {see $category above}
189
-     *       @type string $textdomain string 'gravityview' (length=11)
190
-     *   }
191
-     *   @type array $pricing array of `price_name_slugs` => '00.00' values, if price options exist
192
-     *   @type array $licensing {
193
-     *       @type bool   $enabled Is licensing enabled for the extension
194
-     *       @type string $version Version number
195
-     *       @type string $exp_unit Expiration unit ('years')
196
-     *       @type string $exp_length Expiration length ('1')
197
-     *   }
198
-     *   @type array $files Array of files. Empty if user has no access to the file. {
199
-     *       @type string $file string URL of the file download
200
-     *   }
201
-     * }
165
+	 *   @type array  $info {
166
+	 *       @type string $id int 17
167
+	 *       @type string $slug Extension slug
168
+	 *       @type string $title Extension title
169
+	 *       @type string $create_date in '2018-07-19 20:03:10' format
170
+	 *       @type string $modified_date
171
+	 *       @type string $status
172
+	 *       @type string $link URL to public plugin page
173
+	 *       @type string $content
174
+	 *       @type string $excerpt
175
+	 *       @type string $thumbnail URL to thumbnail
176
+	 *       @type array  $category Taxonomy details for the plugin's category {
177
+	 *         @type int $term_id => int 30
178
+	 *         @type string $name => string 'Plugins' (length=7)
179
+	 *         @type string $slug => string 'plugins' (length=7)
180
+	 *         @type int $term_group => int 0
181
+	 *         @type int $term_taxonomy_id => int 30
182
+	 *         @type string $taxonomy => string 'download_category' (length=17)
183
+	 *         @type string $description => string '' (length=0)
184
+	 *         @type int $parent => int 0
185
+	 *         @type int $count => int 4
186
+	 *         @type string $filter => string 'raw' (length=3)
187
+	 *       }
188
+	 *       @type array $tags {see $category above}
189
+	 *       @type string $textdomain string 'gravityview' (length=11)
190
+	 *   }
191
+	 *   @type array $pricing array of `price_name_slugs` => '00.00' values, if price options exist
192
+	 *   @type array $licensing {
193
+	 *       @type bool   $enabled Is licensing enabled for the extension
194
+	 *       @type string $version Version number
195
+	 *       @type string $exp_unit Expiration unit ('years')
196
+	 *       @type string $exp_length Expiration length ('1')
197
+	 *   }
198
+	 *   @type array $files Array of files. Empty if user has no access to the file. {
199
+	 *       @type string $file string URL of the file download
200
+	 *   }
201
+	 * }
202 202
 	 */
203 203
 	public function get_downloads_data() {
204 204
 
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 		) );
227 227
 
228 228
 		if ( is_wp_error( $response ) ) {
229
-		    gravityview()->log->error( "Extension data response is an error", array( 'data' => $response ) );
229
+			gravityview()->log->error( "Extension data response is an error", array( 'data' => $response ) );
230 230
 			return $response;
231 231
 		}
232 232
 
@@ -279,10 +279,10 @@  discard block
 block discarded – undo
279 279
                 <div class="gv-admin-installer-notice notice inline error">
280 280
                     <h3><?php esc_html_e( 'Extensions and plugins data cannot be loaded at the moment. Please try again later.', 'gravityview' ); ?></h3>
281 281
                     <?php
282
-                    if ( is_wp_error( $downloads_data ) ) {
283
-	                    echo wpautop( '<pre>' . esc_html( $downloads_data->get_error_message() ) . '</pre>' );
284
-                    }
285
-                    ?>
282
+					if ( is_wp_error( $downloads_data ) ) {
283
+						echo wpautop( '<pre>' . esc_html( $downloads_data->get_error_message() ) . '</pre>' );
284
+					}
285
+					?>
286 286
                 </div>
287 287
             </div>
288 288
 			<?php
@@ -338,9 +338,9 @@  discard block
 block discarded – undo
338 338
 	protected function render_download( $download, $wp_plugins ) {
339 339
 
340 340
 
341
-        $details = $this->get_download_display_details( $download, $wp_plugins );
341
+		$details = $this->get_download_display_details( $download, $wp_plugins );
342 342
 
343
-        $download_info = $details['download_info'];
343
+		$download_info = $details['download_info'];
344 344
 
345 345
 		?>
346 346
         <div class="item <?php echo esc_attr( $details['item_class'] ); ?>">
@@ -362,43 +362,43 @@  discard block
 block discarded – undo
362 362
 
363 363
                 <div class="addon-excerpt"><?php
364 364
 
365
-                    $excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] );
365
+					$excerpt = \GV\Utils::get( $download_info, 'installer_excerpt', $download_info['excerpt'] );
366 366
 
367
-                    // Allow some pure HTML tags, but remove everything else from the excerpt.
368
-                    $tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' );
369
-                    $replacements = array( '[b]', '[/b]', '[i]', '[/i]', '[code]', '[/code]' );
367
+					// Allow some pure HTML tags, but remove everything else from the excerpt.
368
+					$tags = array( '<strong>', '</strong>', '<em>', '</em>', '<code>', '</code>' );
369
+					$replacements = array( '[b]', '[/b]', '[i]', '[/i]', '[code]', '[/code]' );
370 370
 
371
-                    $excerpt = str_replace( $tags, $replacements, $excerpt );
372
-                    $excerpt = esc_html( strip_tags( $excerpt ) );
371
+					$excerpt = str_replace( $tags, $replacements, $excerpt );
372
+					$excerpt = esc_html( strip_tags( $excerpt ) );
373 373
 					$excerpt = str_replace( $replacements, $tags, $excerpt );
374 374
 
375 375
 					echo wpautop( $excerpt );
376
-                ?></div>
376
+				?></div>
377 377
             </div>
378 378
         </div>
379 379
 		<?php
380 380
 	}
381 381
 
382 382
 	/**
383
-     * Generates details array for the download to keep the render_download() method a bit tidier
384
-     *
383
+	 * Generates details array for the download to keep the render_download() method a bit tidier
384
+	 *
385 385
 	 * @param array $download Single download, as returned by {@see get_downloads_data}
386 386
 	 * @param array $wp_plugins All active plugins, as returned by {@see get_plugins()}
387 387
 	 *
388 388
 	 * @return array {
389
-     *   @type array $download_info
390
-     *   @type string $plugin_path
391
-     *   @type string $status License status returned by Easy Digital Downloads ("active", "inactive", "expired", "revoked", etc)
392
-     *   @type string $status_label
393
-     *   @type string $button_title Title attribute to show when hovering over the download's button
394
-     *   @type string $button_class CSS class to use for the button
395
-     *   @type string $button_label Text to use for the download's anchor link
396
-     *   @type string $href URL for the download's button
397
-     *   @type bool   $spinner Whether to show the spinner icon
398
-     *   @type string $item_class CSS class for the download container
399
-     *   @type string $required_license The name of the required license for the download ("All Access" or "Core + Extensions")
400
-     *   @type bool   $is_active Is the current GravityView license (as entered in Settings) active?
401
-     * }
389
+	 *   @type array $download_info
390
+	 *   @type string $plugin_path
391
+	 *   @type string $status License status returned by Easy Digital Downloads ("active", "inactive", "expired", "revoked", etc)
392
+	 *   @type string $status_label
393
+	 *   @type string $button_title Title attribute to show when hovering over the download's button
394
+	 *   @type string $button_class CSS class to use for the button
395
+	 *   @type string $button_label Text to use for the download's anchor link
396
+	 *   @type string $href URL for the download's button
397
+	 *   @type bool   $spinner Whether to show the spinner icon
398
+	 *   @type string $item_class CSS class for the download container
399
+	 *   @type string $required_license The name of the required license for the download ("All Access" or "Core + Extensions")
400
+	 *   @type bool   $is_active Is the current GravityView license (as entered in Settings) active?
401
+	 * }
402 402
 	 */
403 403
 	private function get_download_display_details( $download, $wp_plugins ) {
404 404
 
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
 			'slug' => '',
410 410
 			'excerpt' => '',
411 411
 			'link' => '',
412
-            'coming_soon' => false,
412
+			'coming_soon' => false,
413 413
 			'installer_title' => null, // May not be defined
414 414
 			'installer_excerpt' => null, // May not be defined
415 415
 		) );
@@ -451,14 +451,14 @@  discard block
 block discarded – undo
451 451
 			$href         = 'https://gravityview.co/pricing/?utm_source=admin-installer&utm_medium=admin&utm_campaign=Admin%20Notice&utm_content=' . $required_license;
452 452
 		}
453 453
 
454
-        elseif ( ! empty( $download_info['coming_soon'] ) ) {
455
-	        $spinner      = false;
456
-	        $status       = 'notinstalled';
457
-	        $status_label = __( 'Coming Soon', 'gravityview' );
458
-	        $button_label = __( 'Learn More', 'gravityview' );
459
-	        $button_class = 'button-primary button-large';
460
-	        $href         = \GV\Utils::get( $download_info, 'link', 'https://gravityview.co/extensions/' );
461
-        }
454
+		elseif ( ! empty( $download_info['coming_soon'] ) ) {
455
+			$spinner      = false;
456
+			$status       = 'notinstalled';
457
+			$status_label = __( 'Coming Soon', 'gravityview' );
458
+			$button_label = __( 'Learn More', 'gravityview' );
459
+			$button_class = 'button-primary button-large';
460
+			$href         = \GV\Utils::get( $download_info, 'link', 'https://gravityview.co/extensions/' );
461
+		}
462 462
 
463 463
 		// Access but the plugin is not installed
464 464
 		elseif ( ! $wp_plugin ) {
@@ -498,18 +498,18 @@  discard block
 block discarded – undo
498 498
 		}
499 499
 
500 500
 		return compact( 'download_info','plugin_path', 'status', 'status_label', 'button_title', 'button_class', 'button_label', 'href', 'spinner', 'item_class', 'required_license', 'is_active' );
501
-    }
501
+	}
502 502
 
503 503
 	/**
504
-     * Returns the base price for an extension
505
-     *
504
+	 * Returns the base price for an extension
505
+	 *
506 506
 	 * @param array $download
507 507
 	 *
508 508
 	 * @return float Base price for an extension. If not for sale separately, returns 0
509 509
 	 */
510 510
 	private function get_download_base_price( $download ) {
511 511
 
512
-	    $base_price = \GV\Utils::get( $download, 'pricing/amount', 0 );
512
+		$base_price = \GV\Utils::get( $download, 'pricing/amount', 0 );
513 513
 		$base_price = \GFCommon::to_number( $base_price );
514 514
 
515 515
 		unset( $download['pricing']['amount'] );
@@ -520,7 +520,7 @@  discard block
 block discarded – undo
520 520
 		}
521 521
 
522 522
 		return floatval( $base_price );
523
-    }
523
+	}
524 524
 
525 525
 	/**
526 526
 	 * Handle AJAX request to activate extension
@@ -538,8 +538,8 @@  discard block
 block discarded – undo
538 538
 
539 539
 		if ( is_wp_error( $result ) || ! is_plugin_active( $data['path'] ) ) {
540 540
 			wp_send_json_error( array(
541
-                'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() )
542
-            ) );
541
+				'error' => sprintf( __( 'Plugin activation failed: %s', 'gravityview' ), $result->get_error_message() )
542
+			) );
543 543
 		}
544 544
 
545 545
 		wp_send_json_success();
@@ -560,10 +560,10 @@  discard block
 block discarded – undo
560 560
 		deactivate_plugins( $data['path'] );
561 561
 
562 562
 		if( is_plugin_active( $data['path'] ) ) {
563
-            wp_send_json_error( array(
564
-                'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) )
565
-            ) );
566
-        }
563
+			wp_send_json_error( array(
564
+				'error' => sprintf( __( 'Plugin deactivation failed.', 'gravityview' ) )
565
+			) );
566
+		}
567 567
 
568 568
 		wp_send_json_success();
569 569
 	}
Please login to merge, or discard this patch.
includes/widgets/class-gravityview-widget-page-size.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 
75 75
 	/**
76 76
 	 * Render the page size widget
77
-     *
77
+	 *
78 78
 	 * @param array $widget_args The Widget shortcode args.
79 79
 	 * @param string $content The content.
80 80
 	 * @param string|\GV\Template_Context $context The context, if available.
@@ -115,14 +115,14 @@  discard block
 block discarded – undo
115 115
 						<?php } ?>
116 116
                     </select>
117 117
                     <input type="submit" value="Submit" style="visibility: hidden; position: absolute;" /><?php
118
-                    if( ! empty( $_GET ) ) {
119
-                        $get = $_GET;
120
-                        unset( $get['page_size'] );
121
-	                    foreach ( $get as $key => $value ) {
122
-		                    printf( '<input type="hidden" name="%s" value="%s" />', esc_attr( $key ), esc_attr( $value ) );
123
-	                    }
124
-                    }
125
-                    ?>
118
+					if( ! empty( $_GET ) ) {
119
+						$get = $_GET;
120
+						unset( $get['page_size'] );
121
+						foreach ( $get as $key => $value ) {
122
+							printf( '<input type="hidden" name="%s" value="%s" />', esc_attr( $key ), esc_attr( $value ) );
123
+						}
124
+					}
125
+					?>
126 126
                 </div>
127 127
             </form>
128 128
         </div>
Please login to merge, or discard this patch.
includes/widgets/search-widget/templates/search-field-select.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@
 block discarded – undo
16 16
 }
17 17
 
18 18
 if( is_array( $search_field['value'] ) ) {
19
-    gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' );
19
+	gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' );
20 20
 	$search_field['value'] = reset( $search_field['value'] );
21 21
 }
22 22
 
Please login to merge, or discard this patch.
includes/admin/class-gravityview-support-port.php 1 patch
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 
14 14
 	/**
15 15
 	 * @var string The hash key used to generate secure message history
16
-     * @since 2.2.5
16
+	 * @since 2.2.5
17 17
 	 */
18 18
 	const beacon_key = 'lCXlwbQR707kipR+J0MCqcxrhGOHjGF0ldD6yNbGM0w=';
19 19
 
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 			'payment_id'       => '',
111 111
 			'customer_name'    => '',
112 112
 			'customer_email'   => '',
113
-            'price_id'         => '0',
113
+			'price_id'         => '0',
114 114
 		) );
115 115
 
116 116
 		// This is just HTML we don't need.
@@ -127,9 +127,9 @@  discard block
 block discarded – undo
127 127
 			case 3:
128 128
 				$package = 'All Access';
129 129
 				break;
130
-            case 4:
131
-                $package = 'Lifetime';
132
-                break;
130
+			case 4:
131
+				$package = 'Lifetime';
132
+				break;
133 133
 		}
134 134
 
135 135
 		$current_user = wp_get_current_user();
@@ -159,27 +159,27 @@  discard block
 block discarded – undo
159 159
 		// Help Scout length limit is 200 characters
160 160
 		foreach( $data as $key => $value ) {
161 161
 			if ( ! is_string( $value ) ) {
162
-                continue;
162
+				continue;
163 163
 			}
164
-		    $data[ $key ] = mb_substr( $value, 0, 200 );
165
-        }
164
+			$data[ $key ] = mb_substr( $value, 0, 200 );
165
+		}
166 166
 
167 167
 		$localization_data = array(
168 168
 			'contactEnabled' => (int)GVCommon::has_cap( 'gravityview_contact_support' ),
169 169
 			'data' => $data,
170 170
 			'translation' => $translation,
171
-            'suggest' => array(),
171
+			'suggest' => array(),
172 172
 		);
173 173
 
174 174
 		/**
175
-         * @filter `gravityview/support_port/localization_data` Filter data passed to the Support Port, before localize_script is run
175
+		 * @filter `gravityview/support_port/localization_data` Filter data passed to the Support Port, before localize_script is run
176 176
 		 * @since 2.0
177
-         * @param array $localization_data {
178
-         *   @type int $contactEnabled Can the user contact support?
179
-         *   @type array $data Support/license info
180
-         *   @type array $translation i18n strings
181
-         *   @type array $suggest Article IDs to recommend to the user (per page in the admin
182
-         * }
177
+		 * @param array $localization_data {
178
+		 *   @type int $contactEnabled Can the user contact support?
179
+		 *   @type array $data Support/license info
180
+		 *   @type array $translation i18n strings
181
+		 *   @type array $suggest Article IDs to recommend to the user (per page in the admin
182
+		 * }
183 183
 		 */
184 184
 		$localization_data = apply_filters( 'gravityview/support_port/localization_data', $localization_data );
185 185
 
@@ -193,11 +193,11 @@  discard block
 block discarded – undo
193 193
 	 *
194 194
 	 * If the user doesn't have the `gravityview_support_port` capability, returns false; then
195 195
 	 * If global setting is "hide", returns false; then
196
-     * If user preference is not set, return global setting; then
197
-     * If user preference is set, return that setting.
196
+	 * If user preference is not set, return global setting; then
197
+	 * If user preference is set, return that setting.
198 198
 	 *
199 199
 	 * @since 1.15
200
-     * @since 1.17.5 Changed behavior to respect global setting
200
+	 * @since 1.17.5 Changed behavior to respect global setting
201 201
 	 *
202 202
 	 * @param int $user Optional. ID of the user to check, defaults to 0 for current user.
203 203
 	 *
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 		$global_setting = gravityview()->plugin->settings->get( 'support_port' );
213 213
 
214 214
 		if ( empty( $global_setting ) ) {
215
-            return false;
215
+			return false;
216 216
 		}
217 217
 
218 218
 		// Get the per-user Support Port setting
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
 	 * Modifies the output of profile.php to add GravityView Support preference
249 249
 	 *
250 250
 	 * @since 1.15
251
-     * @since 1.17.5 Only show if global setting is active
251
+	 * @since 1.17.5 Only show if global setting is active
252 252
 	 *
253 253
 	 * @param WP_User $user Current user info
254 254
 	 *
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
 		$global_setting = gravityview()->plugin->settings->get( 'support_port' );
260 260
 
261 261
 		if ( empty( $global_setting ) ) {
262
-            return;
262
+			return;
263 263
 		}
264 264
 
265 265
 		/**
Please login to merge, or discard this patch.
future/includes/class-gv-template-view-table.php 1 patch
Indentation   +88 added lines, -88 removed lines patch added patch discarded remove patch
@@ -19,8 +19,8 @@  discard block
 block discarded – undo
19 19
 
20 20
 
21 21
 	/**
22
-     * Constructor. Add filters to modify output.
23
-     *
22
+	 * Constructor. Add filters to modify output.
23
+	 *
24 24
 	 * @since 2.0.4
25 25
 	 *
26 26
 	 * @param View $view
@@ -29,19 +29,19 @@  discard block
 block discarded – undo
29 29
 	 */
30 30
 	public function __construct( View $view, Entry_Collection $entries, Request $request ) {
31 31
 
32
-	    add_filter( 'gravityview/template/field/label', array( __CLASS__, 'add_columns_sort_links' ), 100, 2 );
32
+		add_filter( 'gravityview/template/field/label', array( __CLASS__, 'add_columns_sort_links' ), 100, 2 );
33 33
 
34 34
 		parent::__construct( $view, $entries, $request );
35 35
 	}
36 36
 
37 37
 	/**
38
-     * Add sorting links to HTML columns that support sorting
39
-     *
40
-     * @since 2.0.4
41
-     * @since 2.0.5 Made static
42
-     *
43
-     * @static
44
-     *
38
+	 * Add sorting links to HTML columns that support sorting
39
+	 *
40
+	 * @since 2.0.4
41
+	 * @since 2.0.5 Made static
42
+	 *
43
+	 * @static
44
+	 *
45 45
 	 * @param string $column_label Label for the table column
46 46
 	 * @param \GV\Template_Context $context
47 47
 	 *
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 		$sort_columns = $context->view->settings->get( 'sort_columns' );
53 53
 
54 54
 		if ( empty( $sort_columns ) ) {
55
-            return $column_label;
55
+			return $column_label;
56 56
 		}
57 57
 
58 58
 		if ( ! \GravityView_frontend::getInstance()->is_field_sortable( $context->field->ID, $context->view->form->form ) ) {
@@ -102,22 +102,22 @@  discard block
 block discarded – undo
102 102
 		// If we are already sorting by the current field...
103 103
 		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
104 104
 
105
-		    switch( $sorting['direction'] ) {
106
-		        // No sort
107
-                case '':
108
-	                $sort_args[1] = 'asc';
109
-	                $class .= ' gv-icon-caret-up-down';
110
-                    break;
111
-                case 'desc':
112
-	                $sort_args[1] = '';
113
-	                $class .= ' gv-icon-sort-asc';
114
-	                break;
115
-                case 'asc':
116
-                default:
117
-                    $sort_args[1] = 'desc';
118
-                    $class .= ' gv-icon-sort-desc';
119
-                    break;
120
-            }
105
+			switch( $sorting['direction'] ) {
106
+				// No sort
107
+				case '':
108
+					$sort_args[1] = 'asc';
109
+					$class .= ' gv-icon-caret-up-down';
110
+					break;
111
+				case 'desc':
112
+					$sort_args[1] = '';
113
+					$class .= ' gv-icon-sort-asc';
114
+					break;
115
+				case 'asc':
116
+				default:
117
+					$sort_args[1] = 'desc';
118
+					$class .= ' gv-icon-sort-desc';
119
+					break;
120
+			}
121 121
 
122 122
 		} else {
123 123
 			$class .= ' gv-icon-caret-up-down';
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 		$url = remove_query_arg( 'sort', $url );
128 128
 		$multisort_url = self::_get_multisort_url( $url, $sort_args, $context->field->ID );
129 129
 
130
-    	$url = add_query_arg( $sort_args[0], $sort_args[1], $url );
130
+		$url = add_query_arg( $sort_args[0], $sort_args[1], $url );
131 131
 
132 132
 		$return = '<a href="'. esc_url_raw( $url ) .'"';
133 133
 
@@ -141,50 +141,50 @@  discard block
 block discarded – undo
141 141
 	}
142 142
 
143 143
 	/**
144
-     * Get the multi-sort URL used in the sorting links
145
-     *
146
-     * @todo Consider moving to Utils?
147
-     *
148
-     * @since 2.3
149
-     *
150
-     * @see add_columns_sort_links
144
+	 * Get the multi-sort URL used in the sorting links
145
+	 *
146
+	 * @todo Consider moving to Utils?
147
+	 *
148
+	 * @since 2.3
149
+	 *
150
+	 * @see add_columns_sort_links
151 151
 	 * @param string $url Single-sort URL
152 152
 	 * @param array $sort_args Single sorting for rules, in [ field_id, dir ] format
153
-     * @param string|int $field_id ID of the current field being displayed
154
-     *
155
-     * @return string Multisort URL, if there are multiple sorts. Otherwise, existing $url
153
+	 * @param string|int $field_id ID of the current field being displayed
154
+	 *
155
+	 * @return string Multisort URL, if there are multiple sorts. Otherwise, existing $url
156 156
 	 */
157 157
 	static public function _get_multisort_url( $url, $sort_args, $field_id ) {
158 158
 
159 159
 		$sorts = Utils::_GET( 'sort' );
160 160
 
161 161
 		if ( ! is_array( $sorts ) ) {
162
-            return $url;
162
+			return $url;
163 163
 		}
164 164
 
165
-        $multisort_url = $url;
165
+		$multisort_url = $url;
166 166
 
167 167
 		// If the field has already been sorted by, add the field to the URL
168
-        if ( ! in_array( $field_id, $keys = array_keys( $sorts ) ) ) {
169
-            if ( count( $keys ) ) {
170
-                $multisort_url = add_query_arg( sprintf( 'sort[%s]', end( $keys ) ), $sorts[ end( $keys ) ], $multisort_url );
171
-                $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url );
172
-            } else {
173
-                $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url );
174
-            }
175
-        }
176
-        // Otherwise, we are just updating the sort order
177
-        else {
178
-
179
-            // Pass empty value to unset
180
-            if( '' === $sort_args[1] ) {
181
-	            unset( $sorts[ $field_id ] );
182
-            } else {
183
-	            $sorts[ $field_id ] = $sort_args[1];
184
-            }
185
-
186
-            $multisort_url = add_query_arg( array( 'sort' => $sorts ), $multisort_url );
187
-        }
168
+		if ( ! in_array( $field_id, $keys = array_keys( $sorts ) ) ) {
169
+			if ( count( $keys ) ) {
170
+				$multisort_url = add_query_arg( sprintf( 'sort[%s]', end( $keys ) ), $sorts[ end( $keys ) ], $multisort_url );
171
+				$multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url );
172
+			} else {
173
+				$multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url );
174
+			}
175
+		}
176
+		// Otherwise, we are just updating the sort order
177
+		else {
178
+
179
+			// Pass empty value to unset
180
+			if( '' === $sort_args[1] ) {
181
+				unset( $sorts[ $field_id ] );
182
+			} else {
183
+				$sorts[ $field_id ] = $sort_args[1];
184
+			}
185
+
186
+			$multisort_url = add_query_arg( array( 'sort' => $sorts ), $multisort_url );
187
+		}
188 188
 
189 189
 		return $multisort_url;
190 190
 	}
@@ -214,10 +214,10 @@  discard block
 block discarded – undo
214 214
 	}
215 215
 
216 216
 	/**
217
-     * Returns the label for a column, with support for all deprecated filters
218
-     *
219
-     * @since 2.1
220
-     *
217
+	 * Returns the label for a column, with support for all deprecated filters
218
+	 *
219
+	 * @since 2.1
220
+	 *
221 221
 	 * @param \GV\Field $field
222 222
 	 * @param \GV\Template_Context $context
223 223
 	 */
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 		$column_label = apply_filters( 'gravityview/template/field/label', $column_label, $context );
241 241
 
242 242
 		return $column_label;
243
-    }
243
+	}
244 244
 
245 245
 	/**
246 246
 	 * Output the entry row.
@@ -309,15 +309,15 @@  discard block
 block discarded – undo
309 309
 				 */
310 310
 				do_action( 'gravityview/template/table/cells/before', $context );
311 311
 
312
-                /**
313
-                 * @action `gravityview_table_cells_before` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
314
-                 * @since 1.0.7
312
+				/**
313
+				 * @action `gravityview_table_cells_before` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
314
+				 * @since 1.0.7
315 315
 				 * @param \GravityView_View $this Current GravityView_View object
316 316
 				 * @deprecated Use `gravityview/template/table/cells/before`
317
-                 */
318
-                do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() );
317
+				 */
318
+				do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() );
319 319
 
320
-                foreach ( $fields->all() as $field ) {
320
+				foreach ( $fields->all() as $field ) {
321 321
 					if ( isset( $this->view->unions[ $entry['form_id'] ] ) ) {
322 322
 						if ( isset( $this->view->unions[ $entry['form_id'] ][ $field->ID ] ) ) {
323 323
 							$field = $this->view->unions[ $entry['form_id'] ][ $field->ID ];
@@ -337,13 +337,13 @@  discard block
 block discarded – undo
337 337
 				 */
338 338
 				do_action( 'gravityview/template/table/cells/after', $context );
339 339
 
340
-                /**
341
-                 * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
342
-                 * @since 1.0.7
340
+				/**
341
+				 * @action `gravityview_table_cells_after` Inside the `tr` while rendering each entry in the loop. Can be used to insert additional table cells.
342
+				 * @since 1.0.7
343 343
 				 * @param \GravityView_View $this Current GravityView_View object
344 344
 				 * @deprecated Use `gravityview/template/table/cells/after`
345
-                 */
346
-                do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() );
345
+				 */
346
+				do_action( 'gravityview_table_cells_after', \GravityView_View::getInstance() );
347 347
 
348 348
 				?>
349 349
 			</tr>
@@ -384,9 +384,9 @@  discard block
 block discarded – undo
384 384
 			'value' => $value,
385 385
 			'hide_empty' => false,
386 386
 			'zone_id' => 'directory_table-columns',
387
-            'label' => self::get_field_column_label( $field, $context ),
387
+			'label' => self::get_field_column_label( $field, $context ),
388 388
 			'markup' => '<td id="{{ field_id }}" class="{{ class }}" data-label="{{label_value:data-label}}">{{ value }}</td>',
389
-            'form' => $form,
389
+			'form' => $form,
390 390
 		);
391 391
 
392 392
 		/** Output. */
@@ -411,11 +411,11 @@  discard block
 block discarded – undo
411 411
 		do_action( 'gravityview/template/table/body/before', $context );
412 412
 
413 413
 		/**
414
-		* @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
415
-		* @deprecated Use `gravityview/template/table/body/before`
416
-		* @since 1.0.7
417
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
418
-		*/
414
+		 * @action `gravityview_table_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
415
+		 * @deprecated Use `gravityview/template/table/body/before`
416
+		 * @since 1.0.7
417
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
418
+		 */
419 419
 		do_action( 'gravityview_table_body_before', \GravityView_View::getInstance() /** ugh! */ );
420 420
 	}
421 421
 
@@ -437,11 +437,11 @@  discard block
 block discarded – undo
437 437
 		do_action( 'gravityview/template/table/body/after', $context );
438 438
 
439 439
 		/**
440
-		* @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
441
-		* @deprecated Use `gravityview/template/table/body/after`
442
-		* @since 1.0.7
443
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
444
-		*/
440
+		 * @action `gravityview_table_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
441
+		 * @deprecated Use `gravityview/template/table/body/after`
442
+		 * @since 1.0.7
443
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
444
+		 */
445 445
 		do_action( 'gravityview_table_body_after', \GravityView_View::getInstance() /** ugh! */ );
446 446
 	}
447 447
 
Please login to merge, or discard this patch.
future/includes/class-gv-request.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -170,10 +170,10 @@
 block discarded – undo
170 170
 	 */
171 171
 	public function is_edit_entry( $form_id = 0 ) {
172 172
 		/**
173
-		* @filter `gravityview_is_edit_entry` Whether we're currently on the Edit Entry screen \n
174
-		* The Edit Entry functionality overrides this value.
175
-		* @param boolean $is_edit_entry
176
-		*/
173
+		 * @filter `gravityview_is_edit_entry` Whether we're currently on the Edit Entry screen \n
174
+		 * The Edit Entry functionality overrides this value.
175
+		 * @param boolean $is_edit_entry
176
+		 */
177 177
 		if ( ( $entry = $this->is_entry( $form_id ) ) && apply_filters( 'gravityview_is_edit_entry', false ) ) {
178 178
 			if ( $entry->is_multi() ) {
179 179
 				return array_pop( $entry->entries );
Please login to merge, or discard this patch.