X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/wordpress.git/blobdiff_plain/cc7b1505cd9fafd87c3672f669e13e98b0c544f7..53a5df18dd17a11c18781e78349feb3e139096b4:/wp-admin/options.php
diff --git a/wp-admin/options.php b/wp-admin/options.php
index 3c5b8dbf..00fb3c0f 100644
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -1,119 +1,256 @@
array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string' ),
+ 'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ),
+ 'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type' ),
+ 'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'show_on_front', 'page_on_front', 'page_for_posts', 'blog_public' ),
+ 'writing' => array( 'use_smilies', 'default_category', 'default_email_category', 'use_balanceTags', 'default_link_category', 'default_post_format' )
+);
+$whitelist_options['misc'] = $whitelist_options['options'] = $whitelist_options['privacy'] = array();
-case 'update':
- $any_changed = 0;
-
- check_admin_referer('update-options');
+$mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass');
- if (!$_POST['page_options']) {
- foreach ($_POST as $key => $value) {
- $options[] = $key;
- }
+if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) )
+ $whitelist_options['reading'][] = 'blog_charset';
+
+if ( !is_multisite() ) {
+ if ( !defined( 'WP_SITEURL' ) )
+ $whitelist_options['general'][] = 'siteurl';
+ if ( !defined( 'WP_HOME' ) )
+ $whitelist_options['general'][] = 'home';
+
+ $whitelist_options['general'][] = 'admin_email';
+ $whitelist_options['general'][] = 'users_can_register';
+ $whitelist_options['general'][] = 'default_role';
+
+ $whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
+ $whitelist_options['writing'][] = 'ping_sites';
+
+ $whitelist_options['media'][] = 'uploads_use_yearmonth_folders';
+
+ // If upload_url_path and upload_path are both default values, they're locked.
+ if ( get_option( 'upload_url_path' ) || ( get_option('upload_path') != 'wp-content/uploads' && get_option('upload_path') ) ) {
+ $whitelist_options['media'][] = 'upload_path';
+ $whitelist_options['media'][] = 'upload_url_path';
+ }
+} else {
+ $whitelist_options['general'][] = 'new_admin_email';
+ $whitelist_options['general'][] = 'WPLANG';
+
+ /**
+ * Toggle post-by-email functionality.
+ *
+ * @since 3.0.0
+ *
+ * @param bool True or false, based on whether post-by-email configuration is enabled or not.
+ */
+ if ( apply_filters( 'enable_post_by_email_configuration', true ) )
+ $whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
+}
+
+/**
+ * Filter the options white list.
+ *
+ * @since 2.7.0
+ *
+ * @param array White list options.
+ */
+$whitelist_options = apply_filters( 'whitelist_options', $whitelist_options );
+
+/*
+ * If $_GET['action'] == 'update' we are saving settings sent from a settings page
+ */
+if ( 'update' == $action ) {
+ if ( 'options' == $option_page && !isset( $_POST['option_page'] ) ) { // This is for back compat and will eventually be removed.
+ $unregistered = true;
+ check_admin_referer( 'update-options' );
} else {
- $options = explode(',', stripslashes($_POST['page_options']));
+ $unregistered = false;
+ check_admin_referer( $option_page . '-options' );
}
- // Save for later.
- $old_siteurl = get_settings('siteurl');
- $old_home = get_settings('home');
-
- // HACK
- // Options that if not there have 0 value but need to be something like "closed"
- $nonbools = array('default_ping_status', 'default_comment_status');
- if ($options) {
- foreach ($options as $option) {
- $option = trim($option);
- $value = trim(stripslashes($_POST[$option]));
- if( in_array($option, $nonbools) && ( $value == '0' || $value == '') )
- $value = 'closed';
-
- if( $option == 'blogdescription' || $option == 'blogname' )
- if (current_user_can('unfiltered_html') == false)
- $value = wp_filter_post_kses( $value );
-
- if (update_option($option, $value) ) {
- $any_changed++;
- }
+ if ( !isset( $whitelist_options[ $option_page ] ) )
+ wp_die( __( 'ERROR: options page not found.' ) );
+
+ if ( 'options' == $option_page ) {
+ if ( is_multisite() && ! is_super_admin() )
+ wp_die( __( 'You do not have sufficient permissions to modify unregistered settings for this site.' ) );
+ $options = explode( ',', wp_unslash( $_POST[ 'page_options' ] ) );
+ } else {
+ $options = $whitelist_options[ $option_page ];
+ }
+
+ // Handle custom date/time formats
+ if ( 'general' == $option_page ) {
+ if ( !empty($_POST['date_format']) && isset($_POST['date_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['date_format'] ) )
+ $_POST['date_format'] = $_POST['date_format_custom'];
+ if ( !empty($_POST['time_format']) && isset($_POST['time_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['time_format'] ) )
+ $_POST['time_format'] = $_POST['time_format_custom'];
+ // Map UTC+- timezones to gmt_offsets and set timezone_string to empty.
+ if ( !empty($_POST['timezone_string']) && preg_match('/^UTC[+-]/', $_POST['timezone_string']) ) {
+ $_POST['gmt_offset'] = $_POST['timezone_string'];
+ $_POST['gmt_offset'] = preg_replace('/UTC\+?/', '', $_POST['gmt_offset']);
+ $_POST['timezone_string'] = '';
}
}
-
- if ($any_changed) {
- // If siteurl or home changed, reset cookies.
- if ( get_settings('siteurl') != $old_siteurl || get_settings('home') != $old_home ) {
- // If home changed, write rewrite rules to new location.
- $wp_rewrite->flush_rules();
- // Clear cookies for old paths.
- wp_clearcookie();
- // Set cookies for new paths.
- wp_setcookie($user_login, $user_pass_md5, true, get_settings('home'), get_settings('siteurl'));
+
+ if ( $options ) {
+ foreach ( $options as $option ) {
+ if ( $unregistered )
+ _deprecated_argument( 'options.php', '2.7', sprintf( __( 'The %1$s
setting is unregistered. Unregistered settings are deprecated. See http://codex.wordpress.org/Settings_API' ), $option, $option_page ) );
+
+ $option = trim( $option );
+ $value = null;
+ if ( isset( $_POST[ $option ] ) ) {
+ $value = $_POST[ $option ];
+ if ( ! is_array( $value ) )
+ $value = trim( $value );
+ $value = wp_unslash( $value );
}
+ update_option( $option, $value );
+ }
+ }
- //$message = sprintf(__('%d setting(s) saved... '), $any_changed);
- }
-
- $referred = remove_query_arg('updated' , wp_get_referer());
- $goback = add_query_arg('updated', 'true', wp_get_referer());
- $goback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $goback);
- wp_redirect($goback);
- break;
+ /**
+ * Handle settings errors and return to options page
+ */
+ // If no settings errors were registered add a general 'updated' message.
+ if ( !count( get_settings_errors() ) )
+ add_settings_error('general', 'settings_updated', __('Settings saved.'), 'updated');
+ set_transient('settings_errors', get_settings_errors(), 30);
+
+ /**
+ * Redirect back to the settings page that was submitted
+ */
+ $goback = add_query_arg( 'settings-updated', 'true', wp_get_referer() );
+ wp_redirect( $goback );
+ exit;
+}
-default:
- include('admin-header.php'); ?>
+include( ABSPATH . 'wp-admin/admin-header.php' ); ?>