@@ -219,6 +219,9 @@ discard block |
||
219 | 219 | |
220 | 220 | } |
221 | 221 | |
222 | + /** |
|
223 | + * @param string $key |
|
224 | + */ |
|
222 | 225 | public function getCurrentFieldSetting( $key ) { |
223 | 226 | $settings = $this->getCurrentField('field_settings'); |
224 | 227 | |
@@ -725,6 +728,7 @@ discard block |
||
725 | 728 | * |
726 | 729 | * @inheritdoc |
727 | 730 | * @see Gamajo_Template_Loader::locate_template() |
731 | + * @param string $template_names |
|
728 | 732 | * @return null|string NULL: Template not found; String: path to template |
729 | 733 | */ |
730 | 734 | function locate_template( $template_names, $load = false, $require_once = true ) { |
@@ -328,34 +328,34 @@ discard block |
||
328 | 328 | } |
329 | 329 | |
330 | 330 | /** |
331 | - * Get the fields for a specific context |
|
332 | - * |
|
333 | - * @since 1.19.2 |
|
334 | - * |
|
331 | + * Get the fields for a specific context |
|
332 | + * |
|
333 | + * @since 1.19.2 |
|
334 | + * |
|
335 | 335 | * @param string $context [Optional] "directory", "single", or "edit" |
336 | 336 | * |
337 | 337 | * @return array Array of GravityView field layout configurations |
338 | 338 | */ |
339 | 339 | public function getContextFields( $context = '' ) { |
340 | 340 | |
341 | - if( '' === $context ) { |
|
342 | - $context = $this->getContext(); |
|
343 | - } |
|
341 | + if( '' === $context ) { |
|
342 | + $context = $this->getContext(); |
|
343 | + } |
|
344 | 344 | |
345 | 345 | $fields = $this->getFields(); |
346 | 346 | |
347 | - foreach ( (array) $fields as $key => $context_fields ) { |
|
347 | + foreach ( (array) $fields as $key => $context_fields ) { |
|
348 | 348 | |
349 | - // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against |
|
350 | - $matches = explode( '_', $key ); |
|
349 | + // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against |
|
350 | + $matches = explode( '_', $key ); |
|
351 | 351 | |
352 | - if( isset( $matches[0] ) && $matches[0] === $context ) { |
|
353 | - return $context_fields; |
|
354 | - } |
|
355 | - } |
|
352 | + if( isset( $matches[0] ) && $matches[0] === $context ) { |
|
353 | + return $context_fields; |
|
354 | + } |
|
355 | + } |
|
356 | 356 | |
357 | 357 | return array(); |
358 | - } |
|
358 | + } |
|
359 | 359 | |
360 | 360 | /** |
361 | 361 | * @param array $fields |
@@ -448,10 +448,10 @@ discard block |
||
448 | 448 | */ |
449 | 449 | public function getPaging() { |
450 | 450 | |
451 | - $default_params = array( |
|
452 | - 'offset' => 0, |
|
453 | - 'page_size' => 20, |
|
454 | - ); |
|
451 | + $default_params = array( |
|
452 | + 'offset' => 0, |
|
453 | + 'page_size' => 20, |
|
454 | + ); |
|
455 | 455 | |
456 | 456 | return wp_parse_args( $this->paging, $default_params ); |
457 | 457 | } |
@@ -508,10 +508,10 @@ discard block |
||
508 | 508 | public function getSorting() { |
509 | 509 | |
510 | 510 | $defaults_params = array( |
511 | - 'sort_field' => 'date_created', |
|
512 | - 'sort_direction' => 'ASC', |
|
513 | - 'is_numeric' => false, |
|
514 | - ); |
|
511 | + 'sort_field' => 'date_created', |
|
512 | + 'sort_direction' => 'ASC', |
|
513 | + 'is_numeric' => false, |
|
514 | + ); |
|
515 | 515 | |
516 | 516 | return wp_parse_args( $this->sorting, $defaults_params ); |
517 | 517 | } |
@@ -837,7 +837,7 @@ discard block |
||
837 | 837 | */ |
838 | 838 | public function render_widget_hooks( $view_id_or_context ) { |
839 | 839 | |
840 | - /** |
|
840 | + /** |
|
841 | 841 | * @deprecated Numeric argument is deprecated. Pass a \GV\Template_Context instead. |
842 | 842 | */ |
843 | 843 | if ( is_numeric( $view_id_or_context ) ) { |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | die; |
17 | 17 | } |
18 | 18 | |
19 | -if( ! class_exists( '\GV\Gamajo_Template_Loader' ) ) { |
|
19 | +if ( ! class_exists( '\GV\Gamajo_Template_Loader' ) ) { |
|
20 | 20 | require( GRAVITYVIEW_DIR . 'future/lib/class-gamajo-template-loader.php' ); |
21 | 21 | } |
22 | 22 | |
@@ -157,8 +157,8 @@ discard block |
||
157 | 157 | 'atts' => NULL, |
158 | 158 | ) ); |
159 | 159 | |
160 | - foreach ($atts as $key => $value) { |
|
161 | - if( is_null( $value ) ) { |
|
160 | + foreach ( $atts as $key => $value ) { |
|
161 | + if ( is_null( $value ) ) { |
|
162 | 162 | continue; |
163 | 163 | } |
164 | 164 | $this->{$key} = $value; |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | */ |
189 | 189 | static function getInstance( $passed_post = NULL ) { |
190 | 190 | |
191 | - if( empty( self::$instance ) ) { |
|
191 | + if ( empty( self::$instance ) ) { |
|
192 | 192 | self::$instance = new self( $passed_post ); |
193 | 193 | } |
194 | 194 | |
@@ -201,8 +201,8 @@ discard block |
||
201 | 201 | */ |
202 | 202 | public function getCurrentField( $key = NULL ) { |
203 | 203 | |
204 | - if( !empty( $key ) ) { |
|
205 | - if( isset( $this->_current_field[ $key ] ) ) { |
|
204 | + if ( ! empty( $key ) ) { |
|
205 | + if ( isset( $this->_current_field[ $key ] ) ) { |
|
206 | 206 | return $this->_current_field[ $key ]; |
207 | 207 | } |
208 | 208 | return NULL; |
@@ -213,16 +213,16 @@ discard block |
||
213 | 213 | |
214 | 214 | public function setCurrentFieldSetting( $key, $value ) { |
215 | 215 | |
216 | - if( !empty( $this->_current_field ) ) { |
|
217 | - $this->_current_field['field_settings'][ $key ] = $value; |
|
216 | + if ( ! empty( $this->_current_field ) ) { |
|
217 | + $this->_current_field[ 'field_settings' ][ $key ] = $value; |
|
218 | 218 | } |
219 | 219 | |
220 | 220 | } |
221 | 221 | |
222 | 222 | public function getCurrentFieldSetting( $key ) { |
223 | - $settings = $this->getCurrentField('field_settings'); |
|
223 | + $settings = $this->getCurrentField( 'field_settings' ); |
|
224 | 224 | |
225 | - if( $settings && !empty( $settings[ $key ] ) ) { |
|
225 | + if ( $settings && ! empty( $settings[ $key ] ) ) { |
|
226 | 226 | return $settings[ $key ]; |
227 | 227 | } |
228 | 228 | |
@@ -253,8 +253,8 @@ discard block |
||
253 | 253 | */ |
254 | 254 | public function getAtts( $key = NULL ) { |
255 | 255 | |
256 | - if( !empty( $key ) ) { |
|
257 | - if( isset( $this->atts[ $key ] ) ) { |
|
256 | + if ( ! empty( $key ) ) { |
|
257 | + if ( isset( $this->atts[ $key ] ) ) { |
|
258 | 258 | return $this->atts[ $key ]; |
259 | 259 | } |
260 | 260 | return NULL; |
@@ -320,7 +320,7 @@ discard block |
||
320 | 320 | |
321 | 321 | $fields = empty( $this->fields ) ? NULL : $this->fields; |
322 | 322 | |
323 | - if( $fields && !empty( $key ) ) { |
|
323 | + if ( $fields && ! empty( $key ) ) { |
|
324 | 324 | $fields = isset( $fields[ $key ] ) ? $fields[ $key ] : NULL; |
325 | 325 | } |
326 | 326 | |
@@ -338,18 +338,18 @@ discard block |
||
338 | 338 | */ |
339 | 339 | public function getContextFields( $context = '' ) { |
340 | 340 | |
341 | - if( '' === $context ) { |
|
341 | + if ( '' === $context ) { |
|
342 | 342 | $context = $this->getContext(); |
343 | 343 | } |
344 | 344 | |
345 | 345 | $fields = $this->getFields(); |
346 | 346 | |
347 | - foreach ( (array) $fields as $key => $context_fields ) { |
|
347 | + foreach ( (array)$fields as $key => $context_fields ) { |
|
348 | 348 | |
349 | 349 | // Formatted as `{context}_{template id}-{zone name}`, so we want just the $context to match against |
350 | 350 | $matches = explode( '_', $key ); |
351 | 351 | |
352 | - if( isset( $matches[0] ) && $matches[0] === $context ) { |
|
352 | + if ( isset( $matches[ 0 ] ) && $matches[ 0 ] === $context ) { |
|
353 | 353 | return $context_fields; |
354 | 354 | } |
355 | 355 | } |
@@ -370,8 +370,8 @@ discard block |
||
370 | 370 | */ |
371 | 371 | public function getField( $key ) { |
372 | 372 | |
373 | - if( !empty( $key ) ) { |
|
374 | - if( isset( $this->fields[ $key ] ) ) { |
|
373 | + if ( ! empty( $key ) ) { |
|
374 | + if ( isset( $this->fields[ $key ] ) ) { |
|
375 | 375 | return $this->fields[ $key ]; |
376 | 376 | } |
377 | 377 | } |
@@ -477,8 +477,8 @@ discard block |
||
477 | 477 | public function getPaginationCounts() { |
478 | 478 | |
479 | 479 | $paging = $this->getPaging(); |
480 | - $offset = $paging['offset']; |
|
481 | - $page_size = $paging['page_size']; |
|
480 | + $offset = $paging[ 'offset' ]; |
|
481 | + $page_size = $paging[ 'page_size' ]; |
|
482 | 482 | $total = $this->getTotalEntries(); |
483 | 483 | |
484 | 484 | if ( empty( $total ) ) { |
@@ -499,7 +499,7 @@ discard block |
||
499 | 499 | */ |
500 | 500 | list( $first, $last, $total ) = apply_filters( 'gravityview_pagination_counts', array( $first, $last, $total ) ); |
501 | 501 | |
502 | - return array( 'first' => (int) $first, 'last' => (int) $last, 'total' => (int) $total ); |
|
502 | + return array( 'first' => (int)$first, 'last' => (int)$last, 'total' => (int)$total ); |
|
503 | 503 | } |
504 | 504 | |
505 | 505 | /** |
@@ -595,16 +595,16 @@ discard block |
||
595 | 595 | */ |
596 | 596 | public function getCurrentEntry() { |
597 | 597 | |
598 | - if( in_array( $this->getContext(), array( 'edit', 'single') ) ) { |
|
598 | + if ( in_array( $this->getContext(), array( 'edit', 'single' ) ) ) { |
|
599 | 599 | $entries = $this->getEntries(); |
600 | - $entry = $entries[0]; |
|
600 | + $entry = $entries[ 0 ]; |
|
601 | 601 | } else { |
602 | 602 | $entry = $this->_current_entry; |
603 | 603 | } |
604 | 604 | |
605 | 605 | /** @since 1.16 Fixes DataTables empty entry issue */ |
606 | - if ( empty( $entry ) && ! empty( $this->_current_field['entry'] ) ) { |
|
607 | - $entry = $this->_current_field['entry']; |
|
606 | + if ( empty( $entry ) && ! empty( $this->_current_field[ 'entry' ] ) ) { |
|
607 | + $entry = $this->_current_field[ 'entry' ]; |
|
608 | 608 | } |
609 | 609 | |
610 | 610 | return $entry; |
@@ -644,7 +644,7 @@ discard block |
||
644 | 644 | public function renderZone( $zone = '', $atts = array(), $echo = true ) { |
645 | 645 | |
646 | 646 | if ( empty( $zone ) ) { |
647 | - gravityview()->log->error( 'No zone defined.'); |
|
647 | + gravityview()->log->error( 'No zone defined.' ); |
|
648 | 648 | return NULL; |
649 | 649 | } |
650 | 650 | |
@@ -653,16 +653,16 @@ discard block |
||
653 | 653 | 'context' => $this->getContext(), |
654 | 654 | 'entry' => $this->getCurrentEntry(), |
655 | 655 | 'form' => $this->getForm(), |
656 | - 'hide_empty' => $this->getAtts('hide_empty'), |
|
656 | + 'hide_empty' => $this->getAtts( 'hide_empty' ), |
|
657 | 657 | ); |
658 | 658 | |
659 | 659 | $final_atts = wp_parse_args( $atts, $defaults ); |
660 | 660 | |
661 | 661 | $output = ''; |
662 | 662 | |
663 | - $final_atts['zone_id'] = "{$final_atts['context']}_{$final_atts['slug']}-{$zone}"; |
|
663 | + $final_atts[ 'zone_id' ] = "{$final_atts[ 'context' ]}_{$final_atts[ 'slug' ]}-{$zone}"; |
|
664 | 664 | |
665 | - $fields = $this->getField( $final_atts['zone_id'] ); |
|
665 | + $fields = $this->getField( $final_atts[ 'zone_id' ] ); |
|
666 | 666 | |
667 | 667 | // Backward compatibility |
668 | 668 | if ( 'table' === $this->getTemplatePartSlug() ) { |
@@ -672,19 +672,19 @@ discard block |
||
672 | 672 | * @param \GravityView_View $this |
673 | 673 | * @deprecated Use `gravityview/template/table/fields` |
674 | 674 | */ |
675 | - $fields = apply_filters("gravityview_table_cells", $fields, $this ); |
|
675 | + $fields = apply_filters( "gravityview_table_cells", $fields, $this ); |
|
676 | 676 | } |
677 | 677 | |
678 | 678 | if ( empty( $fields ) ) { |
679 | 679 | |
680 | - gravityview()->log->error( 'Empty zone configuration for {zone_id}.', array( 'zone_id' => $final_atts['zone_id'] ) ); |
|
680 | + gravityview()->log->error( 'Empty zone configuration for {zone_id}.', array( 'zone_id' => $final_atts[ 'zone_id' ] ) ); |
|
681 | 681 | |
682 | 682 | return NULL; |
683 | 683 | } |
684 | 684 | |
685 | 685 | $field_output = ''; |
686 | 686 | foreach ( $fields as $field ) { |
687 | - $final_atts['field'] = $field; |
|
687 | + $final_atts[ 'field' ] = $field; |
|
688 | 688 | |
689 | 689 | $field_output .= gravityview_field_output( $final_atts ); |
690 | 690 | } |
@@ -701,17 +701,17 @@ discard block |
||
701 | 701 | return NULL; |
702 | 702 | } |
703 | 703 | |
704 | - if( !empty( $final_atts['wrapper_class'] ) ) { |
|
705 | - $output .= '<div class="'.gravityview_sanitize_html_class( $final_atts['wrapper_class'] ).'">'; |
|
704 | + if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) { |
|
705 | + $output .= '<div class="' . gravityview_sanitize_html_class( $final_atts[ 'wrapper_class' ] ) . '">'; |
|
706 | 706 | } |
707 | 707 | |
708 | 708 | $output .= $field_output; |
709 | 709 | |
710 | - if( !empty( $final_atts['wrapper_class'] ) ) { |
|
710 | + if ( ! empty( $final_atts[ 'wrapper_class' ] ) ) { |
|
711 | 711 | $output .= '</div>'; |
712 | 712 | } |
713 | 713 | |
714 | - if( $echo ) { |
|
714 | + if ( $echo ) { |
|
715 | 715 | echo $output; |
716 | 716 | } |
717 | 717 | |
@@ -729,7 +729,7 @@ discard block |
||
729 | 729 | */ |
730 | 730 | function locate_template( $template_names, $load = false, $require_once = true ) { |
731 | 731 | |
732 | - if( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) { |
|
732 | + if ( is_string( $template_names ) && isset( $this->located_templates[ $template_names ] ) ) { |
|
733 | 733 | |
734 | 734 | $located = $this->located_templates[ $template_names ]; |
735 | 735 | |
@@ -738,7 +738,7 @@ discard block |
||
738 | 738 | // Set $load to always false so we handle it here. |
739 | 739 | $located = parent::locate_template( $template_names, false, $require_once ); |
740 | 740 | |
741 | - if( is_string( $template_names ) ) { |
|
741 | + if ( is_string( $template_names ) ) { |
|
742 | 742 | $this->located_templates[ $template_names ] = $located; |
743 | 743 | } |
744 | 744 | } |
@@ -756,7 +756,7 @@ discard block |
||
756 | 756 | * @return mixed|null The stored data. |
757 | 757 | */ |
758 | 758 | public function __get( $name ) { |
759 | - if( isset( $this->{$name} ) ) { |
|
759 | + if ( isset( $this->{$name} ) ) { |
|
760 | 760 | return $this->{$name}; |
761 | 761 | } else { |
762 | 762 | return NULL; |
@@ -785,17 +785,17 @@ discard block |
||
785 | 785 | $additional = array(); |
786 | 786 | |
787 | 787 | // form-19-table-body.php |
788 | - $additional[] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name ); |
|
788 | + $additional[ ] = sprintf( 'form-%d-%s-%s.php', $this->getFormId(), $slug, $name ); |
|
789 | 789 | |
790 | - if( $view_id = $this->getViewId() ) { |
|
790 | + if ( $view_id = $this->getViewId() ) { |
|
791 | 791 | // view-3-table-body.php |
792 | - $additional[] = sprintf( 'view-%d-%s-%s.php', $view_id, $slug, $name ); |
|
792 | + $additional[ ] = sprintf( 'view-%d-%s-%s.php', $view_id, $slug, $name ); |
|
793 | 793 | } |
794 | 794 | |
795 | - if( $this->getPostId() ) { |
|
795 | + if ( $this->getPostId() ) { |
|
796 | 796 | |
797 | 797 | // page-19-table-body.php |
798 | - $additional[] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name ); |
|
798 | + $additional[ ] = sprintf( 'page-%d-%s-%s.php', $this->getPostId(), $slug, $name ); |
|
799 | 799 | } |
800 | 800 | |
801 | 801 | // Combine with existing table-body.php and table.php |
@@ -817,7 +817,7 @@ discard block |
||
817 | 817 | |
818 | 818 | gravityview()->log->debug( 'Rendering Template File: {path}', array( 'path' => $template_file ) ); |
819 | 819 | |
820 | - if( !empty( $template_file) ) { |
|
820 | + if ( ! empty( $template_file ) ) { |
|
821 | 821 | |
822 | 822 | if ( $require_once ) { |
823 | 823 | require_once( $template_file ); |
@@ -892,7 +892,7 @@ discard block |
||
892 | 892 | |
893 | 893 | // Prevent being called twice |
894 | 894 | if ( did_action( "gravityview/widgets/$zone/{$view->ID}/rendered" ) ) { |
895 | - gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone.'_'.$view->ID.'_widgets' ) ); |
|
895 | + gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone . '_' . $view->ID . '_widgets' ) ); |
|
896 | 896 | return; |
897 | 897 | } |
898 | 898 | |
@@ -914,7 +914,7 @@ discard block |
||
914 | 914 | * @param string $zone Current widget zone, either `header` or `footer` |
915 | 915 | * @param array $widgets Array of widget configurations for the current zone, as set by `gravityview_get_current_view_data()['widgets']` |
916 | 916 | */ |
917 | - $css_class = apply_filters('gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() ); |
|
917 | + $css_class = apply_filters( 'gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() ); |
|
918 | 918 | |
919 | 919 | $css_class = gravityview_sanitize_html_class( $css_class ); |
920 | 920 | |
@@ -922,15 +922,15 @@ discard block |
||
922 | 922 | ?> |
923 | 923 | <div class="<?php echo $css_class; ?>"> |
924 | 924 | <?php |
925 | - foreach( $rows as $row ) { |
|
926 | - foreach( $row as $col => $areas ) { |
|
925 | + foreach ( $rows as $row ) { |
|
926 | + foreach ( $row as $col => $areas ) { |
|
927 | 927 | $column = ( $col == '2-2' ) ? '1-2 gv-right' : "$col gv-left"; |
928 | 928 | ?> |
929 | 929 | <div class="gv-grid-col-<?php echo esc_attr( $column ); ?>"> |
930 | 930 | <?php |
931 | 931 | if ( ! empty( $areas ) ) { |
932 | 932 | foreach ( $areas as $area ) { |
933 | - foreach ( $widgets->by_position( $zone . '_' . $area['areaid'] )->all() as $widget ) { |
|
933 | + foreach ( $widgets->by_position( $zone . '_' . $area[ 'areaid' ] )->all() as $widget ) { |
|
934 | 934 | do_action( sprintf( 'gravityview/widgets/%s/render', $widget->get_widget_id() ), $widget->configuration->all(), null, $view_id_or_context ); |
935 | 935 | } |
936 | 936 | } |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | * |
59 | 59 | * @see GVCommon::get_form_fields() |
60 | 60 | * @access public |
61 | - * @param string|array $form_id (default: '') or $form object |
|
61 | + * @param string|array $form (default: '') or $form object |
|
62 | 62 | * @return array |
63 | 63 | */ |
64 | 64 | function gravityview_get_form_fields( $form = '', $add_default_properties = false, $include_parent_field = true ) { |
@@ -108,7 +108,6 @@ discard block |
||
108 | 108 | * Since 1.4, supports custom entry slugs. The way that GravityView fetches an entry based on the custom slug is by searching `gravityview_unique_id` meta. The `$entry_slug` is fetched by getting the current query var set by `is_single_entry()` |
109 | 109 | * |
110 | 110 | * @access public |
111 | - * @param mixed $entry_id |
|
112 | 111 | * @param boolean $force_allow_ids Force the get_entry() method to allow passed entry IDs, even if the `gravityview_custom_entry_slug_allow_id` filter returns false. |
113 | 112 | * @param boolean $check_entry_display Check whether the entry is visible for the current View configuration. Default: true {@since 1.14} |
114 | 113 | * @return array|boolean |
@@ -202,7 +201,6 @@ discard block |
||
202 | 201 | * |
203 | 202 | * @see GravityView_Template::template_id |
204 | 203 | * |
205 | - * @param int $view_id The ID of the View to get the layout of |
|
206 | 204 | * |
207 | 205 | * @return string GravityView_Template::template_id value. Empty string if not. |
208 | 206 | */ |
@@ -333,8 +333,8 @@ discard block |
||
333 | 333 | * @param mixed $field_id Field ID or Field array |
334 | 334 | * @return string field type |
335 | 335 | */ |
336 | -function gravityview_get_field_type( $form = null , $field_id = '' ) { |
|
337 | - return GVCommon::get_field_type( $form, $field_id ); |
|
336 | +function gravityview_get_field_type( $form = null, $field_id = '' ) { |
|
337 | + return GVCommon::get_field_type( $form, $field_id ); |
|
338 | 338 | } |
339 | 339 | |
340 | 340 | |
@@ -347,8 +347,8 @@ discard block |
||
347 | 347 | * @return string HTML of the output. Empty string if $view_id is empty. |
348 | 348 | */ |
349 | 349 | function get_gravityview( $view_id = '', $atts = array() ) { |
350 | - if( !empty( $view_id ) ) { |
|
351 | - $atts['id'] = $view_id; |
|
350 | + if ( ! empty( $view_id ) ) { |
|
351 | + $atts[ 'id' ] = $view_id; |
|
352 | 352 | $args = wp_parse_args( $atts, \GV\View_Settings::defaults() ); |
353 | 353 | $GravityView_frontend = GravityView_frontend::getInstance(); |
354 | 354 | $GravityView_frontend->setGvOutputData( GravityView_View_Data::getInstance( $view_id ) ); |
@@ -391,19 +391,19 @@ discard block |
||
391 | 391 | */ |
392 | 392 | function gravityview_view_has_single_checkbox_or_radio( $form, $view_fields ) { |
393 | 393 | |
394 | - if( class_exists('GFFormsModel') && $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) { |
|
394 | + if ( class_exists( 'GFFormsModel' ) && $form_fields = GFFormsModel::get_fields_by_type( $form, array( 'checkbox', 'radio' ) ) ) { |
|
395 | 395 | |
396 | 396 | /** @var GF_Field_Radio|GF_Field_Checkbox $form_field */ |
397 | - foreach( $form_fields as $form_field ) { |
|
397 | + foreach ( $form_fields as $form_field ) { |
|
398 | 398 | $field_id = $form_field->id; |
399 | - foreach( $view_fields as $zone ) { |
|
399 | + foreach ( $view_fields as $zone ) { |
|
400 | 400 | |
401 | 401 | // ACF compatibility; ACF-added fields aren't arrays |
402 | 402 | if ( ! is_array( $zone ) ) { continue; } |
403 | 403 | |
404 | - foreach( $zone as $field ) { |
|
404 | + foreach ( $zone as $field ) { |
|
405 | 405 | // If it's an input, not the parent and the parent ID matches a checkbox or radio |
406 | - if( ( strpos( $field['id'], '.' ) > 0 ) && floor( $field['id'] ) === floor( $field_id ) ) { |
|
406 | + if ( ( strpos( $field[ 'id' ], '.' ) > 0 ) && floor( $field[ 'id' ] ) === floor( $field_id ) ) { |
|
407 | 407 | return true; |
408 | 408 | } |
409 | 409 | } |
@@ -45,7 +45,6 @@ discard block |
||
45 | 45 | * Trick the GF fileupload field to render with the proper HTML ID to enable the plupload JS to work properly |
46 | 46 | * |
47 | 47 | * @param array $form The Form Object currently being processed. |
48 | - * @param string|array $value The field value. From default/dynamic population, $_POST, or a resumed incomplete submission. |
|
49 | 48 | * @param null|array $entry Null or the Entry Object currently being edited. |
50 | 49 | * @param GF_Field_FileUpload $field Gravity Forms field |
51 | 50 | * |
@@ -74,6 +73,7 @@ discard block |
||
74 | 73 | * |
75 | 74 | * @since 2.0 |
76 | 75 | * @param \GV\Template_Context The context. |
76 | + * @param GV\Template_Context $context |
|
77 | 77 | * |
78 | 78 | * @return array Array of file output, with `file_path` and `html` keys (see comments above) |
79 | 79 | */ |
@@ -24,21 +24,21 @@ discard block |
||
24 | 24 | |
25 | 25 | public function field_options( $field_options, $template_id, $field_id, $context, $input_type, $form_id ) { |
26 | 26 | |
27 | - unset( $field_options['search_filter'] ); |
|
27 | + unset( $field_options[ 'search_filter' ] ); |
|
28 | 28 | |
29 | - if( 'edit' === $context ) { |
|
29 | + if ( 'edit' === $context ) { |
|
30 | 30 | return $field_options; |
31 | 31 | } |
32 | 32 | |
33 | - $add_options['link_to_file'] = array( |
|
33 | + $add_options[ 'link_to_file' ] = array( |
|
34 | 34 | 'type' => 'checkbox', |
35 | 35 | 'label' => __( 'Display as a Link:', 'gravityview' ), |
36 | - 'desc' => __('Display the uploaded files as links, rather than embedded content.', 'gravityview'), |
|
36 | + 'desc' => __( 'Display the uploaded files as links, rather than embedded content.', 'gravityview' ), |
|
37 | 37 | 'value' => false, |
38 | 38 | 'merge_tags' => false, |
39 | 39 | ); |
40 | 40 | |
41 | - $add_options['image_width'] = array( |
|
41 | + $add_options[ 'image_width' ] = array( |
|
42 | 42 | 'type' => 'text', |
43 | 43 | 'label' => __( 'Custom Width:', 'gravityview' ), |
44 | 44 | 'desc' => __( 'Override the default image width (250).', 'gravityview' ), |
@@ -127,14 +127,14 @@ discard block |
||
127 | 127 | $base_id = null; |
128 | 128 | |
129 | 129 | $is_single = gravityview_get_context() === 'single'; |
130 | - $lightbox = ! empty( $gravityview_view->atts['lightbox'] ); |
|
130 | + $lightbox = ! empty( $gravityview_view->atts[ 'lightbox' ] ); |
|
131 | 131 | $field_compat = $gravityview_view->getCurrentField(); |
132 | 132 | } |
133 | 133 | |
134 | 134 | $output_arr = array(); |
135 | 135 | |
136 | 136 | // Get an array of file paths for the field. |
137 | - $file_paths = \GV\Utils::get( $field , 'multipleFiles' ) ? json_decode( $value ) : array( $value ); |
|
137 | + $file_paths = \GV\Utils::get( $field, 'multipleFiles' ) ? json_decode( $value ) : array( $value ); |
|
138 | 138 | |
139 | 139 | // The $value JSON was probably truncated; let's check lead_detail_long. |
140 | 140 | if ( ! is_array( $file_paths ) ) { |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | $rendered = null; |
154 | 154 | |
155 | 155 | // If the site is HTTPS, use HTTPS |
156 | - if ( function_exists('set_url_scheme') ) { |
|
156 | + if ( function_exists( 'set_url_scheme' ) ) { |
|
157 | 157 | $file_path = set_url_scheme( $file_path ); |
158 | 158 | } |
159 | 159 | |
@@ -164,8 +164,8 @@ discard block |
||
164 | 164 | $file_path_info = pathinfo( $file_path ); |
165 | 165 | |
166 | 166 | // If pathinfo() gave us the extension of the file, run the switch statement using that. |
167 | - $extension = empty( $file_path_info['extension'] ) ? NULL : strtolower( $file_path_info['extension'] ); |
|
168 | - $basename = $file_path_info['basename']; |
|
167 | + $extension = empty( $file_path_info[ 'extension' ] ) ? NULL : strtolower( $file_path_info[ 'extension' ] ); |
|
168 | + $basename = $file_path_info[ 'basename' ]; |
|
169 | 169 | |
170 | 170 | // Get the secure download URL |
171 | 171 | $is_secure = false; |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | */ |
203 | 203 | $audio_settings = apply_filters( 'gravityview_audio_settings', array( |
204 | 204 | 'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension |
205 | - 'class' => 'wp-audio-shortcode gv-audio gv-field-id-'.$field_settings['id'] |
|
205 | + 'class' => 'wp-audio-shortcode gv-audio gv-field-id-' . $field_settings[ 'id' ] |
|
206 | 206 | ), $context ); |
207 | 207 | |
208 | 208 | /** |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | */ |
239 | 239 | $video_settings = apply_filters( 'gravityview_video_settings', array( |
240 | 240 | 'src' => $insecure_file_path, // Needs to be insecure path so WP can parse extension |
241 | - 'class' => 'wp-video-shortcode gv-video gv-field-id-'.$field_settings['id'] |
|
241 | + 'class' => 'wp-video-shortcode gv-video gv-field-id-' . $field_settings[ 'id' ] |
|
242 | 242 | ), $context ); |
243 | 243 | |
244 | 244 | /** |
@@ -271,13 +271,13 @@ discard block |
||
271 | 271 | $width = \GV\Utils::get( $field_settings, 'image_width', 250 ); |
272 | 272 | $image_atts = array( |
273 | 273 | 'src' => $file_path, |
274 | - 'class' => 'gv-image gv-field-id-' . $field_settings['id'], |
|
275 | - 'alt' => $field_settings['label'], |
|
276 | - 'width' => ( $is_single ? null : ( $width ? $width: 250 ) ) |
|
274 | + 'class' => 'gv-image gv-field-id-' . $field_settings[ 'id' ], |
|
275 | + 'alt' => $field_settings[ 'label' ], |
|
276 | + 'width' => ( $is_single ? null : ( $width ? $width : 250 ) ) |
|
277 | 277 | ); |
278 | 278 | |
279 | 279 | if ( $is_secure ) { |
280 | - $image_atts['validate_src'] = false; |
|
280 | + $image_atts[ 'validate_src' ] = false; |
|
281 | 281 | } |
282 | 282 | |
283 | 283 | /** |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | |
293 | 293 | $image = new GravityView_Image( $image_atts ); |
294 | 294 | |
295 | - $entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry ); |
|
295 | + $entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry ); |
|
296 | 296 | |
297 | 297 | /** |
298 | 298 | * @filter `gravityview/fields/fileupload/allow_insecure_lightbox` Allow insecure links to be shown for the lighbox. |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | */ |
304 | 304 | $override_security = apply_filters( 'gravityview/fields/fileupload/allow_insecure_lightbox', false, $file_path, $field_settings, $context ); |
305 | 305 | |
306 | - if ( $lightbox && empty( $field_settings['show_as_link'] ) && ( ! $is_secure || $override_security ) ) { |
|
306 | + if ( $lightbox && empty( $field_settings[ 'show_as_link' ] ) && ( ! $is_secure || $override_security ) ) { |
|
307 | 307 | $lightbox_link_atts = array( |
308 | 308 | 'rel' => sprintf( "%s-%s", $gv_class, $entry_slug ), |
309 | 309 | 'class' => 'thickbox', |
@@ -312,7 +312,7 @@ discard block |
||
312 | 312 | $lightbox_link_atts = apply_filters( 'gravityview/fields/fileupload/link_atts', $lightbox_link_atts, $field_compat, $context ); |
313 | 313 | |
314 | 314 | if ( $override_security ) { |
315 | - $image_atts['src'] = $insecure_file_path; |
|
315 | + $image_atts[ 'src' ] = $insecure_file_path; |
|
316 | 316 | $image = new GravityView_Image( $image_atts ); |
317 | 317 | $file_path = $insecure_file_path; |
318 | 318 | // :( a kitten died somewhere |
@@ -324,7 +324,7 @@ discard block |
||
324 | 324 | } |
325 | 325 | |
326 | 326 | // Show as link should render the image regardless. |
327 | - if ( ! empty( $field_settings['show_as_link'] ) ) { |
|
327 | + if ( ! empty( $field_settings[ 'show_as_link' ] ) ) { |
|
328 | 328 | $text = $rendered; |
329 | 329 | } |
330 | 330 | } |
@@ -341,7 +341,7 @@ discard block |
||
341 | 341 | $disable_wrapped_link = apply_filters( 'gravityview/fields/fileupload/disable_link', false, $field_compat, $context ); |
342 | 342 | |
343 | 343 | // Output textualized content where |
344 | - if ( ! $disable_wrapped_link && ( ! empty( $field_settings['link_to_file'] ) || ! empty( $field_settings['show_as_link'] ) ) ) { |
|
344 | + if ( ! $disable_wrapped_link && ( ! empty( $field_settings[ 'link_to_file' ] ) || ! empty( $field_settings[ 'show_as_link' ] ) ) ) { |
|
345 | 345 | /** |
346 | 346 | * Modify the link text (defaults to the file name) |
347 | 347 | * |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | */ |
355 | 355 | $content = apply_filters( 'gravityview/fields/fileupload/link_content', $text, $field_compat, $context ); |
356 | 356 | |
357 | - if ( empty( $field_settings['show_as_link'] ) ) { |
|
357 | + if ( empty( $field_settings[ 'show_as_link' ] ) ) { |
|
358 | 358 | /** |
359 | 359 | * @filter `gravityview/fields/fileupload/link_atts` Modify the link attributes for a file upload field |
360 | 360 | * @param array|string $link_atts Array or attributes string |
@@ -370,7 +370,7 @@ discard block |
||
370 | 370 | $content = empty( $rendered ) ? $text : $rendered; |
371 | 371 | } |
372 | 372 | |
373 | - $output_arr[] = array( |
|
373 | + $output_arr[ ] = array( |
|
374 | 374 | 'file_path' => $file_path, |
375 | 375 | 'content' => $content |
376 | 376 | ); |
@@ -72,7 +72,7 @@ |
||
72 | 72 | * |
73 | 73 | * @param mixed $value The value in. |
74 | 74 | * |
75 | - * @return mixed The value out. |
|
75 | + * @return string The value out. |
|
76 | 76 | */ |
77 | 77 | public function get_value( $value ) { |
78 | 78 | return $this->get_string_from_value( $value ); |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | public function get_content( $output, $entry = array(), $field_settings = array(), $field = array() ) { |
61 | 61 | |
62 | 62 | /** Overridden by a template. */ |
63 | - if( ! empty( $field['field_path'] ) ) { return $output; } |
|
63 | + if ( ! empty( $field[ 'field_path' ] ) ) { return $output; } |
|
64 | 64 | |
65 | 65 | return $this->get_string_from_value( $output ); |
66 | 66 | } |
@@ -92,11 +92,11 @@ discard block |
||
92 | 92 | switch ( intval( $value ) ) { |
93 | 93 | case self::NOT_FULFILLED: |
94 | 94 | default: |
95 | - $return = __('Not Fulfilled', 'gravityview'); |
|
95 | + $return = __( 'Not Fulfilled', 'gravityview' ); |
|
96 | 96 | break; |
97 | 97 | |
98 | 98 | case self::FULFILLED: |
99 | - $return = __('Fulfilled', 'gravityview'); |
|
99 | + $return = __( 'Fulfilled', 'gravityview' ); |
|
100 | 100 | break; |
101 | 101 | } |
102 | 102 | |
@@ -116,13 +116,13 @@ discard block |
||
116 | 116 | * |
117 | 117 | * @return string Original text if {is_fulfilled} isn't found. Otherwise, "Not Fulfilled" or "Fulfilled" |
118 | 118 | */ |
119 | - public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) { |
|
119 | + public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) { |
|
120 | 120 | |
121 | 121 | $return = $text; |
122 | 122 | |
123 | 123 | foreach ( $matches as $match ) { |
124 | 124 | |
125 | - $full_tag = $match[0]; |
|
125 | + $full_tag = $match[ 0 ]; |
|
126 | 126 | |
127 | 127 | $fulfilled = \GV\Utils::get( $entry, 'is_fulfilled' ); |
128 | 128 |
@@ -69,7 +69,7 @@ |
||
69 | 69 | * @param \GV\Entry $entry The entry. |
70 | 70 | * @param \GV\Request $request The request context. |
71 | 71 | * |
72 | - * @return mixed $value The filtered value. |
|
72 | + * @return string $value The filtered value. |
|
73 | 73 | */ |
74 | 74 | public function get_value( $value, $field, $view, $source, $entry, $request ) { |
75 | 75 | return $this->get_content( $value, $entry->as_entry(), $field->as_configuration() ); |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | public function get_content( $output = '', $entry = array(), $field_settings = array(), $field = array() ) { |
50 | 50 | |
51 | 51 | /** Overridden by a template. */ |
52 | - if( ! empty( $field['field_path'] ) ) { return $output; } |
|
52 | + if ( ! empty( $field[ 'field_path' ] ) ) { return $output; } |
|
53 | 53 | |
54 | 54 | $amount = \GV\Utils::get( $entry, 'payment_amount' ); |
55 | 55 | $return = GFCommon::to_money( $amount, \GV\Utils::get( $entry, 'currency' ) ); |
@@ -88,14 +88,14 @@ discard block |
||
88 | 88 | * |
89 | 89 | * @return string Original text if {date_created} isn't found. Otherwise, replaced text. |
90 | 90 | */ |
91 | - public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) { |
|
91 | + public function replace_merge_tag( $matches = array(), $text = '', $form = array(), $entry = array(), $url_encode = false, $esc_html = false ) { |
|
92 | 92 | |
93 | 93 | $return = $text; |
94 | 94 | |
95 | 95 | foreach ( $matches as $match ) { |
96 | 96 | |
97 | - $full_tag = $match[0]; |
|
98 | - $modifier = isset( $match[1] ) ? $match[1] : false; |
|
97 | + $full_tag = $match[ 0 ]; |
|
98 | + $modifier = isset( $match[ 1 ] ) ? $match[ 1 ] : false; |
|
99 | 99 | |
100 | 100 | $amount = \GV\Utils::get( $entry, 'payment_amount' ); |
101 | 101 |
@@ -2,7 +2,9 @@ |
||
2 | 2 | namespace GV; |
3 | 3 | |
4 | 4 | // Exit if accessed directly |
5 | -if ( ! defined( 'ABSPATH' ) ) exit; |
|
5 | +if ( ! defined( 'ABSPATH' ) ) { |
|
6 | + exit; |
|
7 | +} |
|
6 | 8 | |
7 | 9 | /** |
8 | 10 | * Allows plugins to use their own update API. |
@@ -78,7 +78,7 @@ |
||
78 | 78 | * @uses api_request() |
79 | 79 | * |
80 | 80 | * @param array $_transient_data Update array build by WordPress. |
81 | - * @return array Modified update array with custom plugin data. |
|
81 | + * @return \stdClass Modified update array with custom plugin data. |
|
82 | 82 | */ |
83 | 83 | public function check_update( $_transient_data ) { |
84 | 84 |
@@ -40,10 +40,10 @@ discard block |
||
40 | 40 | $this->api_data = $_api_data; |
41 | 41 | $this->name = plugin_basename( $_plugin_file ); |
42 | 42 | $this->slug = basename( $_plugin_file, '.php' ); |
43 | - $this->version = $_api_data['version']; |
|
44 | - $this->wp_override = isset( $_api_data['wp_override'] ) ? (bool) $_api_data['wp_override'] : false; |
|
45 | - $this->beta = ! empty( $this->api_data['beta'] ) ? true : false; |
|
46 | - $this->cache_key = 'edd_sl_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) ); |
|
43 | + $this->version = $_api_data[ 'version' ]; |
|
44 | + $this->wp_override = isset( $_api_data[ 'wp_override' ] ) ? (bool)$_api_data[ 'wp_override' ] : false; |
|
45 | + $this->beta = ! empty( $this->api_data[ 'beta' ] ) ? true : false; |
|
46 | + $this->cache_key = 'edd_sl_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) ); |
|
47 | 47 | |
48 | 48 | $edd_plugin_data[ $this->slug ] = $this->api_data; |
49 | 49 | |
@@ -147,11 +147,11 @@ discard block |
||
147 | 147 | return; |
148 | 148 | } |
149 | 149 | |
150 | - if( ! current_user_can( 'update_plugins' ) ) { |
|
150 | + if ( ! current_user_can( 'update_plugins' ) ) { |
|
151 | 151 | return; |
152 | 152 | } |
153 | 153 | |
154 | - if( ! is_multisite() ) { |
|
154 | + if ( ! is_multisite() ) { |
|
155 | 155 | return; |
156 | 156 | } |
157 | 157 | |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | '<a target="_blank" class="thickbox" href="' . esc_url( $changelog_link ) . '">', |
248 | 248 | esc_html( $version_info->new_version ), |
249 | 249 | '</a>', |
250 | - '<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) .'">', |
|
250 | + '<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) . '">', |
|
251 | 251 | '</a>' |
252 | 252 | ); |
253 | 253 | } |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | ) |
293 | 293 | ); |
294 | 294 | |
295 | - $cache_key = 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) ); |
|
295 | + $cache_key = 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) ); |
|
296 | 296 | |
297 | 297 | // Get the transient where we store the api request for this plugin for 24 hours |
298 | 298 | $edd_api_request_transient = $this->get_cached_version_info( $cache_key ); |
@@ -333,7 +333,7 @@ discard block |
||
333 | 333 | $_data->contributors = $this->convert_object_to_array( $_data->contributors ); |
334 | 334 | } |
335 | 335 | |
336 | - if( ! isset( $_data->plugin ) ) { |
|
336 | + if ( ! isset( $_data->plugin ) ) { |
|
337 | 337 | $_data->plugin = $this->name; |
338 | 338 | } |
339 | 339 | |
@@ -372,7 +372,7 @@ discard block |
||
372 | 372 | |
373 | 373 | $verify_ssl = $this->verify_ssl(); |
374 | 374 | if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) { |
375 | - $args['sslverify'] = $verify_ssl; |
|
375 | + $args[ 'sslverify' ] = $verify_ssl; |
|
376 | 376 | } |
377 | 377 | return $args; |
378 | 378 | |
@@ -400,9 +400,9 @@ discard block |
||
400 | 400 | if ( ! is_array( $edd_plugin_url_available ) || ! isset( $edd_plugin_url_available[ $store_hash ] ) ) { |
401 | 401 | $test_url_parts = parse_url( $this->api_url ); |
402 | 402 | |
403 | - $scheme = ! empty( $test_url_parts['scheme'] ) ? $test_url_parts['scheme'] : 'http'; |
|
404 | - $host = ! empty( $test_url_parts['host'] ) ? $test_url_parts['host'] : ''; |
|
405 | - $port = ! empty( $test_url_parts['port'] ) ? ':' . $test_url_parts['port'] : ''; |
|
403 | + $scheme = ! empty( $test_url_parts[ 'scheme' ] ) ? $test_url_parts[ 'scheme' ] : 'http'; |
|
404 | + $host = ! empty( $test_url_parts[ 'host' ] ) ? $test_url_parts[ 'host' ] : ''; |
|
405 | + $port = ! empty( $test_url_parts[ 'port' ] ) ? ':' . $test_url_parts[ 'port' ] : ''; |
|
406 | 406 | |
407 | 407 | if ( empty( $host ) ) { |
408 | 408 | $edd_plugin_url_available[ $store_hash ] = false; |
@@ -419,27 +419,27 @@ discard block |
||
419 | 419 | |
420 | 420 | $data = array_merge( $this->api_data, $_data ); |
421 | 421 | |
422 | - if ( $data['slug'] != $this->slug ) { |
|
422 | + if ( $data[ 'slug' ] != $this->slug ) { |
|
423 | 423 | return; |
424 | 424 | } |
425 | 425 | |
426 | - if( $this->api_url == trailingslashit ( home_url() ) ) { |
|
426 | + if ( $this->api_url == trailingslashit( home_url() ) ) { |
|
427 | 427 | return false; // Don't allow a plugin to ping itself |
428 | 428 | } |
429 | 429 | |
430 | 430 | $api_params = array( |
431 | 431 | 'edd_action' => 'get_version', |
432 | - 'license' => ! empty( $data['license'] ) ? $data['license'] : '', |
|
433 | - 'item_name' => isset( $data['item_name'] ) ? $data['item_name'] : false, |
|
434 | - 'item_id' => isset( $data['item_id'] ) ? $data['item_id'] : false, |
|
435 | - 'version' => isset( $data['version'] ) ? $data['version'] : false, |
|
436 | - 'slug' => $data['slug'], |
|
437 | - 'author' => $data['author'], |
|
432 | + 'license' => ! empty( $data[ 'license' ] ) ? $data[ 'license' ] : '', |
|
433 | + 'item_name' => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false, |
|
434 | + 'item_id' => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false, |
|
435 | + 'version' => isset( $data[ 'version' ] ) ? $data[ 'version' ] : false, |
|
436 | + 'slug' => $data[ 'slug' ], |
|
437 | + 'author' => $data[ 'author' ], |
|
438 | 438 | 'url' => home_url(), |
439 | - 'beta' => ! empty( $data['beta'] ), |
|
439 | + 'beta' => ! empty( $data[ 'beta' ] ), |
|
440 | 440 | ); |
441 | 441 | |
442 | - $request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => $verify_ssl, 'body' => $api_params ) ); |
|
442 | + $request = wp_remote_post( $this->api_url, array( 'timeout' => 15, 'sslverify' => $verify_ssl, 'body' => $api_params ) ); |
|
443 | 443 | |
444 | 444 | if ( ! is_wp_error( $request ) ) { |
445 | 445 | $request = json_decode( wp_remote_retrieve_body( $request ) ); |
@@ -459,9 +459,9 @@ discard block |
||
459 | 459 | $request->icons = maybe_unserialize( $request->icons ); |
460 | 460 | } |
461 | 461 | |
462 | - if( ! empty( $request->sections ) ) { |
|
463 | - foreach( $request->sections as $key => $section ) { |
|
464 | - $request->$key = (array) $section; |
|
462 | + if ( ! empty( $request->sections ) ) { |
|
463 | + foreach ( $request->sections as $key => $section ) { |
|
464 | + $request->$key = (array)$section; |
|
465 | 465 | } |
466 | 466 | } |
467 | 467 | |
@@ -472,37 +472,37 @@ discard block |
||
472 | 472 | |
473 | 473 | global $edd_plugin_data; |
474 | 474 | |
475 | - if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) { |
|
475 | + if ( empty( $_REQUEST[ 'edd_sl_action' ] ) || 'view_plugin_changelog' != $_REQUEST[ 'edd_sl_action' ] ) { |
|
476 | 476 | return; |
477 | 477 | } |
478 | 478 | |
479 | - if( empty( $_REQUEST['plugin'] ) ) { |
|
479 | + if ( empty( $_REQUEST[ 'plugin' ] ) ) { |
|
480 | 480 | return; |
481 | 481 | } |
482 | 482 | |
483 | - if( empty( $_REQUEST['slug'] ) ) { |
|
483 | + if ( empty( $_REQUEST[ 'slug' ] ) ) { |
|
484 | 484 | return; |
485 | 485 | } |
486 | 486 | |
487 | - if( ! current_user_can( 'update_plugins' ) ) { |
|
487 | + if ( ! current_user_can( 'update_plugins' ) ) { |
|
488 | 488 | wp_die( __( 'You do not have permission to install plugin updates', 'gravityview' ), __( 'Error', 'gravityview' ), array( 'response' => 403 ) ); |
489 | 489 | } |
490 | 490 | |
491 | - $data = $edd_plugin_data[ $_REQUEST['slug'] ]; |
|
492 | - $beta = ! empty( $data['beta'] ) ? true : false; |
|
493 | - $cache_key = md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_' . $beta . '_version_info' ); |
|
491 | + $data = $edd_plugin_data[ $_REQUEST[ 'slug' ] ]; |
|
492 | + $beta = ! empty( $data[ 'beta' ] ) ? true : false; |
|
493 | + $cache_key = md5( 'edd_plugin_' . sanitize_key( $_REQUEST[ 'plugin' ] ) . '_' . $beta . '_version_info' ); |
|
494 | 494 | $version_info = $this->get_cached_version_info( $cache_key ); |
495 | 495 | |
496 | - if( false === $version_info ) { |
|
496 | + if ( false === $version_info ) { |
|
497 | 497 | |
498 | 498 | $api_params = array( |
499 | 499 | 'edd_action' => 'get_version', |
500 | - 'item_name' => isset( $data['item_name'] ) ? $data['item_name'] : false, |
|
501 | - 'item_id' => isset( $data['item_id'] ) ? $data['item_id'] : false, |
|
502 | - 'slug' => $_REQUEST['slug'], |
|
503 | - 'author' => $data['author'], |
|
500 | + 'item_name' => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false, |
|
501 | + 'item_id' => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false, |
|
502 | + 'slug' => $_REQUEST[ 'slug' ], |
|
503 | + 'author' => $data[ 'author' ], |
|
504 | 504 | 'url' => home_url(), |
505 | - 'beta' => ! empty( $data['beta'] ) |
|
505 | + 'beta' => ! empty( $data[ 'beta' ] ) |
|
506 | 506 | ); |
507 | 507 | |
508 | 508 | $verify_ssl = $this->verify_ssl(); |
@@ -519,9 +519,9 @@ discard block |
||
519 | 519 | $version_info = false; |
520 | 520 | } |
521 | 521 | |
522 | - if( ! empty( $version_info ) ) { |
|
523 | - foreach( $version_info->sections as $key => $section ) { |
|
524 | - $version_info->$key = (array) $section; |
|
522 | + if ( ! empty( $version_info ) ) { |
|
523 | + foreach ( $version_info->sections as $key => $section ) { |
|
524 | + $version_info->$key = (array)$section; |
|
525 | 525 | } |
526 | 526 | } |
527 | 527 | |
@@ -529,8 +529,8 @@ discard block |
||
529 | 529 | |
530 | 530 | } |
531 | 531 | |
532 | - if( ! empty( $version_info ) && isset( $version_info->sections['changelog'] ) ) { |
|
533 | - echo '<div style="background:#fff;padding:10px;">' . $version_info->sections['changelog'] . '</div>'; |
|
532 | + if ( ! empty( $version_info ) && isset( $version_info->sections[ 'changelog' ] ) ) { |
|
533 | + echo '<div style="background:#fff;padding:10px;">' . $version_info->sections[ 'changelog' ] . '</div>'; |
|
534 | 534 | } |
535 | 535 | |
536 | 536 | exit; |
@@ -538,29 +538,29 @@ discard block |
||
538 | 538 | |
539 | 539 | public function get_cached_version_info( $cache_key = '' ) { |
540 | 540 | |
541 | - if( empty( $cache_key ) ) { |
|
541 | + if ( empty( $cache_key ) ) { |
|
542 | 542 | $cache_key = $this->cache_key; |
543 | 543 | } |
544 | 544 | |
545 | 545 | $cache = get_option( $cache_key ); |
546 | 546 | |
547 | - if( empty( $cache['timeout'] ) || time() > $cache['timeout'] ) { |
|
547 | + if ( empty( $cache[ 'timeout' ] ) || time() > $cache[ 'timeout' ] ) { |
|
548 | 548 | return false; // Cache is expired |
549 | 549 | } |
550 | 550 | |
551 | 551 | // We need to turn the icons into an array, thanks to WP Core forcing these into an object at some point. |
552 | - $cache['value'] = json_decode( $cache['value'] ); |
|
553 | - if ( ! empty( $cache['value']->icons ) ) { |
|
554 | - $cache['value']->icons = (array) $cache['value']->icons; |
|
552 | + $cache[ 'value' ] = json_decode( $cache[ 'value' ] ); |
|
553 | + if ( ! empty( $cache[ 'value' ]->icons ) ) { |
|
554 | + $cache[ 'value' ]->icons = (array)$cache[ 'value' ]->icons; |
|
555 | 555 | } |
556 | 556 | |
557 | - return $cache['value']; |
|
557 | + return $cache[ 'value' ]; |
|
558 | 558 | |
559 | 559 | } |
560 | 560 | |
561 | 561 | public function set_version_info_cache( $value = '', $cache_key = '' ) { |
562 | 562 | |
563 | - if( empty( $cache_key ) ) { |
|
563 | + if ( empty( $cache_key ) ) { |
|
564 | 564 | $cache_key = $this->cache_key; |
565 | 565 | } |
566 | 566 | |
@@ -580,7 +580,7 @@ discard block |
||
580 | 580 | * @return bool |
581 | 581 | */ |
582 | 582 | private function verify_ssl() { |
583 | - return (bool) apply_filters( 'edd_sl_api_request_verify_ssl', true, $this ); |
|
583 | + return (bool)apply_filters( 'edd_sl_api_request_verify_ssl', true, $this ); |
|
584 | 584 | } |
585 | 585 | |
586 | 586 | } |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | printf( '<body style="padding: 0; margin: 0; font-family: -apple-system, BlinkMacSystemFont, \'Segoe UI\', Roboto, Oxygen-Sans, Ubuntu, Cantarell, \'Helvetica Neue\', sans-serif;">' ); |
26 | 26 | printf( '<img src="' . plugins_url( 'assets/images/astronaut-200x263.png', GRAVITYVIEW_FILE ) . '" alt="The GravityView Astronaut Says:" style="float: left; height: 60px; margin-right : 10px;" />' ); |
27 | 27 | printf( __( "%sGravityView requires PHP Version %s or newer.%s \n\nYou're using Version %s. Please ask your host to upgrade your server's PHP.", 'gravityview' ), |
28 | - '<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_MIN_PHP_VERSION , "</h3>\n\n", $version ); |
|
28 | + '<h3 style="font-size:16px; margin: 0 0 8px 0;">', GV_MIN_PHP_VERSION, "</h3>\n\n", $version ); |
|
29 | 29 | printf( '</body>' ); |
30 | 30 | } |
31 | 31 | |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | } |
35 | 35 | |
36 | 36 | /** The future branch of GravityView requires PHP 5.3+ namespaces and SPL. */ |
37 | -if ( version_compare( phpversion(), '5.3.0' , '<' ) ) { |
|
37 | +if ( version_compare( phpversion(), '5.3.0', '<' ) ) { |
|
38 | 38 | require GRAVITYVIEW_DIR . 'future/_stubs.php'; |
39 | 39 | |
40 | 40 | /** All looks fine. */ |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | */ |
77 | 77 | public static function remove() { |
78 | 78 | $shortcode = new static(); |
79 | - unset( self::$shortcodes[$shortcode->name] ); |
|
79 | + unset( self::$shortcodes[ $shortcode->name ] ); |
|
80 | 80 | remove_shortcode( $shortcode->name ); |
81 | 81 | } |
82 | 82 | |
@@ -108,14 +108,14 @@ discard block |
||
108 | 108 | preg_match_all( '/' . get_shortcode_regex() . '/', $content, $matches, PREG_SET_ORDER ); |
109 | 109 | |
110 | 110 | foreach ( $matches as $shortcode ) { |
111 | - $shortcode_name = $shortcode[2]; |
|
111 | + $shortcode_name = $shortcode[ 2 ]; |
|
112 | 112 | |
113 | - $shortcode_atts = shortcode_parse_atts( $shortcode[3] ); |
|
114 | - $shortcode_content = $shortcode[5]; |
|
113 | + $shortcode_atts = shortcode_parse_atts( $shortcode[ 3 ] ); |
|
114 | + $shortcode_content = $shortcode[ 5 ]; |
|
115 | 115 | |
116 | 116 | /** This is a registered GravityView shortcode. */ |
117 | - if ( !empty( self::$shortcodes[$shortcode_name] ) ) { |
|
118 | - $shortcode = clone self::$shortcodes[$shortcode_name]; |
|
117 | + if ( ! empty( self::$shortcodes[ $shortcode_name ] ) ) { |
|
118 | + $shortcode = clone self::$shortcodes[ $shortcode_name ]; |
|
119 | 119 | } else { |
120 | 120 | /** This is some generic shortcode. */ |
121 | 121 | $shortcode = new self; |
@@ -62,7 +62,6 @@ |
||
62 | 62 | * |
63 | 63 | * Internal static cache for gets, and whatnot. |
64 | 64 | * This is not persistent, resets across requests. |
65 | - |
|
66 | 65 | * @internal |
67 | 66 | */ |
68 | 67 | private static $cache = array(); |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | $slug = apply_filters( 'gravityview_slug', 'view' ); |
210 | 210 | $rule = array( sprintf( '%s/([^/]+)/csv/?', $slug ), 'index.php?gravityview=$matches[1]&csv=1', 'top' ); |
211 | 211 | |
212 | - add_filter( 'query_vars', function( $query_vars ) { |
|
212 | + add_filter( 'query_vars', function( $query_vars ) { |
|
213 | 213 | $query_vars[] = 'csv'; |
214 | 214 | return $query_vars; |
215 | 215 | } ); |
@@ -254,8 +254,9 @@ discard block |
||
254 | 254 | * Check permissions. |
255 | 255 | */ |
256 | 256 | while ( $error = $view->can_render( null, $request ) ) { |
257 | - if ( ! is_wp_error( $error ) ) |
|
258 | - break; |
|
257 | + if ( ! is_wp_error( $error ) ) { |
|
258 | + break; |
|
259 | + } |
|
259 | 260 | |
260 | 261 | switch ( str_replace( 'gravityview/', '', $error->get_error_code() ) ) { |
261 | 262 | case 'post_password_required': |
@@ -795,6 +795,7 @@ |
||
795 | 795 | * Retrieve the entries for the current view and request. |
796 | 796 | * |
797 | 797 | * @param \GV\Request The request. Unused for now. |
798 | + * @param Request $request |
|
798 | 799 | * |
799 | 800 | * @return \GV\Entry_Collection The entries. |
800 | 801 | */ |
@@ -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 | } |
@@ -308,13 +308,13 @@ discard block |
||
308 | 308 | return $content; |
309 | 309 | } |
310 | 310 | |
311 | - $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap('gravityview_moderate_entries', $view->ID ); |
|
311 | + $is_admin_and_can_view = $view->settings->get( 'admin_show_all_statuses' ) && \GVCommon::has_cap( 'gravityview_moderate_entries', $view->ID ); |
|
312 | 312 | |
313 | 313 | /** |
314 | 314 | * Editing a single entry. |
315 | 315 | */ |
316 | 316 | if ( $entry = $request->is_edit_entry( $view->form ? $view->form->ID : 0 ) ) { |
317 | - if ( $entry['status'] != 'active' ) { |
|
317 | + if ( $entry[ 'status' ] != 'active' ) { |
|
318 | 318 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $entry->ID ) ); |
319 | 319 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
320 | 320 | } |
@@ -325,7 +325,7 @@ discard block |
||
325 | 325 | } |
326 | 326 | |
327 | 327 | if ( $view->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
328 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
328 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $entry->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
329 | 329 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $entry->ID ) ); |
330 | 330 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
331 | 331 | } |
@@ -348,7 +348,7 @@ discard block |
||
348 | 348 | |
349 | 349 | foreach ( $entryset as $e ) { |
350 | 350 | |
351 | - if ( 'active' !== $e['status'] ) { |
|
351 | + if ( 'active' !== $e[ 'status' ] ) { |
|
352 | 352 | gravityview()->log->notice( 'Entry ID #{entry_id} is not active', array( 'entry_id' => $e->ID ) ); |
353 | 353 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
354 | 354 | } |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | } |
360 | 360 | |
361 | 361 | if ( $show_only_approved && ! $is_admin_and_can_view ) { |
362 | - if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
362 | + if ( ! \GravityView_Entry_Approval_Status::is_approved( gform_get_meta( $e->ID, \GravityView_Entry_Approval::meta_key ) ) ) { |
|
363 | 363 | gravityview()->log->error( 'Entry ID #{entry_id} is not approved for viewing', array( 'entry_id' => $e->ID ) ); |
364 | 364 | return __( 'You are not allowed to view this content.', 'gravityview' ); |
365 | 365 | } |
@@ -534,7 +534,7 @@ discard block |
||
534 | 534 | $join_column = is_numeric( $join_column ) ? GF_Field::by_id( $join, $join_column ) : Internal_Field::by_id( $join_column ); |
535 | 535 | $join_on_column = is_numeric( $join_on_column ) ? GF_Field::by_id( $join_on, $join_on_column ) : Internal_Field::by_id( $join_on_column ); |
536 | 536 | |
537 | - $joins [] = new Join( $join, $join_column, $join_on, $join_on_column ); |
|
537 | + $joins [ ] = new Join( $join, $join_column, $join_on, $join_on_column ); |
|
538 | 538 | } |
539 | 539 | |
540 | 540 | return $joins; |
@@ -624,13 +624,13 @@ discard block |
||
624 | 624 | } |
625 | 625 | |
626 | 626 | foreach ( $_fields as $field ) { |
627 | - if ( ! empty( $field['unions'] ) ) { |
|
628 | - foreach ( $field['unions'] as $form_id => $field_id ) { |
|
627 | + if ( ! empty( $field[ 'unions' ] ) ) { |
|
628 | + foreach ( $field[ 'unions' ] as $form_id => $field_id ) { |
|
629 | 629 | if ( ! isset( $unions[ $form_id ] ) ) { |
630 | 630 | $unions[ $form_id ] = array(); |
631 | 631 | } |
632 | 632 | |
633 | - $unions[ $form_id ][ $field['id'] ] = |
|
633 | + $unions[ $form_id ][ $field[ 'id' ] ] = |
|
634 | 634 | 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 ); |
635 | 635 | } |
636 | 636 | } |
@@ -685,7 +685,7 @@ discard block |
||
685 | 685 | if ( ! $view->form ) { |
686 | 686 | gravityview()->log->error( 'View #{view_id} tried attaching non-existent Form #{form_id} to it.', array( |
687 | 687 | 'view_id' => $view->ID, |
688 | - 'form_id' => $view->_gravityview_form_id ? : 0, |
|
688 | + 'form_id' => $view->_gravityview_form_id ?: 0, |
|
689 | 689 | ) ); |
690 | 690 | } |
691 | 691 | |
@@ -924,11 +924,11 @@ discard block |
||
924 | 924 | * Remove multiple sorting before calling legacy filters. |
925 | 925 | * This allows us to fake it till we make it. |
926 | 926 | */ |
927 | - if ( ! empty( $parameters['sort_field'] ) && is_array( $parameters['sort_field'] ) ) { |
|
927 | + if ( ! empty( $parameters[ 'sort_field' ] ) && is_array( $parameters[ 'sort_field' ] ) ) { |
|
928 | 928 | $has_multisort = true; |
929 | - $parameters['sort_field'] = reset( $parameters['sort_field'] ); |
|
930 | - if ( ! empty( $parameters['sort_direction'] ) && is_array( $parameters['sort_direction'] ) ) { |
|
931 | - $parameters['sort_direction'] = reset( $parameters['sort_direction'] ); |
|
929 | + $parameters[ 'sort_field' ] = reset( $parameters[ 'sort_field' ] ); |
|
930 | + if ( ! empty( $parameters[ 'sort_direction' ] ) && is_array( $parameters[ 'sort_direction' ] ) ) { |
|
931 | + $parameters[ 'sort_direction' ] = reset( $parameters[ 'sort_direction' ] ); |
|
932 | 932 | } |
933 | 933 | } |
934 | 934 | |
@@ -937,31 +937,30 @@ discard block |
||
937 | 937 | */ |
938 | 938 | $parameters = \GravityView_frontend::get_view_entries_parameters( $parameters, $this->form->ID ); |
939 | 939 | |
940 | - $parameters['context_view_id'] = $this->ID; |
|
940 | + $parameters[ 'context_view_id' ] = $this->ID; |
|
941 | 941 | $parameters = \GVCommon::calculate_get_entries_criteria( $parameters, $this->form->ID ); |
942 | 942 | |
943 | 943 | if ( ! is_array( $parameters ) ) { |
944 | 944 | $parameters = array(); |
945 | 945 | } |
946 | 946 | |
947 | - if ( ! is_array( $parameters['search_criteria'] ) ) { |
|
948 | - $parameters['search_criteria'] = array(); |
|
947 | + if ( ! is_array( $parameters[ 'search_criteria' ] ) ) { |
|
948 | + $parameters[ 'search_criteria' ] = array(); |
|
949 | 949 | } |
950 | 950 | |
951 | - if ( ( ! isset( $parameters['search_criteria']['field_filters'] ) ) || ( ! is_array( $parameters['search_criteria']['field_filters'] ) ) ) { |
|
952 | - $parameters['search_criteria']['field_filters'] = array(); |
|
951 | + if ( ( ! isset( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) || ( ! is_array( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) ) { |
|
952 | + $parameters[ 'search_criteria' ][ 'field_filters' ] = array(); |
|
953 | 953 | } |
954 | 954 | |
955 | 955 | if ( $request instanceof REST\Request ) { |
956 | 956 | $atts = $this->settings->as_atts(); |
957 | 957 | $paging_parameters = wp_parse_args( $request->get_paging(), array( |
958 | - 'paging' => array( 'page_size' => $atts['page_size'] ), |
|
958 | + 'paging' => array( 'page_size' => $atts[ 'page_size' ] ), |
|
959 | 959 | ) ); |
960 | - $parameters['paging'] = $paging_parameters['paging']; |
|
960 | + $parameters[ 'paging' ] = $paging_parameters[ 'paging' ]; |
|
961 | 961 | } |
962 | 962 | |
963 | - $page = Utils::get( $parameters['paging'], 'current_page' ) ? |
|
964 | - : ( ( ( $parameters['paging']['offset'] - $this->settings->get( 'offset' ) ) / $parameters['paging']['page_size'] ) + 1 ); |
|
963 | + $page = Utils::get( $parameters[ 'paging' ], 'current_page' ) ?: ( ( ( $parameters[ 'paging' ][ 'offset' ] - $this->settings->get( 'offset' ) ) / $parameters[ 'paging' ][ 'page_size' ] ) + 1 ); |
|
965 | 964 | |
966 | 965 | /** |
967 | 966 | * Cleanup duplicate field_filter parameters to simplify the query. |
@@ -969,14 +968,14 @@ discard block |
||
969 | 968 | $unique_field_filters = array(); |
970 | 969 | foreach ( Utils::get( $parameters, 'search_criteria/field_filters', array() ) as $key => $filter ) { |
971 | 970 | if ( 'mode' === $key ) { |
972 | - $unique_field_filters['mode'] = $filter; |
|
971 | + $unique_field_filters[ 'mode' ] = $filter; |
|
973 | 972 | } else if ( ! in_array( $filter, $unique_field_filters ) ) { |
974 | - $unique_field_filters[] = $filter; |
|
973 | + $unique_field_filters[ ] = $filter; |
|
975 | 974 | } |
976 | 975 | } |
977 | - $parameters['search_criteria']['field_filters'] = $unique_field_filters; |
|
976 | + $parameters[ 'search_criteria' ][ 'field_filters' ] = $unique_field_filters; |
|
978 | 977 | |
979 | - if ( ! empty( $parameters['search_criteria']['field_filters'] ) ) { |
|
978 | + if ( ! empty( $parameters[ 'search_criteria' ][ 'field_filters' ] ) ) { |
|
980 | 979 | gravityview()->log->notice( 'search_criteria/field_filters is not empty, third-party code may be using legacy search_criteria filters.' ); |
981 | 980 | } |
982 | 981 | |
@@ -985,7 +984,7 @@ discard block |
||
985 | 984 | $query_class = $this->get_query_class(); |
986 | 985 | |
987 | 986 | /** @var \GF_Query $query */ |
988 | - $query = new $query_class( $this->form->ID, $parameters['search_criteria'], Utils::get( $parameters, 'sorting' ) ); |
|
987 | + $query = new $query_class( $this->form->ID, $parameters[ 'search_criteria' ], Utils::get( $parameters, 'sorting' ) ); |
|
989 | 988 | |
990 | 989 | /** |
991 | 990 | * Apply multisort. |
@@ -996,15 +995,15 @@ discard block |
||
996 | 995 | $view_setting_sort_field_ids = \GV\Utils::get( $atts, 'sort_field', array() ); |
997 | 996 | $view_setting_sort_directions = \GV\Utils::get( $atts, 'sort_direction', array() ); |
998 | 997 | |
999 | - $has_sort_query_param = ! empty( $_GET['sort'] ) && is_array( $_GET['sort'] ); |
|
998 | + $has_sort_query_param = ! empty( $_GET[ 'sort' ] ) && is_array( $_GET[ 'sort' ] ); |
|
1000 | 999 | |
1001 | - if( $has_sort_query_param ) { |
|
1002 | - $has_sort_query_param = array_filter( array_values( $_GET['sort'] ) ); |
|
1000 | + if ( $has_sort_query_param ) { |
|
1001 | + $has_sort_query_param = array_filter( array_values( $_GET[ 'sort' ] ) ); |
|
1003 | 1002 | } |
1004 | 1003 | |
1005 | 1004 | if ( $this->settings->get( 'sort_columns' ) && $has_sort_query_param ) { |
1006 | - $sort_field_ids = array_keys( $_GET['sort'] ); |
|
1007 | - $sort_directions = array_values( $_GET['sort'] ); |
|
1005 | + $sort_field_ids = array_keys( $_GET[ 'sort' ] ); |
|
1006 | + $sort_directions = array_values( $_GET[ 'sort' ] ); |
|
1008 | 1007 | } else { |
1009 | 1008 | $sort_field_ids = $view_setting_sort_field_ids; |
1010 | 1009 | $sort_directions = $view_setting_sort_directions; |
@@ -1012,7 +1011,7 @@ discard block |
||
1012 | 1011 | |
1013 | 1012 | $skip_first = false; |
1014 | 1013 | |
1015 | - foreach ( (array) $sort_field_ids as $key => $sort_field_id ) { |
|
1014 | + foreach ( (array)$sort_field_ids as $key => $sort_field_id ) { |
|
1016 | 1015 | |
1017 | 1016 | if ( ! $skip_first && ! $has_sort_query_param ) { |
1018 | 1017 | $skip_first = true; // Skip the first one, it's already in the query |
@@ -1042,15 +1041,15 @@ discard block |
||
1042 | 1041 | |
1043 | 1042 | $merged_time = false; |
1044 | 1043 | |
1045 | - foreach ( $q['order'] as $oid => $order ) { |
|
1046 | - if ( $order[0] instanceof \GF_Query_Column ) { |
|
1047 | - $column = $order[0]; |
|
1048 | - } else if ( $order[0] instanceof \GF_Query_Call ) { |
|
1049 | - if ( count( $order[0]->columns ) != 1 || ! $order[0]->columns[0] instanceof \GF_Query_Column ) { |
|
1044 | + foreach ( $q[ 'order' ] as $oid => $order ) { |
|
1045 | + if ( $order[ 0 ] instanceof \GF_Query_Column ) { |
|
1046 | + $column = $order[ 0 ]; |
|
1047 | + } else if ( $order[ 0 ] instanceof \GF_Query_Call ) { |
|
1048 | + if ( count( $order[ 0 ]->columns ) != 1 || ! $order[ 0 ]->columns[ 0 ] instanceof \GF_Query_Column ) { |
|
1050 | 1049 | $orders[ $oid ] = $order; |
1051 | 1050 | continue; // Need something that resembles a single sort |
1052 | 1051 | } |
1053 | - $column = $order[0]->columns[0]; |
|
1052 | + $column = $order[ 0 ]->columns[ 0 ]; |
|
1054 | 1053 | } |
1055 | 1054 | |
1056 | 1055 | if ( ( ! $field = \GFAPI::get_field( $column->source, $column->field_id ) ) || $field->type !== 'time' ) { |
@@ -1064,7 +1063,7 @@ discard block |
||
1064 | 1063 | |
1065 | 1064 | $orders[ $oid ] = array( |
1066 | 1065 | new \GV\Mocks\GF_Query_Call_TIMESORT( 'timesort', array( $column, $sql ) ), |
1067 | - $order[1] // Mock it! |
|
1066 | + $order[ 1 ] // Mock it! |
|
1068 | 1067 | ); |
1069 | 1068 | |
1070 | 1069 | $merged_time = true; |
@@ -1075,15 +1074,15 @@ discard block |
||
1075 | 1074 | * ORDER again. |
1076 | 1075 | */ |
1077 | 1076 | if ( ! empty( $orders ) && $_orders = $query->_order_generate( $orders ) ) { |
1078 | - $sql['order'] = 'ORDER BY ' . implode( ', ', $_orders ); |
|
1077 | + $sql[ 'order' ] = 'ORDER BY ' . implode( ', ', $_orders ); |
|
1079 | 1078 | } |
1080 | 1079 | } |
1081 | 1080 | |
1082 | 1081 | return $sql; |
1083 | 1082 | } ); |
1084 | 1083 | |
1085 | - $query->limit( $parameters['paging']['page_size'] ) |
|
1086 | - ->offset( ( ( $page - 1 ) * $parameters['paging']['page_size'] ) + $this->settings->get( 'offset' ) ); |
|
1084 | + $query->limit( $parameters[ 'paging' ][ 'page_size' ] ) |
|
1085 | + ->offset( ( ( $page - 1 ) * $parameters[ 'paging' ][ 'page_size' ] ) + $this->settings->get( 'offset' ) ); |
|
1087 | 1086 | |
1088 | 1087 | /** |
1089 | 1088 | * Any joins? |
@@ -1106,7 +1105,7 @@ discard block |
||
1106 | 1105 | |
1107 | 1106 | $query_parameters = $query->_introspect(); |
1108 | 1107 | |
1109 | - $query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) ); |
|
1108 | + $query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) ); |
|
1110 | 1109 | } |
1111 | 1110 | |
1112 | 1111 | /** |
@@ -1140,7 +1139,7 @@ discard block |
||
1140 | 1139 | } |
1141 | 1140 | |
1142 | 1141 | $q = $query->_introspect(); |
1143 | - $query->where( \GF_Query_Condition::_and( $q['where'], $condition ) ); |
|
1142 | + $query->where( \GF_Query_Condition::_and( $q[ 'where' ], $condition ) ); |
|
1144 | 1143 | |
1145 | 1144 | if ( $this->settings->get( 'show_only_approved' ) && ! $is_admin_and_can_view ) { |
1146 | 1145 | |
@@ -1165,7 +1164,7 @@ discard block |
||
1165 | 1164 | |
1166 | 1165 | $query_parameters = $query->_introspect(); |
1167 | 1166 | |
1168 | - $query->where( \GF_Query_Condition::_and( $query_parameters['where'], $condition ) ); |
|
1167 | + $query->where( \GF_Query_Condition::_and( $query_parameters[ 'where' ], $condition ) ); |
|
1169 | 1168 | } |
1170 | 1169 | } |
1171 | 1170 | |
@@ -1189,7 +1188,7 @@ discard block |
||
1189 | 1188 | $conditions = array(); |
1190 | 1189 | |
1191 | 1190 | foreach ( $condition->expressions as $_condition ) { |
1192 | - $conditions[] = $recurse( $_condition, $fields, $recurse ); |
|
1191 | + $conditions[ ] = $recurse( $_condition, $fields, $recurse ); |
|
1193 | 1192 | } |
1194 | 1193 | |
1195 | 1194 | return call_user_func_array( |
@@ -1218,10 +1217,10 @@ discard block |
||
1218 | 1217 | $q = new $query_class( $form_id ); |
1219 | 1218 | |
1220 | 1219 | // Copy the WHERE clauses but substitute the field_ids to the respective ones |
1221 | - $q->where( $where_union_substitute( $query_parameters['where'], $fields, $where_union_substitute ) ); |
|
1220 | + $q->where( $where_union_substitute( $query_parameters[ 'where' ], $fields, $where_union_substitute ) ); |
|
1222 | 1221 | |
1223 | 1222 | // Copy the ORDER clause and substitute the field_ids to the respective ones |
1224 | - foreach ( $query_parameters['order'] as $order ) { |
|
1223 | + foreach ( $query_parameters[ 'order' ] as $order ) { |
|
1225 | 1224 | list( $column, $_order ) = $order; |
1226 | 1225 | |
1227 | 1226 | if ( $column && $column instanceof \GF_Query_Column ) { |
@@ -1235,15 +1234,15 @@ discard block |
||
1235 | 1234 | |
1236 | 1235 | add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( &$unions_sql ) { |
1237 | 1236 | // Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses |
1238 | - $select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] ); |
|
1237 | + $select = 'UNION ALL ' . str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] ); |
|
1239 | 1238 | |
1240 | 1239 | // Record the SQL |
1241 | - $unions_sql[] = array( |
|
1240 | + $unions_sql[ ] = array( |
|
1242 | 1241 | // Remove columns, we'll rebuild them |
1243 | 1242 | 'select' => preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $select ), |
1244 | - 'from' => $sql['from'], |
|
1245 | - 'join' => $sql['join'], |
|
1246 | - 'where' => $sql['where'], |
|
1243 | + 'from' => $sql[ 'from' ], |
|
1244 | + 'join' => $sql[ 'join' ], |
|
1245 | + 'where' => $sql[ 'where' ], |
|
1247 | 1246 | // Remove order and limit |
1248 | 1247 | ); |
1249 | 1248 | |
@@ -1260,11 +1259,11 @@ discard block |
||
1260 | 1259 | |
1261 | 1260 | add_filter( 'gform_gf_query_sql', $gf_query_sql_callback = function( $sql ) use ( $unions_sql ) { |
1262 | 1261 | // Remove SQL_CALC_FOUND_ROWS as it's not needed in UNION clauses |
1263 | - $sql['select'] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql['select'] ); |
|
1262 | + $sql[ 'select' ] = str_replace( 'SQL_CALC_FOUND_ROWS ', '', $sql[ 'select' ] ); |
|
1264 | 1263 | |
1265 | 1264 | // Remove columns, we'll rebuild them |
1266 | - preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql['select'], $select_match ); |
|
1267 | - $sql['select'] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql['select'] ); |
|
1265 | + preg_match( '#DISTINCT (`[motc]\d+`.`.*?`)#', $sql[ 'select' ], $select_match ); |
|
1266 | + $sql[ 'select' ] = preg_replace( '#DISTINCT (.*)#', 'DISTINCT ', $sql[ 'select' ] ); |
|
1268 | 1267 | |
1269 | 1268 | $unions = array(); |
1270 | 1269 | |
@@ -1275,30 +1274,30 @@ discard block |
||
1275 | 1274 | }; |
1276 | 1275 | |
1277 | 1276 | // Add all the order columns into the selects, so we can order by the whole union group |
1278 | - preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql['order'], $order_matches ); |
|
1277 | + preg_match_all( '#(`[motc]\d+`.`.*?`)#', $sql[ 'order' ], $order_matches ); |
|
1279 | 1278 | |
1280 | 1279 | $columns = array( |
1281 | - sprintf( '%s AS %s', $select_match[1], $column_to_alias( $select_match[1] ) ) |
|
1280 | + sprintf( '%s AS %s', $select_match[ 1 ], $column_to_alias( $select_match[ 1 ] ) ) |
|
1282 | 1281 | ); |
1283 | 1282 | |
1284 | 1283 | foreach ( array_slice( $order_matches, 1 ) as $match ) { |
1285 | - $columns[] = sprintf( '%s AS %s', $match[0], $column_to_alias( $match[0] ) ); |
|
1284 | + $columns[ ] = sprintf( '%s AS %s', $match[ 0 ], $column_to_alias( $match[ 0 ] ) ); |
|
1286 | 1285 | |
1287 | 1286 | // Rewrite the order columns to the shared aliases |
1288 | - $sql['order'] = str_replace( $match[0], $column_to_alias( $match[0] ), $sql['order'] ); |
|
1287 | + $sql[ 'order' ] = str_replace( $match[ 0 ], $column_to_alias( $match[ 0 ] ), $sql[ 'order' ] ); |
|
1289 | 1288 | } |
1290 | 1289 | |
1291 | 1290 | $columns = array_unique( $columns ); |
1292 | 1291 | |
1293 | 1292 | // Add the columns to every UNION |
1294 | 1293 | foreach ( $unions_sql as $union_sql ) { |
1295 | - $union_sql['select'] .= implode( ', ', $columns ); |
|
1296 | - $unions []= implode( ' ', $union_sql ); |
|
1294 | + $union_sql[ 'select' ] .= implode( ', ', $columns ); |
|
1295 | + $unions [ ] = implode( ' ', $union_sql ); |
|
1297 | 1296 | } |
1298 | 1297 | |
1299 | 1298 | // Add the columns to the main SELECT, but only grab the entry id column |
1300 | - $sql['select'] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql['select'] . implode( ', ', $columns ); |
|
1301 | - $sql['order'] = implode( ' ', $unions ) . ') AS u ' . $sql['order']; |
|
1299 | + $sql[ 'select' ] = 'SELECT SQL_CALC_FOUND_ROWS t1_id FROM (' . $sql[ 'select' ] . implode( ', ', $columns ); |
|
1300 | + $sql[ 'order' ] = implode( ' ', $unions ) . ') AS u ' . $sql[ 'order' ]; |
|
1302 | 1301 | |
1303 | 1302 | return $sql; |
1304 | 1303 | } ); |
@@ -1343,20 +1342,20 @@ discard block |
||
1343 | 1342 | } ); |
1344 | 1343 | } else { |
1345 | 1344 | $entries = $this->form->entries |
1346 | - ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters['search_criteria'] ) ) |
|
1345 | + ->filter( \GV\GF_Entry_Filter::from_search_criteria( $parameters[ 'search_criteria' ] ) ) |
|
1347 | 1346 | ->offset( $this->settings->get( 'offset' ) ) |
1348 | - ->limit( $parameters['paging']['page_size'] ) |
|
1347 | + ->limit( $parameters[ 'paging' ][ 'page_size' ] ) |
|
1349 | 1348 | ->page( $page ); |
1350 | 1349 | |
1351 | - if ( ! empty( $parameters['sorting'] ) && is_array( $parameters['sorting'] && ! isset( $parameters['sorting']['key'] ) ) ) { |
|
1350 | + if ( ! empty( $parameters[ 'sorting' ] ) && is_array( $parameters[ 'sorting' ] && ! isset( $parameters[ 'sorting' ][ 'key' ] ) ) ) { |
|
1352 | 1351 | // Pluck off multisort arrays |
1353 | - $parameters['sorting'] = $parameters['sorting'][0]; |
|
1352 | + $parameters[ 'sorting' ] = $parameters[ 'sorting' ][ 0 ]; |
|
1354 | 1353 | } |
1355 | 1354 | |
1356 | - if ( ! empty( $parameters['sorting'] ) && ! empty( $parameters['sorting']['key'] ) ) { |
|
1355 | + if ( ! empty( $parameters[ 'sorting' ] ) && ! empty( $parameters[ 'sorting' ][ 'key' ] ) ) { |
|
1357 | 1356 | $field = new \GV\Field(); |
1358 | - $field->ID = $parameters['sorting']['key']; |
|
1359 | - $direction = strtolower( $parameters['sorting']['direction'] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
1357 | + $field->ID = $parameters[ 'sorting' ][ 'key' ]; |
|
1358 | + $direction = strtolower( $parameters[ 'sorting' ][ 'direction' ] ) == 'asc' ? \GV\Entry_Sort::ASC : \GV\Entry_Sort::DESC; |
|
1360 | 1359 | $entries = $entries->sort( new \GV\Entry_Sort( $field, $direction ) ); |
1361 | 1360 | } |
1362 | 1361 | } |
@@ -1431,7 +1430,7 @@ discard block |
||
1431 | 1430 | $allowed = $headers = array(); |
1432 | 1431 | |
1433 | 1432 | foreach ( $view->fields->by_position( "directory_*" )->by_visible( $view )->all() as $id => $field ) { |
1434 | - $allowed[] = $field; |
|
1433 | + $allowed[ ] = $field; |
|
1435 | 1434 | } |
1436 | 1435 | |
1437 | 1436 | $renderer = new Field_Renderer(); |
@@ -1453,17 +1452,17 @@ discard block |
||
1453 | 1452 | } ); |
1454 | 1453 | |
1455 | 1454 | foreach ( array_diff( $allowed_field_ids, wp_list_pluck( $allowed, 'ID' ) ) as $field_id ) { |
1456 | - $allowed[] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id ); |
|
1455 | + $allowed[ ] = is_numeric( $field_id ) ? \GV\GF_Field::by_id( $view->form, $field_id ) : \GV\Internal_Field::by_id( $field_id ); |
|
1457 | 1456 | } |
1458 | 1457 | |
1459 | 1458 | foreach ( $allowed as $field ) { |
1460 | 1459 | $source = is_numeric( $field->ID ) ? $view->form : new \GV\Internal_Source(); |
1461 | 1460 | |
1462 | - $return[] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' ); |
|
1461 | + $return[ ] = $renderer->render( $field, $view, $source, $entry, gravityview()->request, '\GV\Field_CSV_Template' ); |
|
1463 | 1462 | |
1464 | 1463 | if ( ! $headers_done ) { |
1465 | 1464 | $label = $field->get_label( $view, $source, $entry ); |
1466 | - $headers[] = $label ? $label : $field->ID; |
|
1465 | + $headers[ ] = $label ? $label : $field->ID; |
|
1467 | 1466 | } |
1468 | 1467 | } |
1469 | 1468 |