Completed
Push — master ( 2adc18...d10a7f )
by Zack
30:36 queued 26:56
created
includes/fields/class-gravityview-field-post-image.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -23,16 +23,16 @@  discard block
 block discarded – undo
23 23
 
24 24
 	function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
25 25
 
26
-		unset ( $field_options['search_filter'] );
26
+		unset ( $field_options[ 'search_filter' ] );
27 27
 
28
-		if( 'edit' === $context ) {
28
+		if ( 'edit' === $context ) {
29 29
 			return $field_options;
30 30
 		}
31 31
 
32
-		$this->add_field_support('link_to_post', $field_options );
32
+		$this->add_field_support( 'link_to_post', $field_options );
33 33
 
34 34
 		// @since 1.5.4
35
-		$this->add_field_support('dynamic_data', $field_options );
35
+		$this->add_field_support( 'dynamic_data', $field_options );
36 36
 
37 37
 		return $field_options;
38 38
 	}
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 		$url = $title = $caption = $description = '';
59 59
 
60 60
 		// If there's a |:| match, process. Otherwise, empty array!
61
-		if( preg_match( '/\|\:\|/', $value ) ) {
61
+		if ( preg_match( '/\|\:\|/', $value ) ) {
62 62
 			list( $url, $title, $caption, $description ) = array_pad( explode( '|:|', $value ), 4, false );
63 63
 		}
64 64
 
@@ -87,8 +87,8 @@  discard block
 block discarded – undo
87 87
 	 */
88 88
 	public function get_field_input( $form, $value = '', $entry = null, GF_Field_Post_Image $field ) {
89 89
 
90
-		$id = (int) $field->id;
91
-		$form_id = $form['id'];
90
+		$id = (int)$field->id;
91
+		$form_id = $form[ 'id' ];
92 92
 		$input_name = "input_{$id}";
93 93
 		$field_id = sprintf( 'input_%d_%d', $form_id, $id );
94 94
 		$img_name = null;
@@ -96,16 +96,16 @@  discard block
 block discarded – undo
96 96
 		// Convert |:| to associative array
97 97
 		$img_array = $this->explode_value( $value );
98 98
 
99
-		if( ! empty( $img_array['url'] ) ) {
99
+		if ( ! empty( $img_array[ 'url' ] ) ) {
100 100
 
101
-			$img_name = basename( $img_array['url'] );
101
+			$img_name = basename( $img_array[ 'url' ] );
102 102
 
103 103
 			/**
104 104
 			 * Set the $uploaded_files value so that the .ginput_preview renders, and the file upload is hidden
105 105
 			 * @see GF_Field_Post_Image::get_field_input See the `<span class='ginput_preview'>` code
106 106
 			 * @see GFFormsModel::get_temp_filename See the `rgget( $input_name, self::$uploaded_files[ $form_id ] );` code
107 107
 			 */
108
-			if( empty( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) {
108
+			if ( empty( GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] ) ) {
109 109
 				GFFormsModel::$uploaded_files[ $form_id ][ $input_name ] = $img_name;
110 110
 			}
111 111
 		}
@@ -134,8 +134,8 @@  discard block
 block discarded – undo
134 134
 		 * @hack
135 135
 		 */
136 136
 		if ( $img_name ) {
137
-			$current_file = sprintf( "<input name='%s' id='%s' type='hidden' value='%s' />", $input_name, $field_id, esc_url_raw( $img_array['url'] ) );
138
-			$gf_post_image_field_output = str_replace('<span class=\'ginput_preview\'>', '<span class=\'ginput_preview\'>'.$current_file, $gf_post_image_field_output );
137
+			$current_file = sprintf( "<input name='%s' id='%s' type='hidden' value='%s' />", $input_name, $field_id, esc_url_raw( $img_array[ 'url' ] ) );
138
+			$gf_post_image_field_output = str_replace( '<span class=\'ginput_preview\'>', '<span class=\'ginput_preview\'>' . $current_file, $gf_post_image_field_output );
139 139
 		}
140 140
 
141 141
 		return $gf_post_image_field_output;
Please login to merge, or discard this patch.
includes/class-template.php 1 patch
Spacing   +61 added lines, -61 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( 'Gamajo_Template_Loader' ) ) {
19
+if ( ! class_exists( 'Gamajo_Template_Loader' ) ) {
20 20
 	require( GRAVITYVIEW_DIR . 'includes/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;
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 	 */
190 190
 	static function getInstance( $passed_post = NULL ) {
191 191
 
192
-		if( empty( self::$instance ) ) {
192
+		if ( empty( self::$instance ) ) {
193 193
 			self::$instance = new self( $passed_post );
194 194
 		}
195 195
 
@@ -202,8 +202,8 @@  discard block
 block discarded – undo
202 202
 	 */
203 203
 	public function getCurrentField( $key = NULL ) {
204 204
 
205
-		if( !empty( $key ) ) {
206
-			if( isset( $this->_current_field[ $key ] ) ) {
205
+		if ( ! empty( $key ) ) {
206
+			if ( isset( $this->_current_field[ $key ] ) ) {
207 207
 				return $this->_current_field[ $key ];
208 208
 			}
209 209
 			return NULL;
@@ -214,16 +214,16 @@  discard block
 block discarded – undo
214 214
 
215 215
 	public function setCurrentFieldSetting( $key, $value ) {
216 216
 
217
-		if( !empty( $this->_current_field ) ) {
218
-			$this->_current_field['field_settings'][ $key ] = $value;
217
+		if ( ! empty( $this->_current_field ) ) {
218
+			$this->_current_field[ 'field_settings' ][ $key ] = $value;
219 219
 		}
220 220
 
221 221
 	}
222 222
 
223 223
 	public function getCurrentFieldSetting( $key ) {
224
-		$settings = $this->getCurrentField('field_settings');
224
+		$settings = $this->getCurrentField( 'field_settings' );
225 225
 
226
-		if( $settings && !empty( $settings[ $key ] ) ) {
226
+		if ( $settings && ! empty( $settings[ $key ] ) ) {
227 227
 			return $settings[ $key ];
228 228
 		}
229 229
 
@@ -254,8 +254,8 @@  discard block
 block discarded – undo
254 254
 	 */
255 255
 	public function getAtts( $key = NULL ) {
256 256
 
257
-		if( !empty( $key ) ) {
258
-			if( isset( $this->atts[ $key ] ) ) {
257
+		if ( ! empty( $key ) ) {
258
+			if ( isset( $this->atts[ $key ] ) ) {
259 259
 				return $this->atts[ $key ];
260 260
 			}
261 261
 			return NULL;
@@ -321,7 +321,7 @@  discard block
 block discarded – undo
321 321
 
322 322
 		$fields = empty( $this->fields ) ? NULL : $this->fields;
323 323
 
324
-		if( $fields && !empty( $key ) ) {
324
+		if ( $fields && ! empty( $key ) ) {
325 325
 			$fields = isset( $fields[ $key ] ) ? $fields[ $key ] : NULL;
326 326
 		}
327 327
 
@@ -341,8 +341,8 @@  discard block
 block discarded – undo
341 341
 	 */
342 342
 	public function getField( $key ) {
343 343
 
344
-		if( !empty( $key ) ) {
345
-			if( isset( $this->fields[ $key ] ) ) {
344
+		if ( ! empty( $key ) ) {
345
+			if ( isset( $this->fields[ $key ] ) ) {
346 346
 				return $this->fields[ $key ];
347 347
 			}
348 348
 		}
@@ -442,8 +442,8 @@  discard block
 block discarded – undo
442 442
 	public function getPaginationCounts() {
443 443
 
444 444
 		$paging = $this->getPaging();
445
-		$offset = $paging['offset'];
446
-		$page_size = $paging['page_size'];
445
+		$offset = $paging[ 'offset' ];
446
+		$page_size = $paging[ 'page_size' ];
447 447
 		$total = $this->getTotalEntries();
448 448
 
449 449
 		if ( empty( $total ) ) {
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
 		 */
465 465
 		list( $first, $last, $total ) = apply_filters( 'gravityview_pagination_counts', array( $first, $last, $total ) );
466 466
 
467
-		return array( 'first' => (int) $first, 'last' => (int) $last, 'total' => (int) $total );
467
+		return array( 'first' => (int)$first, 'last' => (int)$last, 'total' => (int)$total );
468 468
 	}
469 469
 
470 470
 	/**
@@ -548,16 +548,16 @@  discard block
 block discarded – undo
548 548
 	 */
549 549
 	public function getCurrentEntry() {
550 550
 
551
-		if( in_array( $this->getContext(), array( 'edit', 'single') ) ) {
551
+		if ( in_array( $this->getContext(), array( 'edit', 'single' ) ) ) {
552 552
 			$entries = $this->getEntries();
553
-			$entry = $entries[0];
553
+			$entry = $entries[ 0 ];
554 554
 		} else {
555 555
 			$entry = $this->_current_entry;
556 556
 		}
557 557
 
558 558
 		/** @since 1.16 Fixes DataTables empty entry issue */
559
-		if ( empty( $entry ) && ! empty( $this->_current_field['entry'] ) ) {
560
-			$entry = $this->_current_field['entry'];
559
+		if ( empty( $entry ) && ! empty( $this->_current_field[ 'entry' ] ) ) {
560
+			$entry = $this->_current_field[ 'entry' ];
561 561
 		}
562 562
 
563 563
 		return $entry;
@@ -591,8 +591,8 @@  discard block
 block discarded – undo
591 591
 	 */
592 592
 	public function renderZone( $zone = '', $atts = array() ) {
593 593
 
594
-		if( empty( $zone ) ) {
595
-			do_action('gravityview_log_error', 'GravityView_View[renderZone] No zone defined.');
594
+		if ( empty( $zone ) ) {
595
+			do_action( 'gravityview_log_error', 'GravityView_View[renderZone] No zone defined.' );
596 596
 			return NULL;
597 597
 		}
598 598
 
@@ -601,33 +601,33 @@  discard block
 block discarded – undo
601 601
 			'context' => $this->getContext(),
602 602
 			'entry' => $this->getCurrentEntry(),
603 603
 			'form' => $this->getForm(),
604
-			'hide_empty' => $this->getAtts('hide_empty'),
604
+			'hide_empty' => $this->getAtts( 'hide_empty' ),
605 605
 		);
606 606
 
607 607
 		$final_atts = wp_parse_args( $atts, $defaults );
608 608
 
609 609
 		$output = '';
610 610
 
611
-		$final_atts['zone_id'] = "{$final_atts['context']}_{$final_atts['slug']}-{$zone}";
611
+		$final_atts[ 'zone_id' ] = "{$final_atts[ 'context' ]}_{$final_atts[ 'slug' ]}-{$zone}";
612 612
 
613
-		$fields = $this->getField( $final_atts['zone_id'] );
613
+		$fields = $this->getField( $final_atts[ 'zone_id' ] );
614 614
 
615 615
 		// Backward compatibility
616
-		if( 'table' === $this->getTemplatePartSlug() ) {
616
+		if ( 'table' === $this->getTemplatePartSlug() ) {
617 617
 			/**
618 618
 			 * Modify the fields displayed in the table
619 619
 			 * @var array
620 620
 			 */
621
-			$fields = apply_filters("gravityview_table_cells", $fields, $this );
621
+			$fields = apply_filters( "gravityview_table_cells", $fields, $this );
622 622
 		}
623 623
 
624
-		if( empty( $fields ) ) {
624
+		if ( empty( $fields ) ) {
625 625
 			return NULL;
626 626
 		}
627 627
 
628 628
 		$field_output = '';
629 629
 		foreach ( $fields as $field ) {
630
-			$final_atts['field'] = $field;
630
+			$final_atts[ 'field' ] = $field;
631 631
 
632 632
 			$field_output .= gravityview_field_output( $final_atts );
633 633
 		}
@@ -638,17 +638,17 @@  discard block
 block discarded – undo
638 638
 		 * @since 1.7.6
639 639
 		 * @param boolean $hide_empty_zone Default: false
640 640
 		 */
641
-		if( empty( $field_output ) && apply_filters( 'gravityview/render/hide-empty-zone', false ) ) {
641
+		if ( empty( $field_output ) && apply_filters( 'gravityview/render/hide-empty-zone', false ) ) {
642 642
 			return NULL;
643 643
 		}
644 644
 
645
-		if( !empty( $final_atts['wrapper_class'] ) ) {
646
-			$output .= '<div class="'.gravityview_sanitize_html_class( $final_atts['wrapper_class'] ).'">';
645
+		if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
646
+			$output .= '<div class="' . gravityview_sanitize_html_class( $final_atts[ 'wrapper_class' ] ) . '">';
647 647
 		}
648 648
 
649 649
 		$output .= $field_output;
650 650
 
651
-		if( !empty( $final_atts['wrapper_class'] ) ) {
651
+		if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) {
652 652
 			$output .= '</div>';
653 653
 		}
654 654
 
@@ -668,7 +668,7 @@  discard block
 block discarded – undo
668 668
 	 */
669 669
 	function locate_template( $template_names, $load = false, $require_once = true ) {
670 670
 
671
-		if( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
671
+		if ( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) {
672 672
 
673 673
 			$located = $this->located_templates[ $template_names ];
674 674
 
@@ -677,7 +677,7 @@  discard block
 block discarded – undo
677 677
 			// Set $load to always false so we handle it here.
678 678
 			$located = parent::locate_template( $template_names, false, $require_once );
679 679
 
680
-			if( is_string( $template_names ) ) {
680
+			if ( is_string( $template_names ) ) {
681 681
 				$this->located_templates[ $template_names ] = $located;
682 682
 			}
683 683
 		}
@@ -695,7 +695,7 @@  discard block
 block discarded – undo
695 695
 	 * @return mixed|null    The stored data.
696 696
 	 */
697 697
 	public function __get( $name ) {
698
-		if( isset( $this->{$name} ) ) {
698
+		if ( isset( $this->{$name} ) ) {
699 699
 			return $this->{$name};
700 700
 		} else {
701 701
 			return NULL;
@@ -724,15 +724,15 @@  discard block
 block discarded – undo
724 724
 		$additional = array();
725 725
 
726 726
 		// form-19-table-body.php
727
-		$additional[] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
727
+		$additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name );
728 728
 
729 729
 		// view-3-table-body.php
730
-		$additional[] = sprintf( 'view-%d-%s-%s.php', $this->getViewId(), $slug, $name );
730
+		$additional[ ] = sprintf( 'view-%d-%s-%s.php', $this->getViewId(), $slug, $name );
731 731
 
732
-		if( $this->getPostId() ) {
732
+		if ( $this->getPostId() ) {
733 733
 
734 734
 			// page-19-table-body.php
735
-			$additional[] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
735
+			$additional[ ] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name );
736 736
 		}
737 737
 
738 738
 		// Combine with existing table-body.php and table.php
@@ -754,7 +754,7 @@  discard block
 block discarded – undo
754 754
 
755 755
 		do_action( 'gravityview_log_debug', '[render] Rendering Template File', $template_file );
756 756
 
757
-		if( !empty( $template_file) ) {
757
+		if ( ! empty( $template_file ) ) {
758 758
 
759 759
 			if ( $require_once ) {
760 760
 				require_once( $template_file );
@@ -771,7 +771,7 @@  discard block
 block discarded – undo
771 771
 	 */
772 772
 	public function render_widget_hooks( $view_id ) {
773 773
 
774
-		if( empty( $view_id ) || 'single' == gravityview_get_context() ) {
774
+		if ( empty( $view_id ) || 'single' == gravityview_get_context() ) {
775 775
 			do_action( 'gravityview_log_debug', __METHOD__ . ' - Not rendering widgets; single entry' );
776 776
 			return;
777 777
 		}
@@ -779,9 +779,9 @@  discard block
 block discarded – undo
779 779
 		$view_data = gravityview_get_current_view_data( $view_id );
780 780
 
781 781
 		// get View widget configuration
782
-		$widgets = (array)$view_data['widgets'];
782
+		$widgets = (array)$view_data[ 'widgets' ];
783 783
 
784
-		switch( current_filter() ) {
784
+		switch ( current_filter() ) {
785 785
 			default:
786 786
 			case 'gravityview_before':
787 787
 				$zone = 'header';
@@ -795,9 +795,9 @@  discard block
 block discarded – undo
795 795
 		 * Filter widgets not in the current zone
796 796
 		 * @since 1.16
797 797
 		 */
798
-		foreach( $widgets as $key => $widget ) {
798
+		foreach ( $widgets as $key => $widget ) {
799 799
 			// The widget isn't in the current zone
800
-			if( false === strpos( $key, $zone ) ) {
800
+			if ( false === strpos( $key, $zone ) ) {
801 801
 				unset( $widgets[ $key ] );
802 802
 			}
803 803
 		}
@@ -812,8 +812,8 @@  discard block
 block discarded – undo
812 812
 		}
813 813
 
814 814
 		// Prevent being called twice
815
-		if( did_action( $zone.'_'.$view_id.'_widgets' ) ) {
816
-			do_action( 'gravityview_log_debug', sprintf( '%s - Not rendering %s; already rendered', __METHOD__ , $zone.'_'.$view_id.'_widgets' ) );
815
+		if ( did_action( $zone . '_' . $view_id . '_widgets' ) ) {
816
+			do_action( 'gravityview_log_debug', sprintf( '%s - Not rendering %s; already rendered', __METHOD__, $zone . '_' . $view_id . '_widgets' ) );
817 817
 			return;
818 818
 		}
819 819
 
@@ -829,7 +829,7 @@  discard block
 block discarded – undo
829 829
 		 * @param string $zone Current widget zone, either `header` or `footer`
830 830
 		 * @param array $widgets Array of widget configurations for the current zone, as set by `gravityview_get_current_view_data()['widgets']`
831 831
 		 */
832
-		$css_class = apply_filters('gravityview/widgets/wrapper_css_class', 'gv-grid gv-widgets-' . $zone, $zone, $widgets );
832
+		$css_class = apply_filters( 'gravityview/widgets/wrapper_css_class', 'gv-grid gv-widgets-' . $zone, $zone, $widgets );
833 833
 
834 834
 		$css_class = gravityview_sanitize_html_class( $css_class );
835 835
 
@@ -837,17 +837,17 @@  discard block
 block discarded – undo
837 837
 		?>
838 838
 		<div class="<?php echo $css_class; ?>">
839 839
 			<?php
840
-			foreach( $rows as $row ) {
841
-				foreach( $row as $col => $areas ) {
842
-					$column = ($col == '2-2') ? '1-2 gv-right' : $col.' gv-left';
840
+			foreach ( $rows as $row ) {
841
+				foreach ( $row as $col => $areas ) {
842
+					$column = ( $col == '2-2' ) ? '1-2 gv-right' : $col . ' gv-left';
843 843
 				?>
844 844
 					<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
845 845
 						<?php
846
-						if( !empty( $areas ) ) {
847
-							foreach( $areas as $area ) {
848
-								if( !empty( $widgets[ $zone .'_'. $area['areaid'] ] ) ) {
849
-									foreach( $widgets[ $zone .'_'. $area['areaid'] ] as $widget ) {
850
-										do_action( "gravityview_render_widget_{$widget['id']}", $widget );
846
+						if ( ! empty( $areas ) ) {
847
+							foreach ( $areas as $area ) {
848
+								if ( ! empty( $widgets[ $zone . '_' . $area[ 'areaid' ] ] ) ) {
849
+									foreach ( $widgets[ $zone . '_' . $area[ 'areaid' ] ] as $widget ) {
850
+										do_action( "gravityview_render_widget_{$widget[ 'id' ]}", $widget );
851 851
 									}
852 852
 								}
853 853
 							}
@@ -863,8 +863,8 @@  discard block
 block discarded – undo
863 863
 		 * Prevent widgets from being called twice.
864 864
 		 * Checking for loop_start prevents themes and plugins that pre-process shortcodes from triggering the action before displaying. Like, ahem, the Divi theme and WordPress SEO plugin
865 865
 		 */
866
-		if( did_action( 'loop_start' ) ) {
867
-			do_action( $zone.'_'.$view_id.'_widgets' );
866
+		if ( did_action( 'loop_start' ) ) {
867
+			do_action( $zone . '_' . $view_id . '_widgets' );
868 868
 		}
869 869
 	}
870 870
 
Please login to merge, or discard this patch.