Completed
Push — develop ( 94f7b7...8906ef )
by Zack
16:58
created
future/includes/class-gv-entry.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 
114 114
 		$args = array();
115 115
 
116
-		$view_id = is_null ( $view ) ? null : $view->ID;
116
+		$view_id = is_null( $view ) ? null : $view->ID;
117 117
 
118 118
 		$permalink = null;
119 119
 
@@ -123,7 +123,7 @@  discard block
 block discarded – undo
123 123
 			/** Must be an embed of some sort. */
124 124
 			if ( is_object( $post ) && is_numeric( $post->ID ) ) {
125 125
 				$permalink = get_permalink( $post->ID );
126
-				$args['gvid'] = $view_id;
126
+				$args[ 'gvid' ] = $view_id;
127 127
 			}
128 128
 		}
129 129
 		
@@ -151,21 +151,21 @@  discard block
 block discarded – undo
151 151
 			 */
152 152
 			$link_parts = explode( '?', $permalink );
153 153
 
154
-			$query = ! empty( $link_parts[1] ) ? '?' . $link_parts[1] : '';
154
+			$query = ! empty( $link_parts[ 1 ] ) ? '?' . $link_parts[ 1 ] : '';
155 155
 
156
-			$permalink = trailingslashit( $link_parts[0] ) . $entry_endpoint_name . '/'. $entry_slug .'/' . $query;
156
+			$permalink = trailingslashit( $link_parts[ 0 ] ) . $entry_endpoint_name . '/' . $entry_slug . '/' . $query;
157 157
 		} else {
158 158
 			$args[ $entry_endpoint_name ] = $entry_slug;
159 159
 		}
160 160
 
161 161
 		if ( $track_directory ) {
162
-			if ( ! empty( $_GET['pagenum'] ) ) {
163
-				$args['pagenum'] = intval( $_GET['pagenum'] );
162
+			if ( ! empty( $_GET[ 'pagenum' ] ) ) {
163
+				$args[ 'pagenum' ] = intval( $_GET[ 'pagenum' ] );
164 164
 			}
165 165
 
166 166
 			if ( $sort = Utils::_GET( 'sort' ) ) {
167
-				$args['sort'] = $sort;
168
-				$args['dir'] = Utils::_GET( 'dir' );
167
+				$args[ 'sort' ] = $sort;
168
+				$args[ 'dir' ] = Utils::_GET( 'dir' );
169 169
 			}
170 170
 		}
171 171
 
Please login to merge, or discard this patch.
includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-acf.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
 		$acf_keys = get_field_objects( $post->ID, array( 'load_value' => false ) );
57 57
 
58
-		if( $acf_keys ) {
58
+		if ( $acf_keys ) {
59 59
 			return array_merge( array_keys( $acf_keys ), $meta_keys );
60 60
 		}
61 61
 
@@ -70,9 +70,9 @@  discard block
 block discarded – undo
70 70
 	 * @return void
71 71
 	 */
72 72
 	private function fix_posted_fields() {
73
-		if( is_admin() && isset( $_POST['action'] ) && isset( $_POST['post_type'] ) ) {
74
-			if( 'editpost' === $_POST['action'] && 'gravityview' === $_POST['post_type'] ) {
75
-				$_POST['fields'] = _gravityview_process_posted_fields();
73
+		if ( is_admin() && isset( $_POST[ 'action' ] ) && isset( $_POST[ 'post_type' ] ) ) {
74
+			if ( 'editpost' === $_POST[ 'action' ] && 'gravityview' === $_POST[ 'post_type' ] ) {
75
+				$_POST[ 'fields' ] = _gravityview_process_posted_fields();
76 76
 			}
77 77
 		}
78 78
 	}
Please login to merge, or discard this patch.
future/includes/class-gv-settings-addon.php 2 patches
Indentation   +106 added lines, -106 removed lines patch added patch discarded remove patch
@@ -138,20 +138,20 @@  discard block
 block discarded – undo
138 138
 	}
139 139
 
140 140
 	/**
141
-     * Uninstall all traces of GravityView
142
-     *
143
-     * Note: method is public because parent method is public
144
-     *
141
+	 * Uninstall all traces of GravityView
142
+	 *
143
+	 * Note: method is public because parent method is public
144
+	 *
145 145
 	 * @return bool
146 146
 	 */
147 147
 	public function uninstall() {
148 148
 		gravityview()->plugin->uninstall();
149 149
 
150 150
 		/**
151
-         * Set the path so that Gravity Forms can de-activate GravityView
152
-         * @see GFAddOn::uninstall_addon
153
-         * @uses deactivate_plugins()
154
-         */
151
+		 * Set the path so that Gravity Forms can de-activate GravityView
152
+		 * @see GFAddOn::uninstall_addon
153
+		 * @uses deactivate_plugins()
154
+		 */
155 155
 		$this->_path = GRAVITYVIEW_FILE;
156 156
 
157 157
 		return true;
@@ -181,42 +181,42 @@  discard block
 block discarded – undo
181 181
 	}
182 182
 
183 183
 	/**
184
-     * Get an array of reasons why the plugin might be uninstalled
185
-     *
186
-     * @since 1.17.5
187
-     *
184
+	 * Get an array of reasons why the plugin might be uninstalled
185
+	 *
186
+	 * @since 1.17.5
187
+	 *
188 188
 	 * @return array Array of reasons with the label and followup questions for each uninstall reason
189 189
 	 */
190 190
 	private function get_uninstall_reasons() {
191 191
 		$reasons = array(
192 192
 			'will-continue' => array(
193
-                'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ),
194
-            ),
193
+				'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ),
194
+			),
195 195
 			'no-longer-need' => array(
196
-                'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ),
197
-            ),
196
+				'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ),
197
+			),
198 198
 			'doesnt-work' => array(
199
-                'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ),
200
-            ),
199
+				'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ),
200
+			),
201 201
 			'found-other' => array(
202
-                'label' => esc_html__( 'I found a better plugin', 'gravityview' ),
203
-                'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ),
204
-            ),
202
+				'label' => esc_html__( 'I found a better plugin', 'gravityview' ),
203
+				'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ),
204
+			),
205 205
 			'other' => array(
206
-                'label' => esc_html__( 'Other', 'gravityview' ),
207
-            ),
206
+				'label' => esc_html__( 'Other', 'gravityview' ),
207
+			),
208 208
 		);
