Completed
Push — develop ( 578953...555ad7 )
by Zack
26:20 queued 13:08
created
includes/admin/metaboxes/views/sort-filter.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -28,18 +28,18 @@
 block discarded – undo
28 28
 
29 29
 	$sort_fields_input = '<select name="template_settings[sort_field][]" class="gravityview_sort_field" id="gravityview_sort_field_%d">%s</select>';
30 30
 
31
-	if ( is_array( $current_settings['sort_field'] ) ) {
32
-		$primary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings['sort_field'][0] );
33
-		$secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings['sort_field'][1] );
31
+	if ( is_array( $current_settings[ 'sort_field' ] ) ) {
32
+		$primary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings[ 'sort_field' ][ 0 ] );
33
+		$secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings[ 'sort_field' ][ 1 ] );
34 34
 	} else {
35
-		$primary_sort_fields = $secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings['sort_field'] );
35
+		$primary_sort_fields = $secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings[ 'sort_field' ] );
36 36
 	}
37 37
 
38 38
 	// Splice the sort direction
39 39
 	$_directions = array();
40 40
 	foreach ( (array)\GV\Utils::get( $current_settings, 'sort_direction', array() ) as $i => $direction ) {
41 41
 		if ( ! $i ) {
42
-			$_directions['sort_direction'] = $direction;
42
+			$_directions[ 'sort_direction' ] = $direction;
43 43
 		} else {
44 44
 			$_directions[ sprintf( 'sort_direction_%d', $i + 1 ) ] = $direction;
45 45
 		}
Please login to merge, or discard this patch.
future/includes/class-gv-template-view-table.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -69,22 +69,22 @@  discard block
 block discarded – undo
69 69
 			if ( is_array( $sorts ) ) {
70 70
 				foreach ( (array)$sorts as $key => $direction ) {
71 71
 					if ( $key == $context->field->ID ) {
72
-						$sorting['key'] = $context->field->ID;
73
-						$sorting['direction'] = strtolower( $direction );
72
+						$sorting[ 'key' ] = $context->field->ID;
73
+						$sorting[ 'direction' ] = strtolower( $direction );
74 74
 						break;
75 75
 					}
76 76
 				}
77 77
 			} else {
78 78
 				if ( $sorts == $context->field->ID ) {
79
-					$sorting['key'] = $context->field->ID;
80
-					$sorting['direction'] = strtolower( Utils::_GET( 'dir', '' ) );
79
+					$sorting[ 'key' ] = $context->field->ID;
80
+					$sorting[ 'direction' ] = strtolower( Utils::_GET( 'dir', '' ) );
81 81
 				}
82 82
 			}
83 83
 		} else {
84 84
 			foreach ( (array)$context->view->settings->get( 'sort_field', array() ) as $i => $sort_field ) {
85 85
 				if ( $sort_field == $context->field->ID ) {
86
-					$sorting['key'] = $sort_field;
87
-					$sorting['direction'] = strtolower( Utils::get( $directions, $i, '' ) );
86
+					$sorting[ 'key' ] = $sort_field;
87
+					$sorting[ 'direction' ] = strtolower( Utils::get( $directions, $i, '' ) );
88 88
 					break; // Only get the first sort
89 89
 				}
90 90
 			}
@@ -100,21 +100,21 @@  discard block
 block discarded – undo
100 100
 		);
101 101
 
102 102
 		// If we are already sorting by the current field...
103
-		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
103
+		if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) {
104 104
 
105
-		    switch( $sorting['direction'] ) {
105
+		    switch ( $sorting[ 'direction' ] ) {
106 106
 		        // No sort
107 107
                 case '':
108
-	                $sort_args[1] = 'asc';
108
+	                $sort_args[ 1 ] = 'asc';
109 109
 	                $class .= ' gv-icon-caret-up-down';
110 110
                     break;
111 111
                 case 'desc':
112
-	                $sort_args[1] = '';
112
+	                $sort_args[ 1 ] = '';
113 113
 	                $class .= ' gv-icon-sort-asc';
114 114
 	                break;
115 115
                 case 'asc':
116 116
                 default:
117
-                    $sort_args[1] = 'desc';
117
+                    $sort_args[ 1 ] = 'desc';
118 118
                     $class .= ' gv-icon-sort-desc';
119 119
                     break;
120 120
             }
@@ -127,15 +127,15 @@  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
-		$return = '<a href="'. esc_url_raw( $url ) .'"';
132
+		$return = '<a href="' . esc_url_raw( $url ) . '"';
133 133
 
134 134
 		if ( ! empty( $multisort_url ) ) {
135
-			$return .= ' data-multisort-href="'. esc_url_raw( $multisort_url ) . '"';
135
+			$return .= ' data-multisort-href="' . esc_url_raw( $multisort_url ) . '"';
136 136
 		}
137 137
 
138
-		$return .= ' class="'. $class .'" ></a>&nbsp;'. $column_label;
138
+		$return .= ' class="' . $class . '" ></a>&nbsp;' . $column_label;
139 139
 
140 140
 		return $return;
141 141
 	}
@@ -168,19 +168,19 @@  discard block
 block discarded – undo
168 168
         if ( ! in_array( $field_id, $keys = array_keys( $sorts ) ) ) {
169 169
             if ( count( $keys ) ) {
170 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 );
171
+                $multisort_url = add_query_arg( $sort_args[ 0 ], $sort_args[ 1 ], $multisort_url );
172 172
             } else {
173
-                $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url );
173
+                $multisort_url = add_query_arg( $sort_args[ 0 ], $sort_args[ 1 ], $multisort_url );
174 174
             }
175 175
         }
176 176
         // Otherwise, we are just updating the sort order
177 177
         else {
178 178
 
179 179
             // Pass empty value to unset
180
-            if( '' === $sort_args[1] ) {
180
+            if ( '' === $sort_args[ 1 ] ) {
181 181
 	            unset( $sorts[ $field_id ] );
182 182
             } else {
183
-	            $sorts[ $field_id ] = $sort_args[1];
183
+	            $sorts[ $field_id ] = $sort_args[ 1 ];
184 184
             }
185 185
 
186 186
             $multisort_url = add_query_arg( array( 'sort' => $sorts ), $multisort_url );
@@ -318,9 +318,9 @@  discard block
 block discarded – undo
318 318
                 do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() );
319 319
 
320 320
                 foreach ( $fields->all() as $field ) {
321
-					if ( isset( $this->view->unions[ $entry['form_id'] ] ) ) {
322
-						if ( isset( $this->view->unions[ $entry['form_id'] ][ $field->ID ] ) ) {
323
-							$field = $this->view->unions[ $entry['form_id'] ][ $field->ID ];
321
+					if ( isset( $this->view->unions[ $entry[ 'form_id' ] ] ) ) {
322
+						if ( isset( $this->view->unions[ $entry[ 'form_id' ] ][ $field->ID ] ) ) {
323
+							$field = $this->view->unions[ $entry[ 'form_id' ] ][ $field->ID ];
324 324
 						} else {
325 325
 							if ( ! $field instanceof Internal_Field ) {
326 326
 								$field = Internal_Field::from_configuration( array( 'id' => 'custom' ) );
Please login to merge, or discard this patch.
includes/class-admin-approve-entries.php 1 patch
Spacing   +65 added lines, -65 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 		/** gf_entries page - entries table screen */
45 45
 
46 46
 		// capture bulk actions
47
-		add_action( 'gform_loaded', array( $this, 'process_bulk_action') );
47
+		add_action( 'gform_loaded', array( $this, 'process_bulk_action' ) );
48 48
 
49 49
 		// add hidden field with approve status
50 50
 		add_action( 'gform_entries_first_column_actions', array( $this, 'add_entry_approved_hidden_input' ), 1, 5 );
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 		add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'tooltips' ) );
53 53
 
54 54
 		// adding styles and scripts
55
-		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles') );
55
+		add_action( 'admin_enqueue_scripts', array( $this, 'add_scripts_and_styles' ) );
56 56
 		// bypass Gravity Forms no-conflict mode
57 57
 		add_filter( 'gform_noconflict_scripts', array( $this, 'register_gform_noconflict_script' ) );
58 58
 		add_filter( 'gform_noconflict_styles', array( $this, 'register_gform_noconflict_style' ) );
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 		 * @param bool $show_filter_links True: show the "approved"/"disapproved" filter links. False: hide them.
82 82
 		 * @param array $form GF Form object of current form
83 83
 		 */
84
-		if( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) {
84
+		if ( false === apply_filters( 'gravityview/approve_entries/show_filter_links_entry_list', true, $form ) ) {
85 85
 			return $filter_links;
86 86
 		}
87 87
 
@@ -109,27 +109,27 @@  discard block
 block discarded – undo
109 109
 		$approved_count = $disapproved_count = $unapproved_count = 0;
110 110
 
111 111
 		// Only count if necessary
112
-		if( $include_counts ) {
113
-			$approved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) );
114
-			$disapproved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) );
115
-			$unapproved_count = count( gravityview_get_entry_ids( $form['id'], array( 'status' => 'active', 'field_filters' => $field_filters_unapproved ) ) );
112
+		if ( $include_counts ) {
113
+			$approved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_approved ) ) );
114
+			$disapproved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_disapproved ) ) );
115
+			$unapproved_count = count( gravityview_get_entry_ids( $form[ 'id' ], array( 'status' => 'active', 'field_filters' => $field_filters_unapproved ) ) );
116 116
 		}
117 117
 
