Changeset 14513 for trunk/wp-admin/network.php

Timestamp:

05/08/2010 03:25:33 PM (15 years ago)

Author:

wpmuguru

Message:

add network install rule, filter & UI tweaks, see #12931

File:

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

trunk/wp-admin/network.php

@@ -49 +49 @@
 
     return true;
+}
+/**
+ * Allow folder install
+ *
+ * @since 3.0.0
+ * @return bool Whether folder install is allowed
+ */
+function allow_folder_install() {
+    global $wpdb;
+    if ( apply_filters( 'allow_folder_install', false ) )
+        return true;
+
+    $post = $wpdb->get_row( "SELECT ID FROM $wpdb->posts WHERE post_date < DATE_SUB(NOW(), INTERVAL 1 MONTH) AND post_status = 'publish'" );
+    if ( empty( $post ) )
+        return true;
+
+    return false;
 }
 /**
@@ -109 +126 @@
     if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ) ) ) ) {
         echo '<div class="error"><p><strong>' . __( 'Error:') . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</strong></p></div>';
-        if ( $no_ip )
-            echo '<p>' . __( 'You cannot use an IP address such as <code>127.0.0.1</code>.' ) . '</p>';
-        else
-            echo '<p>' . sprintf( __( 'You cannot use port numbers such as <code>%s</code>.' ), $has_ports ) . '</p>';
+        echo '<p>' . sprintf( __( 'You cannot use port numbers such as <code>%s</code>.' ), $has_ports ) . '</p>';
         echo '<a href="' . esc_url( admin_url() ) . '">' . __( 'Return to Dashboard' ) . '</a>';
         include( './admin-footer.php' );
@@ -140 +154 @@
         $subdomain_install = (bool) $_POST['subdomain_install'];
     } elseif ( apache_mod_loaded('mod_rewrite') ) { // assume nothing
+        $subdomain_install = true;
+    } elseif ( !allow_folder_install() ) {
         $subdomain_install = true;
     } else {
@@ -150 +166 @@
     }
 
-    if ( allow_subdomain_install() ) : ?>
+    if ( allow_subdomain_install() && allow_folder_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>
@@ -238 +254 @@
 
     if ( $_POST ) {
-        $subdomain_install = allow_subdomain_install() ? ! empty( $_POST['subdomain_install'] ) : false;
+        $subdomain_install = allow_subdomain_install() ? ( allow_folder_install() ? ! empty( $_POST['subdomain_install'] ) : true ) : false;
     } else {
         if ( is_multisite() ) {
@@ -333 +349 @@
         </ol>
 <?php if ( !is_multisite() ) { ?>
-        <p><?php printf( __( 'Once you complete these steps, your network is enabled and configured.') ); ?> <a href="<?php echo esc_url( admin_url() ); ?>"><?php _e( 'Return to Dashboard' ); ?></a></p>
+        <p><?php printf( __( 'Once you complete these steps, your network is enabled and configured. You will have to log in again.') ); ?> <a href="<?php echo esc_url( site_url( 'wp-login.php' ) ); ?>"><?php _e( 'Log In' ); ?></a></p>
 <?php
     }