Changeset 2453

Timestamp:

07/01/2010 09:12:10 PM (16 years ago)

Author:

chrishajer

Message:

Fixes for anonymous posting. Fixes #1244. Props Nightgunner5, GautamGupta

Location:

trunk

Files:

• bb-includes/defaults.bb-filters.php (modified) (1 diff)
• bb-includes/functions.bb-capabilities.php (modified) (1 diff)
• bb-includes/functions.bb-deprecated.php (modified) (1 diff)
• bb-includes/functions.bb-meta.php (modified) (1 diff)
• bb-includes/functions.bb-posts.php (modified) (5 diffs)
• bb-includes/functions.bb-template.php (modified) (5 diffs)
• bb-includes/functions.bb-topics.php (modified) (2 diffs)
• bb-post.php (modified) (2 diffs)
• bb-templates/kakumei/post-form.php (modified) (1 diff)

trunk/bb-includes/defaults.bb-filters.php

@@ -163 +163 @@
 add_action( 'bb_new_post', 'bb_notify_subscribers' );
 
+add_action( 'post_form_pre_post', 'bb_anonymous_post_form' );
+
 unset( $filters, $filter );

trunk/bb-includes/functions.bb-capabilities.php

@@ -26 +26 @@
         if ( empty($bb_current_user) ) {
                 $retvalue = false;
+                if ( ( $capability == 'write_topic' || $capability == 'write_topics' ) && !bb_is_login_required() )
+                        $retvalue = true;
+                if ( ( $capability == 'write_topic' || $capability == 'write_topics' ) && !bb_is_login_required() )
+                        $retvalue = true;
         } else {
                 $retvalue = call_user_func_array(array(&$bb_current_user, 'has_cap'), $args);

trunk/bb-includes/functions.bb-deprecated.php

@@ -1181 +1181 @@
         }
 }
+
+function bb_get_current_commenter() {
+        bb_log_deprecated( 'function', __FUNCTION__, 'bb_get_current_poster' );
+        extract( bb_get_current_poster() );
+        return array( 'comment_author' => $post_author, 'comment_email' => $post_author_email, 'comment_author_url' => $post_author_url );
+}

trunk/bb-includes/functions.bb-meta.php

@@ -298 +298 @@
                         break;
                 case 'version':
-                        return '1.1-alpha-2452'; // Don't filter
+                        return '1.1-alpha-2453'; // Don't filter
                         break;
                 case 'bb_db_version' :

trunk/bb-includes/functions.bb-posts.php

@@ -5 +5 @@
 /**
  * Check to make sure that a user is not making too many posts in a short amount of time.
- *
- * @todo Add logic for users not logged in.
  *
  * @param string $ip Comment IP.
@@ -20 +18 @@
                 return;
         }
-
-        $hour_ago = gmdate( 'Y-m-d H:i:s', time() - 3600 );
 
         if ( bb_is_user_logged_in() ) {
@@ -34 +30 @@
                 }
         } else {
-                // todo: add logic for non-logged-in users
+                if ( ( $last_posted = bb_get_transient($_SERVER['REMOTE_ADDR'] . '_last_posted') ) && time() < $last_posted + $throttle_time ) {
+                        if ( defined('DOING_AJAX') && DOING_AJAX ) {
+                                die(__('Slow down; you move too fast.'));
+                        } else {
+                                bb_die(__('Slow down; you move too fast.'));
+                        }
+                }
         }
 }
 
 /**
- * Get the current, non-logged-in commenter data.
+ * Get the current, non-logged-in poster data.
  * @return array The associative array of author, email, and url data.
  */
