Changeset 6056 for trunk/src/includes/topics/functions.php

Timestamp:

06/05/2016 06:27:54 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Moderators: Refactor per-forum moderators to use meta-data instead of mocked taxonomy terms.

If the future of Forums is a taxonomy (vs. a custom post-type) then a per-forum Moderator taxonomy for a Forum taxonomy won't work very well, for a few reasons:

• Scalability
• Taxonomies for taxonomies is a bit more inception than should be required for this simple feature
• Forum moderators do not require much of what taxonomy objects provide (permalinks, visibility, metadata, etc...)
• User taxonomy terms matching nicenames works okay for something like Automattic's P2 theme, but bbPress requires a user ID based solution to avoid data synchronization issues between nicenames & term slugs

So... the future of per-forum per-user capability mappings is in meta-data using map_meta_cap.

This commit:

• Removes the forum_mod taxonomy and surrounding code additions introduced in the first pass in r5834
• Renames forum_mod functions to forum_moderator to be more explicit
• Adds CRUD wrapper functions for per-forum moderator meta data
• Adds administrative interfaces for assigning moderators to forums for wp-admin and forum edit pages
• Adds helper functions for getting user nicenames & IDs

Note that this feature has now been refactored to no longer be forum specific (I.E. object agnostic) -- it's possible for any user access to be mapped based on the object type using any meta-data key. While this is currently useful for per-forum moderators, it may be user for per-topic blocking, per-topic-tag moderation, etc...

See #459.

File:

• trunk/src/includes/topics/functions.php (modified) (3 diffs)

trunk/src/includes/topics/functions.php

@@ -393 +393 @@
                 do_action( 'bbp_new_topic', $topic_id, $forum_id, $anonymous_data, $topic_author );
 
-                /** Stickies **********************************************************/
-
-                // Sticky check after 'bbp_new_topic' action so forum ID meta is set
-                if ( ! empty( $_POST['bbp_stick_topic'] ) && in_array( $_POST['bbp_stick_topic'], array( 'stick', 'super', 'unstick' ) ) ) {
-
-                        // What's the caps?
-                        if ( current_user_can( 'moderate', $topic_id ) ) {
-
-                                // What's the haps?
-                                switch ( $_POST['bbp_stick_topic'] ) {
-
-                                        // Sticky in this forum
-                                        case 'stick'   :
-                                                bbp_stick_topic( $topic_id );
-                                                break;
-
-                                        // Super sticky in all forums
-                                        case 'super'   :
-                                                bbp_stick_topic( $topic_id, true );
-                                                break;
-
-                                        // We can avoid this as it is a new topic
-                                        case 'unstick' :
-                                        default        :
-                                                break;
-                                }
-                        }
-                }
-
                 /** Additional Actions (After Save) ***********************************/
 
@@ -761 +732 @@
                 }
 
-                /** Stickies **********************************************************/
-
-                // Get the topic types
-                $topic_types = bbp_get_topic_types( $topic_id );
-
-                // Maybe sticky
-                if ( ! empty( $_POST['bbp_stick_topic'] ) && in_array( $_POST['bbp_stick_topic'], array_keys( $topic_types ) ) ) {
-
-                        // What's the caps?
-                        if ( current_user_can( 'moderate', $topic_id ) ) {
-
-                                // What's the haps?
-                                switch ( $_POST['bbp_stick_topic'] ) {
-
-                                        // Sticky in forum
-                                        case 'stick'   :
-                                                bbp_stick_topic( $topic_id );
-                                                break;
-
-                                        // Sticky in all forums
-                                        case 'super'   :
-                                                bbp_stick_topic( $topic_id, true );
-                                                break;
-
-                                        // Normal
-                                        case 'unstick' :
-                                        default        :
-                                                bbp_unstick_topic( $topic_id );
-                                                break;
-                                }
-                        }
-                }
-
                 /** Additional Actions (After Save) ***********************************/
 
@@ -879 +817 @@
         if ( empty( $forum_id ) ) {
                 $forum_id = bbp_get_topic_forum_id( $topic_id );
+        }
+
+        // Get the topic types
+        $topic_types = bbp_get_topic_types( $topic_id );
+
+        // Sticky check after 'bbp_new_topic' action so forum ID meta is set
+        if ( ! empty( $_POST['bbp_stick_topic'] ) && in_array( $_POST['bbp_stick_topic'], array_keys( $topic_types ) ) ) {
+
+                // What's the caps?
+                if ( current_user_can( 'moderate', $topic_id ) ) {
+
+                        // What's the haps?
+                        switch ( $_POST['bbp_stick_topic'] ) {
+
+                                // Sticky in this forum
+                                case 'stick'   :
+                                        bbp_stick_topic( $topic_id );
+                                        break;
+
+                                // Super sticky in all forums
+                                case 'super'   :
+                                        bbp_stick_topic( $topic_id, true );
+                                        break;
+
+                                // We can avoid this as it is a new topic
+                                case 'unstick' :
+                                default        :
+                                        break;
+                        }
+                }
         }