209 209
 
210 210
 		shuffle( $reasons );
211 211
 
212 212
 		return $reasons;
213
-    }
213
+	}
214 214
 
215 215
 	/**
216
-     * Display a feedback form when the plugin is uninstalled
217
-     *
218
-     * @since 1.17.5
219
-     *
216
+	 * Display a feedback form when the plugin is uninstalled
217
+	 *
218
+	 * @since 1.17.5
219
+	 *
220 220
 	 * @return string HTML of the uninstallation form
221 221
 	 */
222 222
 	public function uninstall_form() {
@@ -296,7 +296,7 @@  discard block
 block discarded – undo
296 296
             <h2><?php esc_html_e( 'Why did you uninstall GravityView?', 'gravityview' ); ?></h2>
297 297
             <ul>
298 298
 				<?php
299
-                $reasons = $this->get_uninstall_reasons();
299
+				$reasons = $this->get_uninstall_reasons();
300 300
 				foreach ( $reasons as $reason ) {
301 301
 					printf( '<li><label><input name="reason" type="radio" value="other" data-followup="%s"> %s</label></li>', Utils::get( $reason, 'followup' ), Utils::get( $reason, 'label' ) );
302 302
 				}
@@ -390,12 +390,12 @@  discard block
 block discarded – undo
390 390
 	}
391 391
 
392 392
 	public function app_settings_tab() {
393
-	    parent::app_settings_tab();
393
+		parent::app_settings_tab();
394 394
 
395 395
 		if ( $this->maybe_uninstall() ) {
396
-            echo $this->uninstall_form();
396
+			echo $this->uninstall_form();
397 397
 		}
398
-    }
398
+	}
399 399
 
400 400
 	/**
401 401
 	 * The Settings title
@@ -480,7 +480,7 @@  discard block
 block discarded – undo
480 480
 	 * @return array The settings.
481 481
 	 */
482 482
 	public function all() {
483
-	    return wp_parse_args( get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', array() ), $this->defaults() );
483
+		return wp_parse_args( get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', array() ), $this->defaults() );
484 484
 	}
485 485
 
486 486
 	/**
@@ -549,8 +549,8 @@  discard block
 block discarded – undo
549 549
                     type="' . $field['type'] . '"
550 550
                     name="' . esc_attr( $name ) . '"
551 551
                     value="' . $value . '" ' .
552
-		        implode( ' ', $attributes ) .
553
-		        ' />';
552
+				implode( ' ', $attributes ) .
553
+				' />';
554 554
 
555 555
 		if ( $echo ) {
556 556
 			echo $html;
@@ -574,16 +574,16 @@  discard block
 block discarded – undo
574 574
 	 */
575 575
 	public function license_key_notice() {
576 576
 
577
-	    if( $this->is_save_postback() ) {
578
-		    $settings = $this->get_posted_settings();
579
-		    $license_key = \GV\Utils::get( $settings, 'license_key' );
580
-		    $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' );
581
-        } else {
582
-		    $license_status = $this->get( 'license_key_status', 'inactive' );
583
-		    $license_key    = $this->get( 'license_key' );
584
-	    }
577
+		if( $this->is_save_postback() ) {
578
+			$settings = $this->get_posted_settings();
579
+			$license_key = \GV\Utils::get( $settings, 'license_key' );
580
+			$license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' );
581
+		} else {
582
+			$license_status = $this->get( 'license_key_status', 'inactive' );
583
+			$license_key    = $this->get( 'license_key' );
584
+		}
585 585
 
586
-	    $license_id = empty( $license_key ) ? 'license' : $license_key;
586
+		$license_id = empty( $license_key ) ? 'license' : $license_key;
587 587
 
588 588
 		$message = esc_html__( 'Your GravityView license %s. This means you&rsquo;re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview' );
589 589
 
@@ -597,7 +597,7 @@  discard block
 block discarded – undo
597 597
 		$update_below = false;
598 598
 		$primary_button_link = admin_url( 'edit.php?post_type=gravityview&amp;page=gravityview_settings' );
599 599
 
600
-        switch ( $license_status ) {
600
+		switch ( $license_status ) {
601 601
 			/** @since 1.17 */
602 602
 			case 'expired':
603 603
 				$title = __( 'Expired License', 'gravityview' );
@@ -653,12 +653,12 @@  discard block
 block discarded – undo
653 653
 	}
654 654
 
655 655
 	/**
656
-     * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason.
657
-     *
658
-     * @since 1.21.5
659
-     *
660
-     * @see GFAddOn::scripts()
661
-     *
656
+	 * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason.
657
+	 *
658
+	 * @since 1.21.5
659
+	 *
660
+	 * @see GFAddOn::scripts()
661
+	 *
662 662
 	 * @return array Array of scripts
663 663
 	 */
664 664
 	public function scripts() {
@@ -667,10 +667,10 @@  discard block
 block discarded – undo
667 667
 		$scripts[] = array(
668 668
 			'handle'  => 'gform_tooltip_init',
669 669
 			'enqueue' => array(
670
-                array(
671
-			        'admin_page' => array( 'app_settings' )
672
-                )
673
-            )
670
+				array(
671
+					'admin_page' => array( 'app_settings' )
672
+				)
673
+			)
674 674
 		);
675 675
 
676 676
 		return $scripts;
@@ -688,10 +688,10 @@  discard block
 block discarded – undo
688 688
 			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
689 689
 			'version' => Plugin::$version,
690 690
 			'deps' => array(
691
-                'gform_admin',
691
+				'gform_admin',
692 692
 				'gaddon_form_settings_css',
693
-                'gform_tooltip',
694
-                'gform_font_awesome',
693
+				'gform_tooltip',
694
+				'gform_font_awesome',
695 695
 			),
696 696
 			'enqueue' => array(
697 697
 				array( 'admin_page' => array(
@@ -859,7 +859,7 @@  discard block
 block discarded – undo
859 859
 					array(
860 860
 						'label' => _x( 'Show me beta versions if they are available.', 'gravityview' ),
861 861
 						'value' => '1',
862
-                        'name'  => 'beta',
862
+						'name'  => 'beta',
863 863
 					),
864 864
 				),
865 865
 				'description'   => __( 'You will have early access to the latest GravityView features and improvements. There may be bugs! If you encounter an issue, help make GravityView better by reporting it!', 'gravityview' ),
@@ -897,38 +897,38 @@  discard block
 block discarded – undo
897 897
 
898 898
 			if ( empty( $field['disabled'] ) ) {
899 899
 				unset( $field['disabled'] );
900
-            }
900
+			}
901 901
 		}
902 902
 
903
-        $sections = array(
904
-            array(
905
-                'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ),
906
-                'fields'      => $fields,
907
-            )
908
-        );
903
+		$sections = array(
904
+			array(
905
+				'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ),
906
+				'fields'      => $fields,
907
+			)
908
+		);
909 909
 
910
-        // custom 'update settings' button
911
-        $button = array(
912
-            'class' => 'button button-primary button-hero',
913
-            'type' => 'save',
914
-        );
910
+		// custom 'update settings' button
911
+		$button = array(
912
+			'class' => 'button button-primary button-hero',
913
+			'type' => 'save',
914
+		);
915 915
 
916 916
 		if ( $disabled_attribute ) {
917 917
 			$button['disabled'] = $disabled_attribute;
918 918
 		}
919 919
 
920
-        /**
921
-         * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page
922
-         * Extensions can tap in here to insert their own section and settings.
923
-         * <code>
924
-         *   $sections[] = array(
925
-         *      'title' => __( 'GravityView My Extension Settings', 'gravityview' ),
926
-         *      'fields' => $settings,
927
-         *   );
928
-         * </code>
929
-         * @param array $extension_settings Empty array, ready for extension settings!
930
-         */
931
-        $extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() );
920
+		/**
921
+		 * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page
922
+		 * Extensions can tap in here to insert their own section and settings.
923
+		 * <code>
924
+		 *   $sections[] = array(
925
+		 *      'title' => __( 'GravityView My Extension Settings', 'gravityview' ),
926
+		 *      'fields' => $settings,
927
+		 *   );
928
+		 * </code>
929
+		 * @param array $extension_settings Empty array, ready for extension settings!
930
+		 */
931
+		$extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() );
932 932
 
933 933
 		// If there are extensions, add a section for them
934 934
 		if ( ! empty( $extension_sections ) ) {
@@ -941,13 +941,13 @@  discard block
 block discarded – undo
941 941
 				}
942 942
 			}
943 943
 
944
-            $k = count( $extension_sections ) - 1 ;
945
-            $extension_sections[ $k ]['fields'][] = $button;
944
+			$k = count( $extension_sections ) - 1 ;
945
+			$extension_sections[ $k ]['fields'][] = $button;
946 946
 			$sections = array_merge( $sections, $extension_sections );
947 947
 		} else {
948
-            // add the 'update settings' button to the general section
949
-            $sections[0]['fields'][] = $button;
950
-        }
948
+			// add the 'update settings' button to the general section
949
+			$sections[0]['fields'][] = $button;
950
+		}
951 951
 
