Completed
Pull Request — master (#1461)
by Zack
17:37 queued 14:56
created
includes/extensions/entry-notes/class-gravityview-field-notes.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -175,10 +175,10 @@  discard block
 block discarded – undo
175 175
 
176 176
 		if( 'gv_note_add' === $_POST['action'] ) {
177 177
 
178
-            if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
179
-                do_action( 'gravityview_log_error', __METHOD__ . ': The user isnt allowed to add entry notes.' );
180
-                return;
181
-            }
178
+			if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
179
+				do_action( 'gravityview_log_error', __METHOD__ . ': The user isnt allowed to add entry notes.' );
180
+				return;
181
+			}
182 182
 
183 183
 			$post = wp_unslash( $_POST );
184 184
 
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
 	 *
279 279
 	 * Verify permissions. Check expected $_POST. Parse args, then send to process_delete_notes
280 280
 	 *
281
-  	 * @since 1.17
281
+	 * @since 1.17
282 282
 	 *
283 283
 	 * @see process_delete_notes
284 284
 	 *
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
 			'subject-label' => __( 'Subject', 'gravityview' ),
432 432
 			'subject' => __( 'Email subject', 'gravityview' ),
433 433
 			'default-email-subject' => __( 'New entry note', 'gravityview' ),
434
-            'email-footer' => __( 'This note was sent from {url}', 'gravityview' ),
434
+			'email-footer' => __( 'This note was sent from {url}', 'gravityview' ),
435 435
 			'also-email' => __( 'Also email this note to', 'gravityview' ),
436 436
 			'error-add-note' => __( 'There was an error adding the note.', 'gravityview' ),
437 437
 			'error-invalid' => __( 'The request was invalid. Refresh the page and try again.', 'gravityview' ),
@@ -501,11 +501,11 @@  discard block
 block discarded – undo
501 501
 
502 502
 		if ( $context instanceof \GV\Template_Context ) {
503 503
 
504
-		    ob_start();
505
-		    $context->template->get_template_part( 'note', 'detail', true );
506
-            $note_detail_html = ob_get_clean();
504
+			ob_start();
505
+			$context->template->get_template_part( 'note', 'detail', true );
506
+			$note_detail_html = ob_get_clean();
507 507
 
508
-            ob_start();
508
+			ob_start();
509 509
 			$context->template->get_template_part( 'note', $note_row_template, true );
510 510
 			$note_row = ob_get_clean();
511 511
 		} else {
@@ -761,7 +761,7 @@  discard block
 block discarded – undo
761 761
 				'gv-note-to-custom' => '',
762 762
 				'gv-note-subject' => '',
763 763
 				'gv-note-content' => '',
764
-                'current-url' => '',
764
+				'current-url' => '',
765 765
 			);
766 766
 
767 767
 			$current_user  = wp_get_current_user();
@@ -813,9 +813,9 @@  discard block
 block discarded – undo
813 813
 			$message .= $this->get_email_footer( $email_footer, $is_html, $email_data );
814 814
 
815 815
 			/**
816
-             * @filter `gravityview/field/notes/wpautop_email` Should the message content have paragraphs added automatically, if using HTML message format
816
+			 * @filter `gravityview/field/notes/wpautop_email` Should the message content have paragraphs added automatically, if using HTML message format
817 817
 			 * @since 1.18
818
-             * @param bool $wpautop_email True: Apply wpautop() to the email message if using; False: Leave as entered (Default: true)
818
+			 * @param bool $wpautop_email True: Apply wpautop() to the email message if using; False: Leave as entered (Default: true)
819 819
 			 */
820 820
 			$wpautop_email = apply_filters( 'gravityview/field/notes/wpautop_email', true );
821 821
 
@@ -835,12 +835,12 @@  discard block
 block discarded – undo
835 835
 	}
836 836
 
837 837
 	/**
838
-     * Get the footer for Entry Note emails
839
-     *
840
-     * `{url}` is replaced by the URL of the page where the note form was embedded
841
-     *
842
-     * @since 1.18
843
-     * @see GravityView_Field_Notes::strings The default value of $message_footer is set here, with the key 'email-footer'
838
+	 * Get the footer for Entry Note emails
839
+	 *
840
+	 * `{url}` is replaced by the URL of the page where the note form was embedded
841
+	 *
842
+	 * @since 1.18
843
+	 * @see GravityView_Field_Notes::strings The default value of $message_footer is set here, with the key 'email-footer'
844 844
 	 *
845 845
 	 * @param string $email_footer The message footer value
846 846
 	 * @param bool $is_html True: Email is being sent as HTML; False: sent as text
@@ -849,10 +849,10 @@  discard block
 block discarded – undo
849 849
 	 */
