@@ -33,7 +33,7 @@  | 
                                                    ||
| 33 | 33 | $secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings['sort_field'][1] );  | 
                                                        
| 34 | 34 |  	} else { | 
                                                        
| 35 | 35 | $primary_sort_fields = $secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings['sort_field'] );  | 
                                                        
| 36 | - }  | 
                                                        |
| 36 | + }  | 
                                                        |
| 37 | 37 | |
| 38 | 38 | |
| 39 | 39 | GravityView_Render_Settings::render_setting_row( 'sort_field', $current_settings, sprintf( $sort_fields_input, $primary_sort_fields ) );  | 
                                                        
@@ -28,11 +28,11 @@  | 
                                                    ||
| 28 | 28 | |
| 29 | 29 | $sort_fields_input = '<select name="template_settings[sort_field][]" id="gravityview_sort_field">%s</select>';  | 
                                                        
| 30 | 30 | |
| 31 | -	if ( is_array( $current_settings['sort_field'] ) ) { | 
                                                        |
| 32 | - $primary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings['sort_field'][0] );  | 
                                                        |
| 33 | - $secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings['sort_field'][1] );  | 
                                                        |
| 31 | +	if ( is_array( $current_settings[ 'sort_field' ] ) ) { | 
                                                        |
| 32 | + $primary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings[ 'sort_field' ][ 0 ] );  | 
                                                        |
| 33 | + $secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings[ 'sort_field' ][ 1 ] );  | 
                                                        |
| 34 | 34 |  	} else { | 
                                                        
| 35 | - $primary_sort_fields = $secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings['sort_field'] );  | 
                                                        |
| 35 | + $primary_sort_fields = $secondary_sort_fields = gravityview_get_sortable_fields( $curr_form, $current_settings[ 'sort_field' ] );  | 
                                                        |
| 36 | 36 | }  | 
                                                        
| 37 | 37 | |
| 38 | 38 | |
@@ -98,15 +98,15 @@ discard block  | 
                                                    ||
| 98 | 98 | $additional = array();  | 
                                                        
| 99 | 99 | |
| 100 | 100 | // form-19-table-body.php  | 
                                                        
| 101 | - $additional[] = sprintf( 'form-%d-%s-%s.php', $this->view->form ? $this->view->form->ID : 0, $slug, $name );  | 
                                                        |
| 101 | + $additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->view->form ? $this->view->form->ID : 0, $slug, $name );  | 
                                                        |
| 102 | 102 | |
| 103 | 103 | // view-3-table-body.php  | 
                                                        
| 104 | - $additional[] = sprintf( 'view-%d-%s-%s.php', $this->view->ID, $slug, $name );  | 
                                                        |
| 104 | + $additional[ ] = sprintf( 'view-%d-%s-%s.php', $this->view->ID, $slug, $name );  | 
                                                        |
| 105 | 105 | |
| 106 | 106 | global $post;  | 
                                                        
| 107 | 107 |  		if ( $post ) { | 
                                                        
| 108 | 108 | // page-19-table-body.php  | 
                                                        
| 109 | - $additional[] = sprintf( 'page-%d-%s-%s.php', $post->ID, $slug, $name );  | 
                                                        |
| 109 | + $additional[ ] = sprintf( 'page-%d-%s-%s.php', $post->ID, $slug, $name );  | 
                                                        |
| 110 | 110 | }  | 
                                                        
| 111 | 111 | |
| 112 | 112 | // Combine with existing table-body.php and table.php  | 
                                                        
@@ -130,7 +130,7 @@ discard block  | 
                                                    ||
| 130 | 130 | ob_start();  | 
                                                        
| 131 | 131 | |
| 132 | 132 | $request = new Mock_Request();  | 
                                                        
| 133 | - $request->returns['is_view'] = $this->view;  | 
                                                        |
| 133 | + $request->returns[ 'is_view' ] = $this->view;  | 
                                                        |
| 134 | 134 | |
| 135 | 135 | /**  | 
                                                        
| 136 | 136 | * You got one shot. One opportunity. To render all the widgets you have ever wanted.  | 
                                                        
@@ -144,17 +144,17 @@ discard block  | 
                                                    ||
| 144 | 144 |  		foreach ( array( 'gravityview_before', 'gravityview_after' ) as $hook ) { | 
                                                        
| 145 | 145 | /** WordPress 4.6 and lower compatibility, when WP_Hook classes were still absent. */  | 
                                                        
| 146 | 146 |  			if ( is_array( $wp_filter[ $hook ] ) ) { | 
                                                        
| 147 | -				if ( ! empty( $wp_filter[ $hook ][10] ) ) { | 
                                                        |
| 148 | -					foreach ( $wp_filter[ $hook ][10] as $function_key => $callback ) { | 
                                                        |
| 147 | +				if ( ! empty( $wp_filter[ $hook ][ 10 ] ) ) { | 
                                                        |
| 148 | +					foreach ( $wp_filter[ $hook ][ 10 ] as $function_key => $callback ) { | 
                                                        |
| 149 | 149 |  						if ( strpos( $function_key, 'render_widget_hooks' ) ) { | 
                                                        
| 150 | - unset( $wp_filter[ $hook ][10][ $function_key ] );  | 
                                                        |
| 150 | + unset( $wp_filter[ $hook ][ 10 ][ $function_key ] );  | 
                                                        |
| 151 | 151 | }  | 
                                                        
| 152 | 152 | }  | 
                                                        
| 153 | 153 | }  | 
                                                        
| 154 | 154 |  			} else { | 
                                                        
| 155 | -				foreach ( $wp_filter[ $hook ]->callbacks[10] as $function_key => $callback ) { | 
                                                        |
| 155 | +				foreach ( $wp_filter[ $hook ]->callbacks[ 10 ] as $function_key => $callback ) { | 
                                                        |
| 156 | 156 |  					if ( strpos( $function_key, 'render_widget_hooks' ) ) { | 
                                                        
| 157 | - unset( $wp_filter[ $hook ]->callbacks[10][ $function_key ] );  | 
                                                        |
| 157 | + unset( $wp_filter[ $hook ]->callbacks[ 10 ][ $function_key ] );  | 
                                                        |
| 158 | 158 | }  | 
                                                        
| 159 | 159 | }  | 
                                                        
| 160 | 160 | }  | 
                                                        
@@ -165,7 +165,7 @@ discard block  | 
                                                    ||
| 165 | 165 | */  | 
                                                        
| 166 | 166 |  		if ( $this->entry ) { | 
                                                        
| 167 | 167 | |
| 168 | - $request->returns['is_entry'] = $this->entry;  | 
                                                        |
| 168 | + $request->returns[ 'is_entry' ] = $this->entry;  | 
                                                        |
| 169 | 169 | |
| 170 | 170 | global $post;  | 
                                                        
| 171 | 171 | |
@@ -199,11 +199,11 @@ discard block  | 
                                                    ||
| 199 | 199 | * This allows us to fake it till we make it.  | 
                                                        
| 200 | 200 | */  | 
                                                        
| 201 | 201 | $parameters = $view->settings->as_atts();  | 
                                                        
| 202 | -			if ( ! empty( $parameters['sort_field'] ) && is_array( $parameters['sort_field'] ) ) { | 
                                                        |
| 202 | +			if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) { | 
                                                        |
| 203 | 203 | $has_multisort = true;  | 
                                                        
| 204 | - $parameters['sort_field'] = reset( $parameters['sort_field'] );  | 
                                                        |
| 205 | -				if ( ! empty( $parameters['sort_direction'] ) && is_array( $parameters['sort_direction'] ) ) { | 
                                                        |
| 206 | - $parameters['sort_direction'] = reset( $parameters['sort_direction'] );  | 
                                                        |
| 204 | + $parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] );  | 
                                                        |
| 205 | +				if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) { | 
                                                        |
| 206 | + $parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] );  | 
                                                        |
| 207 | 207 | }  | 
                                                        
| 208 | 208 | }  | 
                                                        
| 209 | 209 | |
@@ -222,8 +222,8 @@ discard block  | 
                                                    ||
| 222 | 222 | 'fields' => $this->view->fields->by_visible(),  | 
                                                        
| 223 | 223 | 'in_the_loop' => true,  | 
                                                        
