<!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>[13630] trunk/wp-admin/ms-edit.php: block invalid site names/
urls in add site, see #11777</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13630">13630</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-03-09 17:06:58 +0000 (Tue, 09 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>block invalid site names/urls in add site, see <a href="http://trac.wordpress.org/ticket/11777">#11777</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmseditphp">trunk/wp-admin/ms-edit.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmseditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-edit.php (13629 => 13630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php 2010-03-09 16:27:02 UTC (rev 13629)
+++ trunk/wp-admin/ms-edit.php 2010-03-09 17:06:58 UTC (rev 13630)
</span><span class="lines">@@ -135,14 +135,18 @@
</span><span class="cx"> if ( is_array( $_POST[ 'blog' ] ) == false )
</span><span class="cx"> wp_die( "Can't create an empty site." );
</span><span class="cx"> $blog = $_POST['blog'];
</span><del>- $domain = sanitize_user( str_replace( '/', '', $blog[ 'domain' ] ) );
</del><ins>+ $domain = '';
+ if ( ! preg_match( '/(--)/', $blog[ 'domain' ] ) && preg_match( '|^([a-zA-Z0-9-])+$|', $blog[ 'domain' ] ) )
+ $domain = strtolower( $blog[ 'domain' ] );
</ins><span class="cx"> $email = sanitize_email( $blog[ 'email' ] );
</span><span class="cx"> $title = $blog[ 'title' ];
</span><span class="cx">
</span><del>- if ( empty($domain) || empty($email) )
- wp_die( __('Missing site address or email address.') );
</del><ins>+ if ( empty( $domain ) )
+ wp_die( __( 'Missing or invalid site address.' ) );
+ if ( empty( $email ) )
+ wp_die( __( 'Missing email address.' ) );
</ins><span class="cx"> if ( !is_email( $email ) )
</span><del>- wp_die( __('Invalid email address') );
</del><ins>+ wp_die( __( 'Invalid email address' ) );
</ins><span class="cx">
</span><span class="cx"> if ( is_subdomain_install() ) {
</span><span class="cx"> $newdomain = $domain.".".$current_site->domain;
</span></span></pre>
</div>
</div>
</body>
</html>