850 850
 	private function get_email_footer( $email_footer = '', $is_html = true, $email_data = array() ) {
851 851
 
852
-	    $output = '';
852
+		$output = '';
853 853
 
854 854
 		if( ! empty( $email_footer ) ) {
855
-		    $url = \GV\Utils::get( $email_data, 'current-url' );
855
+			$url = \GV\Utils::get( $email_data, 'current-url' );
856 856
 			$url = html_entity_decode( $url );
857 857
 			$url = site_url( $url );
858 858
 
Please login to merge, or discard this patch.
future/includes/class-gv-template-view-list.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -151,11 +151,11 @@  discard block
 block discarded – undo
151 151
 		do_action( 'gravityview/template/list/body/before', $context );
152 152
 
153 153
 		/**
154
-		* @action `gravityview_list_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
155
-		* @deprecated Use `gravityview/template/list/body/before`
156
-		* @since 1.0.7
157
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
158
-		*/
154
+		 * @action `gravityview_list_body_before` Inside the `tbody`, before any rows are rendered. Can be used to insert additional rows.
155
+		 * @deprecated Use `gravityview/template/list/body/before`
156
+		 * @since 1.0.7
157
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
158
+		 */
159 159
 		do_action( 'gravityview_list_body_before', \GravityView_View::getInstance() /** ugh! */ );
160 160
 	}
161 161
 
@@ -177,11 +177,11 @@  discard block
 block discarded – undo
177 177
 		do_action( 'gravityview/template/list/body/after', $context );
178 178
 
179 179
 		/**
180
-		* @action `gravityview_list_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
181
-		* @deprecated Use `gravityview/template/list/body/after`
182
-		* @since 1.0.7
183
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
184
-		*/
180
+		 * @action `gravityview_list_body_after` Inside the `tbody`, after any rows are rendered. Can be used to insert additional rows.
181
+		 * @deprecated Use `gravityview/template/list/body/after`
182
+		 * @since 1.0.7
183
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
184
+		 */
185 185
 		do_action( 'gravityview_list_body_after', \GravityView_View::getInstance() /** ugh! */ );
186 186
 	}
187 187
 
@@ -212,11 +212,11 @@  discard block
 block discarded – undo
212 212
 		$zone = str_replace( '/', '_', $zone );
213 213
 
214 214
 		/**
215
-		* @action `gravityview_list_entry_$zone_before` Inside the `entry`, before any rows are rendered. Can be used to insert additional rows.
216
-		* @deprecated Use `gravityview/template/list/entry/$zone/before`
217
-		* @since 1.0.7
218
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
219
-		*/
215
+		 * @action `gravityview_list_entry_$zone_before` Inside the `entry`, before any rows are rendered. Can be used to insert additional rows.
216
+		 * @deprecated Use `gravityview/template/list/entry/$zone/before`
217
+		 * @since 1.0.7
218
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
219
+		 */
220 220
 		do_action( sprintf( 'gravityview_list_entry%sbefore', $zone ), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */ );
221 221
 	}
222 222
 
@@ -247,11 +247,11 @@  discard block
 block discarded – undo
247 247
 		$zone = str_replace( '/', '_', $zone );
248 248
 
249 249
 		/**
250
-		* @action `gravityview_list_entry_$zone_after` Inside the `entry`, after any rows are rendered. Can be used to insert additional rows.
251
-		* @deprecated Use `gravityview/template/list/entry/after`
252
-		* @since 1.0.7
253
-		* @param \GravityView_View $gravityview_view Current GravityView_View object.
254
-		*/
250
+		 * @action `gravityview_list_entry_$zone_after` Inside the `entry`, after any rows are rendered. Can be used to insert additional rows.
251
+		 * @deprecated Use `gravityview/template/list/entry/after`
252
+		 * @since 1.0.7
253
+		 * @param \GravityView_View $gravityview_view Current GravityView_View object.
254
+		 */
255 255
 		do_action( sprintf( 'gravityview_list_entry%safter', $zone ), $entry->as_entry(), \GravityView_View::getInstance() /** ugh! */ );
