fixing language setting save

admin/rest-routes.php

@@ -21,6 +21,10 @@ add_action( 'rest_api_init', 'helix_register_rest_routes' );
  * @since 1.0.0
  */
 function helix_register_rest_routes() {
+	// Get the schemas
+	$get_schema = helix_get_settings_schema();
+	$update_schema = helix_update_settings_schema();
+
 	// Settings endpoints.
 	register_rest_route(
 		'helix/v1',
@@ -30,13 +34,13 @@ function helix_register_rest_routes() {
 				'methods'             => WP_REST_Server::READABLE,
 				'callback'            => 'helix_get_settings',
 				'permission_callback' => 'helix_settings_permissions_check',
-				'args'                => helix_get_settings_schema(),
+				'args'                => $get_schema,
 			),
 			array(
 				'methods'             => WP_REST_Server::EDITABLE,
 				'callback'            => 'helix_update_settings',
 				'permission_callback' => 'helix_settings_permissions_check',
-				'args'                => helix_update_settings_schema(),
+				'args'                => $update_schema,
 			),
 		)
 	);
@@ -113,30 +117,25 @@ function helix_get_settings() {
  * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
  */
 function helix_update_settings( $request ) {
-	$params = $request->get_json_params();
+	$params = $request->get_params();
-
-	if ( empty( $params ) ) {
-		return new WP_Error(
-			'helix_no_settings_data',
-			__( 'No settings data provided.', 'helix' ),
-			array( 'status' => 400 )
-		);
-	}
-
-	$updated_settings = array();
-	$errors           = array();
 	$allowed_settings = helix_get_allowed_settings();
+	$updated_settings = array();
+	$errors = array();
 
+	// Process each setting
 	foreach ( $params as $setting => $value ) {
+		// Check if setting is allowed
 		if ( ! in_array( $setting, $allowed_settings, true ) ) {
-			$errors[ $setting ] = sprintf(
+			$error_msg = sprintf(
 				/* translators: %s: Setting name */
-				__( 'Setting "%s" is not allowed to be updated.', 'helix' ),
+				__( 'Setting "%s" is not allowed.', 'helix' ),
 				$setting
 			);
+			$errors[ $setting ] = $error_msg;
 			continue;
 		}
 
+		// Validate and sanitize the value
 		$sanitized_value = helix_sanitize_setting_value( $setting, $value );
 		
 		if ( is_wp_error( $sanitized_value ) ) {
@@ -144,13 +143,53 @@ function helix_update_settings( $request ) {
 			continue;
 		}
 
+		// Get the WordPress option name for this setting
 		$option_name = helix_get_wp_option_name( $setting );
-		$result      = update_option( $option_name, $sanitized_value );
+		
+		// Update the WordPress option
+		$result = update_option( $option_name, $sanitized_value );
+		
+		// Special handling for WPLANG option
+		if ( $option_name === 'WPLANG' && ! $result ) {
+			// Check if switch_to_locale function is available
+			if ( function_exists( 'switch_to_locale' ) ) {
+				// Check if the language file exists
+				$lang_dir = WP_CONTENT_DIR . '/languages/';
+				$lang_file = $lang_dir . $sanitized_value . '.po';
+				
+				// If language file doesn't exist, try to install it
+				if ( ! file_exists( $lang_file ) ) {
+					// Try to install the language pack using WordPress core functions
+					$install_result = helix_install_language_pack( $sanitized_value );
+					
+					if ( $install_result ) {
+						// Try updating the option again
+						$result = update_option( $option_name, $sanitized_value );
+						
+						if ( $result ) {
+							$updated_settings[ $setting ] = $sanitized_value;
+							continue; // Skip to next setting
+						}
+					}
+				}
+			}
+			
+			// If we still can't update, provide a helpful error message
+			if ( ! $result ) {
+				$error_msg = sprintf(
+					__( 'Language "%s" could not be installed automatically. Please install the language pack manually via WordPress Admin → Settings → General → Site Language.', 'helix' ),
+					$sanitized_value
+				);
+				$errors[ $setting ] = $error_msg;
+				continue; // Skip to next setting
+			}
+		}
 
 		if ( $result ) {
 			$updated_settings[ $setting ] = $sanitized_value;
 		} else {
-			$errors[ $setting ] = __( 'Failed to update setting.', 'helix' );
+			$error_msg = __( 'Failed to update setting.', 'helix' );
+			$errors[ $setting ] = $error_msg;
 		}
 	}
 

admin/settings-api.php

@@ -35,28 +35,57 @@ function helix_get_settings_schema() {
  */
 function helix_update_settings_schema() {
 	$settings_config = helix_get_settings_config();
-	$schema          = array();
+	$schema = array(
+		'type' => 'object',
+		'properties' => array(),
+	);
 
-	foreach ( $settings_config as $category => $settings ) {
+	foreach ( $settings_config as $setting_key => $setting_config ) {
-		foreach ( $settings as $setting_key => $setting_config ) {
+		$schema['properties'][ $setting_key ] = array(
-			$schema[ $setting_key ] = array(
+			'type' => get_rest_api_type( $setting_config['type'] ),
-				'description' => $setting_config['description'],
+		);
-				'type'        => $setting_config['type'],
-			);
 
-			if ( isset( $setting_config['enum'] ) ) {
+		// Add enum validation if applicable
-				$schema[ $setting_key ]['enum'] = $setting_config['enum'];
+		if ( isset( $setting_config['enum'] ) ) {
-			}
+			$schema['properties'][ $setting_key ]['enum'] = $setting_config['enum'];
+		}
 
-			if ( isset( $setting_config['default'] ) ) {
+		// Add minimum/maximum validation for numbers
-				$schema[ $setting_key ]['default'] = $setting_config['default'];
+		if ( isset( $setting_config['min'] ) ) {
-			}
+			$schema['properties'][ $setting_key ]['minimum'] = $setting_config['min'];
+		}
+		if ( isset( $setting_config['max'] ) ) {
+			$schema['properties'][ $setting_key ]['maximum'] = $setting_config['max'];
 		}
 	}
 
 	return $schema;
 }
 
+/**
+ * Convert Helix setting types to WordPress REST API types.
+ *
+ * @since 1.0.0
+ * @param string $helix_type The Helix setting type.
+ * @return string|array The WordPress REST API type.
+ */
+function get_rest_api_type( $helix_type ) {
+	switch ( $helix_type ) {
+		case 'string':
+		case 'email':
+		case 'url':
+			return 'string';
+		case 'integer':
+			return 'integer';
+		case 'number':
+			return 'number';
+		case 'boolean':
+			return 'boolean';
+		default:
+			return 'string';
+	}
+}
+
 /**
  * Get all WordPress settings in organized format.
  *
@@ -110,12 +139,7 @@ function helix_get_allowed_settings() {
 		$allowed_settings = array_merge( $allowed_settings, array_keys( $settings ) );
 	}
 
-	/**
+	// Filter the list of allowed settings.
-	 * Filter the list of allowed settings.
-	 *
-	 * @since 1.0.0
-	 * @param array $allowed_settings Array of allowed setting keys.
-	 */
 	return apply_filters( 'helix_allowed_settings', $allowed_settings );
 }
 
@@ -254,14 +278,24 @@ function helix_sanitize_setting_value( $setting, $value ) {
 		default:
 			// For enum types, validate against allowed values.
 			if ( isset( $setting_config['enum'] ) ) {
-				if ( ! in_array( $value, $setting_config['enum'], true ) ) {
+				// 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( ', ', $setting_config['enum'] )
+							implode( ', ', $enum_values )
 						),
 						array( 'status' => 400 )
 					);
@@ -292,53 +326,157 @@ function helix_get_available_languages() {
 		'label' => 'English (United States)'
 	);
 	
-	// Try to get installed languages
+	// First, try to get installed languages
-	if ( function_exists( 'get_available_languages' ) || ( file_exists( ABSPATH . 'wp-admin/includes/translation-install.php' ) && require_once ABSPATH . 'wp-admin/includes/translation-install.php' ) ) {
+	if ( function_exists( 'get_available_languages' ) ) {
+		$installed_languages = get_available_languages();
+	} else {
+		$installed_languages = array();
+	}
 	
-		$languages = get_available_languages();
+	// Always try to include the required file first
+	if ( ! function_exists( 'wp_get_available_translations' ) && file_exists( ABSPATH . 'wp-admin/includes/translation-install.php' ) ) {
+		require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
+	}
 	
-		if ( ! empty( $languages ) && function_exists( 'wp_get_available_translations' ) ) {
+	// Get all available translations (including uninstalled ones)
-			$available_translations = wp_get_available_translations();
+	if ( function_exists( 'wp_get_available_translations' ) ) {
+		$available_translations = wp_get_available_translations();
 		
-			foreach ( $languages as $language ) {
+		// Add all available languages
-				$language_data = $available_translations[ $language ] ?? null;
+		foreach ( $available_translations as $locale => $translation_data ) {
-				if ( $language_data && isset( $language_data['native_name'] ) ) {
+			$label = isset( $translation_data['native_name'] ) ? $translation_data['native_name'] : $locale;
-					$language_options[] = array(
+			
-						'value' => $language,
+			// Mark installed languages differently
-						'label' => $language_data['native_name']
+			$is_installed = in_array( $locale, $installed_languages );
-					);
+			$display_label = $is_installed ? $label : $label . ' (Not Installed)';
-				} else {
+			
-					// Fallback if translation data is not available
+			$language_options[] = array(
-					$language_options[] = array(
+				'value' => $locale,
-						'value' => $language,
+				'label' => $display_label,
-						'label' => $language
+				'installed' => $is_installed
-					);
+			);
-				}
+		}
-			}
+	} else {
+		// Fallback to common languages if wp_get_available_translations is still not available
+		$language_options = helix_get_fallback_languages( $installed_languages );
+	}
+	
+	return $language_options;
+}
+
+/**
+ * Install a language pack using WordPress core functions.
+ *
+ * @since 1.0.0
+ * @param string $locale The language locale to install.
+ * @return bool True if installation succeeded, false otherwise.
+ */
+function helix_install_language_pack( $locale ) {
+	// Make sure we have the required functions
+	if ( ! function_exists( 'wp_download_language_pack' ) ) {
+		if ( file_exists( ABSPATH . 'wp-admin/includes/translation-install.php' ) ) {
+			require_once ABSPATH . 'wp-admin/includes/translation-install.php';
+		} else {
+			return false;
 		}
 	}
 	
-	// If no languages found, add some common ones as fallback
+	// Make sure we have the filesystem API
-	if ( count( $language_options ) === 1 ) {
+	if ( ! function_exists( 'request_filesystem_credentials' ) ) {
-		$common_languages = array(
+		if ( file_exists( ABSPATH . 'wp-admin/includes/file.php' ) ) {
-			'es_ES' => 'Español',
+			require_once ABSPATH . 'wp-admin/includes/file.php';
-			'fr_FR' => 'Français',
+		} else {
-			'de_DE' => 'Deutsch', 
+			return false;
-			'it_IT' => 'Italiano',
-			'pt_BR' => 'Português do Brasil',
-			'ru_RU' => 'Русский',
-			'ja' => '日本語',
-			'zh_CN' => '简体中文',
-		);
-		
-		foreach ( $common_languages as $code => $name ) {
-			$language_options[] = array(
-				'value' => $code,
-				'label' => $name
-			);
 		}
 	}
 	
+	// Check if the function is now available
+	if ( ! function_exists( 'wp_download_language_pack' ) ) {
+		return false;
+	}
+	
+	// Check if filesystem API is available
+	if ( ! function_exists( 'request_filesystem_credentials' ) ) {
+		return false;
+	}
+	
+	// Get available translations to verify the language exists
+	if ( function_exists( 'wp_get_available_translations' ) ) {
+		$available_translations = wp_get_available_translations();
+		
+		if ( ! isset( $available_translations[ $locale ] ) ) {
+			return false;
+		}
+	}
+	
+	// Try to download and install the language pack
+	try {
+		
+		$download_result = wp_download_language_pack( $locale );
+		
+		if ( is_wp_error( $download_result ) ) {
+			return false;
+		}
+		
+		// Verify the language file now exists
+		$lang_dir = WP_CONTENT_DIR . '/languages/';
+		$lang_file = $lang_dir . $locale . '.po';
+		
+		if ( file_exists( $lang_file ) ) {
+			return true;
+		} else {
+			return false;
+		}
+		
+	} catch ( Exception $e ) {
+		return false;
+	}
+}
+
+/**
+ * Get fallback language options when wp_get_available_translations is not available.
+ *
+ * @since 1.0.0
+ * @param array $installed_languages Array of installed language codes.
+ * @return array Array of fallback language options.
+ */
+function helix_get_fallback_languages( $installed_languages = array() ) {
+	$language_options = array();
+	
+	// Common languages as fallback
+	$common_languages = array(
+		'en_GB' => 'English (United Kingdom)',
+		'es_ES' => 'Español',
+		'fr_FR' => 'Français',
+		'de_DE' => 'Deutsch', 
+		'it_IT' => 'Italiano',
+		'pt_BR' => 'Português do Brasil',
+		'ru_RU' => 'Русский',
+		'ja' => '日本語',
+		'zh_CN' => '简体中文',
+		'ar' => 'العربية',
+		'hi_IN' => 'हिन्दी',
+		'ko_KR' => '한국어',
+		'nl_NL' => 'Nederlands',
+		'sv_SE' => 'Svenska',
+		'da_DK' => 'Dansk',
+		'fi' => 'Suomi',
+		'no' => 'Norsk',
+		'pl_PL' => 'Polski',
+		'tr_TR' => 'Türkçe',
+	);
+	
+	foreach ( $common_languages as $code => $name ) {
+		$is_installed = in_array( $code, $installed_languages );
+		$display_label = $is_installed ? $name : $name . ' (Not Installed)';
+		
+		$language_options[] = array(
+			'value' => $code,
+			'label' => $display_label,
+			'installed' => $is_installed
+		);
+	}
+	
 	return $language_options;
 }
 
@@ -351,85 +489,23 @@ function helix_get_available_languages() {
 function helix_get_available_timezones() {
 	$timezone_options = array();
 	
-	// UTC and common UTC offsets
+	// Use WordPress core function to get timezone choices
-	$timezone_options[] = array( 'value' => 'UTC', 'label' => 'UTC' );
+	if ( function_exists( 'wp_timezone_choice' ) ) {
+		// Get the HTML output from wp_timezone_choice
+		$timezone_html = wp_timezone_choice( get_option( 'timezone_string', 'UTC' ) );
+		// Parse the HTML to extract option values and labels
+		if ( preg_match_all( '/<option[^>]*value=["\']([^"\']*)["\'][^>]*>([^<]*)<\/option>/', $timezone_html, $matches, PREG_SET_ORDER ) ) {
+			foreach ( $matches as $match ) {
+				$value = $match[1];
+				$label = trim( $match[2] );
 				
-	// Positive UTC offsets
+				// Skip empty values
-	for ( $i = 1; $i <= 12; $i++ ) {
+				if ( ! empty( $value ) || $value === '0' ) {
-		$offset = sprintf( '+%d', $i );
+					$timezone_options[] = array(
-		$timezone_options[] = array( 'value' => "UTC{$offset}", 'label' => "UTC{$offset}" );
+						'value' => $value,
-	}
+						'label' => $label
-	
+					);
-	// Negative UTC offsets
+				}
-	for ( $i = 1; $i <= 12; $i++ ) {
-		$offset = sprintf( '-%d', $i );
-		$timezone_options[] = array( 'value' => "UTC{$offset}", 'label' => "UTC{$offset}" );
-	}
-	
-	// Major city-based timezones organized by region
-	$timezone_regions = array(
-		'America' => array(
-			'America/New_York' => 'New York',
-			'America/Chicago' => 'Chicago', 
-			'America/Denver' => 'Denver',
-			'America/Los_Angeles' => 'Los Angeles',
-			'America/Toronto' => 'Toronto',
-			'America/Vancouver' => 'Vancouver',
-			'America/Montreal' => 'Montreal',
-			'America/Mexico_City' => 'Mexico City',
-			'America/Sao_Paulo' => 'São Paulo',
-			'America/Buenos_Aires' => 'Buenos Aires',
-		),
-		'Europe' => array(
-			'Europe/London' => 'London',
-			'Europe/Paris' => 'Paris',
-			'Europe/Berlin' => 'Berlin',
-			'Europe/Rome' => 'Rome',
-			'Europe/Madrid' => 'Madrid',
-			'Europe/Amsterdam' => 'Amsterdam',
-			'Europe/Brussels' => 'Brussels',
-			'Europe/Vienna' => 'Vienna',
-			'Europe/Stockholm' => 'Stockholm',
-			'Europe/Moscow' => 'Moscow',
-		),
-		'Asia' => array(
-			'Asia/Tokyo' => 'Tokyo',
-			'Asia/Shanghai' => 'Shanghai',
-			'Asia/Hong_Kong' => 'Hong Kong',
-			'Asia/Singapore' => 'Singapore',
-			'Asia/Kolkata' => 'Kolkata',
-			'Asia/Dubai' => 'Dubai',
-			'Asia/Bangkok' => 'Bangkok',
-			'Asia/Seoul' => 'Seoul',
-			'Asia/Manila' => 'Manila',
-		),
-		'Australia' => array(
-			'Australia/Sydney' => 'Sydney',
-			'Australia/Melbourne' => 'Melbourne',
-			'Australia/Brisbane' => 'Brisbane',
-			'Australia/Perth' => 'Perth',
-			'Australia/Adelaide' => 'Adelaide',
-		),
-		'Africa' => array(
-			'Africa/Cairo' => 'Cairo',
-			'Africa/Johannesburg' => 'Johannesburg',
-			'Africa/Lagos' => 'Lagos',
-		),
-		'Pacific' => array(
-			'Pacific/Auckland' => 'Auckland',
-			'Pacific/Honolulu' => 'Honolulu',
-		),
-	);
-	
-	$timezone_identifiers = timezone_identifiers_list();
-	
-	foreach ( $timezone_regions as $region => $timezones ) {
-		foreach ( $timezones as $timezone_id => $city_name ) {
-			if ( in_array( $timezone_id, $timezone_identifiers ) ) {
-				$timezone_options[] = array(
-					'value' => $timezone_id,
-					'label' => "{$city_name} ({$region})"
-				);
 			}
 		}
 	}