Changeset 14010

Timestamp:

08/26/2024 11:10:35 PM (2 years ago)

Author:

espellcaste

Message:

WPCS: Part I: miscellaneous fixes for some of the files of the blogs component.

See #9174
See #9173

Location:

trunk/src/bp-blogs/classes

Files:

• class-bp-blogs-blog.php (modified) (43 diffs)
• class-bp-blogs-component.php (modified) (12 diffs)
• class-bp-blogs-template.php (modified) (7 diffs)
• class-bp-blogs-theme-compat.php (modified) (10 diffs)

trunk/src/bp-blogs/classes/class-bp-blogs-blog.php

@@ -49 +49 @@
          */
         public function __construct( $id = null ) {
-                if ( !empty( $id ) ) {
+                if ( ! empty( $id ) ) {
                         $this->id = (int) $id;
                         $this->populate();
@@ -71 +71 @@
         /**
          * Save the BP blog data to the database.
+         *
+         * @global wpdb $wpdb WordPress database object.
          *
          * @return bool
@@ -109 +111 @@
 
                 // Don't try and save if there is no user ID or blog ID set.
-                if ( !$this->user_id || !$this->blog_id )
+                if ( ! $this->user_id || ! $this->blog_id ) {
                         return false;
+                }
 
                 // Don't save if this blog has already been recorded for the user.
-                if ( !$this->id && $this->exists() )
+                if ( ! $this->id && $this->exists() ) {
                         return false;
+                }
 
                 $bp = buddypress();
@@ -126 +130 @@
                 }
 
-                if ( !$wpdb->query($sql) )
+                if ( ! $wpdb->query( $sql ) ) {
                         return false;
+                }
 
                 /**
@@ -140 +145 @@
                 do_action_ref_array( 'bp_blogs_blog_after_save', array( &$this ) );
 
-                if ( $this->id )
+                if ( $this->id ) {
                         return $this->id;
-                else
-                        return $wpdb->insert_id;
+                }
+
+                return $wpdb->insert_id;
         }
 
@@ -149 +155 @@
          * Check whether an association between this user and this blog exists.
          *
-         * @return int $value The number of associations between the user and blog
-         *                    saved in the blog component tables.
+         * @global wpdb $wpdb WordPress database object.
+         *
+         * @return string|null The number of associations between the user and blog.
          */
         public function exists() {
@@ -166 +173 @@
          *
          * @since 1.2.0
-         * @since 10.0.0 Converted to array as main function argument. Added `$date_query` parameter.
-         *
-         * @param array $data {
+         * @since 10.0.0 Converted to `array` as main function argument. Added `$date_query` parameter.
+         *
+         * @global wpdb $wpdb WordPress database object.
+         *
+         * @param array ...$args {
          *     Array of site data to query for.
+         *
          *     @type string      $type              The order in which results should be returned.
          *                                          'active', 'alphabetical', 'newest', or 'random'.
@@ -184 +194 @@
          *     @type array|bool  $include_blog_ids  Optional. Array of blog IDs to include.
          *     @type array       $date_query        Optional. Filter results by site last activity date. See first
-         *                                          paramter of {@link WP_Date_Query::__construct()} for syntax. Only
-         *                                          applicable if $type is either 'newest' or 'active'.
+         *                                          parameter of {@link WP_Date_Query::__construct()} for syntax. Only
+         *                                          applicable if `$type` is either 'newest' or 'active'.
          * }
          * @return array Multidimensional results array, structured as follows:
@@ -194 +204 @@
                 global $wpdb;
 
-                $bp = buddypress();
-
                 // Backward compatibility with old method of passing arguments.
                 if ( ! is_array( $args[0] ) || count( $args ) > 1 ) {
-                        _deprecated_argument( __METHOD__, '10.0.0', sprintf( esc_html__( 'Arguments passed to %1$s should be in an associative array. See the inline documentation at %2$s for more details.', 'buddypress' ), __METHOD__, __FILE__ ) );
-
-                        $old_args_keys = [
-                                0  => 'type',
-                                1  => 'per_page',
-                                2  => 'page',
-                                3  => 'user_id',
-                                4  => 'search_terms',
-                                5  => 'update_meta_cache',
-                                6  => 'include_blog_ids',
-                        ];
+                        _deprecated_argument(
+                                __METHOD__,
+                                '10.0.0',
+                                sprintf(
+                                        // translators: 1: the name of the method. 2: the name of the file.
+                                        esc_html__( 'Arguments passed to %1$s should be in an associative array. See the inline documentation at %2$s for more details.', 'buddypress' ),
+                                        __METHOD__,
+                                        __FILE__
+                                )
+                        );
+
+                        $old_args_keys = array(
+                                0 => 'type',
+                                1 => 'per_page',
+                                2 => 'page',
+                                3 => 'user_id',
+                                4 => 'search_terms',
+                                5 => 'update_meta_cache',
+                                6 => 'include_blog_ids',
+                        );
 
                         $args = bp_core_parse_args_array( $old_args_keys, $args );
@@ -215 +232 @@
                 }
 
-                $r = wp_parse_args(
+                $bp = buddypress();
+                $r  = wp_parse_args(
                         $args,
                         array(
@@ -230 +248 @@
 
                 if ( ! is_user_logged_in() || ( ! bp_current_user_can( 'bp_moderate' ) && ( $r['user_id'] != bp_loggedin_user_id() ) ) ) {
-                        $hidden_sql = "AND wb.public = 1";
+                        $hidden_sql = 'AND wb.public = 1';
                 } else {
                         $hidden_sql = '';
                 }
 
-                $pag_sql = ( $r['per_page'] && $r['page'] ) ? $wpdb->prepare( " LIMIT %d, %d", intval( ( $r['page'] - 1 ) * $r['per_page']), intval( $r['per_page'] ) ) : '';
-
-                $user_sql = ! empty( $r['user_id'] ) ? $wpdb->prepare( " AND b.user_id = %d", $r['user_id'] ) : '';
+                $pag_sql = ( $r['per_page'] && $r['page'] ) ? $wpdb->prepare( ' LIMIT %d, %d', intval( ( $r['page'] - 1 ) * $r['per_page'] ), intval( $r['per_page'] ) ) : '';
+
+                $user_sql = ! empty( $r['user_id'] ) ? $wpdb->prepare( ' AND b.user_id = %d', $r['user_id'] ) : '';
 
                 $date_query_sql = '';
 
                 switch ( $r['type'] ) {
-                        case 'active': default:
+                        case 'active':
+                        default:
                                 $date_query_sql = BP_Date_Query::get_where_sql( $r['date_query'], 'bm.meta_value', true );
-                                $order_sql      = "ORDER BY bm.meta_value DESC";
+                                $order_sql      = 'ORDER BY bm.meta_value DESC';
                                 break;
                         case 'alphabetical':
-                                $order_sql = "ORDER BY bm_name.meta_value ASC";
+                                $order_sql = 'ORDER BY bm_name.meta_value ASC';
                                 break;
                         case 'newest':
                                 $date_query_sql = BP_Date_Query::get_where_sql( $r['date_query'], 'wb.registered', true );
-                                $order_sql      = "ORDER BY wb.registered DESC";
+                                $order_sql      = 'ORDER BY wb.registered DESC';
                                 break;
                         case 'random':
-                                $order_sql = "ORDER BY RAND()";
+                                $order_sql = 'ORDER BY RAND()';
                                 break;
                 }
 
-                $include_sql = '';
+                $include_sql      = '';
                 $include_blog_ids = array_filter( wp_parse_id_list( $r['include_blog_ids'] ) );
                 if ( ! empty( $include_blog_ids ) ) {
@@ -278 +297 @@
                 }
 
-                $paged_blogs = $wpdb->get_results( "
+                $paged_blogs = $wpdb->get_results(
+                        "
                         SELECT b.blog_id, b.user_id as admin_user_id, u.user_email as admin_user_email, wb.domain, wb.path, bm.meta_value as last_activity, bm_name.meta_value as name
                         FROM
@@ -292 +312 @@
                           {$search_terms_sql} {$user_sql} {$include_sql} {$date_query_sql}
                         GROUP BY b.blog_id {$order_sql} {$pag_sql}
-                " );
-
-                $total_blogs = $wpdb->get_var( "
+                "
+                );
+
+                $total_blogs = $wpdb->get_var(
+                        "
                         SELECT COUNT(DISTINCT b.blog_id)
                         FROM
@@ -306 +328 @@
                           AND bm.meta_key = 'last_activity' AND bm_name.meta_key = 'name'
                           {$search_terms_sql} {$user_sql} {$include_sql} {$date_query_sql}
-                " );
+                "
+                );
 
                 $blog_ids = array();
@@ -313 +336 @@
                 }
 
-                $paged_blogs = BP_Blogs_Blog::get_blog_extras( $paged_blogs, $blog_ids, $r['type'] );
+                $paged_blogs = self::get_blog_extras( $paged_blogs, $blog_ids, $r['type'] );
 
                 // Integer casting.
@@ -325 +348 @@
                 }
 
-                return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
+                return array(
+                        'blogs' => $paged_blogs,
+                        'total' => $total_blogs,
+                );
         }
 
         /**
          * Delete the record of a given blog for all users.
+         *
+         * @global wpdb $wpdb WordPress database object.
          *
          * @param int $blog_id The blog being removed from all users.
@@ -346 +374 @@
         /**
          * Delete the record of a given blog for a specific user.
+         *
+         * @global wpdb $wpdb WordPress database object.
          *
          * @param int      $blog_id The blog being removed.
@@ -355 +385 @@
                 global $wpdb;
 
-                if ( !$user_id )
+                if ( ! $user_id ) {
                         $user_id = bp_loggedin_user_id();
+                }
 
                 $bp = buddypress();
@@ -365 +396 @@
         /**
          * Delete all of a user's blog associations in the BP tables.
+         *
+         * @global wpdb $wpdb WordPress database object.
          *
          * @param int|null $user_id Optional. The ID of the user whose blog associations
@@ -373 +406 @@
                 global $wpdb;
 
-                if ( !$user_id )
+                if ( ! $user_id ) {
                         $user_id = bp_loggedin_user_id();
+                }
 
                 $bp = buddypress();
@@ -388 +422 @@
          * blogs that have been recorded by BuddyPress, while the WP function
          * does a true query of a user's blog capabilities.
+         *
+         * @global wpdb $wpdb WordPress database object.
          *
          * @param int  $user_id     Optional. ID of the user whose blogs are being
@@ -402 +438 @@
                 $bp = buddypress();
 
-                if ( !$user_id )
+                if ( ! $user_id ) {
                         $user_id = bp_displayed_user_id();
+                }
 
                 // Show logged in users their hidden blogs.
-                if ( !bp_is_my_profile() && !$show_hidden )
+                if ( ! bp_is_my_profile() && ! $show_hidden ) {
                         $blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.blog_id, b.id, bm1.meta_value as name, wb.domain, wb.path FROM {$bp->blogs->table_name} b, {$wpdb->base_prefix}blogs wb, {$bp->blogs->table_name_blogmeta} bm1 WHERE b.blog_id = wb.blog_id AND b.blog_id = bm1.blog_id AND bm1.meta_key = 'name' AND wb.public = 1 AND wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND b.user_id = %d ORDER BY b.blog_id", $user_id ) );
-                else
+                } else {
                         $blogs = $wpdb->get_results( $wpdb->prepare( "SELECT DISTINCT b.blog_id, b.id, bm1.meta_value as name, wb.domain, wb.path FROM {$bp->blogs->table_name} b, {$wpdb->base_prefix}blogs wb, {$bp->blogs->table_name_blogmeta} bm1 WHERE b.blog_id = wb.blog_id AND b.blog_id = bm1.blog_id AND bm1.meta_key = 'name' AND wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND b.user_id = %d ORDER BY b.blog_id", $user_id ) );
-
-                $total_blog_count = BP_Blogs_Blog::total_blog_count_for_user( $user_id );
+                }
+
+                $total_blog_count = self::total_blog_count_for_user( $user_id );
 
                 $user_blogs = array();
                 foreach ( (array) $blogs as $blog ) {
-                        $user_blogs[$blog->blog_id] = new stdClass;
-                        $user_blogs[$blog->blog_id]->id = (int) $blog->id;
-                        $user_blogs[$blog->blog_id]->blog_id = (int) $blog->blog_id;
-                        $user_blogs[$blog->blog_id]->siteurl = ( is_ssl() ) ? 'https://' . $blog->domain . $blog->path : 'http://' . $blog->domain . $blog->path;
-                        $user_blogs[$blog->blog_id]->name = $blog->name;
-                }
-
-                return array( 'blogs' => $user_blogs, 'count' => $total_blog_count );
+                        $user_blogs[ $blog->blog_id ]          = new stdClass();
+                        $user_blogs[ $blog->blog_id ]->id      = (int) $blog->id;
+                        $user_blogs[ $blog->blog_id ]->blog_id = (int) $blog->blog_id;
+                        $user_blogs[ $blog->blog_id ]->siteurl = ( is_ssl() ) ? 'https://' . $blog->domain . $blog->path : 'http://' . $blog->domain . $blog->path;
+                        $user_blogs[ $blog->blog_id ]->name    = $blog->name;
+                }
+
+                return array(
+                        'blogs' => $user_blogs,
+                        'count' => $total_blog_count,
+                );
         }
 
@@ -429 +470 @@
          *
          * This method always includes hidden blogs.
+         *
+         * @global wpdb $wpdb WordPress database object.
          *
          * @param int $user_id Optional. ID of the user whose blogs are being
          *                     queried. Defaults to logged-in user.
-         * @return int The number of blogs associated with the user.
+         * @return int[]
          */
         public static function get_blog_ids_for_user( $user_id = 0 ) {
@@ -439 +482 @@
                 $bp = buddypress();
 
-                if ( !$user_id )
+                if ( ! $user_id ) {
                         $user_id = bp_displayed_user_id();
-
-                return array_map( 'intval', $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM {$bp->blogs->table_name} WHERE user_id = %d", $user_id ) ) );
+                }
+
+                $blog_ids = $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM {$bp->blogs->table_name} WHERE user_id = %d", $user_id ) );
+
+                return wp_parse_id_list( $blog_ids );
         }
 
         /**
          * Check whether a blog has been recorded by BuddyPress.
+         *
+         * @global wpdb $wpdb WordPress database object.
          *
          * @param int $blog_id ID of the blog being queried.
@@ -469 +517 @@
          * cap.
          *
+         * @global wpdb $wpdb WordPress database object.
+         *
          * @param int|null $user_id Optional. ID of the user whose blogs are being
          *                          queried. Defaults to logged-in user.
-         * @return int Blog count for the user.
+         * @return string|null Blog count for the user.
          */
         public static function total_blog_count_for_user( $user_id = null ) {
@@ -478 +528 @@
                 $bp = buddypress();
 
-                if ( !$user_id )
+                if ( ! $user_id ) {
                         $user_id = bp_displayed_user_id();
+                }
 
                 // If the user is logged in return the blog count including their hidden blogs.
-                if ( ( is_user_logged_in() && $user_id == bp_loggedin_user_id() ) || bp_current_user_can( 'bp_moderate' ) ) {
+                if ( ( is_user_logged_in() && $user_id === bp_loggedin_user_id() ) || bp_current_user_can( 'bp_moderate' ) ) {
                         return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT b.blog_id) FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND user_id = %d", $user_id ) );
-                } else {
-                        return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT b.blog_id) FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND user_id = %d", $user_id ) );
-                }
+                }
+
+                return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(DISTINCT b.blog_id) FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.public = 1 AND wb.deleted = 0 AND wb.spam = 0 AND wb.mature = 0 AND wb.archived = '0' AND user_id = %d", $user_id ) );
         }
 
@@ -494 +545 @@
          * Matches against blog names and descriptions, as stored in the BP
          * blogmeta table.
+         *
+         * @global wpdb $wpdb WordPress database object.
          *
          * @param string   $filter The search term.
@@ -511 +564 @@
 
                 $hidden_sql = '';
-                if ( !bp_current_user_can( 'bp_moderate' ) )
-                        $hidden_sql = "AND wb.public = 1";
+                if ( ! bp_current_user_can( 'bp_moderate' ) ) {
+                        $hidden_sql = 'AND wb.public = 1';
+                }
 
                 $pag_sql = '';
                 if ( $limit && $page ) {
-                        $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+                        $pag_sql = $wpdb->prepare( ' LIMIT %d, %d', intval( ( $page - 1 ) * $limit ), intval( $limit ) );
                 }
 
@@ -529 +583 @@
                 }
 
-                return array( 'blogs' => $paged_blogs, 'total' => (int) $total_blogs );
+                return array(
+                        'blogs' => $paged_blogs,
+                        'total' => (int) $total_blogs,
+                );
         }
 
@@ -537 +594 @@
          * Query will include hidden blogs if the logged-in user has the
          * 'bp_moderate' cap.
+         *
+         * @global wpdb $wpdb WordPress database object.
          *
          * @param int|null $limit Optional. The maximum number of items to return.
@@ -551 +610 @@
                 $bp = buddypress();
 
-                $hidden_sql = !bp_current_user_can( 'bp_moderate' ) ? "AND wb.public = 1" : '';
-                $pag_sql    = ( $limit && $page ) ? $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) ) : '';
+                $hidden_sql = ! bp_current_user_can( 'bp_moderate' ) ? 'AND wb.public = 1' : '';
+                $pag_sql    = ( $limit && $page ) ? $wpdb->prepare( ' LIMIT %d, %d', intval( ( $page - 1 ) * $limit ), intval( $limit ) ) : '';
 
                 $paged_blogs = $wpdb->get_results( "SELECT DISTINCT b.blog_id FROM {$bp->blogs->table_name} b LEFT JOIN {$wpdb->base_prefix}blogs wb ON b.blog_id = wb.blog_id WHERE wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 {$hidden_sql} {$pag_sql}" );
@@ -562 +621 @@
                 }
 
-                return array( 'blogs' => $paged_blogs, 'total' => (int) $total_blogs );
+                return array(
+                        'blogs' => $paged_blogs,
+                        'total' => (int) $total_blogs,
+                );
         }
 
