<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12605] trunk: Set svn-eolstyle on some files.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12605">12605</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-01-06 07:50:12 +0000 (Wed, 06 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Set svn-eolstyle on some files. See <a href="http://trac.wordpress.org/ticket/11644">#11644</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpactivatephp">trunk/wp-activate.php</a></li>
<li><a href="#trunkwpincludesmssettingsphp">trunk/wp-includes/ms-settings.php</a></li>
<li><a href="#trunkwpsignupphp">trunk/wp-signup.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkwpactivatephp">trunk/wp-activate.php</a></li>
<li><a href="#trunkwpadmineditformphp">trunk/wp-admin/edit-form.php</a></li>
<li><a href="#trunkwpadmineditpagedraftsphp">trunk/wp-admin/edit-page-drafts.php</a></li>
<li><a href="#trunkwpadmineditpostdraftsphp">trunk/wp-admin/edit-post-drafts.php</a></li>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminlinkimportphp">trunk/wp-admin/link-import.php</a></li>
<li><a href="#trunkwpadminmsadminphp">trunk/wp-admin/ms-admin.php</a></li>
<li><a href="#trunkwpadminmseditphp">trunk/wp-admin/ms-edit.php</a></li>
<li><a href="#trunkwpadminmsoptionsphp">trunk/wp-admin/ms-options.php</a></li>
<li><a href="#trunkwpadminmssitesphp">trunk/wp-admin/ms-sites.php</a></li>
<li><a href="#trunkwpadminmsupgradesitephp">trunk/wp-admin/ms-upgrade-site.php</a></li>
<li><a href="#trunkwpadminmsusersphp">trunk/wp-admin/ms-users.php</a></li>
<li><a href="#trunkwpincludesmetaphp">trunk/wp-includes/meta.php</a></li>
<li><a href="#trunkwpincludesmsdefaultfiltersphp">trunk/wp-includes/ms-default-filters.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
<li><a href="#trunkwpincludesmssettingsphp">trunk/wp-includes/ms-settings.php</a></li>
<li><a href="#trunkwpincludespostthumbnailtemplatephp">trunk/wp-includes/post-thumbnail-template.php</a></li>
<li><a href="#trunkwpsignupphp">trunk/wp-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpactivatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-activate.php (12604 => 12605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-activate.php 2010-01-06 07:44:25 UTC (rev 12604)
+++ trunk/wp-activate.php 2010-01-06 07:50:12 UTC (rev 12605)
</span><span class="lines">@@ -1,88 +1,88 @@
</span><del>-<?php
-define( "WP_INSTALLING", true );
-
-/** Sets up the WordPress Environment. */
-require( dirname(__FILE__) . '/wp-load.php' );
-
-require( 'wp-blog-header.php' );
-require_once( ABSPATH . WPINC . '/registration.php');
-
-if( is_object( $wp_object_cache ) )
- $wp_object_cache->cache_enabled = false;
-
-do_action("activate_header");
-
-function wpmu_activate_stylesheet() {
- ?>
- <style type="text/css">
- form { margin-top: 2em; }
- #submit, #key { width: 90%; font-size: 24px; }
- #language { margin-top: .5em; }
- .error { background: #f66; }
- span.h3 { padding:0 8px; font-size:1.3em; font-family:'Trebuchet MS','Lucida Grande',Verdana,Arial,Sans-Serif; font-weight:700; color:#333333; }
- </style>
- <?php
-}
-add_action( 'wp_head', 'wpmu_activate_stylesheet' );
-
-get_header();
-?>
-
-<div id="content" class="widecolumn">
- <?php if ( empty($_GET['key']) && empty($_POST['key']) ) { ?>
-
- <h2><?php _e('Activation Key Required') ?></h2>
- <form name="activateform" id="activateform" method="post" action="<?php echo 'http://' . $current_site->domain . $current_site->path ?>wp-activate.php">
- <p>
- <label for="key"><?php _e('Activation Key:') ?></label>
- <br /><input type="text" name="key" id="key" value="" size="50" />
- </p>
- <p class="submit">
- <input id="submit" type="submit" name="Submit" class="submit" value="<?php _e('Activate &raquo;') ?>" />
- </p>
- </form>
-
- <?php } else {
-
- $key = !empty($_GET['key']) ? $_GET['key'] : $_POST['key'];
- $result = wpmu_activate_signup($key);
- if ( is_wp_error($result) ) {
- if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
- $signup = $result->get_error_data();
- ?>
- <h2><?php _e('Your account is now active!'); ?></h2>
- <?php
- if( $signup->domain . $signup->path == '' ) {
- printf(__('<p class="lead-in">Your account has been activated. You may now <a href="%1$s">login</a> to the site using your chosen username of "%2$s". Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.</p>'), 'http://' . $current_site->domain . $current_site->path . 'wp-login.php', $signup->user_login, $signup->user_email, 'http://' . $current_site->domain . $current_site->path . 'wp-login.php?action=lostpassword');
- } else {
- printf(__('<p class="lead-in">Your blog at <a href="%1$s">%2$s</a> is active. You may now login to your blog using your chosen username of "%3$s". Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.</p>'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, 'http://' . $current_site->domain . $current_site->path . 'wp-login.php?action=lostpassword');
- }
- } else {
- ?>
- <h2><?php _e('An error occurred during the activation'); ?></h2>
- <?php
- echo '<p>'.$result->get_error_message().'</p>';
- }
- } else {
- extract($result);
- $url = get_blogaddress_by_id( (int) $blog_id);
- $user = new WP_User( (int) $user_id);
- ?>
- <h2><?php _e('Your account is now active!'); ?></h2>
-
- <div id="signup-welcome">
- <p><span class="h3"><?php _e('Username:'); ?></span> <?php echo $user->user_login ?></p>
- <p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $password; ?></p>
- </div>
-
- <?php if( $url != 'http://' . $current_site->domain . $current_site->path ) : ?>
- <p class="view"><?php printf(__('Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Login</a>'), $url, $url . 'wp-login.php' ); ?></p>
- <?php else: ?>
- <p class="view"><?php printf( __( 'Your account is now activated. <a href="%1$s">Login</a> or go back to the <a href="%2$s">homepage</a>.' ), 'http://' . $current_site->domain . $current_site->path . 'wp-login.php', 'http://' . $current_site->domain . $current_site->path ); ?></p>
- <?php endif;
- }
- }
- ?>
-</div>
-
-<?php get_footer(); ?>
</del><ins>+<?php
+define( "WP_INSTALLING", true );
+
+/** Sets up the WordPress Environment. */
+require( dirname(__FILE__) . '/wp-load.php' );
+
+require( 'wp-blog-header.php' );
+require_once( ABSPATH . WPINC . '/registration.php');
+
+if( is_object( $wp_object_cache ) )
+ $wp_object_cache->cache_enabled = false;
+
+do_action("activate_header");
+
+function wpmu_activate_stylesheet() {
+ ?>
+ <style type="text/css">
+ form { margin-top: 2em; }
+ #submit, #key { width: 90%; font-size: 24px; }
+ #language { margin-top: .5em; }
+ .error { background: #f66; }
+ span.h3 { padding:0 8px; font-size:1.3em; font-family:'Trebuchet MS','Lucida Grande',Verdana,Arial,Sans-Serif; font-weight:700; color:#333333; }
+ </style>
+ <?php
+}
+add_action( 'wp_head', 'wpmu_activate_stylesheet' );
+
+get_header();
+?>
+
+<div id="content" class="widecolumn">
+ <?php if ( empty($_GET['key']) && empty($_POST['key']) ) { ?>
+
+ <h2><?php _e('Activation Key Required') ?></h2>
+ <form name="activateform" id="activateform" method="post" action="<?php echo 'http://' . $current_site->domain . $current_site->path ?>wp-activate.php">
+ <p>
+ <label for="key"><?php _e('Activation Key:') ?></label>
+ <br /><input type="text" name="key" id="key" value="" size="50" />
+ </p>
+ <p class="submit">
+ <input id="submit" type="submit" name="Submit" class="submit" value="<?php _e('Activate &raquo;') ?>" />
+ </p>
+ </form>
+
+ <?php } else {
+
+ $key = !empty($_GET['key']) ? $_GET['key'] : $_POST['key'];
+ $result = wpmu_activate_signup($key);
+ if ( is_wp_error($result) ) {
+ if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
+ $signup = $result->get_error_data();
+ ?>
+ <h2><?php _e('Your account is now active!'); ?></h2>
+ <?php
+ if( $signup->domain . $signup->path == '' ) {
+ printf(__('<p class="lead-in">Your account has been activated. You may now <a href="%1$s">login</a> to the site using your chosen username of "%2$s". Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.</p>'), 'http://' . $current_site->domain . $current_site->path . 'wp-login.php', $signup->user_login, $signup->user_email, 'http://' . $current_site->domain . $current_site->path . 'wp-login.php?action=lostpassword');
+ } else {
+ printf(__('<p class="lead-in">Your blog at <a href="%1$s">%2$s</a> is active. You may now login to your blog using your chosen username of "%3$s". Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.</p>'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, 'http://' . $current_site->domain . $current_site->path . 'wp-login.php?action=lostpassword');
+ }
+ } else {
+ ?>
+ <h2><?php _e('An error occurred during the activation'); ?></h2>
+ <?php
+ echo '<p>'.$result->get_error_message().'</p>';
+ }
+ } else {
+ extract($result);
+ $url = get_blogaddress_by_id( (int) $blog_id);
+ $user = new WP_User( (int) $user_id);
+ ?>
+ <h2><?php _e('Your account is now active!'); ?></h2>
+
+ <div id="signup-welcome">
+ <p><span class="h3"><?php _e('Username:'); ?></span> <?php echo $user->user_login ?></p>
+ <p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $password; ?></p>
+ </div>
+
+ <?php if( $url != 'http://' . $current_site->domain . $current_site->path ) : ?>
+ <p class="view"><?php printf(__('Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Login</a>'), $url, $url . 'wp-login.php' ); ?></p>
+ <?php else: ?>
+ <p class="view"><?php printf( __( 'Your account is now activated. <a href="%1$s">Login</a> or go back to the <a href="%2$s">homepage</a>.' ), 'http://' . $current_site->domain . $current_site->path . 'wp-login.php', 'http://' . $current_site->domain . $current_site->path ); ?></p>
+ <?php endif;
+ }
+ }
+ ?>
+</div>
+
+<?php get_footer(); ?>
</ins><span class="cx">Property changes on: trunk/wp-activate.php
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadmineditformphp"></a>
<div class="propset"><h4>Property changes: trunk/wp-admin/edit-form.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadmineditpagedraftsphp"></a>
<div class="propset"><h4>Property changes: trunk/wp-admin/edit-page-drafts.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadmineditpostdraftsphp"></a>
<div class="propset"><h4>Property changes: trunk/wp-admin/edit-post-drafts.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadminincludesmsphp"></a>
<div class="propset"><h4>Property changes: trunk/wp-admin/includes/ms.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadminlinkimportphp"></a>
<div class="propset"><h4>Property changes: trunk/wp-admin/link-import.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadminmsadminphp"></a>
<div class="propset"><h4>Property changes: trunk/wp-admin/ms-admin.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadminmseditphp"></a>
<div class="propset"><h4>Property changes: trunk/wp-admin/ms-edit.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadminmsoptionsphp"></a>
<div class="propset"><h4>Property changes: trunk/wp-admin/ms-options.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="propset"><h4>Property changes: trunk/wp-admin/ms-sites.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadminmsupgradesitephp"></a>
<div class="propset"><h4>Property changes: trunk/wp-admin/ms-upgrade-site.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpadminmsusersphp"></a>
<div class="propset"><h4>Property changes: trunk/wp-admin/ms-users.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpincludesmetaphp"></a>
<div class="propset"><h4>Property changes: trunk/wp-includes/meta.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpincludesmsdefaultfiltersphp"></a>
<div class="propset"><h4>Property changes: trunk/wp-includes/ms-default-filters.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="propset"><h4>Property changes: trunk/wp-includes/ms-functions.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpincludesmssettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-settings.php (12604 => 12605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-settings.php 2010-01-06 07:44:25 UTC (rev 12604)
+++ trunk/wp-includes/ms-settings.php 2010-01-06 07:50:12 UTC (rev 12605)
</span><span class="lines">@@ -1,245 +1,245 @@
</span><del>-<?php
-if( isset( $current_site ) && isset( $current_blog ) )
- return;
-
-// depreciated
-$wpmuBaseTablePrefix = $table_prefix;
-
-$domain = addslashes( $_SERVER['HTTP_HOST'] );
-if( substr( $domain, 0, 4 ) == 'www.' )
- $domain = substr( $domain, 4 );
-if( strpos( $domain, ':' ) ) {
- if( substr( $domain, -3 ) == ':80' ) {
- $domain = substr( $domain, 0, -3 );
- $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -3 );
- } elseif( substr( $domain, -4 ) == ':443' ) {
- $domain = substr( $domain, 0, -4 );
- $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -4 );
- } else {
- die( 'WPMU only works without the port number in the URL.' );
- }
-}
-$domain = preg_replace('/:.*$/', '', $domain); // Strip ports
-if( substr( $domain, -1 ) == '.' )
- $domain = substr( $domain, 0, -1 );
-
-$path = preg_replace( '|([a-z0-9-]+.php.*)|', '', $_SERVER['REQUEST_URI'] );
-$path = str_replace ( '/wp-admin/', '/', $path );
-$path = preg_replace( '|(/[a-z0-9-]+?/).*|', '$1', $path );
-
-function get_current_site_name( $current_site ) {
- global $wpdb;
- $current_site->site_name = wp_cache_get( $current_site->id . ':current_site_name', "site-options" );
- if ( !$current_site->site_name ) {
- $current_site->site_name = $wpdb->get_var( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = %d AND meta_key = 'site_name'", $current_site->id ) );
- if( $current_site->site_name == null )
- $current_site->site_name = ucfirst( $current_site->domain );
- wp_cache_set( $current_site->id . ':current_site_name', $current_site->site_name, 'site-options');
- }
- return $current_site;
-}
-
-function wpmu_current_site() {
- global $wpdb, $current_site, $domain, $path, $sites;
- if( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) ) {
- $current_site->id = (defined( 'SITE_ID_CURRENT_SITE' ) ? constant('SITE_ID_CURRENT_SITE') : 1);
- $current_site->domain = DOMAIN_CURRENT_SITE;
- $current_site->path = $path = PATH_CURRENT_SITE;
- if( defined( 'BLOGID_CURRENT_SITE' ) )
- $current_site->blog_id = BLOGID_CURRENT_SITE;
- return $current_site;
- }
-
- $current_site = wp_cache_get( "current_site", "site-options" );
- if( $current_site )
- return $current_site;
-
- $wpdb->suppress_errors();
- $sites = $wpdb->get_results( "SELECT * FROM $wpdb->site" ); // usually only one site
- if( count( $sites ) == 1 ) {
- $current_site = $sites[0];
- $path = $current_site->path;
- $current_site->blog_id = $wpdb->get_var( "SELECT blog_id FROM {$wpdb->blogs} WHERE domain='{$current_site->domain}' AND path='{$current_site->path}'" );
- $current_site = get_current_site_name( $current_site );
- wp_cache_set( "current_site", $current_site, "site-options" );
- return $current_site;
- }
- $path = substr( $_SERVER[ 'REQUEST_URI' ], 0, 1 + strpos( $_SERVER[ 'REQUEST_URI' ], '/', 1 ) );
- if( constant( 'VHOST' ) == 'yes' ) {
- $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path = %s", $domain, $path) );
- if( $current_site != null )
- return $current_site;
- $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path='/'", $domain) );
- if( $current_site != null ) {
- $path = '/';
- return $current_site;
- }
-
- $sitedomain = substr( $domain, 1 + strpos( $domain, '.' ) );
- $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path = %s", $sitedomain, $path) );
- if( $current_site != null )
- return $current_site;
- $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path='/'", $sitedomain) );
- if( $current_site == null && defined( "WP_INSTALLING" ) == false ) {
- if( count( $sites ) == 1 ) {
- $current_site = $sites[0];
- die( "That blog does not exist. Please try <a href='http://{$current_site->domain}{$current_site->path}'>http://{$current_site->domain}{$current_site->path}</a>" );
- } else {
- die( "No WPMU site defined on this host. If you are the owner of this site, please check <a href='http://codex.wordpress.org/Debugging_WPMU'>Debugging WPMU</a> for further assistance." );
- }
- } else {
- $path = '/';
- }
- } else {
- $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path = %s", $domain, $path) );
- if( $current_site != null )
- return $current_site;
- $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path='/'", $domain) );
- if( $current_site == null && defined( "WP_INSTALLING" ) == false ) {
- if( count( $sites ) == 1 ) {
- $current_site = $sites[0];
- die( "That blog does not exist. Please try <a href='http://{$current_site->domain}{$current_site->path}'>http://{$current_site->domain}{$current_site->path}</a>" );
- } else {
- die( "No WPMU site defined on this host. If you are the owner of this site, please check <a href='http://codex.wordpress.org/Debugging_WPMU'>Debugging WPMU</a> for further assistance." );
- }
- } else {
- $path = '/';
- }
- }
- return $current_site;
-}
-
-$current_site = wpmu_current_site();
-if( !isset( $current_site->blog_id ) )
- $current_site->blog_id = $wpdb->get_var( "SELECT blog_id FROM {$wpdb->blogs} WHERE domain='{$current_site->domain}' AND path='{$current_site->path}'" );
-
-if( constant( 'VHOST' ) == 'yes' ) {
- $current_blog = wp_cache_get( 'current_blog_' . $domain, 'site-options' );
- if( !$current_blog ) {
- $current_blog = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s", $domain) );
- if( $current_blog )
- wp_cache_set( 'current_blog_' . $domain, $current_blog, 'site-options' );
- }
- if( $current_blog != null && $current_blog->site_id != $current_site->id ) {
- $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE id = %d", $current_blog->site_id) );
- } else {
- $blogname = substr( $domain, 0, strpos( $domain, '.' ) );
- }
-} else {
- $blogname = htmlspecialchars( substr( $_SERVER[ 'REQUEST_URI' ], strlen( $path ) ) );
- if( strpos( $blogname, '/' ) )
- $blogname = substr( $blogname, 0, strpos( $blogname, '/' ) );
- if( strpos( " ".$blogname, '?' ) )
- $blogname = substr( $blogname, 0, strpos( $blogname, '?' ) );
- $reserved_blognames = array( 'page', 'comments', 'blog', 'wp-admin', 'wp-includes', 'wp-content', 'files', 'feed' );
- if ( $blogname != '' && !in_array( $blogname, $reserved_blognames ) && !is_file( $blogname ) ) {
- $path = $path . $blogname . '/';
- }
- $current_blog = wp_cache_get( 'current_blog_' . $domain . $path, 'site-options' );
- if( !$current_blog ) {
- $current_blog = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $domain, $path) );
- if( $current_blog )
- wp_cache_set( 'current_blog_' . $domain . $path, $current_blog, 'site-options' );
- }
-}
-
-if( defined( "WP_INSTALLING" ) == false && constant( 'VHOST' ) == 'yes' && !is_object( $current_blog ) ) {
- if( defined( 'NOBLOGREDIRECT' ) ) {
- $destination = constant( 'NOBLOGREDIRECT' );
- if ( $destination == '%siteurl%' )
- $destination = "http://" . $current_site->domain . $current_site->path;
- header( "Location: " . $destination);
- die();
- } else {
- header( "Location: http://" . $current_site->domain . $current_site->path . "wp-signup.php?new=" . str_replace( '.' . $current_site->domain, '', $domain ) );
- die();
- }
-
-}
-
-if( defined( "WP_INSTALLING" ) == false ) {
- if( $current_site && $current_blog == null ) {
- if( $current_site->domain != $_SERVER[ 'HTTP_HOST' ] ) {
- header( "Location: http://" . $current_site->domain . $current_site->path );
- exit;
- }
- $current_blog = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $current_site->domain, $current_site->path) );
- }
- if( $current_blog == false || $current_site == false )
- is_installed();
-}
-
-$blog_id = $current_blog->blog_id;
-$public = $current_blog->public;
-
-if( $current_blog->site_id == 0 || $current_blog->site_id == '' )
- $current_blog->site_id = 1;
-$site_id = $current_blog->site_id;
-
-$current_site = get_current_site_name( $current_site );
-
-if( $blog_id == false ) {
- // no blog found, are we installing? Check if the table exists.
- if ( defined('WP_INSTALLING') ) {
- $blog_id = $wpdb->get_var( "SELECT blog_id FROM $wpdb->blogs LIMIT 0,1" );
- if( $blog_id == false ) {
- // table doesn't exist. This is the first blog
- $blog_id = 1;
- } else {
- // table exists
- // don't create record at this stage. we're obviously installing so it doesn't matter what the table vars below are like.
- // default to using the "main" blog.
- $blog_id = 1;
- }
- $current_blog->blog_id = $blog_id;
- } else {
- $check = $wpdb->get_results( "SELECT * FROM $wpdb->site" );
- if( $check == false ) {
- $msg = ': DB Tables Missing';
- } else {
- $msg = '';
- }
- die( "No Blog by that name on this system." . $msg );
- }
-}
-
-$wpdb->suppress_errors( false );
-
-if( '0' == $current_blog->public ) {
- // This just means the blog shouldn't show up in google, etc. Only to registered members
-}
-
-function is_installed() {
- global $wpdb, $domain, $path;
- $base = stripslashes( $base );
- if( defined( "WP_INSTALLING" ) == false ) {
- $check = $wpdb->get_results( "SELECT * FROM $wpdb->site" );
- $msg = "If your blog does not display, please contact the owner of this site.<br /><br />If you are the owner of this site please check that MySQL is running properly and all tables are error free.<br /><br />";
- if( $check == false ) {
- $msg .= "<strong>Database Tables Missing.</strong><br />Database tables are missing. This means that MySQL is either not running, WPMU was not installed properly, or someone deleted {$wpdb->site}. You really <em>should</em> look at your database now.<br />";
- } else {
- $msg .= '<strong>Could Not Find Blog!</strong><br />';
- $msg .= "Searched for <em>" . $domain . $path . "</em> in " . DB_NAME . "::" . $wpdb->blogs . " table. Is that right?<br />";
- }
- $msg .= "<br />\n<h1>What do I do now?</h1>";
- $msg .= "Read the <a target='_blank' href='http://codex.wordpress.org/Debugging_WPMU'>bug report</a> page. Some of the guidelines there may help you figure out what went wrong.<br />";
- $msg .= "If you're still stuck with this message, then check that your database contains the following tables:<ul>
- <li> $wpdb->blogs </li>
- <li> $wpdb->users </li>
- <li> $wpdb->usermeta </li>
- <li> $wpdb->site </li>
- <li> $wpdb->sitemeta </li>
- <li> $wpdb->sitecategories </li>
- </ul>";
- $msg .= "If you suspect a problem please report it to the support forums but you must include the information asked for in the <a href='http://codex.wordpress.org/Debugging_WPMU'>WPMU bug reporting guidelines</a>!<br /><br />";
- if( is_file( 'release-info.txt' ) ) {
- $msg .= 'Your bug report must include the following text: "';
- $info = file( 'release-info.txt' );
- $msg .= $info[ 4 ] . '"';
- }
-
- die( "<h1>Fatal Error</h1> " . $msg );
- }
-}
-
-?>
</del><ins>+<?php
+if( isset( $current_site ) && isset( $current_blog ) )
+ return;
+
+// depreciated
+$wpmuBaseTablePrefix = $table_prefix;
+
+$domain = addslashes( $_SERVER['HTTP_HOST'] );
+if( substr( $domain, 0, 4 ) == 'www.' )
+ $domain = substr( $domain, 4 );
+if( strpos( $domain, ':' ) ) {
+ if( substr( $domain, -3 ) == ':80' ) {
+ $domain = substr( $domain, 0, -3 );
+ $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -3 );
+ } elseif( substr( $domain, -4 ) == ':443' ) {
+ $domain = substr( $domain, 0, -4 );
+ $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -4 );
+ } else {
+ die( 'WPMU only works without the port number in the URL.' );
+ }
+}
+$domain = preg_replace('/:.*$/', '', $domain); // Strip ports
+if( substr( $domain, -1 ) == '.' )
+ $domain = substr( $domain, 0, -1 );
+
+$path = preg_replace( '|([a-z0-9-]+.php.*)|', '', $_SERVER['REQUEST_URI'] );
+$path = str_replace ( '/wp-admin/', '/', $path );
+$path = preg_replace( '|(/[a-z0-9-]+?/).*|', '$1', $path );
+
+function get_current_site_name( $current_site ) {
+ global $wpdb;
+ $current_site->site_name = wp_cache_get( $current_site->id . ':current_site_name', "site-options" );
+ if ( !$current_site->site_name ) {
+ $current_site->site_name = $wpdb->get_var( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = %d AND meta_key = 'site_name'", $current_site->id ) );
+ if( $current_site->site_name == null )
+ $current_site->site_name = ucfirst( $current_site->domain );
+ wp_cache_set( $current_site->id . ':current_site_name', $current_site->site_name, 'site-options');
+ }
+ return $current_site;
+}
+
+function wpmu_current_site() {
+ global $wpdb, $current_site, $domain, $path, $sites;
+ if( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) ) {
+ $current_site->id = (defined( 'SITE_ID_CURRENT_SITE' ) ? constant('SITE_ID_CURRENT_SITE') : 1);
+ $current_site->domain = DOMAIN_CURRENT_SITE;
+ $current_site->path = $path = PATH_CURRENT_SITE;
+ if( defined( 'BLOGID_CURRENT_SITE' ) )
+ $current_site->blog_id = BLOGID_CURRENT_SITE;
+ return $current_site;
+ }
+
+ $current_site = wp_cache_get( "current_site", "site-options" );
+ if( $current_site )
+ return $current_site;
+
+ $wpdb->suppress_errors();
+ $sites = $wpdb->get_results( "SELECT * FROM $wpdb->site" ); // usually only one site
+ if( count( $sites ) == 1 ) {
+ $current_site = $sites[0];
+ $path = $current_site->path;
+ $current_site->blog_id = $wpdb->get_var( "SELECT blog_id FROM {$wpdb->blogs} WHERE domain='{$current_site->domain}' AND path='{$current_site->path}'" );
+ $current_site = get_current_site_name( $current_site );
+ wp_cache_set( "current_site", $current_site, "site-options" );
+ return $current_site;
+ }
+ $path = substr( $_SERVER[ 'REQUEST_URI' ], 0, 1 + strpos( $_SERVER[ 'REQUEST_URI' ], '/', 1 ) );
+ if( constant( 'VHOST' ) == 'yes' ) {
+ $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path = %s", $domain, $path) );
+ if( $current_site != null )
+ return $current_site;
+ $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path='/'", $domain) );
+ if( $current_site != null ) {
+ $path = '/';
+ return $current_site;
+ }
+
+ $sitedomain = substr( $domain, 1 + strpos( $domain, '.' ) );
+ $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path = %s", $sitedomain, $path) );
+ if( $current_site != null )
+ return $current_site;
+ $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path='/'", $sitedomain) );
+ if( $current_site == null && defined( "WP_INSTALLING" ) == false ) {
+ if( count( $sites ) == 1 ) {
+ $current_site = $sites[0];
+ die( "That blog does not exist. Please try <a href='http://{$current_site->domain}{$current_site->path}'>http://{$current_site->domain}{$current_site->path}</a>" );
+ } else {
+ die( "No WPMU site defined on this host. If you are the owner of this site, please check <a href='http://codex.wordpress.org/Debugging_WPMU'>Debugging WPMU</a> for further assistance." );
+ }
+ } else {
+ $path = '/';
+ }
+ } else {
+ $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path = %s", $domain, $path) );
+ if( $current_site != null )
+ return $current_site;
+ $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path='/'", $domain) );
+ if( $current_site == null && defined( "WP_INSTALLING" ) == false ) {
+ if( count( $sites ) == 1 ) {
+ $current_site = $sites[0];
+ die( "That blog does not exist. Please try <a href='http://{$current_site->domain}{$current_site->path}'>http://{$current_site->domain}{$current_site->path}</a>" );
+ } else {
+ die( "No WPMU site defined on this host. If you are the owner of this site, please check <a href='http://codex.wordpress.org/Debugging_WPMU'>Debugging WPMU</a> for further assistance." );
+ }
+ } else {
+ $path = '/';
+ }
+ }
+ return $current_site;
+}
+
+$current_site = wpmu_current_site();
+if( !isset( $current_site->blog_id ) )
+ $current_site->blog_id = $wpdb->get_var( "SELECT blog_id FROM {$wpdb->blogs} WHERE domain='{$current_site->domain}' AND path='{$current_site->path}'" );
+
+if( constant( 'VHOST' ) == 'yes' ) {
+ $current_blog = wp_cache_get( 'current_blog_' . $domain, 'site-options' );
+ if( !$current_blog ) {
+ $current_blog = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s", $domain) );
+ if( $current_blog )
+ wp_cache_set( 'current_blog_' . $domain, $current_blog, 'site-options' );
+ }
+ if( $current_blog != null && $current_blog->site_id != $current_site->id ) {
+ $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE id = %d", $current_blog->site_id) );
+ } else {
+ $blogname = substr( $domain, 0, strpos( $domain, '.' ) );
+ }
+} else {
+ $blogname = htmlspecialchars( substr( $_SERVER[ 'REQUEST_URI' ], strlen( $path ) ) );
+ if( strpos( $blogname, '/' ) )
+ $blogname = substr( $blogname, 0, strpos( $blogname, '/' ) );
+ if( strpos( " ".$blogname, '?' ) )
+ $blogname = substr( $blogname, 0, strpos( $blogname, '?' ) );
+ $reserved_blognames = array( 'page', 'comments', 'blog', 'wp-admin', 'wp-includes', 'wp-content', 'files', 'feed' );
+ if ( $blogname != '' && !in_array( $blogname, $reserved_blognames ) && !is_file( $blogname ) ) {
+ $path = $path . $blogname . '/';
+ }
+ $current_blog = wp_cache_get( 'current_blog_' . $domain . $path, 'site-options' );
+ if( !$current_blog ) {
+ $current_blog = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $domain, $path) );
+ if( $current_blog )
+ wp_cache_set( 'current_blog_' . $domain . $path, $current_blog, 'site-options' );
+ }
+}
+
+if( defined( "WP_INSTALLING" ) == false && constant( 'VHOST' ) == 'yes' && !is_object( $current_blog ) ) {
+ if( defined( 'NOBLOGREDIRECT' ) ) {
+ $destination = constant( 'NOBLOGREDIRECT' );
+ if ( $destination == '%siteurl%' )
+ $destination = "http://" . $current_site->domain . $current_site->path;
+ header( "Location: " . $destination);
+ die();
+ } else {
+ header( "Location: http://" . $current_site->domain . $current_site->path . "wp-signup.php?new=" . str_replace( '.' . $current_site->domain, '', $domain ) );
+ die();
+ }
+
+}
+
+if( defined( "WP_INSTALLING" ) == false ) {
+ if( $current_site && $current_blog == null ) {
+ if( $current_site->domain != $_SERVER[ 'HTTP_HOST' ] ) {
+ header( "Location: http://" . $current_site->domain . $current_site->path );
+ exit;
+ }
+ $current_blog = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->blogs WHERE domain = %s AND path = %s", $current_site->domain, $current_site->path) );
+ }
+ if( $current_blog == false || $current_site == false )
+ is_installed();
+}
+
+$blog_id = $current_blog->blog_id;
+$public = $current_blog->public;
+
+if( $current_blog->site_id == 0 || $current_blog->site_id == '' )
+ $current_blog->site_id = 1;
+$site_id = $current_blog->site_id;
+
+$current_site = get_current_site_name( $current_site );
+
+if( $blog_id == false ) {
+ // no blog found, are we installing? Check if the table exists.
+ if ( defined('WP_INSTALLING') ) {
+ $blog_id = $wpdb->get_var( "SELECT blog_id FROM $wpdb->blogs LIMIT 0,1" );
+ if( $blog_id == false ) {
+ // table doesn't exist. This is the first blog
+ $blog_id = 1;
+ } else {
+ // table exists
+ // don't create record at this stage. we're obviously installing so it doesn't matter what the table vars below are like.
+ // default to using the "main" blog.
+ $blog_id = 1;
+ }
+ $current_blog->blog_id = $blog_id;
+ } else {
+ $check = $wpdb->get_results( "SELECT * FROM $wpdb->site" );
+ if( $check == false ) {
+ $msg = ': DB Tables Missing';
+ } else {
+ $msg = '';
+ }
+ die( "No Blog by that name on this system." . $msg );
+ }
+}
+
+$wpdb->suppress_errors( false );
+
+if( '0' == $current_blog->public ) {
+ // This just means the blog shouldn't show up in google, etc. Only to registered members
+}
+
+function is_installed() {
+ global $wpdb, $domain, $path;
+ $base = stripslashes( $base );
+ if( defined( "WP_INSTALLING" ) == false ) {
+ $check = $wpdb->get_results( "SELECT * FROM $wpdb->site" );
+ $msg = "If your blog does not display, please contact the owner of this site.<br /><br />If you are the owner of this site please check that MySQL is running properly and all tables are error free.<br /><br />";
+ if( $check == false ) {
+ $msg .= "<strong>Database Tables Missing.</strong><br />Database tables are missing. This means that MySQL is either not running, WPMU was not installed properly, or someone deleted {$wpdb->site}. You really <em>should</em> look at your database now.<br />";
+ } else {
+ $msg .= '<strong>Could Not Find Blog!</strong><br />';
+ $msg .= "Searched for <em>" . $domain . $path . "</em> in " . DB_NAME . "::" . $wpdb->blogs . " table. Is that right?<br />";
+ }
+ $msg .= "<br />\n<h1>What do I do now?</h1>";
+ $msg .= "Read the <a target='_blank' href='http://codex.wordpress.org/Debugging_WPMU'>bug report</a> page. Some of the guidelines there may help you figure out what went wrong.<br />";
+ $msg .= "If you're still stuck with this message, then check that your database contains the following tables:<ul>
+ <li> $wpdb->blogs </li>
+ <li> $wpdb->users </li>
+ <li> $wpdb->usermeta </li>
+ <li> $wpdb->site </li>
+ <li> $wpdb->sitemeta </li>
+ <li> $wpdb->sitecategories </li>
+ </ul>";
+ $msg .= "If you suspect a problem please report it to the support forums but you must include the information asked for in the <a href='http://codex.wordpress.org/Debugging_WPMU'>WPMU bug reporting guidelines</a>!<br /><br />";
+ if( is_file( 'release-info.txt' ) ) {
+ $msg .= 'Your bug report must include the following text: "';
+ $info = file( 'release-info.txt' );
+ $msg .= $info[ 4 ] . '"';
+ }
+
+ die( "<h1>Fatal Error</h1> " . $msg );
+ }
+}
+
+?>
</ins><span class="cx">Property changes on: trunk/wp-includes/ms-settings.php
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpincludespostthumbnailtemplatephp"></a>
<div class="propset"><h4>Property changes: trunk/wp-includes/post-thumbnail-template.php</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre></div>
<a id="trunkwpsignupphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-signup.php (12604 => 12605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-signup.php 2010-01-06 07:44:25 UTC (rev 12604)
+++ trunk/wp-signup.php 2010-01-06 07:50:12 UTC (rev 12605)
</span><span class="lines">@@ -1,439 +1,439 @@
</span><del>-<?php
-
-/** Sets up the WordPress Environment. */
-require( dirname(__FILE__) . '/wp-load.php' );
-
-add_action( 'wp_head', 'signuppageheaders' ) ;
-
-require( 'wp-blog-header.php' );
-require_once( ABSPATH . WPINC . '/registration.php' );
-
-if( is_array( get_site_option( 'illegal_names' )) && $_GET[ 'new' ] != '' && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) == true ) {
- wp_redirect( "http://{$current_site->domain}{$current_site->path}" );
- die();
-}
-
-function do_signup_header() {
- do_action("signup_header");
-}
-add_action( 'wp_head', 'do_signup_header' );
-
-function signuppageheaders() {
- echo "<meta name='robots' content='noindex,nofollow' />\n";
-}
-
-if( $current_blog->domain . $current_blog->path != $current_site->domain . $current_site->path ) {
- wp_redirect( "http://" . $current_site->domain . $current_site->path . "wp-signup.php" );
- die();
-}
-
-function wpmu_signup_stylesheet() {
- ?>
- <style type="text/css">
- .mu_register { width: 90%; margin:0 auto; }
- .mu_register form { margin-top: 2em; }
- .mu_register .error { font-weight:700; padding:10px; color:#333333; background:#FFEBE8; border:1px solid #CC0000; }
- .mu_register input[type="submit"],
- .mu_register #blog_title,
- .mu_register #user_email,
- .mu_register #blogname,
- .mu_register #user_name { width:100%; font-size: 24px; margin:5px 0; }
- .mu_register .prefix_address,
- .mu_register .suffix_address {font-size: 18px;display:inline; }
- .mu_register label { font-weight:700; font-size:15px; display:block; margin:10px 0; }
- .mu_register label.checkbox { display:inline; }
- .mu_register .mu_alert { font-weight:700; padding:10px; color:#333333; background:#ffffe0; border:1px solid #e6db55; }
- </style>
- <?php
-}
-
-add_action( 'wp_head', 'wpmu_signup_stylesheet' );
-get_header();
-?>
-<div id="content" class="widecolumn">
-<div class="mu_register">
-<?php
-function show_blog_form($blogname = '', $blog_title = '', $errors = '') {
- global $current_site;
- // Blog name
- if( constant( "VHOST" ) == 'no' )
- echo '<label for="blogname">' . __('Blog Name:') . '</label>';
- else
- echo '<label for="blogname">' . __('Blog Domain:') . '</label>';
-
- if ( $errmsg = $errors->get_error_message('blogname') ) { ?>
- <p class="error"><?php echo $errmsg ?></p>
- <?php }
-
- if( constant( "VHOST" ) == 'no' ) {
- echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span><input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /><br />';
- } else {
- echo '<input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /><span class="suffix_address">.' . $current_site->domain . $current_site->path . '</span><br />';
- }
- if ( !is_user_logged_in() ) {
- print '(<strong>' . __( 'Your address will be ' );
- if( constant( "VHOST" ) == 'no' ) {
- print $current_site->domain . $current_site->path . __( 'blogname' );
- } else {
- print __( 'domain.' ) . $current_site->domain . $current_site->path;
- }
- echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' ) . '</p>';
- }
-
- // Blog Title
- ?>
- <label for="blog_title"><?php _e('Blog Title:') ?></label>
- <?php if ( $errmsg = $errors->get_error_message('blog_title') ) { ?>
- <p class="error"><?php echo $errmsg ?></p>
- <?php }
- echo '<input name="blog_title" type="text" id="blog_title" value="'.wp_specialchars($blog_title, 1).'" /></p>';
- ?>
-
- <div id="privacy">
- <p class="privacy-intro">
- <label for="blog_public_on"><?php _e('Privacy:') ?></label>
- <?php _e('I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.'); ?>
- <div style="clear:both;"></div>
- <label class="checkbox" for="blog_public_on">
- <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php if( !isset( $_POST['blog_public'] ) || $_POST['blog_public'] == '1' ) { ?>checked="checked"<?php } ?> />
- <strong><?php _e( 'Yes' ); ?></strong>
- </label>
- <label class="checkbox" for="blog_public_off">
- <input type="radio" id="blog_public_off" name="blog_public" value="0" <?php if( isset( $_POST['blog_public'] ) && $_POST['blog_public'] == '0' ) { ?>checked="checked"<?php } ?> />
- <strong><?php _e( 'No' ); ?></strong>
- </label>
- </p>
- </div>
-
- <?php
- do_action('signup_blogform', $errors);
-}
-
-function validate_blog_form() {
- $user = '';
- if ( is_user_logged_in() )
- $user = wp_get_current_user();
-
- return wpmu_validate_blog_signup($_POST['blogname'], $_POST['blog_title'], $user);
-}
-
-function show_user_form($user_name = '', $user_email = '', $errors = '') {
- // User name
- echo '<label for="user_name">' . __('Username:') . '</label>';
- if ( $errmsg = $errors->get_error_message('user_name') ) {
- echo '<p class="error">'.$errmsg.'</p>';
- }
- echo '<input name="user_name" type="text" id="user_name" value="'.$user_name.'" maxlength="50" /><br />';
- _e('(Must be at least 4 characters, letters and numbers only.)');
- ?>
-
- <label for="user_email"><?php _e('Email&nbsp;Address:') ?></label>
- <?php if ( $errmsg = $errors->get_error_message('user_email') ) { ?>
- <p class="error"><?php echo $errmsg ?></p>
- <?php } ?>
- <input name="user_email" type="text" id="user_email" value="<?php echo wp_specialchars($user_email, 1) ?>" maxlength="200" /><br /><?php _e('(We&#8217;ll send your password to this address, so <strong>triple-check it</strong>.)') ?>
- <?php
- if ( $errmsg = $errors->get_error_message('generic') ) {
- echo '<p class="error">'.$errmsg.'</p>';
- }
- do_action( 'signup_extra_fields', $errors );
-}
-
-function validate_user_form() {
- return wpmu_validate_user_signup($_POST['user_name'], $_POST['user_email']);
-}
-
-function signup_another_blog($blogname = '', $blog_title = '', $errors = '') {
- global $current_user, $current_site;
-
- if ( ! is_wp_error($errors) ) {
- $errors = new WP_Error();
- }
-
- // allow definition of default variables
- $filtered_results = apply_filters('signup_another_blog_init', array('blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors ));
- $blogname = $filtered_results['blogname'];
- $blog_title = $filtered_results['blog_title'];
- $errors = $filtered_results['errors'];
-
- echo '<h2>' . sprintf( __('Get <em>another</em> %s blog in seconds'), $current_site->site_name ) . '</h2>';
-
- if ( $errors->get_error_code() ) {
- echo "<p>" . __('There was a problem, please correct the form below and try again.') . "</p>";
- }
- ?>
- <p><?php printf(__("Welcome back, %s. By filling out the form below, you can <strong>add another blog to your account</strong>. There is no limit to the number of blogs you can have, so create to your heart's content, but blog responsibly."), $current_user->display_name) ?></p>
-
- <?php
- $blogs = get_blogs_of_user($current_user->ID);
- if ( !empty($blogs) ) { ?>
- <p>
- <?php _e('Blogs you are already a member of:') ?>
- <ul>
- <?php foreach ( $blogs as $blog ) {
- echo "<li><a href='http://" . $blog->domain . $blog->path . "'>" . $blog->domain . $blog->path . "</a></li>";
- } ?>
- </ul>
- </p>
- <?php } ?>
-
- <p><?php _e("If you&#8217;re not going to use a great blog domain, leave it for a new user. Now have at it!") ?></p>
- <form id="setupform" method="post" action="wp-signup.php">
- <input type="hidden" name="stage" value="gimmeanotherblog" />
- <?php do_action( "signup_hidden_fields" ); ?>
- <?php show_blog_form($blogname, $blog_title, $errors); ?>
- <p class="submit"><input type="submit" name="submit" class="submit" value="<?php _e('Create Blog &raquo;') ?>" /></p>
- </form>
- <?php
-}
-
-function validate_another_blog_signup() {
- global $wpdb, $current_user, $blogname, $blog_title, $errors, $domain, $path;
- $current_user = wp_get_current_user();
- if( !is_user_logged_in() )
- die();
-
- $result = validate_blog_form();
- extract($result);
-
- if ( $errors->get_error_code() ) {
- signup_another_blog($blogname, $blog_title, $errors);
- return false;
- }
-
- $public = (int) $_POST['blog_public'];
- $meta = apply_filters('signup_create_blog_meta', array ('lang_id' => 1, 'public' => $public)); // depreciated
- $meta = apply_filters( "add_signup_meta", $meta );
-
- wpmu_create_blog( $domain, $path, $blog_title, $current_user->id, $meta, $wpdb->siteid );
- confirm_another_blog_signup($domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta);
- return true;
-}
-
-function confirm_another_blog_signup($domain, $path, $blog_title, $user_name, $user_email = '', $meta = '') {
- ?>
- <h2><?php printf(__('The blog %s is yours.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
- <p>
- <?php printf(__('<a href="http://%1$s">http://%2$s</a> is your new blog. <a href="%3$s">Login</a> as "%4$s" using your existing password.'), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name) ?>
- </p>
- <?php
- do_action('signup_finished');
-}
-
-function signup_user($user_name = '', $user_email = '', $errors = '') {
- global $current_site, $active_signup;
-
- if ( !is_wp_error($errors) )
- $errors = new WP_Error();
- if( isset( $_POST[ 'signup_for' ] ) ) {
- $signup[ wp_specialchars( $_POST[ 'signup_for' ] ) ] = 'checked="checked"';
- } else {
- $signup[ 'blog' ] = 'checked="checked"';
- }
-
- // allow definition of default variables
- $filtered_results = apply_filters('signup_user_init', array('user_name' => $user_name, 'user_email' => $user_email, 'errors' => $errors ));
- $user_name = $filtered_results['user_name'];
- $user_email = $filtered_results['user_email'];
- $errors = $filtered_results['errors'];
-
- ?>
-
- <h2><?php printf( __('Get your own %s account in seconds'), $current_site->site_name ) ?></h2>
- <form id="setupform" method="post" action="wp-signup.php">
- <input type="hidden" name="stage" value="validate-user-signup" />
- <?php do_action( "signup_hidden_fields" ); ?>
- <?php show_user_form($user_name, $user_email, $errors); ?>
-
- <p>
- <?php if( $active_signup == 'blog' ) { ?>
- <input id="signupblog" type="hidden" name="signup_for" value="blog" />
- <?php } elseif( $active_signup == 'user' ) { ?>
- <input id="signupblog" type="hidden" name="signup_for" value="user" />
- <?php } else { ?>
- <input id="signupblog" type="radio" name="signup_for" value="blog" <?php echo $signup['blog'] ?> />
- <label class="checkbox" for="signupblog"><?php _e('Gimme a blog!') ?></label>
- <br />
- <input id="signupuser" type="radio" name="signup_for" value="user" <?php echo $signup['user'] ?> />
- <label class="checkbox" for="signupuser"><?php _e('Just a username, please.') ?></label>
- <?php } ?>
- </p>
-
- <p class="submit"><input type="submit" name="submit" class="submit" value="<?php _e('Next &raquo;') ?>" /></p>
- </form>
- <?php
-}
-
-function validate_user_signup() {
- $result = validate_user_form();
- extract($result);
-
- if ( $errors->get_error_code() ) {
- signup_user($user_name, $user_email, $errors);
- return false;
- }
-
- if ( 'blog' == $_POST['signup_for'] ) {
- signup_blog($user_name, $user_email);
- return false;
- }
-
- wpmu_signup_user($user_name, $user_email, apply_filters( "add_signup_meta", array() ) );
-
- confirm_user_signup($user_name, $user_email);
- return true;
-}
-
-function confirm_user_signup($user_name, $user_email) {
- ?>
- <h2><?php printf(__('%s is your new username'), $user_name) ?></h2>
- <p><?php _e('But, before you can start using your new username, <strong>you must activate it</strong>.') ?></p>
- <p><?php printf(__('Check your inbox at <strong>%1$s</strong> and click the link given.'), $user_email) ?></p>
- <p><?php _e('If you do not activate your username within two days, you will have to sign up again.'); ?></p>
- <?php
- do_action('signup_finished');
-}
-
-function signup_blog($user_name = '', $user_email = '', $blogname = '', $blog_title = '', $errors = '') {
- if ( !is_wp_error($errors) )
- $errors = new WP_Error();
-
- // allow definition of default variables
- $filtered_results = apply_filters('signup_blog_init', array('user_name' => $user_name, 'user_email' => $user_email, 'blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors ));
- $user_name = $filtered_results['user_name'];
- $user_email = $filtered_results['user_email'];
- $blogname = $filtered_results['blogname'];
- $blog_title = $filtered_results['blog_title'];
- $errors = $filtered_results['errors'];
-
- if ( empty($blogname) )
- $blogname = $user_name;
- ?>
- <form id="setupform" method="post" action="wp-signup.php">
- <input type="hidden" name="stage" value="validate-blog-signup" />
- <input type="hidden" name="user_name" value="<?php echo $user_name ?>" />
- <input type="hidden" name="user_email" value="<?php echo $user_email ?>" />
- <?php do_action( "signup_hidden_fields" ); ?>
- <?php show_blog_form($blogname, $blog_title, $errors); ?>
- <p class="submit"><input type="submit" name="submit" class="submit" value="<?php _e('Signup &raquo;') ?>" /></p>
- </form>
- <?php
-}
-
-function validate_blog_signup() {
- // Re-validate user info.
- $result = wpmu_validate_user_signup($_POST['user_name'], $_POST['user_email']);
- extract($result);
-
- if ( $errors->get_error_code() ) {
- signup_user($user_name, $user_email, $errors);
- return false;
- }
-
- $result = wpmu_validate_blog_signup($_POST['blogname'], $_POST['blog_title']);
- extract($result);
-
- if ( $errors->get_error_code() ) {
- signup_blog($user_name, $user_email, $blogname, $blog_title, $errors);
- return false;
- }
-
- $public = (int) $_POST['blog_public'];
- $meta = array ('lang_id' => 1, 'public' => $public);
- $meta = apply_filters( "add_signup_meta", $meta );
-
- wpmu_signup_blog($domain, $path, $blog_title, $user_name, $user_email, $meta);
- confirm_blog_signup($domain, $path, $blog_title, $user_name, $user_email, $meta);
- return true;
-}
-
-function confirm_blog_signup($domain, $path, $blog_title, $user_name = '', $user_email = '', $meta) {
- ?>
- <h2><?php printf(__('Congratulations! Your new blog, %s, is almost ready.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
-
- <p><?php _e('But, before you can start using your blog, <strong>you must activate it</strong>.') ?></p>
- <p><?php printf(__('Check your inbox at <strong>%s</strong> and click the link given. It should arrive within 30 minutes.'), $user_email) ?></p>
- <p><?php _e('If you do not activate your blog within two days, you will have to sign up again.'); ?></p>
- <h2><?php _e('Still waiting for your email?'); ?></h2>
- <p>
- <?php _e("If you haven't received your email yet, there are a number of things you can do:") ?>
- <ul id="noemail-tips">
- <li><p><strong><?php _e('Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control.') ?></strong></p></li>
- <li><p><?php _e('Check the junk email or spam folder of your email client. Sometime emails wind up there by mistake.') ?></p></li>
- <li><?php printf(__("Have you entered your email correctly? We think it's %s but if you've entered it incorrectly, you won't receive it."), $user_email) ?></li>
- </ul>
- </p>
- <?php
- do_action('signup_finished');
-}
-
-// Main
-$active_signup = get_site_option( 'registration' );
-if( !$active_signup )
- $active_signup = 'all';
-
-$active_signup = apply_filters( 'wpmu_active_signup', $active_signup ); // return "all", "none", "blog" or "user"
-
-if( is_site_admin() )
- echo '<div class="mu_alert">' . sprintf( __( "Greetings Site Administrator! You are currently allowing '%s' registrations. To change or disable registration go to your <a href='wp-admin/wpmu-options.php'>Options page</a>." ), $active_signup ) . '</div>';
-
-$newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null;
-
-$current_user = wp_get_current_user();
-if( $active_signup == "none" ) {
- _e( "Registration has been disabled." );
-} elseif( $active_signup == 'blog' && !is_user_logged_in() ){
- if( is_ssl() ) {
- $proto = 'https://';
- } else {
- $proto = 'http://';
- }
- $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode($proto . $_SERVER['HTTP_HOST'] . '/wp-signup.php' ));
- echo sprintf( __( "You must first <a href=\"%s\">login</a>, and then you can create a new blog."), $login_url );
-} else {
- switch ($_POST['stage']) {
- case 'validate-user-signup' :
- if( $active_signup == 'all' || $_POST[ 'signup_for' ] == 'blog' && $active_signup == 'blog' || $_POST[ 'signup_for' ] == 'user' && $active_signup == 'user' )
- validate_user_signup();
- else
- _e( "User registration has been disabled." );
- break;
- case 'validate-blog-signup':
- if( $active_signup == 'all' || $active_signup == 'blog' )
- validate_blog_signup();
- else
- _e( "Blog registration has been disabled." );
- break;
- case 'gimmeanotherblog':
- validate_another_blog_signup();
- break;
- default :
- $user_email = $_POST[ 'user_email' ];
- do_action( "preprocess_signup_form" ); // populate the form from invites, elsewhere?
- if ( is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'blog' ) ) {
- signup_another_blog($newblogname);
- } elseif( is_user_logged_in() == false && ( $active_signup == 'all' || $active_signup == 'user' ) ) {
- signup_user( $newblogname, $user_email );
- } elseif( is_user_logged_in() == false && ( $active_signup == 'blog' ) ) {
- _e( "I'm sorry. We're not accepting new registrations at this time." );
- } else {
- _e( "You're logged in already. No need to register again!" );
- }
- if ($newblogname) {
- if( constant( "VHOST" ) == 'no' )
- $newblog = 'http://' . $current_site->domain . $current_site->path . $newblogname . '/';
- else
- $newblog = 'http://' . $newblogname . '.' . $current_site->domain . $current_site->path;
- if ($active_signup == 'blog' || $active_signup == 'all')
- printf(__("<p><em>The blog you were looking for, <strong>%s</strong> doesn't exist but you can create it now!</em></p>"), $newblog );
- else
- printf(__("<p><em>The blog you were looking for, <strong>%s</strong> doesn't exist.</em></p>"), $newblog );
- }
- break;
- }
-}
-?>
-</div>
-</div>
-
-<?php get_footer(); ?>
</del><ins>+<?php
+
+/** Sets up the WordPress Environment. */
+require( dirname(__FILE__) . '/wp-load.php' );
+
+add_action( 'wp_head', 'signuppageheaders' ) ;
+
+require( 'wp-blog-header.php' );
+require_once( ABSPATH . WPINC . '/registration.php' );
+
+if( is_array( get_site_option( 'illegal_names' )) && $_GET[ 'new' ] != '' && in_array( $_GET[ 'new' ], get_site_option( 'illegal_names' ) ) == true ) {
+ wp_redirect( "http://{$current_site->domain}{$current_site->path}" );
+ die();
+}
+
+function do_signup_header() {
+ do_action("signup_header");
+}
+add_action( 'wp_head', 'do_signup_header' );
+
+function signuppageheaders() {
+ echo "<meta name='robots' content='noindex,nofollow' />\n";
+}
+
+if( $current_blog->domain . $current_blog->path != $current_site->domain . $current_site->path ) {
+ wp_redirect( "http://" . $current_site->domain . $current_site->path . "wp-signup.php" );
+ die();
+}
+
+function wpmu_signup_stylesheet() {
+ ?>
+ <style type="text/css">
+ .mu_register { width: 90%; margin:0 auto; }
+ .mu_register form { margin-top: 2em; }
+ .mu_register .error { font-weight:700; padding:10px; color:#333333; background:#FFEBE8; border:1px solid #CC0000; }
+ .mu_register input[type="submit"],
+ .mu_register #blog_title,
+ .mu_register #user_email,
+ .mu_register #blogname,
+ .mu_register #user_name { width:100%; font-size: 24px; margin:5px 0; }
+ .mu_register .prefix_address,
+ .mu_register .suffix_address {font-size: 18px;display:inline; }
+ .mu_register label { font-weight:700; font-size:15px; display:block; margin:10px 0; }
+ .mu_register label.checkbox { display:inline; }
+ .mu_register .mu_alert { font-weight:700; padding:10px; color:#333333; background:#ffffe0; border:1px solid #e6db55; }
+ </style>
+ <?php
+}
+
+add_action( 'wp_head', 'wpmu_signup_stylesheet' );
+get_header();
+?>
+<div id="content" class="widecolumn">
+<div class="mu_register">
+<?php
+function show_blog_form($blogname = '', $blog_title = '', $errors = '') {
+ global $current_site;
+ // Blog name
+ if( constant( "VHOST" ) == 'no' )
+ echo '<label for="blogname">' . __('Blog Name:') . '</label>';
+ else
+ echo '<label for="blogname">' . __('Blog Domain:') . '</label>';
+
+ if ( $errmsg = $errors->get_error_message('blogname') ) { ?>
+ <p class="error"><?php echo $errmsg ?></p>
+ <?php }
+
+ if( constant( "VHOST" ) == 'no' ) {
+ echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span><input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /><br />';
+ } else {
+ echo '<input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /><span class="suffix_address">.' . $current_site->domain . $current_site->path . '</span><br />';
+ }
+ if ( !is_user_logged_in() ) {
+ print '(<strong>' . __( 'Your address will be ' );
+ if( constant( "VHOST" ) == 'no' ) {
+ print $current_site->domain . $current_site->path . __( 'blogname' );
+ } else {
+ print __( 'domain.' ) . $current_site->domain . $current_site->path;
+ }
+ echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' ) . '</p>';
+ }
+
+ // Blog Title
+ ?>
+ <label for="blog_title"><?php _e('Blog Title:') ?></label>
+ <?php if ( $errmsg = $errors->get_error_message('blog_title') ) { ?>
+ <p class="error"><?php echo $errmsg ?></p>
+ <?php }
+ echo '<input name="blog_title" type="text" id="blog_title" value="'.wp_specialchars($blog_title, 1).'" /></p>';
+ ?>
+
+ <div id="privacy">
+ <p class="privacy-intro">
+ <label for="blog_public_on"><?php _e('Privacy:') ?></label>
+ <?php _e('I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.'); ?>
+ <div style="clear:both;"></div>
+ <label class="checkbox" for="blog_public_on">
+ <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php if( !isset( $_POST['blog_public'] ) || $_POST['blog_public'] == '1' ) { ?>checked="checked"<?php } ?> />
+ <strong><?php _e( 'Yes' ); ?></strong>
+ </label>
+ <label class="checkbox" for="blog_public_off">
+ <input type="radio" id="blog_public_off" name="blog_public" value="0" <?php if( isset( $_POST['blog_public'] ) && $_POST['blog_public'] == '0' ) { ?>checked="checked"<?php } ?> />
+ <strong><?php _e( 'No' ); ?></strong>
+ </label>
+ </p>
+ </div>
+
+ <?php
+ do_action('signup_blogform', $errors);
+}
+
+function validate_blog_form() {
+ $user = '';
+ if ( is_user_logged_in() )
+ $user = wp_get_current_user();
+
+ return wpmu_validate_blog_signup($_POST['blogname'], $_POST['blog_title'], $user);
+}
+
+function show_user_form($user_name = '', $user_email = '', $errors = '') {
+ // User name
+ echo '<label for="user_name">' . __('Username:') . '</label>';
+ if ( $errmsg = $errors->get_error_message('user_name') ) {
+ echo '<p class="error">'.$errmsg.'</p>';
+ }
+ echo '<input name="user_name" type="text" id="user_name" value="'.$user_name.'" maxlength="50" /><br />';
+ _e('(Must be at least 4 characters, letters and numbers only.)');
+ ?>
+
+ <label for="user_email"><?php _e('Email&nbsp;Address:') ?></label>
+ <?php if ( $errmsg = $errors->get_error_message('user_email') ) { ?>
+ <p class="error"><?php echo $errmsg ?></p>
+ <?php } ?>
+ <input name="user_email" type="text" id="user_email" value="<?php echo wp_specialchars($user_email, 1) ?>" maxlength="200" /><br /><?php _e('(We&#8217;ll send your password to this address, so <strong>triple-check it</strong>.)') ?>
+ <?php
+ if ( $errmsg = $errors->get_error_message('generic') ) {
+ echo '<p class="error">'.$errmsg.'</p>';
+ }
+ do_action( 'signup_extra_fields', $errors );
+}
+
+function validate_user_form() {
+ return wpmu_validate_user_signup($_POST['user_name'], $_POST['user_email']);
+}
+
+function signup_another_blog($blogname = '', $blog_title = '', $errors = '') {
+ global $current_user, $current_site;
+
+ if ( ! is_wp_error($errors) ) {
+ $errors = new WP_Error();
+ }
+
+ // allow definition of default variables
+ $filtered_results = apply_filters('signup_another_blog_init', array('blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors ));
+ $blogname = $filtered_results['blogname'];
+ $blog_title = $filtered_results['blog_title'];
+ $errors = $filtered_results['errors'];
+
+ echo '<h2>' . sprintf( __('Get <em>another</em> %s blog in seconds'), $current_site->site_name ) . '</h2>';
+
+ if ( $errors->get_error_code() ) {
+ echo "<p>" . __('There was a problem, please correct the form below and try again.') . "</p>";
+ }
+ ?>
+ <p><?php printf(__("Welcome back, %s. By filling out the form below, you can <strong>add another blog to your account</strong>. There is no limit to the number of blogs you can have, so create to your heart's content, but blog responsibly."), $current_user->display_name) ?></p>
+
+ <?php
+ $blogs = get_blogs_of_user($current_user->ID);
+ if ( !empty($blogs) ) { ?>
+ <p>
+ <?php _e('Blogs you are already a member of:') ?>
+ <ul>
+ <?php foreach ( $blogs as $blog ) {
+ echo "<li><a href='http://" . $blog->domain . $blog->path . "'>" . $blog->domain . $blog->path . "</a></li>";
+ } ?>
+ </ul>
+ </p>
+ <?php } ?>
+
+ <p><?php _e("If you&#8217;re not going to use a great blog domain, leave it for a new user. Now have at it!") ?></p>
+ <form id="setupform" method="post" action="wp-signup.php">
+ <input type="hidden" name="stage" value="gimmeanotherblog" />
+ <?php do_action( "signup_hidden_fields" ); ?>
+ <?php show_blog_form($blogname, $blog_title, $errors); ?>
+ <p class="submit"><input type="submit" name="submit" class="submit" value="<?php _e('Create Blog &raquo;') ?>" /></p>
+ </form>
+ <?php
+}
+
+function validate_another_blog_signup() {
+ global $wpdb, $current_user, $blogname, $blog_title, $errors, $domain, $path;
+ $current_user = wp_get_current_user();
+ if( !is_user_logged_in() )
+ die();
+
+ $result = validate_blog_form();
+ extract($result);
+
+ if ( $errors->get_error_code() ) {
+ signup_another_blog($blogname, $blog_title, $errors);
+ return false;
+ }
+
+ $public = (int) $_POST['blog_public'];
+ $meta = apply_filters('signup_create_blog_meta', array ('lang_id' => 1, 'public' => $public)); // depreciated
+ $meta = apply_filters( "add_signup_meta", $meta );
+
+ wpmu_create_blog( $domain, $path, $blog_title, $current_user->id, $meta, $wpdb->siteid );
+ confirm_another_blog_signup($domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta);
+ return true;
+}
+
+function confirm_another_blog_signup($domain, $path, $blog_title, $user_name, $user_email = '', $meta = '') {
+ ?>
+ <h2><?php printf(__('The blog %s is yours.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
+ <p>
+ <?php printf(__('<a href="http://%1$s">http://%2$s</a> is your new blog. <a href="%3$s">Login</a> as "%4$s" using your existing password.'), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name) ?>
+ </p>
+ <?php
+ do_action('signup_finished');
+}
+
+function signup_user($user_name = '', $user_email = '', $errors = '') {
+ global $current_site, $active_signup;
+
+ if ( !is_wp_error($errors) )
+ $errors = new WP_Error();
+ if( isset( $_POST[ 'signup_for' ] ) ) {
+ $signup[ wp_specialchars( $_POST[ 'signup_for' ] ) ] = 'checked="checked"';
+ } else {
+ $signup[ 'blog' ] = 'checked="checked"';
+ }
+
+ // allow definition of default variables
+ $filtered_results = apply_filters('signup_user_init', array('user_name' => $user_name, 'user_email' => $user_email, 'errors' => $errors ));
+ $user_name = $filtered_results['user_name'];
+ $user_email = $filtered_results['user_email'];
+ $errors = $filtered_results['errors'];
+
+ ?>
+
+ <h2><?php printf( __('Get your own %s account in seconds'), $current_site->site_name ) ?></h2>
+ <form id="setupform" method="post" action="wp-signup.php">
+ <input type="hidden" name="stage" value="validate-user-signup" />
+ <?php do_action( "signup_hidden_fields" ); ?>
+ <?php show_user_form($user_name, $user_email, $errors); ?>
+
+ <p>
+ <?php if( $active_signup == 'blog' ) { ?>
+ <input id="signupblog" type="hidden" name="signup_for" value="blog" />
+ <?php } elseif( $active_signup == 'user' ) { ?>
+ <input id="signupblog" type="hidden" name="signup_for" value="user" />
+ <?php } else { ?>
+ <input id="signupblog" type="radio" name="signup_for" value="blog" <?php echo $signup['blog'] ?> />
+ <label class="checkbox" for="signupblog"><?php _e('Gimme a blog!') ?></label>
+ <br />
+ <input id="signupuser" type="radio" name="signup_for" value="user" <?php echo $signup['user'] ?> />
+ <label class="checkbox" for="signupuser"><?php _e('Just a username, please.') ?></label>
+ <?php } ?>
+ </p>
+
+ <p class="submit"><input type="submit" name="submit" class="submit" value="<?php _e('Next &raquo;') ?>" /></p>
+ </form>
+ <?php
+}
+
+function validate_user_signup() {
+ $result = validate_user_form();
+ extract($result);
+
+ if ( $errors->get_error_code() ) {
+ signup_user($user_name, $user_email, $errors);
+ return false;
+ }
+
+ if ( 'blog' == $_POST['signup_for'] ) {
+ signup_blog($user_name, $user_email);
+ return false;
+ }
+
+ wpmu_signup_user($user_name, $user_email, apply_filters( "add_signup_meta", array() ) );
+
+ confirm_user_signup($user_name, $user_email);
+ return true;
+}
+
+function confirm_user_signup($user_name, $user_email) {
+ ?>
+ <h2><?php printf(__('%s is your new username'), $user_name) ?></h2>
+ <p><?php _e('But, before you can start using your new username, <strong>you must activate it</strong>.') ?></p>
+ <p><?php printf(__('Check your inbox at <strong>%1$s</strong> and click the link given.'), $user_email) ?></p>
+ <p><?php _e('If you do not activate your username within two days, you will have to sign up again.'); ?></p>
+ <?php
+ do_action('signup_finished');
+}
+
+function signup_blog($user_name = '', $user_email = '', $blogname = '', $blog_title = '', $errors = '') {
+ if ( !is_wp_error($errors) )
+ $errors = new WP_Error();
+
+ // allow definition of default variables
+ $filtered_results = apply_filters('signup_blog_init', array('user_name' => $user_name, 'user_email' => $user_email, 'blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors ));
+ $user_name = $filtered_results['user_name'];
+ $user_email = $filtered_results['user_email'];
+ $blogname = $filtered_results['blogname'];
+ $blog_title = $filtered_results['blog_title'];
+ $errors = $filtered_results['errors'];
+
+ if ( empty($blogname) )
+ $blogname = $user_name;
+ ?>
+ <form id="setupform" method="post" action="wp-signup.php">
+ <input type="hidden" name="stage" value="validate-blog-signup" />
+ <input type="hidden" name="user_name" value="<?php echo $user_name ?>" />
+ <input type="hidden" name="user_email" value="<?php echo $user_email ?>" />
+ <?php do_action( "signup_hidden_fields" ); ?>
+ <?php show_blog_form($blogname, $blog_title, $errors); ?>
+ <p class="submit"><input type="submit" name="submit" class="submit" value="<?php _e('Signup &raquo;') ?>" /></p>
+ </form>
+ <?php
+}
+
+function validate_blog_signup() {
+ // Re-validate user info.
+ $result = wpmu_validate_user_signup($_POST['user_name'], $_POST['user_email']);
+ extract($result);
+
+ if ( $errors->get_error_code() ) {
+ signup_user($user_name, $user_email, $errors);
+ return false;
+ }
+
+ $result = wpmu_validate_blog_signup($_POST['blogname'], $_POST['blog_title']);
+ extract($result);
+
+ if ( $errors->get_error_code() ) {
+ signup_blog($user_name, $user_email, $blogname, $blog_title, $errors);
+ return false;
+ }
+
+ $public = (int) $_POST['blog_public'];
+ $meta = array ('lang_id' => 1, 'public' => $public);
+ $meta = apply_filters( "add_signup_meta", $meta );
+
+ wpmu_signup_blog($domain, $path, $blog_title, $user_name, $user_email, $meta);
+ confirm_blog_signup($domain, $path, $blog_title, $user_name, $user_email, $meta);
+ return true;
+}
+
+function confirm_blog_signup($domain, $path, $blog_title, $user_name = '', $user_email = '', $meta) {
+ ?>
+ <h2><?php printf(__('Congratulations! Your new blog, %s, is almost ready.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
+
+ <p><?php _e('But, before you can start using your blog, <strong>you must activate it</strong>.') ?></p>
+ <p><?php printf(__('Check your inbox at <strong>%s</strong> and click the link given. It should arrive within 30 minutes.'), $user_email) ?></p>
+ <p><?php _e('If you do not activate your blog within two days, you will have to sign up again.'); ?></p>
+ <h2><?php _e('Still waiting for your email?'); ?></h2>
+ <p>
+ <?php _e("If you haven't received your email yet, there are a number of things you can do:") ?>
+ <ul id="noemail-tips">
+ <li><p><strong><?php _e('Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control.') ?></strong></p></li>
+ <li><p><?php _e('Check the junk email or spam folder of your email client. Sometime emails wind up there by mistake.') ?></p></li>
+ <li><?php printf(__("Have you entered your email correctly? We think it's %s but if you've entered it incorrectly, you won't receive it."), $user_email) ?></li>
+ </ul>
+ </p>
+ <?php
+ do_action('signup_finished');
+}
+
+// Main
+$active_signup = get_site_option( 'registration' );
+if( !$active_signup )
+ $active_signup = 'all';
+
+$active_signup = apply_filters( 'wpmu_active_signup', $active_signup ); // return "all", "none", "blog" or "user"
+
+if( is_site_admin() )
+ echo '<div class="mu_alert">' . sprintf( __( "Greetings Site Administrator! You are currently allowing '%s' registrations. To change or disable registration go to your <a href='wp-admin/wpmu-options.php'>Options page</a>." ), $active_signup ) . '</div>';
+
+$newblogname = isset($_GET['new']) ? strtolower(preg_replace('/^-|-$|[^-a-zA-Z0-9]/', '', $_GET['new'])) : null;
+
+$current_user = wp_get_current_user();
+if( $active_signup == "none" ) {
+ _e( "Registration has been disabled." );
+} elseif( $active_signup == 'blog' && !is_user_logged_in() ){
+ if( is_ssl() ) {
+ $proto = 'https://';
+ } else {
+ $proto = 'http://';
+ }
+ $login_url = site_url( 'wp-login.php?redirect_to=' . urlencode($proto . $_SERVER['HTTP_HOST'] . '/wp-signup.php' ));
+ echo sprintf( __( "You must first <a href=\"%s\">login</a>, and then you can create a new blog."), $login_url );
+} else {
+ switch ($_POST['stage']) {
+ case 'validate-user-signup' :
+ if( $active_signup == 'all' || $_POST[ 'signup_for' ] == 'blog' && $active_signup == 'blog' || $_POST[ 'signup_for' ] == 'user' && $active_signup == 'user' )
+ validate_user_signup();
+ else
+ _e( "User registration has been disabled." );
+ break;
+ case 'validate-blog-signup':
+ if( $active_signup == 'all' || $active_signup == 'blog' )
+ validate_blog_signup();
+ else
+ _e( "Blog registration has been disabled." );
+ break;
+ case 'gimmeanotherblog':
+ validate_another_blog_signup();
+ break;
+ default :
+ $user_email = $_POST[ 'user_email' ];
+ do_action( "preprocess_signup_form" ); // populate the form from invites, elsewhere?
+ if ( is_user_logged_in() && ( $active_signup == 'all' || $active_signup == 'blog' ) ) {
+ signup_another_blog($newblogname);
+ } elseif( is_user_logged_in() == false && ( $active_signup == 'all' || $active_signup == 'user' ) ) {
+ signup_user( $newblogname, $user_email );
+ } elseif( is_user_logged_in() == false && ( $active_signup == 'blog' ) ) {
+ _e( "I'm sorry. We're not accepting new registrations at this time." );
+ } else {
+ _e( "You're logged in already. No need to register again!" );
+ }
+ if ($newblogname) {
+ if( constant( "VHOST" ) == 'no' )
+ $newblog = 'http://' . $current_site->domain . $current_site->path . $newblogname . '/';
+ else
+ $newblog = 'http://' . $newblogname . '.' . $current_site->domain . $current_site->path;
+ if ($active_signup == 'blog' || $active_signup == 'all')
+ printf(__("<p><em>The blog you were looking for, <strong>%s</strong> doesn't exist but you can create it now!</em></p>"), $newblog );
+ else
+ printf(__("<p><em>The blog you were looking for, <strong>%s</strong> doesn't exist.</em></p>"), $newblog );
+ }
+ break;
+ }
+}
+?>
+</div>
+</div>
+
+<?php get_footer(); ?>
</ins><span class="cx">Property changes on: trunk/wp-signup.php
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:eol-style
</span><span class="cx"> + native
</span></span></pre>
</div>
</div>
</body>
</html>