site_iri: comparison web/wp-includes/ms-functions.php

equal deleted inserted replaced

-:f507feede89a
+:09a1c134465b
 *
 * @since MU 1.0
 *
 * @param int $blog_id ID of the blog.
 * @param int $post_id ID of the post you're looking for.
-* @return object The post.
+* @return WP_Post|null WP_Post on success or null on failure
 */
 function get_blog_post( $blog_id, $post_id ) {
-	global $wpdb;
+	switch_to_blog( $blog_id );
+	$post = get_post( $post_id );
-	$key = $blog_id . '-' . $post_id;
+	restore_current_blog();
-	$post = wp_cache_get( $key, 'global-posts' );
-	if ( $post == false ) {
-		$post = $wpdb->get_row( $wpdb->prepare( 'SELECT * FROM ' . $wpdb->get_blog_prefix( $blog_id ) . 'posts WHERE ID = %d', $post_id ) );
-		wp_cache_add( $key, $post, 'global-posts' );
-	}
 	return $post;
 }
 /**
 * @return bool
 */
 function add_user_to_blog( $blog_id, $user_id, $role ) {
 	switch_to_blog($blog_id);
-	$user = new WP_User($user_id);
+	$user = get_userdata( $user_id );
-	if ( ! $user->exists() ) {
+	if ( ! $user ) {
 		restore_current_blog();
-		return new WP_Error('user_does_not_exist', __('That user does not exist.'));
+		return new WP_Error( 'user_does_not_exist', __( 'The requested user does not exist.' ) );
 	}
 	if ( !get_user_meta($user_id, 'primary_blog', true) ) {
 		update_user_meta($user_id, 'primary_blog', $blog_id);
 		$details = get_blog_details($blog_id);
 		update_user_meta($user_id, 'primary_blog', $new_id);
 		update_user_meta($user_id, 'source_domain', $new_domain);
 	}
 	// wp_revoke_user($user_id);
-	$user = new WP_User($user_id);
+	$user = get_userdata( $user_id );
-	if ( ! $user->exists() ) {
+	if ( ! $user ) {
 		restore_current_blog();
 		return new WP_Error('user_does_not_exist', __('That user does not exist.'));
 	}
 	$user->remove_all_caps();
 /**
 * Get the permalink for a post on another blog.
 *
 * @since MU 1.0
 *
-* @param int $_blog_id ID of the source blog.
+* @param int $blog_id ID of the source blog.
 * @param int $post_id ID of the desired post.
 * @return string The post's permalink
 */
-function get_blog_permalink( $_blog_id, $post_id ) {
+function get_blog_permalink( $blog_id, $post_id ) {
-	$key = "{$_blog_id}-{$post_id}-blog_permalink";
+	switch_to_blog( $blog_id );
-	$link = wp_cache_get( $key, 'site-options' );
+	$link = get_permalink( $post_id );
-	if ( $link == false ) {
+	restore_current_blog();
-		switch_to_blog( $_blog_id );
-		$link = get_permalink( $post_id );
-		restore_current_blog();
-		wp_cache_add( $key, $link, 'site-options', 360 );
-	}
 	return $link;
 }
 /**
 * Get a blog's numeric ID from its URL.
 *
 * @since MU 2.6.5
 *
 * @param string $domain
 * @param string $path Optional. Not required for subdomain installations.
-* @return int
+* @return int 0 if no blog found, otherwise the ID of the matching blog
 */
 function get_blog_id_from_url( $domain, $path = '/' ) {
 	global $wpdb;
-	$domain = strtolower( $wpdb->escape( $domain ) );
+	$domain = strtolower( $domain );
-	$path = strtolower( $wpdb->escape( $path ) );
+	$path = strtolower( $path );
 	$id = wp_cache_get( md5( $domain . $path ), 'blog-id-cache' );
-	if ( $id == -1 ) { // blog does not exist
+	if ( $id == -1 ) // blog does not exist
 		return 0;
-	} elseif ( $id ) {
+	elseif ( $id )
-		return (int)$id;
+		return (int) $id;
-	}
+	$id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s and path = %s /* get_blog_id_from_url */", $domain, $path ) );
-	$id = $wpdb->get_var( "SELECT blog_id FROM $wpdb->blogs WHERE domain = '$domain' and path = '$path' /* get_blog_id_from_url */" );
+	if ( ! $id ) {
-	if ( !$id ) {
 		wp_cache_set( md5( $domain . $path ), -1, 'blog-id-cache' );
-		return false;
+		return 0;
 	}
 	wp_cache_set( md5( $domain . $path ), $id, 'blog-id-cache' );
 	return $id;
 }
 * @param string $user_email The email provided by the user at registration.
 * @return bool Returns true when the email address is banned.
 */
 function is_email_address_unsafe( $user_email ) {
 	$banned_names = get_site_option( 'banned_email_domains' );
-	if ($banned_names && !is_array( $banned_names ))
+	if ( $banned_names && ! is_array( $banned_names ) )
-		$banned_names = explode( "\n", $banned_names);
+		$banned_names = explode( "\n", $banned_names );
-	if ( is_array( $banned_names ) && empty( $banned_names ) == false ) {
+	$is_email_address_unsafe = false;
-		$email_domain = strtolower( substr( $user_email, 1 + strpos( $user_email, '@' ) ) );
-		foreach ( (array) $banned_names as $banned_domain ) {
+	if ( $banned_names && is_array( $banned_names ) ) {
-			if ( $banned_domain == '' )
+		list( $email_local_part, $email_domain ) = explode( '@', $user_email );
+		foreach ( $banned_names as $banned_domain ) {
+			if ( ! $banned_domain )
 				continue;
-			if (
-				strstr( $email_domain, $banned_domain ) ||
+			if ( $email_domain == $banned_domain ) {
-				(
+				$is_email_address_unsafe = true;
-					strstr( $banned_domain, '/' ) &&
+				break;
-					preg_match( $banned_domain, $email_domain )
+			}
-				)
-			)
+			$dotted_domain = ".$banned_domain";
-			return true;
+			if ( $dotted_domain === substr( $user_email, -strlen( $dotted_domain ) ) ) {
+				$is_email_address_unsafe = true;
+				break;
+			}
 		}
 	}
-	return false;
+	return apply_filters( 'is_email_address_unsafe', $is_email_address_unsafe, $user_email );
 }
 /**
 * Processes new user registrations.
 *
 	preg_match( '/[0-9]*/', $user_name, $match );
 	if ( $match[0] == $user_name )
 		$errors->add('user_name', __('Sorry, usernames must have letters too!'));
 	if ( !is_email( $user_email ) )
-		$errors->add('user_email', __( 'Please enter a correct email address.' ) );
+		$errors->add('user_email', __( 'Please enter a valid email address.' ) );
 	$limited_email_domains = get_site_option( 'limited_email_domains' );
 	if ( is_array( $limited_email_domains ) && empty( $limited_email_domains ) == false ) {
 		$emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) );
 		if ( in_array( $emaildomain, $limited_email_domains ) == false )
 			$errors->add('user_email', __('Sorry, that email address is not allowed!'));
 	}
 	// Check if the username has been used already.
 	if ( username_exists($user_name) )
-		$errors->add('user_name', __('Sorry, that username already exists!'));
+		$errors->add( 'user_name', __( 'Sorry, that username already exists!' ) );
 	// Check if the email address has been used already.
 	if ( email_exists($user_email) )
-		$errors->add('user_email', __('Sorry, that email address is already used!'));
+		$errors->add( 'user_email', __( 'Sorry, that email address is already used!' ) );
 	// Has someone already signed up for this username?
 	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name) );
 	if ( $signup != null ) {
 		$registered_at =  mysql2date('U', $signup->registered);
 		$now = current_time( 'timestamp', true );
 		$diff = $now - $registered_at;
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 172800 )
+		if ( $diff > 2 * DAY_IN_SECONDS )
 			$wpdb->delete( $wpdb->signups, array( 'user_login' => $user_name ) );
 		else
 			$errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.'));
 		if ( $signup->active == 0 && $signup->user_email == $user_email )
 	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_email = %s", $user_email) );
 	if ( $signup != null ) {
 		$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 172800 )
+		if ( $diff > 2 * DAY_IN_SECONDS )
 			$wpdb->delete( $wpdb->signups, array( 'user_email' => $user_email ) );
 		else
 			$errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.'));
 	}
 * @param string $blogname The blog name provided by the user. Must be unique.
 * @param string $blog_title The blog title provided by the user.
 * @return array Contains the new site data and error messages.
 */
 function wpmu_validate_blog_signup($blogname, $blog_title, $user = '') {
-	global $wpdb, $domain, $base, $current_site;
+	global $wpdb, $domain, $current_site;
+	$base = $current_site->path;
 	$blog_title = strip_tags( $blog_title );
 	$blog_title = substr( $blog_title, 0, 50 );
 	$errors = new WP_Error();
 	if ( empty( $blogname ) )
 		$errors->add('blogname', __( 'Please enter a site name.' ) );
 	if ( preg_match( '/[^a-z0-9]+/', $blogname ) )
-		$errors->add('blogname', __( 'Only lowercase letters and numbers allowed.' ) );
+		$errors->add('blogname', __( 'Only lowercase letters (a-z) and numbers are allowed.' ) );
 	if ( in_array( $blogname, $illegal_names ) == true )
 		$errors->add('blogname',  __( 'That name is not allowed.' ) );
 	if ( strlen( $blogname ) < 4 && !is_super_admin() )
 		$path = $base;
 	} else {
 		$mydomain = "$domain";
 		$path = $base.$blogname.'/';
 	}
-	if ( domain_exists($mydomain, $path) )
+	if ( domain_exists($mydomain, $path, $current_site->id) )
-		$errors->add('blogname', __('Sorry, that site already exists!'));
+		$errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
 	if ( username_exists( $blogname ) ) {
 		if ( is_object( $user ) == false || ( is_object($user) && ( $user->user_login != $blogname ) ) )
 			$errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
 	}
 	// Has someone already signed up for this domain?
 	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path) ); // TODO: Check email too?
 	if ( ! empty($signup) ) {
 		$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 172800 )
