@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | /** |
31 | 31 | * Get the singleton instance of this class |
32 | 32 | * @since 2.2.2 |
33 | - * @return object |
|
33 | + * @return CMB2_Ajax |
|
34 | 34 | */ |
35 | 35 | public static function get_instance() { |
36 | 36 | if ( ! ( self::$instance instanceof self ) ) { |
@@ -221,7 +221,6 @@ discard block |
||
221 | 221 | * |
222 | 222 | * @since 1.3.0 |
223 | 223 | * @param string $meta_key Postmeta's key |
224 | - * @param mixed $meta_value (Optional) value of the postmeta to be saved |
|
225 | 224 | */ |
226 | 225 | protected function cache_action( $meta_key ) { |
227 | 226 | $func_args = func_get_args(); |
@@ -59,12 +59,12 @@ discard block |
||
59 | 59 | public function oembed_handler() { |
60 | 60 | |
61 | 61 | // Verify our nonce |
62 | - if ( ! ( isset( $_REQUEST['cmb2_ajax_nonce'], $_REQUEST['oembed_url'] ) && wp_verify_nonce( $_REQUEST['cmb2_ajax_nonce'], 'ajax_nonce' ) ) ) { |
|
62 | + if ( ! ( isset( $_REQUEST[ 'cmb2_ajax_nonce' ], $_REQUEST[ 'oembed_url' ] ) && wp_verify_nonce( $_REQUEST[ 'cmb2_ajax_nonce' ], 'ajax_nonce' ) ) ) { |
|
63 | 63 | die(); |
64 | 64 | } |
65 | 65 | |
66 | 66 | // Sanitize our search string |
67 | - $oembed_string = sanitize_text_field( $_REQUEST['oembed_url'] ); |
|
67 | + $oembed_string = sanitize_text_field( $_REQUEST[ 'oembed_url' ] ); |
|
68 | 68 | |
69 | 69 | // Send back error if empty |
70 | 70 | if ( empty( $oembed_string ) ) { |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | } |
73 | 73 | |
74 | 74 | // Set width of embed |
75 | - $embed_width = isset( $_REQUEST['oembed_width'] ) && intval( $_REQUEST['oembed_width'] ) < 640 ? intval( $_REQUEST['oembed_width'] ) : '640'; |
|
75 | + $embed_width = isset( $_REQUEST[ 'oembed_width' ] ) && intval( $_REQUEST[ 'oembed_width' ] ) < 640 ? intval( $_REQUEST[ 'oembed_width' ] ) : '640'; |
|
76 | 76 | |
77 | 77 | // Set url |
78 | 78 | $oembed_url = esc_url( $oembed_string ); |
@@ -85,10 +85,10 @@ discard block |
||
85 | 85 | // Get embed code (or fallback link) |
86 | 86 | $html = $this->get_oembed( array( |
87 | 87 | 'url' => $oembed_url, |
88 | - 'object_id' => $_REQUEST['object_id'], |
|
89 | - 'object_type' => isset( $_REQUEST['object_type'] ) ? $_REQUEST['object_type'] : 'post', |
|
88 | + 'object_id' => $_REQUEST[ 'object_id' ], |
|
89 | + 'object_type' => isset( $_REQUEST[ 'object_type' ] ) ? $_REQUEST[ 'object_type' ] : 'post', |
|
90 | 90 | 'oembed_args' => $embed_args, |
91 | - 'field_id' => $_REQUEST['field_id'], |
|
91 | + 'field_id' => $_REQUEST[ 'field_id' ], |
|
92 | 92 | ) ); |
93 | 93 | |
94 | 94 | wp_send_json_success( $html ); |
@@ -103,10 +103,10 @@ discard block |
||
103 | 103 | public function get_oembed_no_edit( $args ) { |
104 | 104 | global $wp_embed; |
105 | 105 | |
106 | - $oembed_url = esc_url( $args['url'] ); |
|
106 | + $oembed_url = esc_url( $args[ 'url' ] ); |
|
107 | 107 | |
108 | 108 | // Sanitize object_id |
109 | - $this->object_id = is_numeric( $args['object_id'] ) ? absint( $args['object_id'] ) : sanitize_text_field( $args['object_id'] ); |
|
109 | + $this->object_id = is_numeric( $args[ 'object_id' ] ) ? absint( $args[ 'object_id' ] ) : sanitize_text_field( $args[ 'object_id' ] ); |
|
110 | 110 | |
111 | 111 | $args = wp_parse_args( $args, array( |
112 | 112 | 'object_type' => 'post', |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | 'wp_error' => false, |
116 | 116 | ) ); |
117 | 117 | |
118 | - $this->embed_args =& $args; |
|
118 | + $this->embed_args = & $args; |
|
119 | 119 | |
120 | 120 | /** |
121 | 121 | * Set the post_ID so oEmbed won't fail |
@@ -124,9 +124,9 @@ discard block |
||
124 | 124 | $wp_embed->post_ID = $this->object_id; |
125 | 125 | |
126 | 126 | // Special scenario if NOT a post object |
127 | - if ( isset( $args['object_type'] ) && 'post' != $args['object_type'] ) { |
|
127 | + if ( isset( $args[ 'object_type' ] ) && 'post' != $args[ 'object_type' ] ) { |
|
128 | 128 | |
129 | - if ( 'options-page' == $args['object_type'] ) { |
|
129 | + if ( 'options-page' == $args[ 'object_type' ] ) { |
|
130 | 130 | |
131 | 131 | // Bogus id to pass some numeric checks. Issue with a VERY large WP install? |
132 | 132 | $wp_embed->post_ID = 1987645321; |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | |
135 | 135 | // Ok, we need to hijack the oembed cache system |
136 | 136 | $this->hijack = true; |
137 | - $this->object_type = $args['object_type']; |
|
137 | + $this->object_type = $args[ 'object_type' ]; |
|
138 | 138 | |
139 | 139 | // Gets ombed cache from our object's meta (vs postmeta) |
140 | 140 | add_filter( 'get_post_metadata', array( $this, 'hijack_oembed_cache_get' ), 10, 3 ); |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | |
147 | 147 | $embed_args = ''; |
148 | 148 | |
149 | - foreach ( $args['oembed_args'] as $key => $val ) { |
|
149 | + foreach ( $args[ 'oembed_args' ] as $key => $val ) { |
|
150 | 150 | $embed_args .= " $key=\"$val\""; |
151 | 151 | } |
152 | 152 | |
@@ -169,12 +169,12 @@ discard block |
||
169 | 169 | $oembed = $this->get_oembed_no_edit( $args ); |
170 | 170 | |
171 | 171 | // Send back our embed |
172 | - if ( $oembed['embed'] && $oembed['embed'] != $oembed['fallback'] ) { |
|
173 | - return '<div class="cmb2-oembed embed-status">' . $oembed['embed'] . '<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button" rel="' . $oembed['args']['field_id'] . '">' . __( 'Remove Embed', 'cmb2' ) . '</a></p></div>'; |
|
172 | + if ( $oembed[ 'embed' ] && $oembed[ 'embed' ] != $oembed[ 'fallback' ] ) { |
|
173 | + return '<div class="cmb2-oembed embed-status">' . $oembed[ 'embed' ] . '<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button" rel="' . $oembed[ 'args' ][ 'field_id' ] . '">' . __( 'Remove Embed', 'cmb2' ) . '</a></p></div>'; |
|
174 | 174 | } |
175 | 175 | |
176 | 176 | // Otherwise, send back error info that no oEmbeds were found |
177 | - return '<p class="ui-state-error-text">' . sprintf( __( 'No oEmbed Results Found for %s. View more info at', 'cmb2' ), $oembed['fallback'] ) . ' <a href="http://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>.</p>'; |
|
177 | + return '<p class="ui-state-error-text">' . sprintf( __( 'No oEmbed Results Found for %s. View more info at', 'cmb2' ), $oembed[ 'fallback' ] ) . ' <a href="http://codex.wordpress.org/Embeds" target="_blank">codex.wordpress.org/Embeds</a>.</p>'; |
|
178 | 178 | } |
179 | 179 | |
180 | 180 | /** |
@@ -236,15 +236,15 @@ discard block |
||
236 | 236 | */ |
237 | 237 | protected function cache_action( $meta_key ) { |
238 | 238 | $func_args = func_get_args(); |
239 | - $action = isset( $func_args[1] ) ? 'update' : 'get'; |
|
239 | + $action = isset( $func_args[ 1 ] ) ? 'update' : 'get'; |
|
240 | 240 | |
241 | 241 | if ( 'options-page' === $this->object_type ) { |
242 | 242 | |
243 | 243 | $args = array( $meta_key ); |
244 | 244 | |
245 | 245 | if ( 'update' === $action ) { |
246 | - $args[] = $func_args[1]; |
|
247 | - $args[] = true; |
|
246 | + $args[ ] = $func_args[ 1 ]; |
|
247 | + $args[ ] = true; |
|
248 | 248 | } |
249 | 249 | |
250 | 250 | // Cache the result to our options |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | } else { |
253 | 253 | |
254 | 254 | $args = array( $this->object_type, $this->object_id, $meta_key ); |
255 | - $args[] = 'update' === $action ? $func_args : true; |
|
255 | + $args[ ] = 'update' === $action ? $func_args : true; |
|
256 | 256 | |
257 | 257 | // Cache the result to our metadata |
258 | 258 | $status = call_user_func_array( $action . '_metadata', $args ); |
@@ -84,7 +84,6 @@ discard block |
||
84 | 84 | |
85 | 85 | /** |
86 | 86 | * Fall back to CMB2_Types methods |
87 | - * @param string $field |
|
88 | 87 | * @throws Exception Throws an exception if the field is invalid. |
89 | 88 | * @return mixed |
90 | 89 | */ |
@@ -105,7 +104,7 @@ discard block |
||
105 | 104 | * Magic getter for our object. |
106 | 105 | * @param string $field |
107 | 106 | * @throws Exception Throws an exception if the field is invalid. |
108 | - * @return mixed |
|
107 | + * @return CMB2_Field |
|
109 | 108 | */ |
110 | 109 | public function __get( $field ) { |
111 | 110 | switch ( $field ) { |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | */ |
39 | 39 | public function __construct( CMB2_Types $types, $args = array() ) { |
40 | 40 | $this->types = $types; |
41 | - $args['rendered'] = isset( $args['rendered'] ) ? (bool) $args['rendered'] : true; |
|
41 | + $args[ 'rendered' ] = isset( $args[ 'rendered' ] ) ? (bool) $args[ 'rendered' ] : true; |
|
42 | 42 | $this->args = $args; |
43 | 43 | } |
44 | 44 | |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | * @return string|CMB2_Type_Base Rendered output or this object. |
57 | 57 | */ |
58 | 58 | public function rendered( $rendered ) { |
59 | - if ( $this->args['rendered'] ) { |
|
59 | + if ( $this->args[ 'rendered' ] ) { |
|
60 | 60 | return is_a( $rendered, __CLASS__ ) ? $rendered->rendered : $rendered; |
61 | 61 | } |
62 | 62 |
@@ -38,6 +38,9 @@ discard block |
||
38 | 38 | return $date_input . "\n" . $time_input; |
39 | 39 | } |
40 | 40 | |
41 | + /** |
|
42 | + * @param boolean $has_good_value |
|
43 | + */ |
|
41 | 44 | public function date_args( $args, $has_good_value ) { |
42 | 45 | $date_args = wp_parse_args( $args['datepicker'], array( |
43 | 46 | 'class' => 'cmb2-text-small cmb2-datepicker', |
@@ -51,6 +54,9 @@ discard block |
||
51 | 54 | return $this->parse_picker_options( 'date', $date_args ); |
52 | 55 | } |
53 | 56 | |
57 | + /** |
|
58 | + * @param boolean $has_good_value |
|
59 | + */ |
|
54 | 60 | public function time_args( $args, $has_good_value ) { |
55 | 61 | $time_args = wp_parse_args( $args['timepicker'], array( |
56 | 62 | 'class' => 'cmb2-timepicker text-time', |
@@ -22,16 +22,16 @@ discard block |
||
22 | 22 | 'timepicker' => array(), |
23 | 23 | ) ); |
24 | 24 | |
25 | - if ( empty( $args['value'] ) ) { |
|
26 | - $args['value'] = $field->escaped_value(); |
|
25 | + if ( empty( $args[ 'value' ] ) ) { |
|
26 | + $args[ 'value' ] = $field->escaped_value(); |
|
27 | 27 | // This will be used if there is a select_timezone set for this field |
28 | 28 | $tz_offset = $field->field_timezone_offset(); |
29 | 29 | if ( ! empty( $tz_offset ) ) { |
30 | - $args['value'] -= $tz_offset; |
|
30 | + $args[ 'value' ] -= $tz_offset; |
|
31 | 31 | } |
32 | 32 | } |
33 | 33 | |
34 | - $has_good_value = ! empty( $args['value'] ) && ! is_array( $args['value'] ); |
|
34 | + $has_good_value = ! empty( $args[ 'value' ] ) && ! is_array( $args[ 'value' ] ); |
|
35 | 35 | |
36 | 36 | $date_input = parent::render( $this->date_args( $args, $has_good_value ) ); |
37 | 37 | $time_input = parent::render( $this->time_args( $args, $has_good_value ) ); |
@@ -40,31 +40,31 @@ discard block |
||
40 | 40 | } |
41 | 41 | |
42 | 42 | public function date_args( $args, $has_good_value ) { |
43 | - $date_args = wp_parse_args( $args['datepicker'], array( |
|
43 | + $date_args = wp_parse_args( $args[ 'datepicker' ], array( |
|
44 | 44 | 'class' => 'cmb2-text-small cmb2-datepicker', |
45 | 45 | 'name' => $this->_name( '[date]' ), |
46 | 46 | 'id' => $this->_id( '_date' ), |
47 | - 'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args['value'] ) : '', |
|
47 | + 'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args[ 'value' ] ) : '', |
|
48 | 48 | 'desc' => '', |
49 | 49 | ) ); |
50 | 50 | |
51 | - $date_args['rendered'] = true; |
|
51 | + $date_args[ 'rendered' ] = true; |
|
52 | 52 | |
53 | 53 | // Let's get the date-format, and set it up as a data attr for the field. |
54 | 54 | return $this->parse_picker_options( 'date', $date_args ); |
55 | 55 | } |
56 | 56 | |
57 | 57 | public function time_args( $args, $has_good_value ) { |
58 | - $time_args = wp_parse_args( $args['timepicker'], array( |
|
58 | + $time_args = wp_parse_args( $args[ 'timepicker' ], array( |
|
59 | 59 | 'class' => 'cmb2-timepicker text-time', |
60 | 60 | 'name' => $this->_name( '[time]' ), |
61 | 61 | 'id' => $this->_id( '_time' ), |
62 | - 'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args['value'] ) : '', |
|
63 | - 'desc' => $args['desc'], |
|
62 | + 'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args[ 'value' ] ) : '', |
|
63 | + 'desc' => $args[ 'desc' ], |
|
64 | 64 | 'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker', 'jquery-ui-datetimepicker' ), |
65 | 65 | ) ); |
66 | 66 | |
67 | - $time_args['rendered'] = true; |
|
67 | + $time_args[ 'rendered' ] = true; |
|
68 | 68 | |
69 | 69 | // Let's get the time-format, and set it up as a data attr for the field. |
70 | 70 | return $this->parse_picker_options( 'time', $time_args ); |
@@ -15,7 +15,6 @@ |
||
15 | 15 | /** |
16 | 16 | * Handles outputting a 'wysiwyg' element |
17 | 17 | * @since 1.1.0 |
18 | - * @param array $args Override arguments |
|
19 | 18 | * @return string Form wysiwyg element |
20 | 19 | */ |
21 | 20 | public function render() { |
@@ -26,7 +26,7 @@ |
||
26 | 26 | 'options' => $this->field->options(), |
27 | 27 | ) ); |
28 | 28 | |
29 | - wp_editor( $a['value'], $a['id'], $a['options'] ); |
|
30 | - echo $a['desc']; |
|
29 | + wp_editor( $a[ 'value' ], $a[ 'id' ], $a[ 'options' ] ); |
|
30 | + echo $a[ 'desc' ]; |
|
31 | 31 | } |
32 | 32 | } |
@@ -33,7 +33,7 @@ |
||
33 | 33 | 'data-objecttype' => $field->object_type, |
34 | 34 | ) ) |
35 | 35 | . '<p class="cmb-spinner spinner" style="display:none;"></p>' |
36 | - . '<div id="'. $this->_id( '-status' ). '" class="cmb2-media-status ui-helper-clearfix embed_wrap">' . $oembed . '</div>'; |
|
36 | + . '<div id="' . $this->_id( '-status' ) . '" class="cmb2-media-status ui-helper-clearfix embed_wrap">' . $oembed . '</div>'; |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | } |
@@ -55,11 +55,11 @@ discard block |
||
55 | 55 | */ |
56 | 56 | public function img_status_output( $args ) { |
57 | 57 | return sprintf( '<%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>', |
58 | - $args['tag'], |
|
59 | - $args['image'], |
|
60 | - isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '', |
|
58 | + $args[ 'tag' ], |
|
59 | + $args[ 'image' ], |
|
60 | + isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '', |
|
61 | 61 | esc_html( $this->_text( 'remove_image_text', __( 'Remove Image', 'cmb2' ) ) ), |
62 | - isset( $args['id_input'] ) ? $args['id_input'] : '' |
|
62 | + isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : '' |
|
63 | 63 | ); |
64 | 64 | } |
65 | 65 | |
@@ -71,14 +71,14 @@ discard block |
||
71 | 71 | */ |
72 | 72 | public function file_status_output( $args ) { |
73 | 73 | return sprintf( '<%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>', |
74 | - $args['tag'], |
|
74 | + $args[ 'tag' ], |
|
75 | 75 | esc_html( $this->_text( 'file_text', __( 'File:', 'cmb2' ) ) ), |
76 | - cmb2_utils()->get_file_name_from_path( $args['value'] ), |
|
77 | - $args['value'], |
|
76 | + cmb2_utils()->get_file_name_from_path( $args[ 'value' ] ), |
|
77 | + $args[ 'value' ], |
|
78 | 78 | esc_html( $this->_text( 'file_download_text', __( 'Download', 'cmb2' ) ) ), |
79 | - isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '', |
|
79 | + isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '', |
|
80 | 80 | esc_html( $this->_text( 'remove_text', __( 'Remove', 'cmb2' ) ) ), |
81 | - isset( $args['id_input'] ) ? $args['id_input'] : '' |
|
81 | + isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : '' |
|
82 | 82 | ); |
83 | 83 | } |
84 | 84 |
@@ -14,7 +14,7 @@ |
||
14 | 14 | |
15 | 15 | public function render() { |
16 | 16 | |
17 | - $this->field->args['default'] = $this->field->get_default() |
|
17 | + $this->field->args[ 'default' ] = $this->field->get_default() |
|
18 | 18 | ? $this->field->get_default() |
19 | 19 | : cmb2_utils()->timezone_string(); |
20 | 20 |
@@ -36,7 +36,7 @@ |
||
36 | 36 | ); |
37 | 37 | |
38 | 38 | if ( is_array( $saved_terms ) && in_array( $term->slug, $saved_terms ) ) { |
39 | - $args['checked'] = 'checked'; |
|
39 | + $args[ 'checked' ] = 'checked'; |
|
40 | 40 | } |
41 | 41 | $options .= $this->types->list_input( $args, $i ); |
42 | 42 | $i++; |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | $field = $this->field; |
17 | 17 | $names = $this->get_object_terms(); |
18 | 18 | |
19 | - $saved_term = is_wp_error( $names ) || empty( $names ) ? $field->get_default() : $names[key( $names )]->slug; |
|
19 | + $saved_term = is_wp_error( $names ) || empty( $names ) ? $field->get_default() : $names[ key( $names ) ]->slug; |
|
20 | 20 | $terms = get_terms( $field->args( 'taxonomy' ), 'hide_empty=0' ); |
21 | 21 | $options = ''; |
22 | 22 | $i = 1; |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | if ( ! $terms ) { |
25 | 25 | $options .= sprintf( '<li><label>%s</label></li>', esc_html( $this->types->_text( 'no_terms_text', __( 'No terms', 'cmb2' ) ) ) ); |
26 | 26 | } else { |
27 | - $option_none = $field->args( 'show_option_none' ); |
|
27 | + $option_none = $field->args( 'show_option_none' ); |
|
28 | 28 | if ( ! empty( $option_none ) ) { |
29 | 29 | |
30 | 30 | $field_id = $this->_id(); |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | 'label' => $option_none, |
55 | 55 | ); |
56 | 56 | if ( $saved_term == $option_none_value ) { |
57 | - $args['checked'] = 'checked'; |
|
57 | + $args[ 'checked' ] = 'checked'; |
|
58 | 58 | } |
59 | 59 | $options .= $this->list_input( $args, $i ); |
60 | 60 | $i++; |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | ); |
68 | 68 | |
69 | 69 | if ( $saved_term == $term->slug ) { |
70 | - $args['checked'] = 'checked'; |
|
70 | + $args[ 'checked' ] = 'checked'; |
|
71 | 71 | } |
72 | 72 | $options .= $this->list_input( $args, $i ); |
73 | 73 | $i++; |