| 224 | 224 | ), empty( $parameters ) ? array() : array(  | 
                                                        
| 225 | - 'paging' => $parameters['paging'],  | 
                                                        |
| 226 | - 'sorting' => $parameters['sorting'],  | 
                                                        |
| 225 | + 'paging' => $parameters[ 'paging' ],  | 
                                                        |
| 226 | + 'sorting' => $parameters[ 'sorting' ],  | 
                                                        |
| 227 | 227 | ), $post ? array(  | 
                                                        
| 228 | 228 | 'post' => $post,  | 
                                                        
| 229 | 229 | ) : array() ) );  | 
                                                        
@@ -109,11 +109,11 @@ discard block  | 
                                                    ||
| 109 | 109 | * This allows us to fake it till we make it.  | 
                                                        
| 110 | 110 | */  | 
                                                        
| 111 | 111 | $parameters = $view->settings->as_atts();  | 
                                                        
| 112 | -		if ( ! empty( $parameters['sort_field'] ) && is_array( $parameters['sort_field'] ) ) { | 
                                                        |
| 112 | +		if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) { | 
                                                        |
| 113 | 113 | $has_multisort = true;  | 
                                                        
| 114 | - $parameters['sort_field'] = reset( $parameters['sort_field'] );  | 
                                                        |
| 115 | -			if ( ! empty( $parameters['sort_direction'] ) && is_array( $parameters['sort_direction'] ) ) { | 
                                                        |
| 116 | - $parameters['sort_direction'] = reset( $parameters['sort_direction'] );  | 
                                                        |
| 114 | + $parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] );  | 
                                                        |
| 115 | +			if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) { | 
                                                        |
| 116 | + $parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] );  | 
                                                        |
| 117 | 117 | }  | 
                                                        
| 118 | 118 | }  | 
                                                        
| 119 | 119 | |
@@ -128,8 +128,8 @@ discard block  | 
                                                    ||
| 128 | 128 | 'entries' => $entries,  | 
                                                        
| 129 | 129 | 'request' => $request,  | 
                                                        
| 130 | 130 | ), empty( $parameters ) ? array() : array(  | 
                                                        
| 131 | - 'paging' => $parameters['paging'],  | 
                                                        |
| 132 | - 'sorting' => $parameters['sorting'],  | 
                                                        |
| 131 | + 'paging' => $parameters[ 'paging' ],  | 
                                                        |
| 132 | + 'sorting' => $parameters[ 'sorting' ],  | 
                                                        |
| 133 | 133 | ), empty( $post ) ? array() : array(  | 
                                                        
| 134 | 134 | 'post' => $post,  | 
                                                        
| 135 | 135 | ) ) );  | 
                                                        
@@ -125,7 +125,7 @@ discard block  | 
                                                    ||
| 125 | 125 | $supports = array( 'title', 'revisions' );  | 
                                                        
| 126 | 126 | |
| 127 | 127 |  		if ( $is_hierarchical ) { | 
                                                        
| 128 | - $supports[] = 'page-attributes';  | 
                                                        |
| 128 | + $supports[ ] = 'page-attributes';  | 
                                                        |
| 129 | 129 | }  | 
                                                        
| 130 | 130 | |
| 131 | 131 | /**  | 
                                                        
@@ -227,11 +227,11 @@ discard block  | 
                                                    ||
| 227 | 227 | $rule = array( sprintf( '%s/([^/]+)/csv/?', $slug ), 'index.php?gravityview=$matches[1]&csv=1', 'top' );  | 
                                                        
| 228 | 228 | |
| 229 | 229 |  		add_filter( 'query_vars', function( $query_vars ) {  | 
                                                        
| 230 | - $query_vars[] = 'csv';  | 
                                                        |
| 230 | + $query_vars[ ] = 'csv';  | 
                                                        |
| 231 | 231 | return $query_vars;  | 
                                                        
| 232 | 232 | } );  | 
                                                        
| 233 | 233 | |
| 234 | -		if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[0] ] ) ) { | 
                                                        |
| 234 | +		if ( ! isset( $wp_rewrite->extra_rules_top[ $rule[ 0 ] ] ) ) { | 
                                                        |
| 235 | 235 | call_user_func_array( 'add_rewrite_rule', $rule );  | 
                                                        
| 236 | 236 | }  | 
                                                        
| 237 | 237 | }  | 
                                                        
@@ -300,13 +300,13 @@ discard block  | 
                                                    ||
| 300 | 300 | return $content;  | 
                                                        
| 301 | 301 | }  | 
                                                        
| 302 | 302 | |
| 303 | -		$is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID ); | 
                                                        |
| 303 | + $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID );  | 
                                                        |
| 304 | 304 | |
| 305 | 305 | /**  | 
                                                        
| 306 | 306 | * Editing a single entry.  | 
                                                        
| 307 | 307 | */  | 
                                                        
| 308 | 308 |  		if ( $entry = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ) ) { | 
                                                        
| 309 | -			if ( $entry['status'] != 'active' ) { | 
                                                        |
| 309 | +			if ( $entry[ 'status' ] != 'active' ) { | 
                                                        |
| 310 | 310 |  				gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); | 
                                                        
| 311 | 311 | return __( 'You are not allowed to view this content.', 'gravityview' );  | 
                                                        
| 312 | 312 | }  | 
                                                        
@@ -317,7 +317,7 @@ discard block  | 
                                                    ||
| 317 | 317 | }  | 
                                                        
| 318 | 318 | |
| 319 | 319 |  			if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { | 
                                                        
| 320 | -				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) )  ) { | 
                                                        |
| 320 | +				if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { | 
                                                        |
| 321 | 321 |  					gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); | 
                                                        
| 322 | 322 | return __( 'You are not allowed to view this content.', 'gravityview' );  | 
                                                        
| 323 | 323 | }  | 
                                                        
@@ -340,7 +340,7 @@ discard block  | 
                                                    ||
| 340 | 340 | |
| 341 | 341 |  			foreach ( $entryset as $e ) { | 
                                                        
| 342 | 342 | |
| 343 | -				if ( 'active' !== $e['status'] ) { | 
                                                        |
| 343 | +				if ( 'active' !== $e[ 'status' ] ) { | 
                                                        |
| 344 | 344 |  					gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $e->ID ) ); | 
                                                        
| 345 | 345 | return __( 'You are not allowed to view this content.', 'gravityview' );  | 
                                                        
| 346 | 346 | }  | 
                                                        
@@ -351,7 +351,7 @@ discard block  | 
                                                    ||
| 351 | 351 | }  | 
                                                        
| 352 | 352 | |
| 353 | 353 |  				if ( $show_only_approved && ! $is_admin_and_can_view ) { | 
                                                        
| 354 | -					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) )  ) { | 
                                                        |
| 354 | +					if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) { | 
                                                        |
| 355 | 355 |  						gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $e->ID ) ); | 
                                                        
| 356 | 356 | return __( 'You are not allowed to view this content.', 'gravityview' );  | 
                                                        
| 357 | 357 | }  | 
                                                        
@@ -526,7 +526,7 @@ discard block  | 
                                                    ||
| 526 | 526 | $join_column = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field::by_id( $join_column );  | 
                                                        
| 527 | 527 | $join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field::by_id( $join_on_column );  | 
                                                        
| 528 | 528 | |
| 529 | - $joins [] = new Join( $join, $join_column, $join_on, $join_on_column );  | 
                                                        |
| 529 | + $joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column );  | 
                                                        |
| 530 | 530 | }  | 
                                                        
| 531 | 531 | |
| 532 | 532 | return $joins;  | 
                                                        
@@ -621,13 +621,13 @@ discard block  | 
                                                    ||
| 621 | 621 | }  | 
                                                        