-function bb_get_current_commenter() {
+function bb_get_current_poster() {
         // Cookies should already be sanitized.
-        $comment_author = '';
-        if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) )
-                $comment_author = $_COOKIE['comment_author_'.COOKIEHASH];
-
-        $comment_author_email = '';
-        if ( isset($_COOKIE['comment_author_email_'.COOKIEHASH]) )
-                $comment_author_email = $_COOKIE['comment_author_email_'.COOKIEHASH];
-
-        $comment_author_url = '';
-        if ( isset($_COOKIE['comment_author_url_'.COOKIEHASH]) )
-                $comment_author_url = $_COOKIE['comment_author_url_'.COOKIEHASH];
-
-        return compact('comment_author', 'comment_author_email', 'comment_author_url');
+        $post_author = '';
+        if ( isset( $_COOKIE['post_author_'.COOKIEHASH] ) )
+                $post_author = $_COOKIE['post_author_'.COOKIEHASH];
+
+        $post_author_email = '';
+        if ( isset( $_COOKIE['post_author_email_'.COOKIEHASH] ) )
+                $post_author_email = $_COOKIE['post_author_email_'.COOKIEHASH];
+
+        $post_author_url = '';
+        if ( isset( $_COOKIE['post_author_url_'.COOKIEHASH] ) )
+                $post_author_url = $_COOKIE['post_author_url_'.COOKIEHASH];
+
+        return compact( 'post_author', 'post_author_email', 'post_author_url' );
 }
 
@@ -412 +414 @@
 
                 // if user not logged in, save user data as meta data