@@ -570 +632 @@
          * Query will include hidden blogs if the logged-in user has the
          * 'bp_moderate' cap.
+         *
+         * @global wpdb $wpdb WordPress database object.
          *
          * @param string   $letter The letter you're looking for.
@@ -589 +653 @@
 
                 $hidden_sql = '';
-                if ( !bp_current_user_can( 'bp_moderate' ) )
-                        $hidden_sql = "AND wb.public = 1";
+                if ( ! bp_current_user_can( 'bp_moderate' ) ) {
+                        $hidden_sql = 'AND wb.public = 1';
+                }
 
                 $pag_sql = '';
-                if ( $limit && $page )
-                        $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
+                if ( $limit && $page ) {
+                        $pag_sql = $wpdb->prepare( ' LIMIT %d, %d', intval( ( $page - 1 ) * $limit ), intval( $limit ) );
+                }
 
                 $paged_blogs = $wpdb->get_results( "SELECT DISTINCT bm.blog_id FROM {$bp->blogs->table_name_blogmeta} bm LEFT JOIN {$wpdb->base_prefix}blogs wb ON bm.blog_id = wb.blog_id WHERE bm.meta_key = 'name' AND {$letter_sql} {$hidden_sql} AND wb.mature = 0 AND wb.spam = 0 AND wb.archived = '0' AND wb.deleted = 0 ORDER BY bm.meta_value ASC{$pag_sql}" );