| 622 | 622 | |
| 623 | 623 |  			foreach ( $_fields as $field ) { | 
                                                        
| 624 | -				if ( ! empty( $field['unions'] ) ) { | 
                                                        |
| 625 | -					foreach ( $field['unions'] as $form_id => $field_id ) { | 
                                                        |
| 624 | +				if ( ! empty( $field[ 'unions' ] ) ) { | 
                                                        |
| 625 | +					foreach ( $field[ 'unions' ] as $form_id => $field_id ) { | 
                                                        |
| 626 | 626 |  						if ( ! isset( $unions[ $form_id ] ) ) { | 
                                                        
| 627 | 627 | $unions[ $form_id ] = array();  | 
                                                        
| 628 | 628 | }  | 
                                                        
| 629 | 629 | |
| 630 | - $unions[ $form_id ][ $field['id'] ] =  | 
                                                        |
| 630 | + $unions[ $form_id ][ $field[ 'id' ] ] =  | 
                                                        |
| 631 | 631 | is_numeric( $field_id ) ? \GV\GF_Field::by_id( \GV\GF_Form::by_id( $form_id ), $field_id ) : \GV\Internal_Field::by_id( $field_id );  | 
                                                        
| 632 | 632 | }  | 
                                                        
| 633 | 633 | }  | 
                                                        
@@ -676,7 +676,7 @@ discard block  | 
                                                    ||
| 676 | 676 |  		if ( ! $view->form ) { | 
                                                        
| 677 | 677 |  			gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array( | 
                                                        
| 678 | 678 | 'view_id' => $view->ID,  | 
                                                        
| 679 | - 'form_id' => $view->_gravityview_form_id ? : 0,  | 
                                                        |
| 679 | + 'form_id' => $view->_gravityview_form_id ?: 0,  | 
                                                        |
| 680 | 680 | ) );  | 
                                                        
| 681 | 681 | }  | 
                                                        
| 682 | 682 | |
@@ -913,11 +913,11 @@ discard block  | 
                                                    ||
| 913 | 913 | * Remove multiple sorting before calling legacy filters.  | 
                                                        
| 914 | 914 | * This allows us to fake it till we make it.  | 
                                                        
| 915 | 915 | */  | 
                                                        
| 916 | -			if ( ! empty( $parameters['sort_field'] ) && is_array( $parameters['sort_field'] ) ) { | 
                                                        |
| 916 | +			if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) { | 
                                                        |
| 917 | 917 | $has_multisort = true;  | 
                                                        
| 918 | - $parameters['sort_field'] = reset( $parameters['sort_field'] );  | 
                                                        |
| 919 | -				if ( ! empty( $parameters['sort_direction'] ) && is_array( $parameters['sort_direction'] ) ) { | 
                                                        |
| 920 | - $parameters['sort_direction'] = reset( $parameters['sort_direction'] );  | 
                                                        |
| 918 | + $parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] );  | 
                                                        |
| 919 | +				if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) { | 
                                                        |
| 920 | + $parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] );  | 
                                                        |
| 921 | 921 | }  | 
                                                        
| 922 | 922 | }  | 
                                                        
| 923 | 923 | |
@@ -925,40 +925,39 @@ discard block  | 
                                                    ||
| 925 | 925 | * @todo: Stop using _frontend and use something like $request->get_search_criteria() instead  | 
                                                        
| 926 | 926 | */  | 
                                                        
| 927 | 927 | $parameters = \GravityView_frontend::get_view_entries_parameters( $parameters, $this->form->ID );  | 
                                                        
| 928 | - $parameters['context_view_id'] = $this->ID;  | 
                                                        |
| 928 | + $parameters[ 'context_view_id' ] = $this->ID;  | 
                                                        |
| 929 | 929 | $parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID );  | 
                                                        
| 930 | 930 | |
| 931 | 931 |  			if ( $request instanceof REST\Request ) { | 
                                                        
| 932 | 932 | $atts = $this->settings->as_atts();  | 
                                                        
| 933 | 933 | $paging_parameters = wp_parse_args( $request->get_paging(), array(  | 
                                                        
| 934 | - 'paging' => array( 'page_size' => $atts['page_size'] ),  | 
                                                        |
| 934 | + 'paging' => array( 'page_size' => $atts[ 'page_size' ] ),  | 
                                                        |
| 935 | 935 | ) );  | 
                                                        
| 936 | - $parameters['paging'] = $paging_parameters['paging'];  | 
                                                        |
| 936 | + $parameters[ 'paging' ] = $paging_parameters[ 'paging' ];  | 
                                                        |
| 937 | 937 | }  | 
                                                        
| 938 | 938 | |
| 939 | - $page = Utils::get( $parameters['paging'], 'current_page' ) ?  | 
                                                        |
| 940 | - : ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 );  | 
                                                        |
| 939 | + $page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 );  | 
                                                        |
| 941 | 940 | |
| 942 | 941 | /**  | 
                                                        
| 943 | 942 | * Cleanup duplicate field_filter parameters to simplify the query.  | 
                                                        
| 944 | 943 | */  | 
                                                        
| 945 | 944 | $unique_field_filters = array();  | 
                                                        
