From 941ec0ff9790b769b131b62d95c96d6e0c894e3e Mon Sep 17 00:00:00 2001 From: ryan Date: Sat, 18 Feb 2006 07:40:43 +0000 Subject: [PATCH] Blog privacy. fixes #2480 git-svn-id: http://svn.automattic.com/wordpress/trunk@3548 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/install.php | 9 +++++++++ wp-admin/options-general.php | 7 ++++++- wp-admin/upgrade-functions.php | 2 +- wp-admin/upgrade-schema.php | 2 ++ wp-includes/default-filters.php | 5 ++++- wp-includes/functions.php | 6 ++++++ wp-includes/template-functions-general.php | 5 +++++ wp-includes/version.php | 2 +- 8 files changed, 34 insertions(+), 4 deletions(-) diff --git a/wp-admin/install.php b/wp-admin/install.php index 7d778e9f2..3338d0bfe 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -107,6 +107,10 @@ switch($step) { + + + +

@@ -121,6 +125,7 @@ switch($step) { // Fill in the data we gathered $weblog_title = stripslashes($_POST['weblog_title']); $admin_email = stripslashes($_POST['admin_email']); +$public = (int) $_POST['blog_public']; // check e-mail address if (empty($admin_email)) { die (__("ERROR: please type your e-mail address")); @@ -144,6 +149,10 @@ populate_roles(); update_option('blogname', $weblog_title); update_option('admin_email', $admin_email); +update_option('blog_public', $public); +// If not a public blog, don't ping. +if ( ! $public ) + update_option('default_pingback_flag', 0); // Now drop in some default links $wpdb->query("INSERT INTO $wpdb->linkcategories (cat_id, cat_name) VALUES (1, '".$wpdb->escape(__('Blogroll'))."')"); diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php index df190628a..738565c9a 100644 --- a/wp-admin/options-general.php +++ b/wp-admin/options-general.php @@ -22,6 +22,11 @@ include('./admin-header.php'); + + + + + @@ -101,7 +106,7 @@ endfor;

- +

diff --git a/wp-admin/upgrade-functions.php b/wp-admin/upgrade-functions.php index af7b305c6..5bc998c63 100644 --- a/wp-admin/upgrade-functions.php +++ b/wp-admin/upgrade-functions.php @@ -33,7 +33,7 @@ function upgrade_all() { if ( $wp_current_db_version < 3308 ) upgrade_160(); - if ( $wp_current_db_version < 3531 ) + if ( $wp_current_db_version < 3548 ) upgrade_210(); $wp_rewrite->flush_rules(); diff --git a/wp-admin/upgrade-schema.php b/wp-admin/upgrade-schema.php index 196ed77bf..eb3fa8cd3 100644 --- a/wp-admin/upgrade-schema.php +++ b/wp-admin/upgrade-schema.php @@ -229,6 +229,8 @@ function populate_options() { add_option('uploads_use_yearmonth_folders', 1); add_option('upload_path', 'wp-content/uploads'); } + // 2.1 + add_option('blog_public', 1); // Delete unused options $unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog'); diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php index 4ac9b68ac..9b9b2751e 100644 --- a/wp-includes/default-filters.php +++ b/wp-includes/default-filters.php @@ -81,8 +81,11 @@ add_filter('comment_text_rss', 'ent2ncr', 8); add_filter('bloginfo_rss', 'ent2ncr', 8); add_filter('the_author', 'ent2ncr', 8); +// Misc filters +add_filter('option_ping_sites', 'privacy_ping_filter'); + // Actions add_action('wp_head', 'rsd_link'); add_action('publish_future_post', 'wp_publish_post', 10, 1); - +add_action('wp_head', 'noindex', 1); ?> diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 855f35cf5..9e4392258 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -2381,4 +2381,10 @@ function wp_cron() { } } +function privacy_ping_filter( $sites ) { + if ( get_option('blog_public') ) + return $sites; + else + return ''; +} ?> diff --git a/wp-includes/template-functions-general.php b/wp-includes/template-functions-general.php index 3994633ec..f15569c46 100644 --- a/wp-includes/template-functions-general.php +++ b/wp-includes/template-functions-general.php @@ -702,4 +702,9 @@ function rsd_link() { echo '\n"; } +function noindex() { + // If the blog is not public, tell robots to go away. + if ( ! get_option('blog_public') ) + echo '' . "\n"; +} ?> diff --git a/wp-includes/version.php b/wp-includes/version.php index 2936135e1..d9b8a78b6 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -3,6 +3,6 @@ // This just holds the version number, in a separate file so we can bump it without cluttering the SVN $wp_version = '2.1-alpha1'; -$wp_db_version = 3531; +$wp_db_version = 3548; ?> \ No newline at end of file