Completed
Pull Request — develop (#1573)
by Zack
20:26
created
includes/widgets/search-widget/templates/search-field-select.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -10,14 +10,14 @@  discard block
 block discarded – undo
10 10
 $search_field = $gravityview_view->search_field;
11 11
 
12 12
 // Make sure that there are choices to display
13
-if( empty( $search_field['choices'] ) ) {
13
+if ( empty( $search_field[ 'choices' ] ) ) {
14 14
 	gravityview()->log->debug( 'search-field-select.php - No choices for field' );
15 15
 	return;
16 16
 }
17 17
 
18
-if( is_array( $search_field['value'] ) ) {
18
+if ( is_array( $search_field[ 'value' ] ) ) {
19 19
     gravityview()->log->debug( 'search-field-select.php - Array values passed; using first value.' );
20
-	$search_field['value'] = reset( $search_field['value'] );
20
+	$search_field[ 'value' ] = reset( $search_field[ 'value' ] );
21 21
 }
22 22
 
23 23
 /**
@@ -26,26 +26,26 @@  discard block
 block discarded – undo
26 26
  * @param string $default_option Default: `—` (—)
27 27
  * @param string $field_type Field type: "select" or "multiselect"
28 28
  */
29
-$default_option = apply_filters('gravityview/extension/search/select_default', '—', 'select' );
29
+$default_option = apply_filters( 'gravityview/extension/search/select_default', '—', 'select' );
30 30
 
31 31
 ?>
32 32
 <div class="gv-search-box gv-search-field-select">
33
-	<?php if( ! gv_empty( $search_field['label'], false, false ) ) { ?>
34
-		<label for="search-box-<?php echo esc_attr( $search_field['name'] ); ?>"><?php echo esc_html( $search_field['label'] ); ?></label>
33
+	<?php if ( ! gv_empty( $search_field[ 'label' ], false, false ) ) { ?>
34
+		<label for="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>"><?php echo esc_html( $search_field[ 'label' ] ); ?></label>
35 35
 	<?php } ?>
36 36
 	<p>
37
-		<select name="<?php echo esc_attr( $search_field['name'] ); ?>" id="search-box-<?php echo esc_attr( $search_field['name'] ); ?>">
38
-			<option value="" <?php gv_selected( '', $search_field['value'], true ); ?>><?php echo esc_html( $default_option ); ?></option>
37
+		<select name="<?php echo esc_attr( $search_field[ 'name' ] ); ?>" id="search-box-<?php echo esc_attr( $search_field[ 'name' ] ); ?>">
38
+			<option value="" <?php gv_selected( '', $search_field[ 'value' ], true ); ?>><?php echo esc_html( $default_option ); ?></option>
39 39
 			<?php
40
-			foreach( $search_field['choices'] as $choice ) { ?>
41
-				<?php if ( is_array( $choice['value'] ) ) { ?>
42
-					<optgroup label="<?php echo esc_attr( $choice['text'] ); ?>">
43
-						<?php foreach ( $choice['value'] as $subchoice ): ?>
44
-							<option value="<?php echo esc_attr( $subchoice['value'] ); ?>"><?php echo esc_html( $subchoice['text'] ); ?></option>
40
+			foreach ( $search_field[ 'choices' ] as $choice ) { ?>
41
+				<?php if ( is_array( $choice[ 'value' ] ) ) { ?>
42
+					<optgroup label="<?php echo esc_attr( $choice[ 'text' ] ); ?>">
43
+						<?php foreach ( $choice[ 'value' ] as $subchoice ): ?>
44
+							<option value="<?php echo esc_attr( $subchoice[ 'value' ] ); ?>"><?php echo esc_html( $subchoice[ 'text' ] ); ?></option>
45 45
 						<?php endforeach; ?>
46 46
 					</optgroup>
47 47
 				<?php } else { ?>
48
-					<option value="<?php echo esc_attr( $choice['value'] ); ?>" <?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $search_field['value'] ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option>
48
+					<option value="<?php echo esc_attr( $choice[ 'value' ] ); ?>" <?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $search_field[ 'value' ] ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option>
49 49
 				<?php } ?>
50 50
 			<?php } ?>
51 51
 		</select>
Please login to merge, or discard this patch.
includes/class-template.php 1 patch
Spacing   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 	die;
17 17
 }
18 18
 
19
-if( ! class_exists( '\GV\Gamajo_Template_Loader' ) ) {
19
+if ( ! class_exists( '\GV\Gamajo_Template_Loader' ) ) {
20 20
 	require( GRAVITYVIEW_DIR . 'future/lib/class-gamajo-template-loader.php' );
21 21
 }
22 22
 
@@ -157,8 +157,8 @@  discard block
 block discarded – undo
157 157
 			'atts'	  => NULL,
158 158
 		) );
159 159
 
160
-		foreach ($atts as $key => $value) {
161
-			if( is_null( $value ) ) {
160
+		foreach ( $atts as $key => $value ) {
161
+			if ( is_null( $value ) ) {
162 162
 				continue;
163 163
 			}
164 164
 			$this->{$key} = $value;
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 	 */
189 189
 	static function getInstance( $passed_post = NULL ) {
190 190
 
191
-		if( empty( self::$instance ) ) {
191
+		if ( empty( self::$instance ) ) {
192 192
 			self::$instance = new self( $passed_post );
193 193
 		}
194 194
 
@@ -201,8 +201,8 @@  discard block
 block discarded – undo
201 201
 	 */
202 202
 	public function getCurrentField( $key = NULL ) {
203 203
 
204
-		if( !empty( $key ) ) {
205
-			if( isset( $this->_current_field[ $key ] ) ) {
204
+		if ( ! empty( $key ) ) {
205
+			if ( isset( $this->_current_field[ $key ] ) ) {
206 206
 				return $this->_current_field[ $key ];
207 207
 			}
208 208
 			return NULL;
@@ -213,16 +213,16 @@  discard block
 block discarded – undo
213 213
 
214 214
 	public function setCurrentFieldSetting( $key, $value ) {
215 215
 
216
-		if( !empty( $this->_current_field ) ) {
217
-			$this->_current_field['field_settings'][ $key ] = $value;
216
+		if ( ! empty( $this->_current_field ) ) {
217
+			$this->_current_field[ 'field_settings' ][ $key ] = $value;
218 218
 		}
219 219
 
220 220
 	}
221 221
 
222 222
 	public function getCurrentFieldSetting( $key ) {
223
-		$settings = $this->getCurrentField('field_settings');
223
+		$settings = $this->getCurrentField( 'field_settings' );
224 224
 
225
-		if( $settings && !empty( $settings[ $key ] ) ) {
225
+		if ( $settings && ! empty( $settings[ $key ] ) ) {
226 226
 			return $settings[ $key ];
227 227
 		}
228 228
 
@@ -253,8 +253,8 @@  discard block
 block discarded – undo
253 253
 	 */
254 254
 	public function getAtts( $key = NULL ) {
255 255
 
256
-		if( !empty( $key ) ) {
257
-			if( isset( $this->atts[ $key ] ) ) {
256
+		if ( ! empty( $key ) ) {
257
+			if ( isset( $this->atts[ $key ] ) ) {
258 258
 				return $this->atts[ $key ];
259 259
 			}
260 260
 			return NULL;
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
 
321 321
 		$fields = empty( $this->fields ) ? NULL : $this->fields;
322 322
 
323
-		if( $fields && !empty( $key ) ) {
323
+		if ( $fields && ! empty( $key ) ) {
324 324
 			$fields = isset( $fields[ $key ] ) ? $fields[ $key ] : NULL;
325 325
 		}
326 326
 
@@ -338,18 +338,18 @@  discard block
 block discarded – undo
338 338
 	 */
339 339
 	public function getContextFields( $context = '' ) {
340 340
 
341
-	    if( '' === $context ) {
341
+	    if ( '' === $context ) {
342 342
 	        $context = $this->getContext();
343 343
         }
344 344
 
345 345
 		$fields = $this->getFields();
346 346
 
347
-        foreach ( (array) $fields as $key => $context_fields ) {
347
+        foreach ( (array)$fields as $key => $context_fields ) {
348 348
 
349 349
             // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against
350 350
             $matches = explode( '_', $key );
351 351
 
352
-            if( isset( $matches[0] ) && $matches[0] === $context ) {
352
+            if ( isset( $matches[ 0 ] ) && $matches[ 0 ] === $context ) {
353 353
                 return $context_fields;
354 354
             }
355 355
         }
@@ -370,8 +370,8 @@  discard block
 block discarded – undo
370 370
 	 */
371 371
 	public function getField( $key ) {
372 372
 
373
-		if( !empty( $key ) ) {
374
-			if( isset( $this->fields[ $key ] ) ) {
373
+		if ( ! empty( $key ) ) {
374
+			if ( isset( $this->fields[ $key ] ) ) {
375 375
 				return $this->fields[ $key ];
376 376
 			}
377 377
 		}
@@ -477,8 +477,8 @@  discard block
 block discarded – undo
477 477
 	public function getPaginationCounts() {
478 478
 
479 479
 		$paging = $this->getPaging();
480
-		$offset = $paging['offset'];
481
-		$page_size = $paging['page_size'];
480
+		$offset = $paging[ 'offset' ];
481
+		$page_size = $paging[ 'page_size' ];
482 482
 		$total = $this->getTotalEntries();
483 483
 
484 484
 		if ( empty( $total ) ) {
@@ -499,7 +499,7 @@  discard block
 block discarded – undo
499 499
 		 */
500 500
 		list( $first, $last, $total ) = apply_filters( 'gravityview_pagination_counts', array( $first, $last, $total ) );
501 501
 
502
-		return array( 'first' => (int) $first, 'last' => (int) $last, 'total' => (int) $total );
502
+		return array( 'first' => (int)$first, 'last' => (int)$last, 'total' => (int)$total );
503 503
 	}
504 504
 
505 505
 	/**
@@ -595,16 +595,16 @@  discard block
 block discarded – undo
595 595
 	 */
596 596
 	public function getCurrentEntry() {
597 597
 
598
-		if( in_array( $this->getContext(), array( 'edit', 'single') ) ) {
598
+		if ( in_array( $this->getContext(), array( 'edit', 'single' ) ) ) {
599 599
 			$entries = $this->getEntries();
600
-			$entry = $entries[0];
600
+			$entry = $entries[ 0 ];
601 601
 		} else {
602 602
 			$entry = $this->_current_entry;
603 603
 		}
604 604
 
605 605
 		/** @since 1.16 Fixes DataTables empty entry issue */
606
-		if ( empty( $entry ) && ! empty( $this->_current_field['entry'] ) ) {
607
-			$entry = $this->_current_field['entry'];
606
+		if ( empty( $entry ) && ! empty( $this->_current_field[ 'entry' ] ) ) {
607
+			$entry = $this->_current_field[ 'entry' ];
608 608
 		}
609 609
 
610 610
 		return $entry;
@@ -644,7 +644,7 @@  discard block
 block discarded – undo
644 644
 	public function renderZone( $zone = '', $atts = array(), $echo = true ) {
645 645
 
646 646
 		if ( empty( $zone ) ) {
647
-			gravityview()->log->error( 'No zone defined.');
647
+			gravityview()->log->error( 'No zone defined.' );
648 648
 			return NULL;
649 649
 		}
650 650
 
@@ -653,16 +653,16 @@  discard block
 block discarded – undo
653 653
 			'context' => $this->getContext(),
654 654
 			'entry' => $this->getCurrentEntry(),
655 655
 			'form' => $this->getForm(),
656
-			'hide_empty' => $this->getAtts('hide_empty'),
656
+			'hide_empty' => $this->getAtts( 'hide_empty' ),
657 657
 		);
658 658
 
659 659
 		$final_atts = wp_parse_args( $atts, $defaults );
660 660
 
661 661
 		$output = '';
662 662
 
663
-		$final_atts['zone_id'] = "{$final_atts['context']}_{$final_atts['slug']}-{$zone}";
663
+		$final_atts[ 'zone_id' ] = "{$final_atts[ 'context' ]}_{$final_atts[ 'slug' ]}-{$zone}";
664 664
 
665
-		$fields = $this->getField( $final_atts['zone_id'] );
665
+		$fields = $this->getField( $final_atts[ 'zone_id' ] );
666 666
 
667 667
 		// Backward compatibility
668 668
 		if ( 'table' === $this->getTemplatePartSlug() ) {
@@ -672,19 +672,19 @@  discard block
 block discarded – undo
672 672
 			 * @param \GravityView_View $this
673 673
 			 * @deprecated Use `gravityview/template/table/fields`
674 674
 			 */
675
-			$fields = apply_filters("gravityview_table_cells", $fields, $this );
675
+			$fields = apply_filters( "gravityview_table_cells", $fields, $this );
676 676
 		}
677 677
 
678 678
 		if ( empty( $fields ) ) {
679 679
 
680
-			gravityview()->log->error( 'Empty zone configuration for {zone_id}.', array( 'zone_id' => $final_atts['zone_id'] ) );
680
+			gravityview()->log->error( 'Empty zone configuration for {zone_id}.', array( 'zone_id' => $final_atts[ 'zone_id' ] ) );
681 681
 
682 682
 			return NULL;
683 683
 		}
684 684
 
685 685
 		$field_output = '';
686 686
 		foreach ( $fields as $field ) {
687
-			$final_atts['field'] = $field;
687
+			$final_atts[ 'field' ] = $field;
688 688
 
689 689
 			$field_output .= gravityview_field_output( $final_atts );
690 690
 		}
@@ -701,17 +701,17 @@  discard block
 block discarded – undo
701 701
 			return NULL;
702 702
 		}
703 703
 
704
-		if( !empty( $final_atts['wrapper_class'] ) ) {
705
-			$output .= '<div class="'.gravityview_sanitize_html_class( $final_atts['wrapper_class'] ).'">';
704
+		if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
705
+			$output .= '<div class="' . gravityview_sanitize_html_class( $final_atts[ 'wrapper_class' ] ) . '">';
706 706
 		}
707 707
 
708 708
 		$output .= $field_output;
709 709
 
710
-		if( !empty( $final_atts['wrapper_class'] ) ) {
710
+		if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
711 711
 			$output .= '</div>';
712 712
 		}
713 713
 
714
-		if( $echo ) {
714
+		if ( $echo ) {
715 715
 			echo $output;
716 716
 		}
717 717
 
@@ -729,7 +729,7 @@  discard block
 block discarded – undo
729 729
 	 */
730 730
 	function locate_template( $template_names, $load = false, $require_once = true ) {
731 731
 
732
-		if( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
732
+		if ( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
733 733
 
734 734
 			$located = $this->located_templates[ $template_names ];
735 735
 
@@ -738,7 +738,7 @@  discard block
 block discarded – undo
738 738
 			// Set $load to always false so we handle it here.
739 739
 			$located = parent::locate_template( $template_names, false, $require_once );
740 740
 
741
-			if( is_string( $template_names ) ) {
741
+			if ( is_string( $template_names ) ) {
742 742
 				$this->located_templates[ $template_names ] = $located;
743 743
 			}
744 744
 		}
@@ -756,7 +756,7 @@  discard block
 block discarded – undo
756 756
 	 * @return mixed|null    The stored data.
757 757
 	 */
758 758
 	public function __get( $name ) {
759
-		if( isset( $this->{$name} ) ) {
759
+		if ( isset( $this->{$name} ) ) {
760 760
 			return $this->{$name};
761 761
 		} else {
762 762
 			return NULL;
@@ -785,17 +785,17 @@  discard block
 block discarded – undo
785 785
 		$additional = array();
786 786
 
787 787
 		// form-19-table-body.php
788
-		$additional[] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
788
+		$additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
789 789
 
790
-		if( $view_id = $this->getViewId() ) {
790
+		if ( $view_id = $this->getViewId() ) {
791 791
 			// view-3-table-body.php
792
-			$additional[] = sprintf( 'view-%d-%s-%s.php', $view_id, $slug, $name );
792
+			$additional[ ] = sprintf( 'view-%d-%s-%s.php', $view_id, $slug, $name );
793 793
 		}
794 794
 
795
-		if( $this->getPostId() ) {
795
+		if ( $this->getPostId() ) {
796 796
 
797 797
 			// page-19-table-body.php
798
-			$additional[] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
798
+			$additional[ ] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
799 799
 		}
800 800
 
801 801
 		// Combine with existing table-body.php and table.php
@@ -817,7 +817,7 @@  discard block
 block discarded – undo
817 817
 
818 818
 		gravityview()->log->debug( 'Rendering Template File: {path}', array( 'path' => $template_file ) );
819 819
 
820
-		if( !empty( $template_file) ) {
820
+		if ( ! empty( $template_file ) ) {
821 821
 
822 822
 			if ( $require_once ) {
823 823
 				require_once( $template_file );
@@ -892,7 +892,7 @@  discard block
 block discarded – undo
892 892
 
893 893
 		// Prevent being called twice
894 894
 		if ( did_action( "gravityview/widgets/$zone/{$view->ID}/rendered" ) ) {
895
-			gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone.'_'.$view->ID.'_widgets' ) );
895
+			gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone . '_' . $view->ID . '_widgets' ) );
896 896
 			return;
897 897
 		}
898 898
 
@@ -914,7 +914,7 @@  discard block
 block discarded – undo
914 914
 		 * @param string $zone Current widget zone, either `header` or `footer`
915 915
 		 * @param array $widgets Array of widget configurations for the current zone, as set by `gravityview_get_current_view_data()['widgets']`
916 916
 		 */
917
-		$css_class = apply_filters('gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() );
917
+		$css_class = apply_filters( 'gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() );
918 918
 
919 919
 		$css_class = gravityview_sanitize_html_class( $css_class );
920 920
 
@@ -922,15 +922,15 @@  discard block
 block discarded – undo
922 922
 		?>
923 923
 		<div class="<?php echo $css_class; ?>">
924 924
 			<?php
925
-			foreach( $rows as $row ) {
926
-				foreach( $row as $col => $areas ) {
925
+			foreach ( $rows as $row ) {
926
+				foreach ( $row as $col => $areas ) {
927 927
 					$column = ( $col == '2-2' ) ? '1-2 gv-right' : "$col gv-left";
928 928
 				?>
929 929
 					<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
930 930
 						<?php
931 931
 						if ( ! empty( $areas ) ) {
932 932
 							foreach ( $areas as $area ) {
933
-								foreach ( $widgets->by_position( $zone . '_' . $area['areaid'] )->all() as $widget ) {
933
+								foreach ( $widgets->by_position( $zone . '_' . $area[ 'areaid' ] )->all() as $widget ) {
934 934
 									do_action( sprintf( 'gravityview/widgets/%s/render', $widget->get_widget_id() ), $widget->configuration->all(), null, $view_id_or_context );
935 935
 								}
936 936
 							}
Please login to merge, or discard this patch.
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.
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.
future/includes/class-gv-collection-entry.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -104,11 +104,11 @@  discard block
 block discarded – undo
104 104
 
105 105
 		/** Call all lazy callbacks. */
106 106
 		foreach ( $this->callbacks as $callback ) {
107
-			if ( $callback[0] != 'count' ) {
107
+			if ( $callback[ 0 ] != 'count' ) {
108 108
 				continue;
109 109
 			}
110 110
 
111
-			$total += $callback[1]( $this->filters );
111
+			$total += $callback[ 1 ]( $this->filters );
112 112
 		}
113 113
 
114 114
 		if ( ! $total ) {
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 
149 149
 		foreach ( $this->all() as $entry ) {
150 150
 			$entry = $entry->as_entry();
151
-			$result[] = Utils::get( $entry, $key, null );
151
+			$result[ ] = Utils::get( $entry, $key, null );
152 152
 		}
153 153
 
154 154
 		return $result;
@@ -206,11 +206,11 @@  discard block
 block discarded – undo
206 206
 
207 207
 		/** Call all lazy callbacks. */
208 208
 		foreach ( $this->callbacks as $i => $callback ) {
209
-			if ( $callback[0] != 'fetch' ) {
209
+			if ( $callback[ 0 ] != 'fetch' ) {
210 210
 				continue;
211 211
 			}
212 212
 
213
-			$this->merge( $callback[1]( $this->filters, $this->sorts, $offset ) );
213
+			$this->merge( $callback[ 1 ]( $this->filters, $this->sorts, $offset ) );
214 214
 		}
215 215
 
216 216
 		$this->fetched = parent::count();
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
 			return;
367 367
 		}
368 368
 
369
-		$this->callbacks []= array( $type, $callback );
369
+		$this->callbacks [ ] = array( $type, $callback );
370 370
 	}
371 371
 
372 372
 	/**
Please login to merge, or discard this patch.
includes/widgets/class-gravityview-widget-page-size.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
 		$default_size = 25;
48 48
 
49 49
 		if ( $context instanceof \GV\Template_Context ) {
50
-			$default_size = (int) $context->view->settings->get( 'page_size' );
50
+			$default_size = (int)$context->view->settings->get( 'page_size' );
51 51
 		}
52 52
 
53 53
 		$sizes = array( 10, 25, $default_size, 50, 100 );
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 
59 59
 		$page_sizes = array();
60 60
 		foreach ( $sizes as $size ) {
61
-			$page_sizes [] = array(
61
+			$page_sizes [ ] = array(
62 62
 				'value' => $size,
63 63
 				'text'  => $size
64 64
 			);
@@ -83,11 +83,11 @@  discard block
 block discarded – undo
83 83
 	 */
84 84
 	public function render_frontend( $widget_args, $content = '', $context = null ) {
85 85
 
86
-		if( ! $this->pre_render_frontend() ) {
86
+		if ( ! $this->pre_render_frontend() ) {
87 87
 			return;
88 88
 		}
89 89
 
90
-		$page_size = (int) \GV\Utils::_GET( 'page_size', $context->view->settings->get( 'page_size' ) );
90
+		$page_size = (int)\GV\Utils::_GET( 'page_size', $context->view->settings->get( 'page_size' ) );
91 91
 
92 92
 		$settings = shortcode_atts( array(
93 93
 			'label'   => __( 'Page Size', 'gravityview' ),
@@ -106,20 +106,20 @@  discard block
 block discarded – undo
106 106
         <div class="gv-widget-page-size">
107 107
             <form method="get" action="<?php echo esc_url( add_query_arg( array() ) ); ?>" onchange="this.submit();">
108 108
                 <div>
109
-                    <?php if( ! empty( $settings['label'] ) ) { ?>
110
-                    <label for="gv-page_size"><?php echo esc_html( $settings['label'] ); ?></label>
109
+                    <?php if ( ! empty( $settings[ 'label' ] ) ) { ?>
110
+                    <label for="gv-page_size"><?php echo esc_html( $settings[ 'label' ] ); ?></label>
111 111
                     <?php } ?>
112 112
                     <select name="page_size" id="gv-page_size">
113
-                        <option value=""><?php echo esc_html( $settings['default_choice_text'] ); ?></option>
113
+                        <option value=""><?php echo esc_html( $settings[ 'default_choice_text' ] ); ?></option>
114 114
 						<?php
115
-						foreach ( $settings['choices'] as $choice ) { ?>
116
-                            <option value='<?php echo esc_attr( $choice['value'] ); ?>'<?php gv_selected( esc_attr( $choice['value'] ), esc_attr( $page_size ), true ); ?>><?php echo esc_html( $choice['text'] ); ?></option>
115
+						foreach ( $settings[ 'choices' ] as $choice ) { ?>
116
+                            <option value='<?php echo esc_attr( $choice[ 'value' ] ); ?>'<?php gv_selected( esc_attr( $choice[ 'value' ] ), esc_attr( $page_size ), true ); ?>><?php echo esc_html( $choice[ 'text' ] ); ?></option>
117 117
 						<?php } ?>
118 118
                     </select>
119 119
                     <input type="submit" value="Submit" style="visibility: hidden; position: absolute;" /><?php
120
-                    if( ! empty( $_GET ) ) {
120
+                    if ( ! empty( $_GET ) ) {
121 121
                         $get = $_GET;
122
-                        unset( $get['page_size'] );
122
+                        unset( $get[ 'page_size' ] );
123 123
 	                    foreach ( $get as $key => $value ) {
124 124
 							if ( is_array( $value ) ) {
125 125
 								foreach ( $value as $_key => $_value ) {
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 		}
159 159
 
160 160
 		// Already overridden
161
-		if ( (int) $page_size === (int) $view->settings->get( 'page_size' ) ) {
161
+		if ( (int)$page_size === (int)$view->settings->get( 'page_size' ) ) {
162 162
 			return;
163 163
 		}
164 164
 
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 			'view' => $view,
167 167
 		) );
168 168
 
169
-		if ( ! in_array( (int) $page_size, wp_list_pluck( self::get_page_sizes( $context ), 'value' ), true ) ) {
169
+		if ( ! in_array( (int)$page_size, wp_list_pluck( self::get_page_sizes( $context ), 'value' ), true ) ) {
170 170
 			gravityview()->log->warning( 'The passed page size is not allowed: {page_size}. Not modifying result.', array( 'page_size' => $page_size ) );
171 171
 			return;
172 172
 		}
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-post-content.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -24,13 +24,13 @@  discard block
 block discarded – undo
24 24
 
25 25
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
26 26
 
27
-		unset( $field_options['show_as_link'] );
27
+		unset( $field_options[ 'show_as_link' ] );
28 28
 
29
-		if( 'edit' === $context ) {
29
+		if ( 'edit' === $context ) {
30 30
 			return $field_options;
31 31
 		}
32 32
 
33
-		$this->add_field_support('dynamic_data', $field_options );
33
+		$this->add_field_support( 'dynamic_data', $field_options );
34 34
 
35 35
 		return $field_options;
36 36
 	}
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 	 */
47 47
 	public function get_field_input( $form, $value = '', $entry = null, GF_Field_Post_Content $field ) {
48 48
 
49
-		$id    = (int) $field->id;
49
+		$id    = (int)$field->id;
50 50
 		$input_name = "input_{$id}";
51 51
 		$class = esc_attr( $field->size );
52 52
 		$tabindex = $field->get_tabindex();
Please login to merge, or discard this patch.