| 946 | -			foreach ( $parameters['search_criteria']['field_filters'] as $key => $filter ) { | 
                                                        |
| 945 | +			foreach ( $parameters[ 'search_criteria' ][ 'field_filters' ] as $key => $filter ) { | 
                                                        |
| 947 | 946 |  				if ( 'mode' === $key ) { | 
                                                        
| 948 | - $unique_field_filters['mode'] = $filter;  | 
                                                        |
| 947 | + $unique_field_filters[ 'mode' ] = $filter;  | 
                                                        |
| 949 | 948 |  				} else if ( ! in_array( $filter, $unique_field_filters ) ) { | 
                                                        
| 950 | - $unique_field_filters[] = $filter;  | 
                                                        |
| 949 | + $unique_field_filters[ ] = $filter;  | 
                                                        |
| 951 | 950 | }  | 
                                                        
| 952 | 951 | }  | 
                                                        
| 953 | - $parameters['search_criteria']['field_filters'] = $unique_field_filters;  | 
                                                        |
| 952 | + $parameters[ 'search_criteria' ][ 'field_filters' ] = $unique_field_filters;  | 
                                                        |
| 954 | 953 | |
| 955 | -			if ( ! empty( $parameters['search_criteria']['field_filters'] ) ) { | 
                                                        |
| 954 | +			if ( ! empty( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) { | 
                                                        |
| 956 | 955 | gravityview()->log->notice( 'search_criteria/field_filters is not empty, third-party code may be using legacy search_criteria filters.' );  | 
                                                        
| 957 | 956 | }  | 
                                                        
| 958 | 957 | |
| 959 | 958 |  			if ( gravityview()->plugin->supports( Plugin::FEATURE_GFQUERY ) ) { | 
                                                        
| 960 | 959 | $query_class = $this->get_query_class();  | 
                                                        
| 961 | - $query = new $query_class( $this->form->ID, $parameters['search_criteria'], $parameters['sorting'] );  | 
                                                        |
| 960 | + $query = new $query_class( $this->form->ID, $parameters[ 'search_criteria' ], $parameters[ 'sorting' ] );  | 
                                                        |
| 962 | 961 | |
| 963 | 962 | /**  | 
                                                        
| 964 | 963 | * Apply multisort.  | 
                                                        
@@ -991,8 +990,8 @@ discard block  | 
                                                    ||
| 991 | 990 | }  | 
                                                        
| 992 | 991 | }  | 
                                                        
| 993 | 992 | |
| 994 | - $query->limit( $parameters['paging']['page_size'] )  | 
                                                        |
| 995 | - ->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) );  | 
                                                        |
| 993 | + $query->limit( $parameters[ 'paging' ][ 'page_size' ] )  | 
                                                        |
| 994 | + ->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) );  | 
                                                        |
| 996 | 995 | |
| 997 | 996 | /**  | 
                                                        
| 998 | 997 | * Any joins?  | 
                                                        
@@ -1015,7 +1014,7 @@ discard block  | 
                                                    ||
| 1015 | 1014 | |
| 1016 | 1015 | $query_parameters = $query->_introspect();  | 
                                                        
| 1017 | 1016 | |
| 1018 | - $query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) );  | 
                                                        |
| 1017 | + $query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) );  | 
                                                        |
| 1019 | 1018 | }  | 
                                                        
| 1020 | 1019 | |
| 1021 | 1020 | /**  | 
                                                        
@@ -1049,7 +1048,7 @@ discard block  | 
                                                    ||
| 1049 | 1048 | }  | 
                                                        
| 1050 | 1049 | |
| 1051 | 1050 | $q = $query->_introspect();  | 
                                                        
| 1052 | - $query->where( \GF_Query_Condition::_and( $q['where'], $condition ) );  | 
                                                        |
| 1051 | + $query->where( \GF_Query_Condition::_and( $q[ 'where' ], $condition ) );  | 
                                                        |
| 1053 | 1052 | |
| 1054 | 1053 |  						if ( $this->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { | 
                                                        
| 1055 | 1054 | |
@@ -1074,7 +1073,7 @@ discard block  | 
                                                    ||
| 1074 | 1073 | |
| 1075 | 1074 | $query_parameters = $query->_introspect();  | 
                                                        
| 1076 | 1075 | |
| 1077 | - $query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) );  | 
                                                        |
| 1076 | + $query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) );  | 
                                                        |
| 1078 | 1077 | }  | 
                                                        
| 1079 | 1078 | }  | 
                                                        
| 1080 | 1079 | |
@@ -1098,7 +1097,7 @@ discard block  | 
                                                    ||
| 1098 | 1097 | $conditions = array();  | 
                                                        
| 1099 | 1098 | |
| 1100 | 1099 |  							foreach ( $condition->expressions as $_condition ) { | 
                                                        
| 1101 | - $conditions[] = $recurse( $_condition, $fields, $recurse );  | 
                                                        |
| 1100 | + $conditions[ ] = $recurse( $_condition, $fields, $recurse );  | 
                                                        |
| 1102 | 1101 | }  | 
                                                        
| 1103 | 1102 | |
| 1104 | 1103 | return call_user_func_array(  | 
                                                        
@@ -1127,10 +1126,10 @@ discard block  | 
                                                    ||
| 1127 | 1126 | $q = new $query_class( $form_id );  | 
                                                        
| 1128 | 1127 | |
| 1129 | 1128 | // Copy the WHERE clauses but substitute the field_ids to the respective ones  | 
                                                        
| 1130 | - $q->where( $where_union_substitute( $query_parameters['where'], $fields, $where_union_substitute ) );  | 
                                                        |
| 1129 | + $q->where( $where_union_substitute( $query_parameters[ 'where' ], $fields, $where_union_substitute ) );  | 
                                                        |
| 1131 | 1130 | |
| 1132 | 1131 | // Copy the ORDER clause and substitute the field_ids to the respective ones  | 
                                                        
| 1133 | -						foreach ( $query_parameters['order'] as $order ) { | 
                                                        |
| 1132 | +						foreach ( $query_parameters[ 'order' ] as $order ) { | 
                                                        |
| 1134 | 1133 | list( $column, $_order ) = $order;  | 
                                                        
| 1135 | 1134 | |
| 1136 | 1135 |  							if ( $column && $column instanceof \GF_Query_Column ) { | 
                                                        
@@ -1144,15 +1143,15 @@ discard block  | 
                                                    ||
| 1144 | 1143 | |
| 1145 | 1144 |  						add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( &$unions_sql ) { | 
                                                        
| 1146 | 1145 | // Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses  | 
                                                        
| 1147 | - $select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] );  | 
                                                        |
| 1146 | + $select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] );  | 
                                                        |
| 1148 | 1147 | |
| 1149 | 1148 | // Record the SQL  | 
                                                        
| 1150 | - $unions_sql[] = array(  | 
                                                        |
| 1149 | + $unions_sql[ ] = array(  | 
                                                        |
| 1151 | 1150 | // Remove columns, we'll rebuild them  | 
                                                        
| 1152 | 1151 | 'select' => preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $select ),  | 
                                                        
| 1153 | - 'from' => $sql['from'],  | 
                                                        |
| 1154 | - 'join' => $sql['join'],  | 
                                                        |
| 1155 | - 'where' => $sql['where'],  | 
                                                        |
| 1152 | + 'from' => $sql[ 'from' ],  | 
                                                        |
| 1153 | + 'join' => $sql[ 'join' ],  | 
                                                        |
| 1154 | + 'where' => $sql[ 'where' ],  | 
                                                        |
| 1156 | 1155 | // Remove order and limit  | 
                                                        
| 1157 | 1156 | );  | 
                                                        
| 1158 | 1157 | |
@@ -1169,11 +1168,11 @@ discard block  | 
                                                    ||
| 1169 | 1168 | |
| 1170 | 1169 |  					add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( $unions_sql ) { | 
                                                        
| 1171 | 1170 | // Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses  | 
                                                        
| 1172 | - $sql['select'] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] );  | 
                                                        |
| 1171 | + $sql[ 'select' ] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] );  | 
                                                        |
| 1173 | 1172 | |
| 1174 | 1173 | // Remove columns, we'll rebuild them  | 
                                                        
| 1175 | - preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql['select'], $select_match );  | 
                                                        |
| 1176 | - $sql['select'] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql['select'] );  | 
                                                        |
| 1174 | + preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql[ 'select' ], $select_match );  | 
                                                        |
| 1175 | + $sql[ 'select' ] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql[ 'select' ] );  | 
                                                        |
| 1177 | 1176 | |
| 1178 | 1177 | $unions = array();  | 
                                                        
| 1179 | 1178 | |
@@ -1184,30 +1183,30 @@ discard block  | 
                                                    ||
| 1184 | 1183 | };  | 
                                                        
| 1185 | 1184 | |
| 1186 | 1185 | // Add all the order columns into the selects, so we can order by the whole union group  | 
                                                        
| 1187 | - preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql['order'], $order_matches );  | 
                                                        |
| 1186 | + preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql[ 'order' ], $order_matches );  | 
                                                        |
| 1188 | 1187 | |
| 1189 | 1188 | $columns = array(  | 
                                                        
| 1190 | - sprintf( '%s AS %s', $select_match[1], $column_to_alias( $select_match[1] ) )  | 
                                                        |
| 1189 | + sprintf( '%s AS %s', $select_match[ 1 ], $column_to_alias( $select_match[ 1 ] ) )  | 
                                                        |
| 1191 | 1190 | );  | 
                                                        
| 1192 | 1191 | |
| 1193 | 1192 |  						foreach ( array_slice( $order_matches, 1 ) as $match ) { | 
                                                        
| 1194 | - $columns[] = sprintf( '%s AS %s', $match[0], $column_to_alias( $match[0] ) );  | 
                                                        |
| 1193 | + $columns[ ] = sprintf( '%s AS %s', $match[ 0 ], $column_to_alias( $match[ 0 ] ) );  | 
                                                        |
| 1195 | 1194 | |
| 1196 | 1195 | // Rewrite the order columns to the shared aliases  | 
                                                        
| 1197 | - $sql['order'] = str_replace( $match[0], $column_to_alias( $match[0] ), $sql['order'] );  | 
                                                        |
| 1196 | + $sql[ 'order' ] = str_replace( $match[ 0 ], $column_to_alias( $match[ 0 ] ), $sql[ 'order' ] );  | 
                                                        |
| 1198 | 1197 | }  | 
                                                        
| 1199 | 1198 | |
| 1200 | 1199 | $columns = array_unique( $columns );  | 
                                                        
| 1201 | 1200 | |
| 1202 | 1201 | // Add the columns to every UNION  | 
                                                        
| 1203 | 1202 |  						foreach ( $unions_sql as $union_sql ) { | 
                                                        
| 1204 | - $union_sql['select'] .= implode( ', ', $columns );  | 
                                                        |
| 1205 | - $unions []= implode( ' ', $union_sql );  | 
                                                        |
| 1203 | + $union_sql[ 'select' ] .= implode( ', ', $columns );  | 
                                                        |
| 1204 | + $unions [ ] = implode( ' ', $union_sql );  | 
                                                        |
| 1206 | 1205 | }  | 
                                                        
| 1207 | 1206 | |
| 1208 | 1207 | // Add the columns to the main SELECT, but only grab the entry id column  | 
                                                        
| 1209 | -						$sql['select'] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql['select'] . implode( ', ', $columns ); | 
                                                        |
| 1210 | - $sql['order'] = implode( ' ', $unions ) . ') AS u ' . $sql['order'];  | 
                                                        |
| 1208 | +						$sql[ 'select' ] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql[ 'select' ] . implode( ', ', $columns ); | 
                                                        |
| 1209 | + $sql[ 'order' ] = implode( ' ', $unions ) . ') AS u ' . $sql[ 'order' ];  | 
                                                        |
| 1211 | 1210 | |
| 1212 | 1211 | return $sql;  | 
                                                        
| 1213 | 1212 | } );  | 
                                                        
@@ -1248,15 +1247,15 @@ discard block  | 
                                                    ||
| 1248 | 1247 | } );  | 
                                                        
| 1249 | 1248 |  			} else { | 
                                                        
| 1250 | 1249 | $entries = $this->form->entries  | 
                                                        
| 1251 | - ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) )  | 
                                                        |
| 1250 | + ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) )  | 
                                                        |
| 1252 | 1251 | ->offset( $this->settings->get( 'offset' ) )  | 
                                                        
| 1253 | - ->limit( $parameters['paging']['page_size'] )  | 
                                                        |
| 1252 | + ->limit( $parameters[ 'paging' ][ 'page_size' ] )  | 
                                                        |
| 1254 | 1253 | ->page( $page );  | 
                                                        
| 1255 | 1254 | |
| 1256 | -				if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) { | 
                                                        |
| 1255 | +				if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) { | 
                                                        |
| 1257 | 1256 | $field = new \GV\Field();  | 
                                                        
| 1258 | - $field->ID = $parameters['sorting']['key'];  | 
                                                        |
| 1259 | - $direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;  | 
                                                        |
| 1257 | + $field->ID = $parameters[ 'sorting' ][ 'key' ];  | 
                                                        |
| 1258 | + $direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC;  | 
                                                        |
| 1260 | 1259 | $entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) );  | 
                                                        
| 1261 | 1260 | }  | 
                                                        
| 1262 | 1261 | }  | 
                                                        
@@ -1327,7 +1326,7 @@ discard block  | 
                                                    ||
| 1327 | 1326 | $allowed = $headers = array();  | 
                                                        
| 1328 | 1327 | |
| 1329 | 1328 |  		foreach ( $view->fields->by_position( "directory_*" )->by_visible()->all() as $id => $field ) { | 
                                                        
| 1330 | - $allowed[] = $field;  | 
                                                        |
| 1329 | + $allowed[ ] = $field;  | 
                                                        |
| 1331 | 1330 | }  | 
                                                        
| 1332 | 1331 | |
| 1333 | 1332 | $renderer = new Field_Renderer();  | 
                                                        
@@ -1349,17 +1348,17 @@ discard block  | 
                                                    ||
| 1349 | 1348 | } );  | 
                                                        
| 1350 | 1349 | |
| 1351 | 1350 |  			foreach ( array_diff( $allowed_field_ids, wp_list_pluck( $allowed, 'ID' ) ) as $field_id ) { | 
                                                        
| 1352 | - $allowed[] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );  | 
                                                        |
| 1351 | + $allowed[ ] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id );  | 
                                                        |
| 1353 | 1352 | }  | 
                                                        
| 1354 | 1353 | |
| 1355 | 1354 |  			foreach ( $allowed as $field ) { | 
                                                        
| 1356 | 1355 | $source = is_numeric( $field->ID ) ? $view->form : new \GV\Internal_Source();  | 
                                                        
| 1357 | 1356 | |
| 1358 | - $return[] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' );  | 
                                                        |
| 1357 | + $return[ ] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' );  | 
                                                        |
| 1359 | 1358 | |
| 1360 | 1359 |  				if ( ! $headers_done ) { | 
                                                        
| 1361 | 1360 | $label = $field->get_label( $view, $source, $entry );  | 
                                                        
| 1362 | - $headers[] = $label ? $label : $field->ID;  | 
                                                        |
| 1361 | + $headers[ ] = $label ? $label : $field->ID;  | 
                                                        |
| 1363 | 1362 | }  | 
                                                        
| 1364 | 1363 | }  | 
                                                        
| 1365 | 1364 | |
@@ -166,7 +166,7 @@ discard block  | 
                                                    ||
| 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  | 
                                                    ||
| 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  | 
                                                    ||
| 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  | 
                                                    ||
| 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  | 
                                                    ||
| 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  | 
                                                    ||
| 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 ];  | 
                                                        
@@ -368,7 +368,7 @@ discard block  | 
                                                    ||
| 368 | 368 | * @return boolean Whether this $key is set or not.  | 
                                                        
| 369 | 369 | */  | 
                                                        
| 370 | 370 |  	public function __isset( $key ) { | 
                                                        
| 371 | -		switch( $key ) { | 
                                                        |
| 371 | +		switch ( $key ) { | 
                                                        |
| 372 | 372 | default:  | 
                                                        
| 373 | 373 | return isset( $this->configuration[ $key ] );  | 
                                                        
| 374 | 374 | }  | 
                                                        
@@ -27,7 +27,7 @@ discard block  | 
                                                    ||
| 27 | 27 | |
| 28 | 28 | $field_options = array();  | 
                                                        
| 29 | 29 | |
| 30 | -		if( 'field' === $field_type ) { | 
                                                        |
| 30 | +		if ( 'field' === $field_type ) { | 
                                                        |
| 31 | 31 | |
| 32 | 32 | // Default options - fields  | 
                                                        
| 33 | 33 | $field_options = array(  | 
                                                        
@@ -45,7 +45,7 @@ discard block  | 
                                                    ||
| 45 | 45 | 'custom_class' => array(  | 
                                                        
| 46 | 46 | 'type' => 'text',  | 
                                                        
| 47 | 47 | 'label' => __( 'Custom CSS Class:', 'gravityview' ),  | 
                                                        
| 48 | - 'desc' => __( 'This class will be added to the field container', 'gravityview'),  | 
                                                        |
| 48 | + 'desc' => __( 'This class will be added to the field container', 'gravityview' ),  | 
                                                        |
| 49 | 49 | 'value' => '',  | 
                                                        
| 50 | 50 | 'merge_tags' => true,  | 
                                                        
| 51 | 51 | 'tooltip' => 'gv_css_merge_tags',  | 
                                                        
@@ -65,11 +65,11 @@ discard block  | 
                                                    ||
| 65 | 65 | );  | 
                                                        
| 66 | 66 | |
| 67 | 67 | // Match Table as well as DataTables  | 
                                                        
| 68 | -			if( preg_match( '/table/ism', $template_id ) && 'directory' === $context ) { | 
                                                        |
| 69 | - $field_options['width'] = array(  | 
                                                        |
| 68 | +			if ( preg_match( '/table/ism', $template_id ) && 'directory' === $context ) { | 
                                                        |
| 69 | + $field_options[ 'width' ] = array(  | 
                                                        |
| 70 | 70 | 'type' => 'number',  | 
                                                        
| 71 | -					'label' => __('Percent Width', 'gravityview'), | 
                                                        |
| 72 | - 'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview'),  | 
                                                        |
| 71 | + 'label' => __( 'Percent Width', 'gravityview' ),  | 
                                                        |
| 72 | + 'desc' => __( 'Leave blank for column width to be based on the field content.', 'gravityview' ),  | 
                                                        |
| 73 | 73 | 'class' => 'code widefat',  | 
                                                        
| 74 | 74 | 'value' => '',  | 
                                                        
| 75 | 75 | );  | 
                                                        
@@ -122,8 +122,8 @@ discard block  | 
                                                    ||
| 122 | 122 | 'manage_options' => __( 'Administrator', 'gravityview' ),  | 
                                                        
| 123 | 123 | );  | 
                                                        
| 124 | 124 | |
| 125 | -		if( is_multisite() ) { | 
                                                        |
| 126 | -			$select_cap_choices['manage_network'] = __('Multisite Super Admin', 'gravityview' ); | 
                                                        |
| 125 | +		if ( is_multisite() ) { | 
                                                        |
| 126 | + $select_cap_choices[ 'manage_network' ] = __( 'Multisite Super Admin', 'gravityview' );  | 
                                                        |
| 127 | 127 | }  | 
                                                        
| 128 | 128 | |
| 129 | 129 | /**  | 
                                                        
@@ -136,7 +136,7 @@ discard block  | 
                                                    ||
| 136 | 136 | * @param string $context Optional. What context are we in? Example: `single` or `directory`  | 
                                                        
| 137 | 137 | * @param string $input_type Optional. (textarea, list, select, etc.)  | 
                                                        
| 138 | 138 | */  | 
                                                        
| 139 | -		$select_cap_choices = apply_filters('gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type ); | 
                                                        |
| 139 | + $select_cap_choices = apply_filters( 'gravityview_field_visibility_caps', $select_cap_choices, $template_id, $field_id, $context, $input_type );  | 
                                                        |
| 140 | 140 | |
| 141 | 141 | return $select_cap_choices;  | 
                                                        
| 142 | 142 | }  | 
                                                        
@@ -164,27 +164,27 @@ discard block  | 
                                                    ||
| 164 | 164 | */  | 
                                                        
| 165 | 165 |  	public static function render_field_options( $form_id, $field_type, $template_id, $field_id, $field_label, $area, $input_type = NULL, $uniqid = '', $current = '', $context = 'single', $item = array() ) { | 
                                                        
| 166 | 166 | |
| 167 | -		if( empty( $uniqid ) ) { | 
                                                        |
| 167 | +		if ( empty( $uniqid ) ) { | 
                                                        |
| 168 | 168 | //generate a unique field id  | 
                                                        
| 169 | -			$uniqid = uniqid('', false); | 
                                                        |
| 169 | + $uniqid = uniqid( '', false );  | 
                                                        |
| 170 | 170 | }  | 
                                                        
| 171 | 171 | |
| 172 | 172 | // get field/widget options  | 
                                                        
| 173 | 173 | $options = self::get_default_field_options( $field_type, $template_id, $field_id, $context, $input_type );  | 
                                                        
| 174 | 174 | |
| 175 | 175 | // two different post arrays, depending of the field type  | 
                                                        
| 176 | - $name_prefix = $field_type .'s' .'['. $area .']['. $uniqid .']';  | 
                                                        |
| 176 | + $name_prefix = $field_type . 's' . '[' . $area . '][' . $uniqid . ']';  | 
                                                        |
| 177 | 177 | |
| 178 | 178 | // build output  | 
                                                        
| 179 | 179 | $output = '';  | 
                                                        
| 180 | - $output .= '<input type="hidden" class="field-key" name="'. $name_prefix .'[id]" value="'. esc_attr( $field_id ) .'">';  | 
                                                        |
| 181 | - $output .= '<input type="hidden" class="field-label" name="'. $name_prefix .'[label]" value="'. esc_attr( $field_label ) .'">';  | 
                                                        |
| 180 | + $output .= '<input type="hidden" class="field-key" name="' . $name_prefix . '[id]" value="' . esc_attr( $field_id ) . '">';  | 
                                                        |
| 181 | + $output .= '<input type="hidden" class="field-label" name="' . $name_prefix . '[label]" value="' . esc_attr( $field_label ) . '">';  | 
                                                        |
| 182 | 182 |  		if ( $form_id ) { | 
                                                        
| 183 | - $output .= '<input type="hidden" class="field-form-id" name="'. $name_prefix .'[form_id]" value="'. esc_attr( $form_id ) .'">';  | 
                                                        |
| 183 | + $output .= '<input type="hidden" class="field-form-id" name="' . $name_prefix . '[form_id]" value="' . esc_attr( $form_id ) . '">';  | 
                                                        |
| 184 | 184 | }  | 
                                                        
| 185 | 185 | |
| 186 | 186 | // If there are no options, return what we got.  | 
                                                        
| 187 | -		if(empty($options)) { | 
                                                        |
| 187 | +		if ( empty( $options ) ) { | 
                                                        |
| 188 | 188 | |
| 189 | 189 | // This is here for checking if the output is empty in render_label()  | 
                                                        
| 190 | 190 | $output .= '<!-- No Options -->';  | 
                                                        
@@ -192,33 +192,33 @@ discard block  | 
                                                    ||
| 192 | 192 | return $output;  | 
                                                        
| 193 | 193 | }  | 
                                                        
| 194 | 194 | |
| 195 | - $output .= '<div class="gv-dialog-options" title="'. esc_attr( sprintf( __( 'Options: %s', 'gravityview' ) , strip_tags( html_entity_decode( $field_label ) ) ) ) .'">';  | 
                                                        |
| 195 | + $output .= '<div class="gv-dialog-options" title="' . esc_attr( sprintf( __( 'Options: %s', 'gravityview' ), strip_tags( html_entity_decode( $field_label ) ) ) ) . '">';  | 
                                                        |
| 196 | 196 | |
| 197 | 197 | /**  | 
                                                        
| 198 | 198 | * @since 1.8  | 
                                                        
| 199 | 199 | */  | 
                                                        
| 200 | -		if( !empty( $item['subtitle'] ) ) { | 
                                                        |
| 201 | - $output .= '<div class="subtitle">' . $item['subtitle'] . '</div>';  | 
                                                        |
| 200 | +		if ( ! empty( $item[ 'subtitle' ] ) ) { | 
                                                        |
| 201 | + $output .= '<div class="subtitle">' . $item[ 'subtitle' ] . '</div>';  | 
                                                        |
| 202 | 202 | }  | 
                                                        
| 203 | 203 | |
| 204 | -		foreach( $options as $key => $option ) { | 
                                                        |
| 204 | +		foreach ( $options as $key => $option ) { | 
                                                        |
| 205 | 205 | |
| 206 | 206 | $value = isset( $current[ $key ] ) ? $current[ $key ] : NULL;  | 
                                                        
| 207 | 207 | |
| 208 | - $field_output = self::render_field_option( $name_prefix . '['. $key .']' , $option, $value);  | 
                                                        |
| 208 | + $field_output = self::render_field_option( $name_prefix . '[' . $key . ']', $option, $value );  | 
                                                        |
| 209 | 209 | |
| 210 | 210 | // The setting is empty  | 
                                                        
| 211 | -			if( empty( $field_output ) ) { | 
                                                        |
| 211 | +			if ( empty( $field_output ) ) { | 
                                                        |
| 212 | 212 | continue;  | 
                                                        
| 213 | 213 | }  | 
                                                        
| 214 | 214 | |
| 215 | -			switch( $option['type'] ) { | 
                                                        |
| 215 | +			switch ( $option[ 'type' ] ) { | 
                                                        |
| 216 | 216 | // Hide hidden fields  | 
                                                        
| 217 | 217 | case 'hidden':  | 
                                                        
| 218 | - $output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . ' screen-reader-text">'. $field_output . '</div>';  | 
                                                        |
| 218 | + $output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . ' screen-reader-text">' . $field_output . '</div>';  | 
                                                        |
| 219 | 219 | break;  | 
                                                        
| 220 | 220 | default:  | 
                                                        
| 221 | - $output .= '<div class="gv-setting-container gv-setting-container-'. esc_attr( $key ) . '">'. $field_output .'</div>';  | 
                                                        |
| 221 | + $output .= '<div class="gv-setting-container gv-setting-container-' . esc_attr( $key ) . '">' . $field_output . '</div>';  | 
                                                        |
| 222 | 222 | }  | 
                                                        
| 223 | 223 | }  | 
                                                        
| 224 | 224 | |
@@ -247,17 +247,17 @@ discard block  | 
                                                    ||
| 247 | 247 | * @deprecated setting index 'default' was replaced by 'value'  | 
                                                        
| 248 | 248 | * @see GravityView_FieldType::get_field_defaults  | 
                                                        
| 249 | 249 | */  | 
                                                        
| 250 | -		if( !empty( $option['default'] ) && empty( $option['value'] ) ) { | 
                                                        |
| 251 | - $option['value'] = $option['default'];  | 
                                                        |
| 252 | - _deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting '. $name .' details' );  | 
                                                        |
| 250 | +		if ( ! empty( $option[ 'default' ] ) && empty( $option[ 'value' ] ) ) { | 
                                                        |
| 251 | + $option[ 'value' ] = $option[ 'default' ];  | 
                                                        |
| 252 | + _deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[value] instead of [default] when defining the setting ' . $name . ' details' );  | 
                                                        |
| 253 | 253 | }  | 
                                                        
| 254 | 254 | |
| 255 | 255 | // prepare to render option field type  | 
                                                        
| 256 | -		if( isset( $option['type'] ) ) { | 
                                                        |
| 256 | +		if ( isset( $option[ 'type' ] ) ) { | 
                                                        |
| 257 | 257 | |
| 258 | 258 | $type_class = self::load_type_class( $option );  | 
                                                        
| 259 | 259 | |
| 260 | -			if( class_exists( $type_class ) ) { | 
                                                        |
| 260 | +			if ( class_exists( $type_class ) ) { | 
                                                        |
| 261 | 261 | |
| 262 | 262 | /** @var GravityView_FieldType $render_type */  | 
                                                        
| 263 | 263 | $render_type = new $type_class( $name, $option, $curr_value );  | 
                                                        
@@ -274,7 +274,7 @@ discard block  | 
                                                    ||
| 274 | 274 | * @param[in,out] string $output field class name  | 
                                                        
| 275 | 275 | * @param[in] array $option option field data  | 
                                                        
| 276 | 276 | */  | 
                                                        
| 277 | -				$output = apply_filters( "gravityview/option/output/{$option['type']}" , $output, $option ); | 
                                                        |
| 277 | +				$output = apply_filters( "gravityview/option/output/{$option[ 'type' ]}", $output, $option ); | 
                                                        |
| 278 | 278 | }  | 
                                                        
| 279 | 279 | |
| 280 | 280 | } // isset option[type]  | 
                                                        
@@ -309,27 +309,27 @@ discard block  | 
                                                    ||
| 309 | 309 | * @deprecated setting index 'name' was replaced by 'label'  | 
                                                        
| 310 | 310 | * @see GravityView_FieldType::get_field_defaults  | 
                                                        
| 311 | 311 | */  | 
                                                        
| 312 | -		if( isset( $setting['name'] ) && empty( $setting['label'] ) ) { | 
                                                        |
| 313 | - $setting['label'] = $setting['name'];  | 
                                                        |
| 314 | - _deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting '. $key .' details' );  | 
                                                        |
| 312 | +		if ( isset( $setting[ 'name' ] ) && empty( $setting[ 'label' ] ) ) { | 
                                                        |
| 313 | + $setting[ 'label' ] = $setting[ 'name' ];  | 
                                                        |
| 314 | + _deprecated_function( 'GravityView_FieldType::get_field_defaults', '1.1.7', '[label] instead of [name] when defining the setting ' . $key . ' details' );  | 
                                                        |
| 315 | 315 | }  | 
                                                        
| 316 | 316 | |
| 317 | 317 | $name = esc_attr( sprintf( $name, $key ) );  | 
                                                        
| 318 | - $setting['id'] = esc_attr( sprintf( $id, $key ) );  | 
                                                        |
| 319 | - $setting['tooltip'] = 'gv_' . $key;  | 
                                                        |
| 318 | + $setting[ 'id' ] = esc_attr( sprintf( $id, $key ) );  | 
                                                        |
| 319 | + $setting[ 'tooltip' ] = 'gv_' . $key;  | 
                                                        |
| 320 | 320 | |
| 321 | 321 | // Use default if current setting isn't set.  | 
                                                        
| 322 | - $curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting['value'];  | 
                                                        |
| 322 | + $curr_value = isset( $current_settings[ $key ] ) ? $current_settings[ $key ] : $setting[ 'value' ];  | 
                                                        |
| 323 | 323 | |
| 324 | 324 | // default setting type = text  | 
                                                        
| 325 | - $setting['type'] = empty( $setting['type'] ) ? 'text' : $setting['type'];  | 
                                                        |
| 325 | + $setting[ 'type' ] = empty( $setting[ 'type' ] ) ? 'text' : $setting[ 'type' ];  | 
                                                        |
| 326 | 326 | |
| 327 | 327 | // merge tags  | 
                                                        
| 328 | -		if( !isset( $setting['merge_tags'] ) ) { | 
                                                        |
| 329 | -			if( $setting['type'] === 'text' ) { | 
                                                        |
| 330 | - $setting['merge_tags'] = true;  | 
                                                        |
| 328 | +		if ( ! isset( $setting[ 'merge_tags' ] ) ) { | 
                                                        |
| 329 | +			if ( $setting[ 'type' ] === 'text' ) { | 
                                                        |
| 330 | + $setting[ 'merge_tags' ] = true;  | 
                                                        |
| 331 | 331 |  			} else { | 
                                                        
| 332 | - $setting['merge_tags'] = false;  | 
                                                        |
| 332 | + $setting[ 'merge_tags' ] = false;  | 
                                                        |
| 333 | 333 | }  | 
                                                        
| 334 | 334 | }  | 
                                                        
| 335 | 335 | |
@@ -337,7 +337,7 @@ discard block  | 
                                                    ||
| 337 | 337 | |
| 338 | 338 | // render the setting  | 
                                                        
| 339 | 339 | $type_class = self::load_type_class( $setting );  | 
                                                        
| 340 | -		if( class_exists( $type_class ) ) { | 
                                                        |
| 340 | +		if ( class_exists( $type_class ) ) { | 
                                                        |
| 341 | 341 | /** @var GravityView_FieldType $render_type */  | 
                                                        
| 342 | 342 | $render_type = new $type_class( $name, $setting, $curr_value );  | 
                                                        
| 343 | 343 | ob_start();  | 
                                                        
@@ -346,25 +346,25 @@ discard block  | 
                                                    ||
| 346 | 346 | }  | 
                                                        
| 347 | 347 | |
| 348 | 348 | // Check if setting is specific for a template  | 
                                                        
| 349 | -		if( !empty( $setting['show_in_template'] ) ) { | 
                                                        |
| 350 | -			if( !is_array( $setting['show_in_template'] ) ) { | 
                                                        |
| 351 | - $setting['show_in_template'] = array( $setting['show_in_template'] );  | 
                                                        |
| 349 | +		if ( ! empty( $setting[ 'show_in_template' ] ) ) { | 
                                                        |
| 350 | +			if ( ! is_array( $setting[ 'show_in_template' ] ) ) { | 
                                                        |
| 351 | + $setting[ 'show_in_template' ] = array( $setting[ 'show_in_template' ] );  | 
                                                        |
| 352 | 352 | }  | 
                                                        
| 353 | - $show_if = ' data-show-if="'. implode( ' ', $setting['show_in_template'] ).'"';  | 
                                                        |
| 353 | + $show_if = ' data-show-if="' . implode( ' ', $setting[ 'show_in_template' ] ) . '"';  | 
                                                        |
| 354 | 354 |  		} else { | 
                                                        
| 355 | 355 | $show_if = '';  | 
                                                        
| 356 | 356 | }  | 
                                                        
| 357 | 357 | |
| 358 | -		if( ! empty( $setting['requires'] ) ) { | 
                                                        |
| 359 | - $show_if .= sprintf( ' data-requires="%s"', $setting['requires'] );  | 
                                                        |
| 358 | +		if ( ! empty( $setting[ 'requires' ] ) ) { | 
                                                        |
| 359 | + $show_if .= sprintf( ' data-requires="%s"', $setting[ 'requires' ] );  | 
                                                        |
| 360 | 360 | }  | 
                                                        
| 361 | 361 | |
| 362 | -		if( ! empty( $setting['requires_not'] ) ) { | 
                                                        |
| 363 | - $show_if .= sprintf( ' data-requires-not="%s"', $setting['requires_not'] );  | 
                                                        |
| 362 | +		if ( ! empty( $setting[ 'requires_not' ] ) ) { | 
                                                        |
| 363 | + $show_if .= sprintf( ' data-requires-not="%s"', $setting[ 'requires_not' ] );  | 
                                                        |
| 364 | 364 | }  | 
                                                        
| 365 | 365 | |
| 366 | 366 | // output  | 
                                                        
| 367 | - echo '<tr valign="top" '. $show_if .'>' . $output . '</tr>';  | 
                                                        |
| 367 | + echo '<tr valign="top" ' . $show_if . '>' . $output . '</tr>';  | 
                                                        |
| 368 | 368 | |
| 369 | 369 | }  | 
                                                        
| 370 | 370 | |
@@ -376,7 +376,7 @@ discard block  | 
                                                    ||
| 376 | 376 | */  | 
                                                        
| 377 | 377 |  	public static function load_type_class( $field = NULL ) { | 
                                                        
| 378 | 378 | |
| 379 | -		if( empty( $field['type'] ) ) { | 
                                                        |
| 379 | +		if ( empty( $field[ 'type' ] ) ) { | 
                                                        |
| 380 | 380 | return NULL;  | 
                                                        
| 381 | 381 | }  | 
                                                        
| 382 | 382 | |
@@ -385,19 +385,19 @@ discard block  | 
                                                    ||
| 385 | 385 |  		 * @param string $class_suffix  field class suffix; `GravityView_FieldType_{$class_suffix}` | 
                                                        
| 386 | 386 | * @param array $field field data  | 
                                                        
| 387 | 387 | */  | 
                                                        
| 388 | -		$type_class = apply_filters( "gravityview/setting/class/{$field['type']}", 'GravityView_FieldType_' . $field['type'], $field ); | 
                                                        |
| 388 | +		$type_class = apply_filters( "gravityview/setting/class/{$field[ 'type' ]}", 'GravityView_FieldType_' . $field[ 'type' ], $field ); | 
                                                        |
| 389 | 389 | |
| 390 | -		if( !class_exists( $type_class ) ) { | 
                                                        |
| 390 | +		if ( ! class_exists( $type_class ) ) { | 
                                                        |
| 391 | 391 | |
| 392 | 392 | /**  | 
                                                        
| 393 | 393 |  			 * @filter `gravityview/setting/class_file/{field_type}` | 
                                                        
| 394 | 394 | * @param string $field_type_include_path field class file path  | 
                                                        
| 395 | 395 | * @param array $field field data  | 
                                                        
| 396 | 396 | */  | 
                                                        
| 397 | -			$class_file = apply_filters( "gravityview/setting/class_file/{$field['type']}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field['type']}.php", $field ); | 
                                                        |
| 397 | +			$class_file = apply_filters( "gravityview/setting/class_file/{$field[ 'type' ]}", GRAVITYVIEW_DIR . "includes/admin/field-types/type_{$field[ 'type' ]}.php", $field ); | 
                                                        |
| 398 | 398 | |
| 399 | -			if( $class_file ) { | 
                                                        |
| 400 | -				if( file_exists( $class_file ) ) { | 
                                                        |
| 399 | +			if ( $class_file ) { | 
                                                        |
| 400 | +				if ( file_exists( $class_file ) ) { | 
                                                        |
| 401 | 401 | require_once( $class_file );  | 
                                                        
| 402 | 402 | }  | 
                                                        
| 403 | 403 | }  | 
                                                        
@@ -422,8 +422,8 @@ discard block  | 
                                                    ||
| 422 | 422 | |
| 423 | 423 | _deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_checkbox::render_input' );  | 
                                                        
| 424 | 424 | |
| 425 | - $output = '<input name="'. esc_attr( $name ) .'" type="hidden" value="0">';  | 
                                                        |
| 426 | - $output .= '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="checkbox" value="1" '. checked( $current, '1', false ) .' >';  | 
                                                        |
| 425 | + $output = '<input name="' . esc_attr( $name ) . '" type="hidden" value="0">';  | 
                                                        |
| 426 | + $output .= '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="checkbox" value="1" ' . checked( $current, '1', false ) . ' >';  | 
                                                        |
| 427 | 427 | |
| 428 | 428 | return $output;  | 
                                                        
| 429 | 429 | }  | 
                                                        
@@ -443,22 +443,22 @@ discard block  | 
                                                    ||
| 443 | 443 | _deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_text::render_input' );  | 
                                                        
| 444 | 444 | |
| 445 | 445 | // Show the merge tags if the field is a list view  | 
                                                        
| 446 | - $is_list = ( preg_match( '/_list-/ism', $name ));  | 
                                                        |
| 446 | + $is_list = ( preg_match( '/_list-/ism', $name ) );  | 
                                                        |
| 447 | 447 | |
| 448 | 448 | // Or is a single entry view  | 
                                                        
| 449 | - $is_single = ( preg_match( '/single_/ism', $name ));  | 
                                                        |
| 449 | + $is_single = ( preg_match( '/single_/ism', $name ) );  | 
                                                        |
| 450 | 450 | $show = ( $is_single || $is_list );  | 
                                                        
| 451 | 451 | |
| 452 | 452 | $class = '';  | 
                                                        
| 453 | 453 | // and $add_merge_tags is not false  | 
                                                        
| 454 | -		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) { | 
                                                        |
| 454 | +		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) { | 
                                                        |
| 455 | 455 | $class = 'merge-tag-support mt-position-right mt-hide_all_fields ';  | 
                                                        
| 456 | 456 | }  | 
                                                        
| 457 | 457 | |
| 458 | - $class .= !empty( $args['class'] ) ? $args['class'] : 'widefat';  | 
                                                        |
| 459 | - $type = !empty( $args['type'] ) ? $args['type'] : 'text';  | 
                                                        |
| 458 | + $class .= ! empty( $args[ 'class' ] ) ? $args[ 'class' ] : 'widefat';  | 
                                                        |
| 459 | + $type = ! empty( $args[ 'type' ] ) ? $args[ 'type' ] : 'text';  | 
                                                        |
| 460 | 460 | |
| 461 | - return '<input name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" type="'.esc_attr($type).'" value="'. esc_attr( $current ) .'" class="'.esc_attr( $class ).'">';  | 
                                                        |
| 461 | + return '<input name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" type="' . esc_attr( $type ) . '" value="' . esc_attr( $current ) . '" class="' . esc_attr( $class ) . '">';  | 
                                                        |
| 462 | 462 | }  | 
                                                        
| 463 | 463 | |
| 464 | 464 | /**  | 
                                                        
@@ -475,21 +475,21 @@ discard block  | 
                                                    ||
| 475 | 475 | _deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_textarea::render_input' );  | 
                                                        
| 476 | 476 | |
| 477 | 477 | // Show the merge tags if the field is a list view  | 
                                                        
| 478 | - $is_list = ( preg_match( '/_list-/ism', $name ));  | 
                                                        |
| 478 | + $is_list = ( preg_match( '/_list-/ism', $name ) );  | 
                                                        |
| 479 | 479 | |
| 480 | 480 | // Or is a single entry view  | 
                                                        
| 481 | - $is_single = ( preg_match( '/single_/ism', $name ));  | 
                                                        |
| 481 | + $is_single = ( preg_match( '/single_/ism', $name ) );  | 
                                                        |
| 482 | 482 | $show = ( $is_single || $is_list );  | 
                                                        
| 483 | 483 | |
| 484 | 484 | $class = '';  | 
                                                        
| 485 | 485 | // and $add_merge_tags is not false  | 
                                                        
| 486 | -		if( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) { | 
                                                        |
| 486 | +		if ( $show && $add_merge_tags !== false || $add_merge_tags === 'force' ) { | 
                                                        |
| 487 | 487 | $class = 'merge-tag-support mt-position-right mt-hide_all_fields ';  | 
                                                        
| 488 | 488 | }  | 
                                                        
| 489 | 489 | |
| 490 | - $class .= !empty( $args['class'] ) ? 'widefat '.$args['class'] : 'widefat';  | 
                                                        |
| 490 | + $class .= ! empty( $args[ 'class' ] ) ? 'widefat ' . $args[ 'class' ] : 'widefat';  | 
                                                        |
| 491 | 491 | |
| 492 | - return '<textarea name="'. esc_attr( $name ) .'" id="'. esc_attr( $id ) .'" class="'.esc_attr( $class ).'">'. esc_textarea( $current ) .'</textarea>';  | 
                                                        |
| 492 | + return '<textarea name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" class="' . esc_attr( $class ) . '">' . esc_textarea( $current ) . '</textarea>';  | 
                                                        |
| 493 | 493 | }  | 
                                                        
| 494 | 494 | |
| 495 | 495 | /**  | 
                                                        
@@ -505,9 +505,9 @@ discard block  | 
                                                    ||
| 505 | 505 | |
| 506 | 506 | _deprecated_function( __METHOD__, '1.2', 'GravityView_FieldType_select::render_input' );  | 
                                                        
| 507 | 507 | |
| 508 | - $output = '<select name="'. $name .'" id="'. $id .'">';  | 
                                                        |
| 509 | -		foreach( $choices as $value => $label ) { | 
                                                        |
| 510 | - $output .= '<option value="'. esc_attr( $value ) .'" '. selected( $value, $current, false ) .'>'. esc_html( $label ) .'</option>';  | 
                                                        |
| 508 | + $output = '<select name="' . $name . '" id="' . $id . '">';  | 
                                                        |
| 509 | +		foreach ( $choices as $value => $label ) { | 
                                                        |
| 510 | + $output .= '<option value="' . esc_attr( $value ) . '" ' . selected( $value, $current, false ) . '>' . esc_html( $label ) . '</option>';  | 
                                                        |
| 511 | 511 | }  | 
                                                        
| 512 | 512 | $output .= '</select>';  | 
                                                        
| 513 | 513 | |