Changeset 3236

Timestamp:

05/26/2011 10:40:54 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Consolidate topic form access checks.

Location:

branches/plugin

Files:

• bbp-includes/bbp-user-template.php (modified) (2 diffs)
• bbp-themes/bbp-twentyten/bbpress/form-topic.php (modified) (2 diffs)

branches/plugin/bbp-includes/bbp-user-template.php

@@ -1163 +1163 @@
     if ( bbp_is_forum() ) {
 
-        // What is the visibility of this forum
-        switch ( bbp_get_forum_visibility() ) {
-
-            // Public
-            case 'publish' :
-
-                // User cannot publish topics
-                if ( current_user_can( 'publish_topics' ) )
-                    $retval = true;
-
-                // Anonymous posting is allowed
-                if ( bbp_allow_anonymous() && !is_user_logged_in() )
-                    $retval = true;
-
-                break;
-
-            // Private forums
-            case 'private' :
-                if ( current_user_can( 'read_private_forums' ) )
-                    $retval = true;
-
-                break;
-
-            // Hidden forums
-            case 'hidden'  :
-                if ( current_user_can( 'read_hidden_forums' ) )
-                    $retval = true;
-
-                break;
+        // Forum is open
+        if ( bbp_is_forum_open() ) {
+
+            // What is the visibility of this forum
+            switch ( bbp_get_forum_visibility() ) {
+
+                // Public
+                case 'publish' :
+
+                    // User cannot publish topics
+                    if ( current_user_can( 'publish_topics' ) )
+                        $retval = true;
+
+                    // Anonymous posting is allowed
+                    if ( bbp_allow_anonymous() && !is_user_logged_in() )
+                        $retval = true;
+
+                    break;
+
+                // Private forums
+                case 'private' :
+                    if ( current_user_can( 'read_private_forums' ) )
+                        $retval = true;
+
+                    break;
+
+                // Hidden forums
+                case 'hidden'  :
+                    if ( current_user_can( 'read_hidden_forums' ) )
+                        $retval = true;
+
+                    break;
+            }
         }
 
@@ -1215 +1219 @@
 }
 
-/**
- * Performs a series of checks to ensure the current user can create topics in
- * this specific forum or scope.
- *
- * @since bbPress (r3127)
- *
- * @uses bbp_is_forum_category()
- * @uses bbp_is_forum_closed()
- * @uses current_user_can()
- * @uses bbp_get_topic_forum_id()
- * @uses bbp_is_topic_edit()
- *
- * @return bool
- */
-function bbp_current_user_can_create_topic_in_forum() {
-
-    // Always allow super admins
-    if ( is_super_admin() )
-        return true;
-
-    // Users need to earn access
-    $retval = false;
-
-    // Looking at a single forum
-    if ( bbp_is_forum() ) {
-
-        // Forum is not a category
-        if ( !bbp_is_forum_category() ) {
-
-            // Forum is open
-            $retval = (bool) bbp_is_forum_open();
-        }
-
-    // Editing a single topic
-    } elseif ( bbp_is_topic_edit() ) {
-
-        // If you can edit this forum, you can edit topics in this forum
-        if ( current_user_can( 'edit_forum', bbp_get_topic_forum_id() ) )
-            $retval = true;
-
-    // Fallback for shortcodes
-    } elseif ( is_page() || is_single() ) {
-
-        // Page or single post, and user can publish topics or anonymous
-        // posting is allowed.
-        if ( current_user_can( 'publish_topics' ) || ( !is_user_logged_in() && bbp_allow_anonymous() ) )
-            $retval = true;
-
-    }
-
-    // Allow access to be filtered
-    return apply_filters( 'bbp_current_user_can_create_topic_in_forum', $retval );
-}
-
-
 ?>

branches/plugin/bbp-themes/bbp-twentyten/bbpress/form-topic.php

@@ -13 +13 @@
 ?>
 
-<?php if ( bbp_current_user_can_access_create_topic_form() ) : ?>
-
-    <?php if ( bbp_current_user_can_create_topic_in_forum() ) : ?>
+    <?php if ( bbp_current_user_can_access_create_topic_form() ) : ?>
 
         <div id="new-topic-<?php bbp_topic_id(); ?>" class="bbp-topic-form">
@@ -158 +156 @@
         </div>
 
+    <?php else : ?>
+
+        <div id="no-topic-<?php bbp_topic_id(); ?>" class="bbp-no-topic">
+            <div class="bbp-template-notice">
+                <p><?php is_user_logged_in() ? _e( 'You cannot create new topics at this time.', 'bbpress' ) : _e( 'You must be logged in to create new topics.', 'bbpress' ); ?></p>
+            </div>
+        </div>
+
     <?php endif; ?>
-
-<?php else : ?>
-
-    <div id="no-topic-<?php bbp_topic_id(); ?>" class="bbp-no-topic">
-        <div class="bbp-template-notice">
-            <p><?php is_user_logged_in() ? _e( 'You cannot create new topics at this time.', 'bbpress' ) : _e( 'You must be logged in to create new topics.', 'bbpress' ); ?></p>
-        </div>
-    </div>
-
-<?php endif; ?>