Completed
Push — develop ( 4df9ef...dbeb5a )
by Zack
18:03
created
future/includes/class-gv-template-entry-list.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -64,9 +64,9 @@
 block discarded – undo
64 64
 		 */
65 65
 		$hide_empty = apply_filters( 'gravityview/render/hide-empty-zone', Utils::get( $extras, 'hide_empty', $this->view->settings->get( 'hide_empty', false ) ), $context );
66 66
 
67
-		$extras['hide_empty'] = $hide_empty;
68
-		$extras['label'] = $label;
69
-		$extras['value'] = $value;
67
+		$extras[ 'hide_empty' ] = $hide_empty;
68
+		$extras[ 'label' ] = $label;
69
+		$extras[ 'value' ] = $value;
70 70
 
71 71
 		return \gravityview_field_output( $extras, $context );
72 72
 	}
Please login to merge, or discard this patch.
future/includes/class-gv-shortcode-gventry.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -44,16 +44,16 @@  discard block
 block discarded – undo
44 44
 		 */
45 45
 		$atts = apply_filters( 'gravityview/shortcodes/gventry/atts', $atts );
46 46
 
47
-		$view = \GV\View::by_id( $atts['view_id'] );
47
+		$view = \GV\View::by_id( $atts[ 'view_id' ] );
48 48
 
49 49
 		if ( ! $view ) {
50
-			gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts['view_id'] ) );
50
+			gravityview()->log->error( 'View does not exist #{view_id}', array( 'view_id' => $atts[ 'view_id' ] ) );
51 51
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', null, null, $atts );
52 52
 		}
53 53
 
54
-		$entry_id = ! empty( $atts['entry_id'] ) ? $atts['entry_id'] : $atts['id'];
54
+		$entry_id = ! empty( $atts[ 'entry_id' ] ) ? $atts[ 'entry_id' ] : $atts[ 'id' ];
55 55
 
56
-		switch( $entry_id ):
56
+		switch ( $entry_id ):
57 57
 			case 'last':