118
-		$filter_links[] = array(
118
+		$filter_links[ ] = array(
119 119
 			'id'            => 'gv_approved',
120 120
 			'field_filters' => $field_filters_approved,
121 121
 			'count'         => $approved_count,
122 122
 			'label'         => GravityView_Entry_Approval_Status::get_label( GravityView_Entry_Approval_Status::APPROVED ),
123 123
 		);
124 124
 
125
-		$filter_links[] = array(
125
+		$filter_links[ ] = array(
126 126
 			'id'            => 'gv_disapproved',
127 127
 			'field_filters' => $field_filters_disapproved,
128 128
 			'count'         => $disapproved_count,
129 129
 			'label'         => GravityView_Entry_Approval_Status::get_label( GravityView_Entry_Approval_Status::DISAPPROVED ),
130 130
 		);
131 131
 
132
-		$filter_links[] = array(
132
+		$filter_links[ ] = array(
133 133
 			'id'            => 'gv_unapproved',
134 134
 			'field_filters' => $field_filters_unapproved,
135 135
 			'count'         => $unapproved_count,
@@ -148,9 +148,9 @@  discard block
 block discarded – undo
148 148
 	 */
149 149
 	function tooltips( $tooltips ) {
150 150
 
151
-		$tooltips['form_gravityview_fields'] = array(
152
-			'title' => __('GravityView Fields', 'gravityview'),
153
-			'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview'),
151
+		$tooltips[ 'form_gravityview_fields' ] = array(
152
+			'title' => __( 'GravityView Fields', 'gravityview' ),
153
+			'value' => __( 'Allow administrators to approve or reject entries and users to opt-in or opt-out of their entries being displayed.', 'gravityview' ),
154 154
 		);
155 155
 
156 156
 		return $tooltips;
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
 
262 262
 		$gv_bulk_action = false;
263 263
 
264
-		if( version_compare( GFForms::$version, '2.0', '>=' ) ) {
264
+		if ( version_compare( GFForms::$version, '2.0', '>=' ) ) {
265 265
 			$bulk_action = ( '-1' !== \GV\Utils::_POST( 'action' ) ) ? \GV\Utils::_POST( 'action' ) : \GV\Utils::_POST( 'action2' );
266 266
 		} else {
267 267
 			// GF 1.9.x - Bulk action 2 is the bottom bulk action select form.
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
 		}
270 270
 
271 271
 		// Check the $bulk_action value against GV actions, see if they're the same. I hate strpos().
272
-		if( ! empty( $bulk_action ) && preg_match( '/^('. implode( '|', $this->bulk_action_prefixes ) .')/ism', $bulk_action ) ) {
272
+		if ( ! empty( $bulk_action ) && preg_match( '/^(' . implode( '|', $this->bulk_action_prefixes ) . ')/ism', $bulk_action ) ) {
273 273
 			$gv_bulk_action = $bulk_action;
274 274
 		}
275 275
 
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
 
295 295
 		// gforms_entry_list is the nonce that confirms we're on the right page
296 296
 		// gforms_update_note is sent when bulk editing entry notes. We don't want to process then.
297
-		if ( $bulk_action && \GV\Utils::_POST( 'gforms_entry_list' ) && empty( $_POST['gforms_update_note'] ) ) {
297
+		if ( $bulk_action && \GV\Utils::_POST( 'gforms_entry_list' ) && empty( $_POST[ 'gforms_update_note' ] ) ) {
298 298
 
299 299
 			check_admin_referer( 'gforms_entry_list', 'gforms_entry_list' );
300 300
 
@@ -312,13 +312,13 @@  discard block
 block discarded – undo
312 312
 			}
313 313
 
314 314
 			// All entries are set to be updated, not just the visible ones
315
-			if ( ! empty( $_POST['all_entries'] ) ) {
315
+			if ( ! empty( $_POST[ 'all_entries' ] ) ) {
316 316
 
317 317
 				// Convert the current entry search into GF-formatted search criteria
318 318
 				$search = array(
319
-					'search_field' => isset( $_POST['f'] ) ? $_POST['f'][0] : 0,
320
-					'search_value' => isset( $_POST['v'][0] ) ? $_POST['v'][0] : '',
321
-					'search_operator' => isset( $_POST['o'][0] ) ? $_POST['o'][0] : 'contains',
319
+					'search_field' => isset( $_POST[ 'f' ] ) ? $_POST[ 'f' ][ 0 ] : 0,
320
+					'search_value' => isset( $_POST[ 'v' ][ 0 ] ) ? $_POST[ 'v' ][ 0 ] : '',
321
+					'search_operator' => isset( $_POST[ 'o' ][ 0 ] ) ? $_POST[ 'o' ][ 0 ] : 'contains',
322 322
 				);
323 323
 
324 324
 				$search_criteria = GravityView_frontend::get_search_criteria( $search, $form_id );
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
 			} else {
330 330
 
331 331
 				// Changed from 'lead' to 'entry' in 2.0
332
-				$entries = isset( $_POST['lead'] ) ? $_POST['lead'] : $_POST['entry'];
332
+				$entries = isset( $_POST[ 'lead' ] ) ? $_POST[ 'lead' ] : $_POST[ 'entry' ];
333 333
 
334 334
 			}
335 335
 
@@ -341,15 +341,15 @@  discard block
 block discarded – undo
341 341
 			$entry_count = count( $entries ) > 1 ? sprintf( __( '%d entries', 'gravityview' ), count( $entries ) ) : __( '1 entry', 'gravityview' );
342 342
 
343 343
 			switch ( $approved_status ) {
344
-				case $this->bulk_action_prefixes['approve']:
344
+				case $this->bulk_action_prefixes[ 'approve' ]:
345 345
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::APPROVED, $form_id );
346 346
 					$this->bulk_update_message = sprintf( __( '%s approved.', 'gravityview' ), $entry_count );
347 347
 					break;
348
-				case $this->bulk_action_prefixes['unapprove']:
348
+				case $this->bulk_action_prefixes[ 'unapprove' ]:
349 349
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::UNAPPROVED, $form_id );
350 350
 					$this->bulk_update_message = sprintf( __( '%s unapproved.', 'gravityview' ), $entry_count );
351 351
 					break;
352
-				case $this->bulk_action_prefixes['disapprove']:
352
+				case $this->bulk_action_prefixes[ 'disapprove' ]:
353 353
 					GravityView_Entry_Approval::update_bulk( $entries, GravityView_Entry_Approval_Status::DISAPPROVED, $form_id );
354 354
 					$this->bulk_update_message = sprintf( __( '%s disapproved.', 'gravityview' ), $entry_count );
355 355
 					break;
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
      *
372 372
 	 * @return boolean True: It worked; False: it failed
373 373
 	 */
374
-	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0) {
374
+	public static function update_approved( $entry_id = 0, $approved = 0, $form_id = 0, $approvedcolumn = 0 ) {
375 375
 		return GravityView_Entry_Approval::update_approved( $entry_id, $approved, $form_id, $approvedcolumn );
376 376
 	}
377 377
 
@@ -401,20 +401,20 @@  discard block
 block discarded – undo
401 401
 	 *
402 402
 	 * @return void
403 403
 	 */
404
-	static public function add_entry_approved_hidden_input(  $form_id, $field_id, $value, $entry, $query_string ) {
404
+	static public function add_entry_approved_hidden_input( $form_id, $field_id, $value, $entry, $query_string ) {
405 405
 
406
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry['id'] ) ) {
406
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries', $entry[ 'id' ] ) ) {
407 407
 			return;
408 408
 		}
409 409
 
410
-		if( empty( $entry['id'] ) ) {
410
+		if ( empty( $entry[ 'id' ] ) ) {
411 411
 			return;
412 412
 		}
413 413
 
414 414
 		$status_value = GravityView_Entry_Approval::get_entry_status( $entry, 'value' );
415 415
 
416
-		if( $status_value ) {
417
-			echo '<input type="hidden" class="entry_approval" id="entry_approved_'. $entry['id'] .'" value="' . esc_attr( $status_value ) . '" />';
416
+		if ( $status_value ) {
417
+			echo '<input type="hidden" class="entry_approval" id="entry_approved_' . $entry[ 'id' ] . '" value="' . esc_attr( $status_value ) . '" />';
418 418
 		}
419 419
 	}
420 420
 
@@ -427,10 +427,10 @@  discard block
 block discarded – undo
427 427
 	 */
428 428
 	private function get_form_id() {
429 429
 
430
-		$form_id = GFForms::get('id');
430
+		$form_id = GFForms::get( 'id' );
431 431
 
432 432
 		// If there are no forms identified, use the first form. That's how GF does it.
433
-		if( empty( $form_id ) && class_exists('RGFormsModel') ) {
433
+		if ( empty( $form_id ) && class_exists( 'RGFormsModel' ) ) {
434 434
 			$form_id = $this->get_first_form_id();
435 435
 		}
436 436
 
@@ -450,14 +450,14 @@  discard block
 block discarded – undo
450 450
 
451 451
 		$forms = RGFormsModel::get_forms( null, 'title' );
452 452
 
453
-		if( ! isset( $forms[0] ) ) {
453
+		if ( ! isset( $forms[ 0 ] ) ) {
454 454
 			gravityview()->log->error( 'No forms were found' );
455 455
 			return 0;
456 456
 		}
457 457
 
458
-		$first_form = $forms[0];
458
+		$first_form = $forms[ 0 ];
459 459
 
460
-		$form_id = is_object( $forms[0] ) ? $first_form->id : $first_form['id'];
460
+		$form_id = is_object( $forms[ 0 ] ) ? $first_form->id : $first_form[ 'id' ];
461 461
 
462 462
 		return intval( $form_id );
463 463
 	}
@@ -465,37 +465,37 @@  discard block
 block discarded – undo
465 465
 
466 466
 	function add_scripts_and_styles( $hook ) {
467 467
 
468
-		if( ! class_exists( 'GFForms' ) ) {
468
+		if ( ! class_exists( 'GFForms' ) ) {
469 469
 			gravityview()->log->error( 'GFForms does not exist.' );
470 470
 			return;
471 471
 		}
472 472
 
473 473
 		// enqueue styles & scripts gf_entries
474 474
 		// But only if we're on the main Entries page, not on reports pages
475
-		if( GFForms::get_page() !== 'entry_list' ) {
475
+		if ( GFForms::get_page() !== 'entry_list' ) {
476 476
 			return;
477 477
 		}
478 478
 
479 479
 		$form_id = $this->get_form_id();
480 480
 
481 481
 		// Things are broken; no forms were found
482
-		if( empty( $form_id ) ) {
482
+		if ( empty( $form_id ) ) {
483 483
 			return;
484 484
 		}
485 485
 
486
-		wp_enqueue_style( 'gravityview_entries_list', plugins_url('assets/css/admin-entries-list.css', GRAVITYVIEW_FILE), array(), GravityView_Plugin::version );
486
+		wp_enqueue_style( 'gravityview_entries_list', plugins_url( 'assets/css/admin-entries-list.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
487 487
 
488
-		$script_debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '' : '.min';
488
+		$script_debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? '' : '.min';
489 489
 
490
-		wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url('assets/js/admin-entries-list'.$script_debug.'.js', GRAVITYVIEW_FILE), array( 'jquery' ), GravityView_Plugin::version );
490
+		wp_enqueue_script( 'gravityview_gf_entries_scripts', plugins_url( 'assets/js/admin-entries-list' . $script_debug . '.js', GRAVITYVIEW_FILE ), array( 'jquery' ), GravityView_Plugin::version );
491 491
 
492 492
 		wp_enqueue_script( 'gravityview_entries_list-popper', plugins_url( 'assets/lib/tippy/popper.min.js', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
493 493
 		wp_enqueue_script( 'gravityview_entries_list-tippy', plugins_url( 'assets/lib/tippy/tippy.min.js', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
494 494
 		wp_enqueue_style( 'gravityview_entries_list-tippy', plugins_url( 'assets/lib/tippy/tippy.css', GRAVITYVIEW_FILE ), array(), GravityView_Plugin::version );
495 495
 
496 496
 		wp_localize_script( 'gravityview_gf_entries_scripts', 'gvGlobals', array(
497
-			'nonce' => wp_create_nonce( 'gravityview_entry_approval'),
498
-			'admin_nonce' => wp_create_nonce( 'gravityview_admin_entry_approval'),
497
+			'nonce' => wp_create_nonce( 'gravityview_entry_approval' ),
498
+			'admin_nonce' => wp_create_nonce( 'gravityview_admin_entry_approval' ),
499 499
 			'form_id' => $form_id,
500 500
 			'show_column' => (int)$this->show_approve_entry_column( $form_id ),
501 501
 			'add_bulk_action' => (int)GVCommon::has_cap( 'gravityview_moderate_entries' ),
@@ -504,10 +504,10 @@  discard block
 block discarded – undo
504 504
 			'status_unapproved' => GravityView_Entry_Approval_Status::UNAPPROVED,
505 505
 			'bulk_actions' => $this->get_bulk_actions( $form_id ),
506 506
 			'bulk_message' => $this->bulk_update_message,
507
-			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('unapproved'),
508
-            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr('disapproved'),
509
-			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr('approved'),
510
-			'column_title' => __( 'Show entry in directory view?', 'gravityview'),
507
+			'unapprove_title' => GravityView_Entry_Approval_Status::get_title_attr( 'unapproved' ),
508
+            'approve_title' => GravityView_Entry_Approval_Status::get_title_attr( 'disapproved' ),
509
+			'disapprove_title' => GravityView_Entry_Approval_Status::get_title_attr( 'approved' ),
510
+			'column_title' => __( 'Show entry in directory view?', 'gravityview' ),
511 511
 			'column_link' => esc_url( $this->get_sort_link() ),
512 512
             'status_popover_template' => GravityView_Entry_Approval::get_popover_template(),
513 513
 			'status_popover_placement' => GravityView_Entry_Approval::get_popover_placement(),
@@ -551,16 +551,16 @@  discard block
 block discarded – undo
551 551
 		$bulk_actions = array(
552 552
 			'GravityView' => array(
553 553
 				array(
554
-					'label' => GravityView_Entry_Approval_Status::get_string('approved', 'action'),
555
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['approve'], $form_id ),
554
+					'label' => GravityView_Entry_Approval_Status::get_string( 'approved', 'action' ),
555
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'approve' ], $form_id ),
556 556
 				),
557 557
 				array(
558
-					'label' => GravityView_Entry_Approval_Status::get_string('disapproved', 'action'),
559
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['disapprove'], $form_id ),
558
+					'label' => GravityView_Entry_Approval_Status::get_string( 'disapproved', 'action' ),
559
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'disapprove' ], $form_id ),
560 560
 				),
561 561
 				array(
562
-					'label' => GravityView_Entry_Approval_Status::get_string('unapproved', 'action'),
563
-					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes['unapprove'], $form_id ),
562
+					'label' => GravityView_Entry_Approval_Status::get_string( 'unapproved', 'action' ),
563
+					'value' => sprintf( '%s-%d', $this->bulk_action_prefixes[ 'unapprove' ], $form_id ),
564 564
 				),
565 565
 			),
566 566
 		);
@@ -577,13 +577,13 @@  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 ) ) {
580
+		    if ( empty( $group ) ) {
581 581
 		        continue;
582 582
 		    }
583 583
 
584 584
 			foreach ( $group as $i => $action ) {
585
-				$bulk_actions[ $key ][ $i ]['label'] = esc_html( $bulk_actions[ $key ][ $i ]['label'] );
586
-				$bulk_actions[ $key ][ $i ]['value'] = esc_attr( $bulk_actions[ $key ][ $i ]['value'] );
585
+				$bulk_actions[ $key ][ $i ][ 'label' ] = esc_html( $bulk_actions[ $key ][ $i ][ 'label' ] );
586
+				$bulk_actions[ $key ][ $i ][ 'value' ] = esc_attr( $bulk_actions[ $key ][ $i ][ 'value' ] );
587 587
 			}
588 588
 		}
589 589
 
@@ -608,13 +608,13 @@  discard block
 block discarded – undo
608 608
 		 * @since 1.7.2
609 609
 		 * @param boolean $hide_if_no_connections
610 610
 		 */
611
-		$hide_if_no_connections = apply_filters('gravityview/approve_entries/hide-if-no-connections', false );
611
+		$hide_if_no_connections = apply_filters( 'gravityview/approve_entries/hide-if-no-connections', false );
612 612
 
613
-		if( $hide_if_no_connections ) {
613
+		if ( $hide_if_no_connections ) {
614 614
 
615 615
 			$connected_views = gravityview_get_connected_views( $form_id );
616 616
 
617
-			if( empty( $connected_views ) ) {
617
+			if ( empty( $connected_views ) ) {
618 618
 				$show_approve_column = false;
619 619
 			}
620 620
 		}
@@ -624,21 +624,21 @@  discard block
 block discarded – undo
624 624
 		 * @param boolean $show_approve_column Whether the column will be shown
625 625
 		 * @param int $form_id The ID of the Gravity Forms form for which entries are being shown
626 626
 		 */
627
-		$show_approve_column = apply_filters('gravityview/approve_entries/show-column', $show_approve_column, $form_id );
627
+		$show_approve_column = apply_filters( 'gravityview/approve_entries/show-column', $show_approve_column, $form_id );
628 628
 
629 629
 		return $show_approve_column;
630 630
 	}
631 631
 
632 632
 	function register_gform_noconflict_script( $scripts ) {
633
-		$scripts[] = 'gravityview_gf_entries_scripts';
634
-		$scripts[] = 'gravityview_entries_list-popper';
635
-		$scripts[] = 'gravityview_entries_list-tippy';
633
+		$scripts[ ] = 'gravityview_gf_entries_scripts';
634
+		$scripts[ ] = 'gravityview_entries_list-popper';
635
+		$scripts[ ] = 'gravityview_entries_list-tippy';
636 636
 		return $scripts;
637 637
 	}
638 638
 
639 639
 	function register_gform_noconflict_style( $styles ) {
640
-		$styles[] = 'gravityview_entries_list';
641
-		$styles[] = 'gravityview_entries_list-tippy';
640
+		$styles[ ] = 'gravityview_entries_list';
641
+		$styles[ ] = 'gravityview_entries_list-tippy';
642 642
 		return $styles;
643 643
 	}
644 644
 
Please login to merge, or discard this patch.
includes/class-gravityview-entry-approval.php 1 patch
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -39,13 +39,13 @@  discard block
 block discarded – undo
39 39
 	private function add_hooks() {
40 40
 
41 41
 		// in case entry is edited (on admin or frontend)
42
-		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2);
42
+		add_action( 'gform_after_update_entry', array( $this, 'after_update_entry_update_approved_meta' ), 10, 2 );
43 43
 
44 44
 		// when using the User opt-in field, check on entry submission
45 45
 		add_action( 'gform_after_submission', array( $this, 'after_submission' ), 10, 2 );
46 46
 
47 47
 		// process ajax approve entry requests
48
-		add_action('wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved'));
48
+		add_action( 'wp_ajax_gv_update_approved', array( $this, 'ajax_update_approved' ) );
49 49
 
50 50
 		// autounapprove
51 51
 		add_action( 'gravityview/edit_entry/after_update', array( __CLASS__, 'autounapprove' ), 10, 4 );
@@ -94,10 +94,10 @@  discard block
 block discarded – undo
94 94
 			return;
95 95
 		}
96 96
 
97
-		$form = GFAPI::get_form( $entry['form_id'] );
97
+		$form = GFAPI::get_form( $entry[ 'form_id' ] );
98 98
 
99 99
 		if ( ! $form ) {
100
-			gravityview()->log->error( 'Form not found at ID #{form_id} for entry #{entry_id}', array( 'form_id' => $entry['form_id'], 'entry_id' => $entry_id ) );
100
+			gravityview()->log->error( 'Form not found at ID #{form_id} for entry #{entry_id}', array( 'form_id' => $entry[ 'form_id' ], 'entry_id' => $entry_id ) );
101 101
 			return;
102 102
 		}
103 103
 
@@ -114,10 +114,10 @@  discard block
 block discarded – undo
114 114
 	 */
115 115
 	public static function add_approval_notification_events( $notification_events = array(), $form = array() ) {
116 116
 
117
-		$notification_events['gravityview/approve_entries/approved'] = 'GravityView - ' . esc_html_x( 'Entry is approved', 'The title for an event in a notifications drop down list.', 'gravityview' );
118
-		$notification_events['gravityview/approve_entries/disapproved'] = 'GravityView - ' . esc_html_x( 'Entry is disapproved', 'The title for an event in a notifications drop down list.', 'gravityview' );
119
-		$notification_events['gravityview/approve_entries/unapproved'] = 'GravityView - ' . esc_html_x( 'Entry approval is reset', 'The title for an event in a notifications drop down list.', 'gravityview' );
120
-		$notification_events['gravityview/approve_entries/updated'] = 'GravityView - ' . esc_html_x( 'Entry approval is changed', 'The title for an event in a notifications drop down list.', 'gravityview' );
117
+		$notification_events[ 'gravityview/approve_entries/approved' ] = 'GravityView - ' . esc_html_x( 'Entry is approved', 'The title for an event in a notifications drop down list.', 'gravityview' );
118
+		$notification_events[ 'gravityview/approve_entries/disapproved' ] = 'GravityView - ' . esc_html_x( 'Entry is disapproved', 'The title for an event in a notifications drop down list.', 'gravityview' );
119
+		$notification_events[ 'gravityview/approve_entries/unapproved' ] = 'GravityView - ' . esc_html_x( 'Entry approval is reset', 'The title for an event in a notifications drop down list.', 'gravityview' );
120
+		$notification_events[ 'gravityview/approve_entries/updated' ] = 'GravityView - ' . esc_html_x( 'Entry approval is changed', 'The title for an event in a notifications drop down list.', 'gravityview' );
121 121
 
122 122
 		return $notification_events;
123 123
 	}
@@ -135,13 +135,13 @@  discard block
 block discarded – undo
135 135
 	 */
136 136
 	public static function get_entry_status( $entry, $value_or_label = 'label' ) {
137 137
 
138
-		$entry_id = is_array( $entry ) ? $entry['id'] : GVCommon::get_entry_id( $entry, true );
138
+		$entry_id = is_array( $entry ) ? $entry[ 'id' ] : GVCommon::get_entry_id( $entry, true );
139 139
 
140 140
 		$status = gform_get_meta( $entry_id, self::meta_key );
141 141
 
142 142
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
143 143
 
144
-		if( 'value' === $value_or_label ) {
144
+		if ( 'value' === $value_or_label ) {
145 145
 			return $status;
146 146
 		}
147 147
 
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 		$nonce = \GV\Utils::_POST( 'nonce' );
180 180
 
181 181
 		// Valid status
182
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
182
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
183 183
 
184 184
 			gravityview()->log->error( 'Invalid approval status', array( 'data' => $_POST ) );
185 185
 
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
 
211 211
 			gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' );
212 212
 
213
-			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview') );
213
+			$result = new WP_Error( 'Missing Cap: gravityview_moderate_entries', __( 'You do not have permission to edit this entry.', 'gravityview' ) );
214 214
 
215 215
 		}
216 216
 
@@ -272,10 +272,10 @@  discard block
 block discarded – undo
272 272
 		}
273 273
 
274 274
 		// Set default
275
-		self::update_approved_meta( $entry['id'], $default_status, $entry['form_id'] );
275
+		self::update_approved_meta( $entry[ 'id' ], $default_status, $entry[ 'form_id' ] );
276 276
 
277 277
 		// Then check for if there is an approval column, and use that value instead
278
-		$this->after_update_entry_update_approved_meta( $form , $entry['id'] );
278
+		$this->after_update_entry_update_approved_meta( $form, $entry[ 'id' ] );
279 279
 	}
280 280
 
281 281
 	/**
@@ -289,12 +289,12 @@  discard block
 block discarded – undo
289 289
 	 */
290 290
 	public function after_update_entry_update_approved_meta( $form, $entry_id = NULL ) {
291 291
 
292
-		$approved_column = self::get_approved_column( $form['id'] );
292
+		$approved_column = self::get_approved_column( $form[ 'id' ] );
293 293
 
294 294
 		/**
295 295
 		 * If the form doesn't contain the approve field, don't assume anything.
296 296
 		 */
297
-		if( empty( $approved_column ) ) {
297
+		if ( empty( $approved_column ) ) {
298 298
 			return;
299 299
 		}
300 300
 
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
 			$value = GravityView_Entry_Approval_Status::APPROVED;
309 309
 		}
310 310
 
311
-		self::update_approved_meta( $entry_id, $value, $form['id'] );
311
+		self::update_approved_meta( $entry_id, $value, $form[ 'id' ] );
312 312
 	}
313 313
 
314 314
 	/**
@@ -326,12 +326,12 @@  discard block
 block discarded – undo
326 326
 	 */
327 327
 	public static function update_bulk( $entries = array(), $approved, $form_id ) {
328 328
 
329
-		if( empty($entries) || ( $entries !== true && !is_array($entries) ) ) {
329
+		if ( empty( $entries ) || ( $entries !== true && ! is_array( $entries ) ) ) {
330 330
 			gravityview()->log->error( 'Entries were empty or malformed.', array( 'data' => $entries ) );
331 331
 			return NULL;
332 332
 		}
333 333
 
334
-		if( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
334
+		if ( ! GVCommon::has_cap( 'gravityview_moderate_entries' ) ) {
335 335
 			gravityview()->log->error( 'User does not have the `gravityview_moderate_entries` capability.' );
336 336
 			return NULL;
337 337
 		}
@@ -346,10 +346,10 @@  discard block
 block discarded – undo
346 346
 		$approved_column_id = self::get_approved_column( $form_id );
347 347
 
348 348
 		$success = true;
349
-		foreach( $entries as $entry_id ) {
349
+		foreach ( $entries as $entry_id ) {
350 350
 			$update_success = self::update_approved( (int)$entry_id, $approved, $form_id, $approved_column_id );
351 351
 
352
-			if( ! $update_success ) {
352
+			if ( ! $update_success ) {
353 353
 				$success = false;
354 354
 			}
355 355
 		}
@@ -373,12 +373,12 @@  discard block
 block discarded – undo
373 373
 	 */
374 374
 	public static function update_approved( $entry_id = 0, $approved = 2, $form_id = 0, $approvedcolumn = 0 ) {
375 375
 
376
-		if( !class_exists( 'GFAPI' ) ) {
376
+		if ( ! class_exists( 'GFAPI' ) ) {
377 377
 			gravityview()->log->error( 'GFAPI does not exist' );
378 378
 			return false;
379 379
 		}
380 380
 
381
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
381
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approved ) ) {
382 382
 			gravityview()->log->error( 'Not a valid approval value.' );
383 383
 			return false;
384 384
 		}
@@ -395,7 +395,7 @@  discard block
 block discarded – undo
395 395
 		// If the form has an Approve/Reject field, update that value
396 396
 		$result = self::update_approved_column( $entry_id, $approved, $form_id, $approvedcolumn );
397 397
 
398
-		if( is_wp_error( $result ) ) {
398
+		if ( is_wp_error( $result ) ) {
399 399
 			gravityview()->log->error( 'Entry approval not updated: {error}', array( 'error' => $result->get_error_message() ) );
400 400
 			return false;
401 401
 		}
@@ -407,7 +407,7 @@  discard block
 block discarded – undo
407 407
 
408 408
 		// add note to entry if approval field updating worked or there was no approved field
409 409
 		// There's no validation for the meta
410
-		if( true === $result ) {
410
+		if ( true === $result ) {
411 411
 
412 412
 			// Add an entry note
413 413
 			self::add_approval_status_updated_note( $entry_id, $approved );
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
460 460
 
461 461
 		$note_id = false;
462 462
 
463
-		if( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
463
+		if ( $add_note && class_exists( 'GravityView_Entry_Notes' ) ) {
464 464
 
465 465
 			$current_user = wp_get_current_user();
466 466
 
@@ -482,7 +482,7 @@  discard block
 block discarded – undo
482 482
 	 */
483 483
 	private static function update_approved_column( $entry_id = 0, $status = '0', $form_id = 0, $approvedcolumn = 0 ) {
484 484
 
485
-		if( empty( $approvedcolumn ) ) {
485
+		if ( empty( $approvedcolumn ) ) {
486 486
 			$approvedcolumn = self::get_approved_column( $form_id );
487 487
 		}
488 488
 
@@ -505,12 +505,12 @@  discard block
 block discarded – undo
505 505
 		$status = GravityView_Entry_Approval_Status::maybe_convert_status( $status );
506 506
 
507 507
 		$new_value = '';
508
-		if( GravityView_Entry_Approval_Status::APPROVED === $status ) {
508
+		if ( GravityView_Entry_Approval_Status::APPROVED === $status ) {
509 509
 			$new_value = self::get_approved_column_input_label( $form_id, $approvedcolumn );
510 510
 		}
511 511
 
512 512
 		//update entry
513
-		$entry["{$approvedcolumn}"] = $new_value;
513
+		$entry[ "{$approvedcolumn}" ] = $new_value;
514 514
 
515 515
 		/**
516 516
 		 * Note: GFAPI::update_entry() doesn't trigger `gform_after_update_entry`, so we trigger updating the meta ourselves
@@ -541,12 +541,12 @@  discard block
 block discarded – undo
541 541
 		// If the user has enabled a different value than the label (for some reason), use it.
542 542
 		// This is highly unlikely
543 543
 		if ( is_array( $field->choices ) && ! empty( $field->choices ) ) {
544
-			return isset( $field->choices[0]['value'] ) ? $field->choices[0]['value'] : $field->choices[0]['text'];
544
+			return isset( $field->choices[ 0 ][ 'value' ] ) ? $field->choices[ 0 ][ 'value' ] : $field->choices[ 0 ][ 'text' ];
545 545
 		}
546 546
 
547 547
 		// Otherwise, fall back on the inputs array
548 548
 		if ( is_array( $field->inputs ) && ! empty( $field->inputs ) ) {
549
-			return $field->inputs[0]['label'];
549
+			return $field->inputs[ 0 ][ 'label' ];
550 550
 		}
551 551
 
552 552
 		return null;
@@ -598,7 +598,7 @@  discard block
 block discarded – undo
598 598
 		 * @since 1.18 Added "unapproved"
599 599
 		 * @param  int $entry_id ID of the Gravity Forms entry
600 600
 		 */
601
-		do_action( 'gravityview/approve_entries/' . $action , $entry_id );
601
+		do_action( 'gravityview/approve_entries/' . $action, $entry_id );
602 602
 	}
603 603
 
604 604
 	/**
@@ -611,11 +611,11 @@  discard block
 block discarded – undo
611 611
 	 */
612 612
 	static public function get_approved_column( $form ) {
613 613
 
614
-		if( empty( $form ) ) {
614
+		if ( empty( $form ) ) {
615 615
 			return null;
616 616
 		}
617 617
 
618
-		if( !is_array( $form ) ) {
618
+		if ( ! is_array( $form ) ) {
619 619
 			$form = GVCommon::get_form( $form );
620 620
 		}
621 621
 
@@ -625,22 +625,22 @@  discard block
 block discarded – undo
625 625
 		 * @var string $key
626 626
 		 * @var GF_Field $field
627 627
 		 */
628
-		foreach( $form['fields'] as $key => $field ) {
628
+		foreach ( $form[ 'fields' ] as $key => $field ) {
629 629
 
630 630
 			$inputs = $field->get_entry_inputs();
631 631
 
632
-			if( !empty( $field->gravityview_approved ) ) {
633
-				if ( ! empty( $inputs ) && !empty( $inputs[0]['id'] ) ) {
634
-					$approved_column_id = $inputs[0]['id'];
632
+			if ( ! empty( $field->gravityview_approved ) ) {
633
+				if ( ! empty( $inputs ) && ! empty( $inputs[ 0 ][ 'id' ] ) ) {
634
+					$approved_column_id = $inputs[ 0 ][ 'id' ];
635 635
 					break;
636 636
 				}
637 637
 			}
638 638
 
639 639
 			// Note: This is just for backward compatibility from GF Directory plugin and old GV versions - when using i18n it may not work..
640
-			if( 'checkbox' === $field->type && ! empty( $inputs ) ) {
640
+			if ( 'checkbox' === $field->type && ! empty( $inputs ) ) {
641 641
 				foreach ( $inputs as $input ) {
642
-					if ( 'approved' === strtolower( $input['label'] ) ) {
643
-						$approved_column_id = $input['id'];
642
+					if ( 'approved' === strtolower( $input[ 'label' ] ) ) {
643
+						$approved_column_id = $input[ 'id' ];
644 644
 						break;
645 645
 					}
646 646
 				}
@@ -666,7 +666,7 @@  discard block
 block discarded – undo
666 666
 
667 667
 		$view_keys = array_keys( $gv_data->get_views() );
668 668
 
669
-		$view = \GV\View::by_id( $view_keys[0] );
669
+		$view = \GV\View::by_id( $view_keys[ 0 ] );
670 670
 
671 671
 		if ( ! $view->settings->get( 'unapprove_edit' ) ) {
672 672
 			return;
@@ -691,11 +691,11 @@  discard block
 block discarded – undo
691 691
 			return;
692 692
 		}
693 693
 
694
-		if( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
694
+		if ( ! GravityView_Entry_Approval_Status::is_valid( $approval_status ) ) {
695 695
 			$approval_status = GravityView_Entry_Approval_Status::UNAPPROVED;
696 696
 		}
697 697
 
698
-		self::update_approved_meta( $entry_id, $approval_status, $form['id'] );
698
+		self::update_approved_meta( $entry_id, $approval_status, $form[ 'id' ] );
699 699
 	}
700 700
 
701 701
 	/**
@@ -733,9 +733,9 @@  discard block
 block discarded – undo
733 733
 		$choices = GravityView_Entry_Approval_Status::get_all();
734 734
 
735 735
 		return <<<TEMPLATE
736
-<a href="#" data-approved="{$choices['approved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-approved popover" title="{$choices['approved']['action']}"><span class="screen-reader-text">{$choices['approved']['action']}</span></a>
737
-<a href="#" data-approved="{$choices['disapproved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-disapproved popover" title="{$choices['disapproved']['action']}"><span class="screen-reader-text">{$choices['disapproved']['action']}</span></a>
738
-<a href="#" data-approved="{$choices['unapproved']['value']}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-unapproved popover" title="{$choices['unapproved']['action']}"><span class="screen-reader-text">{$choices['unapproved']['action']}</span></a>
736
+<a href="#" data-approved="{$choices[ 'approved' ][ 'value' ]}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-approved popover" title="{$choices[ 'approved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'approved' ][ 'action' ]}</span></a>
737
+<a href="#" data-approved="{$choices[ 'disapproved' ][ 'value' ]}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-disapproved popover" title="{$choices[ 'disapproved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'disapproved' ][ 'action' ]}</span></a>
738
+<a href="#" data-approved="{$choices[ 'unapproved' ][ 'value' ]}" aria-role="button"  aria-live="polite" class="gv-approval-toggle gv-approval-unapproved popover" title="{$choices[ 'unapproved' ][ 'action' ]}"><span class="screen-reader-text">{$choices[ 'unapproved' ][ 'action' ]}</span></a>
739 739
 TEMPLATE;
740 740
 	}
741 741
 }
Please login to merge, or discard this patch.
includes/class-ajax.php 1 patch
Spacing   +72 added lines, -72 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 		 * Don't exit if we're running test suite.
37 37
 		 * @since 1.15
38 38
 		 */
39
-		if( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) {
39
+		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && DOING_GRAVITYVIEW_TESTS ) {
40 40
 			return $mixed;
41 41
 		}
42 42
 
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 	 * @return void
51 51
 	 */
52 52
 	function check_ajax_nonce() {
53
-		if ( ! isset( $_POST['nonce'] ) || ! wp_verify_nonce( $_POST['nonce'], 'gravityview_ajaxviews' ) ) {
53
+		if ( ! isset( $_POST[ 'nonce' ] ) || ! wp_verify_nonce( $_POST[ 'nonce' ], 'gravityview_ajaxviews' ) ) {
54 54
 			$this->_exit( false );
55 55
 		}
56 56
 	}
@@ -67,14 +67,14 @@  discard block
 block discarded – undo
67 67
 		//check nonce
68 68
 		$this->check_ajax_nonce();
69 69
 
70
-		$context = isset($_POST['context']) ? esc_attr( $_POST['context'] ) : 'directory';
70
+		$context = isset( $_POST[ 'context' ] ) ? esc_attr( $_POST[ 'context' ] ) : 'directory';
71 71
 
72 72
 		// If Form was changed, JS sends form ID, if start fresh, JS sends template_id
73
-		if( !empty( $_POST['form_id'] ) ) {
74
-			do_action( 'gravityview_render_available_fields', (int) $_POST['form_id'], $context );
73
+		if ( ! empty( $_POST[ 'form_id' ] ) ) {
74
+			do_action( 'gravityview_render_available_fields', (int)$_POST[ 'form_id' ], $context );
75 75
 			$this->_exit();
76
-		} elseif( !empty( $_POST['template_id'] ) ) {
77
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
76
+		} elseif ( ! empty( $_POST[ 'template_id' ] ) ) {
77
+			$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
78 78
 
79 79
 			/** @see GravityView_Admin_Views::render_available_fields */
80 80
 			do_action( 'gravityview_render_available_fields', $form, $context );
@@ -96,17 +96,17 @@  discard block
 block discarded – undo
96 96
 	function get_active_areas() {
97 97
 		$this->check_ajax_nonce();
98 98
 
99
-		if( empty( $_POST['template_id'] ) ) {
99
+		if ( empty( $_POST[ 'template_id' ] ) ) {
100 100
 			$this->_exit( false );
101 101
 		}
102 102
 
103 103
 		ob_start();
104
-		do_action( 'gravityview_render_directory_active_areas', $_POST['template_id'], 'directory', '', true );
105
-		$response['directory'] = ob_get_clean();
104
+		do_action( 'gravityview_render_directory_active_areas', $_POST[ 'template_id' ], 'directory', '', true );
105
+		$response[ 'directory' ] = ob_get_clean();
106 106
 
107 107
 		ob_start();
108
-		do_action( 'gravityview_render_directory_active_areas',  $_POST['template_id'], 'single', '', true );
109
-		$response['single'] = ob_get_clean();
108
+		do_action( 'gravityview_render_directory_active_areas', $_POST[ 'template_id' ], 'single', '', true );
109
+		$response[ 'single' ] = ob_get_clean();
110 110
 
111 111
 		$response = array_map( 'gravityview_strip_whitespace', $response );
112 112
 
@@ -121,20 +121,20 @@  discard block
 block discarded – undo
121 121
 
122 122
 		$this->check_ajax_nonce();
123 123
 
124
-		if( empty( $_POST['template_id'] ) ) {
124
+		if ( empty( $_POST[ 'template_id' ] ) ) {
125 125
 			$this->_exit( false );
126 126
 		}
127 127
 
128 128
 		// get the fields xml config file for this specific preset
129
-		$preset_fields_path = apply_filters( 'gravityview_template_fieldsxml', array(), $_POST['template_id'] );
129
+		$preset_fields_path = apply_filters( 'gravityview_template_fieldsxml', array(), $_POST[ 'template_id' ] );
130 130
 		// import fields
131
-		if( !empty( $preset_fields_path ) ) {
131
+		if ( ! empty( $preset_fields_path ) ) {
132 132
 			$presets = $this->import_fields( $preset_fields_path );
133 133
 		} else {
134 134
 			$presets = array( 'widgets' => array(), 'fields' => array() );
135 135
 		}
136 136
 
137
-		$template_id = esc_attr( $_POST['template_id'] );
137
+		$template_id = esc_attr( $_POST[ 'template_id' ] );
138 138
 
139 139
 		// template areas
140 140
 		$template_areas_directory = apply_filters( 'gravityview_template_active_areas', array(), $template_id, 'directory' );
@@ -144,20 +144,20 @@  discard block
 block discarded – undo
144 144
 		$default_widget_areas = \GV\Widget::get_default_widget_areas();
145 145
 
146 146
 		ob_start();
147
-		do_action('gravityview_render_active_areas', $template_id, 'widget', 'header', $default_widget_areas, $presets['widgets'] );
148
-		$response['header'] = ob_get_clean();
147
+		do_action( 'gravityview_render_active_areas', $template_id, 'widget', 'header', $default_widget_areas, $presets[ 'widgets' ] );
148
+		$response[ 'header' ] = ob_get_clean();
149 149
 
150 150
 		ob_start();
151
-		do_action('gravityview_render_active_areas', $template_id, 'widget', 'footer', $default_widget_areas, $presets['widgets'] );
152
-		$response['footer'] = ob_get_clean();
151
+		do_action( 'gravityview_render_active_areas', $template_id, 'widget', 'footer', $default_widget_areas, $presets[ 'widgets' ] );
152
+		$response[ 'footer' ] = ob_get_clean();
153 153
 
154 154
 		ob_start();
155
-		do_action('gravityview_render_active_areas', $template_id, 'field', 'directory', $template_areas_directory, $presets['fields'] );
156
-		$response['directory'] = ob_get_clean();
155
+		do_action( 'gravityview_render_active_areas', $template_id, 'field', 'directory', $template_areas_directory, $presets[ 'fields' ] );
156
+		$response[ 'directory' ] = ob_get_clean();
157 157
 
158 158
 		ob_start();
159
-		do_action('gravityview_render_active_areas', $template_id, 'field', 'single', $template_areas_single, $presets['fields'] );
160
-		$response['single'] = ob_get_clean();
159
+		do_action( 'gravityview_render_active_areas', $template_id, 'field', 'single', $template_areas_single, $presets[ 'fields' ] );
160
+		$response[ 'single' ] = ob_get_clean();
161 161
 
162 162
 		$response = array_map( 'gravityview_strip_whitespace', $response );
163 163
 
@@ -175,26 +175,26 @@  discard block
 block discarded – undo
175 175
 
176 176
 		$this->check_ajax_nonce();
177 177
 
178
-		if( empty( $_POST['template_id'] ) ) {
178
+		if ( empty( $_POST[ 'template_id' ] ) ) {
179 179
 			gravityview()->log->error( 'Cannot create preset form; the template_id is empty.' );
180 180
 			$this->_exit( false );
181 181
 		}
182 182
 
183 183
 		// get the xml for this specific template_id
184
-		$preset_form_xml_path = apply_filters( 'gravityview_template_formxml', '', $_POST['template_id'] );
184
+		$preset_form_xml_path = apply_filters( 'gravityview_template_formxml', '', $_POST[ 'template_id' ] );
185 185
 
186 186
 		// import form
187 187
 		$form = $this->import_form( $preset_form_xml_path );
188 188
 
189 189
 		// get the form ID
190
-		if( false === $form ) {
190
+		if ( false === $form ) {
191 191
 			// send error to user
192
-			gravityview()->log->error( 'Error importing form for template id: {template_id}', array( 'template_id' => (int) $_POST['template_id'] ) );
192
+			gravityview()->log->error( 'Error importing form for template id: {template_id}', array( 'template_id' => (int)$_POST[ 'template_id' ] ) );
193 193
 
194 194
 			$this->_exit( false );
195 195
 		}
196 196
 
197
-		$this->_exit( '<option value="'.esc_attr( $form['id'] ).'" selected="selected">'.esc_html( $form['title'] ).'</option>' );
197
+		$this->_exit( '<option value="' . esc_attr( $form[ 'id' ] ) . '" selected="selected">' . esc_html( $form[ 'title' ] ) . '</option>' );
198 198
 
199 199
 	}
200 200
 
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 
209 209
 		gravityview()->log->debug( '[import_form] Import Preset Form. (File) {path}', array( 'path' => $xml_or_json_path ) );
210 210
 
211
-		if( empty( $xml_or_json_path ) || !class_exists('GFExport') || !file_exists( $xml_or_json_path ) ) {
211
+		if ( empty( $xml_or_json_path ) || ! class_exists( 'GFExport' ) || ! file_exists( $xml_or_json_path ) ) {
212 212
 			gravityview()->log->error( 'Class GFExport or file not found. file: {path}', array( 'path' => $xml_or_json_path ) );
213 213
 			return false;
214 214
 		}
@@ -220,13 +220,13 @@  discard block
 block discarded – undo
220 220
 		gravityview()->log->debug( '[import_form] Importing form (Result) {count}', array( 'count' => $count ) );
221 221
 		gravityview()->log->debug( '[import_form] Importing form (Form) ', array( 'data' => $forms ) );
222 222
 
223
-		if( $count != 1 || empty( $forms[0]['id'] ) ) {
223
+		if ( $count != 1 || empty( $forms[ 0 ][ 'id' ] ) ) {
224 224
 			gravityview()->log->error( 'Form Import Failed!' );
225 225
 			return false;
226 226
 		}
227 227
 
228 228
 		// import success - return form id
229
-		return $forms[0];
229
+		return $forms[ 0 ];
230 230
 	}
231 231
 
232 232
 
@@ -240,7 +240,7 @@  discard block
 block discarded – undo
240 240
 	function get_field_options() {
241 241
 		$this->check_ajax_nonce();
242 242
 		
243
-		if( empty( $_POST['template'] ) || empty( $_POST['area'] ) || empty( $_POST['field_id'] ) || empty( $_POST['field_type'] ) ) {
243
+		if ( empty( $_POST[ 'template' ] ) || empty( $_POST[ 'area' ] ) || empty( $_POST[ 'field_id' ] ) || empty( $_POST[ 'field_type' ] ) ) {
244 244
 			gravityview()->log->error( 'Required fields were not set in the $_POST request. ' );
245 245
 			$this->_exit( false );
246 246
 		}
@@ -252,11 +252,11 @@  discard block
 block discarded – undo
252 252
 		$_post = array_map( 'esc_attr', $_post );
253 253
 
254 254
 		// The GF type of field: `product`, `name`, `creditcard`, `id`, `text`
255
-		$input_type = isset($_post['input_type']) ? esc_attr( $_post['input_type'] ) : NULL;
256
-		$context = isset($_post['context']) ? esc_attr( $_post['context'] ) : NULL;
255
+		$input_type = isset( $_post[ 'input_type' ] ) ? esc_attr( $_post[ 'input_type' ] ) : NULL;
256
+		$context = isset( $_post[ 'context' ] ) ? esc_attr( $_post[ 'context' ] ) : NULL;
257 257
 
258
-		$form_id = empty( $_post['form_id'] ) ? null : $_post['form_id'];
259
-		$response = GravityView_Render_Settings::render_field_options( $form_id, $_post['field_type'], $_post['template'], $_post['field_id'], $_post['field_label'], $_post['area'], $input_type, '', '', $context  );
258
+		$form_id = empty( $_post[ 'form_id' ] ) ? null : $_post[ 'form_id' ];
259
+		$response = GravityView_Render_Settings::render_field_options( $form_id, $_post[ 'field_type' ], $_post[ 'template' ], $_post[ 'field_id' ], $_post[ 'field_label' ], $_post[ 'area' ], $input_type, '', '', $context );
260 260
 
261 261
 		$response = gravityview_strip_whitespace( $response );
262 262
 
@@ -277,15 +277,15 @@  discard block
 block discarded – undo
277 277
 		$form = '';
278 278
 
279 279
 		// if form id is set, use it, else, get form from preset
280
-		if( !empty( $_POST['form_id'] ) ) {
280
+		if ( ! empty( $_POST[ 'form_id' ] ) ) {
281 281
 
282
-			$form = (int) $_POST['form_id'];
282
+			$form = (int)$_POST[ 'form_id' ];
283 283
 
284 284
 		}
285 285
 		// get form from preset
286
-		elseif( !empty( $_POST['template_id'] ) ) {
286
+		elseif ( ! empty( $_POST[ 'template_id' ] ) ) {
287 287
 
288
-			$form = GravityView_Ajax::pre_get_form_fields( $_POST['template_id'] );
288
+			$form = GravityView_Ajax::pre_get_form_fields( $_POST[ 'template_id' ] );
289 289
 
290 290
 		}
291 291
 
@@ -301,27 +301,27 @@  discard block
 block discarded – undo
301 301
 	 * @param  string $template_id Preset template
302 302
 	 *
303 303
 	 */
304
-	static function pre_get_form_fields( $template_id = '') {
304
+	static function pre_get_form_fields( $template_id = '' ) {
305 305
 
306
-		if( empty( $template_id ) ) {
306
+		if ( empty( $template_id ) ) {
307 307
 			gravityview()->log->error( 'Template ID not set.' );
308 308
 			return false;
309 309
 		} else {
310 310
 			$form_file = apply_filters( 'gravityview_template_formxml', '', $template_id );
311
-			if( !file_exists( $form_file )  ) {
311
+			if ( ! file_exists( $form_file ) ) {
312 312
 				gravityview()->log->error( 'Importing Form Fields for preset [{template_id}]. File not found. file: {path}', array( 'template_id' => $template_id, 'path' => $form_file ) );
313 313
 				return false;
314 314
 			}
315 315
 		}
316 316
 
317 317
 		// Load xml parser (from GravityForms)
318
-		if( class_exists( 'GFCommon' ) ) {
318
+		if ( class_exists( 'GFCommon' ) ) {
319 319
 			$xml_parser = GFCommon::get_base_path() . '/xml.php';
320 320
 		} else {
321 321
 			$xml_parser = trailingslashit( WP_PLUGIN_DIR ) . 'gravityforms/xml.php';
322 322
 		}
323 323
 
324
-		if( file_exists( $xml_parser ) ) {
324
+		if ( file_exists( $xml_parser ) ) {
325 325
 			require_once( $xml_parser );
326 326
 		} else {
327 327
 			gravityview()->log->debug( ' - Gravity Forms XML Parser not found {path}.', array( 'path' => $xml_parser ) );
@@ -332,32 +332,32 @@  discard block
 block discarded – undo
332 332
 		$xmlstr = file_get_contents( $form_file );
333 333
 
334 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)
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 346
         );
347 347
 
348
-		$xml = new RGXML($options);
349
-        $forms = $xml->unserialize($xmlstr);
348
+		$xml = new RGXML( $options );
349
+        $forms = $xml->unserialize( $xmlstr );
350 350
 
351
-        if( !$forms ) {
351
+        if ( ! $forms ) {
352 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 353
         	return false;
354 354
         }
355 355
 
356
-        if( !empty( $forms[0] ) && is_array( $forms[0] ) ) {
357
-        	$form = $forms[0];
356
+        if ( ! empty( $forms[ 0 ] ) && is_array( $forms[ 0 ] ) ) {
357
+        	$form = $forms[ 0 ];
358 358
         }
359 359
 
360
-        if( empty( $form ) ) {
360
+        if ( empty( $form ) ) {
361 361
         	gravityview()->log->error( '$form not set.', array( 'data' => $forms ) );
362 362
         	return false;
363 363
         }
@@ -376,38 +376,38 @@  discard block
 block discarded – undo
376 376
 	 */
377 377
 	function import_fields( $file ) {
378 378
 
379
-		if( empty( $file ) || !file_exists(  $file ) ) {
379
+		if ( empty( $file ) || ! file_exists( $file ) ) {
380 380
 			gravityview()->log->error( 'Importing Preset Fields. File not found. (File) {path}', array( 'path' => $file ) );
381 381
 			return false;
382 382
 		}
383 383
 
384
-		if( !class_exists('WXR_Parser') ) {
384
+		if ( ! class_exists( 'WXR_Parser' ) ) {
385 385
 			include_once GRAVITYVIEW_DIR . 'includes/lib/xml-parsers/parsers.php';
386 386
 		}
387 387
 
388 388
 		$parser = new WXR_Parser();
389 389
 		$presets = $parser->parse( $file );
390 390
 
391
-		if(is_wp_error( $presets )) {
391
+		if ( is_wp_error( $presets ) ) {
392 392
 			gravityview()->log->error( 'Importing Preset Fields failed. Threw WP_Error.', array( 'data' => $presets ) );
393 393
 			return false;
394 394
 		}
395 395
 
396
-		if( empty( $presets['posts'][0]['postmeta'] ) && !is_array( $presets['posts'][0]['postmeta'] ) ) {
396
+		if ( empty( $presets[ 'posts' ][ 0 ][ 'postmeta' ] ) && ! is_array( $presets[ 'posts' ][ 0 ][ 'postmeta' ] ) ) {
397 397
 			gravityview()->log->error( 'Importing Preset Fields failed. Meta not found in file. {path}', array( 'path' => $file ) );
398 398
 			return false;
399 399
 		}
400 400
 
401
-		gravityview()->log->debug( '[import_fields] postmeta', array( 'data' => $presets['posts'][0]['postmeta'] ) );
401
+		gravityview()->log->debug( '[import_fields] postmeta', array( 'data' => $presets[ 'posts' ][ 0 ][ 'postmeta' ] ) );
402 402
 
403 403
 		$fields = $widgets = array();
404
-		foreach( $presets['posts'][0]['postmeta'] as $meta ) {
405
-			switch ($meta['key']) {
404
+		foreach ( $presets[ 'posts' ][ 0 ][ 'postmeta' ] as $meta ) {
405
+			switch ( $meta[ 'key' ] ) {
406 406
 				case '_gravityview_directory_fields':
407
-					$fields = maybe_unserialize( $meta['value'] );
407
+					$fields = maybe_unserialize( $meta[ 'value' ] );
408 408
 					break;
409 409
 				case '_gravityview_directory_widgets':
410
-					$widgets = maybe_unserialize( $meta['value'] );
410
+					$widgets = maybe_unserialize( $meta[ 'value' ] );
411 411
 					break;
412 412
 			}
413 413
 		}
Please login to merge, or discard this patch.
future/lib/EDD_SL_Plugin_Updater.php 1 patch
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -40,10 +40,10 @@  discard block
 block discarded – undo
40 40
 		$this->api_data    = $_api_data;
41 41
 		$this->name        = plugin_basename( $_plugin_file );
42 42
 		$this->slug        = basename( $_plugin_file, '.php' );
43
-		$this->version     = $_api_data['version'];
44
-		$this->wp_override = isset( $_api_data['wp_override'] ) ? (bool) $_api_data['wp_override'] : false;
45
-		$this->beta        = ! empty( $this->api_data['beta'] ) ? true : false;
46
-		$this->cache_key   = 'edd_sl_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) );
43
+		$this->version     = $_api_data[ 'version' ];
44
+		$this->wp_override = isset( $_api_data[ 'wp_override' ] ) ? (bool)$_api_data[ 'wp_override' ] : false;
45
+		$this->beta        = ! empty( $this->api_data[ 'beta' ] ) ? true : false;
46
+		$this->cache_key   = 'edd_sl_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) );
47 47
 
48 48
 		$edd_plugin_data[ $this->slug ] = $this->api_data;
49 49
 
@@ -147,11 +147,11 @@  discard block
 block discarded – undo
147 147
 			return;
148 148
 		}
149 149
 
150
-		if( ! current_user_can( 'update_plugins' ) ) {
150
+		if ( ! current_user_can( 'update_plugins' ) ) {
151 151
 			return;
152 152
 		}
153 153
 
154
-		if( ! is_multisite() ) {
154
+		if ( ! is_multisite() ) {
155 155
 			return;
156 156
 		}
157 157
 
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 					'<a target="_blank" class="thickbox" href="' . esc_url( $changelog_link ) . '">',
248 248
 					esc_html( $version_info->new_version ),
249 249
 					'</a>',
250
-					'<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) .'">',
250
+					'<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) . '">',
251 251
 					'</a>'
252 252
 				);
253 253
 			}
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 			)
293 293
 		);
294 294
 
295
-		$cache_key = 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) );
295
+		$cache_key = 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) );
296 296
 
297 297
 		// Get the transient where we store the api request for this plugin for 24 hours
298 298
 		$edd_api_request_transient = $this->get_cached_version_info( $cache_key );
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
 			$_data->contributors = $this->convert_object_to_array( $_data->contributors );
334 334
 		}
335 335
 
336
-		if( ! isset( $_data->plugin ) ) {
336
+		if ( ! isset( $_data->plugin ) ) {
337 337
 			$_data->plugin = $this->name;
338 338
 		}
339 339
 
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
 
373 373
 		$verify_ssl = $this->verify_ssl();
374 374
 		if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) {
375
-			$args['sslverify'] = $verify_ssl;
375
+			$args[ 'sslverify' ] = $verify_ssl;
376 376
 		}
377 377
 		return $args;
378 378
 
@@ -400,9 +400,9 @@  discard block
 block discarded – undo
400 400
 		if ( ! is_array( $edd_plugin_url_available ) || ! isset( $edd_plugin_url_available[ $store_hash ] ) ) {
401 401
 			$test_url_parts = parse_url( $this->api_url );
402 402
 
403
-			$scheme = ! empty( $test_url_parts['scheme'] ) ? $test_url_parts['scheme']     : 'http';
404
-			$host   = ! empty( $test_url_parts['host'] )   ? $test_url_parts['host']       : '';
405
-			$port   = ! empty( $test_url_parts['port'] )   ? ':' . $test_url_parts['port'] : '';
403
+			$scheme = ! empty( $test_url_parts[ 'scheme' ] ) ? $test_url_parts[ 'scheme' ] : 'http';
404
+			$host   = ! empty( $test_url_parts[ 'host' ] ) ? $test_url_parts[ 'host' ] : '';
405
+			$port   = ! empty( $test_url_parts[ 'port' ] ) ? ':' . $test_url_parts[ 'port' ] : '';
406 406
 
407 407
 			if ( empty( $host ) ) {
408 408
 				$edd_plugin_url_available[ $store_hash ] = false;
@@ -419,27 +419,27 @@  discard block
 block discarded – undo
419 419
 
420 420
 		$data = array_merge( $this->api_data, $_data );
421 421
 
422
-		if ( $data['slug'] != $this->slug ) {
422
+		if ( $data[ 'slug' ] != $this->slug ) {
423 423
 			return;
424 424
 		}
425 425
 
426
-		if( $this->api_url == trailingslashit ( home_url() ) ) {
426
+		if ( $this->api_url == trailingslashit( home_url() ) ) {
427 427
 			return false; // Don't allow a plugin to ping itself
428 428
 		}
429 429
 
430 430
 		$api_params = array(
431 431
 			'edd_action' => 'get_version',
432
-			'license'    => ! empty( $data['license'] ) ? $data['license'] : '',
433
-			'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
434
-			'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
435
-			'version'    => isset( $data['version'] ) ? $data['version'] : false,
436
-			'slug'       => $data['slug'],
437
-			'author'     => $data['author'],
432
+			'license'    => ! empty( $data[ 'license' ] ) ? $data[ 'license' ] : '',
433
+			'item_name'  => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false,
434
+			'item_id'    => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false,
435
+			'version'    => isset( $data[ 'version' ] ) ? $data[ 'version' ] : false,
436
+			'slug'       => $data[ 'slug' ],
437
+			'author'     => $data[ 'author' ],
438 438
 			'url'        => home_url(),
439
-			'beta'       => ! empty( $data['beta'] ),
439
+			'beta'       => ! empty( $data[ 'beta' ] ),
440 440
 		);
441 441
 
442
-		$request    = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => $verify_ssl, 'body' => $api_params ) );
442
+		$request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => $verify_ssl, 'body' => $api_params ) );
443 443
 
444 444
 		if ( ! is_wp_error( $request ) ) {
445 445
 			$request = json_decode( wp_remote_retrieve_body( $request ) );
@@ -459,9 +459,9 @@  discard block
 block discarded – undo
459 459
 			$request->icons = maybe_unserialize( $request->icons );
460 460
 		}
461 461
 
462
-		if( ! empty( $request->sections ) ) {
463
-			foreach( $request->sections as $key => $section ) {
464
-				$request->$key = (array) $section;
462
+		if ( ! empty( $request->sections ) ) {
463
+			foreach ( $request->sections as $key => $section ) {
464
+				$request->$key = (array)$section;
465 465
 			}
466 466
 		}
467 467
 
@@ -472,37 +472,37 @@  discard block
 block discarded – undo
472 472
 
473 473
 		global $edd_plugin_data;
474 474
 
475
-		if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) {
475
+		if ( empty( $_REQUEST[ 'edd_sl_action' ] ) || 'view_plugin_changelog' != $_REQUEST[ 'edd_sl_action' ] ) {
476 476
 			return;
477 477
 		}
478 478
 
479
-		if( empty( $_REQUEST['plugin'] ) ) {
479
+		if ( empty( $_REQUEST[ 'plugin' ] ) ) {
480 480
 			return;
481 481
 		}
482 482
 
483
-		if( empty( $_REQUEST['slug'] ) ) {
483
+		if ( empty( $_REQUEST[ 'slug' ] ) ) {
484 484
 			return;
485 485
 		}
486 486
 
487
-		if( ! current_user_can( 'update_plugins' ) ) {
487
+		if ( ! current_user_can( 'update_plugins' ) ) {
488 488
 			wp_die( __( 'You do not have permission to install plugin updates', 'gravityview' ), __( 'Error', 'gravityview' ), array( 'response' => 403 ) );
489 489
 		}
490 490
 
491
-		$data         = $edd_plugin_data[ $_REQUEST['slug'] ];
492
-		$beta         = ! empty( $data['beta'] ) ? true : false;
493
-		$cache_key    = md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_' . $beta . '_version_info' );
491
+		$data         = $edd_plugin_data[ $_REQUEST[ 'slug' ] ];
492
+		$beta         = ! empty( $data[ 'beta' ] ) ? true : false;
493
+		$cache_key    = md5( 'edd_plugin_' . sanitize_key( $_REQUEST[ 'plugin' ] ) . '_' . $beta . '_version_info' );
494 494
 		$version_info = $this->get_cached_version_info( $cache_key );
495 495
 
496
-		if( false === $version_info ) {
496
+		if ( false === $version_info ) {
497 497
 
498 498
 			$api_params = array(
499 499
 				'edd_action' => 'get_version',
500
-				'item_name'  => isset( $data['item_name'] ) ? $data['item_name'] : false,
501
-				'item_id'    => isset( $data['item_id'] ) ? $data['item_id'] : false,
502
-				'slug'       => $_REQUEST['slug'],
503
-				'author'     => $data['author'],
500
+				'item_name'  => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false,
501
+				'item_id'    => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false,
502
+				'slug'       => $_REQUEST[ 'slug' ],
503
+				'author'     => $data[ 'author' ],
504 504
 				'url'        => home_url(),
505
-				'beta'       => ! empty( $data['beta'] )
505
+				'beta'       => ! empty( $data[ 'beta' ] )
506 506
 			);
507 507
 
508 508
 			$verify_ssl = $this->verify_ssl();
@@ -519,9 +519,9 @@  discard block
 block discarded – undo
519 519
 				$version_info = false;
520 520
 			}
521 521
 
522
-			if( ! empty( $version_info ) ) {
523
-				foreach( $version_info->sections as $key => $section ) {
524
-					$version_info->$key = (array) $section;
522
+			if ( ! empty( $version_info ) ) {
523
+				foreach ( $version_info->sections as $key => $section ) {
524
+					$version_info->$key = (array)$section;
525 525
 				}
526 526
 			}
527 527
 
@@ -529,8 +529,8 @@  discard block
 block discarded – undo
529 529
 
530 530
 		}
531 531
 
532
-		if( ! empty( $version_info ) && isset( $version_info->sections['changelog'] ) ) {
533
-			echo '<div style="background:#fff;padding:10px;">' . $version_info->sections['changelog'] . '</div>';
532
+		if ( ! empty( $version_info ) && isset( $version_info->sections[ 'changelog' ] ) ) {
533
+			echo '<div style="background:#fff;padding:10px;">' . $version_info->sections[ 'changelog' ] . '</div>';
534 534
 		}
535 535
 
536 536
 		exit;
@@ -538,29 +538,29 @@  discard block
 block discarded – undo
538 538
 
539 539
 	public function get_cached_version_info( $cache_key = '' ) {
540 540
 
541
-		if( empty( $cache_key ) ) {
541
+		if ( empty( $cache_key ) ) {
542 542
 			$cache_key = $this->cache_key;
543 543
 		}
544 544
 
545 545
 		$cache = get_option( $cache_key );
546 546
 
547
-		if( empty( $cache['timeout'] ) || time() > $cache['timeout'] ) {
547
+		if ( empty( $cache[ 'timeout' ] ) || time() > $cache[ 'timeout' ] ) {
548 548
 			return false; // Cache is expired
549 549
 		}
550 550
 
551 551
 		// We need to turn the icons into an array, thanks to WP Core forcing these into an object at some point.
552
-		$cache['value'] = json_decode( $cache['value'] );
553
-		if ( ! empty( $cache['value']->icons ) ) {
554
-			$cache['value']->icons = (array) $cache['value']->icons;
552
+		$cache[ 'value' ] = json_decode( $cache[ 'value' ] );
553
+		if ( ! empty( $cache[ 'value' ]->icons ) ) {
554
+			$cache[ 'value' ]->icons = (array)$cache[ 'value' ]->icons;
555 555
 		}
556 556
 
557
-		return $cache['value'];
557
+		return $cache[ 'value' ];
558 558
 
559 559
 	}
560 560
 
561 561
 	public function set_version_info_cache( $value = '', $cache_key = '' ) {
562 562
 
563
-		if( empty( $cache_key ) ) {
563
+		if ( empty( $cache_key ) ) {
564 564
 			$cache_key = $this->cache_key;
565 565
 		}
566 566
 
@@ -580,7 +580,7 @@  discard block
 block discarded – undo
580 580
 	 * @return bool
581 581
 	 */
582 582
 	private function verify_ssl() {
583
-		return (bool) apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
583
+		return (bool)apply_filters( 'edd_sl_api_request_verify_ssl', true, $this );
584 584
 	}
585 585
 
586 586
 }
Please login to merge, or discard this patch.
future/includes/class-gv-extension.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -180,13 +180,13 @@  discard block
 block discarded – undo
180 180
 		$tab = wp_parse_args( $tab_settings, $tab_defaults );
181 181
 
182 182
 		// Force the screen to be GravityView
183
-		$tab['screen'] = 'gravityview';
183
+		$tab[ 'screen' ] = 'gravityview';
184 184
 
185 185
 		if ( class_exists( 'GravityView_Metabox_Tab' ) ) {
186
-			$metabox = new \GravityView_Metabox_Tab( $tab['id'], $tab['title'], $tab['file'], $tab['icon-class'], $tab['callback'], $tab['callback_args'] );
186
+			$metabox = new \GravityView_Metabox_Tab( $tab[ 'id' ], $tab[ 'title' ], $tab[ 'file' ], $tab[ 'icon-class' ], $tab[ 'callback' ], $tab[ 'callback_args' ] );
187 187
 			\GravityView_Metabox_Tabs::add( $metabox );
188 188
 		} else {
189
-			add_meta_box( 'gravityview_' . $tab['id'], $tab['title'], $tab['callback'], $tab['screen'], $tab['context'], $tab['priority'] );
189
+			add_meta_box( 'gravityview_' . $tab[ 'id' ], $tab[ 'title' ], $tab[ 'callback' ], $tab[ 'screen' ], $tab[ 'context' ], $tab[ 'priority' ] );
190 190
 		}
191 191
 	}
192 192
 
@@ -211,14 +211,14 @@  discard block
 block discarded – undo
211 211
 	 */
212 212
 	protected function is_extension_supported() {
213 213
 
214
-		self::$is_compatible = is_array( self::$is_compatible ) ? self::$is_compatible : array( get_called_class() => (bool) self::$is_compatible );
214
+		self::$is_compatible = is_array( self::$is_compatible ) ? self::$is_compatible : array( get_called_class() => (bool)self::$is_compatible );
215 215
 
216 216
 		if ( ! function_exists( 'gravityview' ) ) {
217 217
 			$message = sprintf( __( 'Could not activate the %s Extension; GravityView is not active.', 'gravityview' ), esc_html( $this->_title ) );
218
-		} else if ( false === version_compare( Plugin::$version, $this->_min_gravityview_version , ">=" ) ) {
219
-			$message = sprintf( __( 'The %s Extension requires GravityView Version %s or newer.', 'gravityview' ), esc_html( $this->_title ), '<tt>'.$this->_min_gravityview_version.'</tt>' );
220
-		} else if ( isset( $this->_min_php_version ) && false === version_compare( phpversion(), $this->_min_php_version , ">=" ) ) {
221
-			$message = sprintf( __( 'The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview' ), esc_html( $this->_title ), '<tt>'.$this->_min_php_version.'</tt>' );
218
+		} else if ( false === version_compare( Plugin::$version, $this->_min_gravityview_version, ">=" ) ) {
219
+			$message = sprintf( __( 'The %s Extension requires GravityView Version %s or newer.', 'gravityview' ), esc_html( $this->_title ), '<tt>' . $this->_min_gravityview_version . '</tt>' );
220
+		} else if ( isset( $this->_min_php_version ) && false === version_compare( phpversion(), $this->_min_php_version, ">=" ) ) {
221
+			$message = sprintf( __( 'The %s Extension requires PHP Version %s or newer. Please ask your host to upgrade your server\'s PHP.', 'gravityview' ), esc_html( $this->_title ), '<tt>' . $this->_min_php_version . '</tt>' );
222 222
 		} else if ( ! empty( $this->_max_gravityview_version ) && false === version_compare( $this->_max_gravityview_version, Plugin::$version, ">" ) ) {
223 223
 			$message = sprintf( __( 'The %s Extension is not compatible with this version of GravityView. Please update the Extension to the latest version.', 'gravityview' ), esc_html( $this->_title ) );
224 224
 		} else {
@@ -258,12 +258,12 @@  discard block
 block discarded – undo
258 258
 
259 259
 		$locale = get_locale();
260 260
 
261
-		if ( function_exists('get_user_locale') && is_admin() ) {
261
+		if ( function_exists( 'get_user_locale' ) && is_admin() ) {
262 262
 			$locale = get_user_locale();
263 263
 		}
264 264
 
265 265
 		// Traditional WordPress plugin locale filter
266
-		$locale = apply_filters( 'plugin_locale',  $locale, $this->_text_domain );
266
+		$locale = apply_filters( 'plugin_locale', $locale, $this->_text_domain );
267 267
 
268 268
 		$mofile = sprintf( '%1$s-%2$s.mo', $this->_text_domain, $locale );
269 269
 
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
 	public function settings() {
292 292
 
293 293
 		// If doing ajax, get outta here
294
-		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST('action') ) )  {
294
+		if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'update-plugin' !== Utils::_POST( 'action' ) ) ) {
295 295
 			return;
296 296
 		}
297 297
 
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
             	'version'	=> $this->_version, // current version number
309 309
             	'license'	=> \GV\Utils::get( $license, 'license_key', \GV\Utils::get( $license, 'license', null ) ),
310 310
 	            'item_id'   => $this->_item_id, // The ID of the download on _remote_update_url
311
-            	'item_name' => $this->_title,  // name of this plugin
311
+            	'item_name' => $this->_title, // name of this plugin
312 312
             	'author' 	=> strip_tags( $this->_author )  // author of this plugin
313 313
           	)
314 314
         );
@@ -337,16 +337,16 @@  discard block
 block discarded – undo
337 337
 	 */
338 338
 	public static function add_notice( $notice = array() ) {
339 339
 
340
-		if ( is_array( $notice ) && empty( $notice['message'] ) ) {
340
+		if ( is_array( $notice ) && empty( $notice[ 'message' ] ) ) {
341 341
 			gravityview()->log->error( 'Notice not set', array( 'data' => $notice ) );
342 342
 			return;
343 343
 		} else if ( is_string( $notice ) ) {
344 344
 			$notice = array( 'message' => $notice );
345 345
 		}
346 346
 
347
-		$notice['class'] = empty( $notice['class'] ) ? 'error' : $notice['class'];
347
+		$notice[ 'class' ] = empty( $notice[ 'class' ] ) ? 'error' : $notice[ 'class' ];
348 348
 
349
-		self::$admin_notices []= $notice;
349
+		self::$admin_notices [ ] = $notice;
350 350
 	}
351 351
 
352 352
 	/**
@@ -360,8 +360,8 @@  discard block
 block discarded – undo
360 360
 		}
361 361
 
362 362
 		foreach ( self::$admin_notices as $key => $notice ) {
363
-			echo '<div id="message" class="'. esc_attr( $notice['class'] ).'">';
364
-			echo wpautop( $notice['message'] );
363
+			echo '<div id="message" class="' . esc_attr( $notice[ 'class' ] ) . '">';
364
+			echo wpautop( $notice[ 'message' ] );
365 365
 			echo '<div class="clear"></div>';
366 366
 			echo '</div>';
367 367
 		}
Please login to merge, or discard this patch.
includes/class-gravityview-change-entry-creator.php 1 patch
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -10,17 +10,17 @@  discard block
 block discarded – undo
10 10
     	/**
11 11
     	 * @since  1.5.1
12 12
     	 */
13
-    	add_action('gform_user_registered', array( $this, 'assign_new_user_to_lead'), 10, 4 );
13
+    	add_action( 'gform_user_registered', array( $this, 'assign_new_user_to_lead' ), 10, 4 );
14 14
 
15 15
     	// ONLY ADMIN FROM HERE ON.
16
-    	if( !is_admin() ) { return; }
16
+    	if ( ! is_admin() ) { return; }
17 17
 
18 18
 	    /**
19 19
          * @filter `gravityview_disable_change_entry_creator` Disable the Change Entry Creator functionality
20 20
 	     * @since 1.7.4
21 21
 	     * @param boolean $disable Disable the Change Entry Creator functionality. Default: false.
22 22
 	     */
23
-	    if( apply_filters('gravityview_disable_change_entry_creator', false ) ) {
23
+	    if ( apply_filters( 'gravityview_disable_change_entry_creator', false ) ) {
24 24
 		    return;
25 25
 	    }
26 26
 
@@ -28,9 +28,9 @@  discard block
 block discarded – undo
28 28
          * Use `init` to fix bbPress warning
29 29
          * @see https://bbpress.trac.wordpress.org/ticket/2309
30 30
          */
31
-    	add_action('init', array( $this, 'load'), 100 );
31
+    	add_action( 'init', array( $this, 'load' ), 100 );
32 32
 
33
-    	add_action('plugins_loaded', array( $this, 'prevent_conflicts') );
33
+    	add_action( 'plugins_loaded', array( $this, 'prevent_conflicts' ) );
34 34
 
35 35
     }
36 36
 
@@ -56,20 +56,20 @@  discard block
 block discarded – undo
56 56
     	$assign_to_lead = apply_filters( 'gravityview_assign_new_user_to_entry', true, $user_id, $config, $entry );
57 57
 
58 58
     	// If filter returns false, do not process
59
-    	if( empty( $assign_to_lead ) ) {
59
+    	if ( empty( $assign_to_lead ) ) {
60 60
     		return;
61 61
     	}
62 62
 
63 63
     	// Update the entry. The `false` prevents checking Akismet; `true` disables the user updated hook from firing
64
-    	$result = RGFormsModel::update_entry_property( (int) $entry['id'], 'created_by', (int) $user_id, false, true );
64
+    	$result = RGFormsModel::update_entry_property( (int)$entry[ 'id' ], 'created_by', (int)$user_id, false, true );
65 65
 
66 66
     	if ( false === $result ) {
67
-    		$status = __('Error', 'gravityview');
67
+    		$status = __( 'Error', 'gravityview' );
68 68
     		global $wpdb;
69 69
 		    $note = sprintf( '%s: Failed to assign User ID #%d as the entry creator (Last database error: "%s")', $status, $user_id, $wpdb->last_error );
70 70
     	} else {
71
-    		$status = __('Success', 'gravityview');
72
-    	    $note = sprintf( _x('%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview'), $status, $user_id );
71
+    		$status = __( 'Success', 'gravityview' );
72
+    	    $note = sprintf( _x( '%s: Assigned User ID #%d as the entry creator.', 'First parameter: Success or error of the action. Second: User ID number', 'gravityview' ), $status, $user_id );
73 73
     	}
74 74
 
75 75
     	gravityview()->log->debug( 'GravityView_Change_Entry_Creator[assign_new_user_to_lead] - {note}', array( 'note' => $note ) );
@@ -79,11 +79,11 @@  discard block
 block discarded – undo
79 79
 	     * @since 1.21.5
80 80
 	     * @param boolean $disable Disable the Change Entry Creator note. Default: false.
81 81
 	     */
82
-	    if( apply_filters('gravityview_disable_change_entry_creator_note', false ) ) {
82
+	    if ( apply_filters( 'gravityview_disable_change_entry_creator_note', false ) ) {
83 83
 		    return;
84 84
 	    }
85 85
 
86
-        GravityView_Entry_Notes::add_note( $entry['id'], -1, 'GravityView', $note, 'gravityview' );
86
+        GravityView_Entry_Notes::add_note( $entry[ 'id' ], -1, 'GravityView', $note, 'gravityview' );
87 87
 
88 88
     }
89 89
 
@@ -95,8 +95,8 @@  discard block
 block discarded – undo
95 95
 
96 96
     	// Plugin that was provided here:
97 97
     	// @link https://gravityview.co/support/documentation/201991205/
98
-    	remove_action("gform_entry_info", 'gravityview_change_entry_creator_form', 10 );
99
-    	remove_action("gform_after_update_entry", 'gravityview_update_entry_creator', 10 );
98
+    	remove_action( "gform_entry_info", 'gravityview_change_entry_creator_form', 10 );
99
+    	remove_action( "gform_after_update_entry", 'gravityview_update_entry_creator', 10 );
100 100
 
101 101
     }
102 102
 
@@ -107,26 +107,26 @@  discard block
 block discarded – undo
107 107
     function load() {
108 108
 
109 109
     	// Does GF exist?
110
-        if( !class_exists('GFCommon') ) {
110
+        if ( ! class_exists( 'GFCommon' ) ) {
111 111
             return;
112 112
         }
113 113
 
114 114
         // Can the user edit entries?
115
-        if( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
115
+        if ( ! GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_entries' ) ) ) {
116 116
             return;
117 117
         }
118 118
 
119 119
         // If screen mode isn't set, then we're in the wrong place.
120
-        if( empty( $_REQUEST['screen_mode'] ) ) {
120
+        if ( empty( $_REQUEST[ 'screen_mode' ] ) ) {
121 121
             return;
122 122
         }
123 123
 
124 124
         // Now, no validation is required in the methods; let's hook in.
125
-        add_action('admin_init', array( &$this, 'set_screen_mode' ) );
125
+        add_action( 'admin_init', array( &$this, 'set_screen_mode' ) );
126 126
 
127
-        add_action("gform_entry_info", array( &$this, 'add_select' ), 10, 2);
127
+        add_action( "gform_entry_info", array( &$this, 'add_select' ), 10, 2 );
128 128
 
129
-        add_action("gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2);
129
+        add_action( "gform_after_update_entry", array( &$this, 'update_entry_creator' ), 10, 2 );
130 130
 
131 131
     }
132 132
 
@@ -136,13 +136,13 @@  discard block
 block discarded – undo
136 136
      */
137 137
     function set_screen_mode() {
138 138
 
139
-    	if( 'view' === \GV\Utils::_POST( 'screen_mode' ) ) {
139
+    	if ( 'view' === \GV\Utils::_POST( 'screen_mode' ) ) {
140 140
     		return;
141 141
 	    }
142 142
 
143 143
     	// If $_GET['screen_mode'] is set to edit, set $_POST value
144
-        if( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
145
-            $_POST["screen_mode"] = 'edit';
144
+        if ( \GV\Utils::_GET( 'screen_mode' ) === 'edit' ) {
145
+            $_POST[ "screen_mode" ] = 'edit';
146 146
         }
147 147
 
148 148
     }
@@ -153,11 +153,11 @@  discard block
 block discarded – undo
153 153
      * @param  int $entry_id Entry ID
154 154
      * @return void
155 155
      */
156
-    function update_entry_creator($form, $entry_id) {
156
+    function update_entry_creator( $form, $entry_id ) {
157 157
             global $current_user;
158 158
 
159 159
         // Update the entry
160
-        $created_by = absint( \GV\Utils::_POST( 'created_by') );
160
+        $created_by = absint( \GV\Utils::_POST( 'created_by' ) );
161 161
 
162 162
         RGFormsModel::update_lead_property( $entry_id, 'created_by', $created_by );
163 163
 
@@ -165,30 +165,30 @@  discard block
 block discarded – undo
165 165
         $originally_created_by = \GV\Utils::_POST( 'originally_created_by' );
166 166
 
167 167
         // If there's no owner and there didn't used to be, keep going
168
-        if( empty( $originally_created_by ) && empty( $created_by ) ) {
168
+        if ( empty( $originally_created_by ) && empty( $created_by ) ) {
169 169
             return;
170 170
         }
171 171
 
172 172
         // If the values have changed
173
-        if( absint( $originally_created_by ) !== absint( $created_by ) ) {
173
+        if ( absint( $originally_created_by ) !== absint( $created_by ) ) {
174 174
 
175
-            $user_data = get_userdata($current_user->ID);
175
+            $user_data = get_userdata( $current_user->ID );
176 176
 
177
-            $user_format = _x('%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview');
177
+            $user_format = _x( '%s (ID #%d)', 'The name and the ID of users who initiated changes to entry ownership', 'gravityview' );
178 178
 
179
-            $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview');
179
+            $original_name = $created_by_name = esc_attr_x( 'No User', 'To show that the entry was unassigned from an actual user to no user.', 'gravityview' );
180 180
 
181
-            if( !empty( $originally_created_by ) ) {
182
-                $originally_created_by_user_data = get_userdata($originally_created_by);
181
+            if ( ! empty( $originally_created_by ) ) {
182
+                $originally_created_by_user_data = get_userdata( $originally_created_by );
183 183
                 $original_name = sprintf( $user_format, $originally_created_by_user_data->display_name, $originally_created_by_user_data->ID );
184 184
             }
185 185
 
186
-            if( !empty( $created_by ) ) {
187
-                $created_by_user_data =  get_userdata($created_by);
186
+            if ( ! empty( $created_by ) ) {
187
+                $created_by_user_data = get_userdata( $created_by );
188 188
                 $created_by_name = sprintf( $user_format, $created_by_user_data->display_name, $created_by_user_data->ID );
189 189
             }
190 190
 
191
-            GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __('Changed entry creator from %s to %s', 'gravityview'), $original_name, $created_by_name ), 'note' );
191
+            GravityView_Entry_Notes::add_note( $entry_id, $current_user->ID, $user_data->display_name, sprintf( __( 'Changed entry creator from %s to %s', 'gravityview' ), $original_name, $created_by_name ), 'note' );
192 192
         }
193 193
 
194 194
     }
@@ -199,9 +199,9 @@  discard block
 block discarded – undo
199 199
      * @param array $entry    GF entry array
200 200
      * @return void
201 201
      */
202
-    function add_select($form_id, $entry ) {
202
+    function add_select( $form_id, $entry ) {
203 203
 
204
-        if( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
204
+        if ( \GV\Utils::_POST( 'screen_mode' ) !== 'edit' ) {
205 205
             return;
206 206
         }
207 207
 
@@ -220,23 +220,23 @@  discard block
 block discarded – undo
220 220
 	    }
221 221
 
222 222
         $output = '<label for="change_created_by">';
223
-        $output .= esc_html__('Change Entry Creator:', 'gravityview');
223
+        $output .= esc_html__( 'Change Entry Creator:', 'gravityview' );
224 224
         $output .= '</label>';
225 225
 
226 226
 	    // If there are users who are not being shown, show a warning.
227 227
 	    // TODO: Use AJAX instead of <select>
228 228
 	    $count_users = count_users();
229
-	    if( sizeof( $users ) < $count_users['total_users'] ) {
229
+	    if ( sizeof( $users ) < $count_users[ 'total_users' ] ) {
230 230
 		    $output .= '<p><i class="dashicons dashicons-warning"></i> ' . sprintf( esc_html__( 'The displayed list of users has been trimmed due to the large number of users. %sLearn how to remove this limit%s.', 'gravityview' ), '<a href="https://docs.gravityview.co/article/251-i-only-see-some-users-in-the-change-entry-creator-dropdown" rel="external">', '</a>' ) . '</p>';
231 231
 	    }
232 232
 
233 233
 	    $output .= '<select name="created_by" id="change_created_by" class="widefat">';
234
-        $output .= '<option value="' . selected( $entry['created_by'], '0', false ) . '"> &mdash; '.esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview').' &mdash; </option>';
235
-        foreach($users as $user) {
236
-            $output .= '<option value="'. $user->ID .'"'. selected( $entry['created_by'], $user->ID, false ).'>'.esc_attr( $user->display_name.' ('.$user->user_nicename.')' ).'</option>';
234
+        $output .= '<option value="' . selected( $entry[ 'created_by' ], '0', false ) . '"> &mdash; ' . esc_attr_x( 'No User', 'No user assigned to the entry', 'gravityview' ) . ' &mdash; </option>';
235
+        foreach ( $users as $user ) {
236
+            $output .= '<option value="' . $user->ID . '"' . selected( $entry[ 'created_by' ], $user->ID, false ) . '>' . esc_attr( $user->display_name . ' (' . $user->user_nicename . ')' ) . '</option>';
237 237
         }
238 238
         $output .= '</select>';
239
-        $output .= '<input name="originally_created_by" value="'.esc_attr( $entry['created_by'] ).'" type="hidden" />';
239
+        $output .= '<input name="originally_created_by" value="' . esc_attr( $entry[ 'created_by' ] ) . '" type="hidden" />';
240 240
 
241 241
 	    unset( $is_created_by_in_users, $created_by_user, $users, $created_by_id, $count_users );
242 242
 
Please login to merge, or discard this patch.
future/_mocks.php 1 patch
Spacing   +44 added lines, -47 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,25 +766,25 @@  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 773
 		/** WordPress 4.6 and lower compatibility, when WP_Hook classes were still absent. */
777
-		if ( is_array( $wp_filter['gravityview_after'] ) ) {
778
-			if ( ! empty( $wp_filter['gravityview_after'][10] ) ) {
779
-				foreach ( $wp_filter['gravityview_after'][10] as $function_key => $callback ) {
774
+		if ( is_array( $wp_filter[ 'gravityview_after' ] ) ) {
775
+			if ( ! empty( $wp_filter[ 'gravityview_after' ][ 10 ] ) ) {
776
+				foreach ( $wp_filter[ 'gravityview_after' ][ 10 ] as $function_key => $callback ) {
780 777
 					if ( strpos( $function_key, 'context_not_configured_warning' ) ) {
781
-						unset( $wp_filter['gravityview_after'][10][ $function_key ] );
778
+						unset( $wp_filter[ 'gravityview_after' ][ 10 ][ $function_key ] );
782 779
 					}
783 780
 				}
784 781
 			}
785 782
 			return;
786 783
 		}
787 784
 
788
-		foreach ( $wp_filter['gravityview_after']->callbacks[10] as $function_key => $callback ) {
785
+		foreach ( $wp_filter[ 'gravityview_after' ]->callbacks[ 10 ] as $function_key => $callback ) {
789 786
 			if ( strpos( $function_key, 'context_not_configured_warning' ) ) {
790
-				unset( $wp_filter['gravityview_after']->callbacks[10][ $function_key ] );
787
+				unset( $wp_filter[ 'gravityview_after' ]->callbacks[ 10 ][ $function_key ] );
791 788
 			}
792 789
 		}
793 790
 	}
Please login to merge, or discard this patch.