@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | foreach ( CMB2_REST::$boxes as $this->rest_box ) { |
| 71 | 71 | if ( $this->rest_box->rest_read ) { |
| 72 | 72 | $rest_box = $this->get_rest_box(); |
| 73 | - $boxes_data[ $this->rest_box->cmb->cmb_id ] = $this->server->response_to_data( $rest_box, isset( $_GET['_embed'] ) ); |
|
| 73 | + $boxes_data[ $this->rest_box->cmb->cmb_id ] = $this->server->response_to_data( $rest_box, isset( $_GET[ '_embed' ] ) ); |
|
| 74 | 74 | } |
| 75 | 75 | } |
| 76 | 76 | |
@@ -110,9 +110,9 @@ discard block |
||
| 110 | 110 | |
| 111 | 111 | $boxes_data = $cmb->meta_box; |
| 112 | 112 | |
| 113 | - if ( isset( $_REQUEST['_rendered'] ) && '/cmb2/v1/boxes' !== CMB2_REST_Controller::get_intial_route() ) { |
|
| 114 | - $boxes_data['form_open'] = $this->get_cb_results( array( $cmb, 'render_form_open' ) ); |
|
| 115 | - $boxes_data['form_close'] = $this->get_cb_results( array( $cmb, 'render_form_close' ) ); |
|
| 113 | + if ( isset( $_REQUEST[ '_rendered' ] ) && '/cmb2/v1/boxes' !== CMB2_REST_Controller::get_intial_route() ) { |
|
| 114 | + $boxes_data[ 'form_open' ] = $this->get_cb_results( array( $cmb, 'render_form_open' ) ); |
|
| 115 | + $boxes_data[ 'form_close' ] = $this->get_cb_results( array( $cmb, 'render_form_close' ) ); |
|
| 116 | 116 | |
| 117 | 117 | global $wp_scripts, $wp_styles; |
| 118 | 118 | $before_css = $wp_styles->queue; |
@@ -120,15 +120,15 @@ discard block |
||
| 120 | 120 | |
| 121 | 121 | CMB2_JS::enqueue(); |
| 122 | 122 | |
| 123 | - $boxes_data['js_dependencies'] = array_values( array_diff( $wp_scripts->queue, $before_js ) ); |
|
| 124 | - $boxes_data['css_dependencies'] = array_values( array_diff( $wp_styles->queue, $before_css ) ); |
|
| 123 | + $boxes_data[ 'js_dependencies' ] = array_values( array_diff( $wp_scripts->queue, $before_js ) ); |
|
| 124 | + $boxes_data[ 'css_dependencies' ] = array_values( array_diff( $wp_styles->queue, $before_css ) ); |
|
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | // TODO: look into 'embed' parameter. |
| 128 | 128 | // http://demo.wp-api.org/wp-json/wp/v2/posts?_embed |
| 129 | - unset( $boxes_data['fields'] ); |
|
| 129 | + unset( $boxes_data[ 'fields' ] ); |
|
| 130 | 130 | // Handle callable properties. |
| 131 | - unset( $boxes_data['show_on_cb'] ); |
|
| 131 | + unset( $boxes_data[ 'show_on_cb' ] ); |
|
| 132 | 132 | |
| 133 | 133 | $response = rest_ensure_response( $boxes_data ); |
| 134 | 134 | |
@@ -67,11 +67,11 @@ discard block |
||
| 67 | 67 | |
| 68 | 68 | $fields = array(); |
| 69 | 69 | foreach ( $this->rest_box->cmb->prop( 'fields', array() ) as $field ) { |
| 70 | - $field_id = $field['id']; |
|
| 70 | + $field_id = $field[ 'id' ]; |
|
| 71 | 71 | $rest_field = $this->get_rest_field( $field_id ); |
| 72 | 72 | |
| 73 | 73 | if ( ! is_wp_error( $rest_field ) ) { |
| 74 | - $fields[ $field_id ] = $this->server->response_to_data( $rest_field, isset( $_GET['_embed'] ) ); |
|
| 74 | + $fields[ $field_id ] = $this->server->response_to_data( $rest_field, isset( $_GET[ '_embed' ] ) ); |
|
| 75 | 75 | } else { |
| 76 | 76 | $fields[ $field_id ] = array( 'error' => $rest_field->get_error_message() ); |
| 77 | 77 | } |
@@ -165,11 +165,11 @@ discard block |
||
| 165 | 165 | } |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | - if ( isset( $_REQUEST['_rendered'] ) ) { |
|
| 169 | - $field_data['rendered'] = $rendered; |
|
| 168 | + if ( isset( $_REQUEST[ '_rendered' ] ) ) { |
|
| 169 | + $field_data[ 'rendered' ] = $rendered; |
|
| 170 | 170 | } |
| 171 | 171 | |
| 172 | - $field_data['value'] = $field->get_data(); |
|
| 172 | + $field_data[ 'value' ] = $field->get_data(); |
|
| 173 | 173 | |
| 174 | 174 | return $field_data; |
| 175 | 175 | } |
@@ -190,14 +190,14 @@ discard block |
||
| 190 | 190 | ); |
| 191 | 191 | |
| 192 | 192 | // TODO ? |
| 193 | - error_log( '$this->request[context]: '. print_r( $this->request['context'], true ) ); |
|
| 194 | - error_log( 'CMB2_REST_Controller::get_intial_route(): '. print_r( CMB2_REST_Controller::get_intial_route(), true ) ); |
|
| 195 | - error_log( '$match: '. print_r( 'box_read' === CMB2_REST_Controller::get_intial_request_type(), true ) ); |
|
| 193 | + error_log( '$this->request[context]: ' . print_r( $this->request[ 'context' ], true ) ); |
|
| 194 | + error_log( 'CMB2_REST_Controller::get_intial_route(): ' . print_r( CMB2_REST_Controller::get_intial_route(), true ) ); |
|
| 195 | + error_log( '$match: ' . print_r( 'box_read' === CMB2_REST_Controller::get_intial_request_type(), true ) ); |
|
| 196 | 196 | |
| 197 | 197 | |
| 198 | 198 | // Don't embed boxes when looking at boxes route. |
| 199 | 199 | if ( '/cmb2/v1/boxes' !== CMB2_REST_Controller::get_intial_route() ) { |
| 200 | - $links['up']['embeddable'] = true; |
|
| 200 | + $links[ 'up' ][ 'embeddable' ] = true; |
|
| 201 | 201 | } |
| 202 | 202 | |
| 203 | 203 | return $links; |
@@ -53,12 +53,12 @@ discard block |
||
| 53 | 53 | public function oembed_handler() { |
| 54 | 54 | |
| 55 | 55 | // Verify our nonce |
| 56 | - if ( ! ( isset( $_REQUEST['cmb2_ajax_nonce'], $_REQUEST['oembed_url'] ) && wp_verify_nonce( $_REQUEST['cmb2_ajax_nonce'], 'ajax_nonce' ) ) ) { |
|
| 56 | + if ( ! ( isset( $_REQUEST[ 'cmb2_ajax_nonce' ], $_REQUEST[ 'oembed_url' ] ) && wp_verify_nonce( $_REQUEST[ 'cmb2_ajax_nonce' ], 'ajax_nonce' ) ) ) { |
|
| 57 | 57 | die(); |
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | // Sanitize our search string |
| 61 | - $oembed_string = sanitize_text_field( $_REQUEST['oembed_url'] ); |
|
| 61 | + $oembed_string = sanitize_text_field( $_REQUEST[ 'oembed_url' ] ); |
|
| 62 | 62 | |
| 63 | 63 | // Send back error if empty |
| 64 | 64 | if ( empty( $oembed_string ) ) { |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | // Set width of embed |
| 69 | - $embed_width = isset( $_REQUEST['oembed_width'] ) && intval( $_REQUEST['oembed_width'] ) < 640 ? intval( $_REQUEST['oembed_width'] ) : '640'; |
|
| 69 | + $embed_width = isset( $_REQUEST[ 'oembed_width' ] ) && intval( $_REQUEST[ 'oembed_width' ] ) < 640 ? intval( $_REQUEST[ 'oembed_width' ] ) : '640'; |
|
| 70 | 70 | |
| 71 | 71 | // Set url |
| 72 | 72 | $oembed_url = esc_url( $oembed_string ); |
@@ -79,10 +79,10 @@ discard block |
||
| 79 | 79 | // Get embed code (or fallback link) |
| 80 | 80 | $html = $this->get_oembed( array( |
| 81 | 81 | 'url' => $oembed_url, |
| 82 | - 'object_id' => $_REQUEST['object_id'], |
|
| 83 | - 'object_type' => isset( $_REQUEST['object_type'] ) ? $_REQUEST['object_type'] : 'post', |
|
| 82 | + 'object_id' => $_REQUEST[ 'object_id' ], |
|
| 83 | + 'object_type' => isset( $_REQUEST[ 'object_type' ] ) ? $_REQUEST[ 'object_type' ] : 'post', |
|
| 84 | 84 | 'oembed_args' => $embed_args, |
| 85 | - 'field_id' => $_REQUEST['field_id'], |
|
| 85 | + 'field_id' => $_REQUEST[ 'field_id' ], |
|
| 86 | 86 | ) ); |
| 87 | 87 | |
| 88 | 88 | wp_send_json_success( $html ); |
@@ -98,10 +98,10 @@ discard block |
||
| 98 | 98 | |
| 99 | 99 | global $wp_embed; |
| 100 | 100 | |
| 101 | - $oembed_url = esc_url( $args['url'] ); |
|
| 101 | + $oembed_url = esc_url( $args[ 'url' ] ); |
|
| 102 | 102 | |
| 103 | 103 | // Sanitize object_id |
| 104 | - $this->object_id = is_numeric( $args['object_id'] ) ? absint( $args['object_id'] ) : sanitize_text_field( $args['object_id'] ); |
|
| 104 | + $this->object_id = is_numeric( $args[ 'object_id' ] ) ? absint( $args[ 'object_id' ] ) : sanitize_text_field( $args[ 'object_id' ] ); |
|
| 105 | 105 | |
| 106 | 106 | $args = wp_parse_args( $args, array( |
| 107 | 107 | 'object_type' => 'post', |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | 'field_id' => false, |
| 110 | 110 | ) ); |
| 111 | 111 | |
| 112 | - $this->embed_args =& $args; |
|
| 112 | + $this->embed_args = & $args; |
|
| 113 | 113 | |
| 114 | 114 | /** |
| 115 | 115 | * Set the post_ID so oEmbed won't fail |
@@ -118,9 +118,9 @@ discard block |
||
| 118 | 118 | $wp_embed->post_ID = $this->object_id; |
| 119 | 119 | |
| 120 | 120 | // Special scenario if NOT a post object |
| 121 | - if ( isset( $args['object_type'] ) && 'post' != $args['object_type'] ) { |
|
| 121 | + if ( isset( $args[ 'object_type' ] ) && 'post' != $args[ 'object_type' ] ) { |
|
| 122 | 122 | |
| 123 | - if ( 'options-page' == $args['object_type'] ) { |
|
| 123 | + if ( 'options-page' == $args[ 'object_type' ] ) { |
|
| 124 | 124 | |
| 125 | 125 | // Bogus id to pass some numeric checks. Issue with a VERY large WP install? |
| 126 | 126 | $wp_embed->post_ID = 1987645321; |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | |
| 129 | 129 | // Ok, we need to hijack the oembed cache system |
| 130 | 130 | $this->hijack = true; |
| 131 | - $this->object_type = $args['object_type']; |
|
| 131 | + $this->object_type = $args[ 'object_type' ]; |
|
| 132 | 132 | |
| 133 | 133 | // Gets ombed cache from our object's meta (vs postmeta) |
| 134 | 134 | add_filter( 'get_post_metadata', array( $this, 'hijack_oembed_cache_get' ), 10, 3 ); |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | |
| 141 | 141 | $embed_args = ''; |
| 142 | 142 | |
| 143 | - foreach ( $args['oembed_args'] as $key => $val ) { |
|
| 143 | + foreach ( $args[ 'oembed_args' ] as $key => $val ) { |
|
| 144 | 144 | $embed_args .= " $key=\"$val\""; |
| 145 | 145 | } |
| 146 | 146 | |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | |
| 153 | 153 | // Send back our embed |
| 154 | 154 | if ( $check_embed && $check_embed != $fallback ) { |
| 155 | - return '<div class="embed-status">' . $check_embed . '<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button" rel="' . $args['field_id'] . '">' . __( 'Remove Embed', 'cmb2' ) . '</a></p></div>'; |
|
| 155 | + return '<div class="embed-status">' . $check_embed . '<p class="cmb2-remove-wrapper"><a href="#" class="cmb2-remove-file-button" rel="' . $args[ 'field_id' ] . '">' . __( 'Remove Embed', 'cmb2' ) . '</a></p></div>'; |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | // Otherwise, send back error info that no oEmbeds were found |
@@ -219,15 +219,15 @@ discard block |
||
| 219 | 219 | */ |
| 220 | 220 | protected function cache_action( $meta_key ) { |
| 221 | 221 | $func_args = func_get_args(); |
| 222 | - $action = isset( $func_args[1] ) ? 'update' : 'get'; |
|
| 222 | + $action = isset( $func_args[ 1 ] ) ? 'update' : 'get'; |
|
| 223 | 223 | |
| 224 | 224 | if ( 'options-page' === $this->object_type ) { |
| 225 | 225 | |
| 226 | 226 | $args = array( $meta_key ); |
| 227 | 227 | |
| 228 | 228 | if ( 'update' === $action ) { |
| 229 | - $args[] = $func_args[1]; |
|
| 230 | - $args[] = true; |
|
| 229 | + $args[ ] = $func_args[ 1 ]; |
|
| 230 | + $args[ ] = true; |
|
| 231 | 231 | } |
| 232 | 232 | |
| 233 | 233 | // Cache the result to our options |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | } else { |
| 236 | 236 | |
| 237 | 237 | $args = array( $this->object_type, $this->object_id, $meta_key ); |
| 238 | - $args[] = 'update' === $action ? $func_args : true; |
|
| 238 | + $args[ ] = 'update' === $action ? $func_args : true; |
|
| 239 | 239 | |
| 240 | 240 | // Cache the result to our metadata |
| 241 | 241 | $status = call_user_func_array( $action . '_metadata', $args ); |
@@ -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 | |
@@ -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 | } |
@@ -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++; |