WebDevStudios / CMB2

includes/CMB2_Sanitize.php

Spacing +18 added lines, -18 removed lines

@@ -172,7 +172,7 @@ 
 
 		global $wp_locale;
 
-		$search = array( $wp_locale->number_format['thousands_sep'], $wp_locale->number_format['decimal_point'] );
+		$search = array( $wp_locale->number_format[ 'thousands_sep' ], $wp_locale->number_format[ 'decimal_point' ] );
 		$replace = array( '', '.' );
 
 		// for repeatable
@@ -193,15 +193,15 @@ 
 	 * @return string Timestring
 	 */
 	public function text_date_timestamp() {
-		if (is_array($this->value)) {
-			$returnValue = [];
-			foreach ($this->value as $value) {
-				$date_object   = DateTime::createFromFormat($this->field->args['date_format'], $value);
-				$returnValue[] = $date_object ? $date_object->setTime(0, 0, 0)->getTimeStamp() : '';
+		if ( is_array( $this->value ) ) {
+			$returnValue = [ ];
+			foreach ( $this->value as $value ) {
+				$date_object   = DateTime::createFromFormat( $this->field->args[ 'date_format' ], $value );
+				$returnValue[ ] = $date_object ? $date_object->setTime( 0, 0, 0 )->getTimeStamp() : '';
 			}
 		} else {
-			$date_object = DateTime::createFromFormat($this->field->args['date_format'], $this->value);
-			$returnValue = $date_object ? $date_object->setTime(0, 0, 0)->getTimeStamp() : '';
+			$date_object = DateTime::createFromFormat( $this->field->args[ 'date_format' ], $this->value );
+			$returnValue = $date_object ? $date_object->setTime( 0, 0, 0 )->getTimeStamp() : '';
 		}
 
  		return $returnValue;
@@ -224,8 +224,8 @@ 
 			return $repeat_value;
 		}
 
-		if ( isset( $this->value['date'], $this->value['time'] ) ) {
-			$this->value = $this->field->get_timestamp_from_value( $this->value['date'] . ' ' . $this->value['time'] );
+		if ( isset( $this->value[ 'date' ], $this->value[ 'time' ] ) ) {
+			$this->value = $this->field->get_timestamp_from_value( $this->value[ 'date' ] . ' ' . $this->value[ 'time' ] );
 		}
 
 		if ( $tz_offset = $this->field->field_timezone_offset() ) {
@@ -263,7 +263,7 @@ 
 		$tzstring = null;
 
 		if ( is_array( $this->value ) && array_key_exists( 'timezone', $this->value ) ) {
-			$tzstring = $this->value['timezone'];
+			$tzstring = $this->value[ 'timezone' ];
 		}
 
 		if ( empty( $tzstring ) ) {
@@ -283,8 +283,8 @@ 
 			$tzstring = false !== $tzstring ? $tzstring : timezone_name_from_abbr( '', 0, 0 );
 		}
 
-		$full_format = $this->field->args['date_format'] . ' ' . $this->field->args['time_format'];
-		$full_date   = $this->value['date'] . ' ' . $this->value['time'];
+		$full_format = $this->field->args[ 'date_format' ] . ' ' . $this->field->args[ 'time_format' ];
+		$full_date   = $this->value[ 'date' ] . ' ' . $this->value[ 'time' ];
 
 		try {
 
@@ -307,7 +307,7 @@ 
 			} else {
 				// Save the utc timestamp supporting field
 				if ( $repeat ) {
-					$utc_values[ $utc_key ][] = $utc_stamp;
+					$utc_values[ $utc_key ][ ] = $utc_stamp;
 				} else {
 					$this->_save_utc_value( $utc_key, $utc_stamp );
 				}
@@ -418,10 +418,10 @@ 
 	 */
 	public function _new_supporting_field( $new_field_id ) {
 		$args = $this->field->args();
-		unset( $args['_id'], $args['_name'] );
+		unset( $args[ '_id' ], $args[ '_name' ] );
 
-		$args['id'] = $new_field_id;
-		$args['sanitization_cb'] = false;
+		$args[ 'id' ] = $new_field_id;
+		$args[ 'sanitization_cb' ] = false;
 
 		// And get new field object
 		return new CMB2_Field( array(
@@ -451,7 +451,7 @@ 
 			if ( $this->value ) {
 				$val = $this->$method( true );
 				if ( ! empty( $val ) ) {
-					$new_value[] = $val;
+					$new_value[ ] = $val;
 				}
 			}
 		}

includes/CMB2_Types.php

Spacing +63 added lines, -63 removed lines

@@ -200,8 +200,8 @@ 
 	 */
 	public function concat_items( $args = array() ) {
 
-		$method = isset( $args['method'] ) ? $args['method'] : 'select_option';
-		unset( $args['method'] );
+		$method = isset( $args[ 'method' ] ) ? $args[ 'method' ] : 'select_option';
+		unset( $args[ 'method' ] );
 
 		$value = $this->field->escaped_value()
 			? $this->field->escaped_value()
@@ -219,12 +219,12 @@ 
 			// Clone args & modify for just this item
 			$a = $args;
 
-			$a['value'] = $opt_value;
-			$a['label'] = $opt_label;
+			$a[ 'value' ] = $opt_value;
+			$a[ 'label' ] = $opt_label;
 
 			// Check if this option is the value of the input
 			if ( $value == $opt_value ) {
-				$a['checked'] = 'checked';
+				$a[ 'checked' ] = 'checked';
 			}
 
 			$concatenated_items .= $this->$method( $a, $i++ );
@@ -240,7 +240,7 @@ 
 	 * @return string       Generated option element html
 	 */
 	public function select_option( $args = array() ) {
-		return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args['value'], selected( isset( $args['checked'] ) && $args['checked'], true, false ), $args['label'] ) . "\n";
+		return sprintf( "\t" . '<option value="%s" %s>%s</option>', $args[ 'value' ], selected( isset( $args[ 'checked' ] ) && $args[ 'checked' ], true, false ), $args[ 'label' ] ) . "\n";
 	}
 
 	/**
@@ -260,7 +260,7 @@ 
 			'label' => '',
 		) );
 
-		return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a['id'], $a['label'] );
+		return sprintf( "\t" . '<li><input%s/> <label for="%s">%s</label></li>' . "\n", $this->concat_attrs( $a, array( 'label' ) ), $a[ 'id' ], $a[ 'label' ] );
 	}
 
 	/**
@@ -272,10 +272,10 @@ 
 	 */
 	public function list_input_checkbox( $args, $i ) {
 		$saved_value = $this->field->escaped_value();
-		if ( is_array( $saved_value ) && in_array( $args['value'], $saved_value ) ) {
-			$args['checked'] = 'checked';
+		if ( is_array( $saved_value ) && in_array( $args[ 'value' ], $saved_value ) ) {
+			$args[ 'checked' ] = 'checked';
 		}
-		$args['type'] = 'checkbox';
+		$args[ 'type' ] = 'checkbox';
 		return $this->list_input( $args, $i );
 	}
 
@@ -426,11 +426,11 @@ 
 			'js_dependencies' => array(),
 		) );
 
-		if ( ! empty( $a['js_dependencies'] ) ) {
-			CMB2_JS::add_dependencies( $a['js_dependencies'] );
+		if ( ! empty( $a[ 'js_dependencies' ] ) ) {
+			CMB2_JS::add_dependencies( $a[ 'js_dependencies' ] );
 		}
 
-		return sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a['desc'] );
+		return sprintf( '<input%s/>%s', $this->concat_attrs( $a, array( 'desc', 'js_dependencies' ) ), $a[ 'desc' ] );
 	}
 
 	/**
@@ -449,7 +449,7 @@ 
 			'value' => $this->field->escaped_value( 'esc_textarea' ),
 			'desc'  => $this->_desc( true ),
 		) );
-		return sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attrs( $a, array( 'desc', 'value' ) ), $a['value'], $a['desc'] );
+		return sprintf( '<textarea%s>%s</textarea>%s', $this->concat_attrs( $a, array( 'desc', 'value' ) ), $a[ 'value' ], $a[ 'desc' ] );
 	}
 
 	/**
@@ -500,8 +500,8 @@ 
 			'options' => $this->field->options(),
 		) );
 
-		wp_editor( $a['value'], $a['id'], $a['options'] );
-		echo $a['desc'];
+		wp_editor( $a[ 'value' ], $a[ 'id' ], $a[ 'options' ] );
+		echo $a[ 'desc' ];
 	}
 
 	public function text_date( $args = array() ) {
@@ -512,10 +512,10 @@ 
 			'value'           => $this->field->get_timestamp_format(),
 			'desc'            => $this->_desc(),
 			'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker' ),
- 			'data-datepicker' => '{ "dateFormat": "' . $dateFormat  . '" }'
+ 			'data-datepicker' => '{ "dateFormat": "' . $dateFormat . '" }'
 		) );
 
-		if ( false === strpos( $args['class'], 'timepicker' ) ) {
+		if ( false === strpos( $args[ 'class' ], 'timepicker' ) ) {
 			$this->parse_picker_options( 'date' );
 		}
 
@@ -525,7 +525,7 @@ 
 	// Alias for text_date
 	public function text_date_timestamp( $args = array() ) {
  		$dateFormat = cmb2_utils()->php_to_js_dateformat( $this->field->args( 'date_format' ) );
- 		$args['data-datepicker'] = '{ "dateFormat": "' . $dateFormat  . '" }';
+ 		$args[ 'data-datepicker' ] = '{ "dateFormat": "' . $dateFormat . '" }';
 
 		return $this->text_date( $args );
 	}
@@ -550,34 +550,34 @@ 
 			'timepicker' => array(),
 		) );
 
-		if ( empty( $args['value'] ) ) {
-			$args['value'] = $this->field->escaped_value();
+		if ( empty( $args[ 'value' ] ) ) {
+			$args[ 'value' ] = $this->field->escaped_value();
 			// This will be used if there is a select_timezone set for this field
 			$tz_offset = $this->field->field_timezone_offset();
 			if ( ! empty( $tz_offset ) ) {
-				$args['value'] -= $tz_offset;
+				$args[ 'value' ] -= $tz_offset;
 			}
 		}
 
-		$has_good_value = ! empty( $args['value'] ) && ! is_array( $args['value'] );
+		$has_good_value = ! empty( $args[ 'value' ] ) && ! is_array( $args[ 'value' ] );
 
-		$date_args = wp_parse_args( $args['datepicker'], array(
+		$date_args = wp_parse_args( $args[ 'datepicker' ], array(
 			'class' => 'cmb2-text-small cmb2-datepicker',
 			'name'  => $this->_name( '[date]' ),
 			'id'    => $this->_id( '_date' ),
-			'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args['value'] ) : '',
+			'value' => $has_good_value ? $this->field->get_timestamp_format( 'date_format', $args[ 'value' ] ) : '',
 			'desc'  => '',
 		) );
 
 		// Let's get the date-format, and set it up as a data attr for the field.
 		$date_args = $this->parse_picker_options( 'date', $date_args );
 
-		$time_args = wp_parse_args( $args['timepicker'], array(
+		$time_args = wp_parse_args( $args[ 'timepicker' ], array(
 			'class' => 'cmb2-timepicker text-time',
 			'name'  => $this->_name( '[time]' ),
 			'id'    => $this->_id( '_time' ),
-			'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args['value'] ) : '',
-			'desc'  => $args['desc'],
+			'value' => $has_good_value ? $this->field->get_timestamp_format( 'time_format', $args[ 'value' ] ) : '',
+			'desc'  => $args[ 'desc' ],
 			'js_dependencies' => array( 'jquery-ui-core', 'jquery-ui-datepicker', 'jquery-ui-datetimepicker' ),
 		) );
 
@@ -595,12 +595,12 @@ 
 			'select_timezone'         => array(),
 		) );
 
-		$args['value'] = $this->field->escaped_value();
-		if ( is_array( $args['value'] ) ) {
-			$args['value'] = '';
+		$args[ 'value' ] = $this->field->escaped_value();
+		if ( is_array( $args[ 'value' ] ) ) {
+			$args[ 'value' ] = '';
 		}
 
-		$datetime = maybe_unserialize( $args['value'] );
+		$datetime = maybe_unserialize( $args[ 'value' ] );
 		$value = $tzstring = '';
 
 		if ( $datetime && $datetime instanceof DateTime ) {
@@ -609,24 +609,24 @@ 
 			$value    = $datetime->getTimestamp();
 		}
 
-		$timestamp_args = wp_parse_args( $args['text_datetime_timestamp'], array(
+		$timestamp_args = wp_parse_args( $args[ 'text_datetime_timestamp' ], array(
 			'desc'  => '',
 			'value' => $value,
 		) );
 
-		$timezone_args = wp_parse_args( $args['select_timezone'], array(
+		$timezone_args = wp_parse_args( $args[ 'select_timezone' ], array(
 			'class'   => 'cmb2_select cmb2-select-timezone',
 			'name'    => $this->_name( '[timezone]' ),
 			'id'      => $this->_id( '_timezone' ),
 			'options' => wp_timezone_choice( $tzstring ),
-			'desc'    => $args['desc'],
+			'desc'    => $args[ 'desc' ],
 		) );
 
 		return $this->text_datetime_timestamp( $timestamp_args ) . "\n" . $this->select( $timezone_args );
 	}
 
 	public function select_timezone() {
-		$this->field->args['default'] = $this->field->args( 'default' )
+		$this->field->args[ 'default' ] = $this->field->args( 'default' )
 			? $this->field->args( 'default' )
 			: cmb2_utils()->timezone_string();
 
@@ -668,7 +668,7 @@ 
 			'desc'  => $this->_desc( true ),
 		) );
 
-		return sprintf( '<%1$s class="%2$s">%3$s</%1$s>%4$s', $a['tag'], $a['class'], $a['name'], $a['desc'] );
+		return sprintf( '<%1$s class="%2$s">%3$s</%1$s>%4$s', $a[ 'tag' ], $a[ 'class' ], $a[ 'name' ], $a[ 'desc' ] );
 	}
 
 	public function select( $args = array() ) {
@@ -681,17 +681,17 @@ 
 		) );
 
 		$attrs = $this->concat_attrs( $a, array( 'desc', 'options' ) );
-		return sprintf( '<select%s>%s</select>%s', $attrs, $a['options'], $a['desc'] );
+		return sprintf( '<select%s>%s</select>%s', $attrs, $a[ 'options' ], $a[ 'desc' ] );
 	}
 
 	public function taxonomy_select() {
 
 		$names      = $this->get_object_terms();
-		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[key( $names )]->slug;
+		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[ key( $names ) ]->slug;
 		$terms      = get_terms( $this->field->args( 'taxonomy' ), 'hide_empty=0' );
 		$options    = '';
 
-		$option_none  = $this->field->args( 'show_option_none' );
+		$option_none = $this->field->args( 'show_option_none' );
 		if ( ! empty( $option_none ) ) {
 			$option_none_value = apply_filters( 'cmb2_taxonomy_select_default_value', '' );
 			$option_none_value = apply_filters( "cmb2_taxonomy_select_{$this->_id()}_default_value", $option_none_value );
@@ -721,7 +721,7 @@ 
 			'desc'    => $this->_desc( true ),
 		) );
 
-		return sprintf( '<ul class="%s">%s</ul>%s', $a['class'], $a['options'], $a['desc'] );
+		return sprintf( '<ul class="%s">%s</ul>%s', $a[ 'class' ], $a[ 'options' ], $a[ 'desc' ] );
 	}
 
 	public function radio_inline() {
@@ -756,7 +756,7 @@ 
 			: $is_checked;
 
 		if ( $is_checked ) {
-			$defaults['checked'] = 'checked';
+			$defaults[ 'checked' ] = 'checked';
 		}
 
 		$args = $this->parse_args( $args, 'checkbox', $defaults );
@@ -766,14 +766,14 @@ 
 
 	public function taxonomy_radio() {
 		$names      = $this->get_object_terms();
-		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[key( $names )]->slug;
+		$saved_term = is_wp_error( $names ) || empty( $names ) ? $this->field->args( 'default' ) : $names[ key( $names ) ]->slug;
 		$terms      = get_terms( $this->field->args( 'taxonomy' ), 'hide_empty=0' );
 		$options    = ''; $i = 1;
 
 		if ( ! $terms ) {
 			$options .= sprintf( '<li><label>%s</label></li>', esc_html( $this->_text( 'no_terms_text', __( 'No terms', 'cmb2' ) ) ) );
 		} else {
-			$option_none  = $this->field->args( 'show_option_none' );
+			$option_none = $this->field->args( 'show_option_none' );
 			if ( ! empty( $option_none ) ) {
 				$option_none_value = apply_filters( "cmb2_taxonomy_radio_{$this->_id()}_default_value", apply_filters( 'cmb2_taxonomy_radio_default_value', '' ) );
 				$args = array(
@@ -781,7 +781,7 @@ 
 					'label' => $option_none,
 				);
 				if ( $saved_term == $option_none_value ) {
-					$args['checked'] = 'checked';
+					$args[ 'checked' ] = 'checked';
 				}
 				$options .= $this->list_input( $args, $i );
 				$i++;
@@ -794,7 +794,7 @@ 
 				);
 
 				if ( $saved_term == $term->slug ) {
-					$args['checked'] = 'checked';
+					$args[ 'checked' ] = 'checked';
 				}
 				$options .= $this->list_input( $args, $i );
 				$i++;
@@ -831,7 +831,7 @@ 
 				);
 
 				if ( is_array( $saved_terms ) && in_array( $term->slug, $saved_terms ) ) {
-					$args['checked'] = 'checked';
+					$args[ 'checked' ] = 'checked';
 				}
 				$options .= $this->list_input( $args, $i );
 				$i++;
@@ -936,7 +936,7 @@ 
 		$query_args = $this->field->args( 'query_args' );
 
 		// if options array and 'url' => false, then hide the url field
-		$input_type = array_key_exists( 'url', $options ) && false === $options['url'] ? 'hidden' : 'text';
+		$input_type = array_key_exists( 'url', $options ) && false === $options[ 'url' ] ? 'hidden' : 'text';
 
 		echo $this->input( array(
 			'type'  => $input_type,
@@ -957,8 +957,8 @@ 
 		// Reset field args for attachment ID
 		$args = $this->field->args();
 		// If we're looking at a file in a group, we need to get the non-prefixed id
-		$args['id'] = ( $this->field->group ? $this->field->args( '_id' ) : $cached_id ) . '_id';
-		unset( $args['_id'], $args['_name'] );
+		$args[ 'id' ] = ( $this->field->group ? $this->field->args( '_id' ) : $cached_id ) . '_id';
+		unset( $args[ '_id' ], $args[ '_name' ] );
 
 		// And get new field object
 		$this->field = new CMB2_Field( array(
@@ -990,7 +990,7 @@ 
 				if ( $_id_value ) {
 					$image = wp_get_attachment_image( $_id_value, $img_size, null, array( 'class' => 'cmb-file-field-image' ) );
 				} else {
-					$size = is_array( $img_size ) ? $img_size[0] : 350;
+					$size = is_array( $img_size ) ? $img_size[ 0 ] : 350;
 					$image = '<img style="max-width: ' . absint( $size ) . 'px; width: 100%; height: auto;" src="' . $meta_value . '" alt="" />';
 				}
 
@@ -1021,11 +1021,11 @@ 
 	 */
 	public function img_status_output( $args ) {
 		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>',
-			$args['tag'],
-			$args['image'],
-			isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '',
+			$args[ 'tag' ],
+			$args[ 'image' ],
+			isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '',
 			esc_html( $this->_text( 'remove_image_text', __( 'Remove Image', 'cmb2' ) ) ),
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
+			isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : ''
 		);
 	}
 
@@ -1037,14 +1037,14 @@ 
 	 */
 	public function file_status_output( $args ) {
 		printf( '<%1$s class="file-status"><span>%2$s <strong>%3$s</strong></span>&nbsp;&nbsp; (<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>',
-			$args['tag'],
+			$args[ 'tag' ],
 			esc_html( $this->_text( 'file_text', __( 'File:', 'cmb2' ) ) ),
-			$this->get_file_name_from_path( $args['value'] ),
-			$args['value'],
+			$this->get_file_name_from_path( $args[ 'value' ] ),
+			$args[ 'value' ],
 			esc_html( $this->_text( 'file_download_text', __( 'Download', 'cmb2' ) ) ),
-			isset( $args['cached_id'] ) ? ' rel="' . $args['cached_id'] . '"' : '',
+			isset( $args[ 'cached_id' ] ) ? ' rel="' . $args[ 'cached_id' ] . '"' : '',
 			esc_html( $this->_text( 'remove_text', __( 'Remove', 'cmb2' ) ) ),
-			isset( $args['id_input'] ) ? $args['id_input'] : ''
+			isset( $args[ 'id_input' ] ) ? $args[ 'id_input' ] : ''
 		);
 	}
 
@@ -1066,8 +1066,8 @@ 
 			if ( $update ) {
 				$atts = $this->field->args( 'attributes' );
 			} else {
-				$atts = isset( $args['attributes'] )
-					? $args['attributes']
+				$atts = isset( $args[ 'attributes' ] )
+					? $args[ 'attributes' ]
 					: $atts;
 			}
 
@@ -1083,7 +1083,7 @@ 
 		}
 
 		if ( $update ) {
-			$this->field->args['attributes'] = $atts;
+			$this->field->args[ 'attributes' ] = $atts;
 		}
 
 		return array_merge( $args, $atts );