@@ -604 +670 @@
                 }
 
-                return array( 'blogs' => $paged_blogs, 'total' => (int) $total_blogs );
+                return array(
+                        'blogs' => $paged_blogs,
+                        'total' => (int) $total_blogs,
+                );
         }
 
@@ -616 +685 @@
          *   - The blog description
          *
+         * @global wpdb $wpdb WordPress database object.
+         *
          * @param array       $paged_blogs Array of results from the original query.
          * @param array       $blog_ids    Array of IDs returned from the original query.
@@ -626 +697 @@
                 $bp = buddypress();
 
-                if ( empty( $blog_ids ) )
+                if ( empty( $blog_ids ) ) {
                         return $paged_blogs;
+                }
 
                 $blog_ids = implode( ',', wp_parse_id_list( $blog_ids ) );
 
                 for ( $i = 0, $count = count( $paged_blogs ); $i < $count; ++$i ) {
-                        $blog_prefix = $wpdb->get_blog_prefix( $paged_blogs[$i]->blog_id );
-                        $paged_blogs[$i]->latest_post = $wpdb->get_row( "SELECT ID, post_content, post_title, post_excerpt, guid FROM {$blog_prefix}posts WHERE post_status = 'publish' AND post_type = 'post' AND id != 1 ORDER BY id DESC LIMIT 1" );
+                        $blog_prefix                    = $wpdb->get_blog_prefix( $paged_blogs[ $i ]->blog_id );
+                        $paged_blogs[ $i ]->latest_post = $wpdb->get_row( "SELECT ID, post_content, post_title, post_excerpt, guid FROM {$blog_prefix}posts WHERE post_status = 'publish' AND post_type = 'post' AND id != 1 ORDER BY id DESC LIMIT 1" );
 
                         /**
@@ -649 +721 @@
 
                                 // Add URLs to any Featured Image this post might have.
-                                if ( ! empty( $paged_blogs[$i]->latest_post ) && has_post_thumbnail( $paged_blogs[$i]->latest_post->ID ) ) {
+                                if ( ! empty( $paged_blogs[ $i ]->latest_post ) && has_post_thumbnail( $paged_blogs[ $i ]->latest_post->ID ) ) {
 
                                         // Grab 4 sizes of the image. Thumbnail.
-                                        $image = wp_get_attachment_image_src( get_post_thumbnail_id( $paged_blogs[$i]->latest_post->ID ), 'thumbnail', false );
-                                        if ( ! empty( $image ) )
+                                        $image = wp_get_attachment_image_src( get_post_thumbnail_id( $paged_blogs[ $i ]->latest_post->ID ), 'thumbnail', false );
+                                        if ( ! empty( $image ) ) {
                                                 $images['thumbnail'] = $image[0];
+                                        }
 
                                         // Medium.
-                                        $image = wp_get_attachment_image_src( get_post_thumbnail_id( $paged_blogs[$i]->latest_post->ID ), 'medium', false );
-                                        if ( ! empty( $image ) )
+                                        $image = wp_get_attachment_image_src( get_post_thumbnail_id( $paged_blogs[ $i ]->latest_post->ID ), 'medium', false );
+                                        if ( ! empty( $image ) ) {
                                                 $images['medium'] = $image[0];
+                                        }
 
                                         // Large.
-                                        $image = wp_get_attachment_image_src( get_post_thumbnail_id( $paged_blogs[$i]->latest_post->ID ), 'large', false );
-                                        if ( ! empty( $image ) )
+                                        $image = wp_get_attachment_image_src( get_post_thumbnail_id( $paged_blogs[ $i ]->latest_post->ID ), 'large', false );
+                                        if ( ! empty( $image ) ) {
                                                 $images['large'] = $image[0];
+                                        }
 
                                         // Post thumbnail.
-                                        $image = wp_get_attachment_image_src( get_post_thumbnail_id( $paged_blogs[$i]->latest_post->ID ), 'post-thumbnail', false );
-                                        if ( ! empty( $image ) )
+                                        $image = wp_get_attachment_image_src( get_post_thumbnail_id( $paged_blogs[ $i ]->latest_post->ID ), 'post-thumbnail', false );
+                                        if ( ! empty( $image ) ) {
                                                 $images['post-thumbnail'] = $image[0];
+                                        }
 
                                         // Add the images to the latest_post object.
-                                        $paged_blogs[$i]->latest_post->images = $images;
+                                        $paged_blogs[ $i ]->latest_post->images = $images;
                                 }
 
@@ -684 +760 @@
                 for ( $i = 0, $count = count( $paged_blogs ); $i < $count; ++$i ) {
                         foreach ( (array) $blog_descs as $desc ) {
-                                if ( $desc->blog_id == $paged_blogs[$i]->blog_id )
-                                        $paged_blogs[$i]->description = $desc->description;
+                                if ( $desc->blog_id === $paged_blogs[ $i ]->blog_id ) {
+                                        $paged_blogs[ $i ]->description = $desc->description;
+                                }
                         }
                 }
@@ -696 +773 @@
          *
          * Checks the 'public' column in the wp_blogs table.
+         *
+         * @global wpdb $wpdb WordPress database object.
          *
          * @param int $blog_id The ID of the blog being checked.
@@ -703 +782 @@
                 global $wpdb;
 
-                if ( !(int) $wpdb->get_var( $wpdb->prepare( "SELECT public FROM {$wpdb->base_prefix}blogs WHERE blog_id = %d", $blog_id ) ) ) {
+                if ( ! (int) $wpdb->get_var( $wpdb->prepare( "SELECT public FROM {$wpdb->base_prefix}blogs WHERE blog_id = %d", $blog_id ) ) ) {
                         return true;
                 }
@@ -712 +791 @@
         /**
          * Get ID of user-blog link.
+         *
+         * @global wpdb $wpdb WordPress database object.
          *
          * @param int $user_id ID of user.
@@ -725 +806 @@
 
                 if ( empty( $user_blog ) ) {
-                        $user_blog = false;
-                } else {
-                        $user_blog = intval( $user_blog );
-                }
-
-                return $user_blog;
+                        return false;
+                }
+
+                return intval( $user_blog );
         }
 }

trunk/src/bp-blogs/classes/class-bp-blogs-component.php

@@ -35 +35 @@
                         array(
                                 'adminbar_myaccount_order' => 30,
-                                'search_query_arg' => 'sites_search',
-                                'features' => array( 'site-icon' )
+                                'search_query_arg'         => 'sites_search',
+                                'features'                 => array( 'site-icon' ),
                         )
                 );
@@ -74 +74 @@
                 // Fetch the default directory title.
                 $default_directory_titles = bp_core_get_directory_page_default_titles();
-                $default_directory_title  = $default_directory_titles[$this->id];
+                $default_directory_title  = $default_directory_titles[ $this->id ];
 
                 // All globals for blogs component.
@@ -85 +85 @@
                                 'create_single_item'         => 'blog_create',
                                 'directory_action'           => 'blogs_action',
-                                'directory_action_variables' => 'blogs_action_variables'
+                                'directory_action_variables' => 'blogs_action_variables',
                         ),
                         'directory_title'       => isset( $bp->pages->blogs->title ) ? $bp->pages->blogs->title : $default_directory_title,
@@ -218 +218 @@
                  */
                 if ( ! is_multisite() ) {
-                        return false;
+                        return;
                 }
 
@@ -229 +229 @@
                         'screen_function'     => 'bp_blogs_screen_my_blogs',
                         'default_subnav_slug' => 'my-sites',
-                        'item_css_id'         => $this->id
+                        'item_css_id'         => $this->id,
                 );
 
