Completed
Pull Request — develop (#1573)
by Zack
20:26
created
includes/fields/class-gravityview-field-entry-link.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -32,25 +32,25 @@
 block discarded – undo
32 32
 
33 33
 	public function __construct() {
34 34
 		$this->label = esc_html__( 'Link to Single Entry', 'gravityview' );
35
-		$this->description = esc_html__('A dedicated link to the single entry with customizable text.', 'gravityview');
35
+		$this->description = esc_html__( 'A dedicated link to the single entry with customizable text.', 'gravityview' );
36 36
 		parent::__construct();
37 37
 	}
38 38
 
39 39
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
40 40
 
41 41
 		// Always a link!
42
-		unset( $field_options['show_as_link'], $field_options['search_filter'] );
42
+		unset( $field_options[ 'show_as_link' ], $field_options[ 'search_filter' ] );
43 43
 
44
-		if( 'edit' === $context ) {
44
+		if ( 'edit' === $context ) {
45 45
 			return $field_options;
46 46
 		}
47 47
 
48 48
 		$add_options = array();
49
-		$add_options['entry_link_text'] = array(
49
+		$add_options[ 'entry_link_text' ] = array(
50 50
 			'type' => 'text',
51 51
 			'label' => __( 'Link Text:', 'gravityview' ),
52 52
 			'desc' => NULL,
53
-			'value' => __('View Details', 'gravityview'),
53
+			'value' => __( 'View Details', 'gravityview' ),
54 54
 			'merge_tags' => true,
55 55
 		);
56 56
 
Please login to merge, or discard this patch.
includes/class-gravityview-change-entry-creator.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 			array(
82 82
 				'ajaxurl'  => admin_url( 'admin-ajax.php' ),
83 83
 				'action'   => 'entry_creator_get_users',
84
-				'gf25'    => (bool) gravityview()->plugin->is_GF_25(),
84
+				'gf25'    => (bool)gravityview()->plugin->is_GF_25(),
85 85
 				'language' => array(
86 86
 					'search_placeholder' => esc_html__( 'Search by ID, login, email, or name.', 'gravityview' ),
87 87
 				),
@@ -105,11 +105,11 @@  discard block
 block discarded – undo
105 105
 			)
106 106
 		);
107 107
 
108
-		if ( ! wp_verify_nonce( $post_var['gv_nonce'], 'gv_entry_creator' ) ) {
108
+		if ( ! wp_verify_nonce( $post_var[ 'gv_nonce' ], 'gv_entry_creator' ) ) {
109 109
 			die();
110 110
 		}
111 111
 
112
-		$search_string = $post_var['q'];
112
+		$search_string = $post_var[ 'q' ];
113 113
 
114 114
 		if ( is_numeric( $search_string ) ) {
115 115
 			$user_args = array(
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 		}
157 157
 
158 158
 		// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
159
-		$result = RGFormsModel::update_entry_property( (int) $entry['id'], 'created_by', (int) $user_id, false, true );
159
+		$result = RGFormsModel::update_entry_property( (int)$entry[ 'id' ], 'created_by', (int)$user_id, false, true );
160 160
 
161 161
 		if ( false === $result ) {
162 162
 			$status = __( 'Error', 'gravityview' );
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 			return;
179 179
 		}
180 180
 
181
-		GravityView_Entry_Notes::add_note( $entry['id'], - 1, 'GravityView', $note, 'gravityview' );
181
+		GravityView_Entry_Notes::add_note( $entry[ 'id' ], - 1, 'GravityView', $note, 'gravityview' );
182 182
 
183 183
 	}
184 184
 
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
 		}
214 214
 
215 215
 		// If screen mode isn't set, then we're in the wrong place.
216
-		if ( empty( $_REQUEST['screen_mode'] ) ) {
216
+		if ( empty( $_REQUEST[ 'screen_mode' ] ) ) {
217 217
 			return;
218 218
 		}
219 219
 
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 
240 240
 		// If $_GET['screen_mode'] is set to edit, set $_POST value
241 241
 		if ( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
242
-			$_POST["screen_mode"] = 'edit';
242
+			$_POST[ "screen_mode" ] = 'edit';
243 243
 		}
244 244
 
245 245
 	}
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
 		$entry_creator_user_id = \GV\Utils::get( $entry, 'created_by' );
315 315
 
316 316
 		$entry_creator_user = GVCommon::get_users( 'change_entry_creator', array( 'include' => $entry_creator_user_id ) );
317
-		$entry_creator_user = isset( $entry_creator_user[0] ) ? $entry_creator_user[0] : array();
317
+		$entry_creator_user = isset( $entry_creator_user[ 0 ] ) ? $entry_creator_user[ 0 ] : array();
318 318
 
319 319
 		if ( empty( $entry_creator_user ) ) {
320 320
 			$output .= '<option value="0"> &mdash; ' . esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview' ) . ' &mdash; </option>';
@@ -332,18 +332,18 @@  discard block
 block discarded – undo
332 332
 		}
333 333
 
334 334
 		$user_count      = count_users();
335
-		$user_count      = $user_count['total_users'];
335
+		$user_count      = $user_count[ 'total_users' ];
336 336
 		$users_displayed = self::DEFAULT_NUMBER_OF_USERS + ( ! empty( $entry_creator_user ) ? 1 : 0 );
337 337
 		if ( $user_count > $users_displayed ) {
338 338
 			$remaining_users = $user_count - $users_displayed;
339
-			$user_users = _n( esc_html__('user', 'gravityview' ), esc_html__('users', 'gravityview' ), $remaining_users );
339
+			$user_users = _n( esc_html__( 'user', 'gravityview' ), esc_html__( 'users', 'gravityview' ), $remaining_users );
340 340
 			$message = esc_html_x( 'Use the input above to search the remaining %d %s.', '%d is replaced with user count %s is replaced with "user" or "users"', 'gravityview' );
341 341
 			$message = sprintf( $message, $remaining_users, $user_users );
342
-			$output  .= '<option value="_user_count" disabled="disabled">' . esc_html( $message ) . '</option>';
342
+			$output .= '<option value="_user_count" disabled="disabled">' . esc_html( $message ) . '</option>';
343 343
 		}
344 344
 
345 345
 		$output .= '</select>';
346
-		$output .= '<input name="originally_created_by" value="' . esc_attr( $entry['created_by'] ) . '" type="hidden" />';
346
+		$output .= '<input name="originally_created_by" value="' . esc_attr( $entry[ 'created_by' ] ) . '" type="hidden" />';
347 347
 		$output .= wp_nonce_field( 'gv_entry_creator', 'gv_entry_creator_nonce', false, false );
348 348
 
349 349
 		echo $output;
@@ -357,8 +357,8 @@  discard block
 block discarded – undo
357 357
 	 * @return array
358 358
 	 */
359 359
 	function register_gform_noconflict( $assets ) {
360
-		$assets[] = 'gravityview_selectwoo';
361
-		$assets[] = 'gravityview_entry_creator';
360
+		$assets[ ] = 'gravityview_selectwoo';
361
+		$assets[ ] = 'gravityview_entry_creator';
362 362
 
363 363
 		return $assets;
364 364
 	}
Please login to merge, or discard this patch.
future/_mocks.php 1 patch
Spacing   +40 added lines, -43 removed lines patch added patch discarded remove patch
@@ -102,8 +102,7 @@  discard block
 block discarded – undo
102 102
 			$entries = $view->get_entries( gravityview()->request );
103 103
 		}
104 104
 
105
-		$page = \GV\Utils::get( $parameters['paging'], 'current_page' ) ?
106
-			: ( ( ( $parameters['paging']['offset'] - $view->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 );
105
+		$page = \GV\Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $view->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 );
107 106
 
108 107
 		/** Set paging, count and unwrap the entries. */
109 108
 		$paging = array(
@@ -142,17 +141,17 @@  discard block
 block discarded – undo
142 141
  * @return null|string The value of a field in an entry.
143 142
  */
144 143
 function GravityView_API_field_value( $entry, $field_settings, $format ) {
145
-	if ( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) {
144
+	if ( empty( $entry[ 'form_id' ] ) || empty( $field_settings[ 'id' ] ) ) {
146 145
 		gravityview()->log->error( 'No entry or field_settings[id] supplied', array( 'data' => array( func_get_args() ) ) );
147 146
 		return null;
148 147
 	}
149 148
 
150
-	if ( ! empty( $entry['_multi'] ) && ! empty( $field_settings['form_id'] ) && ! empty( $entry['_multi'][ $field_settings['form_id'] ] ) ) {
151
-		$multientry = \GV\Multi_Entry::from_entries( array_map( '\GV\GF_Entry::from_entry', $entry['_multi'] ) );
152
-		$entry = $entry['_multi'][ $field_settings['form_id'] ];
149
+	if ( ! empty( $entry[ '_multi' ] ) && ! empty( $field_settings[ 'form_id' ] ) && ! empty( $entry[ '_multi' ][ $field_settings[ 'form_id' ] ] ) ) {
150
+		$multientry = \GV\Multi_Entry::from_entries( array_map( '\GV\GF_Entry::from_entry', $entry[ '_multi' ] ) );
151
+		$entry = $entry[ '_multi' ][ $field_settings[ 'form_id' ] ];
153 152
 	}
154 153
 
155
-	if ( empty( $entry['id'] ) || ! $entry = \GV\GF_Entry::by_id( $entry['id'] ) ) {
154
+	if ( empty( $entry[ 'id' ] ) || ! $entry = \GV\GF_Entry::by_id( $entry[ 'id' ] ) ) {
156 155
 		gravityview()->log->error( 'Invalid \GV\GF_Entry supplied', array( 'data' => $entry ) );
157 156
 		return null;
158 157
 	}
@@ -162,18 +161,18 @@  discard block
 block discarded – undo
162 161
 	 *
163 162
 	 * Fields with a numeric ID are Gravity Forms ones.
164 163
 	 */
165
-	$source = is_numeric( $field_settings['id'] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL;;
164
+	$source = is_numeric( $field_settings[ 'id' ] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL; ;
166 165
 
167 166
 	/** Initialize the future field. */
168 167
 	switch ( $source ):
169 168
 		/** The Gravity Forms backend. */
170 169
 		case \GV\Source::BACKEND_GRAVITYFORMS:
171
-			if ( ! $form = \GV\GF_Form::by_id( $entry['form_id'] ) ) {
170
+			if ( ! $form = \GV\GF_Form::by_id( $entry[ 'form_id' ] ) ) {
172 171
 				gravityview()->log->error( 'No form Gravity Form found for entry', array( 'data' => $entry ) );
173 172
 				return null;
174 173
 			}
175 174
 
176
-			if ( ! $field = $form::get_field( $form, $field_settings['id'] ) ) {
175
+			if ( ! $field = $form::get_field( $form, $field_settings[ 'id' ] ) ) {
177 176
 				return null;
178 177
 			}
179 178
 
@@ -181,7 +180,7 @@  discard block
 block discarded – undo
181 180
 
182 181
 		/** Our internal backend. */
183 182
 		case \GV\Source::BACKEND_INTERNAL:
184
-			if ( ! $field = \GV\Internal_Source::get_field( $field_settings['id'] ) ) {
183
+			if ( ! $field = \GV\Internal_Source::get_field( $field_settings[ 'id' ] ) ) {
185 184
 				return null;
186 185
 			}
187 186
 
@@ -215,13 +214,13 @@  discard block
 block discarded – undo
215 214
 
216 215
 	/** A bail condition. */
217 216
 	$bail = function( $label, $field_settings, $entry, $force_show_label, $form ) {
218
-		if ( ! empty( $field_settings['show_label'] ) || $force_show_label ) {
217
+		if ( ! empty( $field_settings[ 'show_label' ] ) || $force_show_label ) {
219 218
 
220
-			$label = isset( $field_settings['label'] ) ? $field_settings['label'] : '';
219
+			$label = isset( $field_settings[ 'label' ] ) ? $field_settings[ 'label' ] : '';
221 220
 
222 221
 			// Use Gravity Forms label by default, but if a custom label is defined in GV, use it.
223
-			if ( ! empty( $field_settings['custom_label'] ) ) {
224
-				$label = \GravityView_API::replace_variables( $field_settings['custom_label'], $form, $entry );
222
+			if ( ! empty( $field_settings[ 'custom_label' ] ) ) {
223
+				$label = \GravityView_API::replace_variables( $field_settings[ 'custom_label' ], $form, $entry );
225 224
 			}
226 225
 
227 226
 			/**
@@ -247,19 +246,19 @@  discard block
 block discarded – undo
247 246
 
248 247
 	$label = '';
249 248
 
250
-	if ( ! empty( $entry['_multi'] ) && ! empty( $field_settings['form_id'] ) && ! empty( $entry['_multi'][ $field_settings['form_id'] ] ) ) {
251
-		$entry = $entry['_multi'][ $field_settings['form_id'] ];
252
-		if ( $_form = \GV\GF_Form::by_id( $field_settings['form_id'] ) ) {
249
+	if ( ! empty( $entry[ '_multi' ] ) && ! empty( $field_settings[ 'form_id' ] ) && ! empty( $entry[ '_multi' ][ $field_settings[ 'form_id' ] ] ) ) {
250
+		$entry = $entry[ '_multi' ][ $field_settings[ 'form_id' ] ];
251
+		if ( $_form = \GV\GF_Form::by_id( $field_settings[ 'form_id' ] ) ) {
253 252
 			$form = $_form->form;
254 253
 		}
255 254
 	}
256 255
 
257
-	if ( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) {
256
+	if ( empty( $entry[ 'form_id' ] ) || empty( $field_settings[ 'id' ] ) ) {
258 257
 		gravityview()->log->error( 'No entry or field_settings[id] supplied', array( 'data' => array( func_get_args() ) ) );
259 258
 		return $bail( $label, $field_settings, $entry, $force_show_label, $form );
260 259
 	}
261 260
 
262
-	if ( empty( $entry['id'] ) || ! $gv_entry = \GV\GF_Entry::by_id( $entry['id'] ) ) {
261
+	if ( empty( $entry[ 'id' ] ) || ! $gv_entry = \GV\GF_Entry::by_id( $entry[ 'id' ] ) ) {
263 262
 		gravityview()->log->error( 'Invalid \GV\GF_Entry supplied', array( 'data' => $entry ) );
264 263
 		return $bail( $label, $field_settings, $entry, $force_show_label, $form );
265 264
 	}
@@ -271,31 +270,31 @@  discard block
 block discarded – undo
271 270
 	 *
272 271
 	 * Fields with a numeric ID are Gravity Forms ones.
273 272
 	 */
274
-	$source = is_numeric( $field_settings['id'] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL;
273
+	$source = is_numeric( $field_settings[ 'id' ] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL;
275 274
 
276 275
 	/** Initialize the future field. */
277 276
 	switch ( $source ):
278 277
 		/** The Gravity Forms backend. */
279 278
 		case \GV\Source::BACKEND_GRAVITYFORMS:
280
-			if ( ! $gf_form = \GV\GF_Form::by_id( $entry['form_id'] ) ) {
279
+			if ( ! $gf_form = \GV\GF_Form::by_id( $entry[ 'form_id' ] ) ) {
281 280
 				gravityview()->log->error( 'No form Gravity Form found for entry', array( 'data' => $entry ) );
282 281
 				return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $form );
283 282
 			}
284 283
 
285
-			if ( ! $field = $gf_form::get_field( $gf_form, $field_settings['id'] ) ) {
286
-				gravityview()->log->error( 'No field found for specified form and field ID #{field_id}', array( 'field_id' => $field_settings['id'], 'data' => $form ) );
284
+			if ( ! $field = $gf_form::get_field( $gf_form, $field_settings[ 'id' ] ) ) {
285
+				gravityview()->log->error( 'No field found for specified form and field ID #{field_id}', array( 'field_id' => $field_settings[ 'id' ], 'data' => $form ) );
287 286
 				return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $gf_form->form );
288 287
 			}
289
-			if ( empty( $field_settings['show_label'] ) ) {
288
+			if ( empty( $field_settings[ 'show_label' ] ) ) {
290 289
 				/** The label never wins... */
291
-				$field_settings['label'] = '';
290
+				$field_settings[ 'label' ] = '';
292 291
 			}
293 292
 
294 293
 			break;
295 294
 
296 295
 		/** Our internal backend. */
297 296
 		case \GV\Source::BACKEND_INTERNAL:
298
-			if ( ! $field = \GV\Internal_Source::get_field( $field_settings['id'] ) ) {
297
+			if ( ! $field = \GV\Internal_Source::get_field( $field_settings[ 'id' ] ) ) {
299 298
 				return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $form );
300 299
 			}
301 300
 			break;
@@ -307,8 +306,8 @@  discard block
 block discarded – undo
307 306
 			break;
308 307
 	endswitch;
309 308
 
310
-	if( $force_show_label ) {
311
-		$field_settings['show_label'] = '1';
309
+	if ( $force_show_label ) {
310
+		$field_settings[ 'show_label' ] = '1';
312 311
 	}
313 312
 
314 313
 	/** Add the field settings. */
@@ -444,7 +443,7 @@  discard block
 block discarded – undo
444 443
 			'\GravityView_View::_current_entry' => \GravityView_View::getInstance()->getCurrentEntry(),
445 444
 			'\GravityView_View::fields' => \GravityView_View::getInstance()->getFields(),
446 445
 			'\GravityView_View::_current_field' => \GravityView_View::getInstance()->getCurrentField(),
447
-			'wp_actions[loop_start]' => empty( $wp_actions['loop_start'] ) ? 0 : $wp_actions['loop_start'],
446
+			'wp_actions[loop_start]' => empty( $wp_actions[ 'loop_start' ] ) ? 0 : $wp_actions[ 'loop_start' ],
448 447
 			'wp_query::in_the_loop' => $wp_query->in_the_loop,
449 448
 		);
450 449
 	}
@@ -532,7 +531,7 @@  discard block
 block discarded – undo
532 531
 					break;
533 532
 				case 'wp_actions[loop_start]':
534 533
 					global $wp_actions;
535
-					$wp_actions['loop_start'] = $value;
534
+					$wp_actions[ 'loop_start' ] = $value;
536 535
 					break;
537 536
 				case 'wp_query::in_the_loop':
538 537
 					global $wp_query;
@@ -629,9 +628,7 @@  discard block
 block discarded – undo
629 628
 				case 'request':
630 629
 					self::thaw( array(
631 630
 						'\GravityView_View::context' => (
632
-							$value->is_entry() ? 'single' :
633
-							( $value->is_edit_entry() ? 'edit' :
634
-									( $value->is_view() ? 'directory': null )
631
+							$value->is_entry() ? 'single' : ( $value->is_edit_entry() ? 'edit' : ( $value->is_view() ? 'directory' : null )
635 632
 								)
636 633
 						),
637 634
 						'\GravityView_frontend::is_search' => $value->is_search(),
@@ -685,14 +682,14 @@  discard block
 block discarded – undo
685 682
 		global $wp_query, $wp_actions;
686 683
 
687 684
 		$wp_query->in_the_loop = false;
688
-		$wp_actions['loop_start'] = 0;
685
+		$wp_actions[ 'loop_start' ] = 0;
689 686
 	}
690 687
 }
691 688
 
692 689
 
693 690
 /** Add some global fix for field capability discrepancies. */
694 691
 add_filter( 'gravityview/configuration/fields', function( $fields ) {
695
-	if ( empty( $fields  ) ) {
692
+	if ( empty( $fields ) ) {
696 693
 		return $fields;
697 694
 	}
698 695
 
@@ -719,11 +716,11 @@  discard block
 block discarded – undo
719 716
 		}
720 717
 
721 718
 		foreach ( $_fields as $uid => &$_field ) {
722
-			if ( ! isset( $_field['only_loggedin'] ) ) {
719
+			if ( ! isset( $_field[ 'only_loggedin' ] ) ) {
723 720
 				continue;
724 721
 			}
725 722
 			/** If we do not require login, we don't require a cap. */
726
-			$_field['only_loggedin'] != '1' && ( $_field['only_loggedin_cap'] = '' );
723
+			$_field[ 'only_loggedin' ] != '1' && ( $_field[ 'only_loggedin_cap' ] = '' );
727 724
 		}
728 725
 	}
729 726
 	return $fields;
@@ -754,8 +751,8 @@  discard block
 block discarded – undo
754 751
 		}
755 752
 
756 753
 		foreach ( $_fields as $uid => &$_field ) {
757
-			if ( ! empty( $_field['id'] ) && is_numeric( $_field['id'] ) && empty( $_field['form_id'] ) ) {
758
-				$_field['form_id'] = $view->form->ID;
754
+			if ( ! empty( $_field[ 'id' ] ) && is_numeric( $_field[ 'id' ] ) && empty( $_field[ 'form_id' ] ) ) {
755
+				$_field[ 'form_id' ] = $view->form->ID;
759 756
 			}
760 757
 		}
761 758
 	}
@@ -769,13 +766,13 @@  discard block
 block discarded – undo
769 766
 	if ( class_exists( '\GravityView_frontend' ) ) {
770 767
 		global $wp_filter;
771 768
 
772
-		if ( empty( $wp_filter['gravityview_after'] ) ) {
769
+		if ( empty( $wp_filter[ 'gravityview_after' ] ) ) {
773 770
 			return;
774 771
 		}
775 772
 
776
-		foreach ( $wp_filter['gravityview_after']->callbacks[10] as $function_key => $callback ) {
773
+		foreach ( $wp_filter[ 'gravityview_after' ]->callbacks[ 10 ] as $function_key => $callback ) {
777 774
 			if ( strpos( $function_key, 'context_not_configured_warning' ) ) {
778
-				unset( $wp_filter['gravityview_after']->callbacks[10][ $function_key ] );
775
+				unset( $wp_filter[ 'gravityview_after' ]->callbacks[ 10 ][ $function_key ] );
779 776
 			}
780 777
 		}
781 778
 	}
Please login to merge, or discard this patch.
future/includes/class-gv-collection-view.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 			 * @deprecated
115 115
 			 * @see The `gravityview/view_collection/from_post/meta_keys` filter.
116 116
 			 */
117
-			$meta_keys = (array) apply_filters_deprecated( 'gravityview/data/parse/meta_keys', array( $meta_keys, $post->ID ), '2.0.7', 'gravityview/view_collection/from_post/meta_keys' );
117
+			$meta_keys = (array)apply_filters_deprecated( 'gravityview/data/parse/meta_keys', array( $meta_keys, $post->ID ), '2.0.7', 'gravityview/view_collection/from_post/meta_keys' );
118 118
 
119 119
 			/** What about inside post meta values? */
120 120
 			foreach ( $meta_keys as $meta_key ) {
@@ -168,12 +168,12 @@  discard block
 block discarded – undo
168 168
 
169 169
 		/** Let's find us some [gravityview] shortcodes perhaps. */
170 170
 		foreach ( Shortcode::parse( $content ) as $shortcode ) {
171
-			if ( $shortcode->name != 'gravityview' || empty( $shortcode->atts['id'] ) ) {
171
+			if ( $shortcode->name != 'gravityview' || empty( $shortcode->atts[ 'id' ] ) ) {
172 172
 				continue;
173 173
 			}
174 174
 
175
-			if ( is_numeric( $shortcode->atts['id'] ) ) {
176
-				$view = View::by_id( $shortcode->atts['id'] );
175
+			if ( is_numeric( $shortcode->atts[ 'id' ] ) ) {
176
+				$view = View::by_id( $shortcode->atts[ 'id' ] );
177 177
 				if ( ! $view ) {
178 178
 					continue;
179 179
 				}
Please login to merge, or discard this patch.
future/includes/class-gv-template-legacy-override.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -98,15 +98,15 @@  discard block
 block discarded – undo
98 98
 		$additional = array();
99 99
 
100 100
 		// form-19-table-body.php
101
-		$additional[] = sprintf( 'form-%d-%s-%s.php', $this->view->form ? $this->view->form->ID : 0, $slug, $name );
101
+		$additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->view->form ? $this->view->form->ID : 0, $slug, $name );
102 102
 
103 103
 		// view-3-table-body.php
104
-		$additional[] = sprintf( 'view-%d-%s-%s.php', $this->view->ID, $slug, $name );
104
+		$additional[ ] = sprintf( 'view-%d-%s-%s.php', $this->view->ID, $slug, $name );
105 105
 
106 106
 		global $post;
107 107
 		if ( $post ) {
108 108
 			// page-19-table-body.php
109
-			$additional[] = sprintf( 'page-%d-%s-%s.php', $post->ID, $slug, $name );
109
+			$additional[ ] = sprintf( 'page-%d-%s-%s.php', $post->ID, $slug, $name );
110 110
 		}
111 111
 
112 112
 		// Combine with existing table-body.php and table.php
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 		ob_start();
131 131
 
132 132
 		$request = new Mock_Request();
133
-		$request->returns['is_view'] = $this->view;
133
+		$request->returns[ 'is_view' ] = $this->view;
134 134
 
135 135
 		/**
136 136
 		 * You got one shot. One opportunity. To render all the widgets you have ever wanted.
@@ -142,9 +142,9 @@  discard block
 block discarded – undo
142 142
 		 */
143 143
 		global $wp_filter;
144 144
 		foreach ( array( 'gravityview_before', 'gravityview_after' ) as $hook ) {
145
-			foreach ( $wp_filter[ $hook ]->callbacks[10] as $function_key => $callback ) {
145
+			foreach ( $wp_filter[ $hook ]->callbacks[ 10 ] as $function_key => $callback ) {
146 146
 				if ( strpos( $function_key, 'render_widget_hooks' ) ) {
147
-					unset( $wp_filter[ $hook ]->callbacks[10][ $function_key ] );
147
+					unset( $wp_filter[ $hook ]->callbacks[ 10 ][ $function_key ] );
148 148
 				}
149 149
 			}
150 150
 		}
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 		 */
155 155
 		if ( $this->entry ) {
156 156
 
157
-			$request->returns['is_entry'] = $this->entry;
157
+			$request->returns[ 'is_entry' ] = $this->entry;
158 158
 
159 159
 			global $post;
160 160
 
@@ -188,11 +188,11 @@  discard block
 block discarded – undo
188 188
 			 * This allows us to fake it till we make it.
189 189
 			 */
190 190
 			$parameters = $this->view->settings->as_atts();
191
-			if ( ! empty( $parameters['sort_field'] ) && is_array( $parameters['sort_field'] ) ) {
191
+			if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) {
192 192
 				$has_multisort = true;
193
-				$parameters['sort_field'] = reset( $parameters['sort_field'] );
194
-				if ( ! empty( $parameters['sort_direction'] ) && is_array( $parameters['sort_direction'] ) ) {
195
-					$parameters['sort_direction'] = reset( $parameters['sort_direction'] );
193
+				$parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] );
194
+				if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) {
195
+					$parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] );
196 196
 				}
197 197
 			}
198 198
 
@@ -211,8 +211,8 @@  discard block
 block discarded – undo
211 211
 					'fields' => $this->view->fields->by_visible( $this->view ),
212 212
 					'in_the_loop' => true,
213 213
 				), empty( $parameters ) ? array() : array(
214
-					'paging' => $parameters['paging'],
215
-					'sorting' => $parameters['sorting'],
214
+					'paging' => $parameters[ 'paging' ],
215
+					'sorting' => $parameters[ 'sorting' ],
216 216
 				), $post ? array(
217 217
 					'post' => $post,
218 218
 				) : array() ) );
Please login to merge, or discard this patch.
includes/helper-functions.php 1 patch
Spacing   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -32,19 +32,19 @@  discard block
 block discarded – undo
32 32
 	// If there's an overriding CSS file in the current template folder, use it.
33 33
 	$template_css_path = trailingslashit( get_stylesheet_directory() ) . 'gravityview/css/' . $css_file;
34 34
 
35
-	if( file_exists( $template_css_path ) ) {
35
+	if ( file_exists( $template_css_path ) ) {
36 36
 		$path = trailingslashit( get_stylesheet_directory_uri() ) . 'gravityview/css/' . $css_file;
37 37
 		gravityview()->log->debug( 'Stylesheet override ({css_file})', array( 'css_file' => esc_attr( $css_file ) ) );
38 38
 	} else {
39 39
 		// Default: use GravityView CSS file
40 40
 
41 41
 		// If no path is provided, assume default plugin templates CSS folder
42
-		if( '' === $dir_path ) {
42
+		if ( '' === $dir_path ) {
43 43
 			$dir_path = GRAVITYVIEW_DIR . 'templates/css/';
44 44
 		}
45 45
 
46 46
 		// plugins_url() expects a path to a file, not directory. We append a file to be stripped.
47
-		$path = plugins_url( $css_file, trailingslashit( $dir_path )  . 'stripped-by-plugin_basename.php' );
47
+		$path = plugins_url( $css_file, trailingslashit( $dir_path ) . 'stripped-by-plugin_basename.php' );
48 48
 	}
49 49
 
50 50
 	return $path;
@@ -82,9 +82,9 @@  discard block
 block discarded – undo
82 82
 
83 83
 	$parsed_permalink = parse_url( get_permalink( $id ) );
84 84
 
85
-	$permalink_args =  isset( $parsed_permalink['query'] ) ? $parsed_permalink['query'] : false;
85
+	$permalink_args = isset( $parsed_permalink[ 'query' ] ) ? $parsed_permalink[ 'query' ] : false;
86 86
 
87
-	if( empty( $permalink_args ) ) {
87
+	if ( empty( $permalink_args ) ) {
88 88
 		return array();
89 89
 	}
90 90
 
@@ -109,15 +109,15 @@  discard block
 block discarded – undo
109 109
 function gv_selected( $value, $current, $echo = true, $type = 'selected' ) {
110 110
 
111 111
 	$output = '';
112
-	if( is_array( $current ) ) {
113
-		if( in_array( $value, $current ) ) {
112
+	if ( is_array( $current ) ) {
113
+		if ( in_array( $value, $current ) ) {
114 114
 			$output = __checked_selected_helper( true, true, false, $type );
115 115
 		}
116 116
 	} else {
117 117
 		$output = __checked_selected_helper( $value, $current, false, $type );
118 118
 	}
119 119
 
120
-	if( $echo ) {
120
+	if ( $echo ) {
121 121
 		echo $output;
122 122
 	}
123 123
 
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 }
126 126
 
127 127
 
128
-if( ! function_exists( 'gravityview_sanitize_html_class' ) ) {
128
+if ( ! function_exists( 'gravityview_sanitize_html_class' ) ) {
129 129
 
130 130
 	/**
131 131
 	 * sanitize_html_class doesn't handle spaces (multiple classes). We remedy that.
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
  */
172 172
 function gravityview_strip_whitespace( $string ) {
173 173
 	$string = normalize_whitespace( $string );
174
-	return preg_replace('/[\r\n\t ]+/', ' ', $string );
174
+	return preg_replace( '/[\r\n\t ]+/', ' ', $string );
175 175
 }
176 176
 
177 177
 /**
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
  * @return string Included file contents
186 186
  */
187 187
 function gravityview_ob_include( $file_path, $object = NULL ) {
188
-	if( ! file_exists( $file_path ) ) {
188
+	if ( ! file_exists( $file_path ) ) {
189 189
 		gravityview()->log->error( 'File path does not exist. {path}', array( 'path' => $file_path ) );
190 190
 		return '';
191 191
 	}
@@ -209,15 +209,15 @@  discard block
 block discarded – undo
209 209
 
210 210
 	$width = $height * 0.7586206897;
211 211
 
212
-	if( function_exists('is_rtl') && is_rtl() ) {
213
-		$style = 'margin:10px 10px 10px 0; height='. $height .'px; width: '. $width .'px;';
212
+	if ( function_exists( 'is_rtl' ) && is_rtl() ) {
213
+		$style = 'margin:10px 10px 10px 0; height=' . $height . 'px; width: ' . $width . 'px;';
214 214
 		$css_class = is_string( $css_class ) ? $css_class : 'alignright';
215 215
 	} else {
216
-		$style = 'margin:10px 10px 10px 0; height='. $height .'px; width: '. $width .'px;';
216
+		$style = 'margin:10px 10px 10px 0; height=' . $height . 'px; width: ' . $width . 'px;';
217 217
 		$css_class = is_string( $css_class ) ? $css_class : 'alignleft';
218 218
 	}
219 219
 
220
-	return '<img src="'. esc_url( plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) ) .'" class="'. gravityview_sanitize_html_class( $css_class ).'" height="'.intval( $height ).'" width="'.round( $width, 2 ).'" alt="The GravityView Astronaut Says:" style="'.$style.'" />';
220
+	return '<img src="' . esc_url( plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) ) . '" class="' . gravityview_sanitize_html_class( $css_class ) . '" height="' . intval( $height ) . '" width="' . round( $width, 2 ) . '" alt="The GravityView Astronaut Says:" style="' . $style . '" />';
221 221
 }
222 222
 
223 223
 /**
@@ -241,9 +241,9 @@  discard block
 block discarded – undo
241 241
 function gravityview_number_format( $number, $decimals = '', $separator = true ) {
242 242
 	global $wp_locale;
243 243
 
244
-	if( '' === $decimals ) {
244
+	if ( '' === $decimals ) {
245 245
 
246
-		$decimal_point = isset( $wp_locale ) ? $wp_locale->number_format['decimal_point'] : '.';
246
+		$decimal_point = isset( $wp_locale ) ? $wp_locale->number_format[ 'decimal_point' ] : '.';
247 247
 
248 248
 		/**
249 249
 		 * Calculate the position of the decimal point in the number
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
 	$parts = parse_url( $value );
277 277
 
278 278
 	// No domain? Strange...show the original text.
279
-	if( empty( $parts['host'] ) ) {
279
+	if ( empty( $parts[ 'host' ] ) ) {
280 280
 		return $value;
281 281
 	}
282 282
 
@@ -289,16 +289,16 @@  discard block
 block discarded – undo
289 289
 	 * @param boolean $enable Whether to strip the scheme. Return false to show scheme. (default: true)\n
290 290
 	 * If true: `http://example.com => example.com`
291 291
 	 */
292
-	if( false === apply_filters('gravityview_anchor_text_striphttp', true) ) {
292
+	if ( false === apply_filters( 'gravityview_anchor_text_striphttp', true ) ) {
293 293
 
294
-		if( isset( $parts['scheme'] ) ) {
295
-			$return .= $parts['scheme'];
294
+		if ( isset( $parts[ 'scheme' ] ) ) {
295
+			$return .= $parts[ 'scheme' ];
296 296
 		}
297 297
 
298 298
 	}
299 299
 
300 300
 	// The domain, which may contain a subdomain
301
-	$domain = $parts['host'];
301
+	$domain = $parts[ 'host' ];
302 302
 
303 303
 	/**
304 304
 	 * @filter `gravityview_anchor_text_stripwww` Strip www from the domain?
@@ -306,10 +306,10 @@  discard block
 block discarded – undo
306 306
 	 * @param boolean $enable Whether to strip www. Return false to show www. (default: true)\n
307 307
 	 * If true: `www.example.com => example.com`
308 308
 	 */
309
-	$strip_www = apply_filters('gravityview_anchor_text_stripwww', true );
309
+	$strip_www = apply_filters( 'gravityview_anchor_text_stripwww', true );
310 310
 
311
-	if( $strip_www ) {
312
-		$domain = str_replace('www.', '', $domain );
311
+	if ( $strip_www ) {
312
+		$domain = str_replace( 'www.', '', $domain );
313 313
 	}
314 314
 
315 315
 	/**
@@ -319,11 +319,11 @@  discard block
 block discarded – undo
319 319
 	 * If true: `http://demo.example.com => example.com` \n
320 320
 	 * If false: `http://demo.example.com => demo.example.com`
321 321
 	 */
322
-	$strip_subdomains = apply_filters('gravityview_anchor_text_nosubdomain', true);
322
+	$strip_subdomains = apply_filters( 'gravityview_anchor_text_nosubdomain', true );
323 323
 
324
-	if( $strip_subdomains ) {
324
+	if ( $strip_subdomains ) {
325 325
 
326
-		$domain = _gravityview_strip_subdomain( $parts['host'] );
326
+		$domain = _gravityview_strip_subdomain( $parts[ 'host' ] );
327 327
 
328 328
 	}
329 329
 
@@ -337,12 +337,12 @@  discard block
 block discarded – undo
337 337
 	 * If true: `http://example.com/sub/directory/page.html => example.com`  \n
338 338
 	 * If false: `http://example.com/sub/directory/page.html => example.com/sub/directory/page.html`
339 339
 	 */
340
-	$root_only = apply_filters('gravityview_anchor_text_rootonly', true);
340
+	$root_only = apply_filters( 'gravityview_anchor_text_rootonly', true );
341 341
 
342
-	if( empty( $root_only ) ) {
342
+	if ( empty( $root_only ) ) {
343 343
 
344
-		if( isset( $parts['path'] ) ) {
345
-			$return .= $parts['path'];
344
+		if ( isset( $parts[ 'path' ] ) ) {
345
+			$return .= $parts[ 'path' ];
346 346
 		}
347 347
 	}
348 348
 
@@ -352,12 +352,12 @@  discard block
 block discarded – undo
352 352
 	 * @param boolean $enable Whether to enable "root only". Return false to show full path. (default: true)\n
353 353
 	 * If true: `http://example.com/?query=example => example.com`
354 354
 	 */
355
-	$strip_query_string = apply_filters('gravityview_anchor_text_noquerystring', true );
355
+	$strip_query_string = apply_filters( 'gravityview_anchor_text_noquerystring', true );
356 356
 
357
-	if( empty( $strip_query_string ) ) {
357
+	if ( empty( $strip_query_string ) ) {
358 358
 
359
-		if( isset( $parts['query'] ) ) {
360
-			$return .= '?'.$parts['query'];
359
+		if ( isset( $parts[ 'query' ] ) ) {
360
+			$return .= '?' . $parts[ 'query' ];
361 361
 		}
362 362
 
363 363
 	}
@@ -374,8 +374,8 @@  discard block
 block discarded – undo
374 374
  */
375 375
 function _gravityview_strip_subdomain( $string_maybe_has_subdomain ) {
376 376
 
377
-	if( preg_match("/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) {
378
-		return $matches['domain'];
377
+	if ( preg_match( "/(?P<domain>[a-z0-9][a-z0-9\-]{1,63}\.(?:com\.|co\.|net\.|org\.|firm\.|me\.|school\.|law\.|gov\.|mod\.|msk\.|irkutsks\.|sa\.|act\.|police\.|plc\.|ac\.|tm\.|asso\.|biz\.|pro\.|cg\.|telememo\.)?[a-z\.]{2,6})$/i", $string_maybe_has_subdomain, $matches ) ) {
378
+		return $matches[ 'domain' ];
379 379
 	} else {
380 380
 		return $string_maybe_has_subdomain;
381 381
 	}
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
444 444
 
445 445
 		if ( in_array( $value, array( 'yes', 'true' ), true ) ) {
446 446
 			$value = true;
447
-		} else if( in_array( $value, array( 'no', 'false' ), true ) ) {
447
+		} else if ( in_array( $value, array( 'no', 'false' ), true ) ) {
448 448
 			$value = false;
449 449
 		}
450 450
 	}
@@ -473,7 +473,7 @@  discard block
 block discarded – undo
473 473
  */
474 474
 function gv_maybe_json_decode( $value, $assoc = false, $depth = 512, $options = 0 ) {
475 475
 
476
-	if( ! is_string( $value ) ) {
476
+	if ( ! is_string( $value ) ) {
477 477
 		return $value;
478 478
 	}
479 479
 
@@ -484,12 +484,12 @@  discard block
 block discarded – undo
484 484
 	}
485 485
 
486 486
 	// There was a JSON error (PHP 5.3+)
487
-	if( function_exists('json_last_error') && JSON_ERROR_NONE !== json_last_error() ) {
487
+	if ( function_exists( 'json_last_error' ) && JSON_ERROR_NONE !== json_last_error() ) {
488 488
 		return $value;
489 489
 	}
490 490
 
491 491
 	// It wasn't JSON (PHP < 5.3 fallback)
492
-	if( is_null( $decoded ) ) {
492
+	if ( is_null( $decoded ) ) {
493 493
 		return $value;
494 494
 	}
495 495
 
@@ -556,7 +556,7 @@  discard block
 block discarded – undo
556 556
 
557 557
 	$exploded = explode( '.', "{$field_id}" );
558 558
 
559
-	return isset( $exploded[1] ) ? intval( $exploded[1] ) : false;
559
+	return isset( $exploded[ 1 ] ) ? intval( $exploded[ 1 ] ) : false;
560 560
 }
561 561
 
562 562
 /**
@@ -597,13 +597,13 @@  discard block
 block discarded – undo
597 597
 	 */
598 598
 	$args = apply_filters( 'gravityview_get_terms_choices_args', $args );
599 599
 
600
-	$terms = get_terms( $args['taxonomy'], $args );
600
+	$terms = get_terms( $args[ 'taxonomy' ], $args );
601 601
 
602 602
 	$choices = array();
603 603
 
604 604
 	if ( is_array( $terms ) ) {
605 605
 		foreach ( $terms as $term_id => $term_name ) {
606
-			$choices[] = array(
606
+			$choices[ ] = array(
607 607
 				'text'  => $term_name,
608 608
 				'value' => $term_id
609 609
 			);
@@ -627,21 +627,21 @@  discard block
 block discarded – undo
627 627
 function _gravityview_process_posted_fields() {
628 628
 	$fields = array();
629 629
 
630
-	if( !empty( $_POST['gv_fields'] ) ) {
631
-		if ( ! is_array( $_POST['gv_fields'] ) ) {
630
+	if ( ! empty( $_POST[ 'gv_fields' ] ) ) {
631
+		if ( ! is_array( $_POST[ 'gv_fields' ] ) ) {
632 632
 
633 633
 			// We are not using parse_str() due to max_input_vars limitation with large View configurations
634 634
 			$fields_holder = array();
635
-			GVCommon::gv_parse_str( stripslashes( $_POST['gv_fields'] ), $fields_holder );
635
+			GVCommon::gv_parse_str( stripslashes( $_POST[ 'gv_fields' ] ), $fields_holder );
636 636
 
637
-			if ( isset( $fields_holder['fields'] ) ) {
638
-				$fields = $fields_holder['fields'];
637
+			if ( isset( $fields_holder[ 'fields' ] ) ) {
638
+				$fields = $fields_holder[ 'fields' ];
639 639
 			} else {
640 640
 				gravityview()->log->error( 'No `fields` key was found after parsing $fields string', array( 'data' => $fields_holder ) );
641 641
 			}
642 642
 
643 643
 		} else {
644
-			$fields = $_POST['gv_fields'];
644
+			$fields = $_POST[ 'gv_fields' ];
645 645
 		}
646 646
 	}
647 647
 
Please login to merge, or discard this patch.
includes/class-gravityview-admin-notices.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -60,21 +60,21 @@  discard block
 block discarded – undo
60 60
 	public function dismiss_notice() {
61 61
 
62 62
 		// No dismiss sent
63
-		if( empty( $_GET['gv-dismiss'] ) || empty( $_GET['notice'] ) ) {
63
+		if ( empty( $_GET[ 'gv-dismiss' ] ) || empty( $_GET[ 'notice' ] ) ) {
64 64
 			return;
65 65
 		}
66 66
 
67 67
 		// Invalid nonce
68
-		if( !wp_verify_nonce( $_GET['gv-dismiss'], 'dismiss' ) ) {
68
+		if ( ! wp_verify_nonce( $_GET[ 'gv-dismiss' ], 'dismiss' ) ) {
69 69
 			return;
70 70
 		}
71 71
 
72
-		$notice_id = esc_attr( $_GET['notice'] );
72
+		$notice_id = esc_attr( $_GET[ 'notice' ] );
73 73
 
74 74
 		//don't display a message if use has dismissed the message for this version
75 75
 		$dismissed_notices = (array)get_transient( 'gravityview_dismissed_notices' );
76 76
 
77
-		$dismissed_notices[] = $notice_id;
77
+		$dismissed_notices[ ] = $notice_id;
78 78
 
79 79
 		$dismissed_notices = array_unique( $dismissed_notices );
80 80
 
@@ -97,12 +97,12 @@  discard block
 block discarded – undo
97 97
 	private function is_notice_dismissed( $notice ) {
98 98
 
99 99
 		// There are no dismissed notices.
100
-		if( empty( self::$dismissed_notices ) ) {
100
+		if ( empty( self::$dismissed_notices ) ) {
101 101
 			return false;
102 102
 		}
103 103
 
104 104
 		// Has the
105
-		$is_dismissed = !empty( $notice['dismiss'] ) && in_array( $notice['dismiss'], self::$dismissed_notices );
105
+		$is_dismissed = ! empty( $notice[ 'dismiss' ] ) && in_array( $notice[ 'dismiss' ], self::$dismissed_notices );
106 106
 
107 107
 		return $is_dismissed ? true : false;
108 108
 	}
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 	 */
128 128
 	private function check_show_multisite_notices() {
129 129
 
130
-		if( ! is_multisite() ) {
130
+		if ( ! is_multisite() ) {
131 131
 			return true;
132 132
 		}
133 133
 
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 		}
138 138
 
139 139
 		// or they don't have admin capabilities
140
-		if( ! is_super_admin() ) {
140
+		if ( ! is_super_admin() ) {
141 141
 			return false;
142 142
 		}
143 143
 
@@ -160,48 +160,48 @@  discard block
 block discarded – undo
160 160
 		 */
161 161
 		$notices = apply_filters( 'gravityview/admin/notices', self::$admin_notices );
162 162
 
163
-		if( empty( $notices ) || ! $this->check_show_multisite_notices() ) {
163
+		if ( empty( $notices ) || ! $this->check_show_multisite_notices() ) {
164 164
 			return;
165 165
 		}
166 166
 
167 167
 		//don't display a message if use has dismissed the message for this version
168 168
 		// TODO: Use get_user_meta instead of get_transient
169
-		self::$dismissed_notices = isset( $_GET['show-dismissed-notices'] ) ? array() : (array)get_transient( 'gravityview_dismissed_notices' );
169
+		self::$dismissed_notices = isset( $_GET[ 'show-dismissed-notices' ] ) ? array() : (array)get_transient( 'gravityview_dismissed_notices' );
170 170
 
171 171
 		$output = '';
172 172
 
173
-		foreach( $notices as $notice ) {
173
+		foreach ( $notices as $notice ) {
174 174
 
175 175
 			// If the user doesn't have the capability to see the warning
176
-			if( isset( $notice['cap'] ) && false === GVCommon::has_cap( $notice['cap'] ) ) {
176
+			if ( isset( $notice[ 'cap' ] ) && false === GVCommon::has_cap( $notice[ 'cap' ] ) ) {
177 177
 				gravityview()->log->debug( 'Notice not shown because user does not have the capability to view it.', array( 'data' => $notice ) );
178 178
 				continue;
179 179
 			}
180 180
 
181
-			if( true === $this->is_notice_dismissed( $notice ) ) {
181
+			if ( true === $this->is_notice_dismissed( $notice ) ) {
182 182
 				gravityview()->log->debug( 'Notice not shown because the notice has already been dismissed.', array( 'data' => $notice ) );
183 183
 				continue;
184 184
 			}
185 185
 
186
-			$output .= '<div id="message" style="position:relative" class="notice '. gravityview_sanitize_html_class( $notice['class'] ).'">';
186
+			$output .= '<div id="message" style="position:relative" class="notice ' . gravityview_sanitize_html_class( $notice[ 'class' ] ) . '">';
187 187
 
188 188
 			// Too cute to leave out.
189 189
 			$output .= gravityview_get_floaty();
190 190
 
191
-			if( !empty( $notice['title'] ) ) {
192
-				$output .= '<h3>'.esc_html( $notice['title'] ) .'</h3>';
191
+			if ( ! empty( $notice[ 'title' ] ) ) {
192
+				$output .= '<h3>' . esc_html( $notice[ 'title' ] ) . '</h3>';
193 193
 			}
194 194
 
195
-			$message = isset( $notice['message'] ) ? $notice['message'] : '';
195
+			$message = isset( $notice[ 'message' ] ) ? $notice[ 'message' ] : '';
196 196
 
197
-			if( !empty( $notice['dismiss'] ) ) {
197
+			if ( ! empty( $notice[ 'dismiss' ] ) ) {
198 198
 
199
-				$dismiss = esc_attr($notice['dismiss']);
199
+				$dismiss = esc_attr( $notice[ 'dismiss' ] );
200 200
 
201 201
 				$url = esc_url( add_query_arg( array( 'gv-dismiss' => wp_create_nonce( 'dismiss' ), 'notice' => $dismiss ) ) );
202 202
 
203 203
 				$align = is_rtl() ? 'alignleft' : 'alignright';
204
-				$message .= '<a href="'.$url.'" data-notice="'.$dismiss.'" class="' . $align . ' button button-link">'.esc_html__('Dismiss', 'gravityview' ).'</a></p>';
204
+				$message .= '<a href="' . $url . '" data-notice="' . $dismiss . '" class="' . $align . ' button button-link">' . esc_html__( 'Dismiss', 'gravityview' ) . '</a></p>';
205 205
 			}
206 206
 
207 207
 			$output .= wpautop( $message );
@@ -233,14 +233,14 @@  discard block
 block discarded – undo
233 233
 	 */
234 234
 	public static function add_notice( $notice = array() ) {
235 235
 
236
-		if( !isset( $notice['message'] ) ) {
236
+		if ( ! isset( $notice[ 'message' ] ) ) {
237 237
 			gravityview()->log->error( 'Notice not set', array( 'data' => $notice ) );
238 238
 			return;
239 239
 		}
240 240
 
241
-		$notice['class'] = empty( $notice['class'] ) ? 'error' : $notice['class'];
241
+		$notice[ 'class' ] = empty( $notice[ 'class' ] ) ? 'error' : $notice[ 'class' ];
242 242
 
243
-		self::$admin_notices[] = $notice;
243
+		self::$admin_notices[ ] = $notice;
244 244
 	}
245 245
 }
246 246
 
Please login to merge, or discard this patch.
future/includes/class-gv-renderer.php 1 patch
Spacing   +5 added lines, -6 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 		$current_user  = wp_get_current_user();
82 82
 		$user_meta_key = '_gv_dismissed_entry_approval_notice' . $gravityview->view->ID;
83 83
 
84
-		if ( isset( $_GET['gv-dismiss'] ) && wp_verify_nonce( $_GET['gv-dismiss'], 'dismiss' ) ) {
84
+		if ( isset( $_GET[ 'gv-dismiss' ] ) && wp_verify_nonce( $_GET[ 'gv-dismiss' ], 'dismiss' ) ) {
85 85
 			add_user_meta( $current_user->ID, $user_meta_key, 1 ); // Prevent user from seeing this again for this View
86 86
 			return;
87 87
 		}
@@ -150,8 +150,7 @@  discard block
 block discarded – undo
150 150
 				$tab = __( 'Edit Entry', 'gravityview' );
151 151
 				$context = 'edit';
152 152
 				break;
153
-			case ( $gravityview->request->is_entry( $gravityview->view->form ? $gravityview->view->form->ID : 0 ) ):
154
-				$tab = __( 'Single Entry', 'gravityview' );
153
+			case ( $gravityview->request->is_entry( $gravityview->view->form ? $gravityview->view->form->ID : 0 ) ) : $tab = __( 'Single Entry', 'gravityview' );
155 154
 				$context = 'single';
156 155
 				break;
157 156
 			default:
@@ -173,7 +172,7 @@  discard block
 block discarded – undo
173 172
 		$action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab );
174 173
 		$message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' );
175 174
 
176
-		$image =  sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
175
+		$image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) );
177 176
 		$output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message );
178 177
 
179 178
 		echo \GVCommon::generate_notice( $output . $image, 'gv-warning warning', 'edit_gravityview', $gravityview->view->ID );
@@ -199,11 +198,11 @@  discard block
 block discarded – undo
199 198
 
200 199
 		$post_types = get_post_types();
201 200
 
202
-		foreach( $post_types as $post_type ) {
201
+		foreach ( $post_types as $post_type ) {
203 202
 			$post_type_rewrite = get_post_type_object( $post_type )->rewrite;
204 203
 
205 204
 			if ( $slug = \GV\Utils::get( $post_type_rewrite, 'slug' ) ) {
206
-				$reserved_slugs[] = $slug;
205
+				$reserved_slugs[ ] = $slug;
207 206
 			}
208 207
 		}
209 208
 
Please login to merge, or discard this patch.
includes/extensions/delete-entry/class-delete-entry.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 	 */
113 113
 	public function add_reserved_arg( $args ) {
114 114
 
115
-		$args[] = 'delete';
115
+		$args[ ] = 'delete';
116 116
 
117 117
 		return $args;
118 118
 	}
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 
183 183
 		// Index 100 is the default GravityView template path.
184 184
 		// Index 110 is Edit Entry link
185
-		$file_paths[115] = self::$file;
185
+		$file_paths[ 115 ] = self::$file;
186 186
 
187 187
 		return $file_paths;
188 188
 	}
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
 
287 287
 		$attributes = array(
288 288
 			'class' => 'btn btn-sm button button-small alignright pull-right btn-danger gv-button-delete',
289
-			'tabindex' => ( GFCommon::$tab_index ++ ),
289
+			'tabindex' => ( GFCommon::$tab_index++ ),
290 290
 			'onclick' => self::get_confirm_dialog(),
291 291
 		);
292 292
 
@@ -322,12 +322,12 @@  discard block
 block discarded – undo
322 322
 		);
323 323
 
324 324
 		// If the form is not submitted, return early
325
-		if ( 'delete' !== $get_fields['action'] || empty( $get_fields['entry_id'] ) ) {
325
+		if ( 'delete' !== $get_fields[ 'action' ] || empty( $get_fields[ 'entry_id' ] ) ) {
326 326
 			return;
327 327
 		}
328 328
 
329 329
 		// Make sure it's a GravityView request
330
-		$valid_nonce_key = wp_verify_nonce( $get_fields['delete'], self::get_nonce_key( $get_fields['entry_id'] ) );
330
+		$valid_nonce_key = wp_verify_nonce( $get_fields[ 'delete' ], self::get_nonce_key( $get_fields[ 'entry_id' ] ) );
331 331
 
332 332
 		if ( ! $valid_nonce_key ) {
333 333
 			gravityview()->log->debug( 'Delete entry not processed: nonce validation failed.' );
@@ -336,10 +336,10 @@  discard block
 block discarded – undo
336 336
 		}
337 337
 
338 338
 		// Get the entry slug
339
-		$entry_slug = esc_attr( $get_fields['entry_id'] );
339
+		$entry_slug = esc_attr( $get_fields[ 'entry_id' ] );
340 340
 
341 341
 		// Redirect after deleting the entry.
342
-		$view = \GV\View::by_id( $get_fields['view_id'] );
342
+		$view = \GV\View::by_id( $get_fields[ 'view_id' ] );
343 343
 
344 344
 		// See if there's an entry there
345 345
 		$entry = gravityview_get_entry( $entry_slug, true, false, $view );
@@ -366,9 +366,9 @@  discard block
 block discarded – undo
366 366
 			$this->_redirect_and_exit( $delete_redirect_base, $delete_response->get_error_message(), 'error' );
367 367
 		}
368 368
 
369
-		if ( (int) $view->settings->get( 'delete_redirect' ) === self::REDIRECT_TO_URL_VALUE ) {
369
+		if ( (int)$view->settings->get( 'delete_redirect' ) === self::REDIRECT_TO_URL_VALUE ) {
370 370
 
371
-			$form                 = GFAPI::get_form( $entry['form_id'] );
371
+			$form                 = GFAPI::get_form( $entry[ 'form_id' ] );
372 372
 			$redirect_url_setting = $view->settings->get( 'delete_redirect_url' );
373 373
 			$redirect_url         = GFCommon::replace_variables( $redirect_url_setting, $form, $entry, false, false, false, 'text' );
374 374
 
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
444 444
 	 */
445 445
 	private function delete_or_trash_entry( $entry ) {
446 446
 
447
-		$entry_id = $entry['id'];
447
+		$entry_id = $entry[ 'id' ];
448 448
 
449 449
 		$mode = $this->get_delete_mode();
450 450
 
@@ -508,7 +508,7 @@  discard block
 block discarded – undo
508 508
 	public function process_connected_posts( $entry_id = 0, $entry = array() ) {
509 509
 
510 510
 		// The entry had no connected post
511
-		if ( empty( $entry['post_id'] ) ) {
511
+		if ( empty( $entry[ 'post_id' ] ) ) {
512 512
 			return;
513 513
 		}
514 514
 
@@ -526,9 +526,9 @@  discard block
 block discarded – undo
526 526
 		$action = current_action();
527 527
 
528 528
 		if ( 'gravityview/delete-entry/deleted' === $action ) {
529
-			$result = wp_delete_post( $entry['post_id'], true );
529
+			$result = wp_delete_post( $entry[ 'post_id' ], true );
530 530
 		} else {
531
-			$result = wp_trash_post( $entry['post_id'] );
531
+			$result = wp_trash_post( $entry[ 'post_id' ] );
532 532
 		}
533 533
 
534 534
 		if ( false === $result ) {
@@ -559,13 +559,13 @@  discard block
 block discarded – undo
559 559
 	public function verify_nonce() {
560 560
 
561 561
 		// No delete entry request was made
562
-		if ( empty( $_GET['entry_id'] ) || empty( $_GET['delete'] ) ) {
562
+		if ( empty( $_GET[ 'entry_id' ] ) || empty( $_GET[ 'delete' ] ) ) {
563 563
 			return false;
564 564
 		}
565 565
 
566
-		$nonce_key = self::get_nonce_key( $_GET['entry_id'] );
566
+		$nonce_key = self::get_nonce_key( $_GET[ 'entry_id' ] );
567 567
 
568
-		$valid = wp_verify_nonce( $_GET['delete'], $nonce_key );
568
+		$valid = wp_verify_nonce( $_GET[ 'delete' ], $nonce_key );
569 569
 
570 570
 		/**
571 571
 		 * @filter `gravityview/delete-entry/verify_nonce` Override Delete Entry nonce validation. Return true to declare nonce valid.
@@ -621,7 +621,7 @@  discard block
 block discarded – undo
621 621
 			$error = __( 'You do not have permission to delete this entry.', 'gravityview' );
622 622
 		}
623 623
 
624
-		if ( $entry['status'] === 'trash' ) {
624
+		if ( $entry[ 'status' ] === 'trash' ) {
625 625
 			if ( 'trash' === $this->get_delete_mode() ) {
626 626
 				$error = __( 'The entry is already in the trash.', 'gravityview' );
627 627
 			} else {
@@ -665,7 +665,7 @@  discard block
 block discarded – undo
665 665
 
666 666
 		$current_user = wp_get_current_user();
667 667
 
668
-		$entry_id = isset( $entry['id'] ) ? $entry['id'] : null;
668
+		$entry_id = isset( $entry[ 'id' ] ) ? $entry[ 'id' ] : null;
669 669
 
670 670
 		// Or if they can delete any entries (as defined in Gravity Forms), we're good.
671 671
 		if ( GVCommon::has_cap( array( 'gravityforms_delete_entries', 'gravityview_delete_others_entries' ), $entry_id ) ) {
@@ -679,17 +679,17 @@  discard block
 block discarded – undo
679 679
 		if ( ! empty( $field ) ) {
680 680
 
681 681
 			// If capability is not defined, something is not right!
682
-			if ( empty( $field['allow_edit_cap'] ) ) {
682
+			if ( empty( $field[ 'allow_edit_cap' ] ) ) {
683 683
 
684 684
 				gravityview()->log->error( 'Cannot read delete entry field caps', array( 'data' => $field ) );
685 685
 
686 686
 				return false;
687 687
 			}
688 688
 
689
-			if ( GVCommon::has_cap( $field['allow_edit_cap'] ) ) {
689
+			if ( GVCommon::has_cap( $field[ 'allow_edit_cap' ] ) ) {
690 690
 
691 691
 				// Do not return true if cap is read, as we need to check if the current user created the entry
692
-				if ( $field['allow_edit_cap'] !== 'read' ) {
692
+				if ( $field[ 'allow_edit_cap' ] !== 'read' ) {
693 693
 					return true;
694 694
 				}
695 695
 			} else {
@@ -700,7 +700,7 @@  discard block
 block discarded – undo
700 700
 			}
701 701
 		}
702 702
 
703
-		if ( ! isset( $entry['created_by'] ) ) {
703
+		if ( ! isset( $entry[ 'created_by' ] ) ) {
704 704
 
705 705
 			gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' );
706 706
 
@@ -716,7 +716,7 @@  discard block
 block discarded – undo
716 716
 		}
717 717
 
718 718
 		// If the logged-in user is the same as the user who created the entry, we're good.
719
-		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
719
+		if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
720 720
 
721 721
 			gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id' => $current_user->ID ) );
722 722
 
@@ -741,12 +741,12 @@  discard block
 block discarded – undo
741 741
 	 */
742 742
 	public function maybe_display_message( $current_view_id = 0 ) {
743 743
 
744
-		if ( empty( $_GET['status'] ) || ! self::verify_nonce() ) {
744
+		if ( empty( $_GET[ 'status' ] ) || ! self::verify_nonce() ) {
745 745
 			return;
746 746
 		}
747 747
 
748 748
 		// Entry wasn't deleted from current View
749
-		if ( isset( $_GET['view_id'] ) && intval( $_GET['view_id'] ) !== intval( $current_view_id ) ) {
749
+		if ( isset( $_GET[ 'view_id' ] ) && intval( $_GET[ 'view_id' ] ) !== intval( $current_view_id ) ) {
750 750
 			return;
751 751
 		}
752 752
 
@@ -755,11 +755,11 @@  discard block
 block discarded – undo
755 755
 
756 756
 	public function display_message() {
757 757
 
758
-		if ( empty( $_GET['status'] ) || empty( $_GET['delete'] ) ) {
758
+		if ( empty( $_GET[ 'status' ] ) || empty( $_GET[ 'delete' ] ) ) {
759 759
 			return;
760 760
 		}
761 761
 
762
-		$status = esc_attr( $_GET['status'] );
762
+		$status = esc_attr( $_GET[ 'status' ] );
763 763
 		$message_from_url = \GV\Utils::_GET( 'message' );
764 764
 		$message_from_url = rawurldecode( stripslashes_deep( $message_from_url ) );
765 765
 		$class = '';
Please login to merge, or discard this patch.