952 952
 		return $sections;
953 953
 	}
@@ -1001,9 +1001,9 @@  discard block
 block discarded – undo
1001 1001
 	 */
1002 1002
 	protected function settings_edd_license( $field, $echo = true ) {
1003 1003
 
1004
-	    if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
1005
-		    $field['input_type'] = 'password';
1006
-        }
1004
+		if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
1005
+			$field['input_type'] = 'password';
1006
+		}
1007 1007
 
1008 1008
 		$text = $this->settings_text( $field, false );
1009 1009
 
@@ -1020,9 +1020,9 @@  discard block
 block discarded – undo
1020 1020
 
1021 1021
 	/**
1022 1022
 	 * Allow pure HTML settings row
1023
-     *
1024
-     * @since 2.0.6
1025
-     *
1023
+	 *
1024
+	 * @since 2.0.6
1025
+	 *
1026 1026
 	 * @param array $field
1027 1027
 	 * @param bool $echo Whether to echo the
1028 1028
 	 *
@@ -1088,19 +1088,19 @@  discard block
 block discarded – undo
1088 1088
 	}
1089 1089
 
1090 1090
 	/**
1091
-     * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it
1092
-     *
1093
-     * Converts `$field['description']` to `$field['gv_description']`
1094
-     * Converts `$field['subtitle']` to `$field['description']`
1095
-     *
1096
-     * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description`
1097
-     * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description
1098
-     *
1099
-     * @since 1.21.5.2
1100
-     *
1091
+	 * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it
1092
+	 *
1093
+	 * Converts `$field['description']` to `$field['gv_description']`
1094
+	 * Converts `$field['subtitle']` to `$field['description']`
1095
+	 *
1096
+	 * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description`
1097
+	 * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description
1098
+	 *
1099
+	 * @since 1.21.5.2
1100
+	 *
1101 1101
 	 * @param array $field
1102
-     *
1103
-     * @return void
1102
+	 *
1103
+	 * @return void
1104 1104
 	 */
1105 1105
 	public function single_setting_row( $field ) {
1106 1106
 		$field['gv_description'] = Utils::get( $field, 'description' );
Please login to merge, or discard this patch.
Spacing   +50 added lines, -50 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 ) .
@@ -574,7 +574,7 @@  discard block
 block discarded – undo
574 574
 	 */