@@ -237 +237 @@
                         'parent_slug'     => $slug,
                         'screen_function' => 'bp_blogs_screen_my_blogs',
-                        'position'        => 10
+                        'position'        => 10,
                 );
 
@@ -334 +334 @@
                                         'title'    => __( 'Create a Site', 'buddypress' ),
                                         'href'     => $url,
-                                        'position' => 99
+                                        'position' => 99,
                                 );
                         }
@@ -356 +356 @@
                                 }
 
-                        // If we are not viewing the logged in user, set up the current
-                        // users avatar and name.
+                                // If we are not viewing the logged in user, set up the current
+                                // users avatar and name.
                         } else {
-                                $bp->bp_options_avatar = bp_core_fetch_avatar( array(
-                                        'item_id' => bp_displayed_user_id(),
-                                        'type'    => 'thumb',
-                                        'alt'     => sprintf(
+                                $bp->bp_options_avatar = bp_core_fetch_avatar(
+                                        array(
+                                                'item_id' => bp_displayed_user_id(),
+                                                'type'    => 'thumb',
+                                                'alt'     => sprintf(
                                                 /* translators: %s: member name */
-                                                __( 'Profile picture of %s', 'buddypress' ),
-                                                bp_get_displayed_user_fullname()
-                                        ),
-                                ) );
-                                $bp->bp_options_title = bp_get_displayed_user_fullname();
+                                                        __( 'Profile picture of %s', 'buddypress' ),
+                                                        bp_get_displayed_user_fullname()
+                                                ),
+                                        )
+                                );
+                                $bp->bp_options_title  = bp_get_displayed_user_fullname();
                         }
                 }
