<!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>[13926] trunk/wp-admin/network.php:
block subdomain install when install is in a folder, see #12736</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13926">13926</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-04-02 02:04:25 +0000 (Fri, 02 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>block subdomain install when install is in a folder, see <a href="http://trac.wordpress.org/ticket/12736">#12736</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (13925 => 13926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-04-02 01:26:44 UTC (rev 13925)
+++ trunk/wp-admin/network.php 2010-04-02 02:04:25 UTC (rev 13926)
</span><span class="lines">@@ -37,6 +37,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Allow subdomain install
+ *
+ * @since 3.0.0
+ * @return bool - whether subdomain install is allowed
+ */
+function allow_subdomain_install() {
+ $path = preg_replace( '|https?://[^/]|', '', get_option( 'siteurl' ) );
+ if( strlen( $path ) > 1 || 'localhost' == $_SERVER[ 'HTTP_HOST' ] )
+ return false;
+
+ return true;
+}
+/**
</ins><span class="cx"> * Get base domain of network.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="lines">@@ -134,7 +147,7 @@
</span><span class="cx"> echo '<p>' . __( 'If <code>mod_rewrite</code> is disabled, ask your administrator to enable that module, or look at the <a href="http://httpd.apache.org/docs/mod/mod_rewrite.html">Apache documentation</a> or <a href="http://www.google.com/search?q=apache+mod_rewrite">elsewhere</a> for help setting it up.' ) . '</p></div>';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( 'localhost' != $hostname ) : ?>
</del><ins>+ if ( allow_subdomain_install() ) : ?>
</ins><span class="cx"> <h3><?php esc_html_e( 'Addresses of Sites in your Network' ); ?></h3>
</span><span class="cx"> <p><?php _e( 'Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories. <strong>You cannot change this later.</strong>' ); ?></p>
</span><span class="cx"> <p><?php _e( "You will need a wildcard DNS record if you're going to use the virtual host (sub-domain) functionality." ); ?></p>
</span><span class="lines">@@ -175,6 +188,11 @@
</span><span class="cx"> <th scope="row"><?php esc_html_e( 'Sub-directory Install' ); ?></th>
</span><span class="cx"> <td><?php _e('Because you are using <code>localhost</code>, the sites in your WordPress network must use sub-directories. Consider using <code>localhost.localdomain</code> if you wish to use sub-domains.'); ?></td>
</span><span class="cx"> </tr>
</span><ins>+ <?php elseif ( !allow_subdomain_install() ) : ?>
+ <tr>
+ <th scope="row"><?php esc_html_e( 'Sub-directory Install' ); ?></th>
+ <td><?php _e('Because your install is in a directory, the sites in your WordPress network must use sub-directories.'); ?></td>
+ </tr>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php if ( ! $is_www ) : ?>
</span><span class="cx"> <tr>
</span><span class="lines">@@ -217,7 +235,7 @@
</span><span class="cx"> echo '<div class="error">' . $errors->get_error_message() . '</div>';
</span><span class="cx">
</span><span class="cx"> if ( $_POST ) {
</span><del>- $vhost = 'localhost' == $hostname ? false : (bool) $_POST['subdomain_install'];
</del><ins>+ $vhost = !allow_subdomain_install() ? false : (bool) $_POST['subdomain_install'];
</ins><span class="cx"> } else {
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> $vhost = is_subdomain_install();
</span><span class="lines">@@ -326,7 +344,7 @@
</span><span class="cx"> // create network tables
</span><span class="cx"> install_network();
</span><span class="cx"> $hostname = get_clean_basedomain();
</span><del>- $subdomain_install = 'localhost' == $hostname ? false : (bool) $_POST['subdomain_install'];
</del><ins>+ $subdomain_install = !allow_subdomain_install() ? false : (bool) $_POST['subdomain_install'];
</ins><span class="cx"> if ( ! network_domain_check() ) {
</span><span class="cx"> $result = populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), $_POST['sitename'], $base, $subdomain_install );
</span><span class="cx"> if ( is_wp_error( $result ) ) {
</span></span></pre>
</div>
</div>
</body>
</html>