Changeset 4791 for trunk/includes/admin/tools.php

Timestamp:

03/06/2013 05:00:53 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Introduce helper functions for determining the REQUEST_METHOD, and replace occurrences with these new functions. Cleans up inconsistent handling of requests through-out the project.

File:

• trunk/includes/admin/tools.php (modified) (2 diffs)

trunk/includes/admin/tools.php

@@ -80 +80 @@
 function bbp_admin_repair_handler() {
 
-    if ( 'post' == strtolower( $_SERVER['REQUEST_METHOD'] ) ) {
-        check_admin_referer( 'bbpress-do-counts' );
-
-        // Stores messages
-        $messages = array();
-
-        wp_cache_flush();
-
-        foreach ( (array) bbp_admin_repair_list() as $item ) {
-            if ( isset( $item[2] ) && isset( $_POST[$item[0]] ) && 1 == $_POST[$item[0]] && is_callable( $item[2] ) ) {
-                $messages[] = call_user_func( $item[2] );
-            }
-        }
-
-        if ( count( $messages ) ) {
-            foreach ( $messages as $message ) {
-                bbp_admin_tools_feedback( $message[1] );
-            }
+    if ( ! bbp_is_post_request() )
+        return;
+
+    check_admin_referer( 'bbpress-do-counts' );
+
+    // Stores messages
+    $messages = array();
+
+    wp_cache_flush();
+
+    foreach ( (array) bbp_admin_repair_list() as $item ) {
+        if ( isset( $item[2] ) && isset( $_POST[$item[0]] ) && 1 == $_POST[$item[0]] && is_callable( $item[2] ) ) {
+            $messages[] = call_user_func( $item[2] );
+        }
+    }
+
+    if ( count( $messages ) ) {
+        foreach ( $messages as $message ) {
+            bbp_admin_tools_feedback( $message[1] );
         }
     }
@@ -1144 +1145 @@
  */
 function bbp_admin_reset_handler() {
-    if ( 'post' == strtolower( $_SERVER['REQUEST_METHOD'] ) && !empty( $_POST['bbpress-are-you-sure'] ) ) {
-        check_admin_referer( 'bbpress-reset' );
-
-        global $wpdb;
-
-        // Stores messages
-        $messages = array();
-        $failed   = __( 'Failed',   'bbpress' );
-        $success  = __( 'Success!', 'bbpress' );
-
-        // Flush the cache; things are about to get ugly.
-        wp_cache_flush();
-
-        /** Posts *************************************************************/
-
-        $statement  = __( 'Deleting Posts… %s', 'bbpress' );
-        $sql_posts  = $wpdb->get_results( "SELECT `ID` FROM `{$wpdb->posts}` WHERE `post_type` IN ('forum', 'topic', 'reply')", OBJECT_K );
-        $sql_delete = "DELETE FROM `{$wpdb->posts}` WHERE `post_type` IN ('forum', 'topic', 'reply')";
+
+    // Bail if not resetting
+    if ( ! bbp_is_post_request() || empty( $_POST['bbpress-are-you-sure'] ) )
+        return;
+
+    // Only keymasters can proceed
+    if ( ! bbp_is_user_keymaster() )
+        return;
+
+    check_admin_referer( 'bbpress-reset' );
+
+    global $wpdb;
+
+    // Stores messages
+    $messages = array();
+    $failed   = __( 'Failed',   'bbpress' );
+    $success  = __( 'Success!', 'bbpress' );
+
+    // Flush the cache; things are about to get ugly.
+    wp_cache_flush();
+
+    /** Posts *************************************************************/
+
+    $statement  = __( 'Deleting Posts… %s', 'bbpress' );
+    $sql_posts  = $wpdb->get_results( "SELECT `ID` FROM `{$wpdb->posts}` WHERE `post_type` IN ('forum', 'topic', 'reply')", OBJECT_K );
+    $sql_delete = "DELETE FROM `{$wpdb->posts}` WHERE `post_type` IN ('forum', 'topic', 'reply')";
+    $result     = is_wp_error( $wpdb->query( $sql_delete ) ) ? $failed : $success;
+    $messages[] = sprintf( $statement, $result );
+
+
+    /** Post Meta *********************************************************/
+
+    if ( !empty( $sql_posts ) ) {
+        foreach( $sql_posts as $key => $value ) {
+            $sql_meta[] = $key;
+        }
+        $statement  = __( 'Deleting Post Meta… %s', 'bbpress' );
+        $sql_meta   = implode( "', '", $sql_meta );
+        $sql_delete = "DELETE FROM `{$wpdb->postmeta}` WHERE `post_id` IN ('{$sql_meta}');";
         $result     = is_wp_error( $wpdb->query( $sql_delete ) ) ? $failed : $success;
         $messages[] = sprintf( $statement, $result );
-
-
-        /** Post Meta *********************************************************/
-
-        if ( !empty( $sql_posts ) ) {
-            foreach( $sql_posts as $key => $value ) {
-                $sql_meta[] = $key;
-            }
-            $statement  = __( 'Deleting Post Meta… %s', 'bbpress' );
-            $sql_meta   = implode( "', '", $sql_meta );
-            $sql_delete = "DELETE FROM `{$wpdb->postmeta}` WHERE `post_id` IN ('{$sql_meta}');";
-            $result     = is_wp_error( $wpdb->query( $sql_delete ) ) ? $failed : $success;
-            $messages[] = sprintf( $statement, $result );
-        }
-
-        /** Topic Tags ********************************************************/
-
-        $statement  = __( 'Deleting Topic Tags… %s', 'bbpress' );
-        $sql_delete = "DELETE a,b,c FROM `{$wpdb->terms}` AS a LEFT JOIN `{$wpdb->term_taxonomy}` AS c ON a.term_id = c.term_id LEFT JOIN `{$wpdb->term_relationships}` AS b ON b.term_taxonomy_id = c.term_taxonomy_id WHERE c.taxonomy = 'topic-tag';";
-        $result     = is_wp_error( $wpdb->query( $sql_delete ) ) ? $failed : $success;
-        $messages[] = sprintf( $statement, $result );
-
-        /** User Meta *********************************************************/
-
-        $statement  = __( 'Deleting User Meta… %s', 'bbpress' );
-        $sql_delete = "DELETE FROM `{$wpdb->usermeta}` WHERE `meta_key` LIKE '%%_bbp_%%';";
-        $result     = is_wp_error( $wpdb->query( $sql_delete ) ) ? $failed : $success;
-        $messages[] = sprintf( $statement, $result );
-
-        /** Converter *********************************************************/
-
-        $statement  = __( 'Deleting Conversion Table… %s', 'bbpress' );
-        $table_name = $wpdb->prefix . 'bbp_converter_translator';
-        if ( $wpdb->get_var( "SHOW TABLES LIKE '{$table_name}'" ) == $table_name ) {
-            $wpdb->query( "DROP TABLE {$table_name}" );
-            $result = $success;
-        } else {
-            $result = $failed;
-        }
-        $messages[] = sprintf( $statement, $result );
-
-        /** Options ***********************************************************/
-
-        $statement  = __( 'Deleting Settings… %s', 'bbpress' );
-        bbp_delete_options();
-        $messages[] = sprintf( $statement, $success );
-
-        /** Roles *************************************************************/
-
-        $statement  = __( 'Deleting Roles and Capabilities… %s', 'bbpress' );
-        remove_role( bbp_get_moderator_role() );
-        remove_role( bbp_get_participant_role() );
-        bbp_remove_caps();
-        $messages[] = sprintf( $statement, $success );
-
-        /** Output ************************************************************/
-
-        if ( count( $messages ) ) {
-            foreach ( $messages as $message ) {
-                bbp_admin_tools_feedback( $message );
-            }
-        }
-    }
-}
+    }
+
+    /** Topic Tags ********************************************************/
+
+    $statement  = __( 'Deleting Topic Tags… %s', 'bbpress' );
+    $sql_delete = "DELETE a,b,c FROM `{$wpdb->terms}` AS a LEFT JOIN `{$wpdb->term_taxonomy}` AS c ON a.term_id = c.term_id LEFT JOIN `{$wpdb->term_relationships}` AS b ON b.term_taxonomy_id = c.term_taxonomy_id WHERE c.taxonomy = 'topic-tag';";
+    $result     = is_wp_error( $wpdb->query( $sql_delete ) ) ? $failed : $success;
+    $messages[] = sprintf( $statement, $result );
+
+    /** User Meta *********************************************************/
+
+    $statement  = __( 'Deleting User Meta… %s', 'bbpress' );
+    $sql_delete = "DELETE FROM `{$wpdb->usermeta}` WHERE `meta_key` LIKE '%%_bbp_%%';";
+    $result     = is_wp_error( $wpdb->query( $sql_delete ) ) ? $failed : $success;
+    $messages[] = sprintf( $statement, $result );
+
+    /** Converter *********************************************************/
+
+    $statement  = __( 'Deleting Conversion Table… %s', 'bbpress' );
+    $table_name = $wpdb->prefix . 'bbp_converter_translator';
+    if ( $wpdb->get_var( "SHOW TABLES LIKE '{$table_name}'" ) == $table_name ) {
+        $wpdb->query( "DROP TABLE {$table_name}" );
+        $result = $success;
+    } else {
+        $result = $failed;
+    }
+    $messages[] = sprintf( $statement, $result );
+
+    /** Options ***********************************************************/
+
+    $statement  = __( 'Deleting Settings… %s', 'bbpress' );
+    bbp_delete_options();
+    $messages[] = sprintf( $statement, $success );
+
+    /** Roles *************************************************************/
+
+    $statement  = __( 'Deleting Roles and Capabilities… %s', 'bbpress' );
+    remove_role( bbp_get_moderator_role() );
+    remove_role( bbp_get_participant_role() );
+    bbp_remove_caps();
+    $messages[] = sprintf( $statement, $success );
+
+    /** Output ************************************************************/
+
+    if ( count( $messages ) ) {
+        foreach ( $messages as $message ) {
+            bbp_admin_tools_feedback( $message );
+        }
+    }
+}