Account for various types of timestamp values passed through REST API.

jtsternberg · jtsternberg · commit 37c876386443 · 2021-04-22T10:18:51.000-04:00
diff --git a/includes/CMB2_Sanitize.php b/includes/CMB2_Sanitize.php
@@ -297,17 +297,24 @@ public function text_datetime_timestamp( $repeat = false ) {
 		// date_create_from_format if there is a slash in the value.
 		$this->value = wp_unslash( $this->value );
 
-		$test = is_array( $this->value ) ? array_filter( $this->value ) : '';
-		if ( empty( $test ) ) {
-			return '';
+		if ( is_array( $this->value ) ) {
+			$test = array_filter( $this->value );
+			if ( empty( $test ) ) {
+				return '';
+			}
 		}
 
 		$repeat_value = $this->_check_repeat( __FUNCTION__, $repeat );
 		if ( false !== $repeat_value ) {
 			return $repeat_value;
 		}
 
-		if ( isset( $this->value['date'], $this->value['time'] ) ) {
+		// Account for timestamp values passed through REST API.
+		if ( is_scalar( $this->value ) && CMB2_Utils::is_valid_date( $this->value ) ) {
+
+			$this->value = CMB2_Utils::make_valid_time_stamp( $this->value );
+
+		} elseif ( isset( $this->value['date'], $this->value['time'] ) ) {
 			$this->value = $this->field->get_timestamp_from_value( $this->value['date'] . ' ' . $this->value['time'] );
 		}
 
diff --git a/includes/CMB2_Utils.php b/includes/CMB2_Utils.php
@@ -247,7 +247,7 @@ public static function timezone_string() {
 	}
 
 	/**
-	 * Returns a timestamp, first checking if value already is a timestamp.
+	 * Returns a unix timestamp, first checking if value already is a timestamp.
 	 *
 	 * @since  2.0.0
 	 * @param  string|int $string Possible timestamp string.
@@ -258,9 +258,41 @@ public static function make_valid_time_stamp( $string ) {
 			return 0;
 		}
 
-		return self::is_valid_time_stamp( $string )
-			? (int) $string :
-			strtotime( (string) $string );
+		$timestamp = @strtotime( (string) $string );
+		if ( ! empty( $timestamp ) ) {
+
+			// We got a timestamp, first try!
+			return $timestamp;
+		}
+
+		$valid = self::is_valid_time_stamp( $string );
+		if ( $valid ) {
+			$timestamp  = (int) $string;
+			$length     = strlen( (string) $timestamp );
+			$unixlength = strlen( (string) time() );
+			$diff       = $length - $unixlength;
+
+			// If value is larger than a unix timestamp, we need to round to the
+			// nearest unix timestamp (in seconds).
+			if ( $diff > 0 ) {
+				$divider   = (int) '1' . str_repeat( '0', $diff );
+				$timestamp = round( $timestamp / $divider );
+			}
+		}
+
+		return $timestamp;
+	}
+
+	/**
+	 * Determine if a value is a valid date.
+	 *
+	 * @since  2.9.1
+	 * @param  mixed $date Value to check.
+	 * @return boolean     Whether value is a valid date
+	 */
+	public static function is_valid_date( $date ) {
+		return ( is_string( $date ) && @strtotime( $date ) )
+			|| self::is_valid_time_stamp( $date );
 	}
 
 	/**