256 256
 	}
257 257
 }
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/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.
includes/class-admin-approve-entries.php 1 patch
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -361,14 +361,14 @@  discard block
 block discarded – undo
361 361
 	/**
362 362
 	 * update_approved function.
363 363
 	 *
364
-     * @since 1.18 Moved to GravityView_Entry_Approval::update_approved
364
+	 * @since 1.18 Moved to GravityView_Entry_Approval::update_approved
365 365
 	 * @see GravityView_Entry_Approval::update_approved
366
-     *
366
+	 *
367 367
 	 * @param int $entry_id (default: 0)
368 368
 	 * @param int $approved (default: 0)
369 369
 	 * @param int $form_id (default: 0)
370 370
 	 * @param int $approvedcolumn (default: 0)
371
-     *
371
+	 *
372 372
 	 * @return boolean True: It worked; False: it failed
373 373
 	 */
374 374
 	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) {
@@ -378,9 +378,9 @@  discard block
 block discarded – undo
378 378
 	/**
379 379
 	 * Calculate the approve field.input id
380 380
 	 *
381
-     * @since 1.18 Moved to GravityView_Entry_Approval::get_approved_column
382
-     * @see GravityView_Entry_Approval::get_approved_column
383
-     *
381
+	 * @since 1.18 Moved to GravityView_Entry_Approval::get_approved_column
382
+	 * @see GravityView_Entry_Approval::get_approved_column
383
+	 *
384 384
 	 * @param mixed $form GF Form or Form ID
385 385
 	 * @return false|null|string Returns the input ID of the approved field. Returns NULL if no approved fields were found. Returns false if $form_id wasn't set.
386 386
 	 */
@@ -505,37 +505,37 @@  discard block
 block discarded – undo
505 505
 			'bulk_actions' => $this->get_bulk_actions( $form_id ),
506 506
 			'bulk_message' => $this->bulk_update_message,
507 507
 			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('unapproved'),
508
-            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
508
+			'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
509 509
 			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('approved'),
510 510
 			'column_title' => __( 'Show entry in directory view?', 'gravityview'),
511 511
 			'column_link' => esc_url( $this->get_sort_link() ),
512
-            'status_popover_template' => GravityView_Entry_Approval::get_popover_template(),
512
+			'status_popover_template' => GravityView_Entry_Approval::get_popover_template(),
513 513
 			'status_popover_placement' => GravityView_Entry_Approval::get_popover_placement(),
514 514
 		) );
515 515
 
516 516
 	}
517 517
 
518 518
 	/**
519
-     * Generate a link to sort by approval status
520
-     *
521
-     * Note: Sorting by approval will never be great because it's not possible currently to declare the sorting as
522
-     * numeric, but it does group the approved entries together.
523
-     *
524
-     * @since 2.0.14 Remove need for approval field for sorting by approval status
525
-     *
519
+	 * Generate a link to sort by approval status
520
+	 *
521
+	 * Note: Sorting by approval will never be great because it's not possible currently to declare the sorting as
522
+	 * numeric, but it does group the approved entries together.
523
+	 *
524
+	 * @since 2.0.14 Remove need for approval field for sorting by approval status
525
+	 *
526 526
 	 * @param int $form_id [NO LONGER USED]
527 527
 	 *
528 528
 	 * @return string Sorting link
529 529
 	 */
530 530
 	private function get_sort_link( $form_id = 0 ) {
531 531
 
532
-	    $args = array(
533
-		    'orderby' => 'is_approved',
534
-            'order' => ( 'desc' === \GV\Utils::_GET( 'order' ) ) ? 'asc' : 'desc',
535
-        );
532
+		$args = array(
533
+			'orderby' => 'is_approved',
534
+			'order' => ( 'desc' === \GV\Utils::_GET( 'order' ) ) ? 'asc' : 'desc',
535
+		);
536 536
 
537 537
 		return add_query_arg( $args );
538
-    }
538
+	}
539 539
 
