@@ -102,8 +102,7 @@ discard block |
||
| 102 | 102 | $entries = $view->get_entries( gravityview()->request ); |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | - $page = \GV\Utils::get( $parameters['paging'], 'current_page' ) ? |
|
| 106 | - : ( ( ( $parameters['paging']['offset'] - $view->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 ); |
|
| 105 | + $page = \GV\Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $view->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 ); |
|
| 107 | 106 | |
| 108 | 107 | /** Set paging, count and unwrap the entries. */ |
| 109 | 108 | $paging = array( |
@@ -142,17 +141,17 @@ discard block |
||
| 142 | 141 | * @return null|string The value of a field in an entry. |
| 143 | 142 | */ |
| 144 | 143 | function GravityView_API_field_value( $entry, $field_settings, $format ) { |
| 145 | - if ( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) { |
|
| 144 | + if ( empty( $entry[ 'form_id' ] ) || empty( $field_settings[ 'id' ] ) ) { |
|
| 146 | 145 | gravityview()->log->error( 'No entry or field_settings[id] supplied', array( 'data' => array( func_get_args() ) ) ); |
| 147 | 146 | return null; |
| 148 | 147 | } |
| 149 | 148 | |
| 150 | - if ( ! empty( $entry['_multi'] ) && ! empty( $field_settings['form_id'] ) && ! empty( $entry['_multi'][ $field_settings['form_id'] ] ) ) { |
|
| 151 | - $multientry = \GV\Multi_Entry::from_entries( array_map( '\GV\GF_Entry::from_entry', $entry['_multi'] ) ); |
|
| 152 | - $entry = $entry['_multi'][ $field_settings['form_id'] ]; |
|
| 149 | + if ( ! empty( $entry[ '_multi' ] ) && ! empty( $field_settings[ 'form_id' ] ) && ! empty( $entry[ '_multi' ][ $field_settings[ 'form_id' ] ] ) ) { |
|
| 150 | + $multientry = \GV\Multi_Entry::from_entries( array_map( '\GV\GF_Entry::from_entry', $entry[ '_multi' ] ) ); |
|
| 151 | + $entry = $entry[ '_multi' ][ $field_settings[ 'form_id' ] ]; |
|
| 153 | 152 | } |
| 154 | 153 | |
| 155 | - if ( empty( $entry['id'] ) || ! $entry = \GV\GF_Entry::by_id( $entry['id'] ) ) { |
|
| 154 | + if ( empty( $entry[ 'id' ] ) || ! $entry = \GV\GF_Entry::by_id( $entry[ 'id' ] ) ) { |
|
| 156 | 155 | gravityview()->log->error( 'Invalid \GV\GF_Entry supplied', array( 'data' => $entry ) ); |
| 157 | 156 | return null; |
| 158 | 157 | } |
@@ -162,18 +161,18 @@ discard block |
||
| 162 | 161 | * |
| 163 | 162 | * Fields with a numeric ID are Gravity Forms ones. |
| 164 | 163 | */ |
| 165 | - $source = is_numeric( $field_settings['id'] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL;; |
|
| 164 | + $source = is_numeric( $field_settings[ 'id' ] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL; ; |
|
| 166 | 165 | |
| 167 | 166 | /** Initialize the future field. */ |
| 168 | 167 | switch ( $source ): |
| 169 | 168 | /** The Gravity Forms backend. */ |
| 170 | 169 | case \GV\Source::BACKEND_GRAVITYFORMS: |
| 171 | - if ( ! $form = \GV\GF_Form::by_id( $entry['form_id'] ) ) { |
|
| 170 | + if ( ! $form = \GV\GF_Form::by_id( $entry[ 'form_id' ] ) ) { |
|
| 172 | 171 | gravityview()->log->error( 'No form Gravity Form found for entry', array( 'data' => $entry ) ); |
| 173 | 172 | return null; |
| 174 | 173 | } |
| 175 | 174 | |
| 176 | - if ( ! $field = $form::get_field( $form, $field_settings['id'] ) ) { |
|
| 175 | + if ( ! $field = $form::get_field( $form, $field_settings[ 'id' ] ) ) { |
|
| 177 | 176 | return null; |
| 178 | 177 | } |
| 179 | 178 | |
@@ -181,7 +180,7 @@ discard block |
||
| 181 | 180 | |
| 182 | 181 | /** Our internal backend. */ |
| 183 | 182 | case \GV\Source::BACKEND_INTERNAL: |
| 184 | - if ( ! $field = \GV\Internal_Source::get_field( $field_settings['id'] ) ) { |
|
| 183 | + if ( ! $field = \GV\Internal_Source::get_field( $field_settings[ 'id' ] ) ) { |
|
| 185 | 184 | return null; |
| 186 | 185 | } |
| 187 | 186 | |
@@ -215,13 +214,13 @@ discard block |
||
| 215 | 214 | |
| 216 | 215 | /** A bail condition. */ |
| 217 | 216 | $bail = function( $label, $field_settings, $entry, $force_show_label, $form ) { |
| 218 | - if ( ! empty( $field_settings['show_label'] ) || $force_show_label ) { |
|
| 217 | + if ( ! empty( $field_settings[ 'show_label' ] ) || $force_show_label ) { |
|
| 219 | 218 | |
| 220 | - $label = isset( $field_settings['label'] ) ? $field_settings['label'] : ''; |
|
| 219 | + $label = isset( $field_settings[ 'label' ] ) ? $field_settings[ 'label' ] : ''; |
|
| 221 | 220 | |
| 222 | 221 | // Use Gravity Forms label by default, but if a custom label is defined in GV, use it. |
| 223 | - if ( ! empty( $field_settings['custom_label'] ) ) { |
|
| 224 | - $label = \GravityView_API::replace_variables( $field_settings['custom_label'], $form, $entry ); |
|
| 222 | + if ( ! empty( $field_settings[ 'custom_label' ] ) ) { |
|
| 223 | + $label = \GravityView_API::replace_variables( $field_settings[ 'custom_label' ], $form, $entry ); |
|
| 225 | 224 | } |
| 226 | 225 | |
| 227 | 226 | /** |
@@ -247,19 +246,19 @@ discard block |
||
| 247 | 246 | |
| 248 | 247 | $label = ''; |
| 249 | 248 | |
| 250 | - if ( ! empty( $entry['_multi'] ) && ! empty( $field_settings['form_id'] ) && ! empty( $entry['_multi'][ $field_settings['form_id'] ] ) ) { |
|
| 251 | - $entry = $entry['_multi'][ $field_settings['form_id'] ]; |
|
| 252 | - if ( $_form = \GV\GF_Form::by_id( $field_settings['form_id'] ) ) { |
|
| 249 | + if ( ! empty( $entry[ '_multi' ] ) && ! empty( $field_settings[ 'form_id' ] ) && ! empty( $entry[ '_multi' ][ $field_settings[ 'form_id' ] ] ) ) { |
|
| 250 | + $entry = $entry[ '_multi' ][ $field_settings[ 'form_id' ] ]; |
|
| 251 | + if ( $_form = \GV\GF_Form::by_id( $field_settings[ 'form_id' ] ) ) { |
|
| 253 | 252 | $form = $_form->form; |
| 254 | 253 | } |
| 255 | 254 | } |
| 256 | 255 | |
| 257 | - if ( empty( $entry['form_id'] ) || empty( $field_settings['id'] ) ) { |
|
| 256 | + if ( empty( $entry[ 'form_id' ] ) || empty( $field_settings[ 'id' ] ) ) { |
|
| 258 | 257 | gravityview()->log->error( 'No entry or field_settings[id] supplied', array( 'data' => array( func_get_args() ) ) ); |
| 259 | 258 | return $bail( $label, $field_settings, $entry, $force_show_label, $form ); |
| 260 | 259 | } |
| 261 | 260 | |
| 262 | - if ( empty( $entry['id'] ) || ! $gv_entry = \GV\GF_Entry::by_id( $entry['id'] ) ) { |
|
| 261 | + if ( empty( $entry[ 'id' ] ) || ! $gv_entry = \GV\GF_Entry::by_id( $entry[ 'id' ] ) ) { |
|
| 263 | 262 | gravityview()->log->error( 'Invalid \GV\GF_Entry supplied', array( 'data' => $entry ) ); |
| 264 | 263 | return $bail( $label, $field_settings, $entry, $force_show_label, $form ); |
| 265 | 264 | } |
@@ -271,31 +270,31 @@ discard block |
||
| 271 | 270 | * |
| 272 | 271 | * Fields with a numeric ID are Gravity Forms ones. |
| 273 | 272 | */ |
| 274 | - $source = is_numeric( $field_settings['id'] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL; |
|
| 273 | + $source = is_numeric( $field_settings[ 'id' ] ) ? \GV\Source::BACKEND_GRAVITYFORMS : \GV\Source::BACKEND_INTERNAL; |
|
| 275 | 274 | |
| 276 | 275 | /** Initialize the future field. */ |
| 277 | 276 | switch ( $source ): |
| 278 | 277 | /** The Gravity Forms backend. */ |
| 279 | 278 | case \GV\Source::BACKEND_GRAVITYFORMS: |
| 280 | - if ( ! $gf_form = \GV\GF_Form::by_id( $entry['form_id'] ) ) { |
|
| 279 | + if ( ! $gf_form = \GV\GF_Form::by_id( $entry[ 'form_id' ] ) ) { |
|
| 281 | 280 | gravityview()->log->error( 'No form Gravity Form found for entry', array( 'data' => $entry ) ); |
| 282 | 281 | return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $form ); |
| 283 | 282 | } |
| 284 | 283 | |
| 285 | - if ( ! $field = $gf_form::get_field( $gf_form, $field_settings['id'] ) ) { |
|
| 286 | - gravityview()->log->error( 'No field found for specified form and field ID #{field_id}', array( 'field_id' => $field_settings['id'], 'data' => $form ) ); |
|
| 284 | + if ( ! $field = $gf_form::get_field( $gf_form, $field_settings[ 'id' ] ) ) { |
|
| 285 | + gravityview()->log->error( 'No field found for specified form and field ID #{field_id}', array( 'field_id' => $field_settings[ 'id' ], 'data' => $form ) ); |
|
| 287 | 286 | return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $gf_form->form ); |
| 288 | 287 | } |
| 289 | - if ( empty( $field_settings['show_label'] ) ) { |
|
| 288 | + if ( empty( $field_settings[ 'show_label' ] ) ) { |
|
| 290 | 289 | /** The label never wins... */ |
| 291 | - $field_settings['label'] = ''; |
|
| 290 | + $field_settings[ 'label' ] = ''; |
|
| 292 | 291 | } |
| 293 | 292 | |
| 294 | 293 | break; |
| 295 | 294 | |
| 296 | 295 | /** Our internal backend. */ |
| 297 | 296 | case \GV\Source::BACKEND_INTERNAL: |
| 298 | - if ( ! $field = \GV\Internal_Source::get_field( $field_settings['id'] ) ) { |
|
| 297 | + if ( ! $field = \GV\Internal_Source::get_field( $field_settings[ 'id' ] ) ) { |
|
| 299 | 298 | return $bail( $label, $field_settings, $entry->as_entry(), $force_show_label, $form ); |
| 300 | 299 | } |
| 301 | 300 | break; |
@@ -307,8 +306,8 @@ discard block |
||
| 307 | 306 | break; |
| 308 | 307 | endswitch; |
| 309 | 308 | |
| 310 | - if( $force_show_label ) { |
|
| 311 | - $field_settings['show_label'] = '1'; |
|
| 309 | + if ( $force_show_label ) { |
|
| 310 | + $field_settings[ 'show_label' ] = '1'; |
|
| 312 | 311 | } |
| 313 | 312 | |
| 314 | 313 | /** Add the field settings. */ |
@@ -444,7 +443,7 @@ discard block |
||
| 444 | 443 | '\GravityView_View::_current_entry' => \GravityView_View::getInstance()->getCurrentEntry(), |
| 445 | 444 | '\GravityView_View::fields' => \GravityView_View::getInstance()->getFields(), |
| 446 | 445 | '\GravityView_View::_current_field' => \GravityView_View::getInstance()->getCurrentField(), |
| 447 | - 'wp_actions[loop_start]' => empty( $wp_actions['loop_start'] ) ? 0 : $wp_actions['loop_start'], |
|
| 446 | + 'wp_actions[loop_start]' => empty( $wp_actions[ 'loop_start' ] ) ? 0 : $wp_actions[ 'loop_start' ], |
|
| 448 | 447 | 'wp_query::in_the_loop' => $wp_query->in_the_loop, |
| 449 | 448 | ); |
| 450 | 449 | } |
@@ -532,7 +531,7 @@ discard block |
||
| 532 | 531 | break; |
| 533 | 532 | case 'wp_actions[loop_start]': |
| 534 | 533 | global $wp_actions; |
| 535 | - $wp_actions['loop_start'] = $value; |
|
| 534 | + $wp_actions[ 'loop_start' ] = $value; |
|
| 536 | 535 | break; |
| 537 | 536 | case 'wp_query::in_the_loop': |
| 538 | 537 | global $wp_query; |
@@ -629,9 +628,7 @@ discard block |
||
| 629 | 628 | case 'request': |
| 630 | 629 | self::thaw( array( |
| 631 | 630 | '\GravityView_View::context' => ( |
| 632 | - $value->is_entry() ? 'single' : |
|
| 633 | - ( $value->is_edit_entry() ? 'edit' : |
|
| 634 | - ( $value->is_view() ? 'directory': null ) |
|
| 631 | + $value->is_entry() ? 'single' : ( $value->is_edit_entry() ? 'edit' : ( $value->is_view() ? 'directory' : null ) |
|
| 635 | 632 | ) |
| 636 | 633 | ), |
| 637 | 634 | '\GravityView_frontend::is_search' => $value->is_search(), |
@@ -685,14 +682,14 @@ discard block |
||
| 685 | 682 | global $wp_query, $wp_actions; |
| 686 | 683 | |
| 687 | 684 | $wp_query->in_the_loop = false; |
| 688 | - $wp_actions['loop_start'] = 0; |
|
| 685 | + $wp_actions[ 'loop_start' ] = 0; |
|
| 689 | 686 | } |
| 690 | 687 | } |
| 691 | 688 | |
| 692 | 689 | |
| 693 | 690 | /** Add some global fix for field capability discrepancies. */ |
| 694 | 691 | add_filter( 'gravityview/configuration/fields', function( $fields ) { |
| 695 | - if ( empty( $fields ) ) { |
|
| 692 | + if ( empty( $fields ) ) { |
|
| 696 | 693 | return $fields; |
| 697 | 694 | } |
| 698 | 695 | |
@@ -719,11 +716,11 @@ discard block |
||
| 719 | 716 | } |
| 720 | 717 | |
| 721 | 718 | foreach ( $_fields as $uid => &$_field ) { |
| 722 | - if ( ! isset( $_field['only_loggedin'] ) ) { |
|
| 719 | + if ( ! isset( $_field[ 'only_loggedin' ] ) ) { |
|
| 723 | 720 | continue; |
| 724 | 721 | } |
| 725 | 722 | /** If we do not require login, we don't require a cap. */ |
| 726 | - $_field['only_loggedin'] != '1' && ( $_field['only_loggedin_cap'] = '' ); |
|
| 723 | + $_field[ 'only_loggedin' ] != '1' && ( $_field[ 'only_loggedin_cap' ] = '' ); |
|
| 727 | 724 | } |
| 728 | 725 | } |
| 729 | 726 | return $fields; |
@@ -754,8 +751,8 @@ discard block |
||
| 754 | 751 | } |
| 755 | 752 | |
| 756 | 753 | foreach ( $_fields as $uid => &$_field ) { |
| 757 | - if ( ! empty( $_field['id'] ) && is_numeric( $_field['id'] ) && empty( $_field['form_id'] ) ) { |
|
| 758 | - $_field['form_id'] = $view->form->ID; |
|
| 754 | + if ( ! empty( $_field[ 'id' ] ) && is_numeric( $_field[ 'id' ] ) && empty( $_field[ 'form_id' ] ) ) { |
|
| 755 | + $_field[ 'form_id' ] = $view->form->ID; |
|
| 759 | 756 | } |
| 760 | 757 | } |
| 761 | 758 | } |
@@ -769,25 +766,25 @@ discard block |
||
| 769 | 766 | if ( class_exists( '\GravityView_frontend' ) ) { |
| 770 | 767 | global $wp_filter; |
| 771 | 768 | |
| 772 | - if ( empty( $wp_filter['gravityview_after'] ) ) { |
|
| 769 | + if ( empty( $wp_filter[ 'gravityview_after' ] ) ) { |
|
| 773 | 770 | return; |
| 774 | 771 | } |
| 775 | 772 | |
| 776 | 773 | /** WordPress 4.6 and lower compatibility, when WP_Hook classes were still absent. */ |
| 777 | - if ( is_array( $wp_filter['gravityview_after'] ) ) { |
|
| 778 | - if ( ! empty( $wp_filter['gravityview_after'][10] ) ) { |
|
| 779 | - foreach ( $wp_filter['gravityview_after'][10] as $function_key => $callback ) { |
|
| 774 | + if ( is_array( $wp_filter[ 'gravityview_after' ] ) ) { |
|
| 775 | + if ( ! empty( $wp_filter[ 'gravityview_after' ][ 10 ] ) ) { |
|
| 776 | + foreach ( $wp_filter[ 'gravityview_after' ][ 10 ] as $function_key => $callback ) { |
|
| 780 | 777 | if ( strpos( $function_key, 'context_not_configured_warning' ) ) { |
| 781 | - unset( $wp_filter['gravityview_after'][10][ $function_key ] ); |
|
| 778 | + unset( $wp_filter[ 'gravityview_after' ][ 10 ][ $function_key ] ); |
|
| 782 | 779 | } |
| 783 | 780 | } |
| 784 | 781 | } |
| 785 | 782 | return; |
| 786 | 783 | } |
| 787 | 784 | |
| 788 | - foreach ( $wp_filter['gravityview_after']->callbacks[10] as $function_key => $callback ) { |
|
| 785 | + foreach ( $wp_filter[ 'gravityview_after' ]->callbacks[ 10 ] as $function_key => $callback ) { |
|
| 789 | 786 | if ( strpos( $function_key, 'context_not_configured_warning' ) ) { |
| 790 | - unset( $wp_filter['gravityview_after']->callbacks[10][ $function_key ] ); |
|
| 787 | + unset( $wp_filter[ 'gravityview_after' ]->callbacks[ 10 ][ $function_key ] ); |
|
| 791 | 788 | } |
| 792 | 789 | } |
| 793 | 790 | } |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | $this->label = esc_html__( 'Result Number', 'gravityview' ); |
| 40 | 40 | |
| 41 | - add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'field_tooltips') ); |
|
| 41 | + add_filter( 'gravityview/metaboxes/tooltips', array( $this, 'field_tooltips' ) ); |
|
| 42 | 42 | |
| 43 | 43 | parent::__construct(); |
| 44 | 44 | } |
@@ -52,9 +52,9 @@ discard block |
||
| 52 | 52 | |
| 53 | 53 | $return = $tooltips; |
| 54 | 54 | |
| 55 | - $return['reverse_sequence'] = array( |
|
| 56 | - 'title' => __('Reverse the order of the result numbers', 'gravityview'), |
|
| 57 | - 'value' => __('Output row numbers in descending order. If enabled, numbers will go from high to low.', 'gravityview'), |
|
| 55 | + $return[ 'reverse_sequence' ] = array( |
|
| 56 | + 'title' => __( 'Reverse the order of the result numbers', 'gravityview' ), |
|
| 57 | + 'value' => __( 'Output row numbers in descending order. If enabled, numbers will go from high to low.', 'gravityview' ), |
|
| 58 | 58 | ); |
| 59 | 59 | |
| 60 | 60 | return $return; |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
| 64 | 64 | |
| 65 | - unset ( $field_options['search_filter'] ); |
|
| 65 | + unset ( $field_options[ 'search_filter' ] ); |
|
| 66 | 66 | |
| 67 | 67 | $new_fields = array( |
| 68 | 68 | 'start' => array( |
@@ -113,20 +113,20 @@ discard block |
||
| 113 | 113 | $return = $text; |
| 114 | 114 | |
| 115 | 115 | $context = new \GV\Template_Context(); |
| 116 | - $context->view = \GV\View::by_id( $view_data['view_id'] ); |
|
| 116 | + $context->view = \GV\View::by_id( $view_data[ 'view_id' ] ); |
|
| 117 | 117 | $context->entry = \GV\GF_Entry::from_entry( $entry ); |
| 118 | 118 | |
| 119 | 119 | $legacy_field = \GravityView_View::getInstance()->getCurrentField(); // TODO: Don't use legacy code... |
| 120 | 120 | |
| 121 | 121 | $gv_field = \GV\Internal_Field::by_id( 'sequence' ); |
| 122 | - $merge_tag_context = $legacy_field['UID']; |
|
| 122 | + $merge_tag_context = $legacy_field[ 'UID' ]; |
|
| 123 | 123 | |
| 124 | 124 | $merge_tag_context = uniqid( 'sequence_', true ) . "/$merge_tag_context"; |
| 125 | 125 | |
| 126 | 126 | foreach ( $matches as $match ) { |
| 127 | 127 | |
| 128 | - $full_tag = $match[0]; |
|
| 129 | - $property = $match[1]; |
|
| 128 | + $full_tag = $match[ 0 ]; |
|
| 129 | + $property = $match[ 1 ]; |
|
| 130 | 130 | |
| 131 | 131 | $gv_field->reverse = false; |
| 132 | 132 | $gv_field->start = 1; |
@@ -144,7 +144,7 @@ discard block |
||
| 144 | 144 | $maybe_start = explode( ':', $modifier ); |
| 145 | 145 | |
| 146 | 146 | if ( 'start' === rgar( $maybe_start, 0 ) && is_numeric( rgar( $maybe_start, 1 ) ) ) { |
| 147 | - $gv_field->start = (int) rgar( $maybe_start, 1 ); |
|
| 147 | + $gv_field->start = (int)rgar( $maybe_start, 1 ); |
|
| 148 | 148 | } |
| 149 | 149 | } |
| 150 | 150 | |
@@ -155,7 +155,7 @@ discard block |
||
| 155 | 155 | $merge_tag_context_modifiers = $merge_tag_context . '/' . var_export( $gv_field->reverse, true ) . '/' . $gv_field->start; |
| 156 | 156 | |
| 157 | 157 | if ( ! isset( $merge_tag_sequences[ $merge_tag_context_modifiers ] ) ) { |
| 158 | - $gv_field->UID = $legacy_field['UID'] . '/' . var_export( $gv_field->reverse, true ) . '/' . $gv_field->start; |
|
| 158 | + $gv_field->UID = $legacy_field[ 'UID' ] . '/' . var_export( $gv_field->reverse, true ) . '/' . $gv_field->start; |
|
| 159 | 159 | $context->field = $gv_field; |
| 160 | 160 | $sequence = $merge_tag_sequences[ $merge_tag_context_modifiers ] = $this->get_sequence( $context ); |
| 161 | 161 | } else { |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | $total = $context->view->get_entries()->total(); |
| 201 | 201 | remove_filter( 'gform_gf_query_sql', $callback ); |
| 202 | 202 | |
| 203 | - unset( $sql_query['paginate'] ); |
|
| 203 | + unset( $sql_query[ 'paginate' ] ); |
|
| 204 | 204 | |
| 205 | 205 | global $wpdb; |
| 206 | 206 | |