Changeset 5060 for trunk/includes/topics/functions.php

Timestamp:

08/02/2013 07:20:49 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Normalize forum, topic, and reply dropdown form fields and associated functions. Includes several new functions with _get_ equivalents to replace incorrectly named _select() functions.

First pass at adding custom topic status handling. Props jkudish. See #2187.

Also replaces $wpdb->update() calls with wp_update_post() in associated functions. Fixes #2351.

File:

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

trunk/includes/topics/functions.php

@@ -276 +276 @@
                 $topic_status = bbp_get_pending_status_id();
 
-        // Default to published
+        // Check a whitelist of possible topic status ID's
+        } elseif ( in_array( $_POST['bbp_topic_status'], array( bbp_get_public_status_id(), bbp_get_closed_status_id(), bbp_get_spam_status_id(), bbp_get_pending_status_id(), bbp_get_trash_status_id(), bbp_get_orphan_status_id() ) ) ) {
+                $topic_status = $_POST['bbp_topic_status'];
+
+        // Default to published if nothing else
         } else {
                 $topic_status = bbp_get_public_status_id();
@@ -608 +612 @@
                 }
 
+        // Check a whitelist of possible topic status ID's
+        } elseif ( in_array( $_POST['bbp_topic_status'], array( bbp_get_public_status_id(), bbp_get_closed_status_id(), bbp_get_spam_status_id(), bbp_get_pending_status_id(), bbp_get_trash_status_id(), bbp_get_orphan_status_id() ) ) ) {
+                $topic_status = $_POST['bbp_topic_status'];
+
         // Use existing post_status
         } else {
@@ -1944 +1952 @@
 }
 
+/** Helpers *******************************************************************/
+
+/**
+ * Return an associative array of available topic statuses
+ *
+ * @since bbPress (r5059)
+ *
+ * @return array
+ */
+function bbp_get_topic_statuses() {
+        return apply_filters( 'bbp_get_topic_statuses', array(
+                bbp_get_public_status_id()  => _x( 'Open',    'Open the topic',        'bbpress' ),
+                bbp_get_closed_status_id()  => _x( 'Closed',  'Close the topic',       'bbpress' ),
+                bbp_get_spam_status_id()    => _x( 'Spam',    'Spam the topic',        'bbpress' ),
+                bbp_get_trash_status_id()   => _x( 'Trash',   'Trash the topic',       'bbpress' ),
+                bbp_get_pending_status_id() => _x( 'Pending', 'Mark topic as pending', 'bbpress' ),
+        ) );
+}
+
+/**
+ * Return an associative array of topic sticky types
+ *
+ * @since bbPress (r5059)
+ *
+ * @return array
+ */
+function bbp_get_topic_types() {
+        return apply_filters( 'bbp_get_topic_types', array(
+                'unstick' => _x( 'Normal',       'Unstick a topic',         'bbpress' ),
+                'stick'   => _x( 'Sticky',       'Make topic sticky',       'bbpress' ),
+                'super'   => _x( 'Super Sticky', 'Make topic super sticky', 'bbpress' )
+        ) );
+}
+
 /** Stickies ******************************************************************/