+		if ( $diff > 2 * DAY_IN_SECONDS )
 			$wpdb->delete( $wpdb->signups, array( 'domain' => $mydomain , 'path' => $path ) );
 		else
 			$errors->add('blogname', __('That site is currently reserved but may be available in a couple days.'));
 	}
-	$result = array('domain' => $mydomain, 'path' => $path, 'blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors);
+	$result = array('domain' => $mydomain, 'path' => $path, 'blogname' => $blogname, 'blog_title' => $blog_title, 'user' => $user, 'errors' => $errors);
 	return apply_filters('wpmu_validate_blog_signup', $result);
 }
 /**
 * Record site signup information for future activation.
 		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
 	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
 	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 	$message = sprintf(
 		apply_filters( 'wpmu_signup_user_notification_email',
-			__( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\n" ),
+			__( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login." ),
 			$user, $user_email, $key, $meta
 		),
 		site_url( "wp-activate.php?key=$key" )
 	);
 	// TODO: Don't hard code activation link.
 	if ( empty($path) )
 		$path = '/';
 	// Check if the domain has been used already. We should return an error message.
 	if ( domain_exists($domain, $path, $site_id) )
-		return new WP_Error('blog_taken', __('Site already exists.'));
+		return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
 	if ( !defined('WP_INSTALLING') )
 		define( 'WP_INSTALLING', true );
 	if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
 	switch_to_blog( $blog_id );
 	$blogname = get_option( 'blogname' );
 	$siteurl = site_url();
 	restore_current_blog();
-	$msg = sprintf( __( 'New Site: %1s
+	$msg = sprintf( __( 'New Site: %1$s
-URL: %2s
+URL: %2$s
-Remote IP: %3s
+Remote IP: %3$s
-Disable these notifications: %4s' ), $blogname, $siteurl, $_SERVER['REMOTE_ADDR'], $options_site_url);
+Disable these notifications: %4$s' ), $blogname, $siteurl, $_SERVER['REMOTE_ADDR'], $options_site_url);
 	$msg = apply_filters( 'newblog_notify_siteadmin', $msg );
 	wp_mail( $email, sprintf( __( 'New Site Registration: %s' ), $siteurl ), $msg );
 	return true;
 }
 	$email = get_site_option( 'admin_email' );
 	if ( is_email($email) == false )
 		return false;
-	$user = new WP_User($user_id);
+	$user = get_userdata( $user_id );
 	$options_site_url = esc_url(network_admin_url('settings.php'));
-	$msg = sprintf(__('New User: %1s
+	$msg = sprintf(__('New User: %1$s
-Remote IP: %2s
+Remote IP: %2$s
-Disable these notifications: %3s'), $user->user_login, $_SERVER['REMOTE_ADDR'], $options_site_url);
+Disable these notifications: %3$s'), $user->user_login, $_SERVER['REMOTE_ADDR'], $options_site_url);
 	$msg = apply_filters( 'newuser_notify_siteadmin', $msg, $user );
 	wp_mail( $email, sprintf(__('New User Registration: %s'), $user->user_login), $msg );
 	return true;
 }
 * @param int $site_id Optional. Relevant only on multi-network installs.
 * @return int
 */
 function domain_exists($domain, $path, $site_id = 1) {
 	global $wpdb;
-	return $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s AND site_id = %d", $domain, $path, $site_id) );
+	$result = $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s AND site_id = %d", $domain, $path, $site_id) );
+	return apply_filters( 'domain_exists', $result, $domain, $path, $site_id );
 }
 /**
 * Store basic site info in the blogs table.
 *
 *
 * @param int $blog_id The value returned by insert_blog().
 * @param string $blog_title The title of the new site.
 */
 function install_blog($blog_id, $blog_title = '') {
-	global $wpdb, $table_prefix, $wp_roles;
+	global $wpdb, $wp_roles, $current_site;
-	$wpdb->suppress_errors();
 	// Cast for security
 	$blog_id = (int) $blog_id;
 	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
-	if ( $wpdb->get_results("SELECT ID FROM $wpdb->posts") )
+	$wpdb->suppress_errors();
-		die(__('<h1>Already Installed</h1><p>You appear to have already installed WordPress. To reinstall please clear your old database tables first.</p>') . '</body></html>');
+	if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) )
+		die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' );
-	$wpdb->suppress_errors(false);
+	$wpdb->suppress_errors( false );
-	$url = get_blogaddress_by_id($blog_id);
+	$url = get_blogaddress_by_id( $blog_id );
 	// Set everything up
 	make_db_current_silent( 'blog' );
 	populate_options();
 	populate_roles();
 	$wp_roles->_init();