-                if ( ! bb_is_user_logged_in() && ! bb_is_login_required() ) {
+                if ( !$user ) {
                         bb_update_meta($post_id, 'post_author', $post_author, 'post');
                         bb_update_meta($post_id, 'post_email', $post_email, 'post');
@@ -440 +442 @@
         bb_update_topic_voices( $topic_id );
         
-        if ( $throttle && !bb_current_user_can( 'throttle' ) )
-                bb_update_usermeta( $poster_id, 'last_posted', time() );
+        if ( $throttle && !bb_current_user_can( 'throttle' ) ) {
+                if ( $user )
+                        bb_update_usermeta( $poster_id, 'last_posted', time() );
+                else
+                        bb_set_transient( $_SERVER['REMOTE_ADDR'] . '_last_posted', time() );
+        }
 
         wp_cache_delete( $topic_id, 'bb_topic' );

trunk/bb-includes/functions.bb-template.php

@@ -331 +331 @@
         echo "\n" . '</fieldset>' . "\n" . '</form>' . "\n";
         do_action('post_edit_form');
+}
+
+function bb_anonymous_post_form() {
+        if ( !bb_is_user_logged_in() && !bb_is_login_required() )
+                bb_load_template( 'post-form-anonymous.php' );
 }
 
@@ -1203 +1208 @@
 function get_topic_last_poster( $id = 0 ) {
         $topic = get_topic( get_topic_id( $id ) );
-        $user_display_name = get_user_display_name($topic->topic_last_poster);
+        $user_display_name = get_post_author( $topic->topic_last_post_id );
         return apply_filters( 'get_topic_last_poster', $user_display_name, $topic->topic_last_poster, $topic->topic_id ); // $topic->topic_last_poster = user ID
 }
@@ -1214 +1219 @@
 function get_topic_author( $id = 0 ) {
         $topic = get_topic( get_topic_id( $id ) );
-        $user_display_name = get_user_display_name($topic->topic_poster);
+        $first_post = bb_get_first_post( $topic );
+        $user_display_name = get_post_author( $first_post->post_id );
         return apply_filters( 'get_topic_author', $user_display_name, $topic->topic_poster, $topic->topic_id ); // $topic->topic_poster = user ID
 }
@@ -1601 +1607 @@
                 $url = bb_get_uri(null, array('new' => 1));
 
-        if ( !bb_is_user_logged_in() )
+        if ( !bb_is_user_logged_in() && bb_is_login_required() )
                 $url = bb_get_uri('bb-login.php', array('redirect_to' => $url), BB_URI_CONTEXT_A_HREF + BB_URI_CONTEXT_BB_USER_FORMS);
         elseif ( bb_is_forum() || bb_is_topic() ) {
@@ -1762 +1768 @@
         if ( $user = bb_get_user( get_post_author_id( $post_id ) ) )
                 return apply_filters( 'get_post_author', $user->display_name, $user->ID, $post_id );
-        elseif ( $title = bb_get_post_meta( 'pingback_title' ) )
+        elseif ( $title = bb_get_post_meta( 'pingback_title', $post_id ) )
                 return apply_filters( 'bb_get_pingback_title', $title, $post_id );
-        elseif ( $title = bb_get_post_meta( 'post_author' ) )
+        elseif ( $title = bb_get_post_meta( 'post_author', $post_id ) )
                 return apply_filters( 'get_post_author', $title, 0, $post_id );
         else

trunk/bb-includes/functions.bb-topics.php

@@ -176 +176 @@
         $forum_id = (int) $forum->forum_id;
 
-        if ( !$user = bb_get_user( $topic_poster ) )
-                if ( !$user = bb_get_user( $topic_poster_name, array( 'by' => 'login' ) ) )
-                        return false;
-        $topic_poster = $user->ID;
-        $topic_poster_name = $user->user_login;
-
-        if ( !$last_user = bb_get_user( $topic_last_poster ) )
-                if ( !$last_user = bb_get_user( $topic_last_poster_name, array( 'by' => 'login' ) ) )
-                        return false;
-        $topic_last_poster = $last_user->ID;
-        $topic_last_poster_name = $last_user->user_login;
+        if ( bb_is_user_logged_in() || bb_is_login_required() ) {
+                if ( !$user = bb_get_user( $topic_poster ) )
+                        if ( !$user = bb_get_user( $topic_poster_name, array( 'by' => 'login' ) ) )
+                                return false;
+                $topic_poster = $user->ID;
+                $topic_poster_name = $user->user_login;
+
+                if ( !$last_user = bb_get_user( $topic_last_poster ) )
+                        if ( !$last_user = bb_get_user( $topic_last_poster_name, array( 'by' => 'login' ) ) )
+                                return false;
+                $topic_last_poster = $last_user->ID;
+                $topic_last_poster_name = $last_user->user_login;
+        }
 
         if ( in_array( 'topic_title', $fields ) ) {
@@ -235 +237 @@
 
 // Deprecated: expects $title to be pre-escaped
-function bb_new_topic( $title, $forum, $tags = '' ) {
+function bb_new_topic( $title, $forum, $tags = '', $args = '' ) {
         $title = stripslashes( $title );
         $tags  = stripslashes( $tags );
         $forum = (int) $forum;
-        return bb_insert_topic( array( 'topic_title' => $title, 'forum_id' => $forum, 'tags' => $tags ) );
+        return bb_insert_topic( wp_parse_args( $args ) + array( 'topic_title' => $title, 'forum_id' => $forum, 'tags' => $tags ) );
 }
 

trunk/bb-post.php

@@ -47 +47 @@
                 bb_die(__('Please enter a topic title'));
 
-        $topic_id = bb_new_topic( $topic, $forum_id, $tags );
+        $args = array();
+
+        if ( isset( $post_author ) )
+                $args['topic_poster_name'] = $args['topic_last_poster_name'] = $post_author;
+
+        $topic_id = bb_new_topic( $topic, $forum_id, $tags, $args );
 
 } elseif ( isset($_POST['topic_id'] ) ) {
@@ -89 +94 @@
         wp_redirect( bb_get_uri(null, null, BB_URI_CONTEXT_HEADER) );
 exit;
-
-?>

trunk/bb-templates/kakumei/post-form.php

@@ -6 +6 @@
 </p>
 <?php endif; do_action( 'post_form_pre_post' ); ?>
-<?php if ( ! bb_is_user_logged_in() && ! bb_is_login_required() )  : 
-        $current_commenter = bb_get_current_commenter();
-?>
-        <p id="post-form-author-container">
-                <label for="author"><?php _e('Author (required)'); ?>
-                        <input type="text" name="author" id="author" size="50" aria-required="true" value="<?php echo esc_attr($current_commenter['comment_author']); ?>" />
-                </label>
-        </p>
-
-        <p id="post-form-email-container">
-                <label for="email"><?php _e('Email (required)'); ?>
-                        <input type="text" name="email" id="email" size="50" aria-required="true" value="<?php echo esc_attr($current_commenter['comment_author_email']); ?>" />
-                </label>
-        </p>
-
-        <p id="post-form-url-container">
-                <label for="url"><?php _e('URL'); ?>
-                        <input type="text" name="url" id="url" size="50" aria-required="true" value="<?php echo esc_attr($current_commenter['comment_author_url']); ?>" />
-                </label>
-
-        </p>
-<?php endif; // end user not logged in but logins aren't required ?>
 
 <p id="post-form-post-container">