Completed
Pull Request — develop (#1487)
by Zack
14:14 queued 02:44
created
includes/fields/class-gravityview-field-created-by.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -37,23 +37,23 @@  discard block
 block discarded – undo
37 37
 
38 38
 		$merge_tags = array(
39 39
 			array(
40
-				'label' => __('Entry Creator: Display Name', 'gravityview'),
40
+				'label' => __( 'Entry Creator: Display Name', 'gravityview' ),
41 41
 				'tag' => '{created_by:display_name}'
42 42
 			),
43 43
 			array(
44
-				'label' => __('Entry Creator: Email', 'gravityview'),
44
+				'label' => __( 'Entry Creator: Email', 'gravityview' ),
45 45
 				'tag' => '{created_by:user_email}'
46 46
 			),
47 47
 			array(
48
-				'label' => __('Entry Creator: Username', 'gravityview'),
48
+				'label' => __( 'Entry Creator: Username', 'gravityview' ),
49 49
 				'tag' => '{created_by:user_login}'
50 50
 			),
51 51
 			array(
52
-				'label' => __('Entry Creator: User ID', 'gravityview'),
52
+				'label' => __( 'Entry Creator: User ID', 'gravityview' ),
53 53
 				'tag' => '{created_by:ID}'
54 54
 			),
55 55
 			array(
56
-				'label' => __('Entry Creator: Roles', 'gravityview'),
56
+				'label' => __( 'Entry Creator: Roles', 'gravityview' ),
57 57
 				'tag' => '{created_by:roles}'
58 58
 			),
59 59
 		);
@@ -81,19 +81,19 @@  discard block
 block discarded – undo
81 81
 	public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) {
82 82
 
83 83
 		// If there are no matches OR the Entry `created_by` isn't set or is 0 (no user)
84
-		if( empty( $matches ) || empty( $entry['created_by'] ) ) {
84
+		if ( empty( $matches ) || empty( $entry[ 'created_by' ] ) ) {
85 85
 			return $text;
86 86
 		}
87 87
 
88 88
 		// Get the creator of the entry
89
-		$entry_creator = new WP_User( $entry['created_by'] );
89
+		$entry_creator = new WP_User( $entry[ 'created_by' ] );
90 90
 
91 91
 		foreach ( $matches as $match ) {
92 92
 
93
-			$full_tag = $match[0];
94
-			$property = $match[1];
93
+			$full_tag = $match[ 0 ];
94
+			$property = $match[ 1 ];
95 95
 
96
-			switch( $property ) {
96
+			switch ( $property ) {
97 97
 				case '':
98 98
 					$value = $entry_creator->ID;
99 99
 					break;
@@ -119,11 +119,11 @@  discard block
 block discarded – undo
119 119
 
120 120
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
121 121
 
122
-		if( 'edit' === $context ) {
122
+		if ( 'edit' === $context ) {
123 123
 			return $field_options;
124 124
 		}
125 125
 
126
-		$field_options['name_display'] = array(
126
+		$field_options[ 'name_display' ] = array(
127 127
 			'type' => 'select',
128 128
 			'label' => __( 'User Format', 'gravityview' ),
129 129
 			'desc' => __( 'How should the User information be displayed?', 'gravityview' ),
Please login to merge, or discard this patch.
includes/fields/class-gravityview-field-date-updated.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -47,11 +47,11 @@  discard block
 block discarded – undo
47 47
 	 */
48 48
 	public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) {
49 49
 
50
-		if( 'edit' === $context ) {
50
+		if ( 'edit' === $context ) {
51 51
 			return $field_options;
52 52
 		}
53 53
 
54
-		$this->add_field_support('date_display', $field_options );
54
+		$this->add_field_support( 'date_display', $field_options );
55 55
 
56 56
 		return $field_options;
57 57
 	}
@@ -71,11 +71,11 @@  discard block
 block discarded – undo
71 71
 	public function get_content( $output = '', $entry = array(), $field_settings = array(), $field = array() ) {
72 72
 
73 73
 		/** Overridden by a template. */
74
-		if( \GV\Utils::get( $field, 'field_path' ) !== gravityview()->plugin->dir( 'templates/fields/field-html.php' ) ) {
74
+		if ( \GV\Utils::get( $field, 'field_path' ) !== gravityview()->plugin->dir( 'templates/fields/field-html.php' ) ) {
75 75
 			return $output;
76 76
 		}
77 77
 
78
-		return GVCommon::format_date( $field['value'], 'format=' . \GV\Utils::get( $field_settings, 'date_display' ) );
78
+		return GVCommon::format_date( $field[ 'value' ], 'format=' . \GV\Utils::get( $field_settings, 'date_display' ) );
79 79
 	}
80 80
 }
81 81
 
Please login to merge, or discard this patch.
future/includes/class-gv-settings-addon.php 1 patch
Spacing   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 	 * @return array
103 103
 	 */
104 104
 	public function modify_app_settings_menu_title( $setting_tabs ) {
105
-		$setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview' );
105
+		$setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' );
106 106
 		return $setting_tabs;
107 107
 	}
108 108
 
@@ -308,15 +308,15 @@  discard block
 block discarded – undo
308 308
             </ul>
309 309
             <div class="gv-followup widefat">
310 310
                 <p><strong><label for="gv-reason-details"><?php esc_html_e( 'Comments', 'gravityview' ); ?></label></strong></p>
311
-                <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>
311
+                <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>
312 312
             </div>
313 313
             <div class="scale-description">
314 314
                 <p><strong><?php esc_html_e( 'How likely are you to recommend GravityView?', 'gravityview' ); ?></strong></p>
315 315
                 <ul class="inline">
316 316
 					<?php
317 317
 					$i = 0;
318
-					while( $i < 11 ) {
319
-						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_'.$i.'" value="'.$i.'" type="radio"> '.$i.'</label></li>';
318
+					while ( $i < 11 ) {
319
+						echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_' . $i . '" value="' . $i . '" type="radio"> ' . $i . '</label></li>';
320 320
 						$i++;
321 321
 					}
322 322
 					?>
@@ -549,15 +549,15 @@  discard block
 block discarded – undo
549 549
 	 * @return string The HTML
550 550
 	 */
551 551
 	public function as_html( $field, $echo = true ) {
552
-		$field['type']  = ( isset( $field['type'] ) && in_array( $field['type'], array( 'submit','reset','button' ) ) ) ? $field['type'] : 'submit';
552
+		$field[ 'type' ] = ( isset( $field[ 'type' ] ) && in_array( $field[ 'type' ], array( 'submit', 'reset', 'button' ) ) ) ? $field[ 'type' ] : 'submit';
553 553
 
554 554
 		$attributes    = $this->get_field_attributes( $field );
555 555
 		$default_value = Utils::get( $field, 'value', Utils::get( $field, 'default_value' ) );
556
-		$value         = $this->get( $field['name'], $default_value );
556
+		$value         = $this->get( $field[ 'name' ], $default_value );
557 557
 
558 558
 
559
-		$attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary gfbutton';
560
-		$name    = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_' . $field['name'];
559
+		$attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary gfbutton';
560
+		$name = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ];
561 561
 
562 562
 		if ( empty( $value ) ) {
563 563
 			$value = __( 'Update Settings', 'gravityview' );
@@ -566,7 +566,7 @@  discard block
 block discarded – undo
566 566
 		$attributes = $this->get_field_attributes( $field );
567 567
 
568 568
 		$html = '<input
569
-                    type="' . $field['type'] . '"
569
+                    type="' . $field[ 'type' ] . '"
570 570
                     name="' . esc_attr( $name ) . '"
571 571
                     value="' . $value . '" ' .
572 572
 		        implode( ' ', $attributes ) .
@@ -597,7 +597,7 @@  discard block
 block discarded – undo
597 597
 	 * @return bool
598 598
 	 */
599 599
 	public function is_save_postback() {
600
-		return isset( $_POST['gform-settings-save'] ) && isset( $_POST['_gravityview_save_settings_nonce'] );
600
+		return isset( $_POST[ 'gform-settings-save' ] ) && isset( $_POST[ '_gravityview_save_settings_nonce' ] );
601 601
 	}
602 602
 
603 603
 	/**
@@ -607,7 +607,7 @@  discard block
 block discarded – undo
607 607
 	 */
608 608
 	public function license_key_notice() {
609 609
 
610
-	    if( $this->is_save_postback() ) {
610
+	    if ( $this->is_save_postback() ) {
611 611
 		    $settings = $this->get_posted_settings();
612 612
 		    $license_key = defined( 'GRAVITYVIEW_LICENSE_KEY' ) ? GRAVITYVIEW_LICENSE_KEY : \GV\Utils::get( $settings, 'license_key' );
613 613
 		    $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' );
@@ -628,7 +628,7 @@  discard block
 block discarded – undo
628 628
 		 * but didn't want to mess up the translation strings for the translators.
629 629
 		 */
630 630
 		$message = mb_substr( $message, 0, mb_strlen( $message ) - 1 );
631
-		$title = __( 'Inactive License', 'gravityview');
631
+		$title = __( 'Inactive License', 'gravityview' );
632 632
 		$status = '';
633 633
 		$update_below = false;
634 634
 		$primary_button_link = admin_url( 'edit.php?post_type=gravityview&amp;page=gravityview_settings' );
@@ -658,7 +658,7 @@  discard block
 block discarded – undo
658 658
 				$update_below = __( 'Activate your license key below.', 'gravityview' );
659 659
 				break;
660 660
 		}
661
-		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content='.$license_status.'&utm_campaign=Admin%20Notice';
661
+		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content=' . $license_status . '&utm_campaign=Admin%20Notice';
662 662
 
663 663
 		// Show a different notice on settings page for inactive licenses (hide the buttons)
664 664
 		if ( $update_below && gravityview()->request->is_admin( '', 'settings' ) ) {
@@ -702,7 +702,7 @@  discard block
 block discarded – undo
702 702
 	public function scripts() {
703 703
 		$scripts = parent::scripts();
704 704
 
705
-		$scripts[] = array(
705
+		$scripts[ ] = array(
706 706
 			'handle'  => 'gform_tooltip_init',
707 707
 			'enqueue' => array(
708 708
                 array(
@@ -721,7 +721,7 @@  discard block
 block discarded – undo
721 721
 	public function styles() {
722 722
 		$styles = parent::styles();
723 723
 
724
-		$styles[] = array(
724
+		$styles[ ] = array(
725 725
 			'handle'  => 'gravityview_settings',
726 726
 			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
727 727
 			'version' => Plugin::$version,
@@ -810,26 +810,26 @@  discard block
 block discarded – undo
810 810
 				'label' => __( 'License Key', 'gravityview' ),
811 811
 				'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' ) ),
812 812
 				'type' => 'edd_license',
813
-				'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' )  && GRAVITYVIEW_LICENSE_KEY ),
813
+				'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ),
814 814
 				'data-pending-text' => __( 'Verifying license&hellip;', 'gravityview' ),
815
-				'default_value' => $default_settings['license_key'],
815
+				'default_value' => $default_settings[ 'license_key' ],
816 816
 				'class' => ( '' == $this->get( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
817 817
 			),
818 818
 			array(
819 819
 				'name' => 'license_key_response',
820
-				'default_value' => $default_settings['license_key_response'],
820
+				'default_value' => $default_settings[ 'license_key_response' ],
821 821
 				'type' => 'hidden',
822 822
 			),
823 823
 			array(
824 824
 				'name' => 'license_key_status',
825
-				'default_value' => $default_settings['license_key_status'],
825
+				'default_value' => $default_settings[ 'license_key_status' ],
826 826
 				'type' => 'hidden',
827 827
 			),
828 828
 			array(
829 829
 				'name' => 'support-email',
830 830
 				'type' => 'text',
831 831
 				'validate' => 'email',
832
-				'default_value' => $default_settings['support-email'],
832
+				'default_value' => $default_settings[ 'support-email' ],
833 833
 				'label' => __( 'Support Email', 'gravityview' ),
834 834
 				'description' => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ),
835 835
 				'class' => 'code regular-text',
@@ -841,7 +841,7 @@  discard block
 block discarded – undo
841 841
 				'name' => 'support_port',
842 842
 				'type' => 'radio',
843 843
 				'label' => __( 'Show Support Port?', 'gravityview' ),
844
-				'default_value' => $default_settings['support_port'],
844
+				'default_value' => $default_settings[ 'support_port' ],
845 845
 				'horizontal' => 1,
846 846
 				'choices' => array(
847 847
 					array(
@@ -860,7 +860,7 @@  discard block
 block discarded – undo
860 860
 				'name' => 'no-conflict-mode',
861 861
 				'type' => 'radio',
862 862
 				'label' => __( 'No-Conflict Mode', 'gravityview' ),
863
-				'default_value' => $default_settings['no-conflict-mode'],
863
+				'default_value' => $default_settings[ 'no-conflict-mode' ],
864 864
 				'horizontal' => 1,
865 865
 				'choices' => array(
866 866
 					array(
@@ -882,7 +882,7 @@  discard block
 block discarded – undo
882 882
 					'name' => 'rest_api',
883 883
 					'type' => 'radio',
884 884
 					'label' => __( 'REST API', 'gravityview' ),
885
-					'default_value' => $default_settings['rest_api'],
885
+					'default_value' => $default_settings[ 'rest_api' ],
886 886
 					'horizontal' => 1,
887 887
 					'choices' => array(
888 888
 						array(
@@ -901,7 +901,7 @@  discard block
 block discarded – undo
901 901
 				'name' => 'beta',
902 902
 				'type' => 'checkbox',
903 903
 				'label' => __( 'Become a Beta Tester', 'gravityview' ),
904
-				'default_value' => $default_settings['beta'],
904
+				'default_value' => $default_settings[ 'beta' ],
905 905
 				'horizontal' => 1,
906 906
 				'choices' => array(
907 907
 					array(
@@ -934,17 +934,17 @@  discard block
 block discarded – undo
934 934
 		 * @since 1.7.4
935 935
 		 */
936 936
 		foreach ( $fields as &$field ) {
937
-			$field['name']          = isset( $field['name'] ) ? $field['name'] : Utils::get( $field, 'id' );
938
-			$field['label']         = isset( $field['label'] ) ? $field['label'] : Utils::get( $field, 'title' );
939
-			$field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : Utils::get( $field, 'default' );
940
-			$field['description']   = isset( $field['description'] ) ? $field['description'] : Utils::get( $field, 'subtitle' );
937
+			$field[ 'name' ]          = isset( $field[ 'name' ] ) ? $field[ 'name' ] : Utils::get( $field, 'id' );
938
+			$field[ 'label' ]         = isset( $field[ 'label' ] ) ? $field[ 'label' ] : Utils::get( $field, 'title' );
939
+			$field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : Utils::get( $field, 'default' );
940
+			$field[ 'description' ]   = isset( $field[ 'description' ] ) ? $field[ 'description' ] : Utils::get( $field, 'subtitle' );
941 941
 
942 942
 			if ( $disabled_attribute ) {
943
-				$field['disabled']  = $disabled_attribute;
943
+				$field[ 'disabled' ] = $disabled_attribute;
944 944
 			}
945 945
 
946
-			if ( empty( $field['disabled'] ) ) {
947
-				unset( $field['disabled'] );
946
+			if ( empty( $field[ 'disabled' ] ) ) {
947
+				unset( $field[ 'disabled' ] );
948 948
             }
949 949
 		}
950 950
 
@@ -962,7 +962,7 @@  discard block
 block discarded – undo
962 962
         );
963 963
 
964 964
 		if ( $disabled_attribute ) {
965
-			$button['disabled'] = $disabled_attribute;
965
+			$button[ 'disabled' ] = $disabled_attribute;
966 966
 		}
967 967
 
968 968
         /**
@@ -981,20 +981,20 @@  discard block
 block discarded – undo
981 981
 		// If there are extensions, add a section for them
982 982
 		if ( ! empty( $extension_sections ) ) {
983 983
 
984
-			if( $disabled_attribute ) {
984
+			if ( $disabled_attribute ) {
985 985
 				foreach ( $extension_sections as &$section ) {
986
-					foreach ( $section['fields'] as &$field ) {
987
-						$field['disabled'] = $disabled_attribute;
986
+					foreach ( $section[ 'fields' ] as &$field ) {
987
+						$field[ 'disabled' ] = $disabled_attribute;
988 988
 					}
989 989
 				}
990 990
 			}
991 991
 
992
-            $k = count( $extension_sections ) - 1 ;
993
-            $extension_sections[ $k ]['fields'][] = $button;
992
+            $k = count( $extension_sections ) - 1;
993
+            $extension_sections[ $k ][ 'fields' ][ ] = $button;
994 994
 			$sections = array_merge( $sections, $extension_sections );
995 995
 		} else {
996 996
             // add the 'update settings' button to the general section
997
-            $sections[0]['fields'][] = $button;
997
+            $sections[ 0 ][ 'fields' ][ ] = $button;
998 998
         }
999 999
 
1000 1000
 		return $sections;
@@ -1050,7 +1050,7 @@  discard block
 block discarded – undo
1050 1050
 	protected function settings_edd_license( $field, $echo = true ) {
1051 1051
 
1052 1052
 	    if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
1053
-		    $field['input_type'] = 'password';
1053
+		    $field[ 'input_type' ] = 'password';
1054 1054
         }
1055 1055
 
1056 1056
 		$text = $this->settings_text( $field, false );
@@ -1099,7 +1099,7 @@  discard block
 block discarded – undo
1099 1099
 	public function single_setting_row_html( $field ) {
1100 1100
 		?>
1101 1101
 
1102
-        <tr id="gaddon-setting-row-<?php echo esc_attr( $field['name'] ); ?>">
1102
+        <tr id="gaddon-setting-row-<?php echo esc_attr( $field[ 'name' ] ); ?>">
1103 1103
             <td colspan="2">
1104 1104
 				<?php $this->single_setting( $field ); ?>
1105 1105
             </td>
@@ -1117,10 +1117,10 @@  discard block
 block discarded – undo
1117 1117
 	 * @return string
1118 1118
 	 */
1119 1119
 	public function settings_save( $field, $echo = true ) {
1120
-		$field['type']  = 'submit';
1121
-		$field['name']  = 'gform-settings-save';
1122
-		$field['class'] = isset( $field['class'] ) ? $field['class'] : 'button-primary gfbutton';
1123
-		$field['value'] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
1120
+		$field[ 'type' ]  = 'submit';
1121
+		$field[ 'name' ]  = 'gform-settings-save';
1122
+		$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] : 'button-primary gfbutton';
1123
+		$field[ 'value' ] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
1124 1124
 
1125 1125
 		$output = $this->settings_submit( $field, false );
1126 1126
 
@@ -1151,8 +1151,8 @@  discard block
 block discarded – undo
1151 1151
      * @return void
1152 1152
 	 */
1153 1153
 	public function single_setting_row( $field ) {
1154
-		$field['gv_description'] = Utils::get( $field, 'description' );
1155
-		$field['description']    = Utils::get( $field, 'subtitle' );
1154
+		$field[ 'gv_description' ] = Utils::get( $field, 'description' );
1155
+		$field[ 'description' ]    = Utils::get( $field, 'subtitle' );
1156 1156
 		parent::single_setting_row( $field );
1157 1157
 	}
1158 1158
 
@@ -1164,7 +1164,7 @@  discard block
 block discarded – undo
1164 1164
 	public function single_setting_label( $field ) {
1165 1165
 		parent::single_setting_label( $field );
1166 1166
 		if ( $description = Utils::get( $field, 'gv_description' ) ) {
1167
-			echo '<span class="description">'. $description .'</span>';
1167
+			echo '<span class="description">' . $description . '</span>';
1168 1168
 		}
1169 1169
 	}
1170 1170
 
@@ -1209,10 +1209,10 @@  discard block
 block discarded – undo
1209 1209
 		// then we assume it's changed. If it's changed, unset the status and the previous response.
1210 1210
 		if ( ! $added_message && ( $local_key !== $response_key ) ) {
1211 1211
 
1212
-			unset( $posted_settings['license_key_response'] );
1213
-			unset( $posted_settings['license_key_status'] );
1212
+			unset( $posted_settings[ 'license_key_response' ] );
1213
+			unset( $posted_settings[ 'license_key_status' ] );
1214 1214
 
1215
-			\GFCommon::add_error_message( __('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
1215
+			\GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
1216 1216
 
1217 1217
 			$added_message = true;
1218 1218
 		}
Please login to merge, or discard this patch.
includes/widgets/register-gravityview-widgets.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -16,17 +16,17 @@
 block discarded – undo
16 16
  */
17 17
 function gravityview_register_gravityview_widgets() {
18 18
 
19
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget.php' );
19
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget.php' );
20 20
 
21
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-pagination-info.php' );
22
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-page-links.php' );
23
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-page-size.php' );
24
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-custom-content.php' );
25
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/class-gravityview-widget-gravityforms.php' );
26
-	include_once( GRAVITYVIEW_DIR .'includes/widgets/search-widget/class-search-widget.php' );
21
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-pagination-info.php' );
22
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-page-links.php' );
23
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-page-size.php' );
24
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-custom-content.php' );
25
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/class-gravityview-widget-gravityforms.php' );
26
+	include_once( GRAVITYVIEW_DIR . 'includes/widgets/search-widget/class-search-widget.php' );
27 27
 
28
-	if( class_exists('GFPolls') ) {
29
-		include_once( GRAVITYVIEW_DIR .'includes/widgets/poll/class-gravityview-widget-poll.php' );
28
+	if ( class_exists( 'GFPolls' ) ) {
29
+		include_once( GRAVITYVIEW_DIR . 'includes/widgets/poll/class-gravityview-widget-poll.php' );
30 30
 	}
31 31
 
32 32
 }
Please login to merge, or discard this patch.
plugin-and-theme-hooks/class-gravityview-plugin-hooks-gravity-flow.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 
34 34
 		parent::add_hooks();
35 35
 
36
-		add_filter( 'gravityview/search/searchable_fields', array( $this, 'modify_search_bar_fields_dropdown'), 10, 2 );
36
+		add_filter( 'gravityview/search/searchable_fields', array( $this, 'modify_search_bar_fields_dropdown' ), 10, 2 );
37 37
 
38 38
 		add_filter( 'gravityview/admin/available_fields', array( $this, 'maybe_add_non_default_fields' ), 10, 3 );
39 39
 
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 	 * @return void
54 54
 	 */
55 55
 	public function clear_cache_after_workflow( $form, $entry_id, $step_id, $starting_step_id ) {
56
-		do_action( 'gravityview_clear_form_cache', $form['id'] );
56
+		do_action( 'gravityview_clear_form_cache', $form[ 'id' ] );
57 57
 	}
58 58
 
59 59
 	/**
@@ -70,13 +70,13 @@  discard block
 block discarded – undo
70 70
 	 */
71 71
 	public static function get_status_options( $form_id = 0, $status_key = 'workflow_final_status' ) {
72 72
 
73
-		if( empty( $form_id ) ) {
73
+		if ( empty( $form_id ) ) {
74 74
 			$form_id = GravityView_View::getInstance()->getFormId();
75 75
 		}
76 76
 
77 77
 		$entry_meta = gravity_flow()->get_entry_meta( array(), $form_id );
78 78
 
79
-		return (array) \GV\Utils::get( $entry_meta, $status_key . '/filter/choices' );
79
+		return (array)\GV\Utils::get( $entry_meta, $status_key . '/filter/choices' );
80 80
 	}
81 81
 
82 82
 
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 
99 99
 		$workflow_steps = $GFlow->get_steps();
100 100
 
101
-		if( $workflow_steps ) {
101
+		if ( $workflow_steps ) {
102 102
 
103 103
 			foreach ( $workflow_steps as $step ) {
104 104
 
@@ -110,12 +110,12 @@  discard block
 block discarded – undo
110 110
 				);
111 111
 			}
112 112
 
113
-			$fields['workflow_step'] = array(
113
+			$fields[ 'workflow_step' ] = array(
114 114
 				'label' => esc_html__( 'Workflow Step', 'gravityview' ),
115 115
 				'type'  => 'select',
116 116
 			);
117 117
 
118
-			$fields['workflow_final_status'] = array(
118
+			$fields[ 'workflow_final_status' ] = array(
119 119
 				'label' => esc_html__( 'Workflow Status', 'gravityview' ),
120 120
 				'type'  => 'select',
121 121
 			);
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 		if ( ( $insert_at = array_search( 'workflow_final_status', wp_list_pluck( $fields, 'key' ) ) ) !== false ) {
132 132
 			$fields_end = array_splice( $fields, $insert_at + 1 );
133 133
 
134
-			$fields[] = array(
134
+			$fields[ ] = array(
135 135
 				'text' => __( 'Workflow Current Status Timestamp', 'gravityview' ),
136 136
 				'operators' => array( '>', '<' ),
137 137
 				'placeholder' => 'yyyy-mm-dd',
@@ -157,8 +157,8 @@  discard block
 block discarded – undo
157 157
 				$keys_end = array_splice( $keys, $insert_at + 1 );
158 158
 				$values_end = array_splice( $values, $insert_at + 1 );
159 159
 
160
-				$keys[] = 'workflow_current_status_timestamp';
161
-				$values[] = array(
160
+				$keys[ ] = 'workflow_current_status_timestamp';
161
+				$values[ ] = array(
162 162
 					'label' => __( 'Workflow Current Status Timestamp', 'gravityview' ),
163 163
 					'type' => 'workflow_current_status_timestamp',
164 164
 				);
Please login to merge, or discard this patch.
includes/class-api.php 1 patch
Spacing   +112 added lines, -112 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 
32 32
 		$form = $gravityview_view->getForm();
33 33
 
34
-		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS['GravityView_API_field_label_override'] ) ) {
34
+		if ( defined( 'DOING_GRAVITYVIEW_TESTS' ) && ! empty( $GLOBALS[ 'GravityView_API_field_label_override' ] ) ) {
35 35
 			/** Allow to fall through for back compatibility testing purposes. */
36 36
 		} else {
37 37
 			return \GV\Mocks\GravityView_API_field_label( $form, $field, $entry, $force_show_label );
@@ -39,29 +39,29 @@  discard block
 block discarded – undo
39 39
 
40 40
 		$label = '';
41 41
 
42
-		if( !empty( $field['show_label'] ) || $force_show_label ) {
42
+		if ( ! empty( $field[ 'show_label' ] ) || $force_show_label ) {
43 43
 
44
-			$label = $field['label'];
44
+			$label = $field[ 'label' ];
45 45
 
46 46
 			// Support Gravity Forms 1.9+
47
-			if( class_exists( 'GF_Field' ) ) {
47
+			if ( class_exists( 'GF_Field' ) ) {
48 48
 
49
-				$field_object = RGFormsModel::get_field( $form, $field['id'] );
49
+				$field_object = RGFormsModel::get_field( $form, $field[ 'id' ] );
50 50
 
51
-				if( $field_object ) {
51
+				if ( $field_object ) {
52 52
 
53
-					$input = GFFormsModel::get_input( $field_object, $field['id'] );
53
+					$input = GFFormsModel::get_input( $field_object, $field[ 'id' ] );
54 54
 
55 55
 					// This is a complex field, with labels on a per-input basis
56
-					if( $input ) {
56
+					if ( $input ) {
57 57
 
58 58
 						// Does the input have a custom label on a per-input basis? Otherwise, default label.
59
-						$label = ! empty( $input['customLabel'] ) ? $input['customLabel'] : $input['label'];
59
+						$label = ! empty( $input[ 'customLabel' ] ) ? $input[ 'customLabel' ] : $input[ 'label' ];
60 60
 
61 61
 					} else {
62 62
 
63 63
 						// This is a field with one label
64
-						$label = $field_object->get_field_label( true, $field['label'] );
64
+						$label = $field_object->get_field_label( true, $field[ 'label' ] );
65 65
 
66 66
 					}
67 67
 
@@ -70,9 +70,9 @@  discard block
 block discarded – undo
70 70
 			}
71 71
 
72 72
 			// Use Gravity Forms label by default, but if a custom label is defined in GV, use it.
73
-			if ( !empty( $field['custom_label'] ) ) {
73
+			if ( ! empty( $field[ 'custom_label' ] ) ) {
74 74
 
75
-				$label = self::replace_variables( $field['custom_label'], $form, $entry );
75
+				$label = self::replace_variables( $field[ 'custom_label' ], $form, $entry );
76 76
 
77 77
 			}
78 78
 
@@ -134,11 +134,11 @@  discard block
 block discarded – undo
134 134
 
135 135
 		$width = NULL;
136 136
 
137
-		if( !empty( $field['width'] ) ) {
138
-			$width = absint( $field['width'] );
137
+		if ( ! empty( $field[ 'width' ] ) ) {
138
+			$width = absint( $field[ 'width' ] );
139 139
 
140 140
 			// If using percentages, limit to 100%
141
-			if( '%d%%' === $format && $width > 100 ) {
141
+			if ( '%d%%' === $format && $width > 100 ) {
142 142
 				$width = 100;
143 143
 			}
144 144
 
@@ -159,42 +159,42 @@  discard block
 block discarded – undo
159 159
 	public static function field_class( $field, $form = NULL, $entry = NULL ) {
160 160
 		$classes = array();
161 161
 
162
-		if( !empty( $field['custom_class'] ) ) {
162
+		if ( ! empty( $field[ 'custom_class' ] ) ) {
163 163
 
164
-            $custom_class = $field['custom_class'];
164
+            $custom_class = $field[ 'custom_class' ];
165 165
 
166
-            if( !empty( $entry ) ) {
166
+            if ( ! empty( $entry ) ) {
167 167
 
168 168
                 // We want the merge tag to be formatted as a class. The merge tag may be
169 169
                 // replaced by a multiple-word value that should be output as a single class.
170 170
                 // "Office Manager" will be formatted as `.OfficeManager`, not `.Office` and `.Manager`
171
-                add_filter('gform_merge_tag_filter', 'sanitize_html_class');
171
+                add_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
172 172
 
173
-                $custom_class = self::replace_variables( $custom_class, $form, $entry);
173
+                $custom_class = self::replace_variables( $custom_class, $form, $entry );
174 174
 
175 175
                 // And then we want life to return to normal
176
-                remove_filter('gform_merge_tag_filter', 'sanitize_html_class');
176
+                remove_filter( 'gform_merge_tag_filter', 'sanitize_html_class' );
177 177
             }
178 178
 
179 179
 			// And now we want the spaces to be handled nicely.
180
-			$classes[] = gravityview_sanitize_html_class( $custom_class );
180
+			$classes[ ] = gravityview_sanitize_html_class( $custom_class );
181 181
 
182 182
 		}
183 183
 
184
-		if(!empty($field['id'])) {
185
-			if( !empty( $form ) && !empty( $form['id'] ) ) {
186
-				$form_id = '-'.$form['id'];
184
+		if ( ! empty( $field[ 'id' ] ) ) {
185
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
186
+				$form_id = '-' . $form[ 'id' ];
187 187
 			} else {
188 188
 				// @deprecated path. Form should always be given.
189 189
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
190 190
 				$gravityview_view = GravityView_View::getInstance();
191
-				$form_id = $gravityview_view->getFormId() ? '-'. $gravityview_view->getFormId() : '';
191
+				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
192 192
 			}
193 193
 
194
-			$classes[] = 'gv-field'.$form_id.'-'.$field['id'];
194
+			$classes[ ] = 'gv-field' . $form_id . '-' . $field[ 'id' ];
195 195
 		}
196 196
 
197
-		return esc_attr(implode(' ', $classes));
197
+		return esc_attr( implode( ' ', $classes ) );
198 198
 	}
199 199
 
200 200
 	/**
@@ -210,11 +210,11 @@  discard block
 block discarded – undo
210 210
 	 * @return string Sanitized unique HTML `id` attribute for the field
211 211
 	 */
212 212
 	public static function field_html_attr_id( $field, $form = array(), $entry = array() ) {
213
-		$id = $field['id'];
213
+		$id = $field[ 'id' ];
214 214
 
215 215
 		if ( ! empty( $id ) ) {
216
-			if ( ! empty( $form ) && ! empty( $form['id'] ) ) {
217
-				$form_id = '-' . $form['id'];
216
+			if ( ! empty( $form ) && ! empty( $form[ 'id' ] ) ) {
217
+				$form_id = '-' . $form[ 'id' ];
218 218
 			} else {
219 219
 				// @deprecated path. Form should always be given.
220 220
 				gravityview()->log->warning( 'GravityView_View::getInstance() legacy API called' );
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 				$form_id = $gravityview_view->getFormId() ? '-' . $gravityview_view->getFormId() : '';
223 223
 			}
224 224
 
225
-			$id = 'gv-field' . $form_id . '-' . $field['id'];
225
+			$id = 'gv-field' . $form_id . '-' . $field[ 'id' ];
226 226
 		}
227 227
 
228 228
 		return esc_attr( $id );
@@ -262,14 +262,14 @@  discard block
 block discarded – undo
262 262
 	 */
263 263
 	public static function entry_link_html( $entry = array(), $anchor_text = '', $passed_tag_atts = array(), $field_settings = array(), $base_id = null ) {
264 264
 
265
-		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry['id'] ) ) {
265
+		if ( empty( $entry ) || ! is_array( $entry ) || ! isset( $entry[ 'id' ] ) ) {
266 266
 			gravityview()->log->debug( 'Entry not defined; returning null', array( 'data' => $entry ) );
267 267
 			return NULL;
268 268
 		}
269 269
 
270 270
 		$href = self::entry_link( $entry, $base_id );
271 271
 
272
-		if( '' === $href ) {
272
+		if ( '' === $href ) {
273 273
 			return NULL;
274 274
 		}
275 275
 
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 		} else {
307 307
 			$gravityview_view = GravityView_View::getInstance();
308 308
 
309
-			if( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
309
+			if ( $gravityview_view && ( $gravityview_view->curr_start || $gravityview_view->curr_end || $gravityview_view->curr_search ) ) {
310 310
 				$is_search = true;
311 311
 			}
312 312
 		}
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
317 317
 
318 318
 			$output = esc_html__( 'This search returned no results.', 'gravityview' );
319 319
 
320
-			if( $context ) {
320
+			if ( $context ) {
321 321
 				$setting = $context->view->settings->get( 'no_search_results_text', $output );
322 322
 			}
323 323
 
@@ -325,7 +325,7 @@  discard block
 block discarded – undo
325 325
 
326 326
 			$output = esc_html__( 'No entries match your request.', 'gravityview' );
327 327
 
328
-			if( $context ) {
328
+			if ( $context ) {
329 329
 				$setting = $context->view->settings->get( 'no_results_text', $output );
330 330
 			}
331 331
 		}
@@ -443,9 +443,9 @@  discard block
 block discarded – undo
443 443
 
444 444
 		// If we've saved the permalink in memory, use it
445 445
 		// @since 1.3
446
-		$link = wp_cache_get( 'gv_directory_link_'.$post_id );
446
+		$link = wp_cache_get( 'gv_directory_link_' . $post_id );
447 447
 
448
-		if ( (int) $post_id === (int) get_option( 'page_on_front' ) ) {
448
+		if ( (int)$post_id === (int)get_option( 'page_on_front' ) ) {
449 449
 			$link = home_url();
450 450
 		}
451 451
 
@@ -454,7 +454,7 @@  discard block
 block discarded – undo
454 454
 
455 455
 			// If not yet saved, cache the permalink.
456 456
 			// @since 1.3
457
-			wp_cache_set( 'gv_directory_link_'.$post_id, $link );
457
+			wp_cache_set( 'gv_directory_link_' . $post_id, $link );
458 458
 		}
459 459
 
460 460
 		// Deal with returning to proper pagination for embedded views
@@ -462,13 +462,13 @@  discard block
 block discarded – undo
462 462
 
463 463
 			$args = array();
464 464
 
465
-			if( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
466
-				$args['pagenum'] = intval( $pagenum );
465
+			if ( $pagenum = \GV\Utils::_GET( 'pagenum' ) ) {
466
+				$args[ 'pagenum' ] = intval( $pagenum );
467 467
 			}
468 468
 
469
-			if( $sort = \GV\Utils::_GET( 'sort' ) ) {
470
-				$args['sort'] = $sort;
471
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
469
+			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
470
+				$args[ 'sort' ] = $sort;
471
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
472 472
 			}
473 473
 
474 474
 			$link = add_query_arg( $args, $link );
@@ -505,7 +505,7 @@  discard block
 block discarded – undo
505 505
 	private static function get_custom_entry_slug( $id, $entry = array() ) {
506 506
 
507 507
 		// Generate an unique hash to use as the default value
508
-		$slug = substr( wp_hash( $id, 'gravityview'.$id ), 0, 8 );
508
+		$slug = substr( wp_hash( $id, 'gravityview' . $id ), 0, 8 );
509 509
 
510 510
 		/**
511 511
 		 * @filter `gravityview_entry_slug` Modify the unique hash ID generated, if you want to improve usability or change the format. This will allow for custom URLs, such as `{entryid}-{first-name}` or even, if unique, `{first-name}-{last-name}`
@@ -516,7 +516,7 @@  discard block
 block discarded – undo
516 516
 		$slug = apply_filters( 'gravityview_entry_slug', $slug, $id, $entry );
517 517
 
518 518
 		// Make sure we have something - use the original ID as backup.
519
-		if( empty( $slug ) ) {
519
+		if ( empty( $slug ) ) {
520 520
 			$slug = $id;
521 521
 		}
522 522
 
@@ -610,15 +610,15 @@  discard block
 block discarded – undo
610 610
          * @param boolean $custom Should we process the custom entry slug?
611 611
          */
612 612
         $custom = apply_filters( 'gravityview_custom_entry_slug', false );
613
-        if( $custom ) {
613
+        if ( $custom ) {
614 614
             // create the gravityview_unique_id and save it
615 615
 
616 616
             // Get the entry hash
617
-            $hash = self::get_custom_entry_slug( $entry['id'], $entry );
617
+            $hash = self::get_custom_entry_slug( $entry[ 'id' ], $entry );
618 618
 
619
-	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry['id'], 'hash' => $hash ) );
619
+	        gravityview()->log->debug( 'Setting hash for entry {entry_id}: {hash}', array( 'entry_id' => $entry[ 'id' ], 'hash' => $hash ) );
620 620
 
621
-            gform_update_meta( $entry['id'], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
621
+            gform_update_meta( $entry[ 'id' ], 'gravityview_unique_id', $hash, \GV\Utils::get( $entry, 'form_id' ) );
622 622
 
623 623
         }
624 624
     }
@@ -643,7 +643,7 @@  discard block
 block discarded – undo
643 643
 
644 644
 		if ( ! empty( $entry ) && ! is_array( $entry ) ) {
645 645
 			$entry = GVCommon::get_entry( $entry );
646
-		} else if( empty( $entry ) ) {
646
+		} else if ( empty( $entry ) ) {
647 647
 			// @deprecated path
648 648
 			$entry = GravityView_frontend::getInstance()->getEntry();
649 649
 		}
@@ -663,38 +663,38 @@  discard block
 block discarded – undo
663 663
 
664 664
 		$query_arg_name = \GV\Entry::get_endpoint_name();
665 665
 
666
-		if ( ! empty( $entry['_multi'] ) ) {
666
+		if ( ! empty( $entry[ '_multi' ] ) ) {
667 667
 			$entry_slugs = array();
668 668
 
669
-			foreach ( $entry['_multi'] as $_multi ) {
669
+			foreach ( $entry[ '_multi' ] as $_multi ) {
670 670
 
671
-				if( $gv_multi = \GV\GF_Entry::from_entry( $_multi ) ) {
672
-					$entry_slugs[] = $gv_multi->get_slug();
671
+				if ( $gv_multi = \GV\GF_Entry::from_entry( $_multi ) ) {
672
+					$entry_slugs[ ] = $gv_multi->get_slug();
673 673
 				} else {
674 674
 					// TODO: This path isn't covered by unit tests
675
-					$entry_slugs[] = \GravityView_API::get_entry_slug( $_multi['id'], $_multi );
675
+					$entry_slugs[ ] = \GravityView_API::get_entry_slug( $_multi[ 'id' ], $_multi );
676 676
 				}
677 677
 
678 678
 				unset( $gv_multi );
679 679
 
680
-				$forms[] = $_multi['form_id'];
680
+				$forms[ ] = $_multi[ 'form_id' ];
681 681
 			}
682 682
 
683 683
 			$entry_slug = implode( ',', $entry_slugs );
684 684
 		} else {
685 685
 
686 686
 			// Fallback when
687
-			if( $gv_entry = \GV\GF_Entry::from_entry( $entry ) ) {
687
+			if ( $gv_entry = \GV\GF_Entry::from_entry( $entry ) ) {
688 688
 				$entry_slug = $gv_entry->get_slug();
689 689
 			} else {
690 690
 				// TODO: This path isn't covered by unit tests
691
-				$entry_slug = \GravityView_API::get_entry_slug( $entry['id'], $entry );
691
+				$entry_slug = \GravityView_API::get_entry_slug( $entry[ 'id' ], $entry );
692 692
 			}
693 693
 
694 694
 			unset( $gv_entry );
695 695
 		}
696 696
 
697
-		if ( get_option('permalink_structure') && !is_preview() ) {
697
+		if ( get_option( 'permalink_structure' ) && ! is_preview() ) {
698 698
 
699 699
 			$args = array();
700 700
 
@@ -704,9 +704,9 @@  discard block
 block discarded – undo
704 704
 			 */
705 705
 			$link_parts = explode( '?', $directory_link );
706 706
 
707
-			$query = !empty( $link_parts[1] ) ? '?'.$link_parts[1] : '';
707
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
708 708
 
709
-			$directory_link = trailingslashit( $link_parts[0] ) . $query_arg_name . '/'. $entry_slug .'/' . $query;
709
+			$directory_link = trailingslashit( $link_parts[ 0 ] ) . $query_arg_name . '/' . $entry_slug . '/' . $query;
710 710
 
711 711
 		} else {
712 712
 
@@ -718,21 +718,21 @@  discard block
 block discarded – undo
718 718
 		 */
719 719
 		if ( $add_directory_args ) {
720 720
 
721
-			if ( ! empty( $_GET['pagenum'] ) ) {
722
-				$args['pagenum'] = intval( $_GET['pagenum'] );
721
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
722
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
723 723
 			}
724 724
 
725 725
 			/**
726 726
 			 * @since 1.7
727 727
 			 */
728 728
 			if ( $sort = \GV\Utils::_GET( 'sort' ) ) {
729
-				$args['sort'] = $sort;
730
-				$args['dir'] = \GV\Utils::_GET( 'dir' );
729
+				$args[ 'sort' ] = $sort;
730
+				$args[ 'dir' ] = \GV\Utils::_GET( 'dir' );
731 731
 			}
732 732
 
733 733
 		}
734 734
 
735
-		if( $post_id ) {
735
+		if ( $post_id ) {
736 736
 			$passed_post = get_post( $post_id );
737 737
 			$views       = \GV\View_Collection::from_post( $passed_post );
738 738
 			$has_multiple_views = $views->count() > 1;
@@ -741,7 +741,7 @@  discard block
 block discarded – undo
741 741
 		}
742 742
 
743 743
 		if ( $has_multiple_views ) {
744
-			$args['gvid'] = $view_id ? $view_id : gravityview_get_view_id();
744
+			$args[ 'gvid' ] = $view_id ? $view_id : gravityview_get_view_id();
745 745
 		}
746 746
 
747 747
 		return add_query_arg( $args, $directory_link );
@@ -762,7 +762,7 @@  discard block
 block discarded – undo
762 762
 }
763 763
 
764 764
 function gv_class( $field, $form = NULL, $entry = array() ) {
765
-	return GravityView_API::field_class( $field, $form, $entry  );
765
+	return GravityView_API::field_class( $field, $form, $entry );
766 766
 }
767 767
 
768 768
 /**
@@ -785,7 +785,7 @@  discard block
 block discarded – undo
785 785
 		$view_id = 0;
786 786
 		if ( $context->view ) {
787 787
 			$view_id = $context->view->ID;
788
-			if( $context->view->settings->get( 'hide_until_searched' ) ) {
788
+			if ( $context->view->settings->get( 'hide_until_searched' ) ) {
789 789
 				$hide_until_searched = ( empty( $context->entry ) && ! $context->request->is_search() );
790 790
 			}
791 791
 		}
@@ -817,7 +817,7 @@  discard block
 block discarded – undo
817 817
 		$default_css_class .= ' ' . $context->view->settings->get( 'class', '' );
818 818
 	}
819 819
 
820
-	$css_class = trim( $passed_css_class . ' '. $default_css_class );
820
+	$css_class = trim( $passed_css_class . ' ' . $default_css_class );
821 821
 
822 822
 	/**
823 823
 	 * @filter `gravityview/render/container/class` Modify the CSS class to be added to the wrapper <div> of a View
@@ -844,7 +844,7 @@  discard block
 block discarded – undo
844 844
 
845 845
 	$value = GravityView_API::field_value( $entry, $field );
846 846
 
847
-	if( $value === '' ) {
847
+	if ( $value === '' ) {
848 848
 		/**
849 849
 		 * @filter `gravityview_empty_value` What to display when a field is empty
850 850
 		 * @param string $value (empty string)
@@ -957,7 +957,7 @@  discard block
 block discarded – undo
957 957
  */
958 958
 function gravityview_get_field_value( $entry, $field_id, $display_value ) {
959 959
 
960
-	if( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
960
+	if ( floatval( $field_id ) === floor( floatval( $field_id ) ) ) {
961 961
 
962 962
 		// For the complete field value as generated by Gravity Forms
963 963
 		return $display_value;
@@ -991,16 +991,16 @@  discard block
 block discarded – undo
991 991
 		$terms = explode( ', ', $value );
992 992
 	}
993 993
 
994
-	foreach ($terms as $term_name ) {
994
+	foreach ( $terms as $term_name ) {
995 995
 
996 996
 		// If we're processing a category,
997
-		if( $taxonomy === 'category' ) {
997
+		if ( $taxonomy === 'category' ) {
998 998
 
999 999
 			// Use rgexplode to prevent errors if : doesn't exist
1000 1000
 			list( $term_name, $term_id ) = rgexplode( ':', $term_name, 2 );
1001 1001
 
1002 1002
 			// The explode was succesful; we have the category ID
1003
-			if( !empty( $term_id )) {
1003
+			if ( ! empty( $term_id ) ) {
1004 1004
 				$term = get_term_by( 'id', $term_id, $taxonomy );
1005 1005
 			} else {
1006 1006
 			// We have to fall back to the name
@@ -1013,7 +1013,7 @@  discard block
 block discarded – undo
1013 1013
 		}
1014 1014
 
1015 1015
 		// There's still a tag/category here.
1016
-		if( $term ) {
1016
+		if ( $term ) {
1017 1017
 
1018 1018
 			$term_link = get_term_link( $term, $taxonomy );
1019 1019
 
@@ -1022,11 +1022,11 @@  discard block
 block discarded – undo
1022 1022
 			    continue;
1023 1023
 			}
1024 1024
 
1025
-			$output[] = gravityview_get_link( $term_link, esc_html( $term->name ) );
1025
+			$output[ ] = gravityview_get_link( $term_link, esc_html( $term->name ) );
1026 1026
 		}
1027 1027
 	}
1028 1028
 
1029
-	return implode(', ', $output );
1029
+	return implode( ', ', $output );
1030 1030
 }
1031 1031
 
1032 1032
 /**
@@ -1040,8 +1040,8 @@  discard block
 block discarded – undo
1040 1040
 
1041 1041
 	$output = get_the_term_list( $post_id, $taxonomy, NULL, ', ' );
1042 1042
 
1043
-	if( empty( $link ) ) {
1044
-		return strip_tags( $output);
1043
+	if ( empty( $link ) ) {
1044
+		return strip_tags( $output );
1045 1045
 	}
1046 1046
 
1047 1047
 	return $output;
@@ -1060,7 +1060,7 @@  discard block
 block discarded – undo
1060 1060
 	$fe = GravityView_frontend::getInstance();
1061 1061
 
1062 1062
 	// Solve problem when loading content via admin-ajax.php
1063
-	if( ! $fe->getGvOutputData() ) {
1063
+	if ( ! $fe->getGvOutputData() ) {
1064 1064
 
1065 1065
 		gravityview()->log->debug( 'gv_output_data not defined; parsing content.' );
1066 1066
 
@@ -1068,7 +1068,7 @@  discard block
 block discarded – undo
1068 1068
 	}
1069 1069
 
1070 1070
 	// Make 100% sure that we're dealing with a properly called situation
1071
-	if( !is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
1071
+	if ( ! is_a( $fe->getGvOutputData(), 'GravityView_View_Data' ) ) {
1072 1072
 
1073 1073
 		gravityview()->log->debug( 'gv_output_data not an object or get_view not callable.', array( 'data' => $fe->getGvOutputData() ) );
1074 1074
 
@@ -1299,12 +1299,12 @@  discard block
 block discarded – undo
1299 1299
 function gravityview_get_files_array( $value, $gv_class = '', $context = null ) {
1300 1300
 	/** @define "GRAVITYVIEW_DIR" "../" */
1301 1301
 
1302
-	if( !class_exists( 'GravityView_Field' ) ) {
1303
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field.php' );
1302
+	if ( ! class_exists( 'GravityView_Field' ) ) {
1303
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field.php' );
1304 1304
 	}
1305 1305
 
1306
-	if( !class_exists( 'GravityView_Field_FileUpload' ) ) {
1307
-		include_once( GRAVITYVIEW_DIR .'includes/fields/class-gravityview-field-fileupload.php' );
1306
+	if ( ! class_exists( 'GravityView_Field_FileUpload' ) ) {
1307
+		include_once( GRAVITYVIEW_DIR . 'includes/fields/class-gravityview-field-fileupload.php' );
1308 1308
 	}
1309 1309
 
1310 1310
 	if ( is_null( $context ) ) {
@@ -1407,21 +1407,21 @@  discard block
 block discarded – undo
1407 1407
 	} else {
1408 1408
 		// @deprecated path
1409 1409
 		// Required fields.
1410
-		if ( empty( $args['field'] ) || empty( $args['form'] ) ) {
1410
+		if ( empty( $args[ 'field' ] ) || empty( $args[ 'form' ] ) ) {
1411 1411
 			gravityview()->log->error( 'Field or form are empty.', array( 'data' => $args ) );
1412 1412
 			return '';
1413 1413
 		}
1414 1414
 	}
1415 1415
 
1416 1416
 	if ( $context instanceof \GV\Template_Context ) {
1417
-		$entry = $args['entry'] ? : ( $context->entry ? $context->entry->as_entry() : array() );
1418
-		$field = $args['field'] ? : ( $context->field ? $context->field->as_configuration() : array() );
1419
-		$form = $args['form'] ? : ( $context->view->form ? $context->view->form->form : array() );
1417
+		$entry = $args[ 'entry' ] ?: ( $context->entry ? $context->entry->as_entry() : array() );
1418
+		$field = $args[ 'field' ] ?: ( $context->field ? $context->field->as_configuration() : array() );
1419
+		$form = $args[ 'form' ] ?: ( $context->view->form ? $context->view->form->form : array() );
1420 1420
 	} else {
1421 1421
 		// @deprecated path
1422
-		$entry = empty( $args['entry'] ) ? array() : $args['entry'];
1423
-		$field = $args['field'];
1424
-		$form = $args['form'];
1422
+		$entry = empty( $args[ 'entry' ] ) ? array() : $args[ 'entry' ];
1423
+		$field = $args[ 'field' ];
1424
+		$form = $args[ 'form' ];
1425 1425
 	}
1426 1426
 
1427 1427
 	/**
@@ -1441,43 +1441,43 @@  discard block
 block discarded – undo
1441 1441
 	);
1442 1442
 
1443 1443
 	if ( $context instanceof \GV\Template_Context ) {
1444
-		$placeholders['value'] = \GV\Utils::get( $args, 'value', '' );
1444
+		$placeholders[ 'value' ] = \GV\Utils::get( $args, 'value', '' );
1445 1445
 	} else {
1446 1446
 		// @deprecated path
1447
-		$placeholders['value'] = gv_value( $entry, $field );
1447
+		$placeholders[ 'value' ] = gv_value( $entry, $field );
1448 1448
 	}
1449 1449
 
1450 1450
 	// If the value is empty and we're hiding empty, return empty.
1451
-	if ( $placeholders['value'] === '' && ! empty( $args['hide_empty'] ) ) {
1451
+	if ( $placeholders[ 'value' ] === '' && ! empty( $args[ 'hide_empty' ] ) ) {
1452 1452
 		return '';
1453 1453
 	}
1454 1454
 
1455
-	if ( $placeholders['value'] !== '' && ! empty( $args['wpautop'] ) ) {
1456
-		$placeholders['value'] = wpautop( $placeholders['value'] );
1455
+	if ( $placeholders[ 'value' ] !== '' && ! empty( $args[ 'wpautop' ] ) ) {
1456
+		$placeholders[ 'value' ] = wpautop( $placeholders[ 'value' ] );
1457 1457
 	}
1458 1458
 
1459 1459
 	// Get width setting, if exists
1460
-	$placeholders['width'] = GravityView_API::field_width( $field );
1460
+	$placeholders[ 'width' ] = GravityView_API::field_width( $field );
1461 1461
 
1462 1462
 	// If replacing with CSS inline formatting, let's do it.
1463
-	$placeholders['width:style'] = GravityView_API::field_width( $field, 'width:' . $placeholders['width'] . '%;' );
1463
+	$placeholders[ 'width:style' ] = GravityView_API::field_width( $field, 'width:' . $placeholders[ 'width' ] . '%;' );
1464 1464
 
1465 1465
 	// Grab the Class using `gv_class`
1466
-	$placeholders['class'] = gv_class( $field, $form, $entry );
1467
-	$placeholders['field_id'] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1466
+	$placeholders[ 'class' ] = gv_class( $field, $form, $entry );
1467
+	$placeholders[ 'field_id' ] = GravityView_API::field_html_attr_id( $field, $form, $entry );
1468 1468
 
1469 1469
 	if ( $context instanceof \GV\Template_Context ) {
1470
-		$placeholders['label_value'] = \GV\Utils::get( $args, 'label' );
1470
+		$placeholders[ 'label_value' ] = \GV\Utils::get( $args, 'label' );
1471 1471
 	} else {
1472 1472
 		// Default Label value
1473
-		$placeholders['label_value'] = gv_label( $field, $entry );
1473
+		$placeholders[ 'label_value' ] = gv_label( $field, $entry );
1474 1474
 	}
1475 1475
 
1476
-	$placeholders['label_value:data-label'] = trim( esc_attr( strip_tags( str_replace( '>&nbsp;', '>', $placeholders['label_value'] ) ) ) );
1477
-	$placeholders['label_value:esc_attr'] = esc_attr( $placeholders['label_value'] );
1476
+	$placeholders[ 'label_value:data-label' ] = trim( esc_attr( strip_tags( str_replace( '>&nbsp;', '>', $placeholders[ 'label_value' ] ) ) ) );
1477
+	$placeholders[ 'label_value:esc_attr' ] = esc_attr( $placeholders[ 'label_value' ] );
1478 1478
 
1479
-	if ( empty( $placeholders['label'] ) && ! empty( $placeholders['label_value'] ) ){
1480
-		$placeholders['label'] = '<span class="gv-field-label">{{ label_value }}</span>';
1479
+	if ( empty( $placeholders[ 'label' ] ) && ! empty( $placeholders[ 'label_value' ] ) ) {
1480
+		$placeholders[ 'label' ] = '<span class="gv-field-label">{{ label_value }}</span>';
1481 1481
 	}
1482 1482
 
1483 1483
 	/**
@@ -1488,7 +1488,7 @@  discard block
 block discarded – undo
1488 1488
 	 * @since 2.0
1489 1489
 	 * @param \GV\Template_Context $context The context.
1490 1490
 	 */
1491
-	$html = apply_filters( 'gravityview/field_output/pre_html', $args['markup'], $args, $context );
1491
+	$html = apply_filters( 'gravityview/field_output/pre_html', $args[ 'markup' ], $args, $context );
1492 1492
 
1493 1493
 	/**
1494 1494
 	 * @filter `gravityview/field_output/open_tag` Modify the opening tags for the template content placeholders
@@ -1515,7 +1515,7 @@  discard block
 block discarded – undo
1515 1515
 	foreach ( $placeholders as $tag => $value ) {
1516 1516
 
1517 1517
 		// If the tag doesn't exist just skip it
1518
-		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ){
1518
+		if ( false === strpos( $html, $open_tag . $tag . $close_tag ) && false === strpos( $html, $open_tag . ' ' . $tag . ' ' . $close_tag ) ) {
1519 1519
 			continue;
1520 1520
 		}
1521 1521
 
Please login to merge, or discard this patch.
future/includes/class-gv-shortcode-gravityview.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -43,8 +43,8 @@  discard block
 block discarded – undo
43 43
 			'class' => '',
44 44
 		) );
45 45
 
46
-		if ( ! $view_id = $atts['id'] ? : $atts['view_id'] ) {
47
-			if ( $atts['detail'] && $view = $request->is_view() ) {
46
+		if ( ! $view_id = $atts[ 'id' ] ?: $atts[ 'view_id' ] ) {
47
+			if ( $atts[ 'detail' ] && $view = $request->is_view() ) {
48 48
 				$view_id = $view->ID;
49 49
 			}
50 50
 		}
@@ -114,12 +114,12 @@  discard block
 block discarded – undo
114 114
 			}
115 115
 		}
116 116
 
117
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
117
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
118 118
 
119 119
 		/**
120 120
 		 * View details.
121 121
 		 */
122
-		if ( $atts['detail'] ) {
122
+		if ( $atts[ 'detail' ] ) {
123 123
 			$entries = $view->get_entries( $request );
124 124
 			return self::_return( $this->detail( $view, $entries, $atts ) );
125 125
 
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 				return self::_return( '' );
137 137
 			}
138 138
 
139
-			if ( $entry['status'] != 'active' ) {
139
+			if ( $entry[ 'status' ] != 'active' ) {
140 140
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
141 141
 				return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
142 142
 			}
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 			}
148 148
 
149 149
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
150
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
150
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
151 151
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
152 152
 					return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
153 153
 				}
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 			$entryset = $entry->is_multi() ? $entry->entries : array( $entry );
171 171
 
172 172
 			foreach ( $entryset as $e ) {
173
-				if ( $e['status'] != 'active' ) {
173
+				if ( $e[ 'status' ] != 'active' ) {
174 174
 					gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $e->ID ) );
175 175
 					return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
176 176
 				}
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
 				}
182 182
 
183 183
 				if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
184
-					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
184
+					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
185 185
 						gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $e->ID ) );
186 186
 						return self::_return( __( 'You are not allowed to view this content.', 'gravityview' ) );
187 187
 					}
@@ -206,10 +206,10 @@  discard block
 block discarded – undo
206 206
 
207 207
 				// Mock the request with the actual View, not the global one
208 208
 				$mock_request = new \GV\Mock_Request();
209
-				$mock_request->returns['is_view'] = $view;
210
-				$mock_request->returns['is_entry'] = $request->is_entry( $view->form ? $view->form->ID : 0 );
211
-				$mock_request->returns['is_edit_entry'] = $request->is_edit_entry( $view->form ? $view->form->ID : 0 );
212
-				$mock_request->returns['is_search'] = $request->is_search();
209
+				$mock_request->returns[ 'is_view' ] = $view;
210
+				$mock_request->returns[ 'is_entry' ] = $request->is_entry( $view->form ? $view->form->ID : 0 );
211
+				$mock_request->returns[ 'is_edit_entry' ] = $request->is_edit_entry( $view->form ? $view->form->ID : 0 );
212
+				$mock_request->returns[ 'is_search' ] = $request->is_search();
213 213
 
214 214
 				$request = $mock_request;
215 215
 			}
@@ -245,16 +245,16 @@  discard block
 block discarded – undo
245 245
 		$filtered_atts = shortcode_atts( $supported_atts, $passed_atts, 'gravityview' );
246 246
 
247 247
 		// Only keep the passed attributes after making sure that they're valid pairs
248
-		$filtered_atts = array_intersect_key( (array) $passed_atts, $filtered_atts );
248
+		$filtered_atts = array_intersect_key( (array)$passed_atts, $filtered_atts );
249 249
 
250 250
 		$atts = array();
251 251
 
252
-		foreach( $filtered_atts as $key => $passed_value ) {
252
+		foreach ( $filtered_atts as $key => $passed_value ) {
253 253
 
254 254
 			// Allow using GravityView merge tags in shortcode attributes, like {get} and {created_by}
255 255
 			$passed_value = \GravityView_Merge_Tags::replace_variables( $passed_value );
256 256
 
257
-			switch( $defaults[ $key ]['type'] ) {
257
+			switch ( $defaults[ $key ][ 'type' ] ) {
258 258
 
259 259
 				/**
260 260
 				 * Make sure number fields are numeric.
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
 				 * @see http://php.net/manual/en/function.is-numeric.php#107326
263 263
 				 */
264 264
 				case 'number':
265
-					if( is_numeric( $passed_value ) ) {
265
+					if ( is_numeric( $passed_value ) ) {
266 266
 						$atts[ $key ] = ( $passed_value + 0 );
267 267
 					}
268 268
 					break;
@@ -277,8 +277,8 @@  discard block
 block discarded – undo
277 277
 				 */
278 278
 				case 'select':
279 279
 				case 'radio':
280
-					$options = isset( $defaults[ $key ]['choices'] ) ? $defaults[ $key ]['choices'] : $defaults[ $key ]['options'];
281
-					if( in_array( $passed_value, array_keys( $options ) ) ) {
280
+					$options = isset( $defaults[ $key ][ 'choices' ] ) ? $defaults[ $key ][ 'choices' ] : $defaults[ $key ][ 'options' ];
281
+					if ( in_array( $passed_value, array_keys( $options ) ) ) {
282 282
 						$atts[ $key ] = $passed_value;
283 283
 					}
284 284
 					break;
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 			}
291 291
 		}
292 292
 
293
-		$atts['detail'] = \GV\Utils::get( $passed_atts, 'detail', null );
293
+		$atts[ 'detail' ] = \GV\Utils::get( $passed_atts, 'detail', null );
294 294
 
295 295
 		return $atts;
296 296
 	}
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
 	private function detail( $view, $entries, $atts ) {
308 308
 		$output = '';
309 309
 
310
-		switch ( $key = $atts['detail'] ):
310
+		switch ( $key = $atts[ 'detail' ] ):
311 311
 			case 'total_entries':
312 312
 				$output = number_format_i18n( $entries->total() );
313 313
 				break;
Please login to merge, or discard this patch.
future/includes/class-gv-template-view-table.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -75,22 +75,22 @@  discard block
 block discarded – undo
75 75
 			if ( is_array( $sorts ) ) {
76 76
 				foreach ( (array)$sorts as $key => $direction ) {
77 77
 					if ( $key == $field_id ) {
78
-						$sorting['key'] = $field_id;
79
-						$sorting['direction'] = strtolower( $direction );
78
+						$sorting[ 'key' ] = $field_id;
79
+						$sorting[ 'direction' ] = strtolower( $direction );
80 80
 						break;
81 81
 					}
82 82
 				}
83 83
 			} else {
84 84
 				if ( $sorts == $field_id ) {
85
-					$sorting['key'] = $context_id;
86
-					$sorting['direction'] = strtolower( Utils::_GET( 'dir', '' ) );
85
+					$sorting[ 'key' ] = $context_id;
86
+					$sorting[ 'direction' ] = strtolower( Utils::_GET( 'dir', '' ) );
87 87
 				}
88 88
 			}
89 89
 		} else {
90 90
 			foreach ( (array)$context->view->settings->get( 'sort_field', array() ) as $i => $sort_field ) {
91 91
 				if ( $sort_field == $field_id ) {
92
-					$sorting['key'] = $sort_field;
93
-					$sorting['direction'] = strtolower( Utils::get( $directions, $i, '' ) );
92
+					$sorting[ 'key' ] = $sort_field;
93
+					$sorting[ 'direction' ] = strtolower( Utils::get( $directions, $i, '' ) );
94 94
 					break; // Only get the first sort
95 95
 				}
96 96
 			}
@@ -109,21 +109,21 @@  discard block
 block discarded – undo
109 109
 		);
110 110
 
111 111
 		// If we are already sorting by the current field...
112
-		if ( ! empty( $sorting['key'] ) && (string) $sort_field_id === (string) $sorting['key'] ) {
112
+		if ( ! empty( $sorting[ 'key' ] ) && (string)$sort_field_id === (string)$sorting[ 'key' ] ) {
113 113
 
114
-		    switch( $sorting['direction'] ) {
114
+		    switch ( $sorting[ 'direction' ] ) {
115 115
 		        // No sort
116 116
                 case '':
117
-	                $sort_args[1] = 'asc';
117
+	                $sort_args[ 1 ] = 'asc';
118 118
 	                $class .= ' gv-icon-caret-up-down';
119 119
                     break;
120 120
                 case 'desc':
121
-	                $sort_args[1] = '';
121
+	                $sort_args[ 1 ] = '';
122 122
 	                $class .= ' gv-icon-sort-asc';
123 123
 	                break;
124 124
                 case 'asc':
125 125
                 default:
126
-                    $sort_args[1] = 'desc';
126
+                    $sort_args[ 1 ] = 'desc';
127 127
                     $class .= ' gv-icon-sort-desc';
128 128
                     break;
129 129
             }
@@ -136,15 +136,15 @@  discard block
 block discarded – undo
136 136
 		$url = remove_query_arg( 'sort', $url );
137 137
 		$multisort_url = self::_get_multisort_url( $url, $sort_args, $context->field );
138 138
 
139
-    	$url = add_query_arg( $sort_args[0], $sort_args[1], $url );
139
+    	$url = add_query_arg( $sort_args[ 0 ], $sort_args[ 1 ], $url );
140 140
 
141
-		$return = '<a href="'. esc_url_raw( $url ) .'"';
141
+		$return = '<a href="' . esc_url_raw( $url ) . '"';
142 142
 
143 143
 		if ( ! empty( $multisort_url ) ) {
144
-			$return .= ' data-multisort-href="'. esc_url_raw( $multisort_url ) . '"';
144
+			$return .= ' data-multisort-href="' . esc_url_raw( $multisort_url ) . '"';
145 145
 		}
146 146
 
147
-		$return .= ' class="'. $class .'" ></a>&nbsp;'. $column_label;
147
+		$return .= ' class="' . $class . '" ></a>&nbsp;' . $column_label;
148 148
 
149 149
 		return $return;
150 150
 	}
@@ -183,19 +183,19 @@  discard block
 block discarded – undo
183 183
         if ( ! in_array( $field_id, $keys = array_keys( $sorts ) ) ) {
184 184
             if ( count( $keys ) ) {
185 185
                 $multisort_url = add_query_arg( sprintf( 'sort[%s]', end( $keys ) ), $sorts[ end( $keys ) ], $multisort_url );
186
-                $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url );
186
+                $multisort_url = add_query_arg( $sort_args[ 0 ], $sort_args[ 1 ], $multisort_url );
187 187
             } else {
188
-                $multisort_url = add_query_arg( $sort_args[0], $sort_args[1], $multisort_url );
188
+                $multisort_url = add_query_arg( $sort_args[ 0 ], $sort_args[ 1 ], $multisort_url );
189 189
             }
190 190
         }
191 191
         // Otherwise, we are just updating the sort order
192 192
         else {
193 193
 
194 194
             // Pass empty value to unset
195
-            if( '' === $sort_args[1] ) {
195
+            if ( '' === $sort_args[ 1 ] ) {
196 196
 	            unset( $sorts[ $field_id ] );
197 197
             } else {
198
-	            $sorts[ $field_id ] = $sort_args[1];
198
+	            $sorts[ $field_id ] = $sort_args[ 1 ];
199 199
             }
200 200
 
201 201
             $multisort_url = add_query_arg( array( 'sort' => $sorts ), $multisort_url );
@@ -333,9 +333,9 @@  discard block
 block discarded – undo
333 333
                 do_action( 'gravityview_table_cells_before', \GravityView_View::getInstance() );
334 334
 
335 335
                 foreach ( $fields->all() as $field ) {
336
-					if ( isset( $this->view->unions[ $entry['form_id'] ] ) ) {
337
-						if ( isset( $this->view->unions[ $entry['form_id'] ][ $field->ID ] ) ) {
338
-							$field = $this->view->unions[ $entry['form_id'] ][ $field->ID ];
336
+					if ( isset( $this->view->unions[ $entry[ 'form_id' ] ] ) ) {
337
+						if ( isset( $this->view->unions[ $entry[ 'form_id' ] ][ $field->ID ] ) ) {
338
+							$field = $this->view->unions[ $entry[ 'form_id' ] ][ $field->ID ];
339 339
 						} else {
340 340
 							if ( ! $field instanceof Internal_Field ) {
341 341
 								$field = Internal_Field::from_configuration( array( 'id' => 'custom' ) );
Please login to merge, or discard this patch.
includes/widgets/class-gravityview-widget-gravityforms.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 
14 14
 	function __construct() {
15 15
 
16
-		$this->widget_description = __('Display a Gravity Forms form.', 'gravityview' );
16
+		$this->widget_description = __( 'Display a Gravity Forms form.', 'gravityview' );
17 17
 
18 18
 		$default_values = array(
19 19
 			'header' => 1,
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 
55 55
 		add_filter( 'gravityview/widget/hide_until_searched/whitelist', array( $this, 'add_to_allowlist' ) );
56 56
 
57
-		parent::__construct( __( 'Gravity Forms', 'gravityview' ) , 'gravityforms', $default_values, $settings );
57
+		parent::__construct( __( 'Gravity Forms', 'gravityview' ), 'gravityforms', $default_values, $settings );
58 58
 	}
59 59
 
60 60
 	/**
@@ -81,13 +81,13 @@  discard block
 block discarded – undo
81 81
 		 * gravityview_get_forms() is currently running too early as widgets_init runs before init and
82 82
 		 * when most Gravity Forms plugins register their own fields like GP Terms of Service.
83 83
 		 */
84
-		if( $doing_ajax || ( \GV\Admin_Request::is_admin() && ! GFForms::is_gravity_page() ) ) {
84
+		if ( $doing_ajax || ( \GV\Admin_Request::is_admin() && ! GFForms::is_gravity_page() ) ) {
85 85
 
86 86
 			// check for available gravity forms
87 87
 			$forms = gravityview_get_forms();
88 88
 
89 89
 			foreach ( $forms as $form ) {
90
-				$choices[ $form['id'] ] = $form['title'];
90
+				$choices[ $form[ 'id' ] ] = $form[ 'title' ];
91 91
 			}
92 92
 		}
93 93
 
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 	 */
104 104
 	function add_to_allowlist( $allowlist ) {
105 105
 
106
-		$allowlist[] = 'gravityforms';
106
+		$allowlist[ ] = 'gravityforms';
107 107
 
108 108
 		return $allowlist;
109 109
 	}
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 	 * @param string $content
114 114
 	 * @param string $context
115 115
 	 */
116
-	public function render_frontend( $widget_args, $content = '', $context = '') {
116
+	public function render_frontend( $widget_args, $content = '', $context = '' ) {
117 117
 
118 118
 		if ( ! $this->pre_render_frontend() ) {
119 119
 			return;
Please login to merge, or discard this patch.