-	// fix url.
+	$url = untrailingslashit( $url );
-	update_option('siteurl', $url);
-	update_option('home', $url);
+	update_option( 'siteurl', $url );
-	update_option('fileupload_url', $url . "files" );
+	update_option( 'home', $url );
-	update_option('upload_path', UPLOADBLOGSDIR . "/$blog_id/files");
-	update_option('blogname', stripslashes( $blog_title ) );
+	if ( get_site_option( 'ms_files_rewriting' ) )
-	update_option('admin_email', '');
+		update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );
-	$wpdb->update( $wpdb->options, array('option_value' => ''), array('option_name' => 'admin_email') );
+	else
+		update_option( 'upload_path', get_blog_option( $current_site->blog_id, 'upload_path' ) );
+	update_option( 'blogname', stripslashes( $blog_title ) );
+	update_option( 'admin_email', '' );
 	// remove all perms
-	$wpdb->delete( $wpdb->usermeta, array( 'meta_key' => $table_prefix.'user_level' ) );
+	$table_prefix = $wpdb->get_blog_prefix();
+	delete_metadata( 'user', 0, $table_prefix . 'user_level',   null, true ); // delete all
-	$wpdb->delete( $wpdb->usermeta, array( 'meta_key' => $table_prefix.'capabilities' ) );
+	delete_metadata( 'user', 0, $table_prefix . 'capabilities', null, true ); // delete all
-	$wpdb->suppress_errors( false );
 }
 /**
 * Set blog defaults.
 *
 We hope you enjoy your new site. Thanks!
 --The Team @ SITE_NAME' ) );
 	$url = get_blogaddress_by_id($blog_id);
-	$user = new WP_User($user_id);
+	$user = get_userdata( $user_id );
 	$welcome_email = str_replace( 'SITE_NAME', $current_site->site_name, $welcome_email );
 	$welcome_email = str_replace( 'BLOG_TITLE', $title, $welcome_email );
 	$welcome_email = str_replace( 'BLOG_URL', $url, $welcome_email );
 	$welcome_email = str_replace( 'USERNAME', $user->user_login, $welcome_email );
 	if ( !apply_filters('wpmu_welcome_user_notification', $user_id, $password, $meta) )
 		return false;
 	$welcome_email = get_site_option( 'welcome_user_email' );
-	$user = new WP_User($user_id);
+	$user = get_userdata( $user_id );
 	$welcome_email = apply_filters( 'update_welcome_user_email', $welcome_email, $user_id, $password, $meta);
 	$welcome_email = str_replace( 'SITE_NAME', $current_site->site_name, $welcome_email );
 	$welcome_email = str_replace( 'USERNAME', $user->user_login, $welcome_email );
 	$welcome_email = str_replace( 'PASSWORD', $password, $welcome_email );
 	if ( false == is_array( $dirsize ) )
 		$dirsize = array();
 	$dirsize[ $directory ][ 'size' ] = recurse_dirsize( $directory );
-	set_transient( 'dirsize_cache', $dirsize, 3600 );
+	set_transient( 'dirsize_cache', $dirsize, HOUR_IN_SECONDS );
 	return $dirsize[ $directory ][ 'size' ];
 }
 /**
 * Get the size of a directory recursively.
 	}
 	return $size;
 }
 /**
-* Check whether a blog has used its allotted upload space.
-*
-* @since MU
-* @uses get_dirsize()
-*
-* @param bool $echo Optional. If $echo is set and the quota is exceeded, a warning message is echoed. Default is true.
-* @return int
-*/
-function upload_is_user_over_quota( $echo = true ) {
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return false;
-	$spaceAllowed = get_space_allowed();
-	if ( empty( $spaceAllowed ) || !is_numeric( $spaceAllowed ) )
-		$spaceAllowed = 10;	// Default space allowed is 10 MB
-	$size = get_dirsize( BLOGUPLOADDIR ) / 1024 / 1024;
-	if ( ($spaceAllowed-$size) < 0 ) {
-		if ( $echo )
-			_e( 'Sorry, you have used your space allocation. Please delete some files to upload more files.' ); // No space left
-		return true;
-	} else {
-		return false;
-	}
-}
-/**
 * Check an array of MIME types against a whitelist.
 *
 * WordPress ships with a set of allowed upload filetypes,
 * which is defined in wp-includes/functions.php in
 * get_allowed_mime_types(). This function is used to filter
 * @param int $blog_id
 * @param int $user_id
 */
 function wpmu_log_new_registrations( $blog_id, $user_id ) {
 	global $wpdb;
-	$user = new WP_User( (int) $user_id );
+	$user = get_userdata( (int) $user_id );
 	$wpdb->insert( $wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace( '/[^0-9., ]/', '',$_SERVER['REMOTE_ADDR'] ), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')) );
-}
-/**
-* Get the remaining upload space for this blog.
-*
-* @since MU
-* @uses upload_is_user_over_quota()
-* @uses get_space_allowed()
-* @uses get_dirsize()
-*
-* @param int $size
-* @return int
-*/
-function fix_import_form_size( $size ) {
-	if ( upload_is_user_over_quota( false ) == true )
-		return 0;
-	$spaceAllowed = 1024 * 1024 * get_space_allowed();
-	$dirsize = get_dirsize( BLOGUPLOADDIR );
-	if ( $size > $spaceAllowed - $dirsize )
-		return $spaceAllowed - $dirsize; // remaining space
-	else
-		return $size; // default
 }
 /**
 * Maintains a canonical list of terms by syncing terms created for each blog with the global terms table.
 *
 *
 * @param array $upload
 * @return mixed If the upload is under the size limit, $upload is returned. Otherwise returns an error message.
 */
 function upload_is_file_too_big( $upload ) {
-	if ( is_array( $upload ) == false || defined( 'WP_IMPORTING' ) )
+	if ( is_array( $upload ) == false || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) )
 		return $upload;
 	if ( strlen( $upload['bits'] )  > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) )
 		return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 ));
 function signup_nonce_check( $result ) {
 	if ( !strpos( $_SERVER[ 'PHP_SELF' ], 'wp-signup.php' ) )
 		return $result;
 	if ( wp_create_nonce('signup_form_' . $_POST[ 'signup_form_id' ]) != $_POST['_signup_form'] )
-		wp_die( __('Please try again!') );
+		wp_die( __( 'Please try again.' ) );
 	return $result;
 }
 /**
 		delete_option( 'new_user_' . $key );
 	if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) )
 		wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url() ) );
-	wp_die( sprintf(__('You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.'), home_url(), admin_url() ), __('Success') );
+	wp_die( sprintf( __( 'You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.' ), home_url(), admin_url() ), __( 'WordPress &rsaquo; Success' ) );
 }
 /**
 * Add a user to a blog based on details from maybe_add_existing_user_to_blog().
 *
 	if ( $username == 0 ) {
 		$user_id = get_current_user_id();
 	} else {
 		$user_id = get_user_id_from_string( $username );
 	}
-	$u = new WP_User( $user_id );
+	$u = get_userdata( $user_id );
 	return ( isset( $u->spam ) && $u->spam == 1 );
 }
 /**
 	return $forced_content;
 }
 /**
-* Formats an String URL to use HTTPS if HTTP is found.
+* Formats a URL to use https.
+*
 * Useful as a filter.
 *
 * @since 2.8.5
-**/
+*
+* @param string URL
+* @return string URL with https as the scheme
+*/
 function filter_SSL( $url ) {
-	if ( !is_string( $url ) )
+	if ( ! is_string( $url ) )
-		return get_bloginfo( 'url' ); //return home blog url with proper scheme
+		return get_bloginfo( 'url' ); // Return home blog url with proper scheme
-	$arrURL = parse_url( $url );
+	if ( force_ssl_content() && is_ssl() )
+		$url = set_url_scheme( $url, 'https' );
-	if ( force_ssl_content() && is_ssl() ) {
-		if ( 'http' === $arrURL['scheme'] )
-			$url = str_replace( $arrURL['scheme'], 'https', $url );
-	}
 	return $url;
 }
 /**
 	global $wpdb;
 	$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(blog_id) as c FROM $wpdb->blogs WHERE site_id = %d AND spam = '0' AND deleted = '0' and archived = '0'", $wpdb->siteid) );
 	update_site_option( 'blog_count', $count );
-	$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'") );
+	$count = $wpdb->get_var( "SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'" );
 	update_site_option( 'user_count', $count );
 }
+/**
+* Returns the space used by the current blog.
+*
+* @since 3.5.0
+*
+* @return int Used space in megabytes
+*/
+function get_space_used() {
+	// Allow for an alternative way of tracking storage space used
+	$space_used = apply_filters( 'pre_get_space_used', false );
+	if ( false === $space_used ) {
+		$upload_dir = wp_upload_dir();
+		$space_used = get_dirsize( $upload_dir['basedir'] ) / 1024 / 1024;
+	}
+	return $space_used;
+}
+/**
+* Returns the upload quota for the current blog.
+*
+* @since MU
+*
+* @return int Quota in megabytes
+*/
+function get_space_allowed() {
+	$space_allowed = get_option( 'blog_upload_space' );
+	if ( ! is_numeric( $space_allowed ) )
+		$space_allowed = get_site_option( 'blog_upload_space' );
+	if ( empty( $space_allowed ) || ! is_numeric( $space_allowed ) )
+		$space_allowed = 50;
+	return $space_allowed;
+}
+/**
+* Determines if there is any upload space left in the current blog's quota.
+*
+* @since 3.0.0
+*
+* @return int of upload space available in bytes
+*/
+function get_upload_space_available() {
+	$space_allowed = get_space_allowed() * 1024 * 1024;
+	if ( get_site_option( 'upload_space_check_disabled' ) )
+		return $space_allowed;
+	$space_used = get_space_used() * 1024 * 1024;
+	if ( ( $space_allowed - $space_used ) <= 0 )
+		return 0;
+	return $space_allowed - $space_used;
+}
+/**
+* Determines if there is any upload space left in the current blog's quota.
+*
+* @since 3.0.0
+* @return bool True if space is available, false otherwise.
+*/
+function is_upload_space_available() {
+	if ( get_site_option( 'upload_space_check_disabled' ) )
+		return true;
+	return (bool) get_upload_space_available();
+}
+/**
+* @since 3.0.0
+*
+* @return int of upload size limit in bytes
+*/
+function upload_size_limit_filter( $size ) {
+	$fileupload_maxk = 1024 * get_site_option( 'fileupload_maxk', 1500 );
+	if ( get_site_option( 'upload_space_check_disabled' ) )
+		return min( $size, $fileupload_maxk );
+	return min( $size, $fileupload_maxk, get_upload_space_available() );
+}

changeset 204	09a1c134465b
parent 194	32102edaa81b