X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/wordpress.git/blobdiff_plain/d3b1ea255664edd2deef17f900a655613d20820d..6c8f14c09105d0afa4c1574215c59b5021040e76:/wp-admin/options.php
diff --git a/wp-admin/options.php b/wp-admin/options.php
index 6bc05615..92ae917b 100644
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -1,60 +1,126 @@
array( 'blogname', 'blogdescription', 'admin_email', 'users_can_register', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'default_role', 'timezone_string' ),
+ 'general' => 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' ),
- 'misc' => array( 'use_linksupdate', 'uploads_use_yearmonth_folders', 'upload_path', 'upload_url_path' ),
'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' ),
- 'privacy' => array( 'blog_public' ),
- 'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'blog_charset', 'show_on_front', 'page_on_front', 'page_for_posts' ),
- 'writing' => array( 'default_post_edit_rows', 'use_smilies', 'ping_sites', 'mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass', 'default_category', 'default_email_category', 'use_balanceTags', 'default_link_category', 'enable_app', 'enable_xmlrpc' ),
- 'options' => array( '' ) );
-if ( !defined( 'WP_SITEURL' ) ) $whitelist_options['general'][] = 'siteurl';
-if ( !defined( 'WP_HOME' ) ) $whitelist_options['general'][] = 'home';
+ '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();
-$whitelist_options = apply_filters( 'whitelist_options', $whitelist_options );
+$mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass');
-if ( !current_user_can('manage_options') )
- wp_die(__('Cheatin’ uh?'));
+if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) )
+ $whitelist_options['reading'][] = 'blog_charset';
-switch($action) {
+if ( !is_multisite() ) {
+ if ( !defined( 'WP_SITEURL' ) )
+ $whitelist_options['general'][] = 'siteurl';
+ if ( !defined( 'WP_HOME' ) )
+ $whitelist_options['general'][] = 'home';
-case 'update':
- if ( isset($_POST[ 'option_page' ]) ) {
- $option_page = $_POST[ 'option_page' ];
- check_admin_referer( $option_page . '-options' );
- } else {
- // This is for back compat and will eventually be removed.
- $option_page = 'options';
+ $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';
+
+ if ( apply_filters( 'enable_post_by_email_configuration', true ) )
+ $whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_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 {
+ $unregistered = false;
+ check_admin_referer( $option_page . '-options' );
}
if ( !isset( $whitelist_options[ $option_page ] ) )
- wp_die( __( 'Error! Options page not found.' ) );
+ wp_die( __( 'ERROR: options page not found.' ) );
if ( 'options' == $option_page ) {
- $options = explode(',', stripslashes( $_POST[ 'page_options' ] ));
+ if ( is_multisite() && ! is_super_admin() )
+ wp_die( __( 'You do not have sufficient permissions to modify unregistered settings for this site.' ) );
+ $options = explode( ',', stripslashes( $_POST[ 'page_options' ] ) );
} else {
$options = $whitelist_options[ $option_page ];
}
@@ -65,50 +131,73 @@ case 'update':
$_POST['date_format'] = $_POST['date_format_custom'];
if ( !empty($_POST['time_format']) && isset($_POST['time_format_custom']) && '\c\u\s\t\o\m' == stripslashes( $_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 ( $options ) {
foreach ( $options as $option ) {
- $option = trim($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 = stripslashes_deep($value);
- update_option($option, $value);
+ if ( isset( $_POST[ $option ] ) ) {
+ $value = $_POST[ $option ];
+ if ( ! is_array( $value ) )
+ $value = trim( $value );
+ $value = stripslashes_deep( $value );
+ }
+ update_option( $option, $value );
}
}
- $goback = add_query_arg( 'updated', 'true', wp_get_referer() );
+ /**
+ * 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 );
- break;
+ exit;
+}
-default:
- include('admin-header.php'); ?>
+include('./admin-header.php'); ?>