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

Timestamp:

03/09/2010 10:01:49 PM (15 years ago)

Author:

nacin

Message:

Check and error out on port numbers in Tools > Network, which aren't allowed in multisite. see #11816, see #11644

File:

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

trunk/wp-admin/network.php

@@ -54 +54 @@
     $active_plugins = get_option( 'active_plugins' );
     if ( ! empty( $active_plugins ) ) {
-        printf( '<p>' . __( 'Please <a href="%s">deactivate</a> your plugins before enabling the Network feature. Once the network is created, you may reactivate your plugins.' ) . '</p>', admin_url( 'plugins.php' ) );
+        echo '<div class="updated"><p><strong>' . __('Warning:') . '</strong> ' . sprintf( __( 'Please <a href="%s">deactivate</a> your plugins before enabling the Network feature.' ), admin_url( 'plugins.php' ) ) . '</p></div><p>' . __(' Once the network is created, you may reactivate your plugins.' ) . '</p>';
         include( './admin-footer.php' );
         die();
@@ -60 +60 @@
 
     $hostname = get_clean_basedomain();
-    if ( preg_match( '|[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|', $hostname ) ) {
-        echo '<p><strong>' . __('You cannot install a network of sites with your server address.' ) . '</strong></p>';
-        echo '<p>' . __('You cannot use an IP address such as <code>127.0.0.1</code>.' ) . '</p>';
+    $has_ports = strstr( $hostname, ':' );
+    if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ) ) )
+        || ( $no_ip = preg_match( '|[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+|', $hostname ) ) ) {
+        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 '<a href="' . esc_url( admin_url() ) . '">' . __( 'Return to Dashboard' ) . '</a>';
         include( './admin-footer.php' );
         die();
@@ -245 +251 @@
 </textarea></li>
         </ol>
-        <p>Once you complete these steps, your network is enabled and configured. <a href="<?php echo esc_url( admin_url() ); ?>">Return to Dashboard</a></p>
+        <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>
 <?php
 }