Changeset 6456 for trunk/src/includes/admin/admin.php

Timestamp:

06/01/2017 09:54:54 PM (7 years ago)

Author:

johnjamesjacoby

Message:

Converter: Multiple converter improvements

• Move classes into their own files
• Move converter.php into /admin/tools/
• Escape output of translated strings where possible
• Introduce bbp_converter_db_connection_failed error handler, in the event the origin database connection cannot be established
• Sets WP_SETUP_CONFIG constant to true to control $wpdb->db_connect() bail from using db-error.php
• Use sanitize_text_field() on database connection values
• Invisibly default to DB_ constants if database connection values are empty
• introduce convert_users class parameter to limit direct touches to $_POST value
• Smarter defaults for converter options

File:

• trunk/src/includes/admin/admin.php (modified) (12 diffs)

trunk/src/includes/admin/admin.php

@@ -101 +101 @@
      */
     private function setup_globals() {
-        $bbp = bbpress();
+        $bbp              = bbpress();
         $this->admin_dir  = trailingslashit( $bbp->includes_dir . 'admin'  ); // Admin path
         $this->admin_url  = trailingslashit( $bbp->includes_url . 'admin'  ); // Admin url
@@ -122 +122 @@
         require $this->admin_dir . 'tools.php';
         require $this->admin_dir . 'tools/common.php';
+        require $this->admin_dir . 'tools/converter.php';
         require $this->admin_dir . 'tools/repair.php';
         require $this->admin_dir . 'tools/upgrades.php';
@@ -128 +129 @@
 
         // Components
-        require $this->admin_dir . 'converter.php';
         require $this->admin_dir . 'settings.php';
         require $this->admin_dir . 'common.php';
@@ -136 +136 @@
         require $this->admin_dir . 'replies.php';
         require $this->admin_dir . 'users.php';
+
+        // Converter
+        require $this->admin_dir . 'classes/class-bbp-converter-base.php';
+        require $this->admin_dir . 'classes/class-bbp-converter.php';
     }
 
@@ -236 +240 @@
         // Forums Tools Root
         add_management_page(
-            __( 'Forums', 'bbpress' ),
-            __( 'Forums', 'bbpress' ),
+            esc_html__( 'Forums', 'bbpress' ),
+            esc_html__( 'Forums', 'bbpress' ),
             'bbp_tools_page',
             'bbp-repair',
@@ -246 +250 @@
         if ( 'basic' === bbp_settings_integration() ) {
             add_options_page(
-                __( 'Forums',  'bbpress' ),
-                __( 'Forums',  'bbpress' ),
+                esc_html__( 'Forums',  'bbpress' ),
+                esc_html__( 'Forums',  'bbpress' ),
                 'bbp_settings_page',
                 'bbpress',
@@ -259 +263 @@
             // About
             add_dashboard_page(
-                __( 'Welcome to bbPress',  'bbpress' ),
-                __( 'Welcome to bbPress',  'bbpress' ),
+                esc_html__( 'Welcome to bbPress',  'bbpress' ),
+                esc_html__( 'Welcome to bbPress',  'bbpress' ),
                 'bbp_about_page',
                 'bbp-about',
@@ -268 +272 @@
             // Credits
             add_dashboard_page(
-                __( 'Welcome to bbPress',  'bbpress' ),
-                __( 'Welcome to bbPress',  'bbpress' ),
+                esc_html__( 'Welcome to bbPress',  'bbpress' ),
+                esc_html__( 'Welcome to bbPress',  'bbpress' ),
                 'bbp_about_page',
                 'bbp-credits',
@@ -283 +287 @@
         add_submenu_page(
             'index.php',
-            __( 'Update Forums', 'bbpress' ),
-            __( 'Update Forums', 'bbpress' ),
+            esc_html__( 'Update Forums', 'bbpress' ),
+            esc_html__( 'Update Forums', 'bbpress' ),
             'manage_network',
             'bbp-update',
@@ -307 +311 @@
         add_submenu_page(
             'upgrade.php',
-            __( 'Update Forums', 'bbpress' ),
-            __( 'Update Forums', 'bbpress' ),
+            esc_html__( 'Update Forums', 'bbpress' ),
+            esc_html__( 'Update Forums', 'bbpress' ),
             'manage_network',
             'bbpress-update',
@@ -1070 +1074 @@
                         <?php foreach ( (array) $blogs as $details ) :
 
-                            $siteurl = get_blog_option( $details['blog_id'], 'siteurl' ); ?>
-
-                            <li><?php echo $siteurl; ?></li>
+                            // Get site URLs
+                            $site_url   = get_site_url( $details['blog_id'] );
+                            $admin_url  = get_site_url( $details['blog_id'], 'wp-admin.php', 'admin' );
+                            $remote_url = add_query_arg( array(
+                                'page'   => 'bbp-update',
+                                'action' => 'bbp-update'
+                            ), $admin_url ); ?>
+
+                            <li><?php echo esc_html( $site_url ); ?></li>
 
                             <?php
@@ -1078 +1088 @@
                             // Get the response of the bbPress update on this site
                             $response = wp_remote_get(
-                                trailingslashit( $siteurl ) . 'wp-admin/index.php?page=bbp-update&action=bbp-update',
-                                array( 'timeout' => 30, 'httpversion' => '1.1' )
+                                $remote_url,
+                                array(
+                                    'timeout'     => 30,
+                                    'httpversion' => '1.1'
+                                )
                             );
 
                             // Site errored out, no response?
                             if ( is_wp_error( $response ) ) {
-                                wp_die( sprintf( __( 'Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: %2$s', 'bbpress' ), $siteurl, '<em>' . $response->get_error_message() . '</em>' ) );
+                                wp_die( sprintf( esc_html__( 'Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: %2$s', 'bbpress' ), $site_url, '<em>' . $response->get_error_message() . '</em>' ) );
                             }