@@ -200,8 +200,8 @@ discard block |
||
200 | 200 | */ |
201 | 201 | public function concat_items( $args = array() ) { |
202 | 202 | |
203 | - $method = isset( $args['method'] ) ? $args['method'] : 'select_option'; |
|
204 | - unset( $args['method'] ); |
|
203 | + $method = isset( $args[ 'method' ] ) ? $args[ 'method' ] : 'select_option'; |
|
204 | + unset( $args[ 'method' ] ); |
|
205 | 205 | |
206 | 206 | $value = $this->field->escaped_value() !== '' |
207 | 207 | ? $this->field->escaped_value() |
@@ -219,12 +219,12 @@ discard block |
||
219 | 219 | // Clone args & modify for just this item |
220 | 220 | $a = $args; |
221 | 221 | |
222 | - $a['value'] = $opt_value; |
|
223 | - $a['label'] = $opt_label; |
|
222 | + $a[ 'value' ] = $opt_value; |
|
223 | + $a[ 'label' ] = $opt_label; |
|
224 | 224 | |
225 | 225 | // Check if this option is the value of the input |
226 | - if ( !is_array( $value ) && (string) $value === (string) $opt_value ) { |
|
227 | - $a['checked'] = 'checked'; |
|
226 | + if ( ! is_array( $value ) && (string) $value === (string) $opt_value ) { |
|
227 | + $a[ 'checked' ] = 'checked'; |
|
228 | 228 | } |
229 | 229 | |
230 | 230 | $concatenated_items .= $this->$method( $a, $i++ ); |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | * @return string Generated option element html |
241 | 241 | */ |
242 | 242 | public function select_option( $args = array() ) { |
243 | - return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args['value'], selected( isset( $args['checked'] ) && $args['checked'], true, false ), $args['label'] ) . "\n"; |
|
243 | + return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args[ 'value' ], selected( isset( $args[ 'checked' ] ) && $args[ 'checked' ], true, false ), $args[ 'label' ] ) . "\n"; |
|
244 | 244 | } |
245 | 245 | |
246 | 246 | /** |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | 'label' => '', |
261 | 261 | ) ); |
262 | 262 | |
263 | - return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a['id'], $a['label'] ); |
|
263 | + return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a[ 'id' ], $a[ 'label' ] ); |
|
264 | 264 | } |
265 | 265 | |
266 | 266 | /** |
@@ -272,10 +272,10 @@ discard block |
||
272 | 272 | */ |
273 | 273 | public function list_input_checkbox( $args, $i ) { |
274 | 274 | $saved_value = $this->field->escaped_value(); |
275 | - if ( is_array( $saved_value ) && in_array( $args['value'], $saved_value ) ) { |
|
276 | - $args['checked'] = 'checked'; |
|
275 | + if ( is_array( $saved_value ) && in_array( $args[ 'value' ], $saved_value ) ) { |
|
276 | + $args[ 'checked' ] = 'checked'; |
|
277 | 277 | } |
278 | - $args['type'] = 'checkbox'; |
|
278 | + $args[ 'type' ] = 'checkbox'; |
|
279 | 279 | return $this->list_input( $args, $i ); |
280 | 280 | } |
281 | 281 | |
@@ -426,11 +426,11 @@ discard block |
||
426 | 426 | 'js_dependencies' => array(), |
427 | 427 | ) ); |
428 | 428 | |
429 | - if ( ! empty( $a['js_dependencies'] ) ) { |
|
430 | - CMB2_JS::add_dependencies( $a['js_dependencies'] ); |
|
429 | + if ( ! empty( $a[ 'js_dependencies' ] ) ) { |
|
430 | + CMB2_JS::add_dependencies( $a[ 'js_dependencies' ] ); |
|
431 | 431 | } |
432 | 432 | |
433 | - return sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a['desc'] ); |
|
433 | + return sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a[ 'desc' ] ); |
|
434 | 434 | } |
435 | 435 | |
436 | 436 | /** |
@@ -449,7 +449,7 @@ discard block |
||
449 | 449 | 'value' => $this->field->escaped_value( 'esc_textarea' ), |
450 | 450 | 'desc' => $this->_desc( true ), |
451 | 451 | ) ); |
452 | - return sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attrs( $a, array( 'desc', 'value' ) ), $a['value'], $a['desc'] ); |
|
452 | + return sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attrs( $a, array( 'desc', 'value' ) ), $a[ 'value' ], $a[ 'desc' ] ); |
|
453 | 453 | } |
454 | 454 | |
455 | 455 | /** |
@@ -500,8 +500,8 @@ discard block |
||
500 | 500 | 'options' => $this->field->options(), |
501 | 501 | ) ); |
502 | 502 | |
503 | - wp_editor( $a['value'], $a['id'], $a['options'] ); |
|
504 | - echo $a['desc']; |
|
503 | + wp_editor( $a[ 'value' ], $a[ 'id' ], $a[ 'options' ] ); |
|
504 | + echo $a[ 'desc' ]; |
|
505 | 505 | } |
506 | 506 | |
507 | 507 | public function text_date( $args = array() ) { |
@@ -512,7 +512,7 @@ discard block |
||
512 | 512 | 'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker' ), |
513 | 513 | ) ); |
514 | 514 | |
515 | - if ( false === strpos( $args['class'], 'timepicker' ) ) { |
|
515 | + if ( false === strpos( $args[ 'class' ], 'timepicker' ) ) { |
|
516 | 516 | $this->parse_picker_options( 'date' ); |
517 | 517 | } |
518 | 518 | |
@@ -544,34 +544,34 @@ discard block |
||
544 | 544 | 'timepicker' => array(), |
545 | 545 | ) ); |
546 | 546 | |
547 | - if ( empty( $args['value'] ) ) { |
|
548 | - $args['value'] = $this->field->escaped_value(); |
|
547 | + if ( empty( $args[ 'value' ] ) ) { |
|
548 | + $args[ 'value' ] = $this->field->escaped_value(); |
|
549 | 549 | // This will be used if there is a select_timezone set for this field |
550 | 550 | $tz_offset = $this->field->field_timezone_offset(); |
551 | 551 | if ( ! empty( $tz_offset ) ) { |
552 | - $args['value'] -= $tz_offset; |
|
552 | + $args[ 'value' ] -= $tz_offset; |
|
553 | 553 | } |
554 | 554 | } |
555 | 555 | |
556 | - $has_good_value = ! empty( $args['value'] ) && ! is_array( $args['value'] ); |
|
556 | + $has_good_value = ! empty( $args[ 'value' ] ) && ! is_array( $args[ 'value' ] ); |
|
557 | 557 | |
558 | - $date_args = wp_parse_args( $args['datepicker'], array( |
|
558 | + $date_args = wp_parse_args( $args[ 'datepicker' ], array( |
|
559 | 559 | 'class' => 'cmb2-text-small cmb2-datepicker', |
560 | 560 | 'name' => $this->_name( '[date]' ), |
561 | 561 | 'id' => $this->_id( '_date' ), |
562 | - 'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args['value'] ) : '', |
|
562 | + 'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args[ 'value' ] ) : '', |
|
563 | 563 | 'desc' => '', |
564 | 564 | ) ); |
565 | 565 | |
566 | 566 | // Let's get the date-format, and set it up as a data attr for the field. |
567 | 567 | $date_args = $this->parse_picker_options( 'date', $date_args ); |
568 | 568 | |
569 | - $time_args = wp_parse_args( $args['timepicker'], array( |
|
569 | + $time_args = wp_parse_args( $args[ 'timepicker' ], array( |
|
570 | 570 | 'class' => 'cmb2-timepicker text-time', |
571 | 571 | 'name' => $this->_name( '[time]' ), |
572 | 572 | 'id' => $this->_id( '_time' ), |
573 | - 'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args['value'] ) : '', |
|
574 | - 'desc' => $args['desc'], |
|
573 | + 'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args[ 'value' ] ) : '', |
|
574 | + 'desc' => $args[ 'desc' ], |
|
575 | 575 | 'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker', 'jquery-ui-datetimepicker' ), |
576 | 576 | ) ); |
577 | 577 | |
@@ -589,12 +589,12 @@ discard block |
||
589 | 589 | 'select_timezone' => array(), |
590 | 590 | ) ); |
591 | 591 | |
592 | - $args['value'] = $this->field->escaped_value(); |
|
593 | - if ( is_array( $args['value'] ) ) { |
|
594 | - $args['value'] = ''; |
|
592 | + $args[ 'value' ] = $this->field->escaped_value(); |
|
593 | + if ( is_array( $args[ 'value' ] ) ) { |
|
594 | + $args[ 'value' ] = ''; |
|
595 | 595 | } |
596 | 596 | |
597 | - $datetime = maybe_unserialize( $args['value'] ); |
|
597 | + $datetime = maybe_unserialize( $args[ 'value' ] ); |
|
598 | 598 | $value = $tzstring = ''; |
599 | 599 | |
600 | 600 | if ( $datetime && $datetime instanceof DateTime ) { |
@@ -603,24 +603,24 @@ discard block |
||
603 | 603 | $value = $datetime->getTimestamp(); |
604 | 604 | } |
605 | 605 | |
606 | - $timestamp_args = wp_parse_args( $args['text_datetime_timestamp'], array( |
|
606 | + $timestamp_args = wp_parse_args( $args[ 'text_datetime_timestamp' ], array( |
|
607 | 607 | 'desc' => '', |
608 | 608 | 'value' => $value, |
609 | 609 | ) ); |
610 | 610 | |
611 | - $timezone_args = wp_parse_args( $args['select_timezone'], array( |
|
611 | + $timezone_args = wp_parse_args( $args[ 'select_timezone' ], array( |
|
612 | 612 | 'class' => 'cmb2_select cmb2-select-timezone', |
613 | 613 | 'name' => $this->_name( '[timezone]' ), |
614 | 614 | 'id' => $this->_id( '_timezone' ), |
615 | 615 | 'options' => wp_timezone_choice( $tzstring ), |
616 | - 'desc' => $args['desc'], |
|
616 | + 'desc' => $args[ 'desc' ], |
|
617 | 617 | ) ); |
618 | 618 | |
619 | 619 | return $this->text_datetime_timestamp( $timestamp_args ) . "\n" . $this->select( $timezone_args ); |
620 | 620 | } |
621 | 621 | |
622 | 622 | public function select_timezone() { |
623 | - $this->field->args['default'] = $this->field->args( 'default' ) |
|
623 | + $this->field->args[ 'default' ] = $this->field->args( 'default' ) |
|
624 | 624 | ? $this->field->args( 'default' ) |
625 | 625 | : cmb2_utils()->timezone_string(); |
626 | 626 | |
@@ -662,7 +662,7 @@ discard block |
||
662 | 662 | 'desc' => $this->_desc( true ), |
663 | 663 | ) ); |
664 | 664 | |
665 | - return sprintf( '<%1$s class="%2$s">%3$s</%1$s>%4$s', $a['tag'], $a['class'], $a['name'], $a['desc'] ); |
|
665 | + return sprintf( '<%1$s class="%2$s">%3$s</%1$s>%4$s', $a[ 'tag' ], $a[ 'class' ], $a[ 'name' ], $a[ 'desc' ] ); |
|
666 | 666 | } |
667 | 667 | |
668 | 668 | public function select( $args = array() ) { |
@@ -675,17 +675,17 @@ discard block |
||
675 | 675 | ) ); |
676 | 676 | |
677 | 677 | $attrs = $this->concat_attrs( $a, array( 'desc', 'options' ) ); |
678 | - return sprintf( '<select%s>%s</select>%s', $attrs, $a['options'], $a['desc'] ); |
|
678 | + return sprintf( '<select%s>%s</select>%s', $attrs, $a[ 'options' ], $a[ 'desc' ] ); |
|
679 | 679 | } |
680 | 680 | |
681 | 681 | public function taxonomy_select() { |
682 | 682 | |
683 | 683 | $names = $this->get_object_terms(); |
684 | - $saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[key( $names )]->slug; |
|
684 | + $saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[ key( $names ) ]->slug; |
|
685 | 685 | $terms = get_terms( $this->field->args( 'taxonomy' ), 'hide_empty=0' ); |
686 | 686 | $options = ''; |
687 | 687 | |
688 | - $option_none = $this->field->args( 'show_option_none' ); |
|
688 | + $option_none = $this->field->args( 'show_option_none' ); |
|
689 | 689 | if ( ! empty( $option_none ) ) { |
690 | 690 | $option_none_value = apply_filters( 'cmb2_taxonomy_select_default_value', '' ); |
691 | 691 | $option_none_value = apply_filters( "cmb2_taxonomy_select_{$this->_id()}_default_value", $option_none_value ); |
@@ -715,7 +715,7 @@ discard block |
||
715 | 715 | 'desc' => $this->_desc( true ), |
716 | 716 | ) ); |
717 | 717 | |
718 | - return sprintf( '<ul class="%s">%s</ul>%s', $a['class'], $a['options'], $a['desc'] ); |
|
718 | + return sprintf( '<ul class="%s">%s</ul>%s', $a[ 'class' ], $a[ 'options' ], $a[ 'desc' ] ); |
|
719 | 719 | } |
720 | 720 | |
721 | 721 | public function radio_inline() { |
@@ -750,7 +750,7 @@ discard block |
||
750 | 750 | : $is_checked; |
751 | 751 | |
752 | 752 | if ( $is_checked ) { |
753 | - $defaults['checked'] = 'checked'; |
|
753 | + $defaults[ 'checked' ] = 'checked'; |
|
754 | 754 | } |
755 | 755 | |
756 | 756 | $args = $this->parse_args( $args, 'checkbox', $defaults ); |
@@ -760,14 +760,14 @@ discard block |
||
760 | 760 | |
761 | 761 | public function taxonomy_radio() { |
762 | 762 | $names = $this->get_object_terms(); |
763 | - $saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[key( $names )]->slug; |
|
763 | + $saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[ key( $names ) ]->slug; |
|
764 | 764 | $terms = get_terms( $this->field->args( 'taxonomy' ), 'hide_empty=0' ); |
765 | 765 | $options = ''; $i = 1; |
766 | 766 | |
767 | 767 | if ( ! $terms ) { |
768 | 768 | $options .= sprintf( '<li><label>%s</label></li>', esc_html( $this->_text( 'no_terms_text', __( 'No terms', 'cmb2' ) ) ) ); |
769 | 769 | } else { |
770 | - $option_none = $this->field->args( 'show_option_none' ); |
|
770 | + $option_none = $this->field->args( 'show_option_none' ); |
|
771 | 771 | if ( ! empty( $option_none ) ) { |
772 | 772 | $option_none_value = apply_filters( "cmb2_taxonomy_radio_{$this->_id()}_default_value", apply_filters( 'cmb2_taxonomy_radio_default_value', '' ) ); |
773 | 773 | $args = array( |
@@ -775,7 +775,7 @@ discard block |
||
775 | 775 | 'label' => $option_none, |
776 | 776 | ); |
777 | 777 | if ( $saved_term == $option_none_value ) { |
778 | - $args['checked'] = 'checked'; |
|
778 | + $args[ 'checked' ] = 'checked'; |
|
779 | 779 | } |
780 | 780 | $options .= $this->list_input( $args, $i ); |
781 | 781 | $i++; |
@@ -788,7 +788,7 @@ discard block |
||
788 | 788 | ); |
789 | 789 | |
790 | 790 | if ( $saved_term == $term->slug ) { |
791 | - $args['checked'] = 'checked'; |
|
791 | + $args[ 'checked' ] = 'checked'; |
|
792 | 792 | } |
793 | 793 | $options .= $this->list_input( $args, $i ); |
794 | 794 | $i++; |
@@ -825,7 +825,7 @@ discard block |
||
825 | 825 | ); |
826 | 826 | |
827 | 827 | if ( is_array( $saved_terms ) && in_array( $term->slug, $saved_terms ) ) { |
828 | - $args['checked'] = 'checked'; |
|
828 | + $args[ 'checked' ] = 'checked'; |
|
829 | 829 | } |
830 | 830 | $options .= $this->list_input( $args, $i ); |
831 | 831 | $i++; |
@@ -930,7 +930,7 @@ discard block |
||
930 | 930 | $query_args = $this->field->args( 'query_args' ); |
931 | 931 | |
932 | 932 | // if options array and 'url' => false, then hide the url field |
933 | - $input_type = array_key_exists( 'url', $options ) && false === $options['url'] ? 'hidden' : 'text'; |
|
933 | + $input_type = array_key_exists( 'url', $options ) && false === $options[ 'url' ] ? 'hidden' : 'text'; |
|
934 | 934 | |
935 | 935 | echo $this->input( array( |
936 | 936 | 'type' => $input_type, |
@@ -951,8 +951,8 @@ discard block |
||
951 | 951 | // Reset field args for attachment ID |
952 | 952 | $args = $this->field->args(); |
953 | 953 | // If we're looking at a file in a group, we need to get the non-prefixed id |
954 | - $args['id'] = ( $this->field->group ? $this->field->args( '_id' ) : $cached_id ) . '_id'; |
|
955 | - unset( $args['_id'], $args['_name'] ); |
|
954 | + $args[ 'id' ] = ( $this->field->group ? $this->field->args( '_id' ) : $cached_id ) . '_id'; |
|
955 | + unset( $args[ '_id' ], $args[ '_name' ] ); |
|
956 | 956 | |
957 | 957 | // And get new field object |
958 | 958 | $this->field = new CMB2_Field( array( |
@@ -984,7 +984,7 @@ discard block |
||
984 | 984 | if ( $_id_value ) { |
985 | 985 | $image = wp_get_attachment_image( $_id_value, $img_size, null, array( 'class' => 'cmb-file-field-image' ) ); |
986 | 986 | } else { |
987 | - $size = is_array( $img_size ) ? $img_size[0] : 350; |
|
987 | + $size = is_array( $img_size ) ? $img_size[ 0 ] : 350; |
|
988 | 988 | $image = '<img style="max-width: ' . absint( $size ) . 'px; width: 100%; height: auto;" src="' . $meta_value . '" alt="" />'; |
989 | 989 | } |
990 | 990 | |
@@ -1015,11 +1015,11 @@ discard block |
||
1015 | 1015 | */ |
1016 | 1016 | public function img_status_output( $args ) { |
1017 | 1017 | printf( '<%1$s class="img-status">%2$s<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button"%3$s>%4$s</a></p>%5$s</%1$s>', |
1018 | - $args['tag'], |
|
1019 | - $args['image'], |
|
1020 | - isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '', |
|
1018 | + $args[ 'tag' ], |
|
1019 | + $args[ 'image' ], |
|
1020 | + isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '', |
|
1021 | 1021 | esc_html( $this->_text( 'remove_image_text', __( 'Remove Image', 'cmb2' ) ) ), |
1022 | - isset( $args['id_input'] ) ? $args['id_input'] : '' |
|
1022 | + isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : '' |
|
1023 | 1023 | ); |
1024 | 1024 | } |
1025 | 1025 | |
@@ -1031,14 +1031,14 @@ discard block |
||
1031 | 1031 | */ |
1032 | 1032 | public function file_status_output( $args ) { |
1033 | 1033 | printf( '<%1$s class="file-status"><span>%2$s <strong>%3$s</strong></span> (<a href="%4$s" target="_blank" rel="external">%5$s</a> / <a href="#" class="cmb2-remove-file-button"%6$s>%7$s</a>)%8$s</%1$s>', |
1034 | - $args['tag'], |
|
1034 | + $args[ 'tag' ], |
|
1035 | 1035 | esc_html( $this->_text( 'file_text', __( 'File:', 'cmb2' ) ) ), |
1036 | - $this->get_file_name_from_path( $args['value'] ), |
|
1037 | - $args['value'], |
|
1036 | + $this->get_file_name_from_path( $args[ 'value' ] ), |
|
1037 | + $args[ 'value' ], |
|
1038 | 1038 | esc_html( $this->_text( 'file_download_text', __( 'Download', 'cmb2' ) ) ), |
1039 | - isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '', |
|
1039 | + isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '', |
|
1040 | 1040 | esc_html( $this->_text( 'remove_text', __( 'Remove', 'cmb2' ) ) ), |
1041 | - isset( $args['id_input'] ) ? $args['id_input'] : '' |
|
1041 | + isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : '' |
|
1042 | 1042 | ); |
1043 | 1043 | } |
1044 | 1044 | |
@@ -1060,8 +1060,8 @@ discard block |
||
1060 | 1060 | if ( $update ) { |
1061 | 1061 | $atts = $this->field->args( 'attributes' ); |
1062 | 1062 | } else { |
1063 | - $atts = isset( $args['attributes'] ) |
|
1064 | - ? $args['attributes'] |
|
1063 | + $atts = isset( $args[ 'attributes' ] ) |
|
1064 | + ? $args[ 'attributes' ] |
|
1065 | 1065 | : $atts; |
1066 | 1066 | } |
1067 | 1067 | |
@@ -1077,7 +1077,7 @@ discard block |
||
1077 | 1077 | } |
1078 | 1078 | |
1079 | 1079 | if ( $update ) { |
1080 | - $this->field->args['attributes'] = $atts; |
|
1080 | + $this->field->args[ 'attributes' ] = $atts; |
|
1081 | 1081 | } |
1082 | 1082 | |
1083 | 1083 | return array_merge( $args, $atts ); |