540 540
 	/**
541 541
 	 * Get an array of options to be added to the Gravity Forms "Bulk action" dropdown in a "GravityView" option group
@@ -577,9 +577,9 @@  discard block
 block discarded – undo
577 577
 		// Sanitize the values, just to be sure.
578 578
 		foreach ( $bulk_actions as $key => $group ) {
579 579
 
580
-		    if( empty( $group ) ) {
581
-		        continue;
582
-		    }
580
+			if( empty( $group ) ) {
581
+				continue;
582
+			}
583 583
 
584 584
 			foreach ( $group as $i => $action ) {
585 585
 				$bulk_actions[ $key ][ $i ]['label'] = esc_html( $bulk_actions[ $key ][ $i ]['label'] );
Please login to merge, or discard this patch.
includes/class-ajax.php 1 patch
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 
139 139
 		// template areas
140 140
 		$template_areas_directory = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'directory' );
141
-        $template_areas_single = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'single' );
141
+		$template_areas_single = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'single' );
142 142
 
143 143
 		// widget areas
144 144
 		$default_widget_areas = \GV\Widget::get_default_widget_areas();
@@ -331,40 +331,40 @@  discard block
 block discarded – undo
331 331
 		// load file
332 332
 		$xmlstr = file_get_contents( $form_file );
333 333
 
334
-        $options = array(
335
-            "page" => array("unserialize_as_array" => true),
336
-            "form"=> array("unserialize_as_array" => true),
337
-            "field"=> array("unserialize_as_array" => true),
338
-            "rule"=> array("unserialize_as_array" => true),
339
-            "choice"=> array("unserialize_as_array" => true),
340
-            "input"=> array("unserialize_as_array" => true),
341
-            "routing_item"=> array("unserialize_as_array" => true),
342
-            "creditCard"=> array("unserialize_as_array" => true),
343
-            "routin"=> array("unserialize_as_array" => true),
344
-            "confirmation" => array("unserialize_as_array" => true),
345
-            "notification" => array("unserialize_as_array" => true)
346
-        );
334
+		$options = array(
335
+			"page" => array("unserialize_as_array" => true),
336
+			"form"=> array("unserialize_as_array" => true),
337
+			"field"=> array("unserialize_as_array" => true),
338
+			"rule"=> array("unserialize_as_array" => true),
339
+			"choice"=> array("unserialize_as_array" => true),
340
+			"input"=> array("unserialize_as_array" => true),
341
+			"routing_item"=> array("unserialize_as_array" => true),
342
+			"creditCard"=> array("unserialize_as_array" => true),
343
+			"routin"=> array("unserialize_as_array" => true),
344
+			"confirmation" => array("unserialize_as_array" => true),
345
+			"notification" => array("unserialize_as_array" => true)
346
+		);
347 347
 
348 348
 		$xml = new RGXML($options);
349
-        $forms = $xml->unserialize($xmlstr);
349
+		$forms = $xml->unserialize($xmlstr);
350 350
 
351
-        if( !$forms ) {
352
-        	gravityview()->log->error( 'Importing Form Fields for preset [{template_id}]. Error importing file. (File) {path}', array( 'template_id' => $template_id, 'path' => $form_file ) );
353
-        	return false;
354
-        }
351
+		if( !$forms ) {
352
+			gravityview()->log->error( 'Importing Form Fields for preset [{template_id}]. Error importing file. (File) {path}', array( 'template_id' => $template_id, 'path' => $form_file ) );
353
+			return false;
354
+		}
355 355
 
356
-        if( !empty( $forms[0] ) && is_array( $forms[0] ) ) {
357
-        	$form = $forms[0];
358
-        }
356
+		if( !empty( $forms[0] ) && is_array( $forms[0] ) ) {
357
+			$form = $forms[0];
358
+		}
359 359
 
360
-        if( empty( $form ) ) {
361
-        	gravityview()->log->error( '$form not set.', array( 'data' => $forms ) );
362
-        	return false;
363
-        }
360
+		if( empty( $form ) ) {
361
+			gravityview()->log->error( '$form not set.', array( 'data' => $forms ) );
362
+			return false;
363
+		}
364 364
 
365
-        gravityview()->log->debug( '[pre_get_available_fields] Importing Form Fields for preset [{template_id}]. (Form)', array( 'template_id' => $template_id, 'data' => $form ) );
365
+		gravityview()->log->debug( '[pre_get_available_fields] Importing Form Fields for preset [{template_id}]. (Form)', array( 'template_id' => $template_id, 'data' => $form ) );
366 366
 
367
-        return $form;
367
+		return $form;
368 368
 
369 369
 	}
370 370
 
Please login to merge, or discard this patch.