Changeset 6537 for trunk/src/includes/admin/tools/common.php

Timestamp:

06/13/2017 05:30:47 AM (7 years ago)

Author:

johnjamesjacoby

Message:

Tools: Improvements to repair, upgrade, and converter tools.

• Use escaped gettext equivalent functions where appropriate
• Rename description to title so that more descriptive descriptions can be used per-tool in a future version
• Register all scripts, and properly enqueue them only a needed
• Reorder & re-title some tools to better match each other

File:

• trunk/src/includes/admin/tools/common.php (modified) (10 diffs)

trunk/src/includes/admin/tools/common.php

@@ -30 +30 @@
      */
     function bbp_get_admin_repair_tool_run_url( $component = array() ) {
-        $tools  = admin_url( 'tools.php' );
-        $page   = ( 'repair' === $component['type'] ) ? 'bbp-repair' : 'bbp-upgrade';
-        $args   = array( 'page' => $page, 'action' => 'run', 'checked' => array( $component['id'] ) );
-        $url    = add_query_arg( $args, $tools );
-        $nonced = wp_nonce_url( $url, 'bbpress-do-counts' );
+
+        // Page
+        $page = ( 'repair' === $component['type'] )
+            ? 'bbp-repair'
+            : 'bbp-upgrade';
+
+        // Arguments
+        $args = array(
+            'page'    => $page,
+            'action'  => 'run',
+            'checked' => array( $component['id']
+        ) );
+
+        // Url
+        $nonced = wp_nonce_url( add_query_arg( $args, admin_url( 'tools.php' ) ), 'bbpress-do-counts' );
 
         // Filter & return
@@ -176 +186 @@
 
     // Filter & return
-    return apply_filters( 'bbp_get_admin_repair_tools', $tools, $type );
+    return (array) apply_filters( 'bbp_get_admin_repair_tools', $tools, $type );
 }
 
@@ -201 +211 @@
 
     // Filter & return
-    return apply_filters( 'bbp_get_admin_repair_tool_registered_components', $retval );
+    return (array) apply_filters( 'bbp_get_admin_repair_tool_registered_components', $retval );
 }
 
@@ -364 +374 @@
         // Search
         if ( ! empty( $search ) ) {
-            if ( ! strstr( strtolower( $tool['description'] ), strtolower( $search ) ) ) {
+            if ( ! strstr( strtolower( $tool['title'] ), strtolower( $search ) ) ) {
                 continue;
             }
@@ -373 +383 @@
             'id'          => sanitize_key( $id ),
             'type'        => $tool['type'],
+            'title'       => $tool['title'],
             'description' => $tool['description'],
             'callback'    => $tool['callback'],
@@ -412 +423 @@
 
     // Filter & return
-    return apply_filters( 'bbp_get_admin_repair_tool_components', $links, $item );
+    return (array) apply_filters( 'bbp_get_admin_repair_tool_components', $links, $item );
 }
 
@@ -460 +471 @@
 
     // Loop through tools and count overheads
-    foreach ( $tools as $id => $tool ) {
+    foreach ( $tools as $tool ) {
 
         // Get the overhead level
@@ -480 +491 @@
     // Default ticker
     $i = 0;
+
+    // Sort
+    ksort( $overheads );
 
     // Loop through overheads and build filter
@@ -493 +507 @@
 
         // Figure out separator and active class
-        $current  = ! empty( $_GET['overhead'] ) && ( sanitize_key( $_GET['overhead'] ) === $key ) ? 'current' : '';
+        $current  = ! empty( $_GET['overhead'] ) && ( sanitize_key( $_GET['overhead'] ) === $key )
+            ? 'current'
+            : '';
 
         // Counts to show
@@ -537 +553 @@
 
     // Filter & return
-    return apply_filters( 'bbp_get_admin_repair_tool_overhead', $links, $item );
-}
+    return (array) apply_filters( 'bbp_get_admin_repair_tool_overhead', $links, $item );
+}