Skip to:
Content

bbPress.org


Ignore:
Timestamp:
07/14/2015 12:46:38 AM (10 years ago)
Author:
johnjamesjacoby
Message:

I think this building should be condemned. There's serious metal fatigue in all the load-bearing members, the wiring is substandard, it's completely inadequate for our power needs, and the neighborhood is like a demilitarized zone.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/includes/common/functions.php

    r5827 r5829  
    126126        );
    127127
    128         if ( !empty( $older_date ) && !is_numeric( $older_date ) ) {
     128        if ( ! empty( $older_date ) && !is_numeric( $older_date ) ) {
    129129            $time_chunks = explode( ':', str_replace( ' ', ':', $older_date ) );
    130130            $date_chunks = explode( '-', str_replace( ' ', '-', $older_date ) );
     
    135135        // between a date and the current time. $newer_date will have a value if
    136136        // we want to work out time elapsed between two known dates.
    137         $newer_date = ( !$newer_date ) ? strtotime( current_time( 'mysql', $gmt ) ) : $newer_date;
     137        $newer_date = ( ! $newer_date ) ? strtotime( current_time( 'mysql', $gmt ) ) : $newer_date;
    138138
    139139        // Difference in seconds
     
    162162
    163163            // If $i iterates all the way to $j, then the event happened 0 seconds ago
    164             if ( !isset( $chunks[$i] ) ) {
     164            if ( ! isset( $chunks[$i] ) ) {
    165165                $output = $right_now_text;
    166166
     
    242242 */
    243243function bbp_get_redirect_to() {
    244     $retval = !empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
     244    $retval = ! empty( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
    245245
    246246    return apply_filters( 'bbp_get_redirect_to', $retval );
     
    262262
    263263    // Are we appending the view=all vars?
    264     if ( bbp_get_view_all() || !empty( $force ) ) {
     264    if ( bbp_get_view_all() || ! empty( $force ) ) {
    265265        $link = add_query_arg( array( 'view' => 'all' ), $original_link );
    266266    } else {
     
    296296 */
    297297function bbp_get_view_all( $cap = 'moderate' ) {
    298     $retval = ( ( !empty( $_GET['view'] ) && ( 'all' === $_GET['view'] ) && current_user_can( $cap ) ) );
     298    $retval = ( ( ! empty( $_GET['view'] ) && ( 'all' === $_GET['view'] ) && current_user_can( $cap ) ) );
    299299    return apply_filters( 'bbp_get_view_all', (bool) $retval );
    300300}
     
    316316
    317317    // Check query paged
    318     } elseif ( !empty( $wp_query->query['paged'] ) ) {
     318    } elseif ( ! empty( $wp_query->query['paged'] ) ) {
    319319        $paged = $wp_query->query['paged'];
    320320    }
    321321
    322322    // Paged found
    323     if ( !empty( $paged ) ) {
     323    if ( ! empty( $paged ) ) {
    324324        return (int) $paged;
    325325    }
     
    354354
    355355    // Post is not a topic or reply, return
    356     if ( !in_array( $data['post_type'], array( bbp_get_topic_post_type(), bbp_get_reply_post_type() ) ) ) {
     356    if ( ! in_array( $data['post_type'], array( bbp_get_topic_post_type(), bbp_get_reply_post_type() ) ) ) {
    357357        return $data;
    358358    }
    359359
    360360    // Is the post by an anonymous user?
    361     if ( ( bbp_get_topic_post_type() === $data['post_type'] && !bbp_is_topic_anonymous( $postarr['ID'] ) ) ||
    362          ( bbp_get_reply_post_type() === $data['post_type'] && !bbp_is_reply_anonymous( $postarr['ID'] ) ) ) {
     361    if ( ( bbp_get_topic_post_type() === $data['post_type'] && ! bbp_is_topic_anonymous( $postarr['ID'] ) ) ||
     362         ( bbp_get_reply_post_type() === $data['post_type'] && ! bbp_is_reply_anonymous( $postarr['ID'] ) ) ) {
    363363        return $data;
    364364    }
     
    480480
    481481    // Users
    482     if ( !empty( $r['count_users'] ) ) {
     482    if ( ! empty( $r['count_users'] ) ) {
    483483        $user_count = bbp_get_total_users();
    484484    }
    485485
    486486    // Forums
    487     if ( !empty( $r['count_forums'] ) ) {
     487    if ( ! empty( $r['count_forums'] ) ) {
    488488        $forum_count = wp_count_posts( bbp_get_forum_post_type() )->publish;
    489489    }
     
    496496
    497497    // Topics
    498     if ( !empty( $r['count_topics'] ) ) {
     498    if ( ! empty( $r['count_topics'] ) ) {
    499499        $all_topics  = wp_count_posts( bbp_get_topic_post_type() );
    500500
     
    505505
    506506            // Private
    507             $topics['private'] = ( !empty( $r['count_private_topics'] ) && current_user_can( 'read_private_topics' ) ) ? (int) $all_topics->{$private} : 0;
     507            $topics['private'] = ( ! empty( $r['count_private_topics'] ) && current_user_can( 'read_private_topics' ) ) ? (int) $all_topics->{$private} : 0;
    508508
    509509            // Spam
    510             $topics['spammed'] = ( !empty( $r['count_spammed_topics'] ) && current_user_can( 'edit_others_topics'  ) ) ? (int) $all_topics->{$spam}    : 0;
     510            $topics['spammed'] = ( ! empty( $r['count_spammed_topics'] ) && current_user_can( 'edit_others_topics'  ) ) ? (int) $all_topics->{$spam}    : 0;
    511511
    512512            // Trash
    513             $topics['trashed'] = ( !empty( $r['count_trashed_topics'] ) && current_user_can( 'view_trash'          ) ) ? (int) $all_topics->{$trash}   : 0;
     513            $topics['trashed'] = ( ! empty( $r['count_trashed_topics'] ) && current_user_can( 'view_trash'          ) ) ? (int) $all_topics->{$trash}   : 0;
    514514
    515515            // Total hidden (private + spam + trash)
     
    517517
    518518            // Generate the hidden topic count's title attribute
    519             $topic_titles[] = !empty( $topics['private'] ) ? sprintf( __( 'Private: %s', 'bbpress' ), number_format_i18n( $topics['private'] ) ) : '';
    520             $topic_titles[] = !empty( $topics['spammed'] ) ? sprintf( __( 'Spammed: %s', 'bbpress' ), number_format_i18n( $topics['spammed'] ) ) : '';
    521             $topic_titles[] = !empty( $topics['trashed'] ) ? sprintf( __( 'Trashed: %s', 'bbpress' ), number_format_i18n( $topics['trashed'] ) ) : '';
     519            $topic_titles[] = ! empty( $topics['private'] ) ? sprintf( __( 'Private: %s', 'bbpress' ), number_format_i18n( $topics['private'] ) ) : '';
     520            $topic_titles[] = ! empty( $topics['spammed'] ) ? sprintf( __( 'Spammed: %s', 'bbpress' ), number_format_i18n( $topics['spammed'] ) ) : '';
     521            $topic_titles[] = ! empty( $topics['trashed'] ) ? sprintf( __( 'Trashed: %s', 'bbpress' ), number_format_i18n( $topics['trashed'] ) ) : '';
    522522
    523523            // Compile the hidden topic title
     
    527527
    528528    // Replies
    529     if ( !empty( $r['count_replies'] ) ) {
     529    if ( ! empty( $r['count_replies'] ) ) {
    530530
    531531        $all_replies = wp_count_posts( bbp_get_reply_post_type() );
     
    537537
    538538            // Private
    539             $replies['private'] = ( !empty( $r['count_private_replies'] ) && current_user_can( 'read_private_replies' ) ) ? (int) $all_replies->{$private} : 0;
     539            $replies['private'] = ( ! empty( $r['count_private_replies'] ) && current_user_can( 'read_private_replies' ) ) ? (int) $all_replies->{$private} : 0;
    540540
    541541            // Spam
    542             $replies['spammed'] = ( !empty( $r['count_spammed_replies'] ) && current_user_can( 'edit_others_replies'  ) ) ? (int) $all_replies->{$spam}    : 0;
     542            $replies['spammed'] = ( ! empty( $r['count_spammed_replies'] ) && current_user_can( 'edit_others_replies'  ) ) ? (int) $all_replies->{$spam}    : 0;
    543543
    544544            // Trash
    545             $replies['trashed'] = ( !empty( $r['count_trashed_replies'] ) && current_user_can( 'view_trash'           ) ) ? (int) $all_replies->{$trash}   : 0;
     545            $replies['trashed'] = ( ! empty( $r['count_trashed_replies'] ) && current_user_can( 'view_trash'           ) ) ? (int) $all_replies->{$trash}   : 0;
    546546
    547547            // Total hidden (private + spam + trash)
     
    549549
    550550            // Generate the hidden topic count's title attribute
    551             $reply_titles[] = !empty( $replies['private'] ) ? sprintf( __( 'Private: %s', 'bbpress' ), number_format_i18n( $replies['private'] ) ) : '';
    552             $reply_titles[] = !empty( $replies['spammed'] ) ? sprintf( __( 'Spammed: %s', 'bbpress' ), number_format_i18n( $replies['spammed'] ) ) : '';
    553             $reply_titles[] = !empty( $replies['trashed'] ) ? sprintf( __( 'Trashed: %s', 'bbpress' ), number_format_i18n( $replies['trashed'] ) ) : '';
     551            $reply_titles[] = ! empty( $replies['private'] ) ? sprintf( __( 'Private: %s', 'bbpress' ), number_format_i18n( $replies['private'] ) ) : '';
     552            $reply_titles[] = ! empty( $replies['spammed'] ) ? sprintf( __( 'Spammed: %s', 'bbpress' ), number_format_i18n( $replies['spammed'] ) ) : '';
     553            $reply_titles[] = ! empty( $replies['trashed'] ) ? sprintf( __( 'Trashed: %s', 'bbpress' ), number_format_i18n( $replies['trashed'] ) ) : '';
    554554
    555555            // Compile the hidden replies title
     
    560560
    561561    // Topic Tags
    562     if ( !empty( $r['count_tags'] ) && bbp_allow_topic_tags() ) {
     562    if ( ! empty( $r['count_tags'] ) && bbp_allow_topic_tags() ) {
    563563
    564564        // Get the count
     
    566566
    567567        // Empty tags
    568         if ( !empty( $r['count_empty_tags'] ) && current_user_can( 'edit_topic_tags' ) ) {
     568        if ( ! empty( $r['count_empty_tags'] ) && current_user_can( 'edit_topic_tags' ) ) {
    569569            $empty_topic_tag_count = wp_count_terms( bbp_get_topic_tag_tax_id() ) - $topic_tag_count;
    570570        }
     
    621621    // Parse arguments against default values
    622622    $r = bbp_parse_args( $args, array (
    623         'bbp_anonymous_name'    => !empty( $_POST['bbp_anonymous_name']    ) ? $_POST['bbp_anonymous_name']    : false,
    624         'bbp_anonymous_email'   => !empty( $_POST['bbp_anonymous_email']   ) ? $_POST['bbp_anonymous_email']   : false,
    625         'bbp_anonymous_website' => !empty( $_POST['bbp_anonymous_website'] ) ? $_POST['bbp_anonymous_website'] : false,
     623        'bbp_anonymous_name'    => ! empty( $_POST['bbp_anonymous_name']    ) ? $_POST['bbp_anonymous_name']    : false,
     624        'bbp_anonymous_email'   => ! empty( $_POST['bbp_anonymous_email']   ) ? $_POST['bbp_anonymous_email']   : false,
     625        'bbp_anonymous_website' => ! empty( $_POST['bbp_anonymous_website'] ) ? $_POST['bbp_anonymous_website'] : false,
    626626    ), 'filter_anonymous_post_data' );
    627627
     
    686686
    687687    // Check for anonymous post
    688     if ( empty( $r['post_author'] ) && ( !empty( $r['anonymous_data'] ) && !empty( $r['anonymous_data']['bbp_anonymous_email'] ) ) ) {
     688    if ( empty( $r['post_author'] ) && ( ! empty( $r['anonymous_data'] ) && ! empty( $r['anonymous_data']['bbp_anonymous_email'] ) ) ) {
    689689        $clauses = get_meta_sql( array( array(
    690690            'key'   => '_bbp_anonymous_email',
     
    706706    // Prepare duplicate check query
    707707    $query  = $bbp_db->prepare( "SELECT ID FROM {$bbp_db->posts} {$join} WHERE post_type = %s AND post_status != %s AND post_author = %d AND post_content = %s {$where}", $r['post_type'], $r['post_status'], $r['post_author'], $r['post_content'] );
    708     $query .= !empty( $r['post_parent'] ) ? $bbp_db->prepare( " AND post_parent = %d", $r['post_parent'] ) : '';
     708    $query .= ! empty( $r['post_parent'] ) ? $bbp_db->prepare( " AND post_parent = %d", $r['post_parent'] ) : '';
    709709    $query .= " LIMIT 1";
    710710    $dupe   = apply_filters( 'bbp_check_for_duplicate_query', $query, $r );
     
    749749
    750750    // User is anonymous, so check a transient based on the IP
    751     if ( !empty( $anonymous_data ) && is_array( $anonymous_data ) ) {
     751    if ( ! empty( $anonymous_data ) && is_array( $anonymous_data ) ) {
    752752        $last_posted = get_transient( '_bbp_' . bbp_current_author_ip() . '_last_posted' );
    753753
    754         if ( !empty( $last_posted ) && time() < $last_posted + $throttle_time ) {
     754        if ( ! empty( $last_posted ) && time() < $last_posted + $throttle_time ) {
    755755            return false;
    756756        }
    757757
    758758    // User is logged in, so check their last posted time
    759     } elseif ( !empty( $author_id ) ) {
     759    } elseif ( ! empty( $author_id ) ) {
    760760        $author_id   = (int) $author_id;
    761761        $last_posted = bbp_get_user_last_posted( $author_id );
     
    816816
    817817        // If data exists, map it
    818         if ( !empty( $user ) ) {
     818        if ( ! empty( $user ) ) {
    819819            $_post['author'] = $user->display_name;
    820820            $_post['email']  = $user->user_email;
     
    916916
    917917    // Bail if keymaster is author
    918     if ( !empty( $author_id ) && bbp_is_user_keymaster( $author_id ) ) {
     918    if ( ! empty( $author_id ) && bbp_is_user_keymaster( $author_id ) ) {
    919919        return true;
    920920    }
     
    936936
    937937    // Map anonymous user data
    938     if ( !empty( $anonymous_data ) ) {
     938    if ( ! empty( $anonymous_data ) ) {
    939939        $_post['author'] = $anonymous_data['bbp_anonymous_name'];
    940940        $_post['email']  = $anonymous_data['bbp_anonymous_email'];
     
    942942
    943943    // Map current user data
    944     } elseif ( !empty( $author_id ) ) {
     944    } elseif ( ! empty( $author_id ) ) {
    945945
    946946        // Get author data
     
    948948
    949949        // If data exists, map it
    950         if ( !empty( $user ) ) {
     950        if ( ! empty( $user ) ) {
    951951            $_post['author'] = $user->display_name;
    952952            $_post['email']  = $user->user_email;
     
    10741074
    10751075    // Bail if subscriptions are turned off
    1076     if ( !bbp_is_subscriptions_active() ) {
     1076    if ( ! bbp_is_subscriptions_active() ) {
    10771077        return false;
    10781078    }
     
    10871087
    10881088    // Bail if topic is not published
    1089     if ( !bbp_is_topic_published( $topic_id ) ) {
     1089    if ( ! bbp_is_topic_published( $topic_id ) ) {
    10901090        return false;
    10911091    }
     
    10941094
    10951095    // Bail if reply is not published
    1096     if ( !bbp_is_reply_published( $reply_id ) ) {
     1096    if ( ! bbp_is_reply_published( $reply_id ) ) {
    10971097        return false;
    10981098    }
     
    11671167
    11681168        // Don't send notifications to the person who made the post
    1169         if ( !empty( $reply_author ) && (int) $user_id === (int) $reply_author ) {
     1169        if ( ! empty( $reply_author ) && (int) $user_id === (int) $reply_author ) {
    11701170            continue;
    11711171        }
     
    12321232
    12331233    // Bail if subscriptions are turned off
    1234     if ( !bbp_is_subscriptions_active() ) {
     1234    if ( ! bbp_is_subscriptions_active() ) {
    12351235        return false;
    12361236    }
     
    13241324
    13251325        // Don't send notifications to the person who made the post
    1326         if ( !empty( $topic_author ) && (int) $user_id === (int) $topic_author ) {
     1326        if ( ! empty( $topic_author ) && (int) $user_id === (int) $topic_author ) {
    13271327            continue;
    13281328        }
     
    13851385
    13861386        // Rejig the $redirect_to
    1387         if ( !isset( $_SERVER['REDIRECT_URL'] ) || ( $redirect_to !== home_url( $_SERVER['REDIRECT_URL'] ) ) ) {
     1387        if ( ! isset( $_SERVER['REDIRECT_URL'] ) || ( $redirect_to !== home_url( $_SERVER['REDIRECT_URL'] ) ) ) {
    13881388            $redirect_to = isset( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : '';
    13891389        }
     
    14291429
    14301430    // Passively filter the args before the parse
    1431     if ( !empty( $filter_key ) ) {
     1431    if ( ! empty( $filter_key ) ) {
    14321432        $r = apply_filters( 'bbp_before_' . $filter_key . '_parse_args', $r );
    14331433    }
    14341434
    14351435    // Parse
    1436     if ( is_array( $defaults ) && !empty( $defaults ) ) {
     1436    if ( is_array( $defaults ) && ! empty( $defaults ) ) {
    14371437        $r = array_merge( $defaults, $r );
    14381438    }
    14391439
    14401440    // Aggressively filter the args after the parse
    1441     if ( !empty( $filter_key ) ) {
     1441    if ( ! empty( $filter_key ) ) {
    14421442        $r = apply_filters( 'bbp_after_' . $filter_key . '_parse_args', $r );
    14431443    }
     
    18841884
    18851885                        // Single forum
    1886                         if ( !empty( $select_query_vars ) ) {
     1886                        if ( ! empty( $select_query_vars ) ) {
    18871887
    18881888                            // Load up our own query
     
    19021902
    19031903                        // Only forum replies
    1904                         if ( !empty( $_GET['type'] ) && ( bbp_get_reply_post_type() === $_GET['type'] ) ) {
     1904                        if ( ! empty( $_GET['type'] ) && ( bbp_get_reply_post_type() === $_GET['type'] ) ) {
    19051905
    19061906                            // The query
     
    19201920
    19211921                        // Only forum topics
    1922                         } elseif ( !empty( $_GET['type'] ) && ( bbp_get_topic_post_type() === $_GET['type'] ) ) {
     1922                        } elseif ( ! empty( $_GET['type'] ) && ( bbp_get_topic_post_type() === $_GET['type'] ) ) {
    19231923
    19241924                            // The query
     
    19661966
    19671967                        // Single topic
    1968                         if ( !empty( $select_query_vars ) ) {
     1968                        if ( ! empty( $select_query_vars ) ) {
    19691969
    19701970                            // Load up our own query
     
    20212021
    20222022            // We have a view to display a feed
    2023             if ( !empty( $view ) ) {
     2023            if ( ! empty( $view ) ) {
    20242024
    20252025                // Get the view query
     
    20572057
    20582058    // Path is not empty
    2059     if ( !empty( $path ) ) {
     2059    if ( ! empty( $path ) ) {
    20602060
    20612061        // Pretty permalinks are on so path might exist
Note: See TracChangeset for help on using the changeset viewer.