Changeset 13926

Timestamp:

04/02/2010 02:04:25 AM (13 years ago)

Author:

wpmuguru

Message:

block subdomain install when install is in a folder, see #12736

File:

• trunk/wp-admin/network.php (modified) (5 diffs)

trunk/wp-admin/network.php

@@ -37 +37 @@
 }
 
+/**
+ * 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;
+}
 /**
  * Get base domain of network.
@@ -135 +148 @@
     }
 
-    if ( 'localhost' != $hostname ) : ?>
+    if ( allow_subdomain_install() ) : ?>
         <h3><?php esc_html_e( 'Addresses of Sites in your Network' ); ?></h3>
         <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>
@@ -176 +189 @@
                 <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>
             </tr>
+        <?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>
         <?php endif; ?>
         <?php if ( ! $is_www ) : ?>
@@ -218 +236 @@
 
     if ( $_POST ) {
-        $vhost = 'localhost' == $hostname ? false : (bool) $_POST['subdomain_install'];
+        $vhost = !allow_subdomain_install() ? false : (bool) $_POST['subdomain_install'];
     } else {
         if ( is_multisite() ) {
@@ -327 +345 @@
     install_network();
     $hostname = get_clean_basedomain();
-    $subdomain_install = 'localhost' == $hostname ? false : (bool) $_POST['subdomain_install'];
+    $subdomain_install = !allow_subdomain_install() ? false : (bool) $_POST['subdomain_install'];
     if ( ! network_domain_check() ) {
         $result = populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), $_POST['sitename'], $base, $subdomain_install );