58 58
 				if ( class_exists( '\GF_Query' ) ) {
59 59
 					/**
@@ -62,17 +62,17 @@  discard block
 block discarded – undo
62 62
 					 * Since we're using \GF_Query shorthand initialization we have to reverse the order parameters here.
63 63
 					 */
64 64
 					add_filter( 'gravityview_get_entries', $filter = function( $parameters, $args, $form_id ) {
65
-						if ( ! empty( $parameters['sorting'] ) ) {
65
+						if ( ! empty( $parameters[ 'sorting' ] ) ) {
66 66
 							/**
67 67
 							 * Reverse existing sorts.
68 68
 							 */
69
-							$sort = &$parameters['sorting'];
70
-							$sort['direction'] = $sort['direction'] == 'RAND' ? : ( $sort['direction'] == 'ASC' ? 'DESC' : 'ASC' );
69
+							$sort = &$parameters[ 'sorting' ];
70
+							$sort[ 'direction' ] = $sort[ 'direction' ] == 'RAND' ?: ( $sort[ 'direction' ] == 'ASC' ? 'DESC' : 'ASC' );
71 71
 						} else {
72 72
 							/**
73 73
 							 * Otherwise, sort by date_created.
74 74
 							 */
75
-							$parameters['sorting'] = array(
75
+							$parameters[ 'sorting' ] = array(
76 76
 								'key' => 'id',
77 77
 								'direction' => 'ASC',
78 78
 								'is_numeric' => true
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
 
88 88
 					/** If a sort already exists, reverse it. */
89 89
 					if ( $sort = end( $entries->sorts ) ) {
90
-						$entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ? : ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode );
90
+						$entries = $entries->sort( new \GV\Entry_Sort( $sort->field, $sort->direction == \GV\Entry_Sort::RAND ?: ( $sort->direction == \GV\Entry_Sort::ASC ? \GV\Entry_Sort::DESC : \GV\Entry_Sort::ASC ) ), $sort->mode );
91 91
 					} else {
92 92
 						/** Otherwise, sort by date_created */
93 93
 						$entries = $entries->sort( new \GV\Entry_Sort( \GV\Internal_Field::by_id( 'id' ), \GV\Entry_Sort::ASC ), \GV\Entry_Sort::NUMERIC );
@@ -105,12 +105,12 @@  discard block
 block discarded – undo
105 105
 				break;
106 106
 			default:
107 107
 				if ( ! $entry = \GV\GF_Entry::by_id( $entry_id ) ) {
108
-					gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts['view_id'] ) );
108
+					gravityview()->log->error( 'Entry #{entry_id} not found', array( 'view_id' => $atts[ 'view_id' ] ) );
109 109
 					return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, null, $atts );
110 110
 				}
111 111
 		endswitch;
112 112
 
113
-		if ( $view->form->ID != $entry['form_id'] ) {
113
+		if ( $view->form->ID != $entry[ 'form_id' ] ) {
114 114
 			gravityview()->log->error( 'Entry does not belong to view (form mismatch)' );
115 115
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
116 116
 		}
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 			return apply_filters( 'gravityview/shortcodes/gventry/output', get_the_password_form( $view->ID ), $view, $entry, $atts );
121 121
 		}
122 122
 
123
-		if ( ! $view->form  ) {
123
+		if ( ! $view->form ) {
124 124
 			gravityview()->log->notice( 'View #{id} has no form attached to it.', array( 'id' => $view->ID ) );
125 125
 
126 126
 			/**
@@ -143,13 +143,13 @@  discard block
 block discarded – undo
143 143
 		}
144 144
 
145 145
 		/** Unapproved entries. */
146
-		if ( $entry['status'] != 'active' ) {
146
+		if ( $entry[ 'status' ] != 'active' ) {
147 147
 			gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
148 148
 			return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
149 149
 		}
150 150
 
151 151
 		if ( $view->settings->get( 'show_only_approved' ) ) {
152
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
152
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
153 153
 				gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
154 154
 				return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
155 155
 			}
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
 		$renderer = new \GV\Entry_Renderer();
162 162
 
163 163
 		$request = new \GV\Mock_Request();
164
-		$request->returns['is_entry'] = $entry;
164
+		$request->returns[ 'is_entry' ] = $entry;
165 165
 
166 166
 		$output = $renderer->render( $entry, $view, $request );
167 167
 
Please login to merge, or discard this patch.
future/includes/class-gv-settings-addon.php 1 patch
Spacing   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 	 * @return array
102 102
 	 */
103 103
 	public function modify_app_settings_menu_title( $setting_tabs ) {
104
-		$setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview' );
104
+		$setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' );
105 105
 		return $setting_tabs;
106 106
 	}
107 107
 
@@ -304,15 +304,15 @@  discard block
 block discarded – undo
304 304
             </ul>
305 305
             <div class="gv-followup widefat">
306 306
                 <p><strong><label for="gv-reason-details"><?php esc_html_e( 'Comments', 'gravityview' ); ?></label></strong></p>
307
-                <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview') ?>" placeholder="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview'); ?>" class="large-text"></textarea>
307
+                <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ) ?>" placeholder="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ); ?>" class="large-text"></textarea>
308 308
             </div>
309 309
             <div class="scale-description">
310 310
                 <p><strong><?php esc_html_e( 'How likely are you to recommend GravityView?', 'gravityview' ); ?></strong></p>
311 311
                 <ul class="inline">
312 312
 					<?php
313 313
 					$i = 0;
314
-					while( $i < 11 ) {
315
-						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_'.$i.'" value="'.$i.'" type="radio"> '.$i.'</label></li>';
314
+					while ( $i < 11 ) {
315
+						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_' . $i . '" value="' . $i . '" type="radio"> ' . $i . '</label></li>';
316 316
 						$i++;
317 317
 					}
318 318
 					?>
@@ -529,15 +529,15 @@  discard block
 block discarded – undo
529 529
 	 * @return string The HTML
530 530
 	 */
531 531
 	public function as_html( $field, $echo = true ) {
532
-		$field['type']  = ( isset( $field['type'] ) && in_array( $field['type'], array( 'submit','reset','button' ) ) ) ? $field['type'] : 'submit';
532
+		$field[ 'type' ] = ( isset( $field[ 'type' ] ) && in_array( $field[ 'type' ], array( 'submit', 'reset', 'button' ) ) ) ? $field[ 'type' ] : 'submit';
533 533
 
534 534
 		$attributes    = $this->get_field_attributes( $field );
535 535
 		$default_value = Utils::get( $field, 'value', Utils::get( $field, 'default_value' ) );
536
-		$value         = $this->get( $field['name'], $default_value );
536
+		$value         = $this->get( $field[ 'name' ], $default_value );
537 537
 
538 538
 
539
-		$attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary gfbutton';
540
-		$name    = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_' . $field['name'];
539
+		$attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary gfbutton';
540
+		$name = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ];
541 541
 
542 542
 		if ( empty( $value ) ) {
543 543
 			$value = __( 'Update Settings', 'gravityview' );
@@ -546,7 +546,7 @@  discard block
 block discarded – undo
546 546
 		$attributes = $this->get_field_attributes( $field );
547 547
 
548 548
 		$html = '<input
549
-                    type="' . $field['type'] . '"
549
+                    type="' . $field[ 'type' ] . '"
550 550
                     name="' . esc_attr( $name ) . '"
551 551
                     value="' . $value . '" ' .
552 552
 		        implode( ' ', $attributes ) .
@@ -575,7 +575,7 @@  discard block
 block discarded – undo
575 575
 	public function license_key_notice() {
576 576
 		$license_status = $this->get( 'license_key_status' );
577 577
 		$license_key = $this->get( 'license_key' );
578
-		if( '' === $license_key ) {
578
+		if ( '' === $license_key ) {
579 579
 			$license_status = 'inactive';
580 580
         }
581 581
 		$license_id = empty( $license_key ) ? 'license' : $license_key;
@@ -587,7 +587,7 @@  discard block
 block discarded – undo
587 587
 		 * but didn't want to mess up the translation strings for the translators.
588 588
 		 */
589 589
 		$message = mb_substr( $message, 0, mb_strlen( $message ) - 1 );
590
-		$title = __ ( 'Inactive License', 'gravityview');
590
+		$title = __( 'Inactive License', 'gravityview' );
591 591
 		$status = '';
592 592
 		$update_below = false;
593 593
 		$primary_button_link = admin_url( 'edit.php?post_type=gravityview&amp;page=gravityview_settings' );
@@ -617,7 +617,7 @@  discard block
 block discarded – undo
617 617
 				$update_below = __( 'Activate your license key below.', 'gravityview' );
618 618
 				break;
619 619
 		}
620
-		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content='.$license_status.'&utm_campaign=Admin%20Notice';
620
+		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content=' . $license_status . '&utm_campaign=Admin%20Notice';
621 621
 
622 622
 		// Show a different notice on settings page for inactive licenses (hide the buttons)
623 623
 		if ( $update_below && gravityview_is_admin_page( '', 'settings' ) ) {
@@ -659,7 +659,7 @@  discard block
 block discarded – undo
659 659
 	public function scripts() {
660 660
 		$scripts = parent::scripts();
661 661
 
662
-		$scripts[] = array(
662
+		$scripts[ ] = array(
663 663
 			'handle'  => 'gform_tooltip_init',
664 664
 			'enqueue' => array(
665 665
                 array(
@@ -678,7 +678,7 @@  discard block
 block discarded – undo
678 678
 	public function styles() {
679 679
 		$styles = parent::styles();
680 680
 
681
-		$styles[] = array(
681
+		$styles[ ] = array(
682 682
 			'handle'  => 'gravityview_settings',
683 683
 			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
684 684
 			'version' => Plugin::$version,
@@ -709,7 +709,7 @@  discard block
 block discarded – undo
709 709
 		 * If multisite and not network admin, we don't want the settings to show.
710 710
 		 * @since 1.7.6
711 711
 		 */
712
-		$show_submenu = ( ! is_multisite() ) ||  is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() );
712
+		$show_submenu = ( ! is_multisite() ) || is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() );
713 713
 
714 714
 		/**
715 715
 		 * Override whether to show the Settings menu on a per-blog basis.
@@ -752,26 +752,26 @@  discard block
 block discarded – undo
752 752
 				'label' => __( 'License Key', 'gravityview' ),
753 753
 				'description' => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates &amp; support.', 'gravityview' ) . $this->get_license_handler()->license_details( $this->get_app_setting( 'license_key_response' ) ),
754 754
 				'type' => 'edd_license',
755
-				'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' )  && GRAVITYVIEW_LICENSE_KEY ),
755
+				'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ),
756 756
 				'data-pending-text' => __( 'Verifying license&hellip;', 'gravityview' ),
757
-				'default_value' => $default_settings['license_key'],
757
+				'default_value' => $default_settings[ 'license_key' ],
758 758
 				'class' => ( '' == $this->get( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
759 759
 			),
760 760
 			array(
761 761
 				'name' => 'license_key_response',
762
-				'default_value' => $default_settings['license_key_response'],
762
+				'default_value' => $default_settings[ 'license_key_response' ],
763 763
 				'type' => 'hidden',
764 764
 			),
765 765
 			array(
766 766
 				'name' => 'license_key_status',
767
-				'default_value' => $default_settings['license_key_status'],
767
+				'default_value' => $default_settings[ 'license_key_status' ],
768 768
 				'type' => 'hidden',
769 769
 			),
770 770
 			array(
771 771
 				'name' => 'support-email',
772 772
 				'type' => 'text',
773 773
 				'validate' => 'email',
774
-				'default_value' => $default_settings['support-email'],
774
+				'default_value' => $default_settings[ 'support-email' ],
775 775
 				'label' => __( 'Support Email', 'gravityview' ),
776 776
 				'description' => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ),
777 777
 				'class' => 'code regular-text',
@@ -783,7 +783,7 @@  discard block
 block discarded – undo
783 783
 				'name' => 'support_port',
784 784
 				'type' => 'radio',
785 785
 				'label' => __( 'Show Support Port?', 'gravityview' ),
786
-				'default_value' => $default_settings['support_port'],
786
+				'default_value' => $default_settings[ 'support_port' ],
787 787
 				'horizontal' => 1,
788 788
 				'choices' => array(
789 789
 					array(
@@ -802,7 +802,7 @@  discard block
 block discarded – undo
802 802
 				'name' => 'no-conflict-mode',
803 803
 				'type' => 'radio',
804 804
 				'label' => __( 'No-Conflict Mode', 'gravityview' ),
805
-				'default_value' => $default_settings['no-conflict-mode'],
805
+				'default_value' => $default_settings[ 'no-conflict-mode' ],
806 806
 				'horizontal' => 1,
807 807
 				'choices' => array(
808 808
 					array(
@@ -824,7 +824,7 @@  discard block
 block discarded – undo
824 824
 					'name' => 'rest_api',
825 825
 					'type' => 'radio',
826 826
 					'label' => __( 'REST API', 'gravityview' ),
827
-					'default_value' => $default_settings['rest_api'],
827
+					'default_value' => $default_settings[ 'rest_api' ],
828 828
 					'horizontal' => 1,
829 829
 					'choices' => array(
830 830
 						array(
@@ -843,7 +843,7 @@  discard block
 block discarded – undo
843 843
 				'name' => 'beta',
844 844
 				'type' => 'checkbox',
845 845
 				'label' => __( 'Become a Beta Tester', 'gravityview' ),
846
-				'default_value' => $default_settings['beta'],
846
+				'default_value' => $default_settings[ 'beta' ],
847 847
 				'horizontal' => 1,
848 848
 				'choices' => array(
849 849
 					array(
@@ -876,17 +876,17 @@  discard block
 block discarded – undo
876 876
 		 * @since 1.7.4
877 877
 		 */
878 878
 		foreach ( $fields as &$field ) {
879
-			$field['name']          = isset( $field['name'] ) ? $field['name'] : Utils::get( $field, 'id' );
880
-			$field['label']         = isset( $field['label'] ) ? $field['label'] : Utils::get( $field, 'title' );
881
-			$field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : Utils::get( $field, 'default' );
882
-			$field['description']   = isset( $field['description'] ) ? $field['description'] : Utils::get( $field, 'subtitle' );
879
+			$field[ 'name' ]          = isset( $field[ 'name' ] ) ? $field[ 'name' ] : Utils::get( $field, 'id' );
880
+			$field[ 'label' ]         = isset( $field[ 'label' ] ) ? $field[ 'label' ] : Utils::get( $field, 'title' );
881
+			$field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : Utils::get( $field, 'default' );
882
+			$field[ 'description' ]   = isset( $field[ 'description' ] ) ? $field[ 'description' ] : Utils::get( $field, 'subtitle' );
883 883
 
884 884
 			if ( $disabled_attribute ) {
885
-				$field['disabled']  = $disabled_attribute;
885
+				$field[ 'disabled' ] = $disabled_attribute;
886 886
 			}
887 887
 
888
-			if ( empty( $field['disabled'] ) ) {
889
-				unset( $field['disabled'] );
888
+			if ( empty( $field[ 'disabled' ] ) ) {
889
+				unset( $field[ 'disabled' ] );
890 890
             }
891 891
 		}
892 892
 
@@ -904,7 +904,7 @@  discard block
 block discarded – undo
904 904
         );
905 905
 
906 906
 		if ( $disabled_attribute ) {
907
-			$button['disabled'] = $disabled_attribute;
907
+			$button[ 'disabled' ] = $disabled_attribute;
908 908
 		}
909 909
 
910 910
         /**
@@ -923,20 +923,20 @@  discard block
 block discarded – undo
923 923
 		// If there are extensions, add a section for them
924 924
 		if ( ! empty( $extension_sections ) ) {
925 925
 
926
-			if( $disabled_attribute ) {
926
+			if ( $disabled_attribute ) {
927 927
 				foreach ( $extension_sections as &$section ) {
928
-					foreach ( $section['fields'] as &$field ) {
929
-						$field['disabled'] = $disabled_attribute;
928
+					foreach ( $section[ 'fields' ] as &$field ) {
929
+						$field[ 'disabled' ] = $disabled_attribute;
930 930
 					}
931 931
 				}
932 932
 			}
933 933
 
934
-            $k = count( $extension_sections ) - 1 ;
935
-            $extension_sections[ $k ]['fields'][] = $button;
934
+            $k = count( $extension_sections ) - 1;
935
+            $extension_sections[ $k ][ 'fields' ][ ] = $button;
936 936
 			$sections = array_merge( $sections, $extension_sections );
937 937
 		} else {
938 938
             // add the 'update settings' button to the general section
939
-            $sections[0]['fields'][] = $button;
939
+            $sections[ 0 ][ 'fields' ][ ] = $button;
940 940
         }
941 941
 
942 942
 		return $sections;
@@ -992,7 +992,7 @@  discard block
 block discarded – undo
992 992
 	protected function settings_edd_license( $field, $echo = true ) {
993 993
 
994 994
 	    if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
995
-		    $field['input_type'] = 'password';
995
+		    $field[ 'input_type' ] = 'password';
996 996
         }
997 997
 
998 998
 		$text = $this->settings_text( $field, false );
@@ -1017,10 +1017,10 @@  discard block
 block discarded – undo
1017 1017
 	 * @return string
1018 1018
 	 */
1019 1019
 	public function settings_save( $field, $echo = true ) {
1020
-		$field['type']  = 'submit';
1021
-		$field['name']  = 'gform-settings-save';
1022
-		$field['class'] = isset( $field['class'] ) ? $field['class'] : 'button-primary gfbutton';
1023
-		$field['value'] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
1020
+		$field[ 'type' ]  = 'submit';
1021
+		$field[ 'name' ]  = 'gform-settings-save';
1022
+		$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] : 'button-primary gfbutton';
1023
+		$field[ 'value' ] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
1024 1024
 
1025 1025
 		$output = $this->settings_submit( $field, false );
1026 1026
 
@@ -1051,8 +1051,8 @@  discard block
 block discarded – undo
1051 1051
      * @return void
1052 1052
 	 */
1053 1053
 	public function single_setting_row( $field ) {
1054
-		$field['gv_description'] = Utils::get( $field, 'description' );
1055
-		$field['description']    = Utils::get( $field, 'subtitle' );
1054
+		$field[ 'gv_description' ] = Utils::get( $field, 'description' );
1055
+		$field[ 'description' ]    = Utils::get( $field, 'subtitle' );
1056 1056
 		parent::single_setting_row( $field );
1057 1057
 	}
1058 1058
 
@@ -1064,7 +1064,7 @@  discard block
 block discarded – undo
1064 1064
 	public function single_setting_label( $field ) {
1065 1065
 		parent::single_setting_label( $field );
1066 1066
 		if ( $description = Utils::get( $field, 'gv_description' ) ) {
1067
-			echo '<span class="description">'. $description .'</span>';
1067
+			echo '<span class="description">' . $description . '</span>';
1068 1068
 		}
1069 1069
 	}
1070 1070
 
@@ -1101,9 +1101,9 @@  discard block
 block discarded – undo
1101 1101
 		// If the posted key doesn't match the activated/deactivated key (set using the Activate License button, AJAX response),
1102 1102
 		// then we assume it's changed. If it's changed, unset the status and the previous response.
1103 1103
 		if ( $local_key !== $response_key ) {
1104
-			unset( $posted_settings['license_key_response'] );
1105
-			unset( $posted_settings['license_key_status'] );
1106
-			\GFCommon::add_error_message( __('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
1104
+			unset( $posted_settings[ 'license_key_response' ] );
1105
+			unset( $posted_settings[ 'license_key_status' ] );
1106
+			\GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
1107 1107
 		}
1108 1108
 		return $posted_settings;
1109 1109
 	}
Please login to merge, or discard this patch.
future/includes/class-gv-renderer-entry.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@
 block discarded – undo
54 54
 		do_action( 'gravityview_render_entry_' . $view->ID, $entry, $view, $request );
55 55
 
56 56
 		/** Entry does not belong to this view. */
57
-		if ( $view->form && $view->form->ID != $entry['form_id'] ) {
57
+		if ( $view->form && $view->form->ID != $entry[ 'form_id' ] ) {
58 58
 			gravityview()->log->error( 'The requested entry does not belong to this View. Entry #{entry_id}, #View {view_id}', array( 'entry_id' => $entry->ID, 'view_id' => $view->ID ) );
59 59
 			return null;
60 60
 		}
Please login to merge, or discard this patch.
includes/extensions/entry-notes/class-gravityview-field-notes.php 1 patch
Spacing   +81 added lines, -81 removed lines patch added patch discarded remove patch
@@ -63,19 +63,19 @@  discard block
 block discarded – undo
63 63
 
64 64
 		add_shortcode( 'gv_note_add', array( 'GravityView_Field_Notes', 'get_add_note_part' ) );
65 65
 
66
-		add_action( 'wp', array( $this, 'maybe_delete_notes'), 1000 );
67
-		add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes') );
68
-		add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes') );
66
+		add_action( 'wp', array( $this, 'maybe_delete_notes' ), 1000 );
67
+		add_action( 'wp_ajax_nopriv_gv_delete_notes', array( $this, 'maybe_delete_notes' ) );
68
+		add_action( 'wp_ajax_gv_delete_notes', array( $this, 'maybe_delete_notes' ) );
69 69
 
70
-		add_action( 'wp', array( $this, 'maybe_add_note'), 1000 );
71
-		add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note') );
72
-		add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note') );
70
+		add_action( 'wp', array( $this, 'maybe_add_note' ), 1000 );
71
+		add_action( 'wp_ajax_nopriv_gv_note_add', array( $this, 'maybe_add_note' ) );
72
+		add_action( 'wp_ajax_gv_note_add', array( $this, 'maybe_add_note' ) );
73 73
 
74 74
 		// add template path to check for field
75 75
 		add_filter( 'gravityview_template_paths', array( $this, 'add_template_path' ) );
76 76
 		add_filter( 'gravityview/template/fields_template_paths', array( $this, 'add_template_path' ) );
77 77
 
78
-		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts') );
78
+		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) );
79 79
 		add_action( 'gravityview/field/notes/scripts', array( $this, 'enqueue_scripts' ) );
80 80
 		
81 81
 		add_filter( 'gravityview_entry_default_fields', array( $this, 'add_entry_default_field' ), 10, 3 );
@@ -97,8 +97,8 @@  discard block
 block discarded – undo
97 97
 	 */
98 98
 	public function add_entry_default_field( $entry_default_fields, $form, $zone ) {
99 99
 
100
-		if( in_array( $zone, array( 'directory', 'single' ) ) ) {
101
-			$entry_default_fields['notes'] = array(
100
+		if ( in_array( $zone, array( 'directory', 'single' ) ) ) {
101
+			$entry_default_fields[ 'notes' ] = array(
102 102
 				'label' => __( 'Entry Notes', 'gravityview' ),
103 103
 				'type'  => 'notes',
104 104
 				'desc'  => __( 'Display, add, and delete notes for an entry.', 'gravityview' ),
@@ -131,23 +131,23 @@  discard block
 block discarded – undo
131 131
 	public function enqueue_scripts() {
132 132
 		global $wp_actions;
133 133
 
134
-		if( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
134
+		if ( ! wp_script_is( 'gravityview-notes', 'enqueued' ) ) {
135 135
 			wp_enqueue_style( 'gravityview-notes' );
136 136
 			wp_enqueue_script( 'gravityview-notes' );
137 137
 		}
138 138
 
139
-		if( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
139
+		if ( ! wp_script_is( 'gravityview-notes', 'done' ) ) {
140 140
 
141 141
 			$strings = self::strings();
142 142
 
143 143
 			wp_localize_script( 'gravityview-notes', 'GVNotes', array(
144 144
 				'ajaxurl' => admin_url( 'admin-ajax.php' ),
145 145
 				'text' => array(
146
-					'processing' => $strings['processing'],
147
-					'delete_confirm' => $strings['delete-confirm'],
148
-					'note_added' => $strings['added-note'],
149
-					'error_invalid' => $strings['error-invalid'],
150
-					'error_empty_note' => $strings['error-empty-note'],
146
+					'processing' => $strings[ 'processing' ],
147
+					'delete_confirm' => $strings[ 'delete-confirm' ],
148
+					'note_added' => $strings[ 'added-note' ],
149
+					'error_invalid' => $strings[ 'error-invalid' ],
150
+					'error_empty_note' => $strings[ 'error-empty-note' ],
151 151
 				),
152 152
 			) );
153 153
 		}
@@ -164,31 +164,31 @@  discard block
 block discarded – undo
164 164
 	 */
165 165
 	function maybe_add_note() {
166 166
 
167
-		if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
167
+		if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
168 168
 			gravityview()->log->error( 'The user isnt allowed to add entry notes.' );
169 169
 			return;
170 170
 		}
171 171
 
172
-		if( ! isset( $_POST['action'] ) ) {
172
+		if ( ! isset( $_POST[ 'action' ] ) ) {
173 173
 			return;
174 174
 		}
175 175
 
176
-		if( 'gv_note_add' === $_POST['action'] ) {
176
+		if ( 'gv_note_add' === $_POST[ 'action' ] ) {
177 177
 
178
-            if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
178
+            if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
179 179
                 do_action( 'gravityview_log_error', __METHOD__ . ': The user isnt allowed to add entry notes.' );
180 180
                 return;
181 181
             }
182 182
 
183 183
 			$post = wp_unslash( $_POST );
184 184
 
185
-			if( $this->doing_ajax ) {
186
-				parse_str( $post['data'], $data );
185
+			if ( $this->doing_ajax ) {
186
+				parse_str( $post[ 'data' ], $data );
187 187
 			} else {
188 188
 				$data = $post;
189 189
 			}
190 190
 
191
-			$this->process_add_note( (array) $data );
191
+			$this->process_add_note( (array)$data );
192 192
 		}
193 193
 	}
194 194
 
@@ -215,23 +215,23 @@  discard block
 block discarded – undo
215 215
 		$error = false;
216 216
 		$success = false;
217 217
 
218
-		if( empty( $data['entry-slug'] ) ) {
218
+		if ( empty( $data[ 'entry-slug' ] ) ) {
219 219
 
220
-			$error = self::strings('error-invalid');
220
+			$error = self::strings( 'error-invalid' );
221 221
 			gravityview()->log->error( 'The note is missing an Entry ID.' );
222 222
 
223 223
 		} else {
224 224
 
225
-			$valid = wp_verify_nonce( $data['gv_note_add'], 'gv_note_add_' . $data['entry-slug'] );
225
+			$valid = wp_verify_nonce( $data[ 'gv_note_add' ], 'gv_note_add_' . $data[ 'entry-slug' ] );
226 226
 			
227 227
 			$has_cap = GVCommon::has_cap( 'gravityview_add_entry_notes' );
228 228
 
229
-			if( ! $has_cap ) {
229
+			if ( ! $has_cap ) {
230 230
 				$error = self::strings( 'error-cap-add' );
231 231
 				gravityview()->log->error( 'Adding a note failed: the user does not have the "gravityview_add_entry_notes" capability.' );
232 232
 			} elseif ( $valid ) {
233 233
 
234
-				$entry = gravityview_get_entry( $data['entry-slug'], true, false );
234
+				$entry = gravityview_get_entry( $data[ 'entry-slug' ], true, false );
235 235
 
236 236
 				$added = $this->add_note( $entry, $data );
237 237
 
@@ -249,22 +249,22 @@  discard block
 block discarded – undo
249 249
 					$this->maybe_send_entry_notes( $note, $entry, $data );
250 250
 
251 251
 					if ( $note ) {
252
-						$success = self::display_note( $note, ! empty( $data['show-delete'] ) );
252
+						$success = self::display_note( $note, ! empty( $data[ 'show-delete' ] ) );
253 253
 						gravityview()->log->debug( 'The note was successfully created', array( 'data' => compact( 'note', 'data' ) ) );
254 254
 					} else {
255
-						$error = self::strings('error-add-note');
255
+						$error = self::strings( 'error-add-note' );
256 256
 						gravityview()->log->error( 'The note was not successfully created', array( 'data' => compact( 'note', 'data' ) ) );
257 257
 					}
258 258
 				}
259 259
 			} else {
260
-				$error = self::strings('error-invalid');
260
+				$error = self::strings( 'error-invalid' );
261 261
 				gravityview()->log->error( 'Nonce validation failed; the note was not created' );
262 262
 			}
263 263
 		}
264 264
 
265 265
 
266
-		if( $this->doing_ajax ) {
267
-			if( $success ) {
266
+		if ( $this->doing_ajax ) {
267
+			if ( $success ) {
268 268
 				wp_send_json_success( array( 'html' => $success ) );
269 269
 			} else {
270 270
 				$error = $error ? $error : self::strings( 'error-invalid' );
@@ -290,11 +290,11 @@  discard block
 block discarded – undo
290 290
 			return;
291 291
 		}
292 292
 
293
-		if ( isset( $_POST['action'] ) && 'gv_delete_notes' === $_POST['action'] ) {
293
+		if ( isset( $_POST[ 'action' ] ) && 'gv_delete_notes' === $_POST[ 'action' ] ) {
294 294
 
295 295
 			$post = wp_unslash( $_POST );
296 296
 			if ( $this->doing_ajax ) {
297
-				parse_str( $post['data'], $data );
297
+				parse_str( $post[ 'data' ], $data );
298 298
 			} else {
299 299
 				$data = $post;
300 300
 			}
@@ -325,18 +325,18 @@  discard block
 block discarded – undo
325 325
 	 */
326 326
 	function process_delete_notes( $data ) {
327 327
 
328
-		$valid = wp_verify_nonce( $data['gv_delete_notes'], 'gv_delete_notes_' . $data['entry-slug'] );
328
+		$valid = wp_verify_nonce( $data[ 'gv_delete_notes' ], 'gv_delete_notes_' . $data[ 'entry-slug' ] );
329 329
 		$has_cap = GVCommon::has_cap( 'gravityview_delete_entry_notes' );
330 330
 		$success = false;
331 331
 
332 332
 		if ( $valid && $has_cap ) {
333
-			GravityView_Entry_Notes::delete_notes( $data['note'] );
333
+			GravityView_Entry_Notes::delete_notes( $data[ 'note' ] );
334 334
 			$success = true;
335 335
 		}
336 336
 
337
-		if( $this->doing_ajax ) {
337
+		if ( $this->doing_ajax ) {
338 338
 
339
-			if( $success ) {
339
+			if ( $success ) {
340 340
 				wp_send_json_success();
341 341
 			} else {
342 342
 				if ( ! $valid ) {
@@ -369,13 +369,13 @@  discard block
 block discarded – undo
369 369
 
370 370
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type ) {
371 371
 
372
-		unset( $field_options['show_as_link'] );
372
+		unset( $field_options[ 'show_as_link' ] );
373 373
 
374 374
 		$notes_options = array(
375 375
 			'notes' => array(
376 376
 				'type' => 'checkboxes',
377
-				'label' => __('Note Settings', 'gravityview'),
378
-				'desc' => sprintf( _x('Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ),
377
+				'label' => __( 'Note Settings', 'gravityview' ),
378
+				'desc' => sprintf( _x( 'Only users with specific capabilities will be able to view, add and delete notes. %sRead more%s.', '%s is opening and closing HTML link', 'gravityview' ), '<a href="https://docs.gravityview.co/article/311-gravityview-capabilities">', '</a>' ),
379 379
 				'options' => array(
380 380
 					'view' => array(
381 381
 						'label' => __( 'Display notes?', 'gravityview' ),
@@ -427,7 +427,7 @@  discard block
 block discarded – undo
427 427
 			'processing' => __( 'Processing&hellip;', 'gravityview' ),
428 428
 			'other-email' => __( 'Other email address', 'gravityview' ),
429 429
 			'email-label' => __( 'Email address', 'gravityview' ),
430
-			'email-placeholder' => _x('[email protected]', 'Example email address used as a placeholder', 'gravityview'),
430
+			'email-placeholder' => _x( '[email protected]', 'Example email address used as a placeholder', 'gravityview' ),
431 431
 			'subject-label' => __( 'Subject', 'gravityview' ),
432 432
 			'subject' => __( 'Email subject', 'gravityview' ),
433 433
 			'default-email-subject' => __( 'New entry note', 'gravityview' ),
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
447 447
 		 */
448 448
 		$strings = gv_map_deep( apply_filters( 'gravityview/field/notes/strings', $strings ), 'esc_html' );
449 449
 
450
-		if( $key ) {
450
+		if ( $key ) {
451 451
 			return isset( $strings[ $key ] ) ? $strings[ $key ] : '';
452 452
 		}
453 453
 
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
 	 */
470 470
 	static public function display_note( $note, $show_delete = false, $context = null ) {
471 471
 
472
-		if( ! is_object( $note ) ) {
472
+		if ( ! is_object( $note ) ) {
473 473
 			return '';
474 474
 		}
475 475
 
@@ -524,7 +524,7 @@  discard block
 block discarded – undo
524 524
 		}
525 525
 
526 526
 		$replacements = array(
527
-			'{note_id}' => $note_content['note_id'],
527
+			'{note_id}' => $note_content[ 'note_id' ],
528 528
 			'{row_class}' => 'gv-note',
529 529
 			'{note_detail}' => $note_detail_html
530 530
 		);
@@ -556,13 +556,13 @@  discard block
 block discarded – undo
556 556
 
557 557
 		$user_data = get_userdata( $current_user->ID );
558 558
 
559
-		$note_content = trim( $data['gv-note-content'] );
559
+		$note_content = trim( $data[ 'gv-note-content' ] );
560 560
 
561
-		if( empty( $note_content ) ) {
561
+		if ( empty( $note_content ) ) {
562 562
 			return new WP_Error( 'gv-add-note-empty', __( 'The note is empty.', 'gravityview' ) );
563 563
 		}
564 564
 
565
-		$return = GravityView_Entry_Notes::add_note( $entry['id'], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
565
+		$return = GravityView_Entry_Notes::add_note( $entry[ 'id' ], $user_data->ID, $user_data->display_name, $note_content, 'gravityview/field/notes' );
566 566
 
567 567
 		return $return;
568 568
 	}
@@ -582,7 +582,7 @@  discard block
 block discarded – undo
582 582
 
583 583
 		$atts = shortcode_atts( array( 'entry' => null ), $atts );
584 584
 
585
-		if( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
585
+		if ( ! GVCommon::has_cap( 'gravityview_add_entry_notes' ) ) {
586 586
 			gravityview()->log->error( 'User does not have permission to add entry notes ("gravityview_add_entry_notes").' );
587 587
 			return '';
588 588
 		}
@@ -604,8 +604,8 @@  discard block
 block discarded – undo
604 604
 
605 605
 			$visibility_settings = $gravityview_view->getCurrentFieldSetting( 'notes' );
606 606
 
607
-			if ( $atts['entry'] ) {
608
-				$entry = GFAPI::get_entry( $atts['entry'] );
607
+			if ( $atts[ 'entry' ] ) {
608
+				$entry = GFAPI::get_entry( $atts[ 'entry' ] );
609 609
 			}
610 610
 
611 611
 			if ( ! isset( $entry ) || ! $entry ) {
@@ -615,19 +615,19 @@  discard block
 block discarded – undo
615 615
 
616 616
 		// Strip extra whitespace in template
617 617
 		$add_note_html = gravityview_strip_whitespace( $add_note_html );
618
-		$entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry );
618
+		$entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
619 619
 		$nonce_field = wp_nonce_field( 'gv_note_add_' . $entry_slug, 'gv_note_add', false, false );
620 620
 
621 621
 		// Only generate the dropdown if the field settings allow it
622 622
 		$email_fields = '';
623
-		if( ! empty( $visibility_settings['email'] ) ) {
623
+		if ( ! empty( $visibility_settings[ 'email' ] ) ) {
624 624
 			$email_fields = self::get_note_email_fields( $entry_slug );
625 625
 		}
626 626
 
627 627
 		$add_note_html = str_replace( '{entry_slug}', $entry_slug, $add_note_html );
628 628
 		$add_note_html = str_replace( '{nonce_field}', $nonce_field, $add_note_html );
629
-		$add_note_html = str_replace( '{show_delete}', intval( empty( $visibility_settings['delete'] ) ? 0 : $visibility_settings['delete'] ), $add_note_html );
630
-		$add_note_html   = str_replace( '{email_fields}', $email_fields, $add_note_html );
629
+		$add_note_html = str_replace( '{show_delete}', intval( empty( $visibility_settings[ 'delete' ] ) ? 0 : $visibility_settings[ 'delete' ] ), $add_note_html );
630
+		$add_note_html = str_replace( '{email_fields}', $email_fields, $add_note_html );
631 631
 		$add_note_html = str_replace( '{url}', esc_url_raw( add_query_arg( array() ) ), $add_note_html );
632 632
 
633 633
 		return $add_note_html;
@@ -652,8 +652,8 @@  discard block
 block discarded – undo
652 652
 		$note_emails = array();
653 653
 
654 654
 		foreach ( $email_fields as $email_field ) {
655
-			if ( ! empty( $entry["{$email_field->id}"] ) && is_email( $entry["{$email_field->id}"] ) ) {
656
-				$note_emails[] = $entry["{$email_field->id}"];
655
+			if ( ! empty( $entry[ "{$email_field->id}" ] ) && is_email( $entry[ "{$email_field->id}" ] ) ) {
656
+				$note_emails[ ] = $entry[ "{$email_field->id}" ];
657 657
 			}
658 658
 		}
659 659
 
@@ -665,7 +665,7 @@  discard block
 block discarded – undo
665 665
 		 */
666 666
 		$note_emails = apply_filters( 'gravityview/field/notes/emails', $note_emails, $entry );
667 667
 
668
-		return (array) $note_emails;
668
+		return (array)$note_emails;
669 669
 	}
670 670
 
671 671
 	/**
@@ -681,7 +681,7 @@  discard block
 block discarded – undo
681 681
 	 */
682 682
 	private static function get_note_email_fields( $entry_slug = '' ) {
683 683
 
684
-		if( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
684
+		if ( ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
685 685
 			gravityview()->log->error( 'User does not have permission to email entry notes ("gravityview_email_entry_notes").' );
686 686
 			return '';
687 687
 		}
@@ -703,27 +703,27 @@  discard block
 block discarded – undo
703 703
 
704 704
 		if ( ! empty( $note_emails ) || $include_custom ) { ?>
705 705
 			<div class="gv-note-email-container">
706
-				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings['also-email'];  ?></label>
706
+				<label for="gv-note-email-to-<?php echo $entry_slug_esc; ?>" class="screen-reader-text"><?php echo $strings[ 'also-email' ]; ?></label>
707 707
 				<select class="gv-note-email-to" name="gv-note-to" id="gv-note-email-to-<?php echo $entry_slug_esc; ?>">
708
-					<option value=""><?php echo $strings['also-email'];  ?></option>
708
+					<option value=""><?php echo $strings[ 'also-email' ]; ?></option>
709 709
 					<?php foreach ( $note_emails as  $email ) {
710 710
 						?>
711 711
 						<option value="<?php echo esc_attr( $email ); ?>"><?php echo esc_html( $email ); ?></option>
712 712
 					<?php }
713
-					if( $include_custom ) { ?>
714
-					<option value="custom"><?php echo self::strings('other-email'); ?></option>
713
+					if ( $include_custom ) { ?>
714
+					<option value="custom"><?php echo self::strings( 'other-email' ); ?></option>
715 715
 					<?php } ?>
716 716
 				</select>
717 717
 				<fieldset class="gv-note-to-container">
718
-					<?php if( $include_custom ) { ?>
718
+					<?php if ( $include_custom ) { ?>
719 719
 					<div class='gv-note-to-custom-container'>
720
-						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings['email-label']; ?></label>
721
-						<input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings['email-placeholder']; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" />
720
+						<label for="gv-note-email-to-custom-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'email-label' ]; ?></label>
721
+						<input type="text" name="gv-note-to-custom" placeholder="<?php echo $strings[ 'email-placeholder' ]; ?>" id="gv-note-to-custom-<?php echo $entry_slug_esc; ?>" value="" />
722 722
 					</div>
723 723
 					<?php } ?>
724 724
 		            <div class='gv-note-subject-container'>
725
-		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings['subject-label']; ?></label>
726
-		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings['subject']; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
725
+		                <label for="gv-note-subject-<?php echo $entry_slug_esc; ?>"><?php echo $strings[ 'subject-label' ]; ?></label>
726
+		                <input type="text" name="gv-note-subject" placeholder="<?php echo $strings[ 'subject' ]; ?>" id="gv-note-subject-<?php echo $entry_slug_esc; ?>" value="" />
727 727
 		            </div>
728 728
 				</fieldset>
729 729
 			</div>
@@ -746,7 +746,7 @@  discard block
 block discarded – undo
746 746
 	 */
747 747
 	private function maybe_send_entry_notes( $note = false, $entry, $data ) {
748 748
 
749
-		if( ! $note || ! GVCommon::has_cap('gravityview_email_entry_notes') ) {
749
+		if ( ! $note || ! GVCommon::has_cap( 'gravityview_email_entry_notes' ) ) {
750 750
 			gravityview()->log->debug( 'User doesn\'t have "gravityview_email_entry_notes" cap, or $note is empty', array( 'data' => $note ) );
751 751
 			return;
752 752
 		}
@@ -754,7 +754,7 @@  discard block
 block discarded – undo
754 754
 		gravityview()->log->debug( '$data', array( 'data' => $data ) );
755 755
 
756 756
 		//emailing notes if configured
757
-		if ( ! empty( $data['gv-note-to'] ) ) {
757
+		if ( ! empty( $data[ 'gv-note-to' ] ) ) {
758 758
 
759 759
 			$default_data = array(
760 760
 				'gv-note-to' => '',
@@ -764,11 +764,11 @@  discard block
 block discarded – undo
764 764
                 'current-url' => '',
765 765
 			);
766 766
 
767
-			$current_user  = wp_get_current_user();
767
+			$current_user = wp_get_current_user();
768 768
 			$email_data = wp_parse_args( $data, $default_data );
769 769
 
770
-			$from    = $current_user->user_email;
771
-			$to = $email_data['gv-note-to'];
770
+			$from = $current_user->user_email;
771
+			$to = $email_data[ 'gv-note-to' ];
772 772
 
773 773
 			/**
774 774
 			 * Documented in get_note_email_fields
@@ -776,8 +776,8 @@  discard block
 block discarded – undo
776 776
 			 */
777 777
 			$include_custom = apply_filters( 'gravityview/field/notes/custom-email', true );
778 778
 
779
-			if( 'custom' === $to && $include_custom ) {
780
-				$to = $email_data['gv-note-to-custom'];
779
+			if ( 'custom' === $to && $include_custom ) {
780
+				$to = $email_data[ 'gv-note-to-custom' ];
781 781
 				gravityview()->log->debug( 'Sending note to a custom email address: {to}' . array( 'to' => $to ) );
782 782
 			}
783 783
 
@@ -788,13 +788,13 @@  discard block
 block discarded – undo
788 788
 
789 789
 			$bcc = false;
790 790
 			$reply_to = $from;
791
-			$subject = trim( $email_data['gv-note-subject'] );
791
+			$subject = trim( $email_data[ 'gv-note-subject' ] );
792 792
 
793 793
 			// We use empty() here because GF uses empty to check against, too. `0` isn't a valid subject to GF
794 794
 			$subject = empty( $subject ) ? self::strings( 'default-email-subject' ) : $subject;
795
-			$message = $email_data['gv-note-content'];
795
+			$message = $email_data[ 'gv-note-content' ];
796 796
 			$email_footer = self::strings( 'email-footer' );
797
-			$from_name     = $current_user->display_name;
797
+			$from_name = $current_user->display_name;
798 798
 			$message_format = 'html';
799 799
 
800 800
 			/**
@@ -825,7 +825,7 @@  discard block
 block discarded – undo
825 825
 
826 826
 			GVCommon::send_email( $from, $to, $bcc, $reply_to, $subject, $message, $from_name, $message_format, '', $entry, false );
827 827
 
828
-			$form  = isset( $entry['form_id'] ) ? GFAPI::get_form( $entry['form_id'] ) : array();
828
+			$form = isset( $entry[ 'form_id' ] ) ? GFAPI::get_form( $entry[ 'form_id' ] ) : array();
829 829
 
830 830
 			/**
831 831
 			 * @see https://www.gravityhelp.com/documentation/article/10146-2/ It's here for compatibility with Gravity Forms
@@ -851,7 +851,7 @@  discard block
 block discarded – undo
851 851
 
852 852
 	    $output = '';
853 853
 
854
-		if( ! empty( $email_footer ) ) {
854
+		if ( ! empty( $email_footer ) ) {
855 855
 		    $url = \GV\Utils::get( $email_data, 'current-url' );
856 856
 			$url = html_entity_decode( $url );
857 857
 			$url = site_url( $url );
Please login to merge, or discard this patch.
future/includes/class-gv-template-view-table.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -77,22 +77,22 @@
 block discarded – undo
77 77
 			'dir' => 'asc',
78 78
 		);
79 79
 
80
-		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
80
+		if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) {
81 81
 			//toggle sorting direction.
82
-			if ( 'asc' === $sorting['direction'] ) {
83
-				$sort_args['dir'] = 'desc';
82
+			if ( 'asc' === $sorting[ 'direction' ] ) {
83
+				$sort_args[ 'dir' ] = 'desc';
84 84
 				$class .= ' gv-icon-sort-desc';
85 85
 			} else {
86
-				$sort_args['dir'] = 'asc';
86
+				$sort_args[ 'dir' ] = 'asc';
87 87
 				$class .= ' gv-icon-sort-asc';
88 88
 			}
89 89
 		} else {
90 90
 			$class .= ' gv-icon-caret-up-down';
91 91
 		}
92 92
 
93
-		$url = add_query_arg( $sort_args, remove_query_arg( array('pagenum') ) );
93
+		$url = add_query_arg( $sort_args, remove_query_arg( array( 'pagenum' ) ) );
94 94
 
95
-		return '<a href="'. esc_url_raw( $url ) .'" class="'. $class .'" ></a>&nbsp;'. $column_label;
95
+		return '<a href="' . esc_url_raw( $url ) . '" class="' . $class . '" ></a>&nbsp;' . $column_label;
96 96
 	}
97 97
 
98 98
 	/**
Please login to merge, or discard this patch.
future/_mocks.php 1 patch
Spacing   +43 added lines, -46 removed lines patch added patch discarded remove patch
@@ -101,8 +101,7 @@  discard block
 block discarded – undo
101 101
 			$entries = $view->get_entries( gravityview()->request );
102 102
 		}
103 103
 
104
-		$page = \GV\Utils::get( $parameters['paging'], 'current_page' ) ?
105
-			: ( ( ( $parameters['paging']['offset'] - $view->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 );
104
+		$page = \GV\Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $view->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 );
106 105
 
107 106
 		/** Set paging, count and unwrap the entries. */
108 107
 		$paging = array(
@@ -141,16 +140,16 @@  discard block
 block discarded – undo
141 140
  * @return null|string The value of a field in an entry.
142 141
  */
143 142
 function GravityView_API_field_value( $entry, $field_settings, $format ) {
144
-	if ( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) {
143
+	if ( empty( $entry[ 'form_id' ] ) || empty( $field_settings[ 'id' ] ) ) {
145 144
 		gravityview()->log->error( 'No entry or field_settings[id] supplied', array( 'data' => array( func_get_args() ) ) );
146 145
 		return null;
147 146
 	}
148 147
 
149
-	if ( ! empty( $entry['_multi'] ) && ! empty( $field_settings['form_id'] ) && ! empty( $entry['_multi'][ $field_settings['form_id'] ] ) ) {
150
-		$entry = $entry['_multi'][ $field_settings['form_id'] ];
148
+	if ( ! empty( $entry[ '_multi' ] ) && ! empty( $field_settings[ 'form_id' ] ) && ! empty( $entry[ '_multi' ][ $field_settings[ 'form_id' ] ] ) ) {
149
+		$entry = $entry[ '_multi' ][ $field_settings[ 'form_id' ] ];
151 150
 	}
152 151
 
153
-	if ( empty( $entry['id'] ) || ! $entry = \GV\GF_Entry::by_id( $entry['id'] ) ) {
152
+	if ( empty( $entry[ 'id' ] ) || ! $entry = \GV\GF_Entry::by_id( $entry[ 'id' ] ) ) {
154 153
 		gravityview()->log->error( 'Invalid \GV\GF_Entry supplied', array( 'data' => $entry ) );
155 154
 		return null;
156 155
 	}
@@ -160,18 +159,18 @@  discard block
 block discarded – undo
160 159
 	 *
161 160
 	 * Fields with a numeric ID are Gravity Forms ones.
162 161
 	 */
163
-	$source = is_numeric( $field_settings['id'] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL;;
162
+	$source = is_numeric( $field_settings[ 'id' ] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL; ;
164 163
 
165 164
 	/** Initialize the future field. */
166 165
 	switch ( $source ):
167 166
 		/** The Gravity Forms backend. */
168 167
 		case \GV\Source::BACKEND_GRAVITYFORMS:
169
-			if ( ! $form = \GV\GF_Form::by_id( $entry['form_id'] ) ) {
168
+			if ( ! $form = \GV\GF_Form::by_id( $entry[ 'form_id' ] ) ) {
170 169
 				gravityview()->log->error( 'No form Gravity Form found for entry', array( 'data' => $entry ) );
171 170
 				return null;
172 171
 			}
173 172
 
174
-			if ( ! $field = $form::get_field( $form, $field_settings['id'] ) ) {
173
+			if ( ! $field = $form::get_field( $form, $field_settings[ 'id' ] ) ) {
175 174
 				return null;
176 175
 			}
177 176
 
@@ -179,7 +178,7 @@  discard block
 block discarded – undo
179 178
 
180 179
 		/** Our internal backend. */
181 180
 		case \GV\Source::BACKEND_INTERNAL:
182
-			if ( ! $field = \GV\Internal_Source::get_field( $field_settings['id'] ) ) {
181
+			if ( ! $field = \GV\Internal_Source::get_field( $field_settings[ 'id' ] ) ) {
183 182
 				return null;
184 183
 			}
185 184
 
@@ -213,13 +212,13 @@  discard block
 block discarded – undo
213 212
 
214 213
 	/** A bail condition. */
215 214
 	$bail = function( $label, $field_settings, $entry, $force_show_label, $form ) {
216
-		if ( ! empty( $field_settings['show_label'] ) || $force_show_label ) {
215
+		if ( ! empty( $field_settings[ 'show_label' ] ) || $force_show_label ) {
217 216
 
218
-			$label = isset( $field_settings['label'] ) ? $field_settings['label'] : '';
217
+			$label = isset( $field_settings[ 'label' ] ) ? $field_settings[ 'label' ] : '';
219 218
 
220 219
 			// Use Gravity Forms label by default, but if a custom label is defined in GV, use it.
221
-			if ( ! empty( $field_settings['custom_label'] ) ) {
222
-				$label = \GravityView_API::replace_variables( $field_settings['custom_label'], $form, $entry );
220
+			if ( ! empty( $field_settings[ 'custom_label' ] ) ) {
221
+				$label = \GravityView_API::replace_variables( $field_settings[ 'custom_label' ], $form, $entry );
223 222
 			}
224 223
 
225 224
 			/**
@@ -245,19 +244,19 @@  discard block
 block discarded – undo
245 244
 
246 245
 	$label = '';
247 246
 
248
-	if ( ! empty( $entry['_multi'] ) && ! empty( $field_settings['form_id'] ) && ! empty( $entry['_multi'][ $field_settings['form_id'] ] ) ) {
249
-		$entry = $entry['_multi'][ $field_settings['form_id'] ];
250
-		if ( $_form = \GV\GF_Form::by_id( $field_settings['form_id'] ) ) {
247
+	if ( ! empty( $entry[ '_multi' ] ) && ! empty( $field_settings[ 'form_id' ] ) && ! empty( $entry[ '_multi' ][ $field_settings[ 'form_id' ] ] ) ) {
248
+		$entry = $entry[ '_multi' ][ $field_settings[ 'form_id' ] ];
249
+		if ( $_form = \GV\GF_Form::by_id( $field_settings[ 'form_id' ] ) ) {
251 250
 			$form = $_form->form;
252 251
 		}
253 252
 	}
254 253
 
255
-	if ( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) {
254
+	if ( empty( $entry[ 'form_id' ] ) || empty( $field_settings[ 'id' ] ) ) {
256 255
 		gravityview()->log->error( 'No entry or field_settings[id] supplied', array( 'data' => array( func_get_args() ) ) );
257 256
 		return $bail( $label, $field_settings, $entry, $force_show_label, $form );
258 257
 	}
259 258
 
260
-	if ( empty( $entry['id'] ) || ! $gv_entry = \GV\GF_Entry::by_id( $entry['id'] ) ) {
259
+	if ( empty( $entry[ 'id' ] ) || ! $gv_entry = \GV\GF_Entry::by_id( $entry[ 'id' ] ) ) {
261 260
 		gravityview()->log->error( 'Invalid \GV\GF_Entry supplied', array( 'data' => $entry ) );
262 261
 		return $bail( $label, $field_settings, $entry, $force_show_label, $form );
263 262
 	}
@@ -269,31 +268,31 @@  discard block
 block discarded – undo
269 268
 	 *
270 269
 	 * Fields with a numeric ID are Gravity Forms ones.
271 270
 	 */
272
-	$source = is_numeric( $field_settings['id'] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL;
271
+	$source = is_numeric( $field_settings[ 'id' ] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL;
273 272
 
274 273
 	/** Initialize the future field. */
275 274
 	switch ( $source ):
276 275
 		/** The Gravity Forms backend. */
277 276
 		case \GV\Source::BACKEND_GRAVITYFORMS:
278
-			if ( ! $gf_form = \GV\GF_Form::by_id( $entry['form_id'] ) ) {
277
+			if ( ! $gf_form = \GV\GF_Form::by_id( $entry[ 'form_id' ] ) ) {
279 278
 				gravityview()->log->error( 'No form Gravity Form found for entry', array( 'data' => $entry ) );
280 279
 				return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $form );
281 280
 			}
282 281
 
283
-			if ( ! $field = $gf_form::get_field( $gf_form, $field_settings['id'] ) ) {
284
-				gravityview()->log->error( 'No field found for specified form and field ID #{field_id}', array( 'field_id' => $field_settings['id'], 'data' => $form ) );
282
+			if ( ! $field = $gf_form::get_field( $gf_form, $field_settings[ 'id' ] ) ) {
283
+				gravityview()->log->error( 'No field found for specified form and field ID #{field_id}', array( 'field_id' => $field_settings[ 'id' ], 'data' => $form ) );
285 284
 				return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $gf_form->form );
286 285
 			}
287
-			if ( empty( $field_settings['show_label'] ) ) {
286
+			if ( empty( $field_settings[ 'show_label' ] ) ) {
288 287
 				/** The label never wins... */
289
-				$field_settings['label'] = '';
288
+				$field_settings[ 'label' ] = '';
290 289
 			}
291 290
 
292 291
 			break;
293 292
 
294 293
 		/** Our internal backend. */
295 294
 		case \GV\Source::BACKEND_INTERNAL:
296
-			if ( ! $field = \GV\Internal_Source::get_field( $field_settings['id'] ) ) {
295
+			if ( ! $field = \GV\Internal_Source::get_field( $field_settings[ 'id' ] ) ) {
297 296
 				return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $form );
298 297
 			}
299 298
 			break;
@@ -305,8 +304,8 @@  discard block
 block discarded – undo
305 304
 			break;
306 305
 	endswitch;
307 306
 
308
-	if( $force_show_label ) {
309
-		$field_settings['show_label'] = '1';
307
+	if ( $force_show_label ) {
308
+		$field_settings[ 'show_label' ] = '1';
310 309
 	}
311 310
 
312 311
 	/** Add the field settings. */
@@ -440,7 +439,7 @@  discard block
 block discarded – undo
440 439
 			'\GravityView_frontend::entry' => \GravityView_frontend::getInstance()->getEntry(),
441 440
 			'\GravityView_View::_current_entry' => \GravityView_View::getInstance()->getCurrentEntry(),
442 441
 			'\GravityView_View::fields' => \GravityView_View::getInstance()->getFields(),
443
-			'wp_actions[loop_start]' => empty( $wp_actions['loop_start'] ) ? 0 : $wp_actions['loop_start'],
442
+			'wp_actions[loop_start]' => empty( $wp_actions[ 'loop_start' ] ) ? 0 : $wp_actions[ 'loop_start' ],
444 443
 			'wp_query::in_the_loop' => $wp_query->in_the_loop,
445 444
 		);
446 445
 	}
@@ -522,7 +521,7 @@  discard block
 block discarded – undo
522 521
 					break;
523 522
 				case 'wp_actions[loop_start]':
524 523
 					global $wp_actions;
525
-					$wp_actions['loop_start'] = $value;
524
+					$wp_actions[ 'loop_start' ] = $value;
526 525
 					break;
527 526
 				case 'wp_query::in_the_loop':
528 527
 					global $wp_query;
@@ -600,9 +599,7 @@  discard block
 block discarded – undo
600 599
 				case 'request':
601 600
 					self::thaw( array(
602 601
 						'\GravityView_View::context' => (
603
-							$value->is_entry() ? 'single' :
604
-								( $value->is_edit_entry() ? 'edit' :
605
-									( $value->is_view() ? 'directory': null )
602
+							$value->is_entry() ? 'single' : ( $value->is_edit_entry() ? 'edit' : ( $value->is_view() ? 'directory' : null )
606 603
 								)
607 604
 						),
608 605
 						'\GravityView_frontend::is_search' => $value->is_search(),
@@ -656,14 +653,14 @@  discard block
 block discarded – undo
656 653
 		global $wp_query, $wp_actions;
657 654
 
658 655
 		$wp_query->in_the_loop = false;
659
-		$wp_actions['loop_start'] = 0;
656
+		$wp_actions[ 'loop_start' ] = 0;
660 657
 	}
661 658
 }
662 659
 
663 660
 
664 661
 /** Add some global fix for field capability discrepancies. */
665 662
 add_filter( 'gravityview/configuration/fields', function( $fields ) {
666
-	if ( empty( $fields  ) ) {
663
+	if ( empty( $fields ) ) {
667 664
 		return $fields;
668 665
 	}
669 666
 
@@ -690,11 +687,11 @@  discard block
 block discarded – undo
690 687
 		}
691 688
 
692 689
 		foreach ( $_fields as $uid => &$_field ) {
693
-			if ( ! isset( $_field['only_loggedin'] ) ) {
690
+			if ( ! isset( $_field[ 'only_loggedin' ] ) ) {
694 691
 				continue;
695 692
 			}
696 693
 			/** If we do not require login, we don't require a cap. */
697
-			$_field['only_loggedin'] != '1' && ( $_field['only_loggedin_cap'] = '' );
694
+			$_field[ 'only_loggedin' ] != '1' && ( $_field[ 'only_loggedin_cap' ] = '' );
698 695
 		}
699 696
 	}
700 697
 	return $fields;
@@ -725,8 +722,8 @@  discard block
 block discarded – undo
725 722
 		}
726 723
 
727 724
 		foreach ( $_fields as $uid => &$_field ) {
728
-			if ( ! empty( $_field['id'] ) && is_numeric( $_field['id'] ) && empty( $_field['form_id'] ) ) {
729
-				$_field['form_id'] = $view->form->ID;
725
+			if ( ! empty( $_field[ 'id' ] ) && is_numeric( $_field[ 'id' ] ) && empty( $_field[ 'form_id' ] ) ) {
726
+				$_field[ 'form_id' ] = $view->form->ID;
730 727
 			}
731 728
 		}
732 729
 	}
@@ -740,25 +737,25 @@  discard block
 block discarded – undo
740 737
 	if ( class_exists( '\GravityView_frontend' ) ) {
741 738
 		global $wp_filter;
742 739
 
743
-		if ( empty( $wp_filter['gravityview_after'] ) ) {
740
+		if ( empty( $wp_filter[ 'gravityview_after' ] ) ) {
744 741
 			return;
745 742
 		}
746 743
 
747 744
 		/** WordPress 4.6 and lower compatibility, when WP_Hook classes were still absent. */
748
-		if ( is_array( $wp_filter['gravityview_after'] ) ) {
749
-			if ( ! empty( $wp_filter['gravityview_after'][10] ) ) {
750
-				foreach ( $wp_filter['gravityview_after'][10] as $function_key => $callback ) {
745
+		if ( is_array( $wp_filter[ 'gravityview_after' ] ) ) {
746
+			if ( ! empty( $wp_filter[ 'gravityview_after' ][ 10 ] ) ) {
747
+				foreach ( $wp_filter[ 'gravityview_after' ][ 10 ] as $function_key => $callback ) {
751 748
 					if ( strpos( $function_key, 'context_not_configured_warning' ) ) {
752
-						unset( $wp_filter['gravityview_after'][10][ $function_key ] );
749
+						unset( $wp_filter[ 'gravityview_after' ][ 10 ][ $function_key ] );
753 750
 					}
754 751
 				}
755 752
 			}
756 753
 			return;
757 754
 		}
758 755
 
759
-		foreach ( $wp_filter['gravityview_after']->callbacks[10] as $function_key => $callback ) {
756
+		foreach ( $wp_filter[ 'gravityview_after' ]->callbacks[ 10 ] as $function_key => $callback ) {
760 757
 			if ( strpos( $function_key, 'context_not_configured_warning' ) ) {
761
-				unset( $wp_filter['gravityview_after']->callbacks[10][ $function_key ] );
758
+				unset( $wp_filter[ 'gravityview_after' ]->callbacks[ 10 ][ $function_key ] );
762 759
 			}
763 760
 		}
764 761
 	}
Please login to merge, or discard this patch.
future/lib/class-gamajo-template-loader.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 		 *
86 86
 		 * @var array
87 87
 		 */
88
-		private $template_data_var_names = array('data');
88
+		private $template_data_var_names = array( 'data' );
89 89
 
90 90
 		/**
91 91
 		 * Clean up template data.
@@ -138,11 +138,11 @@  discard block
 block discarded – undo
138 138
 		public function set_template_data( $data, $var_name = 'data' ) {
139 139
 			global $wp_query;
140 140
 
141
-			$wp_query->query_vars[ $var_name ] = (object) $data;
141
+			$wp_query->query_vars[ $var_name ] = (object)$data;
142 142
 
143 143
 			// Add $var_name to custom variable store if not default value
144
-			if( $var_name !== 'data' ) {
145
-				$this->template_data_var_names[] = $var_name;
144
+			if ( $var_name !== 'data' ) {
145
+				$this->template_data_var_names[ ] = $var_name;
146 146
 			}
147 147
 
148 148
 			return $this;
@@ -165,8 +165,8 @@  discard block
 block discarded – undo
165 165
 
166 166
 			// Remove each custom data reference from $wp_query
167 167
 			foreach ( $custom_var_names as $var ) {
168
-				if ( isset( $wp_query->query_vars[$var] ) ) {
169
-					unset( $wp_query->query_vars[$var] );
168
+				if ( isset( $wp_query->query_vars[ $var ] ) ) {
169
+					unset( $wp_query->query_vars[ $var ] );
170 170
 				}
171 171
 			}
172 172
 
@@ -186,9 +186,9 @@  discard block
 block discarded – undo
186 186
 		protected function get_template_file_names( $slug, $name ) {
187 187
 			$templates = array();
188 188
 			if ( isset( $name ) ) {
189
-				$templates[] = $slug . '-' . $name . '.php';
189
+				$templates[ ] = $slug . '-' . $name . '.php';
190 190
 			}
191
-			$templates[] = $slug . '.php';
191
+			$templates[ ] = $slug . '.php';
192 192
 
193 193
 			/**
194 194
 			 * Allow template choices to be filtered.
@@ -224,18 +224,18 @@  discard block
 block discarded – undo
224 224
 		public function locate_template( $template_names, $load = false, $require_once = true ) {
225 225
 
226 226
 			// Use $template_names as a cache key - either first element of array or the variable itself if it's a string
227
-			$cache_key = is_array( $template_names ) ? $template_names[0] : $template_names;
227
+			$cache_key = is_array( $template_names ) ? $template_names[ 0 ] : $template_names;
228 228
 
229 229
 			// If the key is in the cache array, we've already located this file.
230
-			if ( isset( $this->template_path_cache[$cache_key] ) ) {
231
-				$located = $this->template_path_cache[$cache_key];
230
+			if ( isset( $this->template_path_cache[ $cache_key ] ) ) {
231
+				$located = $this->template_path_cache[ $cache_key ];
232 232
 			} else {
233 233
 
234 234
 				// No file found yet.
235 235
 				$located = false;
236 236
 
237 237
 				// Remove empty entries.
238
-				$template_names = array_filter( (array) $template_names );
238
+				$template_names = array_filter( (array)$template_names );
239 239
 				$template_paths = $this->get_template_paths();
240 240
 
241 241
 				// Try to find a template file.
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
 						if ( file_exists( $template_path . $template_name ) ) {
249 249
 							$located = $template_path . $template_name;
250 250
 							// Store the template path in the cache
251
-							$this->template_path_cache[$cache_key] = $located;
251
+							$this->template_path_cache[ $cache_key ] = $located;
252 252
 							break 2;
253 253
 						}
254 254
 					}
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
 
284 284
 			// Only add this conditionally, so non-child themes don't redundantly check active theme twice.
285 285
 			if ( get_stylesheet_directory() !== get_template_directory() ) {
286
-				$file_paths[1] = trailingslashit( get_stylesheet_directory() ) . $theme_directory;
286
+				$file_paths[ 1 ] = trailingslashit( get_stylesheet_directory() ) . $theme_directory;
287 287
 			}
288 288
 
289 289
 			/**
Please login to merge, or discard this patch.
future/includes/class-gv-template-field.php 1 patch
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -86,13 +86,13 @@  discard block
 block discarded – undo
86 86
 		$this->request = $request;
87 87
 
88 88
 		/** Add granular overrides. */
89
-		add_filter( $this->filter_prefix . '_get_template_part', $this->_add_id_specific_templates_callback  = self::add_id_specific_templates( $this ), 10, 3 );
89
+		add_filter( $this->filter_prefix . '_get_template_part', $this->_add_id_specific_templates_callback = self::add_id_specific_templates( $this ), 10, 3 );
90 90
 
91 91
 		parent::__construct();
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,59 +175,59 @@  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
-			$specifics []= sprintf( '%sfield-%s.php', $slug_dir, $slug_name );
230
-			$specifics []= sprintf( '%sfield.php', $slug_dir );
229
+			$specifics [ ] = sprintf( '%sfield-%s.php', $slug_dir, $slug_name );
230
+			$specifics [ ] = sprintf( '%sfield.php', $slug_dir );
231 231
 
232 232
 
233 233
 			return array_merge( $specifics, $templates );
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
 			/** Prevent any PHP warnings that may be generated. */
255 255
 			ob_start();
256 256
 
257
-			$display_value = \GFCommon::get_lead_field_display( $this->field->field, $value, $this->entry['currency'], false, 'html' );
257
+			$display_value = \GFCommon::get_lead_field_display( $this->field->field, $value, $this->entry[ 'currency' ], false, 'html' );
258 258
 
259 259
 			if ( $errors = ob_get_clean() ) {
260 260
 				gravityview()->log->error( 'Errors when calling GFCommon::get_lead_field_display()', array( 'data' => $errors ) );
Please login to merge, or discard this patch.