@@ -383 +385 @@
 
                 // Global groups.
-                wp_cache_add_global_groups( array(
-                        'bp_blog_meta'
-                ) );
+                wp_cache_add_global_groups(
+                        array(
+                                'bp_blog_meta',
+                        )
+                );
 
                 parent::setup_cache_groups();
@@ -430 +434 @@
                                 'query' => 'index.php?' . $this->rewrite_ids['directory'] . '=1&' . $this->rewrite_ids['directory_action'] . '=$matches[1]',
                         ),
-                        'create_single_item' => array(
+                        'create_single_item'         => array(
                                 'regex' => $this->root_slug . '/' . $create_slug . '/?$',
                                 'order' => 50,
@@ -455 +459 @@
                  */
                 if ( ! is_multisite() || 'rewrites' !== bp_core_get_query_parser() ) {
-                        return parent::parse_query( $query );
+                        parent::parse_query( $query );
+                        return;
                 }
 
@@ -507 +512 @@
         public function rest_api_init( $controllers = array() ) {
                 if ( is_multisite() ) {
-                        $controllers = array(
-                                'BP_REST_Blogs_Endpoint',
-                        );
+                        $controllers = array( 'BP_REST_Blogs_Endpoint' );
 
                         // Support to Blog Avatar.

trunk/src/bp-blogs/classes/class-bp-blogs-template.php

@@ -96 +96 @@
          * @see BP_Blogs_Blog::get() for a description of parameters.
          *
-         * @param array $args {
+         * @param array ...$args {
          *     Array of arguments. See {@link BP_Blogs_Blog::get()}.
          * }
@@ -103 +103 @@
                 // Backward compatibility with old method of passing arguments.
                 if ( ! is_array( $args[0] ) || count( $args ) > 1 ) {
-                        _deprecated_argument( __METHOD__, '10.0.0', sprintf( esc_html__( 'Arguments passed to %1$s should be in an associative array. See the inline documentation at %2$s for more details.', 'buddypress' ), __METHOD__, __FILE__ ) );
-
-                        $old_args_keys = [
-                                0  => 'type',
-                                1  => 'page',
-                                2  => 'per_page',
-                                3  => 'max',
-                                4  => 'user_id',
-                                5  => 'search_terms',
-                                6  => 'page_arg',
-                                7  => 'update_meta_cache',
-                                8  => 'include_blog_ids',
-                        ];
+                        _deprecated_argument(
+                                __METHOD__,
+                                '10.0.0',
+                                sprintf(
+                                        // translators: 1: the name of the method. 2: the name of the file.
+                                        esc_html__( 'Arguments passed to %1$s should be in an associative array. See the inline documentation at %2$s for more details.', 'buddypress' ),
+                                        __METHOD__,
+                                        __FILE__
+                                )
+                        );
+
+                        $old_args_keys = array(
+                                0 => 'type',
+                                1 => 'page',
+                                2 => 'per_page',
+                                3 => 'max',
+                                4 => 'user_id',
+                                5 => 'search_terms',
+                                6 => 'page_arg',
+                                7 => 'update_meta_cache',
+                                8 => 'include_blog_ids',
+                        );
 
                         $args = bp_core_parse_args_array( $old_args_keys, $args );
@@ -147 +156 @@
                         $this->blogs = BP_Blogs_Blog::get_by_letter( $_REQUEST['letter'], $this->pag_num, $this->pag_page );
 
-                // Typical blogs query.
+                        // Typical blogs query.
                 } else {
-                        $this->blogs = bp_blogs_get_blogs( array(
-                                'type'              => $r['type'],
-                                'per_page'          => $this->pag_num,
-                                'page'              => $this->pag_page,
-                                'user_id'           => $r['user_id'],
-                                'search_terms'      => $r['search_terms'],
-                                'update_meta_cache' => $r['update_meta_cache'],
-                                'include_blog_ids'  => $r['include_blog_ids'],
-                                'date_query'        => $r['date_query']
-                        ) );
+                        $this->blogs = bp_blogs_get_blogs(
+                                array(
+                                        'type'              => $r['type'],
+                                        'per_page'          => $this->pag_num,
+                                        'page'              => $this->pag_page,
+                                        'user_id'           => $r['user_id'],
+                                        'search_terms'      => $r['search_terms'],
+                                        'update_meta_cache' => $r['update_meta_cache'],
+                                        'include_blog_ids'  => $r['include_blog_ids'],
+                                        'date_query'        => $r['date_query'],
+                                )
+                        );
                 }
 
@@ -185 +196 @@
                 // Build pagination links based on total blogs and current page number.
                 if ( ! empty( $this->total_blog_count ) && ! empty( $this->pag_num ) ) {
-                        $this->pag_links = paginate_links( array(
-                                'base'      => add_query_arg( $this->pag_arg, '%#%' ),
-                                'format'    => '',
-                                'total'     => ceil( (int) $this->total_blog_count / (int) $this->pag_num ),
-                                'current'   => (int) $this->pag_page,
-                                'prev_text' => _x( '←', 'Blog pagination previous text', 'buddypress' ),
-                                'next_text' => _x( '→', 'Blog pagination next text',     'buddypress' ),
-                                'mid_size'  => 1,
-                                'add_args'  => array(),
-                        ) );
+                        $this->pag_links = paginate_links(
+                                array(
+                                        'base'      => add_query_arg( $this->pag_arg, '%#%' ),
+                                        'format'    => '',
+                                        'total'     => ceil( (int) $this->total_blog_count / (int) $this->pag_num ),
+                                        'current'   => (int) $this->pag_page,
+                                        'prev_text' => _x( '←', 'Blog pagination previous text', 'buddypress' ),
+                                        'next_text' => _x( '→', 'Blog pagination next text', 'buddypress' ),
+                                        'mid_size'  => 1,
+                                        'add_args'  => array(),
+                                )
+                        );
                 }
         }
@@ -206 +219 @@
          */
         public function has_blogs() {
-                return (bool) ! empty( $this->blog_count );
+                return ! empty( $this->blog_count );
         }
 
@@ -215 +228 @@
          */
         public function next_blog() {
-                $this->current_blog++;
+                ++$this->current_blog;
                 $this->blog = $this->blogs[ $this->current_blog ];
 
@@ -271 +284 @@
          */
         public function the_blog() {
-
                 $this->in_the_loop = true;
                 $this->blog        = $this->next_blog();

trunk/src/bp-blogs/classes/class-bp-blogs-theme-compat.php

@@ -38 +38 @@
 
                 // Bail if not looking at a group.
-                if ( ! bp_is_blogs_component() )
+                if ( ! bp_is_blogs_component() ) {
                         return;
+                }
 
                 // Bail if looking at a users sites.
-                if ( bp_is_user() )
+                if ( bp_is_user() ) {
                         return;
+                }
 
                 // Blog Directory.
@@ -57 +59 @@
                         do_action( 'bp_blogs_screen_index' );
 
-                        add_filter( 'bp_get_buddypress_template',                array( $this, 'directory_template_hierarchy' ) );
+                        add_filter( 'bp_get_buddypress_template', array( $this, 'directory_template_hierarchy' ) );
                         add_action( 'bp_template_include_reset_dummy_post_data', array( $this, 'directory_dummy_post' ) );
-                        add_filter( 'bp_replace_the_content',                    array( $this, 'directory_content'    ) );
-
-                // Create blog.
+                        add_filter( 'bp_replace_the_content', array( $this, 'directory_content' ) );
+
+                        // Create blog.
                 } elseif ( is_user_logged_in() && bp_blog_signup_enabled() ) {
-                        add_filter( 'bp_get_buddypress_template',                array( $this, 'create_template_hierarchy' ) );
+                        add_filter( 'bp_get_buddypress_template', array( $this, 'create_template_hierarchy' ) );
                         add_action( 'bp_template_include_reset_dummy_post_data', array( $this, 'create_dummy_post' ) );
-                        add_filter( 'bp_replace_the_content',                    array( $this, 'create_content'    ) );
+                        add_filter( 'bp_replace_the_content', array( $this, 'create_content' ) );
                 }
         }
@@ -79 +81 @@
          * @since 1.8.0
          *
-         * @param string $templates The templates from bp_get_theme_compat_templates().
+         * @param array $templates The templates from bp_get_theme_compat_templates().
          * @return array $templates Array of custom templates to look for.
          */
         public function directory_template_hierarchy( $templates ) {
+
+                if ( empty( $templates ) || ! is_array( $templates ) ) {
+                        $templates = array();
+                }
 
                 /**
@@ -89 +95 @@
                  * @since 1.8.0
                  *
-                 * @param array $value Array of template paths to add to template list to look for.
+                 * @param array $template_paths Array of template paths to add to template list to look for.
                  */
-                $new_templates = apply_filters( 'bp_template_hierarchy_blogs_create', array(
-                        'blogs/index-directory.php'
-                ) );
+                $new_templates = apply_filters(
+                        'bp_template_hierarchy_blogs_create',
+                        array(
+                                'blogs/index-directory.php',
+                        )
+                );
 
                 // Merge new templates with existing stack
                 // @see bp_get_theme_compat_templates().
-                $templates = array_merge( (array) $new_templates, $templates );
-
-                return $templates;
+                return array_merge( $new_templates, $templates );
         }
 
@@ -108 +115 @@
          */
         public function directory_dummy_post() {
-
-                bp_theme_compat_reset_post( array(
-                        'ID'             => 0,
-                        'post_title'     => __( 'Sites', 'buddypress' ),
-                        'post_author'    => 0,
-                        'post_date'      => 0,
-                        'post_content'   => '',
-                        'post_type'      => 'page',
-                        'post_status'    => 'publish',
-                        'is_page'        => true,
-                        'comment_status' => 'closed'
-                ) );
+                bp_theme_compat_reset_post(
+                        array(
+                                'ID'             => 0,
+                                'post_title'     => __( 'Sites', 'buddypress' ),
+                                'post_author'    => 0,
+                                'post_date'      => 0,
+                                'post_content'   => '',
+                                'post_type'      => 'page',
+                                'post_status'    => 'publish',
+                                'is_page'        => true,
+                                'comment_status' => 'closed',
+                        )
+                );
         }
 
@@ -126 +134 @@
          *
          * @since 1.7.0
+         *
+         * @return string|null
          */
         public function directory_content() {
@@ -141 +151 @@
          * @since 1.8.0
          *
-         * @param string $templates The templates from bp_get_theme_compat_templates().
+         * @param array $templates The templates from bp_get_theme_compat_templates().
          * @return array $templates Array of custom templates to look for.
          */
         public function create_template_hierarchy( $templates ) {
+
+                if ( empty( $templates ) || ! is_array( $templates ) ) {
+                        $templates = array();
+                }
 
                 /**
@@ -151 +165 @@
                  * @since 1.8.0
                  *
-                 * @param array $value Array of template paths to add to template list to look for.
+                 * @param array $template_paths Array of template paths to add to template list to look for.
                  */
-                $new_templates = apply_filters( 'bp_template_hierarchy_blogs_create', array(
-                        'blogs/index-create.php'
-                ) );
+                $new_templates = apply_filters(
+                        'bp_template_hierarchy_blogs_create',
+                        array(
+                                'blogs/index-create.php',
+                        )
+                );
 
                 // Merge new templates with existing stack
                 // @see bp_get_theme_compat_templates().
-                $templates = array_merge( (array) $new_templates, $templates );
-
-                return $templates;
+                return array_merge( $new_templates, $templates );
         }
 
@@ -178 +193 @@
                 }
 
-                bp_theme_compat_reset_post( array(
-                        'ID'             => 0,
-                        'post_title'     => $title,
-                        'post_author'    => 0,
-                        'post_date'      => 0,
-                        'post_content'   => '',
-                        'post_type'      => 'page',
-                        'post_status'    => 'publish',
-                        'is_page'        => true,
-                        'comment_status' => 'closed'
-                ) );
+                bp_theme_compat_reset_post(
+                        array(
+                                'ID'             => 0,
+                                'post_title'     => $title,
+                                'post_author'    => 0,
+                                'post_date'      => 0,
+                                'post_content'   => '',
+                                'post_type'      => 'page',
+                                'post_status'    => 'publish',
+                                'is_page'        => true,
+                                'comment_status' => 'closed',
+                        )
+                );
         }
 
@@ -195 +212 @@
          *
          * @since 1.7.0
+         *
+         * @return string|null
          */
         public function create_content() {