Completed
Pull Request — develop (#1194)
by Zack
16:54 queued 01:04
created
includes/class-gvlogic-shortcode.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 	 */
88 88
 	public static function get_instance() {
89 89
 
90
-		if( empty( self::$instance ) ) {
90
+		if ( empty( self::$instance ) ) {
91 91
 			self::$instance = new self;
92 92
 		}
93 93
 
@@ -121,9 +121,9 @@  discard block
 block discarded – undo
121 121
 
122 122
 		$operators = array_merge( self::$SUPPORTED_ARRAY_OPERATORS, self::$SUPPORTED_NUMERIC_OPERATORS, self::$SUPPORTED_SCALAR_OPERATORS, self::$SUPPORTED_CUSTOM_OPERATORS );
123 123
 
124
-		if( $with_values ) {
124
+		if ( $with_values ) {
125 125
 			$operators_with_values = array();
126
-			foreach( $operators as $key ) {
126
+			foreach ( $operators as $key ) {
127 127
 				$operators_with_values[ $key ] = '';
128 128
 			}
129 129
 			return $operators_with_values;
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 
143 143
 		$operators = $this->get_operators( false );
144 144
 
145
-		if( !in_array( $operation, $operators ) ) {
145
+		if ( ! in_array( $operation, $operators ) ) {
146 146
 			gravityview()->log->debug( ' Attempted to add invalid operation type. {operation}', array( 'operation' => $operation ) );
147 147
 			return false;
148 148
 		}
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 			return null;
195 195
 		}
196 196
 
197
-		if( empty( $atts ) ) {
197
+		if ( empty( $atts ) ) {
198 198
 			gravityview()->log->error( '$atts are empty.', array( 'data' => $atts ) );
199 199
 			return null;
200 200
 		}
@@ -209,7 +209,7 @@  discard block
 block discarded – undo
209 209
 		$this->parse_atts();
210 210
 
211 211
 		// We need an "if"
212
-		if( false === $this->if ) {
212
+		if ( false === $this->if ) {
213 213
 			gravityview()->log->error( '$atts->if is empty.', array( 'data' => $this->passed_atts ) );
214 214
 			return null;
215 215
 		}
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 		$setup = $this->setup_operation_and_comparison();
218 218
 
219 219
 		// We need an operation and comparison value
220
-		if( ! $setup ) {
220
+		if ( ! $setup ) {
221 221
 			gravityview()->log->error( 'No valid operators were passed.', array( 'data' => $this->atts ) );
222 222
 			return null;
223 223
 		}
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
 	 */
268 268
 	private function get_output() {
269 269
 
270
-		if( $this->is_match ) {
270
+		if ( $this->is_match ) {
271 271
 			$output = $this->content;
272 272
 		} else {
273 273
 			$output = $this->else_content;
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
 		 * @param string $output HTML/text output
286 286
 		 * @param GVLogic_Shortcode $this This class
287 287
 		 */
288
-		$output = apply_filters('gravityview/gvlogic/output', $output, $this );
288
+		$output = apply_filters( 'gravityview/gvlogic/output', $output, $this );
289 289
 
290 290
 		gravityview()->log->debug( 'Output: ', array( 'data' => $output ) );
291 291
 
@@ -305,14 +305,14 @@  discard block
 block discarded – undo
305 305
 		list( $before_else, $after_else ) = array_pad( explode( '[else]', $passed_content ), 2, NULL );
306 306
 		list( $before_else_if, $after_else_if ) = array_pad( explode( '[else', $passed_content ), 2, NULL );
307 307
 
308
-		$else_attr = isset( $this->atts['else'] ) ? $this->atts['else'] : NULL;
308
+		$else_attr = isset( $this->atts[ 'else' ] ) ? $this->atts[ 'else' ] : NULL;
309 309
 		$else_content = isset( $after_else ) ? $after_else : $else_attr;
310 310
 
311 311
 		// The content is everything OTHER than the [else]
312 312
 		$this->content = $before_else_if;
313 313
 
314 314
 		if ( ! $this->is_match ) {
315
-			if( $elseif_content = $this->process_elseif( $before_else ) ) {
315
+			if ( $elseif_content = $this->process_elseif( $before_else ) ) {
316 316
 				$this->else_content = $elseif_content;
317 317
 			} else {
318 318
 				$this->else_content = $else_content;
@@ -340,16 +340,16 @@  discard block
 block discarded – undo
340 340
 		foreach ( $else_if_matches as $key => $else_if_match ) {
341 341
 
342 342
 			// If $else_if_match[5] exists and has content, check for more shortcodes
343
-			preg_match_all( '/' . $regex . '/', $else_if_match[5] . '[/else]', $recursive_matches, PREG_SET_ORDER );
343
+			preg_match_all( '/' . $regex . '/', $else_if_match[ 5 ] . '[/else]', $recursive_matches, PREG_SET_ORDER );
344 344
 
345 345
 			// If the logic passes, this is the value that should be used for $this->else_content
346
-			$else_if_value = $else_if_match[5];
347
-			$check_elseif_match = $else_if_match[0];
346
+			$else_if_value = $else_if_match[ 5 ];
347
+			$check_elseif_match = $else_if_match[ 0 ];
348 348
 
349 349
 			// Retrieve the value of the match that is currently being checked, without any other [else] tags
350
-			if( ! empty( $recursive_matches[0][0] ) ) {
351
-				$else_if_value = str_replace( $recursive_matches[0][0], '', $else_if_value );
352
-				$check_elseif_match = str_replace( $recursive_matches[0][0], '', $check_elseif_match );
350
+			if ( ! empty( $recursive_matches[ 0 ][ 0 ] ) ) {
351
+				$else_if_value = str_replace( $recursive_matches[ 0 ][ 0 ], '', $else_if_value );
352
+				$check_elseif_match = str_replace( $recursive_matches[ 0 ][ 0 ], '', $check_elseif_match );
353 353
 			}
354 354
 
355 355
 			$check_elseif_match = str_replace( '[else', '[gvlogicelse', $check_elseif_match );
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
 			}
367 367
 
368 368
 			// Process any remaining [else] tags
369
-			return $this->process_elseif( $else_if_match[5] );
369
+			return $this->process_elseif( $else_if_match[ 5 ] );
370 370
 		}
371 371
 
372 372
 		return false;
@@ -392,7 +392,7 @@  discard block
 block discarded – undo
392 392
 		$this->atts = array_intersect_key( $this->passed_atts, $this->atts );
393 393
 
394 394
 		// Strip whitespace if it's not default false
395
-		$this->if = ( isset( $this->atts['if'] ) && is_string( $this->atts['if'] ) ) ? trim( $this->atts['if'] ) : false;
395
+		$this->if = ( isset( $this->atts[ 'if' ] ) && is_string( $this->atts[ 'if' ] ) ) ? trim( $this->atts[ 'if' ] ) : false;
396 396
 
397 397
 		/**
398 398
 		 * @action `gravityview/gvlogic/parse_atts/after` Modify shortcode attributes after it's been parsed
@@ -403,7 +403,7 @@  discard block
 block discarded – undo
403 403
 		do_action( 'gravityview/gvlogic/parse_atts/after', $this );
404 404
 
405 405
 		// Make sure the "if" isn't processed in self::setup_operation_and_comparison()
406
-		unset( $this->atts['if'] );
406
+		unset( $this->atts[ 'if' ] );
407 407
 	}
408 408
 }
409 409
 
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-workflow_final_status.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 	 */
42 42
 	function modify_entry_value_workflow_final_status( $output, $entry, $field_settings, $field ) {
43 43
 
44
-		if( ! empty( $output ) ) {
44
+		if ( ! empty( $output ) ) {
45 45
 			$output = gravity_flow()->translate_status_label( $output );
46 46
 		}
47 47
 
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
 		foreach ( $search_fields as & $search_field ) {
66 66
 			if ( $this->name === \GV\Utils::get( $search_field, 'key' ) ) {
67
-				$search_field['choices'] = GravityView_Plugin_Hooks_Gravity_Flow::get_status_options();
67
+				$search_field[ 'choices' ] = GravityView_Plugin_Hooks_Gravity_Flow::get_status_options();
68 68
 			}
69 69
 		}
70 70
 
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 . '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;
@@ -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 );
@@ -885,7 +885,7 @@  discard block
 block discarded – undo
885 885
 
886 886
 		// Prevent being called twice
887 887
 		if ( did_action( "gravityview/widgets/$zone/{$view->ID}/rendered" ) ) {
888
-			gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone.'_'.$view->ID.'_widgets' ) );
888
+			gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone . '_' . $view->ID . '_widgets' ) );
889 889
 			return;
890 890
 		}
891 891
 
@@ -907,7 +907,7 @@  discard block
 block discarded – undo
907 907
 		 * @param string $zone Current widget zone, either `header` or `footer`
908 908
 		 * @param array $widgets Array of widget configurations for the current zone, as set by `gravityview_get_current_view_data()['widgets']`
909 909
 		 */
910
-		$css_class = apply_filters('gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() );
910
+		$css_class = apply_filters( 'gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() );
911 911
 
912 912
 		$css_class = gravityview_sanitize_html_class( $css_class );
913 913
 
@@ -915,15 +915,15 @@  discard block
 block discarded – undo
915 915
 		?>
916 916
 		<div class="<?php echo $css_class; ?>">
917 917
 			<?php
918
-			foreach( $rows as $row ) {
919
-				foreach( $row as $col => $areas ) {
918
+			foreach ( $rows as $row ) {
919
+				foreach ( $row as $col => $areas ) {
920 920
 					$column = ( $col == '2-2' ) ? '1-2 gv-right' : "$col gv-left";
921 921
 				?>
922 922
 					<div class="gv-grid-col-<?php echo esc_attr( $column ); ?>">
923 923
 						<?php
924 924
 						if ( ! empty( $areas ) ) {
925 925
 							foreach ( $areas as $area ) {
926
-								foreach ( $widgets->by_position( $zone . '_' . $area['areaid'] )->all() as $widget ) {
926
+								foreach ( $widgets->by_position( $zone . '_' . $area[ 'areaid' ] )->all() as $widget ) {
927 927
 									do_action( sprintf( 'gravityview/widgets/%s/render', $widget->get_widget_id() ), $widget->configuration->all(), null, $view_id_or_context );
928 928
 								}
929 929
 							}
Please login to merge, or discard this patch.
future/includes/class-gv-template-field.php 1 patch
Spacing   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 	}
93 93
 
94 94
 	public function __destruct() {
95
-		remove_filter( $this->filter_prefix . '_get_template_part', $this->_add_id_specific_templates_callback );;
95
+		remove_filter( $this->filter_prefix . '_get_template_part', $this->_add_id_specific_templates_callback ); ;
96 96
 	}
97 97
 
98 98
 	/**
@@ -175,55 +175,55 @@  discard block
 block discarded – undo
175 175
 
176 176
 			if ( $is_view && $post ) {
177 177
 				if ( $field_type ) {
178
-					$specifics []= sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name );
179
-					$inputType && $specifics []= sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name );
180
-					$specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type );
181
-					$inputType && $specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType );
182
-					$specifics []= sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name );
183
-					$inputType && $specifics []= sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name );
184
-					$specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type );
185
-					$inputType &&  $specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType );
178
+					$specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $field_type, $slug_name );
179
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s-%s.php', $slug_dir, $post->ID, $view_id, $inputType, $slug_name );
180
+					$specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $field_type );
181
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $inputType );
182
+					$specifics [ ] = sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $field_type, $slug_name );
183
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-field-%s-%s.php', $slug_dir, $post->ID, $inputType, $slug_name );
184
+					$specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $field_type );
185
+					$inputType && $specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $inputType );
186 186
 				}
187 187
 
188
-				$specifics []= sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name );
189
-				$specifics []= sprintf( '%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id );
190
-				$specifics []= sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name );
191
-				$specifics []= sprintf( '%spost-%d-field.php', $slug_dir, $post->ID );
188
+				$specifics [ ] = sprintf( '%spost-%d-view-%d-field-%s.php', $slug_dir, $post->ID, $view_id, $slug_name );
189
+				$specifics [ ] = sprintf( '%spost-%d-view-%d-field.php', $slug_dir, $post->ID, $view_id );
190
+				$specifics [ ] = sprintf( '%spost-%d-field-%s.php', $slug_dir, $post->ID, $slug_name );
191
+				$specifics [ ] = sprintf( '%spost-%d-field.php', $slug_dir, $post->ID );
192 192
 			}
193 193
 			
194 194
 			/** Field-specific */
195 195
 			if ( $field_id && $form_id ) {
196 196
 
197 197
 				if ( $field_id ) {
198
-					$specifics []= sprintf( '%sform-%d-field-%d-%s.php', $slug_dir, $form_id, $field_id, $slug_name );
199
-					$specifics []= sprintf( '%sform-%d-field-%d.php', $slug_dir, $form_id, $field_id );
198
+					$specifics [ ] = sprintf( '%sform-%d-field-%d-%s.php', $slug_dir, $form_id, $field_id, $slug_name );
199
+					$specifics [ ] = sprintf( '%sform-%d-field-%d.php', $slug_dir, $form_id, $field_id );
200 200
 				}
201 201
 
202 202
 				if ( $field_type ) {
203
-					$specifics []= sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $field_type, $slug_name );
204
-					$inputType && $specifics []= sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $inputType, $slug_name );
205
-					$specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $field_type );
206
-					$inputType && $specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $inputType );
207
-
208
-					$specifics []= sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name );
209
-					$inputType && $specifics []= sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name );
210
-					$specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type );
211
-					$inputType && $specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType );
212
-
213
-					$specifics []= sprintf( '%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name );
214
-					$inputType && $specifics []= sprintf( '%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name );
215
-					$specifics []= sprintf( '%sfield-%s.php', $slug_dir, $field_type );
216
-					$inputType && $specifics []= sprintf( '%sfield-%s.php', $slug_dir, $inputType );
203
+					$specifics [ ] = sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $field_type, $slug_name );
204
+					$inputType && $specifics [ ] = sprintf( '%sform-%d-field-%s-%s.php', $slug_dir, $form_id, $inputType, $slug_name );
205
+					$specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $field_type );
206
+					$inputType && $specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $inputType );
207
+
208
+					$specifics [ ] = sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $field_type, $slug_name );
209
+					$inputType && $specifics [ ] = sprintf( '%sview-%d-field-%s-%s.php', $slug_dir, $view_id, $inputType, $slug_name );
210
+					$specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $field_type );
211
+					$inputType && $specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $inputType );
212
+
213
+					$specifics [ ] = sprintf( '%sfield-%s-%s.php', $slug_dir, $field_type, $slug_name );
214
+					$inputType && $specifics [ ] = sprintf( '%sfield-%s-%s.php', $slug_dir, $inputType, $slug_name );
215
+					$specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $field_type );
216
+					$inputType && $specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $inputType );
217 217
 				}
218 218
 			}
219 219
 
220 220
 			if ( $form_id ) {
221 221
 				/** Generic field templates */
222
-				$specifics []= sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name );
223
-				$specifics []= sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $slug_name );
222
+				$specifics [ ] = sprintf( '%sview-%d-field-%s.php', $slug_dir, $view_id, $slug_name );
223
+				$specifics [ ] = sprintf( '%sform-%d-field-%s.php', $slug_dir, $form_id, $slug_name );
224 224
 
225
-				$specifics []= sprintf( '%sview-%d-field.php', $slug_dir, $view_id );
226
-				$specifics []= sprintf( '%sform-%d-field.php', $slug_dir, $form_id );
225
+				$specifics [ ] = sprintf( '%sview-%d-field.php', $slug_dir, $view_id );
226
+				$specifics [ ] = sprintf( '%sform-%d-field.php', $slug_dir, $form_id );
227 227
 			}
228 228
 
229 229
 			/**
@@ -231,12 +231,12 @@  discard block
 block discarded – undo
231 231
 			 * Ignore some types that conflict.
232 232
 			 */
233 233
 			if ( ! in_array( $field_type, array( 'notes' ) ) ) {
234
-				$specifics []= sprintf( '%s.php', $field_type );
235
-				$specifics []= sprintf( 'fields/%s.php', $field_type );
234
+				$specifics [ ] = sprintf( '%s.php', $field_type );
235
+				$specifics [ ] = sprintf( 'fields/%s.php', $field_type );
236 236
 			}
237 237
 
238
-			$specifics []= sprintf( '%sfield-%s.php', $slug_dir, $slug_name );
239
-			$specifics []= sprintf( '%sfield.php', $slug_dir );
238
+			$specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $slug_name );
239
+			$specifics [ ] = sprintf( '%sfield.php', $slug_dir );
240 240
 
241 241
 			return array_merge( $specifics, $templates );
242 242
 		};
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
 			/** Prevent any PHP warnings that may be generated. */
267 267
 			ob_start();
268 268
 
269
-			$display_value = \GFCommon::get_lead_field_display( $this->field->field, $value, $this->entry['currency'], false, 'html' );
269
+			$display_value = \GFCommon::get_lead_field_display( $this->field->field, $value, $this->entry[ 'currency' ], false, 'html' );
270 270
 
271 271
 			if ( $errors = ob_get_clean() ) {
272 272
 				gravityview()->log->error( 'Errors when calling GFCommon::get_lead_field_display()', array( 'data' => $errors ) );
Please login to merge, or discard this patch.
includes/extensions/edit-entry/class-edit-entry.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 
37 37
         self::$file = plugin_dir_path( __FILE__ );
38 38
 
39
-        if( is_admin() ) {
39
+        if ( is_admin() ) {
40 40
             $this->load_components( 'admin' );
41 41
         }
42 42
 
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
     static function getInstance() {
57 57
 
58
-        if( empty( self::$instance ) ) {
58
+        if ( empty( self::$instance ) ) {
59 59
             self::$instance = new GravityView_Edit_Entry;
60 60
         }
61 61
 
@@ -81,10 +81,10 @@  discard block
 block discarded – undo
81 81
     private function add_hooks() {
82 82
 
83 83
         // Add front-end access to Gravity Forms delete file action
84
-        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file') );
84
+        add_action( 'wp_ajax_nopriv_rg_delete_file', array( 'GFForms', 'delete_file' ) );
85 85
 
86 86
         // Make sure this hook is run for non-admins
87
-        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file') );
87
+        add_action( 'wp_ajax_rg_delete_file', array( 'GFForms', 'delete_file' ) );
88 88
 
89 89
         add_filter( 'gravityview_blacklist_field_types', array( $this, 'modify_field_blacklist' ), 10, 2 );
90 90
 
@@ -99,8 +99,8 @@  discard block
 block discarded – undo
99 99
 	 */
100 100
 	private function addon_specific_hooks() {
101 101
 
102
-		if( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
103
-			add_filter('gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script'));
102
+		if ( class_exists( 'GFSignature' ) && is_callable( array( 'GFSignature', 'get_instance' ) ) ) {
103
+			add_filter( 'gform_admin_pre_render', array( GFSignature::get_instance(), 'edit_lead_script' ) );
104 104
 		}
105 105
 
106 106
 	}
@@ -146,15 +146,15 @@  discard block
 block discarded – undo
146 146
      */
147 147
     public static function get_edit_link( $entry, $view_id, $post_id = null, $field_values = '' ) {
148 148
 
149
-        $nonce_key = self::get_nonce_key( $view_id, $entry['form_id'], $entry['id']  );
149
+        $nonce_key = self::get_nonce_key( $view_id, $entry[ 'form_id' ], $entry[ 'id' ] );
150 150
 
151
-        $base = gv_entry_link( $entry, $post_id ? : $view_id  );
151
+        $base = gv_entry_link( $entry, $post_id ?: $view_id );
152 152
 
153 153
         $url = add_query_arg( array(
154 154
             'edit' => wp_create_nonce( $nonce_key )
155 155
         ), $base );
156 156
 
157
-        if( $post_id ) {
157
+        if ( $post_id ) {
158 158
 	        $url = add_query_arg( array( 'gvid' => $view_id ), $url );
159 159
         }
160 160
 
@@ -162,9 +162,9 @@  discard block
 block discarded – undo
162 162
 	     * Allow passing params to dynamically populate entry with values
163 163
 	     * @since 1.9.2
164 164
 	     */
165
-	    if( !empty( $field_values ) ) {
165
+	    if ( ! empty( $field_values ) ) {
166 166
 
167
-		    if( is_array( $field_values ) ) {
167
+		    if ( is_array( $field_values ) ) {
168 168
 			    // If already an array, no parse_str() needed
169 169
 			    $params = $field_values;
170 170
 		    } else {
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
 	 */
186 186
 	public function modify_field_blacklist( $fields = array(), $context = NULL ) {
187 187
 
188
-		if( empty( $context ) || $context !== 'edit' ) {
188
+		if ( empty( $context ) || $context !== 'edit' ) {
189 189
 			return $fields;
190 190
 		}
191 191
 
@@ -246,25 +246,25 @@  discard block
 block discarded – undo
246 246
         // If they can edit any entries (as defined in Gravity Forms)
247 247
         // Or if they can edit other people's entries
248 248
         // Then we're good.
249
-        if( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry['id'] ) ) {
249
+        if ( GVCommon::has_cap( array( 'gravityforms_edit_entries', 'gravityview_edit_others_entries' ), $entry[ 'id' ] ) ) {
250 250
 
251 251
             gravityview()->log->debug( 'User has ability to edit all entries.' );
252 252
 
253 253
             $user_can_edit = true;
254 254
 
255
-        } else if( !isset( $entry['created_by'] ) ) {
255
+        } else if ( ! isset( $entry[ 'created_by' ] ) ) {
256 256
 
257
-            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.');
257
+            gravityview()->log->error( 'Entry `created_by` doesn\'t exist.' );
258 258
 
259 259
             $user_can_edit = false;
260 260
 
261 261
         } else {
262 262
 
263 263
             // get user_edit setting
264
-            if( empty( $view_id ) || $view_id == GravityView_View::getInstance()->getViewId() ) {
264
+            if ( empty( $view_id ) || $view_id == GravityView_View::getInstance()->getViewId() ) {
265 265
                 // if View ID not specified or is the current view
266 266
 				// @deprecated path
267
-                $user_edit = GravityView_View::getInstance()->getAtts('user_edit');
267
+                $user_edit = GravityView_View::getInstance()->getAtts( 'user_edit' );
268 268
             } else {
269 269
                 // in case is specified and not the current view
270 270
                 $user_edit = GVCommon::get_template_setting( $view_id, 'user_edit' );
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
             $current_user = wp_get_current_user();
274 274
 
275 275
             // User edit is disabled
276
-            if( empty( $user_edit ) ) {
276
+            if ( empty( $user_edit ) ) {
277 277
 
278 278
                 gravityview()->log->debug( 'User Edit is disabled. Returning false.' );
279 279
 
@@ -281,13 +281,13 @@  discard block
 block discarded – undo
281 281
             }
282 282
 
283 283
             // User edit is enabled and the logged-in user is the same as the user who created the entry. We're good.
284
-            else if( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry['created_by'] ) ) {
284
+            else if ( is_user_logged_in() && intval( $current_user->ID ) === intval( $entry[ 'created_by' ] ) ) {
285 285
 
286 286
                 gravityview()->log->debug( 'User {user_id} created the entry.', array( 'user_id', $current_user->ID ) );
287 287
 
288 288
                 $user_can_edit = true;
289 289
 
290
-            } else if( ! is_user_logged_in() ) {
290
+            } else if ( ! is_user_logged_in() ) {
291 291
 
292 292
                 gravityview()->log->debug( 'No user defined; edit entry requires logged in user' );
293 293
             }
Please login to merge, or discard this patch.
includes/admin/class-gravityview-admin-view-item.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -44,12 +44,12 @@  discard block
 block discarded – undo
44 44
 	 */
45 45
 	protected $form_id;
46 46
 
47
-	function __construct( $title = '', $item_id, $item = array(), $settings = array(), $form_id = null) {
47
+	function __construct( $title = '', $item_id, $item = array(), $settings = array(), $form_id = null ) {
48 48
 
49 49
 		// Backward compat
50
-		if ( ! empty( $item['type'] ) ) {
51
-			$item['input_type'] = $item['type'];
52
-			unset( $item['type'] );
50
+		if ( ! empty( $item[ 'type' ] ) ) {
51
+			$item[ 'input_type' ] = $item[ 'type' ];
52
+			unset( $item[ 'type' ] );
53 53
 		}
54 54
 
55 55
 		// Prevent items from not having index set
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 		$this->id         = $item_id;
72 72
 		$this->form_id    = $form_id;
73 73
 		$this->settings   = $settings;
74
-		$this->label_type = $item['label_type'];
74
+		$this->label_type = $item[ 'label_type' ];
75 75
 	}
76 76
 
77 77
 	/**
@@ -114,10 +114,10 @@  discard block
 block discarded – undo
114 114
 		if ( $html ) {
115 115
 
116 116
 			foreach ( $field_info_items as $item ) {
117
-				$class = isset( $item['class'] ) ? sanitize_html_class( $item['class'] ) . ' description' : 'description';
117
+				$class = isset( $item[ 'class' ] ) ? sanitize_html_class( $item[ 'class' ] ) . ' description' : 'description';
118 118
 				// Add the title in case the value's long, in which case, it'll be truncated by CSS.
119 119
 				$output .= '<span class="' . $class . '">';
120
-				$output .= esc_html( $item['value'] );
120
+				$output .= esc_html( $item[ 'value' ] );
121 121
 				$output .= '</span>';
122 122
 			}
123 123
 
@@ -145,29 +145,29 @@  discard block
 block discarded – undo
145 145
 
146 146
 		// $settings_html will just be hidden inputs if empty. Otherwise, it'll have an <ul>. Ugly hack, I know.
147 147
 		// TODO: Un-hack this
148
-		$hide_settings_link = ( empty( $this->item['settings_html'] ) || strpos( $this->item['settings_html'], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
148
+		$hide_settings_link = ( empty( $this->item[ 'settings_html' ] ) || strpos( $this->item[ 'settings_html' ], '<!-- No Options -->' ) > 0 ) ? 'hide-if-js' : '';
149 149
 		$settings_link      = sprintf( '<a href="#settings" class="dashicons-admin-generic dashicons %s" title="%s"></a>', $hide_settings_link, esc_attr( $settings_title ) );
150 150
 
151 151
 		// Should we show the icon that the field is being used as a link to single entry?
152
-		$hide_show_as_link_class = empty( $this->settings['show_as_link'] ) ? 'hide-if-js' : '';
152
+		$hide_show_as_link_class = empty( $this->settings[ 'show_as_link' ] ) ? 'hide-if-js' : '';
153 153
 		$show_as_link            = '<span class="dashicons dashicons-admin-links ' . $hide_show_as_link_class . '" title="' . esc_attr( $single_link_title ) . '"></span>';
154 154
 
155 155
 		// When a field label is empty, use the Field ID
156 156
 		$label = empty( $this->title ) ? sprintf( _x( 'Field #%s (No Label)', 'Label in field picker for empty label', 'gravityview' ), $this->id ) : $this->title;
157 157
 
158 158
 		// If there's a custom label, and show label is checked, use that as the field heading
159
-		if ( ! empty( $this->settings['custom_label'] ) && ! empty( $this->settings['show_label'] ) ) {
160
-			$label = $this->settings['custom_label'];
161
-		} else if ( ! empty( $this->item['customLabel'] ) ) {
162
-			$label = $this->item['customLabel'];
159
+		if ( ! empty( $this->settings[ 'custom_label' ] ) && ! empty( $this->settings[ 'show_label' ] ) ) {
160
+			$label = $this->settings[ 'custom_label' ];
161
+		} else if ( ! empty( $this->item[ 'customLabel' ] ) ) {
162
+			$label = $this->item[ 'customLabel' ];
163 163
 		}
164 164
 
165 165
 		$output = '<h5 class="selectable gfield field-id-' . esc_attr( $this->id ) . '">';
166 166
 
167 167
 		$label = esc_attr( $label );
168 168
 
169
-		if ( ! empty( $this->item['parent'] ) ) {
170
-			$label .= ' <small>(' . esc_attr( $this->item['parent']['label'] ) . ')</small>';
169
+		if ( ! empty( $this->item[ 'parent' ] ) ) {
170
+			$label .= ' <small>(' . esc_attr( $this->item[ 'parent' ][ 'label' ] ) . ')</small>';
171 171
 		}
172 172
 
173 173
 		// Name of field / widget
@@ -183,10 +183,10 @@  discard block
 block discarded – undo
183 183
 
184 184
 		$output .= '</h5>';
185 185
 
186
-		$container_class = ! empty( $this->item['parent'] ) ? ' gv-child-field' : '';
187
-		$data_form_id   = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
186
+		$container_class = ! empty( $this->item[ 'parent' ] ) ? ' gv-child-field' : '';
187
+		$data_form_id = ! empty( $this->form_id ) ? 'data-formid="' . esc_attr( $this->form_id ) . '"' : '';
188 188
 
189
-		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item['input_type'] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item['settings_html'] . '</div>';
189
+		$output = '<div data-fieldid="' . esc_attr( $this->id ) . '" ' . $data_form_id . ' data-inputtype="' . esc_attr( $this->item[ 'input_type' ] ) . '" class="gv-fields' . $container_class . '">' . $output . $this->item[ 'settings_html' ] . '</div>';
190 190
 
191 191
 		return $output;
192 192
 	}
Please login to merge, or discard this patch.
includes/admin/metaboxes/views/view-configuration.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -10,32 +10,32 @@  discard block
 block discarded – undo
10 10
 
11 11
 		<div id="directory-fields" class="gv-section">
12 12
 
13
-			<h4><?php esc_html_e( 'Above Entries Widgets', 'gravityview'); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview'); ?></span></h4>
13
+			<h4><?php esc_html_e( 'Above Entries Widgets', 'gravityview' ); ?> <span><?php esc_html_e( 'These widgets will be shown above entries.', 'gravityview' ); ?></span></h4>
14 14
 
15
-			<?php do_action('gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID ); ?>
15
+			<?php do_action( 'gravityview_render_widgets_active_areas', $curr_template, 'header', $post->ID ); ?>
16 16
 
17
-			<h4><?php esc_html_e( 'Entries Fields', 'gravityview'); ?> <span><?php esc_html_e( 'These fields will be shown for each entry.', 'gravityview'); ?></span></h4>
17
+			<h4><?php esc_html_e( 'Entries Fields', 'gravityview' ); ?> <span><?php esc_html_e( 'These fields will be shown for each entry.', 'gravityview' ); ?></span></h4>
18 18
 
19 19
 			<div id="directory-active-fields" class="gv-grid gv-grid-pad gv-grid-border">
20
-				<?php if(!empty( $curr_template ) ) {
21
-					do_action('gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true );
20
+				<?php if ( ! empty( $curr_template ) ) {
21
+					do_action( 'gravityview_render_directory_active_areas', $curr_template, 'directory', $post->ID, true );
22 22
 				} ?>
23 23
 			</div>
24 24
 
25
-			<h4><?php esc_html_e( 'Below Entries Widgets', 'gravityview'); ?> <span><?php esc_html_e( 'These widgets will be shown below entries.', 'gravityview'); ?></span></h4>
25
+			<h4><?php esc_html_e( 'Below Entries Widgets', 'gravityview' ); ?> <span><?php esc_html_e( 'These widgets will be shown below entries.', 'gravityview' ); ?></span></h4>
26 26
 
27 27
 			<?php
28 28
 
29
-                do_action('gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
29
+                do_action( 'gravityview_render_widgets_active_areas', $curr_template, 'footer', $post->ID );
30 30
 
31
-    			do_action('gravityview_render_field_pickers', 'directory' );
31
+    			do_action( 'gravityview_render_field_pickers', 'directory' );
32 32
 
33 33
             ?>
34 34
 
35 35
 			<?php // list of available widgets to be shown in the popup ?>
36 36
             <div id="directory-available-widgets" class="hide-if-js gv-tooltip">
37 37
                 <span class="close"><i class="dashicons dashicons-dismiss"></i></span>
38
-				<?php do_action('gravityview_render_available_widgets' ); ?>
38
+				<?php do_action( 'gravityview_render_available_widgets' ); ?>
39 39
             </div>
40 40
 
41 41
 		</div>
@@ -51,17 +51,17 @@  discard block
 block discarded – undo
51 51
 
52 52
 		<div id="single-fields" class="gv-section">
53 53
 
54
-			<h4><?php esc_html_e( 'These fields will be shown in Single Entry view.', 'gravityview'); ?></h4>
54
+			<h4><?php esc_html_e( 'These fields will be shown in Single Entry view.', 'gravityview' ); ?></h4>
55 55
 
56 56
 			<div id="single-active-fields" class="gv-grid gv-grid-pad gv-grid-border">
57 57
 				<?php
58
-                if(!empty( $curr_template ) ) {
59
-				    do_action('gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
58
+                if ( ! empty( $curr_template ) ) {
59
+				    do_action( 'gravityview_render_directory_active_areas', $curr_template, 'single', $post->ID, true );
60 60
                 }
61 61
 			    ?>
62 62
 			</div>
63 63
             <?php
64
-                do_action('gravityview_render_field_pickers', 'single' );
64
+                do_action( 'gravityview_render_field_pickers', 'single' );
65 65
 			?>
66 66
 		</div>
67 67
 
@@ -71,16 +71,16 @@  discard block
 block discarded – undo
71 71
 
72 72
 		<div id="edit-fields" class="gv-section">
73 73
 
74
-			<h4><?php esc_html_e( 'Fields shown when editing an entry.', 'gravityview'); ?> <span><?php esc_html_e('If not configured, all form fields will be displayed.', 'gravityview'); ?></span></h4>
74
+			<h4><?php esc_html_e( 'Fields shown when editing an entry.', 'gravityview' ); ?> <span><?php esc_html_e( 'If not configured, all form fields will be displayed.', 'gravityview' ); ?></span></h4>
75 75
 
76 76
 			<div id="edit-active-fields" class="gv-grid gv-grid-pad gv-grid-border">
77 77
 				<?php
78
-				do_action('gravityview_render_directory_active_areas', apply_filters( 'gravityview/template/edit', 'default_table_edit' ), 'edit', $post->ID, true );
78
+				do_action( 'gravityview_render_directory_active_areas', apply_filters( 'gravityview/template/edit', 'default_table_edit' ), 'edit', $post->ID, true );
79 79
 				?>
80 80
 			</div>
81 81
 
82 82
 			<?php
83
-			    do_action('gravityview_render_field_pickers', 'edit' );
83
+			    do_action( 'gravityview_render_field_pickers', 'edit' );
84 84
 			?>
85 85
 
86 86
 		</div>
Please login to merge, or discard this patch.
future/includes/class-gv-template-legacy-override.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -98,15 +98,15 @@  discard block
 block discarded – undo
98 98
 		$additional = array();
99 99
 
100 100
 		// form-19-table-body.php
101
-		$additional[] = sprintf( 'form-%d-%s-%s.php', $this->view->form ? $this->view->form->ID : 0, $slug, $name );
101
+		$additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->view->form ? $this->view->form->ID : 0, $slug, $name );
102 102
 
103 103
 		// view-3-table-body.php
104
-		$additional[] = sprintf( 'view-%d-%s-%s.php', $this->view->ID, $slug, $name );
104
+		$additional[ ] = sprintf( 'view-%d-%s-%s.php', $this->view->ID, $slug, $name );
105 105
 
106 106
 		global $post;
107 107
 		if ( $post ) {
108 108
 			// page-19-table-body.php
109
-			$additional[] = sprintf( 'page-%d-%s-%s.php', $post->ID, $slug, $name );
109
+			$additional[ ] = sprintf( 'page-%d-%s-%s.php', $post->ID, $slug, $name );
110 110
 		}
111 111
 
112 112
 		// Combine with existing table-body.php and table.php
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 		ob_start();
131 131
 
132 132
 		$request = new Mock_Request();
133
-		$request->returns['is_view'] = $this->view;
133
+		$request->returns[ 'is_view' ] = $this->view;
134 134
 
135 135
 		/**
136 136
 		 * You got one shot. One opportunity. To render all the widgets you have ever wanted.
@@ -144,17 +144,17 @@  discard block
 block discarded – undo
144 144
 		foreach ( array( 'gravityview_before', 'gravityview_after' ) as $hook ) {
145 145
 			/** WordPress 4.6 and lower compatibility, when WP_Hook classes were still absent. */
146 146
 			if ( is_array( $wp_filter[ $hook ] ) ) {
147
-				if ( ! empty( $wp_filter[ $hook ][10] ) ) {
148
-					foreach ( $wp_filter[ $hook ][10] as $function_key => $callback ) {
147
+				if ( ! empty( $wp_filter[ $hook ][ 10 ] ) ) {
148
+					foreach ( $wp_filter[ $hook ][ 10 ] as $function_key => $callback ) {
149 149
 						if ( strpos( $function_key, 'render_widget_hooks' ) ) {
150
-							unset( $wp_filter[ $hook ][10][ $function_key ] );
150
+							unset( $wp_filter[ $hook ][ 10 ][ $function_key ] );
151 151
 						}
152 152
 					}
153 153
 				}
154 154
 			} else {
155
-				foreach ( $wp_filter[ $hook ]->callbacks[10] as $function_key => $callback ) {
155
+				foreach ( $wp_filter[ $hook ]->callbacks[ 10 ] as $function_key => $callback ) {
156 156
 					if ( strpos( $function_key, 'render_widget_hooks' ) ) {
157
-						unset( $wp_filter[ $hook ]->callbacks[10][ $function_key ] );
157
+						unset( $wp_filter[ $hook ]->callbacks[ 10 ][ $function_key ] );
158 158
 					}
159 159
 				}
160 160
 			}
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 		 */
166 166
 		if ( $this->entry ) {
167 167
 
168
-			$request->returns['is_entry'] = $this->entry;
168
+			$request->returns[ 'is_entry' ] = $this->entry;
169 169
 
170 170
 			global $post;
171 171
 
@@ -209,8 +209,8 @@  discard block
 block discarded – undo
209 209
 					'fields' => $this->view->fields->by_visible(),
210 210
 					'in_the_loop' => true,
211 211
 				), empty( $parameters ) ? array() : array(
212
-					'paging' => $parameters['paging'],
213
-					'sorting' => $parameters['sorting'],
212
+					'paging' => $parameters[ 'paging' ],
213
+					'sorting' => $parameters[ 'sorting' ],
214 214
 				), $post ? array(
215 215
 					'post' => $post,
216 216
 				) : array() ) );
Please login to merge, or discard this patch.
future/includes/class-gv-plugin.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 	/**
85 85
 	 * @var string The REST API functionality identifier.
86 86
 	 */
87
-	const FEATURE_REST  = 'rest_api';
87
+	const FEATURE_REST = 'rest_api';
88 88
 
89 89
 	/**
90 90
 	 * Get the global instance of \GV\Plugin.
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
 		include_once $this->dir( 'includes/class-frontend-views.php' );
211 211
 		include_once $this->dir( 'includes/class-gravityview-admin-bar.php' );
212 212
 		include_once $this->dir( 'includes/class-gravityview-entry-list.php' );
213
-		include_once $this->dir( 'includes/class-gravityview-merge-tags.php'); /** @since 1.8.4 */
213
+		include_once $this->dir( 'includes/class-gravityview-merge-tags.php' ); /** @since 1.8.4 */
214 214
 		include_once $this->dir( 'includes/class-data.php' );
215 215
 		include_once $this->dir( 'includes/class-gravityview-shortcode.php' );
216 216
 		include_once $this->dir( 'includes/class-gravityview-entry-link-shortcode.php' );
@@ -244,12 +244,12 @@  discard block
 block discarded – undo
244 244
 
245 245
 			$locale = get_locale();
246 246
 
247
-			if ( function_exists('get_user_locale') && is_admin() ) {
247
+			if ( function_exists( 'get_user_locale' ) && is_admin() ) {
248 248
 				$locale = get_user_locale();
249 249
 			}
250 250
 
251 251
 			$locale = apply_filters( 'plugin_locale', $locale, 'gravityview' );
252
-			$mofile = $this->dir( 'languages' ) . '/gravityview-'. $locale .'.mo';
252
+			$mofile = $this->dir( 'languages' ) . '/gravityview-' . $locale . '.mo';
253 253
 			load_textdomain( 'gravityview', $mofile );
254 254
 		}
255 255
 	}
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
 	 */
383 383
 	public function is_compatible_wordpress( $version = null ) {
384 384
 
385
-		if( ! $version ) {
385
+		if ( ! $version ) {
386 386
 			$version = self::$min_wp_version;
387 387
 		}
388 388
 
@@ -423,8 +423,8 @@  discard block
 block discarded – undo
423 423
 	 * @return string The version of PHP.
424 424
 	 */
425 425
 	private function get_php_version() {
426
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] ) ?
427
-			$GLOBALS['GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE'] : phpversion();
426
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] ) ?
427
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_PHP_VERSION_OVERRIDE' ] : phpversion();
428 428
 	}
429 429
 
430 430
 	/**
@@ -435,8 +435,8 @@  discard block
 block discarded – undo
435 435
 	 * @return string The version of WordPress.
436 436
 	 */
437 437
 	private function get_wordpress_version() {
438
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] ) ?
439
-			$GLOBALS['GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE'] : $GLOBALS['wp_version'];
438
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] ) ?
439
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_WP_VERSION_OVERRIDE' ] : $GLOBALS[ 'wp_version' ];
440 440
 	}
441 441
 
442 442
 	/**
@@ -447,13 +447,13 @@  discard block
 block discarded – undo
447 447
 	 * @return string|null The version of Gravity Forms or null if inactive.
448 448
 	 */
449 449
 	private function get_gravityforms_version() {
450
-		if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE'] ) ) {
450
+		if ( ! class_exists( '\GFCommon' ) || ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_INACTIVE_OVERRIDE' ] ) ) {
451 451
 			gravityview()->log->error( 'Gravity Forms is inactive or not installed.' );
452 452
 			return null;
453 453
 		}
454 454
 
455
-		return ! empty( $GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] ) ?
456
-			$GLOBALS['GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE'] : \GFCommon::$version;
455
+		return ! empty( $GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] ) ?
456
+			$GLOBALS[ 'GRAVITYVIEW_TESTS_GF_VERSION_OVERRIDE' ] : \GFCommon::$version;
457 457
 	}
458 458
 
459 459
 	/**
@@ -509,9 +509,9 @@  discard block
 block discarded – undo
509 509
 		$tables = array();
510 510
 
511 511
 		if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) ) {
512
-			$tables []= \GFFormsModel::get_entry_meta_table_name();
512
+			$tables [ ] = \GFFormsModel::get_entry_meta_table_name();
513 513
 		}
514
-		$tables []= \GFFormsModel::get_lead_meta_table_name();
514
+		$tables [ ] = \GFFormsModel::get_lead_meta_table_name();
515 515
 
516 516
 		foreach ( $tables as $meta_table ) {
517 517
 			$sql = "
@@ -529,13 +529,13 @@  discard block
 block discarded – undo
529 529
 		$tables = array();
530 530
 
531 531
 		if ( version_compare( \GravityView_GFFormsModel::get_database_version(), '2.3-dev-1', '>=' ) && method_exists( 'GFFormsModel', 'get_entry_notes_table_name' ) ) {
532
-			$tables[] = \GFFormsModel::get_entry_notes_table_name();
532
+			$tables[ ] = \GFFormsModel::get_entry_notes_table_name();
533 533
 		}
534 534
 
535
-		$tables[] = \GFFormsModel::get_lead_notes_table_name();
535
+		$tables[ ] = \GFFormsModel::get_lead_notes_table_name();
536 536
 
537
-		$disapproved = __('Disapproved the Entry for GravityView', 'gravityview');
538
-		$approved = __('Approved the Entry for GravityView', 'gravityview');
537
+		$disapproved = __( 'Disapproved the Entry for GravityView', 'gravityview' );
538
+		$approved = __( 'Approved the Entry for GravityView', 'gravityview' );
539 539
 
540 540
 		$suppress = $wpdb->suppress_errors();
541 541
 		foreach ( $tables as $notes_table ) {
Please login to merge, or discard this patch.