575 575
 	public function license_key_notice() {
576 576
 
577
-	    if( $this->is_save_postback() ) {
577
+	    if ( $this->is_save_postback() ) {
578 578
 		    $settings = $this->get_posted_settings();
579 579
 		    $license_key = \GV\Utils::get( $settings, 'license_key' );
580 580
 		    $license_status = \GV\Utils::get( $settings, 'license_key_status', 'inactive' );
@@ -592,7 +592,7 @@  discard block
 block discarded – undo
592 592
 		 * but didn't want to mess up the translation strings for the translators.
593 593
 		 */
594 594
 		$message = mb_substr( $message, 0, mb_strlen( $message ) - 1 );
595
-		$title = __ ( 'Inactive License', 'gravityview');
595
+		$title = __( 'Inactive License', 'gravityview' );
596 596
 		$status = '';
597 597
 		$update_below = false;
598 598
 		$primary_button_link = admin_url( 'edit.php?post_type=gravityview&amp;page=gravityview_settings' );
@@ -622,7 +622,7 @@  discard block
 block discarded – undo
622 622
 				$update_below = __( 'Activate your license key below.', 'gravityview' );
623 623
 				break;
624 624
 		}
625
-		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content='.$license_status.'&utm_campaign=Admin%20Notice';
625
+		$url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content=' . $license_status . '&utm_campaign=Admin%20Notice';
626 626
 
627 627
 		// Show a different notice on settings page for inactive licenses (hide the buttons)
628 628
 		if ( $update_below && gravityview_is_admin_page( '', 'settings' ) ) {
@@ -664,7 +664,7 @@  discard block
 block discarded – undo
664 664
 	public function scripts() {
665 665
 		$scripts = parent::scripts();
666 666
 
667
-		$scripts[] = array(
667
+		$scripts[ ] = array(
668 668
 			'handle'  => 'gform_tooltip_init',
669 669
 			'enqueue' => array(
670 670
                 array(
@@ -683,7 +683,7 @@  discard block
 block discarded – undo
683 683
 	public function styles() {
684 684
 		$styles = parent::styles();
685 685
 
686
-		$styles[] = array(
686
+		$styles[ ] = array(
687 687
 			'handle'  => 'gravityview_settings',
688 688
 			'src'     => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ),
689 689
 			'version' => Plugin::$version,
@@ -714,7 +714,7 @@  discard block
 block discarded – undo
714 714
 		 * If multisite and not network admin, we don't want the settings to show.
715 715
 		 * @since 1.7.6
716 716
 		 */
717
-		$show_submenu = ( ! is_multisite() ) ||  is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() );
717
+		$show_submenu = ( ! is_multisite() ) || is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() );
718 718
 
719 719
 		/**
720 720
 		 * Override whether to show the Settings menu on a per-blog basis.
@@ -762,26 +762,26 @@  discard block
 block discarded – undo
762 762
 				'label' => __( 'License Key', 'gravityview' ),
763 763
 				'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' ) ),
764 764
 				'type' => 'edd_license',
765
-				'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' )  && GRAVITYVIEW_LICENSE_KEY ),
765
+				'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ),
766 766
 				'data-pending-text' => __( 'Verifying license&hellip;', 'gravityview' ),
767
-				'default_value' => $default_settings['license_key'],
767
+				'default_value' => $default_settings[ 'license_key' ],
768 768
 				'class' => ( '' == $this->get( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key',
769 769
 			),
770 770
 			array(
771 771
 				'name' => 'license_key_response',
772
-				'default_value' => $default_settings['license_key_response'],
772
+				'default_value' => $default_settings[ 'license_key_response' ],
773 773
 				'type' => 'hidden',
774 774
 			),
775 775
 			array(
776 776
 				'name' => 'license_key_status',
777
-				'default_value' => $default_settings['license_key_status'],
777
+				'default_value' => $default_settings[ 'license_key_status' ],
778 778
 				'type' => 'hidden',
779 779
 			),
780 780
 			array(
781 781
 				'name' => 'support-email',
782 782
 				'type' => 'text',
783 783
 				'validate' => 'email',
784
-				'default_value' => $default_settings['support-email'],
784
+				'default_value' => $default_settings[ 'support-email' ],
785 785
 				'label' => __( 'Support Email', 'gravityview' ),
786 786
 				'description' => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ),
787 787
 				'class' => 'code regular-text',
@@ -793,7 +793,7 @@  discard block
 block discarded – undo
793 793
 				'name' => 'support_port',
794 794
 				'type' => 'radio',
795 795
 				'label' => __( 'Show Support Port?', 'gravityview' ),
796
-				'default_value' => $default_settings['support_port'],
796
+				'default_value' => $default_settings[ 'support_port' ],
797 797
 				'horizontal' => 1,
798 798
 				'choices' => array(
799 799
 					array(
@@ -812,7 +812,7 @@  discard block
 block discarded – undo
812 812
 				'name' => 'no-conflict-mode',
813 813
 				'type' => 'radio',
814 814
 				'label' => __( 'No-Conflict Mode', 'gravityview' ),
815
-				'default_value' => $default_settings['no-conflict-mode'],
815
+				'default_value' => $default_settings[ 'no-conflict-mode' ],
816 816
 				'horizontal' => 1,
817 817
 				'choices' => array(
818 818
 					array(
@@ -834,7 +834,7 @@  discard block
 block discarded – undo
834 834
 					'name' => 'rest_api',
835 835
 					'type' => 'radio',
836 836
 					'label' => __( 'REST API', 'gravityview' ),
837
-					'default_value' => $default_settings['rest_api'],
837
+					'default_value' => $default_settings[ 'rest_api' ],
838 838
 					'horizontal' => 1,
839 839
 					'choices' => array(
840 840
 						array(
@@ -853,7 +853,7 @@  discard block
 block discarded – undo
853 853
 				'name' => 'beta',
854 854
 				'type' => 'checkbox',
855 855
 				'label' => __( 'Become a Beta Tester', 'gravityview' ),
856
-				'default_value' => $default_settings['beta'],
856
+				'default_value' => $default_settings[ 'beta' ],
857 857
 				'horizontal' => 1,
858 858
 				'choices' => array(
859 859
 					array(
@@ -886,17 +886,17 @@  discard block
 block discarded – undo
886 886
 		 * @since 1.7.4
887 887
 		 */
888 888
 		foreach ( $fields as &$field ) {
889
-			$field['name']          = isset( $field['name'] ) ? $field['name'] : Utils::get( $field, 'id' );
890
-			$field['label']         = isset( $field['label'] ) ? $field['label'] : Utils::get( $field, 'title' );
891
-			$field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : Utils::get( $field, 'default' );
892
-			$field['description']   = isset( $field['description'] ) ? $field['description'] : Utils::get( $field, 'subtitle' );
889
+			$field[ 'name' ]          = isset( $field[ 'name' ] ) ? $field[ 'name' ] : Utils::get( $field, 'id' );
890
+			$field[ 'label' ]         = isset( $field[ 'label' ] ) ? $field[ 'label' ] : Utils::get( $field, 'title' );
891
+			$field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : Utils::get( $field, 'default' );
892
+			$field[ 'description' ]   = isset( $field[ 'description' ] ) ? $field[ 'description' ] : Utils::get( $field, 'subtitle' );
893 893
 
894 894
 			if ( $disabled_attribute ) {
895
-				$field['disabled']  = $disabled_attribute;
895
+				$field[ 'disabled' ] = $disabled_attribute;
896 896
 			}
897 897
 
898
-			if ( empty( $field['disabled'] ) ) {
899
-				unset( $field['disabled'] );
898
+			if ( empty( $field[ 'disabled' ] ) ) {
899
+				unset( $field[ 'disabled' ] );
900 900
             }
901 901
 		}
902 902
 
@@ -914,7 +914,7 @@  discard block
 block discarded – undo
914 914
         );
915 915
 
916 916
 		if ( $disabled_attribute ) {
917
-			$button['disabled'] = $disabled_attribute;
917
+			$button[ 'disabled' ] = $disabled_attribute;
918 918
 		}
919 919
 
920 920
         /**
@@ -933,20 +933,20 @@  discard block
 block discarded – undo
933 933
 		// If there are extensions, add a section for them
934 934
 		if ( ! empty( $extension_sections ) ) {
935 935
 
936
-			if( $disabled_attribute ) {
936
+			if ( $disabled_attribute ) {
937 937
 				foreach ( $extension_sections as &$section ) {
938
-					foreach ( $section['fields'] as &$field ) {
939
-						$field['disabled'] = $disabled_attribute;
938
+					foreach ( $section[ 'fields' ] as &$field ) {
939
+						$field[ 'disabled' ] = $disabled_attribute;
940 940
 					}
941 941
 				}
942 942
 			}
943 943
 
944
-            $k = count( $extension_sections ) - 1 ;
945
-            $extension_sections[ $k ]['fields'][] = $button;
944
+            $k = count( $extension_sections ) - 1;
945
+            $extension_sections[ $k ][ 'fields' ][ ] = $button;
946 946
 			$sections = array_merge( $sections, $extension_sections );
947 947
 		} else {
948 948
             // add the 'update settings' button to the general section
949
-            $sections[0]['fields'][] = $button;
949
+            $sections[ 0 ][ 'fields' ][ ] = $button;
950 950
         }
951 951
 
952 952
 		return $sections;
@@ -1002,7 +1002,7 @@  discard block
 block discarded – undo
1002 1002
 	protected function settings_edd_license( $field, $echo = true ) {
1003 1003
 
1004 1004
 	    if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) {
1005
-		    $field['input_type'] = 'password';
1005
+		    $field[ 'input_type' ] = 'password';
1006 1006
         }
1007 1007
 
1008 1008
 		$text = $this->settings_text( $field, false );
@@ -1051,7 +1051,7 @@  discard block
 block discarded – undo
1051 1051
 	public function single_setting_row_html( $field ) {
1052 1052
 		?>
1053 1053
 
1054
-        <tr id="gaddon-setting-row-<?php echo esc_attr( $field['name'] ); ?>">
1054
+        <tr id="gaddon-setting-row-<?php echo esc_attr( $field[ 'name' ] ); ?>">
1055 1055
             <td colspan="2">
1056 1056
 				<?php $this->single_setting( $field ); ?>
1057 1057
             </td>
@@ -1069,10 +1069,10 @@  discard block
 block discarded – undo
1069 1069
 	 * @return string
1070 1070
 	 */
1071 1071
 	public function settings_save( $field, $echo = true ) {
1072
-		$field['type']  = 'submit';
1073
-		$field['name']  = 'gform-settings-save';
1074
-		$field['class'] = isset( $field['class'] ) ? $field['class'] : 'button-primary gfbutton';
1075
-		$field['value'] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
1072
+		$field[ 'type' ]  = 'submit';
1073
+		$field[ 'name' ]  = 'gform-settings-save';
1074
+		$field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] : 'button-primary gfbutton';
1075
+		$field[ 'value' ] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) );
1076 1076
 
1077 1077
 		$output = $this->settings_submit( $field, false );
1078 1078
 
@@ -1103,8 +1103,8 @@  discard block
 block discarded – undo
1103 1103
      * @return void
1104 1104
 	 */
1105 1105
 	public function single_setting_row( $field ) {
1106
-		$field['gv_description'] = Utils::get( $field, 'description' );
1107
-		$field['description']    = Utils::get( $field, 'subtitle' );
1106
+		$field[ 'gv_description' ] = Utils::get( $field, 'description' );
1107
+		$field[ 'description' ]    = Utils::get( $field, 'subtitle' );
1108 1108
 		parent::single_setting_row( $field );
1109 1109
 	}
1110 1110
 
@@ -1116,7 +1116,7 @@  discard block
 block discarded – undo
1116 1116
 	public function single_setting_label( $field ) {
1117 1117
 		parent::single_setting_label( $field );
1118 1118
 		if ( $description = Utils::get( $field, 'gv_description' ) ) {
1119
-			echo '<span class="description">'. $description .'</span>';
1119
+			echo '<span class="description">' . $description . '</span>';
1120 1120
 		}
1121 1121
 	}
1122 1122
 
@@ -1153,9 +1153,9 @@  discard block
 block discarded – undo
1153 1153
 		// If the posted key doesn't match the activated/deactivated key (set using the Activate License button, AJAX response),
1154 1154
 		// then we assume it's changed. If it's changed, unset the status and the previous response.
1155 1155
 		if ( $local_key !== $response_key ) {
1156
-			unset( $posted_settings['license_key_response'] );
1157
-			unset( $posted_settings['license_key_status'] );
1158
-			\GFCommon::add_error_message( __('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
1156
+			unset( $posted_settings[ 'license_key_response' ] );
1157
+			unset( $posted_settings[ 'license_key_status' ] );
1158
+			\GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) );
1159 1159
 		}
1160 1160
 		return $posted_settings;
1161 1161
 	}
Please login to merge, or discard this patch.
future/includes/class-gv-source-internal.php 1 patch
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -24,9 +24,8 @@
 block discarded – undo
24 24
 	/**
25 25
 	 * Get a \GV\Field by Field ID for this data source.
26 26
 	 *
27
-	 * @param int $field_id The internal field ID (custom content, etc.)
28 27
 	 *
29
-	 * @return \GV\Field|null The requested field or null if not found.
28
+	 * @return null|Internal_Field The requested field or null if not found.
30 29
 	 */
31 30
 	public static function get_field( /** varargs */ ) {
32 31
 		$args = func_get_args();
Please login to merge, or discard this patch.
future/includes/class-gv-shortcode-gravityview.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -37,8 +37,8 @@  discard block
 block discarded – undo
37 37
 			'detail' => null,
38 38
 		) );
39 39
 		
40
-		if ( ! $view_id = $atts['id'] ? : $atts['view_id'] ) {
41
-			if ( $atts['detail'] && $view = $request->is_view() ) {
40
+		if ( ! $view_id = $atts[ 'id' ] ?: $atts[ 'view_id' ] ) {
41
+			if ( $atts[ 'detail' ] && $view = $request->is_view() ) {
42 42
 				$view_id = $view->ID;
43 43
 			}
44 44
 		}
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 			return get_the_password_form( $view->ID );
77 77
 		}
78 78
 
79
-		if ( ! $view->form  ) {
79
+		if ( ! $view->form ) {
80 80
 			gravityview()->log->notice( 'View #{id} has no form attached to it.', array( 'id' => $view->ID ) );
81 81
 
82 82
 			/**
@@ -97,12 +97,12 @@  discard block
 block discarded – undo
97 97
 			return __( 'You are not allowed to view this content.', 'gravityview' );
98 98
 		}
99 99
 
100
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
100
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
101 101
 
102 102
 		/**
103 103
 		 * View details.
104 104
 		 */
105
-		if ( $atts['detail'] ) {
105
+		if ( $atts[ 'detail' ] ) {
106 106
 			return $this->detail( $view, $entries, $atts );
107 107
 
108 108
 		/**
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 				return '';
117 117
 			}
118 118
 
119
-			if ( $entry['status'] != 'active' ) {
119
+			if ( $entry[ 'status' ] != 'active' ) {
120 120
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
121 121
 				return __( 'You are not allowed to view this content.', 'gravityview' );
122 122
 			}
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 			}
128 128
 
129 129
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
130
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
130
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
131 131
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
132 132
 					return __( 'You are not allowed to view this content.', 'gravityview' );
133 133
 				}
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 				return '';
148 148
 			}
149 149
 
150
-			if ( $entry['status'] != 'active' ) {
150
+			if ( $entry[ 'status' ] != 'active' ) {
151 151
 				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) );
152 152
 				return __( 'You are not allowed to view this content.', 'gravityview' );
153 153
 			}
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 			}
159 159
 
160 160
 			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
161
-				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
161
+				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
162 162
 					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
163 163
 					return __( 'You are not allowed to view this content.', 'gravityview' );
164 164
 				}
@@ -175,10 +175,10 @@  discard block
 block discarded – undo
175 175
 				
176 176
 				// Mock the request with the actual View, not the global one
177 177
 				$mock_request = new \GV\Mock_Request();
178
-				$mock_request->returns['is_view'] = $view;
179
-				$mock_request->returns['is_entry'] = $request->is_entry();
180
-				$mock_request->returns['is_edit_entry'] = $request->is_edit_entry();
181
-				$mock_request->returns['is_search'] = $request->is_search();
178
+				$mock_request->returns[ 'is_view' ] = $view;
179
+				$mock_request->returns[ 'is_entry' ] = $request->is_entry();
180
+				$mock_request->returns[ 'is_edit_entry' ] = $request->is_edit_entry();
181
+				$mock_request->returns[ 'is_search' ] = $request->is_search();
182 182
 
183 183
 				$request = $mock_request;
184 184
 			}
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
 	private function detail( $view, $entries, $atts ) {
201 201
 		$output = '';
202 202
 
203
-		switch ( $key = $atts['detail'] ):
203
+		switch ( $key = $atts[ 'detail' ] ):
204 204
 			case 'total_entries':
205 205
 				$output = number_format_i18n( $entries->total() );
206 206
 				break;
Please login to merge, or discard this patch.
future/includes/rest/class-gv-rest-views-route.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 			'total' => wp_count_posts( 'gravityview' )->publish,
64 64
 		);
65 65
 		foreach ( $items as $item ) {
66
-			$data['views'][] = $this->prepare_view_for_response( $item, $request );
66
+			$data[ 'views' ][ ] = $this->prepare_view_for_response( $item, $request );
67 67
 		}
68 68
 
69 69
 		return new \WP_REST_Response( $data, 200 );
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 
83 83
 		$url = $request->get_url_params();
84 84
 
85
-		$view_id = intval( $url['id'] );
85
+		$view_id = intval( $url[ 'id' ] );
86 86
 
87 87
 		$item = get_post( $view_id );
88 88
 
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 		// Only output the fields that should be displayed.
112 112
 		$allowed = array();
113 113
 		foreach ( $view->fields->by_position( "{$context}_*" )->by_visible()->all() as $field ) {
114
-			$allowed[] = $field->ID;
114
+			$allowed[ ] = $field->ID;
115 115
 		}
116 116
 
117 117
 		/**
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 	public function get_sub_items( $request ) {
157 157
 
158 158
 		$url     = $request->get_url_params();
159
-		$view_id = intval( $url['id'] );
159
+		$view_id = intval( $url[ 'id' ] );
160 160
 		$format  = \GV\Utils::get( $url, 'format', 'json' );
161 161
 
162 162
 		$view = \GV\View::by_id( $view_id );
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 
200 200
 		$data = array( 'entries' => $entries->all(), 'total' => $entries->total() );
201 201
 
202
-		foreach ( $data['entries'] as &$entry ) {
202
+		foreach ( $data[ 'entries' ] as &$entry ) {
203 203
 			$entry = $this->prepare_entry_for_response( $view, $entry, $request, 'directory' );
204 204
 		}
205 205
 
@@ -218,8 +218,8 @@  discard block
 block discarded – undo
218 218
 	 */
219 219
 	public function get_sub_item( $request ) {
220 220
 		$url      = $request->get_url_params();
221
-		$view_id  = intval( $url['id'] );
222
-		$entry_id = intval( $url['s_id'] );
221
+		$view_id  = intval( $url[ 'id' ] );
222
+		$entry_id = intval( $url[ 's_id' ] );
223 223
 		$format   = \GV\Utils::get( $url, 'format', 'json' );
224 224
 
225 225
 		$view  = \GV\View::by_id( $view_id );
@@ -254,32 +254,32 @@  discard block
 block discarded – undo
254 254
 		// Add all the WP_Post data
255 255
 		$view_post = $view_post->to_array();
256 256
 
257
-		unset( $view_post['to_ping'], $view_post['ping_status'], $view_post['pinged'], $view_post['post_type'], $view_post['filter'], $view_post['post_category'], $view_post['tags_input'], $view_post['post_content'], $view_post['post_content_filtered'] );
257
+		unset( $view_post[ 'to_ping' ], $view_post[ 'ping_status' ], $view_post[ 'pinged' ], $view_post[ 'post_type' ], $view_post[ 'filter' ], $view_post[ 'post_category' ], $view_post[ 'tags_input' ], $view_post[ 'post_content' ], $view_post[ 'post_content_filtered' ] );
258 258
 
259 259
 		$return = wp_parse_args( $item, $view_post );
260 260
 
261
-		$return['title'] = $return['post_title'];
261
+		$return[ 'title' ] = $return[ 'post_title' ];
262 262
 
263
-		$return['settings'] = isset( $return['atts'] ) ? $return['atts'] : array();
264
-		unset( $return['atts'], $return['view_id'] );
263
+		$return[ 'settings' ] = isset( $return[ 'atts' ] ) ? $return[ 'atts' ] : array();
264
+		unset( $return[ 'atts' ], $return[ 'view_id' ] );
265 265
 
266
-		$return['search_criteria'] = array(
266
+		$return[ 'search_criteria' ] = array(
267 267
 			'page_size' => rgars( $return, 'settings/page_size' ),
268 268
 			'sort_field' => rgars( $return, 'settings/sort_field' ),
269 269
 			'sort_direction' => rgars( $return, 'settings/sort_direction' ),
270 270
 			'offset' => rgars( $return, 'settings/offset' ),
271 271
 		);
272 272
 
273
-		unset( $return['settings']['page_size'], $return['settings']['sort_field'], $return['settings']['sort_direction'] );
273
+		unset( $return[ 'settings' ][ 'page_size' ], $return[ 'settings' ][ 'sort_field' ], $return[ 'settings' ][ 'sort_direction' ] );
274 274
 
275 275
 		// Redact for non-logged ins
276 276
 		if ( ! \GVCommon::has_cap( 'edit_others_gravityviews' ) ) {
277
-			unset( $return['settings'] );
278
-			unset( $return['search_criteria'] );
277
+			unset( $return[ 'settings' ] );
278
+			unset( $return[ 'search_criteria' ] );
279 279
 		}
280 280
 		
281 281
 		if ( ! \GFCommon::current_user_can_any( 'gravityforms_edit_forms' ) ) {
282
-			unset( $return['form'] );
282
+			unset( $return[ 'form' ] );
283 283
 		}
284 284
 
285 285
 		return $return;
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 			$view_id = func_get_arg( 1 ); // $view_id override
291 291
 		} else {
292 292
 			$url     = $request->get_url_params();
293
-			$view_id = intval( $url['id'] );
293
+			$view_id = intval( $url[ 'id' ] );
294 294
 		}
295 295
 
296 296
 		if ( ! $view = \GV\View::by_id( $view_id ) ) {
@@ -343,8 +343,8 @@  discard block
 block discarded – undo
343 343
 		}
344 344
 
345 345
 		$url     = $request->get_url_params();
346
-		$view_id = intval( $url['id'] );
347
-		$entry_id = intval( $url['s_id'] );
346
+		$view_id = intval( $url[ 'id' ] );
347
+		$entry_id = intval( $url[ 's_id' ] );
348 348
 
349 349
 		$view = \GV\View::by_id( $view_id );
350 350
 
@@ -352,11 +352,11 @@  discard block
 block discarded – undo
352 352
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
353 353
 		}
354 354
 
355
-		if ( $entry['form_id'] != $view->form->ID ) {
355
+		if ( $entry[ 'form_id' ] != $view->form->ID ) {
356 356
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
357 357
 		}
358 358
 
359
-		if ( $entry['status'] != 'active' ) {
359
+		if ( $entry[ 'status' ] != 'active' ) {
360 360
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
361 361
 		}
362 362
 
@@ -364,10 +364,10 @@  discard block
 block discarded – undo
364 364
 			return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
365 365
 		}
366 366
 
367
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
367
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
368 368
 
369 369
 		if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
370
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
370
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
371 371
 				return new \WP_Error( 'rest_forbidden', 'You are not allowed to view this content.', 'gravityview' );
372 372
 			}
373 373
 		}
Please login to merge, or discard this patch.
future/includes/class-gv-shortcode-gventry.php 1 patch
Spacing   +16 added lines, -16 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,15 +143,15 @@  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
-		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID );
151
+		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );
152 152
 
153 153
 		if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) {
154
-			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) {
154
+			if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) {
155 155
 				gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) );
156 156
 				return apply_filters( 'gravityview/shortcodes/gventry/output', '', $view, $entry, $atts );
157 157
 			}
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 		$renderer = new \GV\Entry_Renderer();
164 164
 
165 165
 		$request = new \GV\Mock_Request();
166
-		$request->returns['is_entry'] = $entry;
166
+		$request->returns[ 'is_entry' ] = $entry;
167 167
 
168 168
 		$output = $renderer->render( $entry, $view, $request );
169 169
 
Please login to merge, or discard this patch.
future/includes/class-gv-field-internal.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -29,12 +29,12 @@
 block discarded – undo
29 29
 	 */
30 30
 	public static function from_configuration( $configuration ) {
31 31
 
32
-		if ( empty( $configuration['id'] ) || ! is_string( $configuration['id'] ) ) {
32
+		if ( empty( $configuration[ 'id' ] ) || ! is_string( $configuration[ 'id' ] ) ) {
33 33
 			gravityview()->log->error( 'Invalid configuration[id] supplied.' );
34 34
 			return null;
35 35
 		}
36 36
 
37
-		$field = self::by_id( $configuration['id'] );
37
+		$field = self::by_id( $configuration[ 'id' ] );
38 38
 
39 39
 		$field->update_configuration( $configuration );
40 40
 
Please login to merge, or discard this patch.
future/includes/class-gv-field.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 	 * @return \GV\Field The field implementation from configuration (\GV\GF_Field, \GV\Internal_Field).
167 167
 	 */
168 168
 	public static function from_configuration( $configuration ) {
169
-		if ( empty( $configuration['id'] ) ) {
169
+		if ( empty( $configuration[ 'id' ] ) ) {
170 170
 			$field = new self();
171 171
 			gravityview()->log->error( 'Trying to get field from configuration without a field ID.', array( 'data' => $configuration ) );
172 172
 			$field->update_configuration( $configuration );
@@ -179,8 +179,8 @@  discard block
 block discarded – undo
179 179
 		} else {
180 180
 			$trace = debug_backtrace( DEBUG_BACKTRACE_IGNORE_ARGS );
181 181
 		}
182
-		$trace = $trace[1];
183
-		if ( $trace['function'] == 'from_configuration' && $trace['class'] == __CLASS__ ) {
182
+		$trace = $trace[ 1 ];
183
+		if ( $trace[ 'function' ] == 'from_configuration' && $trace[ 'class' ] == __CLASS__ ) {
184 184
 			$field = new self();
185 185
 			gravityview()->log->error( 'Infinite loop protection tripped. Returning default class here.' );
186 186
 			$field->update_configuration( $configuration );
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 		}
189 189
 
190 190
 		/** Determine the field implementation to use, and try to use. */
191
-		$field_class = is_numeric( $configuration['id'] ) ? '\GV\GF_Field' : '\GV\Internal_Field';
191
+		$field_class = is_numeric( $configuration[ 'id' ] ) ? '\GV\GF_Field' : '\GV\Internal_Field';
192 192
 
193 193
 		/**
194 194
 		 * @filter `gravityview/field/class` Filter the field class about to be created from the configuration.
@@ -227,24 +227,24 @@  discard block
 block discarded – undo
227 227
 	public function update_configuration( $configuration ) {
228 228
 		$configuration = wp_parse_args( $configuration, $this->as_configuration() );
229 229
 
230
-		if ( $this->ID != $configuration['id'] ) {
230
+		if ( $this->ID != $configuration[ 'id' ] ) {
231 231
 			/** Smelling trouble here... */
232 232
 			gravityview()->log->warning( 'ID is being changed for {field_class} instance, but implementation is not. Use ::from_configuration instead', array( 'field_class', __CLASS__ ) );
233 233
 		}
234 234
 
235
-		$this->ID = $configuration['id'];
236
-		$this->label = $configuration['label'];
237
-		$this->show_label = $configuration['show_label'] == '1';
238
-		$this->custom_label = $configuration['custom_label'];
239
-		$this->custom_class = $configuration['custom_class'];
240
-		$this->cap = $configuration['only_loggedin'] == '1' ? $configuration['only_loggedin_cap'] : '';
241
-		$this->search_filter = $configuration['search_filter'] == '1';
242
-		$this->show_as_link = $configuration['show_as_link'] == '1';
235
+		$this->ID = $configuration[ 'id' ];
236
+		$this->label = $configuration[ 'label' ];
237
+		$this->show_label = $configuration[ 'show_label' ] == '1';
238
+		$this->custom_label = $configuration[ 'custom_label' ];
239
+		$this->custom_class = $configuration[ 'custom_class' ];
240
+		$this->cap = $configuration[ 'only_loggedin' ] == '1' ? $configuration[ 'only_loggedin_cap' ] : '';
241
+		$this->search_filter = $configuration[ 'search_filter' ] == '1';
242
+		$this->show_as_link = $configuration[ 'show_as_link' ] == '1';
243 243
 
244 244
 		/** Shared among all field types (sort of). */
245 245
 		$shared_configuration_keys = array(
246 246
 			'id', 'label', 'show_label', 'custom_label', 'custom_class',
247
-			'only_loggedin' ,'only_loggedin_cap', 'search_filter', 'show_as_link',
247
+			'only_loggedin', 'only_loggedin_cap', 'search_filter', 'show_as_link',
248 248
 		);
249 249
 
250 250
 		/** Everything else goes into the properties for now. @todo subclasses! */
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
 
274 274
 		/** A custom label is available. */
275 275
 		if ( ! empty( $this->custom_label ) ) {
276
-			return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ? : null : null, $entry ? $entry->as_entry() : null );
276
+			return \GravityView_API::replace_variables( $this->custom_label, $source ? $source->form ?: null : null, $entry ? $entry->as_entry() : null );
277 277
 		}
278 278
 
279 279
 		return '';
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
 	 * @return mixed|null The value for the given configuration key, null if doesn't exist.
351 351
 	 */
352 352
 	public function __get( $key ) {
353
-		switch( $key ):
353
+		switch ( $key ):
354 354
 			default:
355 355
 				if ( isset( $this->configuration[ $key ] ) ) {
356 356
 					return $this->configuration[ $key ];
@@ -366,7 +366,7 @@  discard block
 block discarded – undo
366 366
 	 * @return boolean Whether this $key is set or not.
367 367
 	 */
368 368
 	public function __isset( $key ) {
369
-		switch( $key ):
369
+		switch ( $key ):
370 370
 			default:
371 371
 				return isset( $this->configuration[ $key ] );
372 372
 		endswitch;
Please login to merge, or discard this patch.