WebDevStudios / CMB2

includes/CMB2_Ajax.php

Doc Comments -1 removed lines

@@ -215,7 +215,6 @@
 	 *
 	 * @since  1.3.0
 	 * @param  string  $meta_key   Postmeta's key
-	 * @param  mixed   $meta_value (Optional) value of the postmeta to be saved
 	 */
 	protected function cache_action( $meta_key ) {
 		$func_args = func_get_args();

Spacing +18 added lines, -18 removed lines

@@ -53,12 +53,12 @@ 
 	public function oembed_handler() {
 
 		// Verify our nonce
-		if ( ! ( isset( $_REQUEST['cmb2_ajax_nonce'], $_REQUEST['oembed_url'] ) && wp_verify_nonce( $_REQUEST['cmb2_ajax_nonce'], 'ajax_nonce' ) ) ) {
+		if ( ! ( isset( $_REQUEST[ 'cmb2_ajax_nonce' ], $_REQUEST[ 'oembed_url' ] ) && wp_verify_nonce( $_REQUEST[ 'cmb2_ajax_nonce' ], 'ajax_nonce' ) ) ) {
 			die();
 		}
 
 		// Sanitize our search string
-		$oembed_string = sanitize_text_field( $_REQUEST['oembed_url'] );
+		$oembed_string = sanitize_text_field( $_REQUEST[ 'oembed_url' ] );
 
 		// Send back error if empty
 		if ( empty( $oembed_string ) ) {
@@ -66,7 +66,7 @@ 
 		}
 
 		// Set width of embed
-		$embed_width = isset( $_REQUEST['oembed_width'] ) && intval( $_REQUEST['oembed_width'] ) < 640 ? intval( $_REQUEST['oembed_width'] ) : '640';
+		$embed_width = isset( $_REQUEST[ 'oembed_width' ] ) && intval( $_REQUEST[ 'oembed_width' ] ) < 640 ? intval( $_REQUEST[ 'oembed_width' ] ) : '640';
 
 		// Set url
 		$oembed_url = esc_url( $oembed_string );
@@ -79,10 +79,10 @@ 
 		// Get embed code (or fallback link)
 		$html = $this->get_oembed( array(
 			'url'         => $oembed_url,
-			'object_id'   => $_REQUEST['object_id'],
-			'object_type' => isset( $_REQUEST['object_type'] ) ? $_REQUEST['object_type'] : 'post',
+			'object_id'   => $_REQUEST[ 'object_id' ],
+			'object_type' => isset( $_REQUEST[ 'object_type' ] ) ? $_REQUEST[ 'object_type' ] : 'post',
 			'oembed_args' => $embed_args,
-			'field_id'    => $_REQUEST['field_id'],
+			'field_id'    => $_REQUEST[ 'field_id' ],
 		) );
 
 		wp_send_json_success( $html );
@@ -98,10 +98,10 @@ 
 
 		global $wp_embed;
 
-		$oembed_url = esc_url( $args['url'] );
+		$oembed_url = esc_url( $args[ 'url' ] );
 
 		// Sanitize object_id
-		$this->object_id = is_numeric( $args['object_id'] ) ? absint( $args['object_id'] ) : sanitize_text_field( $args['object_id'] );
+		$this->object_id = is_numeric( $args[ 'object_id' ] ) ? absint( $args[ 'object_id' ] ) : sanitize_text_field( $args[ 'object_id' ] );
 
 		$args = wp_parse_args( $args, array(
 			'object_type' => 'post',
@@ -109,7 +109,7 @@ 
 			'field_id'    => false,
 		) );
 
-		$this->embed_args =& $args;
+		$this->embed_args = & $args;
 
 		/**
 		 * Set the post_ID so oEmbed won't fail
@@ -118,9 +118,9 @@ 
 		$wp_embed->post_ID = $this->object_id;
 
 		// Special scenario if NOT a post object
-		if ( isset( $args['object_type'] ) && 'post' != $args['object_type'] ) {
+		if ( isset( $args[ 'object_type' ] ) && 'post' != $args[ 'object_type' ] ) {
 
-			if ( 'options-page' == $args['object_type'] ) {
+			if ( 'options-page' == $args[ 'object_type' ] ) {
 
 				// Bogus id to pass some numeric checks. Issue with a VERY large WP install?
 				$wp_embed->post_ID = 1987645321;
@@ -128,7 +128,7 @@ 
 
 			// Ok, we need to hijack the oembed cache system
 			$this->hijack = true;
-			$this->object_type = $args['object_type'];
+			$this->object_type = $args[ 'object_type' ];
 
 			// Gets ombed cache from our object's meta (vs postmeta)
 			add_filter( 'get_post_metadata', array( $this, 'hijack_oembed_cache_get' ), 10, 3 );
@@ -140,7 +140,7 @@ 
 
 		$embed_args = '';
 
-		foreach ( $args['oembed_args'] as $key => $val ) {
+		foreach ( $args[ 'oembed_args' ] as $key => $val ) {
 			$embed_args .= " $key=\"$val\"";
 		}
 
@@ -152,7 +152,7 @@ 
 
 		// Send back our embed
 		if ( $check_embed && $check_embed != $fallback ) {
-			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>';
+			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>';
 		}
 
 		// Otherwise, send back error info that no oEmbeds were found
@@ -219,15 +219,15 @@ 
 	 */
 	protected function cache_action( $meta_key ) {
 		$func_args = func_get_args();
-		$action    = isset( $func_args[1] ) ? 'update' : 'get';
+		$action    = isset( $func_args[ 1 ] ) ? 'update' : 'get';
 
 		if ( 'options-page' === $this->object_type ) {
 
 			$args = array( $meta_key );
 
 			if ( 'update' === $action ) {
-				$args[] = $func_args[1];
-				$args[] = true;
+				$args[ ] = $func_args[ 1 ];
+				$args[ ] = true;
 			}
 
 			// Cache the result to our options
@@ -235,7 +235,7 @@ 
 		} else {
 
 			$args = array( $this->object_type, $this->object_id, $meta_key );
-			$args[] = 'update' === $action ? $func_args : true;
+			$args[ ] = 'update' === $action ? $func_args : true;
 
 			// Cache the result to our metadata
 			$status = call_user_func_array( $action . '_metadata', $args );

includes/CMB2_Field.php

Spacing +59 added lines, -59 removed lines

@@ -93,16 +93,16 @@ 
 	 */
 	public function __construct( $args ) {
 
-		if ( ! empty( $args['group_field'] ) ) {
-			$this->group       = $args['group_field'];
+		if ( ! empty( $args[ 'group_field' ] ) ) {
+			$this->group       = $args[ 'group_field' ];
 			$this->object_id   = $this->group->object_id;
 			$this->object_type = $this->group->object_type;
 		} else {
-			$this->object_id   = isset( $args['object_id'] ) && '_' !== $args['object_id'] ? $args['object_id'] : 0;
-			$this->object_type = isset( $args['object_type'] ) ? $args['object_type'] : 'post';
+			$this->object_id   = isset( $args[ 'object_id' ] ) && '_' !== $args[ 'object_id' ] ? $args[ 'object_id' ] : 0;
+			$this->object_type = isset( $args[ 'object_type' ] ) ? $args[ 'object_type' ] : 'post';
 		}
 
-		$this->args = $this->_set_field_defaults( $args['field_args'] );
+		$this->args = $this->_set_field_defaults( $args[ 'field_args' ] );
 
 		if ( $this->object_id ) {
 			$this->value = $this->get_data();
@@ -117,7 +117,7 @@ 
 	 * @return mixed             Value of field argument
 	 */
 	public function __call( $name, $arguments ) {
-		$key = isset( $arguments[0] ) ? $arguments[0] : false;
+		$key = isset( $arguments[ 0 ] ) ? $arguments[ 0 ] : false;
 		return $this->args( $name, $key );
 	}
 
@@ -188,9 +188,9 @@ 
 	 */
 	public function get_data( $field_id = '', $args = array() ) {
 		if ( $field_id ) {
-			$args['field_id'] = $field_id;
+			$args[ 'field_id' ] = $field_id;
 		} else if ( $this->group ) {
-			$args['field_id'] = $this->group->id();
+			$args[ 'field_id' ] = $this->group->id();
 		}
 
 		$a = $this->data_args( $args );
@@ -231,13 +231,13 @@ 
 		 *
 		 * @since 2.0.0
 		 */
-		$data = apply_filters( "cmb2_override_{$a['field_id']}_meta_value", $data, $this->object_id, $a, $this );
+		$data = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_value", $data, $this->object_id, $a, $this );
 
 		// If no override, get value normally
 		if ( 'cmb2_field_no_override_val' === $data ) {
-			$data = 'options-page' === $a['type']
-				? cmb2_options( $a['id'] )->get( $a['field_id'] )
-				: get_metadata( $a['type'], $a['id'], $a['field_id'], ( $a['single'] || $a['repeat'] ) );
+			$data = 'options-page' === $a[ 'type' ]
+				? cmb2_options( $a[ 'id' ] )->get( $a[ 'field_id' ] )
+				: get_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], ( $a[ 'single' ] || $a[ 'repeat' ] ) );
 		}
 
 		if ( $this->group ) {
@@ -259,7 +259,7 @@ 
 	public function update_data( $new_value, $single = true ) {
 		$a = $this->data_args( array( 'single' => $single ) );
 
-		$a['value'] = $a['repeat'] ? array_values( $new_value ) : $new_value;
+		$a[ 'value' ] = $a[ 'repeat' ] ? array_values( $new_value ) : $new_value;
 
 		/**
 		 * Filter whether to override saving of meta value.
@@ -295,7 +295,7 @@ 
 		 *
 		 * @since 2.0.0
 		 */
-		$override = apply_filters( "cmb2_override_{$a['field_id']}_meta_save", $override, $a, $this->args(), $this );
+		$override = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_save", $override, $a, $this->args(), $this );
 
 		// If override, return that
 		if ( null !== $override ) {
@@ -303,22 +303,22 @@ 
 		}
 
 		// Options page handling (or temp data store)
-		if ( 'options-page' === $a['type'] || empty( $a['id'] ) ) {
-			return cmb2_options( $a['id'] )->update( $a['field_id'], $a['value'], false, $a['single'] );
+		if ( 'options-page' === $a[ 'type' ] || empty( $a[ 'id' ] ) ) {
+			return cmb2_options( $a[ 'id' ] )->update( $a[ 'field_id' ], $a[ 'value' ], false, $a[ 'single' ] );
 		}
 
 		// Add metadata if not single
-		if ( ! $a['single'] ) {
-			return add_metadata( $a['type'], $a['id'], $a['field_id'], $a['value'], false );
+		if ( ! $a[ 'single' ] ) {
+			return add_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $a[ 'value' ], false );
 		}
 
 		// Delete meta if we have an empty array
-		if ( is_array( $a['value'] ) && empty( $a['value'] ) ) {
-			return delete_metadata( $a['type'], $a['id'], $a['field_id'], $this->value );
+		if ( is_array( $a[ 'value' ] ) && empty( $a[ 'value' ] ) ) {
+			return delete_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $this->value );
 		}
 
 		// Update metadata
-		return update_metadata( $a['type'], $a['id'], $a['field_id'], $a['value'] );
+		return update_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $a[ 'value' ] );
 	}
 
 	/**
@@ -368,19 +368,19 @@ 
 		 * @param array $field_args All field arguments
 		 * @param CMB2_Field object $field This field object
 		 */
-		$override = apply_filters( "cmb2_override_{$a['field_id']}_meta_remove", $override, $a, $this->args(), $this );
+		$override = apply_filters( "cmb2_override_{$a[ 'field_id' ]}_meta_remove", $override, $a, $this->args(), $this );
 
 		// If no override, remove as usual
 		if ( null !== $override ) {
 			return $override;
 		}
 		// Option page handling
-		elseif ( 'options-page' === $a['type'] || empty( $a['id'] ) ) {
-			return cmb2_options( $a['id'] )->remove( $a['field_id'] );
+		elseif ( 'options-page' === $a[ 'type' ] || empty( $a[ 'id' ] ) ) {
+			return cmb2_options( $a[ 'id' ] )->remove( $a[ 'field_id' ] );
 		}
 
 		// Remove metadata
-		return delete_metadata( $a['type'], $a['id'], $a['field_id'], $old );
+		return delete_metadata( $a[ 'type' ], $a[ 'id' ], $a[ 'field_id' ], $old );
 	}
 
 	/**
@@ -851,7 +851,7 @@ 
 
 		foreach ( $conditional_classes as $class => $condition ) {
 			if ( $condition ) {
-				$classes[] = $class;
+				$classes[ ] = $class;
 			}
 		}
 
@@ -860,7 +860,7 @@ 
 		}
 
 		if ( $added_classes ) {
-			$classes[] = esc_attr( $added_classes );
+			$classes[ ] = esc_attr( $added_classes );
 		}
 
 		/**
@@ -965,10 +965,10 @@ 
 			return $this->field_options;
 		}
 
-		$this->field_options = (array) $this->args['options'];
+		$this->field_options = (array) $this->args[ 'options' ];
 
-		if ( is_callable( $this->args['options_cb'] ) ) {
-			$options = call_user_func( $this->args['options_cb'], $this );
+		if ( is_callable( $this->args[ 'options_cb' ] ) ) {
+			$options = call_user_func( $this->args[ 'options_cb' ], $this );
 
 			if ( $options && is_array( $options ) ) {
 				$this->field_options += $options;
@@ -1011,17 +1011,17 @@ 
 			'default'           => null,
 			'select_all_button' => true,
 			'multiple'          => false,
-			'repeatable'        => isset( $args['type'] ) && 'group' == $args['type'],
+			'repeatable'        => isset( $args[ 'type' ] ) && 'group' == $args[ 'type' ],
 			'inline'            => false,
 			'on_front'          => true,
 			'show_names'        => true,
 			'date_format'       => 'm\/d\/Y',
 			'time_format'       => 'h:i A',
-			'description'       => isset( $args['desc'] ) ? $args['desc'] : '',
-			'preview_size'      => 'file' == $args['type'] ? array( 350, 350 ) : array( 50, 50 ),
+			'description'       => isset( $args[ 'desc' ] ) ? $args[ 'desc' ] : '',
+			'preview_size'      => 'file' == $args[ 'type' ] ? array( 350, 350 ) : array( 50, 50 ),
 			'render_row_cb'     => array( $this, 'render_field_callback' ),
-			'label_cb'          => 'title' != $args['type'] ? array( $this, 'label' ) : '',
-		), $args['id'], $args['type'], $this );
+			'label_cb'          => 'title' != $args[ 'type' ] ? array( $this, 'label' ) : '',
+		), $args[ 'id' ], $args[ 'type' ], $this );
 		 
 		// Set up blank or default values for empty ones
 		$args = wp_parse_args( $args, $defaults );
@@ -1036,51 +1036,51 @@ 
 		$args = apply_filters( 'cmb2_field_arguments_raw', $args, $this );
 
 		// Allow a filter override of the default value
-		$args['default']    = apply_filters( 'cmb2_default_filter', $args['default'], $this );
-		$args['repeatable'] = $args['repeatable'] && ! $this->repeatable_exception( $args['type'] );
-		$args['inline']     = $args['inline'] || false !== stripos( $args['type'], '_inline' );
+		$args[ 'default' ]    = apply_filters( 'cmb2_default_filter', $args[ 'default' ], $this );
+		$args[ 'repeatable' ] = $args[ 'repeatable' ] && ! $this->repeatable_exception( $args[ 'type' ] );
+		$args[ 'inline' ]     = $args[ 'inline' ] || false !== stripos( $args[ 'type' ], '_inline' );
 
 		// options param can be passed a callback as well
-		if ( is_callable( $args['options'] ) ) {
-			$args['options_cb'] = $args['options'];
-			$args['options'] = array();
+		if ( is_callable( $args[ 'options' ] ) ) {
+			$args[ 'options_cb' ] = $args[ 'options' ];
+			$args[ 'options' ] = array();
 		}
 
-		$args['options']    = 'group' == $args['type'] ? wp_parse_args( $args['options'], array(
+		$args[ 'options' ] = 'group' == $args[ 'type' ] ? wp_parse_args( $args[ 'options' ], array(
 			'add_button'    => __( 'Add Group', 'cmb2' ),
 			'remove_button' => __( 'Remove Group', 'cmb2' ),
-		) ) : $args['options'];
+		) ) : $args[ 'options' ];
 
-		$args['_id']        = $args['id'];
-		$args['_name']      = $args['id'];
+		$args[ '_id' ]        = $args[ 'id' ];
+		$args[ '_name' ]      = $args[ 'id' ];
 
 		if ( $this->group ) {
 
-			$args['id']    = $this->group->args( 'id' ) . '_' . $this->group->index . '_' . $args['id'];
-			$args['_name'] = $this->group->args( 'id' ) . '[' . $this->group->index . '][' . $args['_name'] . ']';
+			$args[ 'id' ]    = $this->group->args( 'id' ) . '_' . $this->group->index . '_' . $args[ 'id' ];
+			$args[ '_name' ] = $this->group->args( 'id' ) . '[' . $this->group->index . '][' . $args[ '_name' ] . ']';
 		}
 
-		if ( 'wysiwyg' == $args['type'] ) {
-			$args['id'] = strtolower( str_ireplace( '-', '_', $args['id'] ) );
-			$args['options']['textarea_name'] = $args['_name'];
+		if ( 'wysiwyg' == $args[ 'type' ] ) {
+			$args[ 'id' ] = strtolower( str_ireplace( '-', '_', $args[ 'id' ] ) );
+			$args[ 'options' ][ 'textarea_name' ] = $args[ '_name' ];
 		}
 
 		$option_types = apply_filters( 'cmb2_all_or_nothing_types', array( 'select', 'radio', 'radio_inline', 'taxonomy_select', 'taxonomy_radio', 'taxonomy_radio_inline' ), $this );
 
-		if ( in_array( $args['type'], $option_types, true ) ) {
+		if ( in_array( $args[ 'type' ], $option_types, true ) ) {
 
-			$args['show_option_none'] = isset( $args['show_option_none'] ) ? $args['show_option_none'] : null;
-			$args['show_option_none'] = true === $args['show_option_none'] ? __( 'None', 'cmb2' ) : $args['show_option_none'];
+			$args[ 'show_option_none' ] = isset( $args[ 'show_option_none' ] ) ? $args[ 'show_option_none' ] : null;
+			$args[ 'show_option_none' ] = true === $args[ 'show_option_none' ] ? __( 'None', 'cmb2' ) : $args[ 'show_option_none' ];
 
-			if ( null === $args['show_option_none'] ) {
-				$off_by_default = in_array( $args['type'], array( 'select', 'radio', 'radio_inline' ), true );
-				$args['show_option_none'] = $off_by_default ? false : __( 'None', 'cmb2' );
+			if ( null === $args[ 'show_option_none' ] ) {
+				$off_by_default = in_array( $args[ 'type' ], array( 'select', 'radio', 'radio_inline' ), true );
+				$args[ 'show_option_none' ] = $off_by_default ? false : __( 'None', 'cmb2' );
 			}
 
 		}
 
-		$args['has_supporting_data'] = in_array(
-			$args['type'],
+		$args[ 'has_supporting_data' ] = in_array(
+			$args[ 'type' ],
 			array(
 				// CMB2_Sanitize::_save_file_id_value()/CMB2_Sanitize::_get_group_file_value_array()
 				'file',
@@ -1106,7 +1106,7 @@ 
 	 * @param array $attrs Array of attributes to update
 	 */
 	public function maybe_set_attributes( $attrs = array() ) {
-		return wp_parse_args( $this->args['attributes'], $attrs );
+		return wp_parse_args( $this->args[ 'attributes' ], $attrs );
 	}
 
 }