@@ -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 ) { |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | die; |
17 | 17 | } |
18 | 18 | |
19 | -if( ! class_exists( 'Gamajo_Template_Loader' ) ) { |
|
19 | +if ( ! class_exists( 'Gamajo_Template_Loader' ) ) { |
|
20 | 20 | require( GRAVITYVIEW_DIR . 'includes/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,7 +672,7 @@ 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 ) ) { |
@@ -684,7 +684,7 @@ discard block |
||
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 ); |
@@ -884,7 +884,7 @@ discard block |
||
884 | 884 | |
885 | 885 | // Prevent being called twice |
886 | 886 | if ( did_action( "gravityview/widgets/$zone/{$view->ID}/rendered" ) ) { |
887 | - gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone.'_'.$view->ID.'_widgets' ) ); |
|
887 | + gravityview()->log->debug( 'Not rendering {zone}; already rendered', array( 'zone' => $zone . '_' . $view->ID . '_widgets' ) ); |
|
888 | 888 | return; |
889 | 889 | } |
890 | 890 | |
@@ -906,7 +906,7 @@ discard block |
||
906 | 906 | * @param string $zone Current widget zone, either `header` or `footer` |
907 | 907 | * @param array $widgets Array of widget configurations for the current zone, as set by `gravityview_get_current_view_data()['widgets']` |
908 | 908 | */ |
909 | - $css_class = apply_filters('gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() ); |
|
909 | + $css_class = apply_filters( 'gravityview/widgets/wrapper_css_class', $default_css_class, $zone, $widgets->as_configuration() ); |
|
910 | 910 | |
911 | 911 | $css_class = gravityview_sanitize_html_class( $css_class ); |
912 | 912 | |
@@ -914,15 +914,15 @@ discard block |
||
914 | 914 | ?> |
915 | 915 | <div class="<?php echo $css_class; ?>"> |
916 | 916 | <?php |
917 | - foreach( $rows as $row ) { |
|
918 | - foreach( $row as $col => $areas ) { |
|
917 | + foreach ( $rows as $row ) { |
|
918 | + foreach ( $row as $col => $areas ) { |
|
919 | 919 | $column = ( $col == '2-2' ) ? '1-2 gv-right' : "$col gv-left"; |
920 | 920 | ?> |
921 | 921 | <div class="gv-grid-col-<?php echo esc_attr( $column ); ?>"> |
922 | 922 | <?php |
923 | 923 | if ( ! empty( $areas ) ) { |
924 | 924 | foreach ( $areas as $area ) { |
925 | - foreach ( $widgets->by_position( $zone . '_' . $area['areaid'] )->all() as $widget ) { |
|
925 | + foreach ( $widgets->by_position( $zone . '_' . $area[ 'areaid' ] )->all() as $widget ) { |
|
926 | 926 | do_action( sprintf( 'gravityview/widgets/%s/render', $widget->get_widget_id() ), $widget->configuration->all(), null, $view_id_or_context ); |
927 | 927 | } |
928 | 928 | } |
@@ -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 ) ) { |
@@ -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 | */ |
@@ -341,7 +341,7 @@ |
||
341 | 341 | */ |
342 | 342 | $content = apply_filters( 'gravityview/fields/fileupload/link_content', $content, $field_compat, $context ); |
343 | 343 | |
344 | - $content = gravityview_get_link( $link, $content, $link_atts ); |
|
344 | + $content = gravityview_get_link( $link, $content, $link_atts ); |
|
345 | 345 | } |
346 | 346 | |
347 | 347 | $output_arr[] = array( |
@@ -24,16 +24,16 @@ discard block |
||
24 | 24 | |
25 | 25 | function field_options( $field_options, $template_id, $field_id, $context, $input_type ) { |
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 | ); |
@@ -116,14 +116,14 @@ discard block |
||
116 | 116 | $base_id = null; |
117 | 117 | |
118 | 118 | $is_single = gravityview_get_context() === 'single'; |
119 | - $lightbox = ! empty( $gravityview_view->atts['lightbox'] ); |
|
119 | + $lightbox = ! empty( $gravityview_view->atts[ 'lightbox' ] ); |
|
120 | 120 | $field_compat = $gravityview_view->getCurrentField(); |
121 | 121 | } |
122 | 122 | |
123 | 123 | $output_arr = array(); |
124 | 124 | |
125 | 125 | // Get an array of file paths for the field. |
126 | - $file_paths = \GV\Utils::get( $field , 'multipleFiles' ) ? json_decode( $value ) : array( $value ); |
|
126 | + $file_paths = \GV\Utils::get( $field, 'multipleFiles' ) ? json_decode( $value ) : array( $value ); |
|
127 | 127 | |
128 | 128 | // The $value JSON was probably truncated; let's check lead_detail_long. |
129 | 129 | if ( ! is_array( $file_paths ) ) { |
@@ -137,10 +137,10 @@ discard block |
||
137 | 137 | } |
138 | 138 | |
139 | 139 | // Process each file path |
140 | - foreach( $file_paths as $file_path ) { |
|
140 | + foreach ( $file_paths as $file_path ) { |
|
141 | 141 | |
142 | 142 | // If the site is HTTPS, use HTTPS |
143 | - if(function_exists('set_url_scheme')) { $file_path = set_url_scheme( $file_path ); } |
|
143 | + if ( function_exists( 'set_url_scheme' ) ) { $file_path = set_url_scheme( $file_path ); } |
|
144 | 144 | |
145 | 145 | // This is from Gravity Forms's code |
146 | 146 | $file_path = esc_attr( str_replace( " ", "%20", $file_path ) ); |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | $file_path_info = pathinfo( $file_path ); |
161 | 161 | |
162 | 162 | // If the field is set to link to the single entry, link to it. |
163 | - $link = !empty( $field_settings['show_as_link'] ) ? GravityView_API::entry_link( $entry, $field, $base_id ) : $file_path; |
|
163 | + $link = ! empty( $field_settings[ 'show_as_link' ] ) ? GravityView_API::entry_link( $entry, $field, $base_id ) : $file_path; |
|
164 | 164 | |
165 | 165 | $html_format = NULL; |
166 | 166 | |
@@ -170,8 +170,8 @@ discard block |
||
170 | 170 | |
171 | 171 | $image_atts = array( |
172 | 172 | 'src' => $file_path, |
173 | - 'class' => 'gv-image gv-field-id-'.$field_settings['id'], |
|
174 | - 'alt' => $field_settings['label'], |
|
173 | + 'class' => 'gv-image gv-field-id-' . $field_settings[ 'id' ], |
|
174 | + 'alt' => $field_settings[ 'label' ], |
|
175 | 175 | 'width' => ( $is_single ? NULL : 250 ) |
176 | 176 | ); |
177 | 177 | |
@@ -189,20 +189,20 @@ discard block |
||
189 | 189 | $content = $image->html(); |
190 | 190 | |
191 | 191 | // The new default content is the image, if it exists. If not, use the file name as the content. |
192 | - $content = !empty( $content ) ? $content : $file_path_info['basename']; |
|
192 | + $content = ! empty( $content ) ? $content : $file_path_info[ 'basename' ]; |
|
193 | 193 | |
194 | 194 | // If pathinfo() gave us the extension of the file, run the switch statement using that. |
195 | - $extension = empty( $file_path_info['extension'] ) ? NULL : strtolower( $file_path_info['extension'] ); |
|
195 | + $extension = empty( $file_path_info[ 'extension' ] ) ? NULL : strtolower( $file_path_info[ 'extension' ] ); |
|
196 | 196 | |
197 | 197 | |
198 | - switch( true ) { |
|
198 | + switch ( true ) { |
|
199 | 199 | |
200 | 200 | // Audio file |
201 | 201 | case in_array( $extension, wp_get_audio_extensions() ): |
202 | 202 | |
203 | 203 | $disable_lightbox = true; |
204 | 204 | |
205 | - if( shortcode_exists( 'audio' ) ) { |
|
205 | + if ( shortcode_exists( 'audio' ) ) { |
|
206 | 206 | |
207 | 207 | $disable_wrapped_link = true; |
208 | 208 | |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | */ |
216 | 216 | $audio_settings = apply_filters( 'gravityview_audio_settings', array( |
217 | 217 | 'src' => $file_path, |
218 | - 'class' => 'wp-audio-shortcode gv-audio gv-field-id-'.$field_settings['id'] |
|
218 | + 'class' => 'wp-audio-shortcode gv-audio gv-field-id-' . $field_settings[ 'id' ] |
|
219 | 219 | ), $context ); |
220 | 220 | |
221 | 221 | /** |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | |
235 | 235 | $disable_lightbox = true; |
236 | 236 | |
237 | - if( shortcode_exists( 'video' ) ) { |
|
237 | + if ( shortcode_exists( 'video' ) ) { |
|
238 | 238 | |
239 | 239 | $disable_wrapped_link = true; |
240 | 240 | |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | */ |
248 | 248 | $video_settings = apply_filters( 'gravityview_video_settings', array( |
249 | 249 | 'src' => $file_path, |
250 | - 'class' => 'wp-video-shortcode gv-video gv-field-id-'.$field_settings['id'] |
|
250 | + 'class' => 'wp-video-shortcode gv-video gv-field-id-' . $field_settings[ 'id' ] |
|
251 | 251 | ), $context ); |
252 | 252 | |
253 | 253 | /** |
@@ -270,7 +270,7 @@ discard block |
||
270 | 270 | break; |
271 | 271 | |
272 | 272 | // if not image, do not set the lightbox (@since 1.5.3) |
273 | - case !in_array( $extension, array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' ) ): |
|
273 | + case ! in_array( $extension, array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' ) ): |
|
274 | 274 | |
275 | 275 | $disable_lightbox = true; |
276 | 276 | |
@@ -280,10 +280,10 @@ discard block |
||
280 | 280 | |
281 | 281 | // If using Link to File, override the content. |
282 | 282 | // (We do this here so that the $disable_lightbox can be set. Yes, there's a little more processing time, but oh well.) |
283 | - if( !empty( $field_settings['link_to_file'] ) ) { |
|
283 | + if ( ! empty( $field_settings[ 'link_to_file' ] ) ) { |
|
284 | 284 | |
285 | 285 | // Force the content to be the file name |
286 | - $content = $file_path_info["basename"]; |
|
286 | + $content = $file_path_info[ "basename" ]; |
|
287 | 287 | |
288 | 288 | // Restore the wrapped link |
289 | 289 | $disable_wrapped_link = false; |
@@ -291,13 +291,13 @@ discard block |
||
291 | 291 | } |
292 | 292 | |
293 | 293 | // Whether to use lightbox or not |
294 | - if ( $disable_lightbox || ! $lightbox || ! empty( $field_settings['show_as_link'] ) ) { |
|
294 | + if ( $disable_lightbox || ! $lightbox || ! empty( $field_settings[ 'show_as_link' ] ) ) { |
|
295 | 295 | |
296 | - $link_atts = empty( $field_settings['show_as_link'] ) ? array( 'target' => '_blank' ) : array(); |
|
296 | + $link_atts = empty( $field_settings[ 'show_as_link' ] ) ? array( 'target' => '_blank' ) : array(); |
|
297 | 297 | |
298 | 298 | } else { |
299 | 299 | |
300 | - $entry_slug = GravityView_API::get_entry_slug( $entry['id'], $entry ); |
|
300 | + $entry_slug = GravityView_API::get_entry_slug( $entry[ 'id' ], $entry ); |
|
301 | 301 | |
302 | 302 | $link_atts = array( |
303 | 303 | 'rel' => sprintf( "%s-%s", $gv_class, $entry_slug ), |
@@ -327,7 +327,7 @@ discard block |
||
327 | 327 | $disable_wrapped_link = apply_filters( 'gravityview/fields/fileupload/disable_link', $disable_wrapped_link, $field_compat, $context ); |
328 | 328 | |
329 | 329 | // If the HTML output hasn't been overridden by the switch statement above, use the default format |
330 | - if ( !empty( $content ) && empty( $disable_wrapped_link ) ) { |
|
330 | + if ( ! empty( $content ) && empty( $disable_wrapped_link ) ) { |
|
331 | 331 | |
332 | 332 | /** |
333 | 333 | * Modify the link text (defaults to the file name) |
@@ -344,7 +344,7 @@ discard block |
||
344 | 344 | $content = gravityview_get_link( $link, $content, $link_atts ); |
345 | 345 | } |
346 | 346 | |
347 | - $output_arr[] = array( |
|
347 | + $output_arr[ ] = array( |
|
348 | 348 | 'file_path' => $file_path, |
349 | 349 | 'content' => $content |
350 | 350 | ); |
@@ -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 |
@@ -38,10 +38,10 @@ discard block |
||
38 | 38 | $this->api_data = $_api_data; |
39 | 39 | $this->name = plugin_basename( $_plugin_file ); |
40 | 40 | $this->slug = basename( $_plugin_file, '.php' ); |
41 | - $this->version = $_api_data['version']; |
|
42 | - $this->wp_override = isset( $_api_data['wp_override'] ) ? (bool) $_api_data['wp_override'] : false; |
|
43 | - $this->beta = ! empty( $this->api_data['beta'] ) ? true : false; |
|
44 | - $this->cache_key = md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) ); |
|
41 | + $this->version = $_api_data[ 'version' ]; |
|
42 | + $this->wp_override = isset( $_api_data[ 'wp_override' ] ) ? (bool)$_api_data[ 'wp_override' ] : false; |
|
43 | + $this->beta = ! empty( $this->api_data[ 'beta' ] ) ? true : false; |
|
44 | + $this->cache_key = md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) ); |
|
45 | 45 | |
46 | 46 | $edd_plugin_data[ $this->slug ] = $this->api_data; |
47 | 47 | |
@@ -133,11 +133,11 @@ discard block |
||
133 | 133 | return; |
134 | 134 | } |
135 | 135 | |
136 | - if( ! current_user_can( 'update_plugins' ) ) { |
|
136 | + if ( ! current_user_can( 'update_plugins' ) ) { |
|
137 | 137 | return; |
138 | 138 | } |
139 | 139 | |
140 | - if( ! is_multisite() ) { |
|
140 | + if ( ! is_multisite() ) { |
|
141 | 141 | return; |
142 | 142 | } |
143 | 143 | |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | '<a target="_blank" class="thickbox" href="' . esc_url( $changelog_link ) . '">', |
213 | 213 | esc_html( $version_info->new_version ), |
214 | 214 | '</a>', |
215 | - '<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) .'">', |
|
215 | + '<a href="' . esc_url( wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $this->name, 'upgrade-plugin_' . $this->name ) ) . '">', |
|
216 | 216 | '</a>' |
217 | 217 | ); |
218 | 218 | } |
@@ -256,7 +256,7 @@ discard block |
||
256 | 256 | ) |
257 | 257 | ); |
258 | 258 | |
259 | - $cache_key = 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data['license'] . $this->beta ) ); |
|
259 | + $cache_key = 'edd_api_request_' . md5( serialize( $this->slug . $this->api_data[ 'license' ] . $this->beta ) ); |
|
260 | 260 | |
261 | 261 | // Get the transient where we store the api request for this plugin for 24 hours |
262 | 262 | $edd_api_request_transient = $this->get_cached_version_info( $cache_key ); |
@@ -311,7 +311,7 @@ discard block |
||
311 | 311 | |
312 | 312 | $verify_ssl = $this->verify_ssl(); |
313 | 313 | if ( strpos( $url, 'https://' ) !== false && strpos( $url, 'edd_action=package_download' ) ) { |
314 | - $args['sslverify'] = $verify_ssl; |
|
314 | + $args[ 'sslverify' ] = $verify_ssl; |
|
315 | 315 | } |
316 | 316 | return $args; |
317 | 317 | |
@@ -334,24 +334,24 @@ discard block |
||
334 | 334 | |
335 | 335 | $data = array_merge( $this->api_data, $_data ); |
336 | 336 | |
337 | - if ( $data['slug'] != $this->slug ) { |
|
337 | + if ( $data[ 'slug' ] != $this->slug ) { |
|
338 | 338 | return; |
339 | 339 | } |
340 | 340 | |
341 | - if( $this->api_url == trailingslashit (home_url() ) ) { |
|
341 | + if ( $this->api_url == trailingslashit( home_url() ) ) { |
|
342 | 342 | return false; // Don't allow a plugin to ping itself |
343 | 343 | } |
344 | 344 | |
345 | 345 | $api_params = array( |
346 | 346 | 'edd_action' => 'get_version', |
347 | - 'license' => ! empty( $data['license'] ) ? $data['license'] : '', |
|
348 | - 'item_name' => isset( $data['item_name'] ) ? $data['item_name'] : false, |
|
349 | - 'item_id' => isset( $data['item_id'] ) ? $data['item_id'] : false, |
|
350 | - 'version' => isset( $data['version'] ) ? $data['version'] : false, |
|
351 | - 'slug' => $data['slug'], |
|
352 | - 'author' => $data['author'], |
|
347 | + 'license' => ! empty( $data[ 'license' ] ) ? $data[ 'license' ] : '', |
|
348 | + 'item_name' => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false, |
|
349 | + 'item_id' => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false, |
|
350 | + 'version' => isset( $data[ 'version' ] ) ? $data[ 'version' ] : false, |
|
351 | + 'slug' => $data[ 'slug' ], |
|
352 | + 'author' => $data[ 'author' ], |
|
353 | 353 | 'url' => home_url(), |
354 | - 'beta' => ! empty( $data['beta'] ), |
|
354 | + 'beta' => ! empty( $data[ 'beta' ] ), |
|
355 | 355 | ); |
356 | 356 | |
357 | 357 | $verify_ssl = $this->verify_ssl(); |
@@ -371,9 +371,9 @@ discard block |
||
371 | 371 | $request->banners = maybe_unserialize( $request->banners ); |
372 | 372 | } |
373 | 373 | |
374 | - if( ! empty( $request->sections ) ) { |
|
375 | - foreach( $request->sections as $key => $section ) { |
|
376 | - $request->$key = (array) $section; |
|
374 | + if ( ! empty( $request->sections ) ) { |
|
375 | + foreach ( $request->sections as $key => $section ) { |
|
376 | + $request->$key = (array)$section; |
|
377 | 377 | } |
378 | 378 | } |
379 | 379 | |
@@ -384,37 +384,37 @@ discard block |
||
384 | 384 | |
385 | 385 | global $edd_plugin_data; |
386 | 386 | |
387 | - if( empty( $_REQUEST['edd_sl_action'] ) || 'view_plugin_changelog' != $_REQUEST['edd_sl_action'] ) { |
|
387 | + if ( empty( $_REQUEST[ 'edd_sl_action' ] ) || 'view_plugin_changelog' != $_REQUEST[ 'edd_sl_action' ] ) { |
|
388 | 388 | return; |
389 | 389 | } |
390 | 390 | |
391 | - if( empty( $_REQUEST['plugin'] ) ) { |
|
391 | + if ( empty( $_REQUEST[ 'plugin' ] ) ) { |
|
392 | 392 | return; |
393 | 393 | } |
394 | 394 | |
395 | - if( empty( $_REQUEST['slug'] ) ) { |
|
395 | + if ( empty( $_REQUEST[ 'slug' ] ) ) { |
|
396 | 396 | return; |
397 | 397 | } |
398 | 398 | |
399 | - if( ! current_user_can( 'update_plugins' ) ) { |
|
399 | + if ( ! current_user_can( 'update_plugins' ) ) { |
|
400 | 400 | wp_die( __( 'You do not have permission to install plugin updates', 'gravityview' ), __( 'Error', 'gravityview' ), array( 'response' => 403 ) ); |
401 | 401 | } |
402 | 402 | |
403 | - $data = $edd_plugin_data[ $_REQUEST['slug'] ]; |
|
404 | - $beta = ! empty( $data['beta'] ) ? true : false; |
|
405 | - $cache_key = md5( 'edd_plugin_' . sanitize_key( $_REQUEST['plugin'] ) . '_' . $beta . '_version_info' ); |
|
403 | + $data = $edd_plugin_data[ $_REQUEST[ 'slug' ] ]; |
|
404 | + $beta = ! empty( $data[ 'beta' ] ) ? true : false; |
|
405 | + $cache_key = md5( 'edd_plugin_' . sanitize_key( $_REQUEST[ 'plugin' ] ) . '_' . $beta . '_version_info' ); |
|
406 | 406 | $version_info = $this->get_cached_version_info( $cache_key ); |
407 | 407 | |
408 | - if( false === $version_info ) { |
|
408 | + if ( false === $version_info ) { |
|
409 | 409 | |
410 | 410 | $api_params = array( |
411 | 411 | 'edd_action' => 'get_version', |
412 | - 'item_name' => isset( $data['item_name'] ) ? $data['item_name'] : false, |
|
413 | - 'item_id' => isset( $data['item_id'] ) ? $data['item_id'] : false, |
|
414 | - 'slug' => $_REQUEST['slug'], |
|
415 | - 'author' => $data['author'], |
|
412 | + 'item_name' => isset( $data[ 'item_name' ] ) ? $data[ 'item_name' ] : false, |
|
413 | + 'item_id' => isset( $data[ 'item_id' ] ) ? $data[ 'item_id' ] : false, |
|
414 | + 'slug' => $_REQUEST[ 'slug' ], |
|
415 | + 'author' => $data[ 'author' ], |
|
416 | 416 | 'url' => home_url(), |
417 | - 'beta' => ! empty( $data['beta'] ) |
|
417 | + 'beta' => ! empty( $data[ 'beta' ] ) |
|
418 | 418 | ); |
419 | 419 | |
420 | 420 | $verify_ssl = $this->verify_ssl(); |
@@ -431,9 +431,9 @@ discard block |
||
431 | 431 | $version_info = false; |
432 | 432 | } |
433 | 433 | |
434 | - if( ! empty( $version_info ) ) { |
|
435 | - foreach( $version_info->sections as $key => $section ) { |
|
436 | - $version_info->$key = (array) $section; |
|
434 | + if ( ! empty( $version_info ) ) { |
|
435 | + foreach ( $version_info->sections as $key => $section ) { |
|
436 | + $version_info->$key = (array)$section; |
|
437 | 437 | } |
438 | 438 | } |
439 | 439 | |
@@ -441,8 +441,8 @@ discard block |
||
441 | 441 | |
442 | 442 | } |
443 | 443 | |
444 | - if( ! empty( $version_info ) && isset( $version_info->sections['changelog'] ) ) { |
|
445 | - echo '<div style="background:#fff;padding:10px;">' . $version_info->sections['changelog'] . '</div>'; |
|
444 | + if ( ! empty( $version_info ) && isset( $version_info->sections[ 'changelog' ] ) ) { |
|
445 | + echo '<div style="background:#fff;padding:10px;">' . $version_info->sections[ 'changelog' ] . '</div>'; |
|
446 | 446 | } |
447 | 447 | |
448 | 448 | exit; |
@@ -450,23 +450,23 @@ discard block |
||
450 | 450 | |
451 | 451 | public function get_cached_version_info( $cache_key = '' ) { |
452 | 452 | |
453 | - if( empty( $cache_key ) ) { |
|
453 | + if ( empty( $cache_key ) ) { |
|
454 | 454 | $cache_key = $this->cache_key; |
455 | 455 | } |
456 | 456 | |
457 | 457 | $cache = get_option( $cache_key ); |
458 | 458 | |
459 | - if( empty( $cache['timeout'] ) || current_time( 'timestamp' ) > $cache['timeout'] ) { |
|
459 | + if ( empty( $cache[ 'timeout' ] ) || current_time( 'timestamp' ) > $cache[ 'timeout' ] ) { |
|
460 | 460 | return false; // Cache is expired |
461 | 461 | } |
462 | 462 | |
463 | - return json_decode( $cache['value'] ); |
|
463 | + return json_decode( $cache[ 'value' ] ); |
|
464 | 464 | |
465 | 465 | } |
466 | 466 | |
467 | 467 | public function set_version_info_cache( $value = '', $cache_key = '' ) { |
468 | 468 | |
469 | - if( empty( $cache_key ) ) { |
|
469 | + if ( empty( $cache_key ) ) { |
|
470 | 470 | $cache_key = $this->cache_key; |
471 | 471 | } |
472 | 472 | |
@@ -486,7 +486,7 @@ discard block |
||
486 | 486 | * @return bool |
487 | 487 | */ |
488 | 488 | private function verify_ssl() { |
489 | - return (bool) apply_filters( 'edd_sl_api_request_verify_ssl', true, $this ); |
|
489 | + return (bool)apply_filters( 'edd_sl_api_request_verify_ssl', true, $this ); |
|
490 | 490 | } |
491 | 491 | |
492 | 492 | } |
@@ -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. |
@@ -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. */ |
@@ -61,7 +61,7 @@ |
||
61 | 61 | $action_text = sprintf( esc_html__( 'Add fields to %s', 'gravityview' ), $tab ); |
62 | 62 | $message = esc_html__( 'You can only see this message because you are able to edit this View.', 'gravityview' ); |
63 | 63 | |
64 | - $image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) ); |
|
64 | + $image = sprintf( '<img alt="%s" src="%s" style="margin-top: 10px;" />', $tab, esc_url( plugins_url( sprintf( 'assets/images/tab-%s.png', $context ), GRAVITYVIEW_FILE ) ) ); |
|
65 | 65 | $output = sprintf( '<h3>%s <strong><a href="%s">%s</a></strong></h3><p>%s</p>', $title, esc_url( $edit_link ), $action_text, $message ); |
66 | 66 | |
67 | 67 | echo \GVCommon::generate_notice( $output . $image, 'gv-error error', 'edit_gravityview', $gravityview->view->ID ); |
@@ -138,20 +138,20 @@ discard block |
||
138 | 138 | } |
139 | 139 | |
140 | 140 | /** |
141 | - * Uninstall all traces of GravityView |
|
142 | - * |
|
143 | - * Note: method is public because parent method is public |
|
144 | - * |
|
141 | + * Uninstall all traces of GravityView |
|
142 | + * |
|
143 | + * Note: method is public because parent method is public |
|
144 | + * |
|
145 | 145 | * @return bool |
146 | 146 | */ |
147 | 147 | public function uninstall() { |
148 | 148 | gravityview()->plugin->uninstall(); |
149 | 149 | |
150 | 150 | /** |
151 | - * Set the path so that Gravity Forms can de-activate GravityView |
|
152 | - * @see GFAddOn::uninstall_addon |
|
153 | - * @uses deactivate_plugins() |
|
154 | - */ |
|
151 | + * Set the path so that Gravity Forms can de-activate GravityView |
|
152 | + * @see GFAddOn::uninstall_addon |
|
153 | + * @uses deactivate_plugins() |
|
154 | + */ |
|
155 | 155 | $this->_path = GRAVITYVIEW_FILE; |
156 | 156 | |
157 | 157 | return true; |
@@ -181,42 +181,42 @@ discard block |
||
181 | 181 | } |
182 | 182 | |
183 | 183 | /** |
184 | - * Get an array of reasons why the plugin might be uninstalled |
|
185 | - * |
|
186 | - * @since 1.17.5 |
|
187 | - * |
|
184 | + * Get an array of reasons why the plugin might be uninstalled |
|
185 | + * |
|
186 | + * @since 1.17.5 |
|
187 | + * |
|
188 | 188 | * @return array Array of reasons with the label and followup questions for each uninstall reason |
189 | 189 | */ |
190 | 190 | private function get_uninstall_reasons() { |
191 | 191 | $reasons = array( |
192 | 192 | 'will-continue' => array( |
193 | - 'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ), |
|
194 | - ), |
|
193 | + 'label' => esc_html__( 'I am going to continue using GravityView', 'gravityview' ), |
|
194 | + ), |
|
195 | 195 | 'no-longer-need' => array( |
196 | - 'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ), |
|
197 | - ), |
|
196 | + 'label' => esc_html__( 'I no longer need GravityView', 'gravityview' ), |
|
197 | + ), |
|
198 | 198 | 'doesnt-work' => array( |
199 | - 'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ), |
|
200 | - ), |
|
199 | + 'label' => esc_html__( 'The plugin doesn\'t work', 'gravityview' ), |
|
200 | + ), |
|
201 | 201 | 'found-other' => array( |
202 | - 'label' => esc_html__( 'I found a better plugin', 'gravityview' ), |
|
203 | - 'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ), |
|
204 | - ), |
|
202 | + 'label' => esc_html__( 'I found a better plugin', 'gravityview' ), |
|
203 | + 'followup' => esc_attr__( 'What plugin you are using, and why?', 'gravityview' ), |
|
204 | + ), |
|
205 | 205 | 'other' => array( |
206 | - 'label' => esc_html__( 'Other', 'gravityview' ), |
|
207 | - ), |
|
206 | + 'label' => esc_html__( 'Other', 'gravityview' ), |
|
207 | + ), |
|
208 | 208 | ); |
209 | 209 | |
210 | 210 | shuffle( $reasons ); |
211 | 211 | |
212 | 212 | return $reasons; |
213 | - } |
|
213 | + } |
|
214 | 214 | |
215 | 215 | /** |
216 | - * Display a feedback form when the plugin is uninstalled |
|
217 | - * |
|
218 | - * @since 1.17.5 |
|
219 | - * |
|
216 | + * Display a feedback form when the plugin is uninstalled |
|
217 | + * |
|
218 | + * @since 1.17.5 |
|
219 | + * |
|
220 | 220 | * @return string HTML of the uninstallation form |
221 | 221 | */ |
222 | 222 | public function uninstall_form() { |
@@ -296,7 +296,7 @@ discard block |
||
296 | 296 | <h2><?php esc_html_e( 'Why did you uninstall GravityView?', 'gravityview' ); ?></h2> |
297 | 297 | <ul> |
298 | 298 | <?php |
299 | - $reasons = $this->get_uninstall_reasons(); |
|
299 | + $reasons = $this->get_uninstall_reasons(); |
|
300 | 300 | foreach ( $reasons as $reason ) { |
301 | 301 | printf( '<li><label><input name="reason" type="radio" value="other" data-followup="%s"> %s</label></li>', Utils::get( $reason, 'followup' ), Utils::get( $reason, 'label' ) ); |
302 | 302 | } |
@@ -390,12 +390,12 @@ discard block |
||
390 | 390 | } |
391 | 391 | |
392 | 392 | public function app_settings_tab() { |
393 | - parent::app_settings_tab(); |
|
393 | + parent::app_settings_tab(); |
|
394 | 394 | |
395 | 395 | if ( $this->maybe_uninstall() ) { |
396 | - echo $this->uninstall_form(); |
|
396 | + echo $this->uninstall_form(); |
|
397 | 397 | } |
398 | - } |
|
398 | + } |
|
399 | 399 | |
400 | 400 | /** |
401 | 401 | * The Settings title |
@@ -480,7 +480,7 @@ discard block |
||
480 | 480 | * @return array The settings. |
481 | 481 | */ |
482 | 482 | public function all() { |
483 | - return wp_parse_args( get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', array() ), $this->defaults() ); |
|
483 | + return wp_parse_args( get_option( 'gravityformsaddon_' . $this->_slug . '_app_settings', array() ), $this->defaults() ); |
|
484 | 484 | } |
485 | 485 | |
486 | 486 | /** |
@@ -549,8 +549,8 @@ discard block |
||
549 | 549 | type="' . $field['type'] . '" |
550 | 550 | name="' . esc_attr( $name ) . '" |
551 | 551 | value="' . $value . '" ' . |
552 | - implode( ' ', $attributes ) . |
|
553 | - ' />'; |
|
552 | + implode( ' ', $attributes ) . |
|
553 | + ' />'; |
|
554 | 554 | |
555 | 555 | if ( $echo ) { |
556 | 556 | echo $html; |
@@ -577,7 +577,7 @@ discard block |
||
577 | 577 | $license_key = $this->get( 'license_key' ); |
578 | 578 | if( '' === $license_key ) { |
579 | 579 | $license_status = 'inactive'; |
580 | - } |
|
580 | + } |
|
581 | 581 | $license_id = empty( $license_key ) ? 'license' : $license_key; |
582 | 582 | |
583 | 583 | $message = esc_html__( 'Your GravityView license %s. This means you’re missing out on updates and support! %sActivate your license%s or %sget a license here%s.', 'gravityview' ); |
@@ -592,7 +592,7 @@ discard block |
||
592 | 592 | $update_below = false; |
593 | 593 | $primary_button_link = admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ); |
594 | 594 | |
595 | - switch ( $license_status ) { |
|
595 | + switch ( $license_status ) { |
|
596 | 596 | /** @since 1.17 */ |
597 | 597 | case 'expired': |
598 | 598 | $title = __( 'Expired License', 'gravityview' ); |
@@ -648,12 +648,12 @@ discard block |
||
648 | 648 | } |
649 | 649 | |
650 | 650 | /** |
651 | - * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason. |
|
652 | - * |
|
653 | - * @since 1.21.5 |
|
654 | - * |
|
655 | - * @see GFAddOn::scripts() |
|
656 | - * |
|
651 | + * Add tooltip script to app settings page. Not enqueued by Gravity Forms for some reason. |
|
652 | + * |
|
653 | + * @since 1.21.5 |
|
654 | + * |
|
655 | + * @see GFAddOn::scripts() |
|
656 | + * |
|
657 | 657 | * @return array Array of scripts |
658 | 658 | */ |
659 | 659 | public function scripts() { |
@@ -662,10 +662,10 @@ discard block |
||
662 | 662 | $scripts[] = array( |
663 | 663 | 'handle' => 'gform_tooltip_init', |
664 | 664 | 'enqueue' => array( |
665 | - array( |
|
666 | - 'admin_page' => array( 'app_settings' ) |
|
667 | - ) |
|
668 | - ) |
|
665 | + array( |
|
666 | + 'admin_page' => array( 'app_settings' ) |
|
667 | + ) |
|
668 | + ) |
|
669 | 669 | ); |
670 | 670 | |
671 | 671 | return $scripts; |
@@ -683,10 +683,10 @@ discard block |
||
683 | 683 | 'src' => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ), |
684 | 684 | 'version' => Plugin::$version, |
685 | 685 | 'deps' => array( |
686 | - 'gform_admin', |
|
686 | + 'gform_admin', |
|
687 | 687 | 'gaddon_form_settings_css', |
688 | - 'gform_tooltip', |
|
689 | - 'gform_font_awesome', |
|
688 | + 'gform_tooltip', |
|
689 | + 'gform_font_awesome', |
|
690 | 690 | ), |
691 | 691 | 'enqueue' => array( |
692 | 692 | array( 'admin_page' => array( |
@@ -849,7 +849,7 @@ discard block |
||
849 | 849 | array( |
850 | 850 | 'label' => _x( 'Show me beta versions if they are available.', 'gravityview' ), |
851 | 851 | 'value' => '1', |
852 | - 'name' => 'beta', |
|
852 | + 'name' => 'beta', |
|
853 | 853 | ), |
854 | 854 | ), |
855 | 855 | 'description' => __( 'You will have early access to the latest GravityView features and improvements. There may be bugs! If you encounter an issue, help make GravityView better by reporting it!', 'gravityview' ), |
@@ -887,38 +887,38 @@ discard block |
||
887 | 887 | |
888 | 888 | if ( empty( $field['disabled'] ) ) { |
889 | 889 | unset( $field['disabled'] ); |
890 | - } |
|
890 | + } |
|
891 | 891 | } |
892 | 892 | |
893 | - $sections = array( |
|
894 | - array( |
|
895 | - 'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ), |
|
896 | - 'fields' => $fields, |
|
897 | - ) |
|
898 | - ); |
|
893 | + $sections = array( |
|
894 | + array( |
|
895 | + 'description' => sprintf( '<span class="version-info description">%s</span>', sprintf( __( 'You are running GravityView version %s', 'gravityview' ), Plugin::$version ) ), |
|
896 | + 'fields' => $fields, |
|
897 | + ) |
|
898 | + ); |
|
899 | 899 | |
900 | - // custom 'update settings' button |
|
901 | - $button = array( |
|
902 | - 'class' => 'button button-primary button-hero', |
|
903 | - 'type' => 'save', |
|
904 | - ); |
|
900 | + // custom 'update settings' button |
|
901 | + $button = array( |
|
902 | + 'class' => 'button button-primary button-hero', |
|
903 | + 'type' => 'save', |
|
904 | + ); |
|
905 | 905 | |
906 | 906 | if ( $disabled_attribute ) { |
907 | 907 | $button['disabled'] = $disabled_attribute; |
908 | 908 | } |
909 | 909 | |
910 | - /** |
|
911 | - * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page |
|
912 | - * Extensions can tap in here to insert their own section and settings. |
|
913 | - * <code> |
|
914 | - * $sections[] = array( |
|
915 | - * 'title' => __( 'GravityView My Extension Settings', 'gravityview' ), |
|
916 | - * 'fields' => $settings, |
|
917 | - * ); |
|
918 | - * </code> |
|
919 | - * @param array $extension_settings Empty array, ready for extension settings! |
|
920 | - */ |
|
921 | - $extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() ); |
|
910 | + /** |
|
911 | + * @filter `gravityview/settings/extension/sections` Modify the GravityView settings page |
|
912 | + * Extensions can tap in here to insert their own section and settings. |
|
913 | + * <code> |
|
914 | + * $sections[] = array( |
|
915 | + * 'title' => __( 'GravityView My Extension Settings', 'gravityview' ), |
|
916 | + * 'fields' => $settings, |
|
917 | + * ); |
|
918 | + * </code> |
|
919 | + * @param array $extension_settings Empty array, ready for extension settings! |
|
920 | + */ |
|
921 | + $extension_sections = apply_filters( 'gravityview/settings/extension/sections', array() ); |
|
922 | 922 | |
923 | 923 | // If there are extensions, add a section for them |
924 | 924 | if ( ! empty( $extension_sections ) ) { |
@@ -931,13 +931,13 @@ discard block |
||
931 | 931 | } |
932 | 932 | } |
933 | 933 | |
934 | - $k = count( $extension_sections ) - 1 ; |
|
935 | - $extension_sections[ $k ]['fields'][] = $button; |
|
934 | + $k = count( $extension_sections ) - 1 ; |
|
935 | + $extension_sections[ $k ]['fields'][] = $button; |
|
936 | 936 | $sections = array_merge( $sections, $extension_sections ); |
937 | 937 | } else { |
938 | - // add the 'update settings' button to the general section |
|
939 | - $sections[0]['fields'][] = $button; |
|
940 | - } |
|
938 | + // add the 'update settings' button to the general section |
|
939 | + $sections[0]['fields'][] = $button; |
|
940 | + } |
|
941 | 941 | |
942 | 942 | return $sections; |
943 | 943 | } |
@@ -991,9 +991,9 @@ discard block |
||
991 | 991 | */ |
992 | 992 | protected function settings_edd_license( $field, $echo = true ) { |
993 | 993 | |
994 | - if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) { |
|
995 | - $field['input_type'] = 'password'; |
|
996 | - } |
|
994 | + if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) { |
|
995 | + $field['input_type'] = 'password'; |
|
996 | + } |
|
997 | 997 | |
998 | 998 | $text = $this->settings_text( $field, false ); |
999 | 999 | |
@@ -1036,19 +1036,19 @@ discard block |
||
1036 | 1036 | } |
1037 | 1037 | |
1038 | 1038 | /** |
1039 | - * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it |
|
1040 | - * |
|
1041 | - * Converts `$field['description']` to `$field['gv_description']` |
|
1042 | - * Converts `$field['subtitle']` to `$field['description']` |
|
1043 | - * |
|
1044 | - * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description` |
|
1045 | - * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description |
|
1046 | - * |
|
1047 | - * @since 1.21.5.2 |
|
1048 | - * |
|
1039 | + * Keep GravityView styling for `$field['description']`, even though Gravity Forms added support for it |
|
1040 | + * |
|
1041 | + * Converts `$field['description']` to `$field['gv_description']` |
|
1042 | + * Converts `$field['subtitle']` to `$field['description']` |
|
1043 | + * |
|
1044 | + * @see \GV\Addon_Settings::single_setting_label Converts `gv_description` back to `description` |
|
1045 | + * @see http://share.gravityview.co/P28uGp/2OIRKxog for image that shows subtitle vs description |
|
1046 | + * |
|
1047 | + * @since 1.21.5.2 |
|
1048 | + * |
|
1049 | 1049 | * @param array $field |
1050 | - * |
|
1051 | - * @return void |
|
1050 | + * |
|
1051 | + * @return void |
|
1052 | 1052 | */ |
1053 | 1053 | public function single_setting_row( $field ) { |
1054 | 1054 | $field['gv_description'] = Utils::get( $field, 'description' ); |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | * @return array |
102 | 102 | */ |
103 | 103 | public function modify_app_settings_menu_title( $setting_tabs ) { |
104 | - $setting_tabs[0]['label'] = __( 'GravityView Settings', 'gravityview' ); |
|
104 | + $setting_tabs[ 0 ][ 'label' ] = __( 'GravityView Settings', 'gravityview' ); |
|
105 | 105 | return $setting_tabs; |
106 | 106 | } |
107 | 107 | |
@@ -304,15 +304,15 @@ discard block |
||
304 | 304 | </ul> |
305 | 305 | <div class="gv-followup widefat"> |
306 | 306 | <p><strong><label for="gv-reason-details"><?php esc_html_e( 'Comments', 'gravityview' ); ?></label></strong></p> |
307 | - <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview') ?>" placeholder="<?php esc_attr_e('Please share your thoughts about GravityView', 'gravityview'); ?>" class="large-text"></textarea> |
|
307 | + <textarea id="gv-reason-details" name="reason_details" data-default="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ) ?>" placeholder="<?php esc_attr_e( 'Please share your thoughts about GravityView', 'gravityview' ); ?>" class="large-text"></textarea> |
|
308 | 308 | </div> |
309 | 309 | <div class="scale-description"> |
310 | 310 | <p><strong><?php esc_html_e( 'How likely are you to recommend GravityView?', 'gravityview' ); ?></strong></p> |
311 | 311 | <ul class="inline"> |
312 | 312 | <?php |
313 | 313 | $i = 0; |
314 | - while( $i < 11 ) { |
|
315 | - echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_'.$i.'" value="'.$i.'" type="radio"> '.$i.'</label></li>'; |
|
314 | + while ( $i < 11 ) { |
|
315 | + echo '<li class="inline number-scale"><label><input name="likely_to_refer" id="likely_to_refer_' . $i . '" value="' . $i . '" type="radio"> ' . $i . '</label></li>'; |
|
316 | 316 | $i++; |
317 | 317 | } |
318 | 318 | ?> |
@@ -529,15 +529,15 @@ discard block |
||
529 | 529 | * @return string The HTML |
530 | 530 | */ |
531 | 531 | public function as_html( $field, $echo = true ) { |
532 | - $field['type'] = ( isset( $field['type'] ) && in_array( $field['type'], array( 'submit','reset','button' ) ) ) ? $field['type'] : 'submit'; |
|
532 | + $field[ 'type' ] = ( isset( $field[ 'type' ] ) && in_array( $field[ 'type' ], array( 'submit', 'reset', 'button' ) ) ) ? $field[ 'type' ] : 'submit'; |
|
533 | 533 | |
534 | 534 | $attributes = $this->get_field_attributes( $field ); |
535 | 535 | $default_value = Utils::get( $field, 'value', Utils::get( $field, 'default_value' ) ); |
536 | - $value = $this->get( $field['name'], $default_value ); |
|
536 | + $value = $this->get( $field[ 'name' ], $default_value ); |
|
537 | 537 | |
538 | 538 | |
539 | - $attributes['class'] = isset( $attributes['class'] ) ? esc_attr( $attributes['class'] ) : 'button-primary gfbutton'; |
|
540 | - $name = ( $field['name'] === 'gform-settings-save' ) ? $field['name'] : '_gaddon_setting_' . $field['name']; |
|
539 | + $attributes[ 'class' ] = isset( $attributes[ 'class' ] ) ? esc_attr( $attributes[ 'class' ] ) : 'button-primary gfbutton'; |
|
540 | + $name = ( $field[ 'name' ] === 'gform-settings-save' ) ? $field[ 'name' ] : '_gaddon_setting_' . $field[ 'name' ]; |
|
541 | 541 | |
542 | 542 | if ( empty( $value ) ) { |
543 | 543 | $value = __( 'Update Settings', 'gravityview' ); |
@@ -546,7 +546,7 @@ discard block |
||
546 | 546 | $attributes = $this->get_field_attributes( $field ); |
547 | 547 | |
548 | 548 | $html = '<input |
549 | - type="' . $field['type'] . '" |
|
549 | + type="' . $field[ 'type' ] . '" |
|
550 | 550 | name="' . esc_attr( $name ) . '" |
551 | 551 | value="' . $value . '" ' . |
552 | 552 | implode( ' ', $attributes ) . |
@@ -575,7 +575,7 @@ discard block |
||
575 | 575 | public function license_key_notice() { |
576 | 576 | $license_status = $this->get( 'license_key_status' ); |
577 | 577 | $license_key = $this->get( 'license_key' ); |
578 | - if( '' === $license_key ) { |
|
578 | + if ( '' === $license_key ) { |
|
579 | 579 | $license_status = 'inactive'; |
580 | 580 | } |
581 | 581 | $license_id = empty( $license_key ) ? 'license' : $license_key; |
@@ -587,7 +587,7 @@ discard block |
||
587 | 587 | * but didn't want to mess up the translation strings for the translators. |
588 | 588 | */ |
589 | 589 | $message = mb_substr( $message, 0, mb_strlen( $message ) - 1 ); |
590 | - $title = __ ( 'Inactive License', 'gravityview'); |
|
590 | + $title = __( 'Inactive License', 'gravityview' ); |
|
591 | 591 | $status = ''; |
592 | 592 | $update_below = false; |
593 | 593 | $primary_button_link = admin_url( 'edit.php?post_type=gravityview&page=gravityview_settings' ); |
@@ -617,7 +617,7 @@ discard block |
||
617 | 617 | $update_below = __( 'Activate your license key below.', 'gravityview' ); |
618 | 618 | break; |
619 | 619 | } |
620 | - $url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content='.$license_status.'&utm_campaign=Admin%20Notice'; |
|
620 | + $url = 'https://gravityview.co/pricing/?utm_source=admin_notice&utm_medium=admin&utm_content=' . $license_status . '&utm_campaign=Admin%20Notice'; |
|
621 | 621 | |
622 | 622 | // Show a different notice on settings page for inactive licenses (hide the buttons) |
623 | 623 | if ( $update_below && gravityview_is_admin_page( '', 'settings' ) ) { |
@@ -659,7 +659,7 @@ discard block |
||
659 | 659 | public function scripts() { |
660 | 660 | $scripts = parent::scripts(); |
661 | 661 | |
662 | - $scripts[] = array( |
|
662 | + $scripts[ ] = array( |
|
663 | 663 | 'handle' => 'gform_tooltip_init', |
664 | 664 | 'enqueue' => array( |
665 | 665 | array( |
@@ -678,7 +678,7 @@ discard block |
||
678 | 678 | public function styles() { |
679 | 679 | $styles = parent::styles(); |
680 | 680 | |
681 | - $styles[] = array( |
|
681 | + $styles[ ] = array( |
|
682 | 682 | 'handle' => 'gravityview_settings', |
683 | 683 | 'src' => plugins_url( 'assets/css/admin-settings.css', GRAVITYVIEW_FILE ), |
684 | 684 | 'version' => Plugin::$version, |
@@ -709,7 +709,7 @@ discard block |
||
709 | 709 | * If multisite and not network admin, we don't want the settings to show. |
710 | 710 | * @since 1.7.6 |
711 | 711 | */ |
712 | - $show_submenu = ( ! is_multisite() ) || is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() ); |
|
712 | + $show_submenu = ( ! is_multisite() ) || is_main_site() || ( ! gravityview()->plugin->is_network_activated() ) || ( is_network_admin() && gravityview()->plugin->is_network_activated() ); |
|
713 | 713 | |
714 | 714 | /** |
715 | 715 | * Override whether to show the Settings menu on a per-blog basis. |
@@ -752,26 +752,26 @@ discard block |
||
752 | 752 | 'label' => __( 'License Key', 'gravityview' ), |
753 | 753 | 'description' => __( 'Enter the license key that was sent to you on purchase. This enables plugin updates & support.', 'gravityview' ) . $this->get_license_handler()->license_details( $this->get_app_setting( 'license_key_response' ) ), |
754 | 754 | 'type' => 'edd_license', |
755 | - 'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ), |
|
755 | + 'disabled' => ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ), |
|
756 | 756 | 'data-pending-text' => __( 'Verifying license…', 'gravityview' ), |
757 | - 'default_value' => $default_settings['license_key'], |
|
757 | + 'default_value' => $default_settings[ 'license_key' ], |
|
758 | 758 | 'class' => ( '' == $this->get( 'license_key' ) ) ? 'activate code regular-text edd-license-key' : 'deactivate code regular-text edd-license-key', |
759 | 759 | ), |
760 | 760 | array( |
761 | 761 | 'name' => 'license_key_response', |
762 | - 'default_value' => $default_settings['license_key_response'], |
|
762 | + 'default_value' => $default_settings[ 'license_key_response' ], |
|
763 | 763 | 'type' => 'hidden', |
764 | 764 | ), |
765 | 765 | array( |
766 | 766 | 'name' => 'license_key_status', |
767 | - 'default_value' => $default_settings['license_key_status'], |
|
767 | + 'default_value' => $default_settings[ 'license_key_status' ], |
|
768 | 768 | 'type' => 'hidden', |
769 | 769 | ), |
770 | 770 | array( |
771 | 771 | 'name' => 'support-email', |
772 | 772 | 'type' => 'text', |
773 | 773 | 'validate' => 'email', |
774 | - 'default_value' => $default_settings['support-email'], |
|
774 | + 'default_value' => $default_settings[ 'support-email' ], |
|
775 | 775 | 'label' => __( 'Support Email', 'gravityview' ), |
776 | 776 | 'description' => __( 'In order to provide responses to your support requests, please provide your email address.', 'gravityview' ), |
777 | 777 | 'class' => 'code regular-text', |
@@ -783,7 +783,7 @@ discard block |
||
783 | 783 | 'name' => 'support_port', |
784 | 784 | 'type' => 'radio', |
785 | 785 | 'label' => __( 'Show Support Port?', 'gravityview' ), |
786 | - 'default_value' => $default_settings['support_port'], |
|
786 | + 'default_value' => $default_settings[ 'support_port' ], |
|
787 | 787 | 'horizontal' => 1, |
788 | 788 | 'choices' => array( |
789 | 789 | array( |
@@ -802,7 +802,7 @@ discard block |
||
802 | 802 | 'name' => 'no-conflict-mode', |
803 | 803 | 'type' => 'radio', |
804 | 804 | 'label' => __( 'No-Conflict Mode', 'gravityview' ), |
805 | - 'default_value' => $default_settings['no-conflict-mode'], |
|
805 | + 'default_value' => $default_settings[ 'no-conflict-mode' ], |
|
806 | 806 | 'horizontal' => 1, |
807 | 807 | 'choices' => array( |
808 | 808 | array( |
@@ -824,7 +824,7 @@ discard block |
||
824 | 824 | 'name' => 'rest_api', |
825 | 825 | 'type' => 'radio', |
826 | 826 | 'label' => __( 'REST API', 'gravityview' ), |
827 | - 'default_value' => $default_settings['rest_api'], |
|
827 | + 'default_value' => $default_settings[ 'rest_api' ], |
|
828 | 828 | 'horizontal' => 1, |
829 | 829 | 'choices' => array( |
830 | 830 | array( |
@@ -843,7 +843,7 @@ discard block |
||
843 | 843 | 'name' => 'beta', |
844 | 844 | 'type' => 'checkbox', |
845 | 845 | 'label' => __( 'Become a Beta Tester', 'gravityview' ), |
846 | - 'default_value' => $default_settings['beta'], |
|
846 | + 'default_value' => $default_settings[ 'beta' ], |
|
847 | 847 | 'horizontal' => 1, |
848 | 848 | 'choices' => array( |
849 | 849 | array( |
@@ -876,17 +876,17 @@ discard block |
||
876 | 876 | * @since 1.7.4 |
877 | 877 | */ |
878 | 878 | foreach ( $fields as &$field ) { |
879 | - $field['name'] = isset( $field['name'] ) ? $field['name'] : Utils::get( $field, 'id' ); |
|
880 | - $field['label'] = isset( $field['label'] ) ? $field['label'] : Utils::get( $field, 'title' ); |
|
881 | - $field['default_value'] = isset( $field['default_value'] ) ? $field['default_value'] : Utils::get( $field, 'default' ); |
|
882 | - $field['description'] = isset( $field['description'] ) ? $field['description'] : Utils::get( $field, 'subtitle' ); |
|
879 | + $field[ 'name' ] = isset( $field[ 'name' ] ) ? $field[ 'name' ] : Utils::get( $field, 'id' ); |
|
880 | + $field[ 'label' ] = isset( $field[ 'label' ] ) ? $field[ 'label' ] : Utils::get( $field, 'title' ); |
|
881 | + $field[ 'default_value' ] = isset( $field[ 'default_value' ] ) ? $field[ 'default_value' ] : Utils::get( $field, 'default' ); |
|
882 | + $field[ 'description' ] = isset( $field[ 'description' ] ) ? $field[ 'description' ] : Utils::get( $field, 'subtitle' ); |
|
883 | 883 | |
884 | 884 | if ( $disabled_attribute ) { |
885 | - $field['disabled'] = $disabled_attribute; |
|
885 | + $field[ 'disabled' ] = $disabled_attribute; |
|
886 | 886 | } |
887 | 887 | |
888 | - if ( empty( $field['disabled'] ) ) { |
|
889 | - unset( $field['disabled'] ); |
|
888 | + if ( empty( $field[ 'disabled' ] ) ) { |
|
889 | + unset( $field[ 'disabled' ] ); |
|
890 | 890 | } |
891 | 891 | } |
892 | 892 | |
@@ -904,7 +904,7 @@ discard block |
||
904 | 904 | ); |
905 | 905 | |
906 | 906 | if ( $disabled_attribute ) { |
907 | - $button['disabled'] = $disabled_attribute; |
|
907 | + $button[ 'disabled' ] = $disabled_attribute; |
|
908 | 908 | } |
909 | 909 | |
910 | 910 | /** |
@@ -923,20 +923,20 @@ discard block |
||
923 | 923 | // If there are extensions, add a section for them |
924 | 924 | if ( ! empty( $extension_sections ) ) { |
925 | 925 | |
926 | - if( $disabled_attribute ) { |
|
926 | + if ( $disabled_attribute ) { |
|
927 | 927 | foreach ( $extension_sections as &$section ) { |
928 | - foreach ( $section['fields'] as &$field ) { |
|
929 | - $field['disabled'] = $disabled_attribute; |
|
928 | + foreach ( $section[ 'fields' ] as &$field ) { |
|
929 | + $field[ 'disabled' ] = $disabled_attribute; |
|
930 | 930 | } |
931 | 931 | } |
932 | 932 | } |
933 | 933 | |
934 | - $k = count( $extension_sections ) - 1 ; |
|
935 | - $extension_sections[ $k ]['fields'][] = $button; |
|
934 | + $k = count( $extension_sections ) - 1; |
|
935 | + $extension_sections[ $k ][ 'fields' ][ ] = $button; |
|
936 | 936 | $sections = array_merge( $sections, $extension_sections ); |
937 | 937 | } else { |
938 | 938 | // add the 'update settings' button to the general section |
939 | - $sections[0]['fields'][] = $button; |
|
939 | + $sections[ 0 ][ 'fields' ][ ] = $button; |
|
940 | 940 | } |
941 | 941 | |
942 | 942 | return $sections; |
@@ -992,7 +992,7 @@ discard block |
||
992 | 992 | protected function settings_edd_license( $field, $echo = true ) { |
993 | 993 | |
994 | 994 | if ( defined( 'GRAVITYVIEW_LICENSE_KEY' ) && GRAVITYVIEW_LICENSE_KEY ) { |
995 | - $field['input_type'] = 'password'; |
|
995 | + $field[ 'input_type' ] = 'password'; |
|
996 | 996 | } |
997 | 997 | |
998 | 998 | $text = $this->settings_text( $field, false ); |
@@ -1017,10 +1017,10 @@ discard block |
||
1017 | 1017 | * @return string |
1018 | 1018 | */ |
1019 | 1019 | public function settings_save( $field, $echo = true ) { |
1020 | - $field['type'] = 'submit'; |
|
1021 | - $field['name'] = 'gform-settings-save'; |
|
1022 | - $field['class'] = isset( $field['class'] ) ? $field['class'] : 'button-primary gfbutton'; |
|
1023 | - $field['value'] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) ); |
|
1020 | + $field[ 'type' ] = 'submit'; |
|
1021 | + $field[ 'name' ] = 'gform-settings-save'; |
|
1022 | + $field[ 'class' ] = isset( $field[ 'class' ] ) ? $field[ 'class' ] : 'button-primary gfbutton'; |
|
1023 | + $field[ 'value' ] = Utils::get( $field, 'value', __( 'Update Settings', 'gravityview' ) ); |
|
1024 | 1024 | |
1025 | 1025 | $output = $this->settings_submit( $field, false ); |
1026 | 1026 | |
@@ -1051,8 +1051,8 @@ discard block |
||
1051 | 1051 | * @return void |
1052 | 1052 | */ |
1053 | 1053 | public function single_setting_row( $field ) { |
1054 | - $field['gv_description'] = Utils::get( $field, 'description' ); |
|
1055 | - $field['description'] = Utils::get( $field, 'subtitle' ); |
|
1054 | + $field[ 'gv_description' ] = Utils::get( $field, 'description' ); |
|
1055 | + $field[ 'description' ] = Utils::get( $field, 'subtitle' ); |
|
1056 | 1056 | parent::single_setting_row( $field ); |
1057 | 1057 | } |
1058 | 1058 | |
@@ -1064,7 +1064,7 @@ discard block |
||
1064 | 1064 | public function single_setting_label( $field ) { |
1065 | 1065 | parent::single_setting_label( $field ); |
1066 | 1066 | if ( $description = Utils::get( $field, 'gv_description' ) ) { |
1067 | - echo '<span class="description">'. $description .'</span>'; |
|
1067 | + echo '<span class="description">' . $description . '</span>'; |
|
1068 | 1068 | } |
1069 | 1069 | } |
1070 | 1070 | |
@@ -1101,9 +1101,9 @@ discard block |
||
1101 | 1101 | // If the posted key doesn't match the activated/deactivated key (set using the Activate License button, AJAX response), |
1102 | 1102 | // then we assume it's changed. If it's changed, unset the status and the previous response. |
1103 | 1103 | if ( $local_key !== $response_key ) { |
1104 | - unset( $posted_settings['license_key_response'] ); |
|
1105 | - unset( $posted_settings['license_key_status'] ); |
|
1106 | - \GFCommon::add_error_message( __('The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) ); |
|
1104 | + unset( $posted_settings[ 'license_key_response' ] ); |
|
1105 | + unset( $posted_settings[ 'license_key_status' ] ); |
|
1106 | + \GFCommon::add_error_message( __( 'The license key you entered has been saved, but not activated. Please activate the license.', 'gravityview' ) ); |
|
1107 | 1107 | } |
1108 | 1108 | return $posted_settings; |
1109 | 1109 | } |