mirror of
https://ghproxy.net/https://github.com/abhijitb/helix.git
synced 2025-08-28 11:42:38 +08:00
fixed timezone saving
This commit is contained in:
parent
9e560f9846
commit
9dbbd4a93c
2 changed files with 121 additions and 52 deletions
|
@ -146,8 +146,13 @@ function helix_update_settings( $request ) {
|
||||||
// Get the WordPress option name for this setting
|
// Get the WordPress option name for this setting
|
||||||
$option_name = helix_get_wp_option_name( $setting );
|
$option_name = helix_get_wp_option_name( $setting );
|
||||||
|
|
||||||
// Update the WordPress option
|
// Special handling for timezone setting
|
||||||
$result = update_option( $option_name, $sanitized_value );
|
if ( $setting === 'timezone' ) {
|
||||||
|
$result = helix_update_timezone_setting( $sanitized_value );
|
||||||
|
} else {
|
||||||
|
// Update the WordPress option normally
|
||||||
|
$result = update_option( $option_name, $sanitized_value );
|
||||||
|
}
|
||||||
|
|
||||||
// Special handling for WPLANG option
|
// Special handling for WPLANG option
|
||||||
if ( $option_name === 'WPLANG' && ! $result ) {
|
if ( $option_name === 'WPLANG' && ! $result ) {
|
||||||
|
|
|
@ -40,22 +40,24 @@ function helix_update_settings_schema() {
|
||||||
'properties' => array(),
|
'properties' => array(),
|
||||||
);
|
);
|
||||||
|
|
||||||
foreach ( $settings_config as $setting_key => $setting_config ) {
|
foreach ( $settings_config as $category => $category_settings ) {
|
||||||
$schema['properties'][ $setting_key ] = array(
|
foreach ( $category_settings as $setting_key => $setting_config ) {
|
||||||
'type' => get_rest_api_type( $setting_config['type'] ),
|
$schema['properties'][ $setting_key ] = array(
|
||||||
);
|
'type' => get_rest_api_type( $setting_config['type'] ),
|
||||||
|
);
|
||||||
|
|
||||||
// Add enum validation if applicable
|
// Add enum validation if applicable
|
||||||
if ( isset( $setting_config['enum'] ) ) {
|
if ( isset( $setting_config['enum'] ) ) {
|
||||||
$schema['properties'][ $setting_key ]['enum'] = $setting_config['enum'];
|
$schema['properties'][ $setting_key ]['enum'] = $setting_config['enum'];
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add minimum/maximum validation for numbers
|
// Add minimum/maximum validation for numbers
|
||||||
if ( isset( $setting_config['min'] ) ) {
|
if ( isset( $setting_config['min'] ) ) {
|
||||||
$schema['properties'][ $setting_key ]['minimum'] = $setting_config['min'];
|
$schema['properties'][ $setting_key ]['minimum'] = $setting_config['min'];
|
||||||
}
|
}
|
||||||
if ( isset( $setting_config['max'] ) ) {
|
if ( isset( $setting_config['max'] ) ) {
|
||||||
$schema['properties'][ $setting_key ]['maximum'] = $setting_config['max'];
|
$schema['properties'][ $setting_key ]['maximum'] = $setting_config['max'];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -250,7 +252,8 @@ function helix_sanitize_setting_value( $setting, $value ) {
|
||||||
// Default sanitization based on type.
|
// Default sanitization based on type.
|
||||||
switch ( $setting_config['type'] ) {
|
switch ( $setting_config['type'] ) {
|
||||||
case 'string':
|
case 'string':
|
||||||
return sanitize_text_field( $value );
|
$sanitized = sanitize_text_field( $value );
|
||||||
|
break;
|
||||||
|
|
||||||
case 'email':
|
case 'email':
|
||||||
$sanitized = sanitize_email( $value );
|
$sanitized = sanitize_email( $value );
|
||||||
|
@ -261,56 +264,111 @@ function helix_sanitize_setting_value( $setting, $value ) {
|
||||||
array( 'status' => 400 )
|
array( 'status' => 400 )
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return $sanitized;
|
break;
|
||||||
|
|
||||||
case 'url':
|
case 'url':
|
||||||
return esc_url_raw( $value );
|
$sanitized = esc_url_raw( $value );
|
||||||
|
break;
|
||||||
|
|
||||||
case 'integer':
|
case 'integer':
|
||||||
return absint( $value );
|
$sanitized = absint( $value );
|
||||||
|
break;
|
||||||
|
|
||||||
case 'number':
|
case 'number':
|
||||||
return floatval( $value );
|
$sanitized = floatval( $value );
|
||||||
|
break;
|
||||||
|
|
||||||
case 'boolean':
|
case 'boolean':
|
||||||
return rest_sanitize_boolean( $value );
|
$sanitized = rest_sanitize_boolean( $value );
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
// For enum types, validate against allowed values.
|
$sanitized = sanitize_text_field( $value );
|
||||||
if ( isset( $setting_config['enum'] ) ) {
|
break;
|
||||||
// Extract values from enum options if they are objects with 'value' property
|
|
||||||
$enum_values = array();
|
|
||||||
foreach ( $setting_config['enum'] as $option ) {
|
|
||||||
if ( is_array( $option ) && isset( $option['value'] ) ) {
|
|
||||||
$enum_values[] = $option['value'];
|
|
||||||
} else {
|
|
||||||
$enum_values[] = $option;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if ( ! in_array( $value, $enum_values, true ) ) {
|
|
||||||
return new WP_Error(
|
|
||||||
'helix_invalid_enum_value',
|
|
||||||
sprintf(
|
|
||||||
/* translators: 1: Setting name, 2: Allowed values */
|
|
||||||
__( 'Invalid value for %1$s. Allowed values: %2$s', 'helix' ),
|
|
||||||
$setting,
|
|
||||||
implode( ', ', $enum_values )
|
|
||||||
),
|
|
||||||
array( 'status' => 400 )
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return sanitize_text_field( $value );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// For any type with enum values, validate against allowed values
|
||||||
|
if ( isset( $setting_config['enum'] ) ) {
|
||||||
|
// Extract values from enum options if they are objects with 'value' property
|
||||||
|
$enum_values = array();
|
||||||
|
foreach ( $setting_config['enum'] as $option ) {
|
||||||
|
if ( is_array( $option ) && isset( $option['value'] ) ) {
|
||||||
|
$enum_values[] = $option['value'];
|
||||||
|
} else {
|
||||||
|
$enum_values[] = $option;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( ! in_array( $sanitized, $enum_values, true ) ) {
|
||||||
|
return new WP_Error(
|
||||||
|
'helix_invalid_enum_value',
|
||||||
|
sprintf(
|
||||||
|
/* translators: 1: Setting name, 2: Allowed values */
|
||||||
|
__( 'Invalid value for %1$s. Allowed values: %2$s', 'helix' ),
|
||||||
|
$setting,
|
||||||
|
implode( ', ', $enum_values )
|
||||||
|
),
|
||||||
|
array( 'status' => 400 )
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $sanitized;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get comprehensive settings configuration.
|
* Update timezone setting by handling both city-based timezones and GMT offsets.
|
||||||
*
|
*
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
* @return array Settings configuration array.
|
* @param string $timezone_value The timezone value to save.
|
||||||
|
* @return bool True if update succeeded, false otherwise.
|
||||||
*/
|
*/
|
||||||
|
function helix_update_timezone_setting( $timezone_value ) {
|
||||||
|
// Check if it's a GMT offset (starts with UTC+ or UTC- or is numeric)
|
||||||
|
if ( preg_match( '/^UTC[+-](\d+(?:\.\d+)?)$/', $timezone_value, $matches ) ) {
|
||||||
|
// Extract the numeric offset
|
||||||
|
$offset = $matches[1];
|
||||||
|
$is_negative = strpos( $timezone_value, 'UTC-' ) === 0;
|
||||||
|
|
||||||
|
// Convert to numeric value (negative if UTC-)
|
||||||
|
$numeric_offset = $is_negative ? -1 * floatval( $offset ) : floatval( $offset );
|
||||||
|
|
||||||
|
// Save to gmt_offset option
|
||||||
|
$result = update_option( 'gmt_offset', $numeric_offset );
|
||||||
|
|
||||||
|
// Clear the timezone_string option since we're using GMT offset
|
||||||
|
if ( $result ) {
|
||||||
|
update_option( 'timezone_string', '' );
|
||||||
|
}
|
||||||
|
|
||||||
|
return $result;
|
||||||
|
} elseif ( is_numeric( $timezone_value ) ) {
|
||||||
|
// Direct numeric offset (like "5.5")
|
||||||
|
$numeric_offset = floatval( $timezone_value );
|
||||||
|
|
||||||
|
// Save to gmt_offset option
|
||||||
|
$result = update_option( 'gmt_offset', $numeric_offset );
|
||||||
|
|
||||||
|
// Clear the timezone_string option since we're using GMT offset
|
||||||
|
if ( $result ) {
|
||||||
|
update_option( 'timezone_string', '' );
|
||||||
|
}
|
||||||
|
|
||||||
|
return $result;
|
||||||
|
} else {
|
||||||
|
// City-based timezone (like "Asia/Kolkata")
|
||||||
|
// Save to timezone_string option
|
||||||
|
$result = update_option( 'timezone_string', $timezone_value );
|
||||||
|
|
||||||
|
// Clear the gmt_offset option since we're using city-based timezone
|
||||||
|
if ( $result ) {
|
||||||
|
update_option( 'gmt_offset', '' );
|
||||||
|
}
|
||||||
|
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get available WordPress languages.
|
* Get available WordPress languages.
|
||||||
*
|
*
|
||||||
|
@ -513,6 +571,12 @@ function helix_get_available_timezones() {
|
||||||
return $timezone_options;
|
return $timezone_options;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get comprehensive settings configuration.
|
||||||
|
*
|
||||||
|
* @since 1.0.0
|
||||||
|
* @return array Settings configuration array.
|
||||||
|
*/
|
||||||
function helix_get_settings_config() {
|
function helix_get_settings_config() {
|
||||||
return array(
|
return array(
|
||||||
'site_information' => array(
|
'site_information' => array(
|
||||||
|
@ -687,13 +751,13 @@ function helix_get_settings_config() {
|
||||||
),
|
),
|
||||||
'largeSizeW' => array(
|
'largeSizeW' => array(
|
||||||
'label' => __( 'Large Width', 'helix' ),
|
'label' => __( 'Large Width', 'helix' ),
|
||||||
'description' => __( 'Maximum width of large-sized images.', 'helix' ),
|
'description' => __( 'Maximum width of large images.', 'helix' ),
|
||||||
'type' => 'integer',
|
'type' => 'integer',
|
||||||
'default' => 1024,
|
'default' => 1024,
|
||||||
),
|
),
|
||||||
'largeSizeH' => array(
|
'largeSizeH' => array(
|
||||||
'label' => __( 'Large Height', 'helix' ),
|
'label' => __( 'Large Height', 'helix' ),
|
||||||
'description' => __( 'Maximum height of large-sized images.', 'helix' ),
|
'description' => __( 'Maximum height of large images.', 'helix' ),
|
||||||
'type' => 'integer',
|
'type' => 'integer',
|
||||||
'default' => 1024,
|
'default' => 1024,
|
||||||
),
|
),
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue