Changeset 6925
- Timestamp:
- 11/09/2019 06:31:12 AM (5 years ago)
- Location:
- trunk/src/includes/admin
- Files:
-
- 4 edited
-
tools.php (modified) (1 diff)
-
tools/common.php (modified) (3 diffs)
-
tools/repair.php (modified) (2 diffs)
-
tools/upgrade.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/includes/admin/tools.php
r6924 r6925 448 448 'callback' => 'bbp_admin_upgrade_group_forum_relationship', 449 449 'priority' => 140, 450 'version' => esc_html__( 'Any', 'bbpress' ), 450 451 'overhead' => 'low', 451 452 'components' => array( bbp_get_forum_post_type() ) -
trunk/src/includes/admin/tools/common.php
r6924 r6925 506 506 507 507 // Get the available tools 508 $list = bbp_get_admin_repair_tools( $type ); 509 $search = ! empty( $_GET['s'] ) ? stripslashes( $_GET['s'] ) : ''; 510 $overhead = ! empty( $_GET['overhead'] ) ? sanitize_key( $_GET['overhead'] ) : ''; 511 $component = ! empty( $_GET['components'] ) ? sanitize_key( $_GET['components'] ) : ''; 512 $version = ! empty( $_GET['version'] ) ? sanitize_text_field( $_GET['version'] ) : ''; 508 $list = bbp_get_admin_repair_tools( $type ); 509 510 // Search 511 $search = ! empty( $_GET['s'] ) 512 ? stripslashes( $_GET['s'] ) 513 : ''; 514 515 // Overhead 516 $overhead = ! empty( $_GET['overhead'] ) 517 ? sanitize_key( $_GET['overhead'] ) 518 : ''; 519 520 // Component 521 $component = ! empty( $_GET['components'] ) 522 ? sanitize_key( $_GET['components'] ) 523 : ''; 524 525 // Version 526 $version = ! empty( $_GET['version'] ) 527 ? sanitize_text_field( $_GET['version'] ) 528 : ''; 529 530 // Orderby 531 $orderby = ! empty( $_GET['orderby'] ) 532 ? sanitize_key( $_GET['orderby'] ) 533 : 'order'; 534 535 // Order 536 $order = ! empty( $_GET['order'] ) && in_array( strtolower( $_GET['order'] ), array( 'asc', 'desc' ), true ) 537 ? strtolower( $_GET['order'] ) 538 : 'asc'; 513 539 514 540 // Overhead filter … … 548 574 'type' => $tool['type'], 549 575 'title' => $tool['title'], 576 'priority' => $tool['priority'], 550 577 'description' => $tool['description'], 551 578 'callback' => $tool['callback'], 552 579 'overhead' => $tool['overhead'], 553 580 'version' => $tool['version'], 554 'components' => $tool['components'] ,581 'components' => $tool['components'] 555 582 ); 556 583 } … … 558 585 559 586 // Sort 560 ksort( $repair_list);587 $retval = wp_list_sort( $repair_list, $orderby, $order, true ); 561 588 562 589 // Filter & return 563 return (array) apply_filters( 'bbp_repair_list', $re pair_list);590 return (array) apply_filters( 'bbp_repair_list', $retval ); 564 591 } 565 592 -
trunk/src/includes/admin/tools/repair.php
r6923 r6925 23 23 24 24 // Get the registered repair tools 25 $tools = bbp_admin_repair_list(); ?> 25 $tools = bbp_admin_repair_list(); 26 27 // Orderby 28 $orderby = ! empty( $_GET['orderby'] ) 29 ? sanitize_key( $_GET['orderby'] ) 30 : 'priority'; 31 32 // Order 33 $order = ! empty( $_GET['order'] ) && in_array( strtolower( $_GET['order'] ), array( 'asc', 'desc' ), true ) 34 ? strtolower( $_GET['order'] ) 35 : 'asc'; 36 37 // New order 38 $new_order = ( 'desc' === $order ) 39 ? 'asc' 40 : 'desc'; ?> 26 41 27 42 <div class="wrap"> … … 68 83 <input id="cb-select-all-1" type="checkbox"> 69 84 </td> 70 <th scope="col" id="description" class="manage-column column-primary column-description"><?php esc_html_e( 'Description', 'bbpress' ); ?></th> 71 <th scope="col" id="components" class="manage-column column-components"><?php esc_html_e( 'Components', 'bbpress' ); ?></th> 72 <th scope="col" id="overhead" class="manage-column column-overhead"><?php esc_html_e( 'Overhead', 'bbpress' ); ?></th> 85 <th scope="col" id="description" class="manage-column column-primary column-description sortable <?php echo ( 'priority' === $orderby ) ? esc_attr( $order ) : 'asc'; ?>"> 86 <a href="<?php echo esc_url( bbp_get_admin_repair_tool_page_url( array( 87 'orderby' => 'priority', 88 'order' => $new_order 89 ) ) ); ?>"><span><?php esc_html_e( 'Description', 'bbpress' ); ?></span><span class="sorting-indicator"></span> 90 </a> 91 </th> 92 <th scope="col" id="components" class="manage-column column-components"> 93 <span><?php esc_html_e( 'Components', 'bbpress' ); ?></span> 94 </th> 95 <th scope="col" id="overhead" class="manage-column column-overhead sortable <?php echo ( 'overhead' === $orderby ) ? esc_attr( $order ) : 'asc'; ?>"> 96 <a href="<?php echo esc_url( bbp_get_admin_repair_tool_page_url( array( 97 'orderby' => 'overhead', 98 'order' => $new_order 99 ) ) ); ?>"><span><?php esc_html_e( 'Overhead', 'bbpress' ); ?></span><span class="sorting-indicator"></span> 100 </a> 101 </th> 73 102 </tr> 74 103 </thead> -
trunk/src/includes/admin/tools/upgrade.php
r6896 r6925 20 20 21 21 // Get the registered upgrade tools 22 $tools = bbp_admin_repair_list( 'upgrade' ); ?> 22 $tools = bbp_admin_repair_list( 'upgrade' ); 23 24 // Orderby 25 $orderby = ! empty( $_GET['orderby'] ) 26 ? sanitize_key( $_GET['orderby'] ) 27 : 'priority'; 28 29 // Order 30 $order = ! empty( $_GET['order'] ) && in_array( strtolower( $_GET['order'] ), array( 'asc', 'desc' ), true ) 31 ? strtolower( $_GET['order'] ) 32 : 'asc'; 33 34 // New order 35 $new_order = ( 'desc' === $order ) 36 ? 'asc' 37 : 'desc'; ?> 23 38 24 39 <div class="wrap"> … … 67 82 <input id="cb-select-all-1" type="checkbox"> 68 83 </td> 69 <th scope="col" id="description" class="manage-column column-primary column-description"><?php esc_html_e( 'Description', 'bbpress' ); ?></th> 70 <th scope="col" id="version" class="manage-column column-version"><?php esc_html_e( 'Version', 'bbpress' ); ?></th> 84 <th scope="col" id="description" class="manage-column column-primary column-description sortable <?php echo ( 'priority' === $orderby ) ? esc_attr( $order ) : 'asc'; ?>"> 85 <a href="<?php echo esc_url( bbp_get_admin_repair_tool_page_url( array( 86 'orderby' => 'priority', 87 'order' => $new_order 88 ) ) ); ?>"><span><?php esc_html_e( 'Description', 'bbpress' ); ?></span><span class="sorting-indicator"></span> 89 </a> 90 </th> 91 <th scope="col" id="version" class="manage-column column-version sortable <?php echo ( 'version' === $orderby ) ? esc_attr( $order ) : 'asc'; ?>"> 92 <a href="<?php echo esc_url( bbp_get_admin_repair_tool_page_url( array( 93 'orderby' => 'version', 94 'order' => $new_order 95 ) ) ); ?>"><span><?php esc_html_e( 'Version', 'bbpress' ); ?></span><span class="sorting-indicator"></span> 96 </a> 97 </th> 71 98 <th scope="col" id="components" class="manage-column column-components"><?php esc_html_e( 'Components', 'bbpress' ); ?></th> 72 <th scope="col" id="overhead" class="manage-column column-overhead"><?php esc_html_e( 'Overhead', 'bbpress' ); ?></th> 99 <th scope="col" id="overhead" class="manage-column column-overhead sortable <?php echo ( 'overhead' === $orderby ) ? esc_attr( $order ) : 'asc'; ?>"> 100 <a href="<?php echo esc_url( bbp_get_admin_repair_tool_page_url( array( 101 'orderby' => 'overhead', 102 'order' => $new_order 103 ) ) ); ?>"><span><?php esc_html_e( 'Overhead', 'bbpress' ); ?></span><span class="sorting-indicator"></span> 104 </a> 105 </th> 73 106 </tr> 74 107 </thead>
Note: See TracChangeset
for help on using the changeset viewer.