Changeset 56599 for trunk/src/wp-admin/includes/network.php

Timestamp:

09/17/2023 03:21:07 PM (3 years ago)

Author:

costdev

Message:

Administration: Use wp_admin_notice() more in /wp-admin/includes/.

Adds further usages of wp_admin_notice() in /wp-admin/includes/ on .notice-error, .notice-warning, .error, and .updated.

Ongoing task to implement new function across core.

Follow-up to [56408], [56409], [56410], [56518], [56570], [56571], [56572], [56573], [56576], [56589], [56590], [56597].

Props joedolson, mukesh27, costdev.
See #57791.

File:

• trunk/src/wp-admin/includes/network.php (modified) (8 diffs)

trunk/src/wp-admin/includes/network.php

@@ -114 +114 @@
 
     if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
-        echo '<div class="error"><p><strong>' . __( 'Error:' ) . '</strong> ' . sprintf(
+        $cannot_define_constant_message  = '<strong>' . __( 'Error:' ) . '</strong> ';
+        $cannot_define_constant_message .= sprintf(
             /* translators: %s: DO_NOT_UPGRADE_GLOBAL_TABLES */
             __( 'The constant %s cannot be defined when creating a network.' ),
             '<code>DO_NOT_UPGRADE_GLOBAL_TABLES</code>'
-        ) . '</p></div>';
+        );
+
+        wp_admin_notice(
+            $cannot_define_constant_message,
+            array(
+                'additional_classes' => array( 'error' ),
+            )
+        );
+
         echo '</div>';
         require_once ABSPATH . 'wp-admin/admin-footer.php';
@@ -143 +152 @@
     $has_ports = strstr( $hostname, ':' );
     if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ), true ) ) ) {
-        echo '<div class="error"><p><strong>' . __( 'Error:' ) . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>';
+        wp_admin_notice(
+            '<strong>' . __( 'Error:' ) . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ),
+            array(
+                'additional_classes' => array( 'error' ),
+            )
+        );
+
         echo '<p>' . sprintf(
             /* translators: %s: Port number. */
@@ -161 +176 @@
     $error_codes = array();
     if ( is_wp_error( $errors ) ) {
-        echo '<div class="error"><p><strong>' . __( 'Error: The network could not be created.' ) . '</strong></p>';
+        $network_created_error_message = '<p><strong>' . __( 'Error: The network could not be created.' ) . '</strong></p>';
         foreach ( $errors->get_error_messages() as $error ) {
-            echo "<p>$error</p>";
-        }
-        echo '</div>';
+            $network_created_error_message .= "<p>$error</p>";
+        }
+        wp_admin_notice(
+            $network_created_error_message,
+            array(
+                'additional_classes' => array( 'error' ),
+                'paragraph_wrap'     => false,
+            )
+        );
         $error_codes = $errors->get_error_codes();
     }
@@ -196 +217 @@
         $got_mod_rewrite   = got_mod_rewrite();
         if ( $got_mod_rewrite ) { // Dangerous assumptions.
-            echo '<div class="updated inline"><p><strong>' . __( 'Note:' ) . '</strong> ';
-            printf(
+            $message_class = 'updated';
+            $message       = '<p><strong>' . __( 'Warning:' ) . '</strong> ';
+            $message      .= '<p>' . sprintf(
                 /* translators: %s: mod_rewrite */
                 __( 'Please make sure the Apache %s module is installed as it will be used at the end of this installation.' ),
                 '<code>mod_rewrite</code>'
-            );
-            echo '</p>';
+            ) . '</p>';
         } elseif ( $is_apache ) {
-            echo '<div class="error inline"><p><strong>' . __( 'Warning:' ) . '</strong> ';
-            printf(
+            $message_class = 'error';
+            $message       = '<p><strong>' . __( 'Warning:' ) . '</strong> ';
+            $message      .= sprintf(
                 /* translators: %s: mod_rewrite */
                 __( 'It looks like the Apache %s module is not installed.' ),
                 '<code>mod_rewrite</code>'
-            );
-            echo '</p>';
+            ) . '</p>';
         }
 
         if ( $got_mod_rewrite || $is_apache ) { // Protect against mod_rewrite mimicry (but ! Apache).
-            echo '<p>';
-            printf(
+            $message .= '<p>' . sprintf(
                 /* translators: 1: mod_rewrite, 2: mod_rewrite documentation URL, 3: Google search for mod_rewrite. */
                 __( 'If %1$s is disabled, ask your administrator to enable that module, or look at the <a href="%2$s">Apache documentation</a> or <a href="%3$s">elsewhere</a> for help setting it up.' ),
@@ -221 +241 @@
                 'https://httpd.apache.org/docs/mod/mod_rewrite.html',
                 'https://www.google.com/search?q=apache+mod_rewrite'
+            ) . '</p>';
+
+            wp_admin_notice(
+                $message,
+                array(
+                    'additional_classes' => array( $message_class, 'inline' ),
+                    'paragraph_wrap'     => false,
+                )
             );
-            echo '</p></div>';
         }
     }
@@ -264 +291 @@
 
     if ( WP_CONTENT_DIR !== ABSPATH . 'wp-content' && ( allow_subdirectory_install() || ! allow_subdomain_install() ) ) {
-        echo '<div class="error inline"><p><strong>' . __( 'Warning:' ) . '</strong> ' . __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' ) . '</p></div>';
+        $subdirectory_warning_message  = '<strong>' . __( 'Warning:' ) . '</strong> ';
+        $subdirectory_warning_message .= __( 'Subdirectory networks may not be fully compatible with custom wp-content directories.' );
+        wp_admin_notice(
+            $subdirectory_warning_message,
+            array(
+                'additional_classes' => array( 'error', 'inline' ),
+            )
+        );
     }
 
@@ -410 +444 @@
     // Wildcard DNS message.
     if ( is_wp_error( $errors ) ) {
-        echo '<div class="error">' . $errors->get_error_message() . '</div>';
+        wp_admin_notice(
+            $errors->get_error_message(),
+            array(
+                'additional_classes' => array( 'error' ),
+            )
+        );
     }
 
@@ -427 +466 @@
         } else {
             $subdomain_install = (bool) $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = 1 AND meta_key = 'subdomain_install'" );
+
+            wp_admin_notice(
+                '<strong>' . __( 'Warning:' ) . '</strong> ' . __( 'An existing WordPress network was detected.' ),
+                array(
+                    'additional_classes' => array( 'error' ),
+                )
+            );
             ?>
-    <div class="error"><p><strong><?php _e( 'Warning:' ); ?></strong> <?php _e( 'An existing WordPress network was detected.' ); ?></p></div>
     <p><?php _e( 'Please complete the configuration steps. To create a new network, you will need to empty or remove the network database tables.' ); ?></p>
             <?php