Changeset 1025

Timestamp:

02/06/2009 10:44:01 PM (18 years ago)

Author:

apeatling

Message:

Syntax cleanup.

Location:

trunk

Files:

• bp-activity.php (modified) (5 diffs)
• bp-activity/bp-activity-classes.php (modified) (1 diff)
• bp-activity/bp-activity-templatetags.php (modified) (4 diffs)
• bp-activity/bp-activity-widgets.php (modified) (1 diff)
• bp-blogs.php (modified) (9 diffs)
• bp-blogs/bp-blogs-templatetags.php (modified) (13 diffs)
• bp-blogs/directories/bp-blogs-directory-blogs.php (modified) (1 diff)
• bp-core.php (modified) (8 diffs)
• bp-core/bp-core-activation.php (modified) (3 diffs)
• bp-core/bp-core-admin.php (modified) (1 diff)
• bp-core/bp-core-adminbar.php (modified) (7 diffs)
• bp-core/bp-core-ajax.php (modified) (1 diff)
• bp-core/bp-core-avatars.php (modified) (5 diffs)
• bp-core/bp-core-catchuri.php (modified) (4 diffs)
• bp-core/bp-core-classes.php (modified) (7 diffs)
• bp-core/bp-core-cssjs.php (modified) (3 diffs)
• bp-core/bp-core-notifications.php (modified) (2 diffs)
• bp-core/bp-core-signup.php (modified) (4 diffs)
• bp-forums.php (modified) (1 diff)
• bp-friends.php (modified) (9 diffs)
• bp-friends/bp-friends-ajax.php (modified) (2 diffs)
• bp-friends/bp-friends-classes.php (modified) (1 diff)
• bp-friends/bp-friends-notifications.php (modified) (2 diffs)
• bp-friends/bp-friends-templatetags.php (modified) (7 diffs)
• bp-friends/bp-friends-widgets.php (deleted)
• bp-groups.php (modified) (35 diffs)
• bp-groups/bp-groups-admin.php (modified) (2 diffs)
• bp-groups/bp-groups-ajax.php (modified) (7 diffs)
• bp-groups/bp-groups-classes.php (modified) (1 diff)
• bp-groups/bp-groups-cssjs.php (modified) (1 diff)
• bp-groups/bp-groups-notifications.php (modified) (6 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (18 diffs)
• bp-groups/bp-groups-widgets.php (modified) (1 diff)
• bp-messages.php (modified) (14 diffs)
• bp-messages/bp-messages-admin.php (deleted)
• bp-messages/bp-messages-classes.php (modified) (2 diffs)
• bp-messages/bp-messages-notifications.php (modified) (1 diff)
• bp-messages/bp-messages-templatetags.php (modified) (6 diffs)
• bp-wire/bp-wire-templatetags.php (modified) (5 diffs)
• bp-xprofile.php (modified) (11 diffs)
• bp-xprofile/bp-xprofile-admin.php (modified) (3 diffs)
• bp-xprofile/bp-xprofile-classes.php (modified) (20 diffs)
• bp-xprofile/bp-xprofile-filters.php (modified) (2 diffs)
• bp-xprofile/bp-xprofile-notifications.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-signup.php (modified) (2 diffs)
• bp-xprofile/bp-xprofile-templatetags.php (modified) (1 diff)

trunk/bp-activity.php

@@ -34 +34 @@
         
         $sql[] = "CREATE TABLE ". $bp->activity->table_name_current_user ." (
-                                id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                                item_id int(11) NOT NULL,
-                                secondary_item_id int(11) NOT NULL,
-                                user_id int(11) NOT NULL,
+                                id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                                item_id bigint(20) NOT NULL,
+                                secondary_item_id bigint(20) NOT NULL,
+                                user_id bigint(20) NOT NULL,
                                 component_name varchar(75) NOT NULL,
                                 component_action varchar(75) NOT NULL,
@@ -50 +50 @@
 
         $sql[] = "CREATE TABLE ". $bp->activity->table_name_current_user_cached ." (
-                                id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                                item_id int(11) NOT NULL,
-                                secondary_item_id int(11) NOT NULL,
+                                id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                                item_id bigint(20) NOT NULL,
+                                secondary_item_id bigint(20) NOT NULL,
                                 content longtext NOT NULL,
                                 primary_link varchar(150) NOT NULL,
@@ -68 +68 @@
         
         $sql[] = "CREATE TABLE ". $bp->activity->table_name_current_user_friends_cached ." (
-                                id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                                user_id int(11) NOT NULL,
+                                id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                                user_id bigint(20) NOT NULL,
                                 content longtext NOT NULL,
                                 primary_link varchar(150) NOT NULL,
@@ -95 +95 @@
         
         $sql[] = "CREATE TABLE ". $bp->activity->table_name_sitewide ." (
-                                id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                                user_id int(11) NOT NULL,
-                                item_id int(11) NOT NULL,
-                                secondary_item_id int(11),
+                                id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                                user_id bigint(20) NOT NULL,
+                                item_id bigint(20) NOT NULL,
+                                secondary_item_id bigint(20),
                                 content longtext NOT NULL,
                                 primary_link varchar(150) NOT NULL,
@@ -154 +154 @@
         }
         
-        if ( is_site_admin() && $current_blog->blog_id == 1 ) {
+        if ( is_site_admin() && 1 == $current_blog->blog_id ) {
                 /* Check to see if the site wide activity table is set up. */
                 if ( !$wpdb->get_var("SHOW TABLES LIKE '%" . $bp->activity->table_name_sitewide . "%'") || get_site_option( 'bp-activity-db-version' ) < BP_ACTIVITY_VERSION  )

trunk/bp-activity/bp-activity-classes.php

@@ -320 +320 @@
                 
                 for ( $i = 0; $i < count($activity_array); $i++ ) {
-                        if ( $activity_array[$i]['content'] == '' ) continue;
+                        if ( empty( $activity_array[$i]['content'] ) ) continue;
                         
                         // Cache that sucka...

trunk/bp-activity/bp-activity-templatetags.php

@@ -26 +26 @@
                         $user_id = $bp->displayed_user->id;
 
-                if ( $bp->current_component != $bp->activity->slug || ( $bp->current_component == $bp->activity->slug && $bp->current_action == 'just-me' || $bp->current_action == 'feed' ) ) {
+                if ( $bp->current_component != $bp->activity->slug || ( $bp->current_component == $bp->activity->slug && 'just-me' == $bp->current_action || 'feed' == $bp->current_action ) ) {
                         $this->activities = BP_Activity_Activity::get_activity_for_user( $user_id, $limit );
                 } else {
@@ -99 +99 @@
         global $bp, $activities_template, $bp_activity_user_id, $bp_activity_limit;
         
-        if ( $bp->current_action == 'my-friends' )
+        if ( 'my-friends' == $bp->current_action )
                 $filter_content = false;
         else
@@ -165 +165 @@
         // The "You" and "Your" conversion is only done in english, if a translation file is present
         // then do not translate as it causes problems in other languages.
-        if ( get_locale() == '' ) {
+        if ( '' == get_locale() ) {
                 /* Switch 'their/your' depending on whether the user is logged in or not and viewing their profile */
                 if ( $filter_words ) {
@@ -206 +206 @@
         global $bp;
         
-        if ( ( $bp->current_component == $bp->profile->slug ) || $bp->current_action == 'just-me' )
+        if ( ( $bp->current_component == $bp->profile->slug ) || 'just-me' == $bp->current_action )
                 echo apply_filters( 'bp_activities_member_rss_link', $bp->displayed_user->domain . $bp->activity->slug . '/feed' );
         else

trunk/bp-activity/bp-activity-widgets.php

@@ -24 +24 @@
                 
         <?php 
-        if ( $options['max_items'] == '' ) {
+        if ( empty( $options['max_items'] ) ) {
                 $options['max_items'] = 20;
         }

trunk/bp-blogs.php

@@ -32 +32 @@
         
         $sql[] = "CREATE TABLE {$bp->blogs->table_name} (
-                                id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                                user_id int(11) NOT NULL,
-                                blog_id int(11) NOT NULL,
+                                id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                                user_id bigint(20) NOT NULL,
+                                blog_id bigint(20) NOT NULL,
                                 KEY user_id (user_id),
                                 KEY blog_id (blog_id)
@@ -40 +40 @@
 
         $sql[] = "CREATE TABLE {$bp->blogs->table_name_blog_posts} (
-                                id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                                user_id int(11) NOT NULL,
-                                blog_id int(11) NOT NULL,
-                                post_id int(11) NOT NULL,
+                                id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                                user_id bigint(20) NOT NULL,
+                                blog_id bigint(20) NOT NULL,
+                                post_id bigint(20) NOT NULL,
                                 date_created datetime NOT NULL,
                                 KEY user_id (user_id),
@@ -51 +51 @@
 
         $sql[] = "CREATE TABLE {$bp->blogs->table_name_blog_comments} (
-                                id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                                user_id int(11) NOT NULL,
-                                blog_id int(11) NOT NULL,
-                                comment_id int(11) NOT NULL,
-                                comment_post_id int(11) NOT NULL,
+                                id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                                user_id bigint(20) NOT NULL,
+                                blog_id bigint(20) NOT NULL,
+                                comment_id bigint(20) NOT NULL,
+                                comment_post_id bigint(20) NOT NULL,
                                 date_created datetime NOT NULL,
                                 KEY user_id (user_id),
@@ -64 +64 @@
         
         $sql[] = "CREATE TABLE {$bp->blogs->table_name_blogmeta} (
-                        id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                        blog_id int(11) NOT NULL,
+                        id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                        blog_id bigint(20) NOT NULL,
                         meta_key varchar(255) DEFAULT NULL,
                         meta_value longtext DEFAULT NULL,
@@ -110 +110 @@
         if ( is_site_admin() ) {
                 /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
-                if ( ( $wpdb->get_var("SHOW TABLES LIKE '%" . $bp->blogs->table_name . "%'") == false ) || ( get_site_option('bp-blogs-db-version') < BP_BLOGS_DB_VERSION )  )
+                if ( ( false == $wpdb->get_var("SHOW TABLES LIKE '%" . $bp->blogs->table_name . "%'") ) || ( get_site_option('bp-blogs-db-version') < BP_BLOGS_DB_VERSION )  )
                         bp_blogs_install();
         }
@@ -173 +173 @@
         
         /* Set up the component options navigation for Blog */
-        if ( $bp->current_component == 'blogs' ) {
+        if ( 'blogs' == $bp->current_component ) {
                 if ( bp_is_home() ) {
                         if ( function_exists('xprofile_setup_nav') ) {
@@ -409 +409 @@
         
         if ( !$is_recorded = BP_Blogs_Post::is_recorded( $post_id, $blog_id, $user_id ) ) {
-                if ( $post->post_status == 'publish' ) {
+                if ( 'publish' == $post->post_status ) {
                         
                         /** 
@@ -515 +515 @@
                          * to remove the record of the post.
                          */
-                        if ( !$comment->comment_approved || $comment->comment_approved == 'spam' )
+                        if ( !$comment->comment_approved || 'spam' == $comment->comment_approved )
                                 BP_Blogs_Comment::delete( $comment_id, $blog_id );      
                 }
@@ -766 +766 @@
         $metas = array_map('maybe_unserialize', $metas);
 
-        if ( count($metas) == 1 )
+        if ( 1 == count($metas) )
                 return $metas[0];
         else

trunk/bp-blogs/bp-blogs-templatetags.php

@@ -80 +80 @@
                 $blog = $this->next_blog();
                 
-                if ( $this->current_blog == 0 ) // loop has just started
+                if ( 0 == $this->current_blog ) // loop has just started
                         do_action('loop_start');
         }
@@ -199 +199 @@
                 $post = $this->next_post();
                 
-                if ( $this->current_post == 0 ) // loop has just started
+                if ( 0 == $this->current_post ) // loop has just started
                         do_action('loop_start');
         }
@@ -384 +384 @@
         );
 
-        if ( $post->post_type == 'page' )
+        if ( 'page' == $post->post_type )
                 return get_page_link($post->ID, $leavename);
-        elseif ($post->post_type == 'attachment')
+        else if ( 'attachment' == $post->post_type )
                 return get_attachment_link($post->ID);
 
@@ -396 +396 @@
 
                 $category = '';
-                if ( strpos($permalink, '%category%') !== false ) {
+                if ( false !== strpos($permalink, '%category%') ) {
                         $cats = get_the_category($post->ID);
                         if ( $cats )
@@ -413 +413 @@
 
                 $author = '';
-                if ( strpos($permalink, '%author%') !== false ) {
+                if ( false !== strpos($permalink, '%author%') ) {
                         $authordata = get_userdata($post->post_author);
                         $author = $authordata->user_nicename;
@@ -547 +547 @@
                 $comment = $this->next_comment();
                 
-                if ( $this->current_comment == 0 ) // loop has just started
+                if ( 0 == $this->current_comment ) // loop has just started
                         do_action('loop_start');
         }
@@ -616 +616 @@
                 $date_format = get_option('date_format');
                 
-        if ( $echo == true )
+        if ( $echo )
                 echo apply_filters( 'bp_comment_date', mysql2date( $date_format, $comments_template->comment->comment_date ) );
         else 
@@ -651 +651 @@
         $active_signup = apply_filters( 'wpmu_active_signup', $active_signup ); // return "all", "none", "blog" or "user"
         
-        if ( $active_signup == 'none' || $active_signup == 'user' )
+        if ( 'none' == $active_signup || 'user' == $active_signup )
                 return false;
         
@@ -701 +701 @@
         
         // Blog name
-        if( constant( "VHOST" ) == 'no' )
+        if( 'no' == constant( "VHOST" ) )
                 echo '<label for="blogname">' . __('Blog Name:', 'buddypress') . '</label>';
         else
@@ -710 +710 @@
         <?php }
 
-        if( constant( "VHOST" ) == 'no' ) {
+        if( 'no' == constant( "VHOST" ) ) {
                 echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span><input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /><br />';
         } else {
@@ -717 +717 @@
         if ( !is_user_logged_in() ) {
                 print '(<strong>' . __( 'Your address will be ' , 'buddypress');
-                if( constant( "VHOST" ) == 'no' ) {
+                if( 'no' == constant( "VHOST" ) ) {
                         print $current_site->domain . $current_site->path . __( 'blogname' , 'buddypress');
                 } else {
@@ -739 +739 @@
                 <div style="clear:both;"></div>
                 <label class="checkbox" for="blog_public_on">
-                        <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php if( !isset( $_POST['blog_public'] ) || $_POST['blog_public'] == '1' ) { ?>checked="checked"<?php } ?> />
+                        <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php if( !isset( $_POST['blog_public'] ) || '1' == $_POST['blog_public'] ) { ?>checked="checked"<?php } ?> />
                         <strong><?php _e( 'Yes' , 'buddypress'); ?></strong>
                 </label>
                 <label class="checkbox" for="blog_public_off">
-                        <input type="radio" id="blog_public_off" name="blog_public" value="0" <?php if( isset( $_POST['blog_public'] ) && $_POST['blog_public'] == '0' ) { ?>checked="checked"<?php } ?> />
+                        <input type="radio" id="blog_public_off" name="blog_public" value="0" <?php if( isset( $_POST['blog_public'] ) && '0' == $_POST['blog_public'] ) { ?>checked="checked"<?php } ?> />
                         <strong><?php _e( 'No' , 'buddypress'); ?></strong>
                 </label>
@@ -818 +818 @@
 ?>
         <ul class="content-header-nav">
-                <li<?php if ( $current_tab == 'my-blogs' || $current_tab == '' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->blogs->slug ?>/my-blogs"><?php printf( __( "%s's Blogs", 'buddypress' ), $bp->displayed_user->fullname )  ?></a></li>
-                <li<?php if ( $current_tab == 'recent-posts' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->blogs->slug ?>/recent-posts"><?php printf( __( "%s's Recent Posts", 'buddypress' ), $bp->displayed_user->fullname )  ?></a></li>
-                <li<?php if ( $current_tab == 'recent-comments' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->blogs->slug ?>/recent-comments"><?php printf( __( "%s's Recent Comments", 'buddypress' ), $bp->displayed_user->fullname )  ?></a></li>     
+                <li<?php if ( 'my-blogs' == $current_tab || empty( $current_tab ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->blogs->slug ?>/my-blogs"><?php printf( __( "%s's Blogs", 'buddypress' ), $bp->displayed_user->fullname )  ?></a></li>
+                <li<?php if ( 'recent-posts' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->blogs->slug ?>/recent-posts"><?php printf( __( "%s's Recent Posts", 'buddypress' ), $bp->displayed_user->fullname )  ?></a></li>
+                <li<?php if ( 'recent-comments' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->blogs->slug ?>/recent-comments"><?php printf( __( "%s's Recent Comments", 'buddypress' ), $bp->displayed_user->fullname )  ?></a></li>     
         </ul>
 <?php

trunk/bp-blogs/directories/bp-blogs-directory-blogs.php

@@ -3 +3 @@
         global $bp, $current_blog;
         
-        if ( $bp->current_component == $bp->blogs->slug && $bp->current_action == '' ) {
+        if ( $bp->current_component == $bp->blogs->slug && empty( $bp->current_action ) ) {
                 add_action( 'bp_template_content', 'bp_blogs_directory_blogs_content' );
                 add_action( 'bp_template_sidebar', 'bp_blogs_directory_blogs_sidebar' );

trunk/bp-core.php

@@ -193 +193 @@
         
         $sql[] = "CREATE TABLE $bp->core->table_name_notifications (
-                                id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                                user_id int(11) NOT NULL,
-                                item_id int(11) NOT NULL,
-                                secondary_item_id int(11),
+                                id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                                user_id bigint(20) NOT NULL,
+                                item_id bigint(20) NOT NULL,
+                                secondary_item_id bigint(20),
                                 component_name varchar(75) NOT NULL,
                                 component_action varchar(75) NOT NULL,
                                 date_notified datetime NOT NULL,
-                                is_new tinyint(1) NOT NULL,
                             KEY item_id (item_id),
                                 KEY secondary_item_id (secondary_item_id),
                                 KEY user_id (user_id),
-                            KEY is_new (is_new),
                                 KEY component_name (component_name),
                                 KEY component_action (component_action)
@@ -240 +238 @@
         if ( is_site_admin() ) {
                 /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
-                if ( ( $wpdb->get_var("show tables like '%{$bp->core->table_name_notifications}%'") == false ) || ( get_site_option('bp-core-db-version') < BP_CORE_DB_VERSION )  )
+                if ( ( false == $wpdb->get_var( "SHOW TABLES LIKE '%{$bp->core->table_name_notifications}%'" ) ) || ( get_site_option('bp-core-db-version') < BP_CORE_DB_VERSION )  )
                         bp_core_install();
         }
@@ -308 +306 @@
                 bp_core_add_subnav_item( 'profile', 'public', __('Public', 'buddypress'), $profile_link, 'xprofile_screen_display_profile' );
 
-                if ( $bp->current_component == 'profile' ) {
+                if ( 'profile' == $bp->current_component ) {
                         if ( bp_is_home() ) {
                                 $bp->bp_options_title = __('My Profile', 'buddypress');
@@ -833 +831 @@
  */
 function bp_is_serialized( $data ) {
-   if ( trim($data) == "" ) {
+   if ( '' == trim($data) ) {
       return false;
    }
@@ -881 +879 @@
 function bp_core_render_notice() {
         if ( $_SESSION['message'] ) {
-                $type = ( $_SESSION['message_type'] == 'success' ) ? 'updated' : 'error';
+                $type = ( 'success' == $_SESSION['message_type'] ) ? 'updated' : 'error';
         ?>
                 <div id="message" class="<?php echo $type; ?>">
@@ -925 +923 @@
         /* $newer_date will equal false if we want to know the time elapsed between a date and the current time */
         /* $newer_date will have a value if we want to work out time elapsed between two known dates */
-        $newer_date = ( $newer_date == false ) ? ( time() + ( 60*60*0 ) ) : $newer_date;
+        $newer_date = ( !$newer_date ) ? ( time() + ( 60*60*0 ) ) : $newer_date;
 
         /* Difference in seconds */
@@ -947 +945 @@
 
         /* Set output var */
-        $output = ( $count == 1 ) ? '1 '. $chunks[$i][1] : $count . ' ' . $chunks[$i][2];
+        $output = ( 1 == $count ) ? '1 '. $chunks[$i][1] : $count . ' ' . $chunks[$i][2];
 
         /* Step two: the second chunk */
@@ -958 +956 @@
                 if ( ( $count2 = floor( ( $since - ( $seconds * $count ) ) / $seconds2 ) ) != 0 ) {
                         /* Add to output var */
-                        $output .= ($count2 == 1) ? ', 1 '. $chunks[$i + 1][1] : ", " . $count2 . ' ' . $chunks[$i + 1][2];
+                        $output .= ( 1 == $count2 ) ? ', 1 '. $chunks[$i + 1][1] : ", " . $count2 . ' ' . $chunks[$i + 1][2];
                 }
         }

trunk/bp-core/bp-core-activation.php

@@ -91 +91 @@
 
         // Send email with activation link.
-        if( constant( "VHOST" ) == 'no' ) {
+        if ( 'no' == constant( "VHOST" ) ) {
                 $activate_url = bp_activation_page( false ) . "?key=$key";
         } else {
@@ -100 +100 @@
         $admin_email = get_site_option( "admin_email" );
         
-        if ( $admin_email == '' )
+        if ( empty( $admin_email ) )
                 $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
         
-        $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
+        $from_name = ( '' == get_site_option( "site_name" ) ) ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
         $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
         $message = sprintf(__("To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your blog here:\n\n%s", 'buddypress' ), $activate_url, clean_url("http://{$domain}{$path}"));
@@ -121 +121 @@
         $admin_email = get_site_option( "admin_email" );
         
-        if ( $admin_email == '' )
+        if ( empty( $admin_email ) )
                 $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
         
-        $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
+        $from_name = ( '' == get_site_option( "site_name" ) ) ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
         $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
         $message = sprintf(__( apply_filters( 'wpmu_signup_user_notification_email', "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\n" ) ), clean_url( bp_activation_page( false ) . "?key=$key") );

trunk/bp-core/bp-core-admin.php

@@ -14 +14 @@
                         
                         if ( function_exists( 'xprofile_install' ) ) {
-                                if ( $key == 'bp-xprofile-base-group-name' ) {
+                                if ( 'bp-xprofile-base-group-name' == $key ) {
                                         $wpdb->query( $wpdb->prepare( "UPDATE $bp->profile->table_name_groups SET name = %s WHERE name = %s AND id = 1", $value, stripslashes( get_site_option('bp-xprofile-base-group-name') ) ) );
                                 }
                                 
-                                if ( $key == 'bp-xprofile-fullname-field-name' ) {
+                                if ( 'bp-xprofile-fullname-field-name' == $key ) {
                                         $wpdb->query( $wpdb->prepare( "UPDATE $bp->profile->table_name_fields SET name = %s WHERE name = %s AND group_id = 1", $value, stripslashes( get_site_option('bp-xprofile-fullname-field-name') ) ) );
                                 }

trunk/bp-core/bp-core-adminbar.php

@@ -61 +61 @@
                 $counter = 0;
                 foreach( $bp->bp_nav as $nav_item ) {
-                        $alt = ( $counter % 2 == 0 ) ? ' class="alt"' : '';
+                        $alt = ( 0 == $counter % 2 ) ? ' class="alt"' : '';
                         
                         echo '<li' . $alt . '>';
@@ -70 +70 @@
                                 $sub_counter = 0;
                                 foreach( $bp->bp_options_nav[$nav_item['css_id']] as $subnav_item ) {
-                                        $alt = ( $sub_counter % 2 == 0 ) ? ' class="alt"' : '';
+                                        $alt = ( 0 == $sub_counter % 2 ) ? ' class="alt"' : '';
                                         echo '<li' . $alt . '><a id="bp-admin-' . $subnav_item['css_id'] . '" href="' . $subnav_item['link'] . '">' . $subnav_item['name'] . '</a></li>';                               
                                         $sub_counter++;
@@ -82 +82 @@
                 }
         
-                $alt = ( $counter % 2 == 0 ) ? ' class="alt"' : '';
+                $alt = ( 0 == $counter % 2 ) ? ' class="alt"' : '';
 
                 if ( function_exists('wp_logout_url') ) { 
@@ -141 +141 @@
                                         $role = get_blog_role_for_user( $bp->loggedin_user->id, $blog->userblog_id );
 
-                                        $alt = ( $counter % 2 == 0 ) ? ' class="alt"' : '';
+                                        $alt = ( 0 == $counter % 2 ) ? ' class="alt"' : '';
                                         echo '<li' . $alt . '>';
                                         echo '<a href="' . $blog->siteurl . '">' . $blog->blogname . ' (' . $role . ')</a>';
-                                        if (!('Subscriber' == $role)) { // then they have something to display on the flyout menu
+                                        if ( !( 'Subscriber' == $role ) ) { // then they have something to display on the flyout menu
                                                 echo '<ul>';
                                                 echo '<li class="alt"><a href="' . $blog->siteurl  . '/wp-admin/">' . __('Dashboard', 'buddypress') . '</a></li>';
@@ -150 +150 @@
                                                 echo '<li class="alt"><a href="' . $blog->siteurl  . '/wp-admin/edit.php">' . __('Manage Posts', 'buddypress') . '</a></li>';
                                                 echo '<li class="alt"><a href="' . $blog->siteurl  . '/wp-admin/edit-comments.php">' . __('Manage Comments', 'buddypress') . '</a></li>';                                       
-                                                if ('Admin' == $role) { 
+                                                if ( 'Admin' == $role ) {       
                                                         echo '<li><a href="' . $blog->siteurl  . '/wp-admin/themes.php">' . __('Switch Theme', 'buddypress') . '</a></li>'; 
                                                 }                                       
@@ -160 +160 @@
                         }
         
-                        $alt = ( $counter % 2 == 0 ) ? ' class="alt"' : '';
+                        $alt = ( 0 == $counter % 2 ) ? ' class="alt"' : '';
 
                         echo '<li' . $alt . '>';
@@ -191 +191 @@
                         <?php $counter = 0; ?>
                         <?php for ( $i = 0; $i < count($notifications); $i++ ) { ?>
-                                <?php $alt = ( $counter % 2 == 0 ) ? ' class="alt"' : ''; ?>
+                                <?php $alt = ( 0 == $counter % 2 ) ? ' class="alt"' : ''; ?>
                                 <li<?php echo $alt ?>><?php echo $notifications[$i] ?></li>
                                 <?php $counter++; ?>

trunk/bp-core/bp-core-ajax.php

@@ -33 +33 @@
                                                 <span class="activity">
                                                         <?php 
-                                                        if ( $_POST['filter'] == 'newest-members') {
+                                                        if ( 'newest-members' == $_POST['filter'] ) {
                                                                 echo bp_core_get_last_activity( $user->user_registered, __( 'registered %s ago', 'buddypress' ) );
-                                                        } else if ( $_POST['filter'] == 'recently-active-members') {
+                                                        } else if ( 'recently-active-members' == $_POST['filter'] ) {
                                                                 echo bp_core_get_last_activity( get_usermeta( $user->user_id, 'last_activity' ), __( 'active %s ago', 'buddypress' ) );
-                                                        } else if ( $_POST['filter'] == 'popular-members') {
-                                                                if ( get_usermeta( $user->user_id, 'total_friend_count' ) == 1 )
+                                                        } else if ( 'popular-members' == $_POST['filter'] ) {
+                                                                if ( 1 == get_usermeta( $user->user_id, 'total_friend_count' ) )
                                                                         echo get_usermeta( $user->user_id, 'total_friend_count' ) . __(' friend', 'buddypress');
                                                                 else

trunk/bp-core/bp-core-avatars.php

@@ -48 +48 @@
                 if ( empty( $grav_option ) ) {
                         $default_grav = 'wavatar';
-                } else if ( $grav_option == 'mystery' ) {
+                } else if ( 'mystery' == $grav_option ) {
                         $default_grav = site_url( MUPLUGINDIR . '/bp-core/images/mystery-man.jpg');
                 } else {
@@ -66 +66 @@
 function bp_core_get_avatar_filter( $avatar, $id_or_email, $size, $default ) {
         $str = '';
-        $ver = ( $size == 1 || $size == 2 ) ? $size : 1;
-        
-        if ( CORE_AVATAR_V2_W == false && CORE_AVATAR_V2_H == false )
+        $ver = ( 1 == $size || 2 == $size ) ? $size : 1;
+        
+        if ( !CORE_AVATAR_V2_W && !CORE_AVATAR_V2_H )
                 $ver = 1;
                 
@@ -111 +111 @@
                 }
 
-        } else if ( isset($_POST['slick_avatars_action']) && $_POST['slick_avatars_action'] == 'upload' ) {
+        } else if ( isset($_POST['slick_avatars_action']) && 'upload' == $_POST['slick_avatars_action'] ) {
         
                 // Confirm that the nonce is valid
@@ -147 +147 @@
                 bp_core_render_avatar_cropper($original, $canvas, $action);
 
-        } else if ( isset($_POST['slick_avatars_action']) && $_POST['slick_avatars_action'] == 'crop' ) {
+        } else if ( isset($_POST['slick_avatars_action']) && 'crop' == $_POST['slick_avatars_action'] ) {
                 // Crop, save, store
                 
@@ -167 +167 @@
                 echo '<span class="crop-img">' . bp_core_get_avatar( get_current_user_id(), 1 ) . '</span>';
                 
-                if ( CORE_AVATAR_V2_W !== false && CORE_AVATAR_V2_H !== false ) {
+                if ( CORE_AVATAR_V2_W && CORE_AVATAR_V2_H ) {
                         echo '<span class="crop-img">' . bp_core_get_avatar( get_current_user_id(), 2 ) . '</span>';
                 }
 
-        } else if ( isset($_GET['slick_avatars_action']) && $_GET['slick_avatars_action'] == 'delete' ) {
+        } else if ( isset($_GET['slick_avatars_action']) && 'delete' == $_GET['slick_avatars_action'] ) {
                 // Delete an avatar
 

trunk/bp-core/bp-core-catchuri.php

@@ -44 +44 @@
         
         /* Take empties off the end of complete URI */
-        if ( $bp_uri[count($bp_uri) - 1] == "" )
+        if ( empty( $bp_uri[count($bp_uri) - 1] ) )
                 array_pop( $bp_uri );
 
         /* Take empties off the start of complete URI */
-        if ( $bp_uri[0] == "" )
+        if ( empty( $bp_uri[0] ) )
                 array_shift( $bp_uri );
                 
@@ -67 +67 @@
 
         /* Take empties off the end of path */
-        if ( $paths[count($paths) - 1] == "" )
+        if ( empty( $paths[count($paths) - 1] ) )
                 array_pop( $paths );
 
         /* Take empties off the start of path */
-        if ( $paths[0] == "" )
+        if ( empty( $paths[0] ) )
                 array_shift( $paths );
 
@@ -112 +112 @@
                 $is_root_component = in_array( $bp_uri[0], $root_components );
 
-        if ( VHOST == 'no' && !$is_root_component ) {
+        if ( 'no' == VHOST && !$is_root_component ) {
                 $component_index++;
                 $action_index++;
@@ -131 +131 @@
 
         /* Remove the username from action variables if this is not a VHOST install */
-        if ( VHOST == 'no' && !$is_root_component )
+        if ( 'no' == VHOST && !$is_root_component )
                 array_shift($action_variables);
         

trunk/bp-core/bp-core-classes.php

@@ -86 +86 @@
 
                         if ( $this->total_friends ) {
-                                if ( $this->total_friends == 1 )
+                                if ( 1 == $this->total_friends )
                                         $this->total_friends .= ' ' . __( 'friend', 'buddypress' );
                                 else
@@ -97 +97 @@
                 if ( function_exists('bp_blogs_install') ) {            
                         if ( $this->total_blogs ) {
-                                if ( $this->total_blogs == 1 )
+                                if ( 1 == $this->total_blogs )
                                         $this->total_blogs .= ' ' . __( 'blog', 'buddypress' );
                                 else
@@ -110 +110 @@
                         
                         if ( $this->total_groups ) {
-                                if ( $this->total_groups == 1 )
+                                if ( 1 == $this->total_groups )
                                         $this->total_groups .= ' ' . __( 'group', 'buddypress' );
                                 else
@@ -239 +239 @@
         var $component_action;
         var $date_notified;
-        var $is_new;
         
         function bp_core_notification( $id = false ) {
@@ -258 +257 @@
                         $this->component_action = $notification->component_action;
                         $this->date_notified = $notification->date_notified;
-                        $this->is_new = $notification->is_new;
                 }
         }       
@@ -267 +265 @@
                 if ( $this->id ) {
                         // Update
-                        $sql = $wpdb->prepare( "UPDATE {$bp->core->table_name_notifications} SET item_id = %d, secondary_item_id = %d, user_id = %d, component_name = %s, component_action = %d, date_notified = FROM_UNIXTIME(%d), is_new = %d ) WHERE id = %d", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_notified, $this->is_new, $this->id );
+                        $sql = $wpdb->prepare( "UPDATE {$bp->core->table_name_notifications} SET item_id = %d, secondary_item_id = %d, user_id = %d, component_name = %s, component_action = %d, date_notified = FROM_UNIXTIME(%d) ) WHERE id = %d", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_notified, $this->id );
                 } else {
                         // Save
-                        $sql = $wpdb->prepare( "INSERT INTO {$bp->core->table_name_notifications} ( item_id, secondary_item_id, user_id, component_name, component_action, date_notified, is_new ) VALUES ( %d, %d, %d, %s, %s, FROM_UNIXTIME(%d), %d )", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_notified, $this->is_new );
+                        $sql = $wpdb->prepare( "INSERT INTO {$bp->core->table_name_notifications} ( item_id, secondary_item_id, user_id, component_name, component_action, date_notified ) VALUES ( %d, %d, %d, %s, %s, FROM_UNIXTIME(%d) )", $this->item_id, $this->secondary_item_id, $this->user_id, $this->component_name, $this->component_action, $this->date_notified );
                 }
 
@@ -291 +289 @@
                 global $wpdb, $bp;
 
-                return $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->core->table_name_notifications} WHERE user_id = %d AND is_new = 1", $user_id ) );
+                return $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->core->table_name_notifications} WHERE user_id = %d", $user_id ) );
         }
         

trunk/bp-core/bp-core-cssjs.php

@@ -44 +44 @@
                 wp_enqueue_style( 'bp-admin-bar', site_url( MUPLUGINDIR . '/bp-core/css/admin-bar.css' ) );
                 
-                if ( get_bloginfo('text_direction') == 'rtl' && file_exists( ABSPATH . MUPLUGINDIR . '/bp-core/css/admin-bar-rtl.css' ) )
+                if ( 'rtl' == get_bloginfo('text_direction') && file_exists( ABSPATH . MUPLUGINDIR . '/bp-core/css/admin-bar-rtl.css' ) )
                         wp_enqueue_style( 'bp-admin-bar-rtl', site_url( MUPLUGINDIR . '/bp-core/css/admin-bar-rtl.css' ) );     
         }
+        
+        // Enable a sitewide CSS file that will apply styles to both the home blog theme
+        // and the member theme.
+        if ( file_exists( WP_CONTENT_DIR . '/themes/' . get_blog_option( 1, 'stylesheet' ) . '/css/site-wide.css' ) )
+                wp_enqueue_style( 'site-wide-styles', WP_CONTENT_URL . '/themes/' . get_blog_option( 1, 'stylesheet' ) . '/css/site-wide.css' );
         
         wp_print_styles();
@@ -75 +80 @@
  */
 function bp_core_add_admin_js() {
-        if ( strpos( $_GET['page'], 'bp-core' ) !== false ) {
+        if ( false !== strpos( $_GET['page'], 'bp-core' ) ) {
                 wp_enqueue_script( 'bp-account-admin-js', site_url( MUPLUGINDIR . '/bp-core/js/account-admin.js' ) );
         }
         
-        if ( strpos( $_GET['page'], 'bp-core/admin-mods' ) !== false ) {
+        if ( false !== strpos( $_GET['page'], 'bp-core/admin-mods' ) ) {
                 wp_enqueue_script('password-strength-meter');
         }
@@ -139 +144 @@
                 }
 
-                <?php if (CORE_AVATAR_V2_W !== false && CORE_AVATAR_V2_H !== false) { ?>
+                <?php if ( CORE_AVATAR_V2_W !== false && CORE_AVATAR_V2_H !== false ) { ?>
                 function v2Cropper() {
                         v1Crop = new Cropper.ImgWithPreview( 

trunk/bp-core/bp-core-notifications.php

@@ -13 +13 @@
         $notification->component_action = $component_action;
         $notification->date_notified = $date_notified;
-        $notification->is_new = 1;
 
         if ( $secondary_item_id )
@@ -59 +58 @@
                                 continue;
                         
-                        $item_id = ( $action_item_count == 1 ) ? $component_action_items[0]->item_id : false;
-                        $secondary_item_id = ( $action_item_count == 1 ) ? $component_action_items[0]->secondary_item_id : false;
+                        $item_id = ( 1 == $action_item_count ) ? $component_action_items[0]->item_id : false;
+                        $secondary_item_id = ( 1 == $action_item_count ) ? $component_action_items[0]->secondary_item_id : false;
                         
                         if ( function_exists( $component_name . '_format_notifications' ) ) {

trunk/bp-core/bp-core-signup.php

@@ -33 +33 @@
         
                 // Blog name
-                if( constant( "VHOST" ) == 'no' )
+                if ( 'no' == constant( "VHOST" ) )
                         echo '<label for="blogname">' . __('Blog Name:', 'buddypress') . '</label>';
                 else
@@ -42 +42 @@
                 <?php }
 
-                if( constant( "VHOST" ) == 'no' ) {
+                if ( 'no' == constant( "VHOST" ) ) {
                         echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span><input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /><br />';
                 } else {
                         echo '<input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /><span class="suffix_address">.' . $current_site->domain . $current_site->path . '</span><br />';
                 }
+                
                 if ( !is_user_logged_in() ) {
                         echo '<p class="help-text">';
                         print '(<strong>' . __( 'Your address will be ', 'buddypress'  );
-                        if( constant( "VHOST" ) == 'no' ) {
+                        if( 'no' == constant( "VHOST" ) ) {
                                 print $current_site->domain . $current_site->path . __( 'blogname', 'buddypress'  );
                         } else {
@@ -72 +73 @@
                         <?php _e( 'I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.', 'buddypress' ); ?> 
                         <label class="checkbox" for="blog_public_on">
-                                <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php if( !isset( $_POST['blog_public'] ) || $_POST['blog_public'] == '1' ) { ?>checked="checked"<?php } ?> />
+                                <input type="radio" id="blog_public_on" name="blog_public" value="1" <?php if( !isset( $_POST['blog_public'] ) || '1' == $_POST['blog_public'] ) { ?>checked="checked"<?php } ?> />
                                  &nbsp;<?php _e( 'Yes', 'buddypress' ); ?>
                         </label>
                         <label class="checkbox" for="blog_public_off">
-                                <input type="radio" id="blog_public_off" name="blog_public" value="0" <?php if( isset( $_POST['blog_public'] ) && $_POST['blog_public'] == '0' ) { ?>checked="checked"<?php } ?> />
+                                <input type="radio" id="blog_public_off" name="blog_public" value="0" <?php if( isset( $_POST['blog_public'] ) && '0' == $_POST['blog_public'] ) { ?>checked="checked"<?php } ?> />
                                  &nbsp;<?php _e( 'No', 'buddypress' ); ?>
                         </label>
@@ -218 +219 @@
                 <?php bp_core_signup_show_user_form($user_name, $user_email, $errors); ?>
                 
-                <?php if( $active_signup == 'blog' ) { ?>
+                <?php if( 'blog' == $active_signup ) { ?>
                         <input id="signupblog" type="hidden" name="signup_for" value="blog" />
-                <?php } elseif( $active_signup == 'user' ) { ?>
+                <?php } elseif( 'user' == $active_signup ) { ?>
                         <input id="signupblog" type="hidden" name="signup_for" value="user" />
                 <?php } else { ?>

trunk/bp-forums.php

@@ -19 +19 @@
         global $bp, $bbpress_live;
 
-        if ( get_usermeta( $bp->loggedin_user->id, 'bb_capabilities' ) == '' )
+        if ( '' == get_usermeta( $bp->loggedin_user->id, 'bb_capabilities' ) )
                 bp_forums_make_user_active_member( $bp->loggedin_user->id );
         

trunk/bp-friends.php

@@ -12 +12 @@
 include_once( 'bp-friends/bp-friends-cssjs.php' );
 include_once( 'bp-friends/bp-friends-templatetags.php' );
-include_once( 'bp-friends/bp-friends-widgets.php' );
 include_once( 'bp-friends/bp-friends-notifications.php' );
 include_once( 'bp-friends/bp-friends-filters.php' );
@@ -30 +29 @@
                 
         $sql[] = "CREATE TABLE {$bp->friends->table_name} (
-                                id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                                initiator_user_id int(11) NOT NULL,
-                                friend_user_id int(11) NOT NULL,
+                                id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                                initiator_user_id bigint(20) NOT NULL,
+                                friend_user_id bigint(20) NOT NULL,
                                 is_confirmed bool DEFAULT 0,
                                 is_limited bool DEFAULT 0,
@@ -72 +71 @@
         if ( is_site_admin() ) {
                 /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
-                if ( ( $wpdb->get_var( "SHOW TABLES LIKE '%{$bp->friends->table_name}%'") == false ) || ( get_site_option('bp-friends-db-version') < BP_FRIENDS_DB_VERSION )  )
+                if ( ( false == $wpdb->get_var( "SHOW TABLES LIKE '%{$bp->friends->table_name}%'") ) || ( get_site_option('bp-friends-db-version') < BP_FRIENDS_DB_VERSION )  )
                         friends_install();
         }
@@ -125 +124 @@
         global $bp;
                         
-        if ( isset($bp->action_variables) && $bp->action_variables[0] == 'accept' && is_numeric($bp->action_variables[1]) ) {
+        if ( isset($bp->action_variables) && 'accept' == $bp->action_variables[0] && is_numeric($bp->action_variables[1]) ) {
                 
                 if ( friends_accept_friendship( $bp->action_variables[1] ) ) {
@@ -134 +133 @@
                 bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/' . $bp->current_action );
                 
-        } else if ( isset($bp->action_variables) && $bp->action_variables[0] == 'reject' && is_numeric($bp->action_variables[1]) ) {
+        } else if ( isset($bp->action_variables) && 'reject' == $bp->action_variables[0] && is_numeric($bp->action_variables[1]) ) {
                 
                 if ( friends_reject_friendship( $bp->action_variables[1] ) ) {
@@ -166 +165 @@
                         <td></td>
                         <td><?php _e( 'A member sends you a friendship request', 'buddypress' ) ?></td>
-                        <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_request]" value="yes" <?php if ( !get_usermeta( $current_user->id,'notification_friends_friendship_request') || get_usermeta( $current_user->id,'notification_friends_friendship_request') == 'yes' ) { ?>checked="checked" <?php } ?>/></td>
+                        <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_request]" value="yes" <?php if ( !get_usermeta( $current_user->id,'notification_friends_friendship_request') || 'yes' == get_usermeta( $current_user->id,'notification_friends_friendship_request') ) { ?>checked="checked" <?php } ?>/></td>
                         <td class="no"><input type="radio" name="notifications[notification_friends_friendship_request]" value="no" <?php if ( get_usermeta( $current_user->id,'notification_friends_friendship_request') == 'no' ) { ?>checked="checked" <?php } ?>/></td>
                 </tr>
@@ -172 +171 @@
                         <td></td>
                         <td><?php _e( 'A member accepts your friendship request', 'buddypress' ) ?></td>
-                        <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="yes" <?php if ( !get_usermeta( $current_user->id,'notification_friends_friendship_accepted') || get_usermeta( $current_user->id,'notification_friends_friendship_accepted') == 'yes' ) { ?>checked="checked" <?php } ?>/></td>
-                        <td class="no"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="no" <?php if ( get_usermeta( $current_user->id,'notification_friends_friendship_accepted') == 'no' ) { ?>checked="checked" <?php } ?>/></td>
+                        <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="yes" <?php if ( !get_usermeta( $current_user->id,'notification_friends_friendship_accepted') || 'yes' == get_usermeta( $current_user->id,'notification_friends_friendship_accepted') ) { ?>checked="checked" <?php } ?>/></td>
+                        <td class="no"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id,'notification_friends_friendship_accepted') ) { ?>checked="checked" <?php } ?>/></td>
                 </tr>
                 
@@ -468 +467 @@
         global $bp;
                 
-        if ( BP_Friends_Friendship::check_is_friend( $user_id, $possible_friend_id ) == 'is_friend' )
+        if ( 'is_friend' == BP_Friends_Friendship::check_is_friend( $user_id, $possible_friend_id ) )
                 return true;
         
@@ -573 +572 @@
 
 function friends_update_friend_totals( $initiator_user_id, $friend_user_id, $status = 'add' ) {
-        if ( $status == 'add' ) {
+        if ( 'add' == $status ) {
                 update_usermeta( $initiator_user_id, 'total_friend_count', (int)get_usermeta( $initiator_user_id, 'total_friend_count' ) + 1 );
                 update_usermeta( $friend_user_id, 'total_friend_count', (int)get_usermeta( $friend_user_id, 'total_friend_count' ) + 1 );

trunk/bp-friends/bp-friends-ajax.php

@@ -13 +13 @@
         global $bp;
 
-        if ( BP_Friends_Friendship::check_is_friend( $bp->loggedin_user->id, $_POST['fid'] ) == 'is_friend' ) {
+        if ( 'is_friend' == BP_Friends_Friendship::check_is_friend( $bp->loggedin_user->id, $_POST['fid'] ) ) {
                 if ( !friends_remove_friend( $bp->loggedin_user->id, $_POST['fid'] ) ) {
                         echo __("Friendship could not be canceled.", 'buddypress');
@@ -19 +19 @@
                         echo '<a id="friend-' . $_POST['fid'] . '" class="add" rel="add" title="' . __( 'Add Friend', 'buddypress' ) . '" href="' . $bp->loggedin_user->domain . $bp->friends->slug . '/add-friend/' . $_POST['fid'] . '">' . __( 'Add Friend', 'buddypress' ) . '</a>';
                 }
-        } else if ( BP_Friends_Friendship::check_is_friend( $bp->loggedin_user->id, $_POST['fid'] ) == 'not_friends' ) {
+        } else if ( 'not_friends' == BP_Friends_Friendship::check_is_friend( $bp->loggedin_user->id, $_POST['fid'] ) ) {
                 if ( !friends_add_friend( $bp->loggedin_user->id, $_POST['fid'] ) ) {
                         echo __("Friendship could not be requested.", 'buddypress');
                 } else {
                         echo '<a href="' . $bp->loggedin_user->domain . $bp->friends->slug . '" class="requested">' . __( 'Friendship Requested', 'buddypres' ) . '</a>';
-                        //echo '<a id="friend-' . $_POST['fid'] . '" class="remove" rel="remove" title="' . __( 'Remove Friend', 'buddypress' ) . '" href="' . $bp->loggedin_user->domain . $bp->friends->slug . '/remove-friend/' . $_POST['fid'] . '">' . __( 'Remove Friend', 'buddypress' ) . '</a>';
                 }
         } else {
-                echo __('Request Pending', 'buddypress');
+                echo __( 'Request Pending', 'buddypress' );
         }
         

trunk/bp-friends/bp-friends-classes.php

@@ -174 +174 @@
                 
                 if ( $result ) {
-                        if ( (int)$result[0]->is_confirmed == 0 ) {
+                        if ( 0 == (int)$result[0]->is_confirmed ) {
                                 return 'pending';
                         } else {

trunk/bp-friends/bp-friends-notifications.php

@@ -6 +6 @@
         $initiator_name = bp_fetch_user_fullname( $initiator_id, false );
 
-        if ( get_usermeta( (int)$friend_id, 'notification_friends_friendship_request' ) == 'no' )
+        if ( 'no' == get_usermeta( (int)$friend_id, 'notification_friends_friendship_request' ) )
                 return false;
         
@@ -45 +45 @@
         $friend_name = bp_fetch_user_fullname( $friend_id, false );
 
-        if ( get_usermeta( (int)$initiator_id, 'notification_friends_friendship_accepted' ) == 'no' )
+        if ( 'no' == get_usermeta( (int)$initiator_id, 'notification_friends_friendship_accepted' ) )
                 return false;
         

trunk/bp-friends/bp-friends-templatetags.php

@@ -20 +20 @@
                 $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : 10;
 
-                if ( $bp->current_action == 'my-friends' && $_POST['friend-search-box'] != '' ) {
+                if ( 'my-friends' == $bp->current_action && !empty( $_POST['friend-search-box'] ) ) {
                         
                         // Search results
@@ -27 +27 @@
                         $this->friendships = $this->friendships['friends'];
                 
-                } else if ( $bp->current_action == 'requests' ) {
+                } else if ( 'requests' == $bp->current_action ) {
                 
                         // Friendship Requests
@@ -37 +37 @@
                         $order = $bp->action_variables[0];
                         
-                        if ( $order == 'newest' ) {
+                        if ( 'newest' == $order ) {
                                 $this->friendships = friends_get_newest( $bp->displayed_user->id, $this->pag_num, $this->pag_page );
-                        } else if ( $order == 'alphabetically' ) {
+                        } else if ( 'alphabetically' == $order ) {
                                 $this->friendships = friends_get_alphabetically( $bp->displayed_user->id, $this->pag_num, $this->pag_page );                            
                         } else {
@@ -102 +102 @@
                 $this->friendship = $this->next_friendship();
                 
-                if ( $bp->current_action == 'requests' ) {
+                if ( 'requests' == $bp->current_action ) {
                         $this->friendship = new BP_Friends_Friendship( $this->friendship );
                 } else {
@@ -109 +109 @@
                 }
                 
-                if ( $this->current_friendship == 0 ) // loop has just started
+                if ( 0 == $this->current_friendship ) // loop has just started
                         do_action('loop_start');
         }
@@ -315 +315 @@
 
                 echo '<div class="friendship-button ' . $friend_status . '" id="friendship-button-' . $potential_friend_id . '">';
-                if ( $friend_status == 'pending' ) {
+                if ( 'pending' == $friend_status ) {
                         echo '<a class="requested" href="' . $bp->loggedin_user->domain . $bp->friends->slug . '">' . __( 'Friendship Requested', 'buddypress' ) . '</a>';
-                } else if ( $friend_status == 'is_friend') {
+                } else if ( 'is_friend' == $friend_status ) {
                         echo '<a href="' . $bp->loggedin_user->domain . $bp->friends->slug . '/remove-friend/' . $potential_friend_id . '" title="' . __('Cancel Friendship', 'buddypress') . '" id="friend-' . $potential_friend_id . '" rel="remove" class="remove">' . __('Cancel Friendship', 'buddypress') . '</a>';
                 } else {
@@ -333 +333 @@
         global $bp, $create_group_step, $completed_to_step;
 ?>
-        <li<?php if ( !isset($bp->action_variables[0]) || $bp->action_variables[0] == 'recently-active' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->friends->slug ?>/my-friends/recently-active"><?php _e( 'Recently Active', 'buddypress' ) ?></a></li>
-        <li<?php if ( $bp->action_variables[0] == 'newest' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->friends->slug ?>/my-friends/newest"><?php _e( 'Newest', 'buddypress' ) ?></a></li>
-        <li<?php if ( $bp->action_variables[0] == 'alphabetically' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->friends->slug ?>/my-friends/alphabetically""><?php _e( 'Alphabetically', 'buddypress' ) ?></a></li>
+        <li<?php if ( !isset($bp->action_variables[0]) || 'recently_active' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->friends->slug ?>/my-friends/recently-active"><?php _e( 'Recently Active', 'buddypress' ) ?></a></li>
+        <li<?php if ( 'newest' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->friends->slug ?>/my-friends/newest"><?php _e( 'Newest', 'buddypress' ) ?></a></li>
+        <li<?php if ( 'alphabetically' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->friends->slug ?>/my-friends/alphabetically""><?php _e( 'Alphabetically', 'buddypress' ) ?></a></li>
 <?php
         do_action( 'friends_header_tabs' );

trunk/bp-groups.php

@@ -31 +31 @@
         
         $sql[] = "CREATE TABLE {$bp->groups->table_name} (
-                        id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                        creator_id int(11) NOT NULL,
+                        id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                        creator_id bigint(20) NOT NULL,
                         name varchar(100) NOT NULL,
                         slug varchar(100) NOT NULL,
@@ -52 +52 @@
         
         $sql[] = "CREATE TABLE {$bp->groups->table_name_members} (
-                        id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                        group_id int(11) NOT NULL,
-                        user_id int(11) NOT NULL,
-                        inviter_id int(11) NOT NULL,
+                        id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                        group_id bigint(20) NOT NULL,
+                        user_id bigint(20) NOT NULL,
+                        inviter_id bigint(20) NOT NULL,
                         is_admin tinyint(1) NOT NULL DEFAULT '0',
                         is_mod tinyint(1) NOT NULL DEFAULT '0',
@@ -73 +73 @@
 
         $sql[] = "CREATE TABLE {$bp->groups->table_name_groupmeta} (
-                        id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                        group_id int(11) NOT NULL,
+                        id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                        group_id bigint(20) NOT NULL,
                         meta_key varchar(255) DEFAULT NULL,
                         meta_value longtext DEFAULT NULL,
@@ -94 +94 @@
         
         $sql[] = "CREATE TABLE {$bp->groups->table_name_wire} (
-                        id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                        item_id int(11) NOT NULL,
-                        user_id int(11) NOT NULL,
+                        id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                        item_id bigint(20) NOT NULL,
+                        user_id bigint(20) NOT NULL,
                         content longtext NOT NULL,
                         date_posted datetime NOT NULL,
@@ -150 +150 @@
         if ( is_site_admin() ) {
                 /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
-                if ( ( $wpdb->get_var("SHOW TABLES LIKE '%" . $bp->groups->table_name . "%'") == false ) || ( get_site_option('bp-groups-db-version') < BP_GROUPS_DB_VERSION )  )
+                if ( false == ( $wpdb->get_var("SHOW TABLES LIKE '%" . $bp->groups->table_name . "%'") ) || ( get_site_option('bp-groups-db-version') < BP_GROUPS_DB_VERSION )  )
                         groups_install();
                         
-                if ( ( function_exists('bp_wire_install') && $wpdb->get_var("SHOW TABLES LIKE '%" . $bp->groups->table_name_wire . "%'") == false ) || ( get_site_option('bp-groups-db-version') < BP_GROUPS_DB_VERSION ) )
+                if ( ( function_exists('bp_wire_install') && false == $wpdb->get_var("SHOW TABLES LIKE '%" . $bp->groups->table_name_wire . "%'") ) || ( get_site_option('bp-groups-db-version') < BP_GROUPS_DB_VERSION ) )
                         groups_wire_install();
         }
@@ -199 +199 @@
         
                 /* Should this group be visible to the logged in user? */
-                $is_visible = ( $group_obj->status == 'public' || $is_member ) ? true : false;
+                $is_visible = ( 'public' == $group_obj->status || $is_member ) ? true : false;
         }
 
@@ -242 +242 @@
                         
                         // If this is a private or hidden group, does the user have access?
-                        if ( $group_obj->status == 'private' || $group_obj->status == 'hidden' ) {
+                        if ( 'private' == $group_obj->status || 'hidden' == $group_obj->status ) {
                                 if ( groups_is_user_member( $bp->loggedin_user->id, $group_obj->id ) && is_user_logged_in() )
                                         $has_access = true;
@@ -366 +366 @@
 
                 // If the user skipped the avatar step, move onto the next step and don't save anything.
-                if ( isset( $_POST['skip'] ) && $create_group_step == "3" ) {
+                if ( isset( $_POST['skip'] ) && 3 == (int)$create_group_step ) {
                         $create_group_step++;
                         $completed_to_step++;
@@ -373 +373 @@
                         
                         // We're done.
-                        if ( $create_group_step == 4 )
+                        if ( 4 == (int)$create_group_step )
                                 bp_core_redirect( bp_group_permalink( $group_obj, false ) );
                         
@@ -455 +455 @@
                 
         if ( $is_single_group ) {
-                if ( $wire_action == 'post' && BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $group_obj->id ) ) {
+                if ( 'post' == $wire_action && BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $group_obj->id ) ) {
 
                         if ( !groups_new_wire_post( $group_obj->id, $_POST['wire-post-textarea'] ) ) {
@@ -469 +469 @@
                         }
         
-                } else if ( $wire_action == 'delete' && BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $group_obj->id ) ) {
+                } else if ( 'delete' == $wire_action && BP_Groups_Member::check_is_member( $bp->loggedin_user->id, $group_obj->id ) ) {
                         $wire_message_id = $bp->action_variables[1];
 
@@ -484 +484 @@
                         }
                 
-                } else if ( ( !$wire_action || $bp->action_variables[1] == 'latest' ) ) {
+                } else if ( ( !$wire_action || 'latest' == $bp->action_variables[1] ) ) {
                         bp_core_load_template( 'groups/wire' );
                 } else {
@@ -518 +518 @@
         
         if ( $is_single_group ) {
-                if ( isset($bp->action_variables) && $bp->action_variables[0] == 'send' ) {
+                if ( isset($bp->action_variables) && 'send' == $bp->action_variables[0] ) {
                         // Send the invites.
                         groups_send_invites($group_obj);
@@ -538 +538 @@
         
         if ( $is_single_group ) {
-                if ( isset($bp->action_variables) && $bp->action_variables[0] == 'yes' ) {
+                if ( isset($bp->action_variables) && 'yes' == $bp->action_variables[0] ) {
                         
                         // Check if the user is the group admin first.
@@ -555 +555 @@
                         }
                         
-                } else if ( isset($bp->action_variables) && $bp->action_variables[0] == 'no' ) {
+                } else if ( isset($bp->action_variables) && 'no' == $bp->action_variables[0] ) {
                         
                         bp_core_redirect( bp_group_permalink( $group_obj, false) );
@@ -576 +576 @@
                 return false;
         
-        if ( $group_obj->status == 'private' ) {
+        if ( 'private' == $group_obj->status ) {
                 // If the user has submitted a request, send it.
                 if ( isset( $_POST['group-request-send']) ) {
@@ -608 +608 @@
         global $bp, $group_obj;
         
-        if ( $bp->current_component == $bp->groups->slug && $bp->action_variables[0] == 'edit-details' ) {
+        if ( $bp->current_component == $bp->groups->slug && 'edit-details' == $bp->action_variables[0] ) {
         
                 if ( $bp->is_item_admin || $bp->is_item_mod  ) {
@@ -638 +638 @@
         global $bp, $group_obj;
         
-        if ( $bp->current_component == $bp->groups->slug && $bp->action_variables[0] == 'group-settings' ) {
+        if ( $bp->current_component == $bp->groups->slug && 'group-settings' == $bp->action_variables[0] ) {
                 
                 if ( !$bp->is_item_admin )
@@ -672 +672 @@
         global $bp, $group_obj;
         
-        if ( $bp->current_component == $bp->groups->slug && $bp->action_variables[0] == 'group-avatar' ) {
+        if ( $bp->current_component == $bp->groups->slug && 'group-avatar' == $bp->action_variables[0] ) {
                 
                 if ( !$bp->is_item_admin )
@@ -717 +717 @@
         global $bp, $group_obj;
 
-        if ( $bp->current_component == $bp->groups->slug && $bp->action_variables[0] == 'manage-members' ) {
+        if ( $bp->current_component == $bp->groups->slug && 'manage-members' == $bp->action_variables[0] ) {
                 
                 if ( !$bp->is_item_admin )
                         return false;
                 
-                if ( $bp->action_variables[1] == 'promote' && is_numeric( $bp->action_variables[2] ) ) {
+                if ( 'promote' == $bp->action_variables[1] && is_numeric( $bp->action_variables[2] ) ) {
                         $user_id = $bp->action_variables[2];
                         
@@ -737 +737 @@
                 }
                 
-                if ( $bp->action_variables[1] == 'demote' && is_numeric( $bp->action_variables[2] ) ) {
+                if ( 'demote' == $bp->action_variables[1] && is_numeric( $bp->action_variables[2] ) ) {
                         $user_id = $bp->action_variables[2];
                         
@@ -752 +752 @@
                 }
                 
-                if ( $bp->action_variables[1] == 'ban' && is_numeric( $bp->action_variables[2] ) ) {
+                if ( 'ban' == $bp->action_variables[1] && is_numeric( $bp->action_variables[2] ) ) {
                         $user_id = $bp->action_variables[2];
                         
@@ -767 +767 @@
                 }
                 
-                if ( $bp->action_variables[1] == 'unban' && is_numeric( $bp->action_variables[2] ) ) {
+                if ( 'unban' == $bp->action_variables[1] && is_numeric( $bp->action_variables[2] ) ) {
                         $user_id = $bp->action_variables[2];
                         
@@ -793 +793 @@
         global $bp, $group_obj;
         
-        if ( $bp->current_component == $bp->groups->slug && $bp->action_variables[0] == 'membership-requests' ) {
-                
-                if ( !$bp->is_item_admin || $group_obj->status == 'public' )
+        if ( $bp->current_component == $bp->groups->slug && 'membership-requests' == $bp->action_variables[0] ) {
+                
+                if ( !$bp->is_item_admin || 'public' == $group_obj->status )
                         return false;
                 
@@ -805 +805 @@
 
                 if ( isset($request_action) && isset($membership_id) ) {
-                        if ( $request_action == 'accept' && is_numeric($membership_id) ) {
+                        if ( 'accept' == $request_action && is_numeric($membership_id) ) {
 
                                 // Accept the membership request
@@ -814 +814 @@
                                 }
 
-                        } else if ( $request_action == 'reject' && is_numeric($membership_id) ) {
+                        } else if ( 'reject' == $request_action && is_numeric($membership_id) ) {
 
                                 // Reject the membership request
@@ -840 +840 @@
         global $bp, $group_obj;
         
-        if ( $bp->current_component == $bp->groups->slug && $bp->action_variables[0] == 'delete-group' ) {
+        if ( $bp->current_component == $bp->groups->slug && 'delete-group' == $bp->action_variables[0] ) {
                 
                 if ( !$bp->is_item_admin )
@@ -878 +878 @@
                         <td></td>
                         <td><?php _e( 'A member invites you to join a group', 'buddypress' ) ?></td>
-                        <td class="yes"><input type="radio" name="notifications[notification_groups_invite]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_invite') || get_usermeta( $current_user->id, 'notification_groups_invite') == 'yes' ) { ?>checked="checked" <?php } ?>/></td>
-                        <td class="no"><input type="radio" name="notifications[notification_groups_invite]" value="no" <?php if ( get_usermeta( $current_user->id, 'notification_groups_invite') == 'no' ) { ?>checked="checked" <?php } ?>/></td>
+                        <td class="yes"><input type="radio" name="notifications[notification_groups_invite]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_invite') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_invite') ) { ?>checked="checked" <?php } ?>/></td>
+                        <td class="no"><input type="radio" name="notifications[notification_groups_invite]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_invite') ) { ?>checked="checked" <?php } ?>/></td>
                 </tr>
                 <tr>
                         <td></td>
                         <td><?php _e( 'Group information is updated', 'buddypress' ) ?></td>
-                        <td class="yes"><input type="radio" name="notifications[notification_groups_group_updated]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_group_updated') || get_usermeta( $current_user->id, 'notification_groups_group_updated') == 'yes' ) { ?>checked="checked" <?php } ?>/></td>
-                        <td class="no"><input type="radio" name="notifications[notification_groups_group_updated]" value="no" <?php if ( get_usermeta( $current_user->id, 'notification_groups_group_updated') == 'no' ) { ?>checked="checked" <?php } ?>/></td>
+                        <td class="yes"><input type="radio" name="notifications[notification_groups_group_updated]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_group_updated') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_group_updated') ) { ?>checked="checked" <?php } ?>/></td>
+                        <td class="no"><input type="radio" name="notifications[notification_groups_group_updated]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_group_updated') ) { ?>checked="checked" <?php } ?>/></td>
                 </tr>
                 <?php if ( function_exists('bp_wire_install') ) { ?>
@@ -891 +891 @@
                         <td></td>
                         <td><?php _e( 'A member posts on the wire of a group you belong to', 'buddypress' ) ?></td>
-                        <td class="yes"><input type="radio" name="notifications[notification_groups_wire_post]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_wire_post') || get_usermeta( $current_user->id, 'notification_groups_wire_post') == 'yes' ) { ?>checked="checked" <?php } ?>/></td>
-                        <td class="no"><input type="radio" name="notifications[notification_groups_wire_post]" value="no" <?php if ( get_usermeta( $current_user->id, 'notification_groups_wire_post') == 'no' ) { ?>checked="checked" <?php } ?>/></td>
+                        <td class="yes"><input type="radio" name="notifications[notification_groups_wire_post]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_wire_post') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_wire_post') ) { ?>checked="checked" <?php } ?>/></td>
+                        <td class="no"><input type="radio" name="notifications[notification_groups_wire_post]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_wire_post') ) { ?>checked="checked" <?php } ?>/></td>
                 </tr>
                 <?php } ?>
@@ -898 +898 @@
                         <td></td>
                         <td><?php _e( 'You are promoted to a group administrator or moderator', 'buddypress' ) ?></td>
-                        <td class="yes"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_admin_promotion') || get_usermeta( $current_user->id, 'notification_groups_admin_promotion') == 'yes' ) { ?>checked="checked" <?php } ?>/></td>
-                        <td class="no"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="no" <?php if ( get_usermeta( $current_user->id, 'notification_groups_admin_promotion') == 'no' ) { ?>checked="checked" <?php } ?>/></td>
+                        <td class="yes"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_admin_promotion') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_admin_promotion') ) { ?>checked="checked" <?php } ?>/></td>
+                        <td class="no"><input type="radio" name="notifications[notification_groups_admin_promotion]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_admin_promotion') ) { ?>checked="checked" <?php } ?>/></td>
                 </tr>
                 <tr>
                         <td></td>
                         <td><?php _e( 'A member requests to join a private group for which you are an admin', 'buddypress' ) ?></td>
-                        <td class="yes"><input type="radio" name="notifications[notification_groups_membership_request]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_membership_request') || get_usermeta( $current_user->id, 'notification_groups_membership_request') == 'yes' ) { ?>checked="checked" <?php } ?>/></td>
-                        <td class="no"><input type="radio" name="notifications[notification_groups_membership_request]" value="no" <?php if ( get_usermeta( $current_user->id, 'notification_groups_membership_request') == 'no' ) { ?>checked="checked" <?php } ?>/></td>
+                        <td class="yes"><input type="radio" name="notifications[notification_groups_membership_request]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_membership_request') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_membership_request') ) { ?>checked="checked" <?php } ?>/></td>
+                        <td class="no"><input type="radio" name="notifications[notification_groups_membership_request]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_membership_request') ) { ?>checked="checked" <?php } ?>/></td>
                 </tr>
                 
@@ -952 +952 @@
                 extract($args);
 
-                if ( $group_obj->status == 'public' )
+                if ( 'public' == $group_obj->status )
                         bp_activity_record( $item_id, $component_name, $component_action, $is_private, $secondary_item_id, $user_id, $secondary_user_id );
         }
@@ -1338 +1338 @@
         global $bp, $create_group_step, $group_obj, $bbpress_live;
 
-        if ( is_numeric( $step ) && ( $step == '1' || $step == '2' || $step == '3' || $step == '4' ) ) {
+        if ( is_numeric( $step ) && ( 1 == (int)$step || 2 == (int)$step || 3 == (int)$step || 4 == (int)$step ) ) {
                 
                 if ( !$group_obj )
@@ -1419 +1419 @@
                                         $group_obj->photos_admin_only = 1;
                                 
-                                if ( $_POST['group-status'] == 'private' ) {
+                                if ( 'private' == $_POST['group-status'] ) {
                                         $group_obj->status = 'private';
-                                } else if ( $_POST['group-status'] == 'hidden' ) {
+                                } else if ( 'hidden' == $_POST['group-status'] ) {
                                         $group_obj->status = 'hidden';
                                 }
@@ -1480 +1480 @@
         }
         
-        if ( substr( $slug, 0, 2 ) == 'wp' )
+        if ( 'wp' == substr( $slug, 0, 2 ) )
                 $slug = substr( $slug, 2, strlen( $slug ) - 2 );
         
@@ -2040 +2040 @@
         $metas = array_map('maybe_unserialize', $metas);
 
-        if ( count($metas) == 1 )
+        if ( 1 == count($metas) )
                 return $metas[0];
         else

trunk/bp-groups/bp-groups-admin.php

@@ -58 +58 @@
                                 
                                 <?php 
-                                if ( !isset($_REQUEST['order']) || $_REQUEST['order'] == 'ASC' ) {
+                                if ( !isset($_REQUEST['order']) || 'ASC' == $_REQUEST['order'] ) {
                                         $order = 'DESC';
                                 } else {
@@ -117 +117 @@
                                                 <?php $counter = 0 ?>
                                                 <?php while ( bp_groups() ) : bp_the_group(); ?>
-                                                        <tr<?php if ( $counter % 2 == 1 ) { ?> class="alternate"<?php }?>>
+                                                        <tr<?php if ( 1 == $counter % 2 ) { ?> class="alternate"<?php }?>>
                                                                 <th class="check-column" scope="row">
                                                                         <input id="group_<?php bp_group_id() ?>" type="checkbox" value="<?php bp_group_id() ?>" name="allgroups[<?php bp_group_id() ?>]" />

trunk/bp-groups/bp-groups-ajax.php

@@ -14 +14 @@
                 return false;
         
-        if ( $_POST['friend_action'] == 'invite' ) {
+        if ( 'invite' == $_POST['friend_action'] ) {
                 if ( !groups_invite_user( $_POST['friend_id'], $_POST['group_id'] ) )
                         return false;
@@ -29 +29 @@
                 echo '</li>';
                 
-        } else if ( $_POST['friend_action'] == 'uninvite' ) {
+        } else if ( 'uninvite' == $_POST['friend_action'] ) {
                 if ( !groups_uninvite_user( $_POST['friend_id'], $_POST['group_id'] ) )
                         return false;
@@ -82 +82 @@
                                                 <span class="activity">
                                                         <?php 
-                                                        if ( $_POST['filter'] == 'newest-groups') {
+                                                        if ( 'newest-groups' == $_POST['filter'] ) {
                                                                 echo bp_core_get_last_activity( $group->date_created, __('created %s ago', 'buddypress') );
-                                                        } else if ( $_POST['filter'] == 'recently-active-groups') {
+                                                        } else if ( 'recently-active-groups' == $_POST['filter'] ) {
                                                                 echo bp_core_get_last_activity( groups_get_groupmeta( $group->id, 'last_activity' ), __('active %s ago', 'buddypress') );
-                                                        } else if ( $_POST['filter'] == 'popular-groups') {
+                                                        } else if ( 'popular-groups' == $_POST['filter'] ) {
                                                                 if ( $group->total_member_count == 1 )
                                                                         echo $group->total_member_count . __(' member', 'buddypress');
@@ -256 +256 @@
                                                 <?php $member_count = groups_get_groupmeta( $group->id, 'total_member_count' ) ?>
                                                 <?php echo ucwords($group->status) ?> <?php _e( 'Group', 'buddypress' ) ?> / 
-                                                <?php if ( $member_count == 1 ) : ?>
+                                                <?php if ( 1 == $member_count ) : ?>
                                                         <?php _e( sprintf( '%d member', $member_count ), 'buddypress' ) ?>
                                                 <?php else : ?>
@@ -293 +293 @@
                 return false;
         
-        if ( $group->status == 'hidden' )
+        if ( 'hidden' == $group->status )
                 return false;
         
         if ( !groups_is_user_member( $bp->loggedin_user->id, $group->id ) ) {
         
-                if ( $group->status == 'public' ) {
+                if ( 'public' == $group->status ) {
                         if ( !groups_join_group( $group->id ) ) {
                                 _e( 'Error joining group', 'buddypress' );
@@ -304 +304 @@
                                 echo '<a id="group-' . $group->id . '" class="leave-group" rel="leave" title="' . __( 'Leave Group', 'buddypress' ) . '" href="' . bp_group_permalink( $group, false ) . '/leave-group">' . __( 'Leave Group', 'buddypress' ) . '</a>';
                         }                       
-                } else if ( $group->status == 'private' ) {
+                } else if ( 'private' == $group->status ) {
                         if ( !groups_send_membership_request( $bp->loggedin_user->id, $group->id ) ) {
                                 _e( 'Error requesting membership', 'buddypress' );      
@@ -316 +316 @@
                         _e( 'Error leaving group', 'buddypress' );
                 } else {
-                        if ( $group->status == 'public' ) {
+                        if ( 'public' == $group->status ) {
                                 echo '<a id="group-' . $group->id . '" class="join-group" rel="join" title="' . __( 'Join Group', 'buddypress' ) . '" href="' . bp_group_permalink( $group, false ) . '/join">' . __( 'Join Group', 'buddypress' ) . '</a>';                            
-                        } else if ( $group->status == 'private' ) {
+                        } else if ( 'private' == $group->status ) {
                                 echo '<a id="group-' . $group->id . '" class="request-membership" rel="join" title="' . __( 'Request Membership', 'buddypress' ) . '" href="' . bp_group_permalink( $group, false ) . '/request-membership">' . __( 'Request Membership', 'buddypress' ) . '</a>';
                         }

trunk/bp-groups/bp-groups-classes.php

@@ -164 +164 @@
                 }
                 
-                if ( $wpdb->query($sql) === false )
+                if ( false == $wpdb->query($sql) )
                         return false;
                 

trunk/bp-groups/bp-groups-cssjs.php

@@ -23 +23 @@
         global $bp, $create_group_step;
         
-        if ( $create_group_step == '3' || ( $bp->current_component == $bp->groups->slug && $bp->action_variables[0] == 'group-avatar' ) ) {
+        if ( 3 == (int)$create_group_step || ( $bp->current_component == $bp->groups->slug && $bp->action_variables[0] == 'group-avatar' ) ) {
                 wp_enqueue_script('jquery');
                 wp_enqueue_script('prototype');

trunk/bp-groups/bp-groups-notifications.php

@@ -17 +17 @@
 
         foreach ( $group->user_dataset as $user ) {
-                if ( get_usermeta( $user->user_id, 'notification_groups_wire_post' ) == 'no' ) continue;
+                if ( 'no' == get_usermeta( $user->user_id, 'notification_groups_wire_post' ) ) continue;
                 
                 $ud = get_userdata( $user->user_id );
@@ -58 +58 @@
 
         foreach ( $group->user_dataset as $user ) {
-                if ( get_usermeta( $user->user_id, 'notification_groups_group_updated' ) == 'no' ) continue;
+                if ( 'no' == get_usermeta( $user->user_id, 'notification_groups_group_updated' ) ) continue;
                 
                 $ud = get_userdata( $user->user_id );
@@ -90 +90 @@
         bp_core_add_notification( $requesting_user_id, $admin_id, 'groups', 'new_membership_request', $group_id );
 
-        if ( get_usermeta( $admin_id, 'notification_groups_membership_request' ) == 'no' )
+        if ( 'no' == get_usermeta( $admin_id, 'notification_groups_membership_request' ) )
                 return false;
                 
@@ -135 +135 @@
                 bp_core_add_notification( $group_id, $requesting_user_id, 'groups', 'membership_request_rejected' );
         
-        if ( get_usermeta( $requesting_user_id, 'notification_membership_request_completed' ) == 'no' )
+        if ( 'no' == get_usermeta( $requesting_user_id, 'notification_membership_request_completed' ) )
                 return false;
                 
@@ -189 +189 @@
         bp_core_add_notification( $group_id, $user_id, 'groups', $type );
 
-        if ( get_usermeta( $user_id, 'notification_groups_admin_promotion' ) == 'no' )
+        if ( 'no' == get_usermeta( $user_id, 'notification_groups_admin_promotion' ) )
                 return false;
 
@@ -234 +234 @@
                 bp_core_add_notification( $group_id, $invited_user_id, 'groups', 'group_invite' );
 
-                if ( get_usermeta( $invited_user_id, 'notification_groups_invite' ) == 'no' ) continue;
+                if ( 'no' == get_usermeta( $invited_user_id, 'notification_groups_invite' ) ) continue;
 
                 $invited_ud = get_userdata($invited_user_id);

trunk/bp-groups/bp-groups-templatetags.php

@@ -28 +28 @@
                 $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $groups_per_page;
                 
-                if ( ( $bp->current_action == 'my-groups' && empty( $_REQUEST['group-filter-box'] ) ) || ( !$bp->current_action && !isset($_REQUEST['page']) && empty( $_REQUEST['group-filter-box'] ) ) ) {
+                if ( ( 'my-groups' == $bp->current_action && empty( $_REQUEST['group-filter-box'] ) ) || ( !$bp->current_action && !isset($_REQUEST['page']) && empty( $_REQUEST['group-filter-box'] ) ) ) {
 
                         $order = $bp->action_variables[0];
                         
-                        if ( $order == 'recently-joined' ) {
+                        if ( 'recently-joined' == $order ) {
                                 $this->groups = groups_get_recently_joined_for_user( $bp->displayed_user->id, $this->pag_num, $this->pag_page );
-                        } else if ( $order == 'most-popular' ) {
+                        } else if ( 'most-popular' == $order ) {
                                 $this->groups = groups_get_most_popular_for_user( $bp->displayed_user->id, $this->pag_num, $this->pag_page );                           
-                        } else if ( $order == 'admin-of' ) {
+                        } else if ( 'admin-of' == $order ) {
                                 $this->groups = groups_get_user_is_admin_of( $bp->displayed_user->id, $this->pag_num, $this->pag_page );                                
-                        } else if ( $order == 'mod-of' ) {
+                        } else if ( 'mod-of' == $order ) {
                                 $this->groups = groups_get_user_is_mod_of( $bp->displayed_user->id, $this->pag_num, $this->pag_page );                          
-                        } else if ( $order == 'alphabetically' ) {
+                        } else if ( 'alphabetically' == $order ) {
                                 $this->groups = groups_get_alphabetically_for_user( $bp->displayed_user->id, $this->pag_num, $this->pag_page ); 
                         } else {
@@ -50 +50 @@
                         $this->group_count = count($this->groups);
                 
-                } else if ( ( $bp->current_action == 'my-groups' && $_REQUEST['group-filter-box'] != '' ) || ( !$bp->current_action && !isset($_REQUEST['page']) && $_REQUEST['group-filter-box'] != '' ) ) {
+                } else if ( ( 'my-groups' == $bp->current_action && $_REQUEST['group-filter-box'] != '' ) || ( !$bp->current_action && !isset($_REQUEST['page']) && $_REQUEST['group-filter-box'] != '' ) ) {
 
                         $this->groups = groups_filter_user_groups( $_REQUEST['group-filter-box'], $this->pag_num, $this->pag_page );
@@ -57 +57 @@
                         $this->group_count = count($this->groups);
                 
-                } else if ( $bp->current_action == 'invites' ) {
+                } else if ( 'invites' == $bp->current_action ) {
                 
                         $this->groups = groups_get_invites_for_user();
@@ -63 +63 @@
                         $this->group_count = count($this->groups);
                 
-                } else if ( isset( $_REQUEST['page'] ) && $_REQUEST['page'] == 'groups_admin_settings' ) {
+                } else if ( isset( $_REQUEST['page'] ) && 'groups_admin_settings' == $_REQUEST['page'] ) {
                         
                         $this->sort_by = $_REQUEST['sortby'];
@@ -157 +157 @@
                         $this->group = new BP_Groups_Group( $this->group->group_id, false );
 
-                if ( $this->current_group == 0 ) // loop has just started
+                if ( 0 == $this->current_group ) // loop has just started
                         do_action('loop_start');
         }
@@ -188 +188 @@
         global $bp, $groups_template;
         
-        if ( $groups_template->group->status == 'public' ) {
+        if ( 'public' == $groups_template->group->status ) {
                 return true;
         } else {
@@ -229 +229 @@
         global $groups_template;
         
-        if ( $groups_template->group->status == 'public' ) {
+        if ( 'public' == $groups_template->group->status ) {
                 $type = __( "Public Group", "buddypress" );
-        } else if ( $groups_template->group->status == 'hidden' ) {     
+        } else if ( 'hidden' == $groups_template->group->status ) {     
                 $type = __( "Hidden Group", "buddypress" );
-        } else if ( $groups_template->group->status == 'private' ) {
+        } else if ( 'private' == $groups_template->group->status ) {
                 $type = __( "Private Group", "buddypress" );
         } else {
@@ -480 +480 @@
         global $groups_template, $bp;
 
-        if ( $bp->current_action == 'my-groups' || !$bp->current_action ) {
+        if ( 'my-groups' == $bp->current_action || !$bp->current_action ) {
                 $action = $bp->loggedin_user->domain . $bp->groups->slug . '/my-groups/search/';
                 $label = __('Filter Groups', 'buddypress');
@@ -595 +595 @@
         global $groups_template;
         
-        if ( $permission == 'admin' && $groups_template->group->photos_admin_only )
+        if ( 'admin' == $permission && $groups_template->group->photos_admin_only )
                 echo ' checked="checked"';
         
-        if ( $permission == 'member' && !$groups_template->group->photos_admin_only )
+        if ( 'member' == $permission && !$groups_template->group->photos_admin_only )
                 echo ' checked="checked"';
 }
@@ -718 +718 @@
 ?>
         <?php if ( $bp->is_item_admin || $bp->is_item_mod ) { ?>
-                <li<?php if ( $current_tab == 'edit-details' || empty( $current_tab ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $groups_template->group->slug ?>/admin/edit-details"><?php _e('Edit Details', 'buddypress') ?></a></li>
+                <li<?php if ( 'edit-details' == $current_tab || empty( $current_tab ) ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $groups_template->group->slug ?>/admin/edit-details"><?php _e('Edit Details', 'buddypress') ?></a></li>
         <?php } ?>
 
         <?php if ( $bp->is_item_admin ) { ?>    
-                <li<?php if ( $current_tab == 'group-settings' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $groups_template->group->slug ?>/admin/group-settings"><?php _e('Group Settings', 'buddypress') ?></a></li>
+                <li<?php if ( 'group-settings' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $groups_template->group->slug ?>/admin/group-settings"><?php _e('Group Settings', 'buddypress') ?></a></li>
         <?php } ?>
         
         <?php if ( $bp->is_item_admin ) { ?>    
-                <li<?php if ( $current_tab == 'group-avatar' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $groups_template->group->slug ?>/admin/group-avatar"><?php _e('Group Avatar', 'buddypress') ?></a></li>
+                <li<?php if ( 'group-avatar' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $groups_template->group->slug ?>/admin/group-avatar"><?php _e('Group Avatar', 'buddypress') ?></a></li>
         <?php } ?>
 
         <?php if ( $bp->is_item_admin ) { ?>                    
-                <li<?php if ( $current_tab == 'manage-members' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $groups_template->group->slug ?>/admin/manage-members"><?php _e('Manage Members', 'buddypress') ?></a></li>
+                <li<?php if ( 'manage-members' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $groups_template->group->slug ?>/admin/manage-members"><?php _e('Manage Members', 'buddypress') ?></a></li>
         <?php } ?>
         
         <?php if ( $bp->is_item_admin && $groups_template->group->status == 'private' ) : ?>
-        <li<?php if ( $current_tab == 'membership-requests' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $groups_template->group->slug ?>/admin/membership-requests"><?php _e('Membership Requests', 'buddypress') ?></a></li>
+        <li<?php if ( 'membership-requests' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $groups_template->group->slug ?>/admin/membership-requests"><?php _e('Membership Requests', 'buddypress') ?></a></li>
         <?php endif; ?>
 
         <?php if ( $bp->is_item_admin ) { ?>            
-                <li<?php if ( $current_tab == 'delete-group' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $groups_template->group->slug ?>/admin/delete-group"><?php _e('Delete Group', 'buddypress') ?></a></li>
+                <li<?php if ( 'delete-group' == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->root_domain . '/' . $bp->groups->slug ?>/<?php echo $groups_template->group->slug ?>/admin/delete-group"><?php _e('Delete Group', 'buddypress') ?></a></li>
         <?php } ?>
         
@@ -772 +772 @@
         global $bp, $create_group_step, $completed_to_step;
 ?>
-        <li<?php if ( $create_group_step == '1' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/create/step/1">1. <?php _e('Group Details', 'buddypress') ?></a></li>
-        <li<?php if ( $create_group_step == '2' ) : ?> class="current"<?php endif; ?>><?php if ( $completed_to_step > 0 ) { ?><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/create/step/2">2. <?php _e('Group Settings', 'buddypress') ?></a><?php } else { ?><span>2. <?php _e('Group Settings', 'buddypress') ?></span><?php } ?></li>
-        <li<?php if ( $create_group_step == '3' ) : ?> class="current"<?php endif; ?>><?php if ( $completed_to_step > 1 ) { ?><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/create/step/3">3. <?php _e('Group Avatar', 'buddypress') ?></a><?php } else { ?><span>3. <?php _e('Group Avatar', 'buddypress') ?></span><?php } ?></li>
-        <li<?php if ( $create_group_step == '4' ) : ?> class="current"<?php endif; ?>><?php if ( $completed_to_step > 2 ) { ?><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/create/step/4">4. <?php _e('Invite Members', 'buddypress') ?></a><?php } else { ?><span>4. <?php _e('Invite Members', 'buddypress') ?></span><?php } ?></li>
+        <li<?php if ( 1 == (int)$create_group_step ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/create/step/1">1. <?php _e('Group Details', 'buddypress') ?></a></li>
+        <li<?php if ( 2 == (int)$create_group_step ) : ?> class="current"<?php endif; ?>><?php if ( $completed_to_step > 0 ) { ?><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/create/step/2">2. <?php _e('Group Settings', 'buddypress') ?></a><?php } else { ?><span>2. <?php _e('Group Settings', 'buddypress') ?></span><?php } ?></li>
+        <li<?php if ( 3 == (int)$create_group_step ) : ?> class="current"<?php endif; ?>><?php if ( $completed_to_step > 1 ) { ?><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/create/step/3">3. <?php _e('Group Avatar', 'buddypress') ?></a><?php } else { ?><span>3. <?php _e('Group Avatar', 'buddypress') ?></span><?php } ?></li>
+        <li<?php if ( 4 == (int)$create_group_step ) : ?> class="current"<?php endif; ?>><?php if ( $completed_to_step > 2 ) { ?><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/create/step/4">4. <?php _e('Invite Members', 'buddypress') ?></a><?php } else { ?><span>4. <?php _e('Invite Members', 'buddypress') ?></span><?php } ?></li>
 <?php
         do_action( 'groups_creation_tabs' );
@@ -861 +861 @@
                         
                                 <div class="radio">
-                                        <label><input type="radio" name="group-status" value="public"<?php if ( $group_obj->status == 'public' ) { ?> checked="checked"<?php } ?> /> <strong><?php _e('This is an open group', 'buddypress') ?></strong><br /><?php _e('This group will be free to join and will appear in group search results.', 'buddypress'); ?></label>
-                                        <label><input type="radio" name="group-status" value="private"<?php if ( $group_obj->status == 'private' ) { ?> checked="checked"<?php } ?> /> <strong><?php _e('This is an private group', 'buddypress') ?></strong><br /><?php _e('This group will require an invite to join but will still appear in group search results.', 'buddypress'); ?></label>
-                                        <label><input type="radio" name="group-status" value="hidden"<?php if ( $group_obj->status == 'hidden' ) { ?> checked="checked"<?php } ?> /> <strong><?php _e('This is a hidden group', 'buddypress') ?></strong><br /><?php _e('This group will require an invite to join and will only be visible to invited members. It will not appear in search results or on member profiles.', 'buddypress'); ?></label>
+                                        <label><input type="radio" name="group-status" value="public"<?php if ( 'public' == $group_obj->status ) { ?> checked="checked"<?php } ?> /> <strong><?php _e('This is an open group', 'buddypress') ?></strong><br /><?php _e('This group will be free to join and will appear in group search results.', 'buddypress'); ?></label>
+                                        <label><input type="radio" name="group-status" value="private"<?php if ( 'private' == $group_obj->status ) { ?> checked="checked"<?php } ?> /> <strong><?php _e('This is an private group', 'buddypress') ?></strong><br /><?php _e('This group will require an invite to join but will still appear in group search results.', 'buddypress'); ?></label>
+                                        <label><input type="radio" name="group-status" value="hidden"<?php if ( 'hidden' == $group_obj->status ) { ?> checked="checked"<?php } ?> /> <strong><?php _e('This is a hidden group', 'buddypress') ?></strong><br /><?php _e('This group will require an invite to join and will only be visible to invited members. It will not appear in search results or on member profiles.', 'buddypress'); ?></label>
                                 </div>
 
@@ -968 +968 @@
         global $bp, $create_group_step, $completed_to_step;
 ?>
-        <li<?php if ( !isset($bp->action_variables[0]) || $bp->action_variables[0] == 'recently-active' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/recently-active"><?php _e( 'Recently Active', 'buddypress' ) ?></a></li>
-        <li<?php if ( $bp->action_variables[0] == 'recently-joined' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/recently-joined"><?php _e( 'Recently Joined', 'buddypress' ) ?></a></li>
-        <li<?php if ( $bp->action_variables[0] == 'most-popular' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/most-popular""><?php _e( 'Most Popular', 'buddypress' ) ?></a></li>
-        <li<?php if ( $bp->action_variables[0] == 'admin-of' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/admin-of""><?php _e( 'Administrator Of', 'buddypress' ) ?></a></li>
-        <li<?php if ( $bp->action_variables[0] == 'mod-of' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/mod-of""><?php _e( 'Moderator Of', 'buddypress' ) ?></a></li>
-        <li<?php if ( $bp->action_variables[0] == 'alphabetically' ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/alphabetically""><?php _e( 'Alphabetically', 'buddypress' ) ?></a></li>
+        <li<?php if ( !isset($bp->action_variables[0]) || 'recently-active' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/recently-active"><?php _e( 'Recently Active', 'buddypress' ) ?></a></li>
+        <li<?php if ( 'recently-joined' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/recently-joined"><?php _e( 'Recently Joined', 'buddypress' ) ?></a></li>
+        <li<?php if ( 'most-popular' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/most-popular""><?php _e( 'Most Popular', 'buddypress' ) ?></a></li>
+        <li<?php if ( 'admin-of' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/admin-of""><?php _e( 'Administrator Of', 'buddypress' ) ?></a></li>
+        <li<?php if ( 'mod-of' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/mod-of""><?php _e( 'Moderator Of', 'buddypress' ) ?></a></li>
+        <li<?php if ( 'alphabetically' == $bp->action_variables[0] ) : ?> class="current"<?php endif; ?>><a href="<?php echo $bp->displayed_user->domain . $bp->groups->slug ?>/my-groups/alphabetically""><?php _e( 'Alphabetically', 'buddypress' ) ?></a></li>
                 
 <?php
@@ -1153 +1153 @@
         global $groups_template;
         
-        if ( $groups_template->group->status == 'private' ) {
+        if ( 'private' == $groups_template->group->status ) {
                 if ( !bp_group_has_requested_membership() )
                         if ( is_user_logged_in() )
@@ -1191 +1191 @@
                                                 <?php $member_count = groups_get_groupmeta( $group->id, 'total_member_count' ) ?>
                                                 <?php echo ucwords($group->status) ?> <?php _e( 'Group', 'buddypress' ) ?> / 
-                                                <?php if ( $member_count == 1 ) : ?>
+                                                <?php if ( 1 == $member_count ) : ?>
                                                         <?php _e( sprintf( '%d member', $member_count ), 'buddypress' ) ?>
                                                 <?php else : ?>
@@ -1336 +1336 @@
                 $this->member = $this->next_member();
 
-                if ( $this->current_member == 0 ) // loop has just started
+                if ( 0 == $this->current_member ) // loop has just started
                         do_action('loop_start');
         }
@@ -1411 +1411 @@
         global $bp;
         
-        if ( $bp->current_action == 'group-finder' )
+        if ( 'group-finder' == $bp->current_action )
                 echo apply_filters( 'bp_group_reject_invite_link', 'groupfinder-pag' );
         else
@@ -1521 +1521 @@
                 $this->request = $this->next_request();
 
-                if ( $this->current_request == 0 ) // loop has just started
+                if ( 0 == $this->current_request ) // loop has just started
                         do_action('loop_start');
         }

trunk/bp-groups/bp-groups-widgets.php

@@ -51 +51 @@
                                                 <span class="activity">
                                                         <?php 
-                                                        if ( $group->total_member_count == 1 )
+                                                        if ( 1 == $group->total_member_count )
                                                                 echo $group->total_member_count . __(' member', 'buddypress');
                                                         else

trunk/bp-messages.php

@@ -11 +11 @@
 include_once( 'bp-messages/bp-messages-ajax.php' );
 include_once( 'bp-messages/bp-messages-cssjs.php' );
-include_once( 'bp-messages/bp-messages-admin.php' );
 include_once( 'bp-messages/bp-messages-templatetags.php' );
 include_once( 'bp-messages/bp-messages-notifications.php' );
@@ -33 +32 @@
         
         $sql[] = "CREATE TABLE {$bp->messages->table_name_threads} (
-                                id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                                id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                                 message_ids longtext NOT NULL,
                                 sender_ids longtext NOT NULL,
                                 first_post_date datetime NOT NULL,
                                 last_post_date datetime NOT NULL,
-                                last_message_id int(11) NOT NULL,
-                                last_sender_id int(11) NOT NULL,
+                                last_message_id bigint(20) NOT NULL,
+                                last_sender_id bigint(20) NOT NULL,
                             KEY last_message_id (last_message_id),
                             KEY last_sender_id (last_sender_id)
@@ -45 +44 @@
         
         $sql[] = "CREATE TABLE {$bp->messages->table_name_recipients} (
-                                id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                                user_id int(11) NOT NULL,
-                                thread_id int(11) NOT NULL,
+                                id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                                user_id bigint(20) NOT NULL,
+                                thread_id bigint(20) NOT NULL,
                                 sender_only tinyint(1) NOT NULL DEFAULT '0',
                                 unread_count int(10) NOT NULL DEFAULT '0',
@@ -59 +58 @@
 
         $sql[] = "CREATE TABLE {$bp->messages->table_name_messages} (
-                                id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                                sender_id int(11) NOT NULL,
+                                id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                                sender_id bigint(20) NOT NULL,
                                 subject varchar(200) NOT NULL,
                                 message longtext NOT NULL,
@@ -72 +71 @@
         
         $sql[] = "CREATE TABLE {$bp->messages->table_name_notices} (
-                                id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                                id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                                 subject varchar(200) NOT NULL,
                                 message longtext NOT NULL,
@@ -123 +122 @@
         if ( is_site_admin() ) {
                 /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
-                if ( ( $wpdb->get_var( "SHOW TABLES LIKE '%{$bp->messages->table_name_messages}%'" ) == false ) || ( get_site_option('bp-messages-db-version') < BP_MESSAGES_DB_VERSION ) )
+                if ( false == ( $wpdb->get_var( "SHOW TABLES LIKE '%{$bp->messages->table_name_messages}%'" ) ) || ( get_site_option('bp-messages-db-version') < BP_MESSAGES_DB_VERSION ) )
                         messages_install();
         }
@@ -186 +185 @@
         
         $recipients = false;
-        if ( $_POST['send_to_usernames'] == '' ) {
-                if ( $_POST['send-to-input'] != '' ) {
+        if ( empty( $_POST['send_to_usernames'] ) ) {
+                if ( !empty( $_POST['send-to-input'] ) ) {
                         // Replace commas with places
                         $recipients = str_replace( ',', ' ', $_POST['send-to-input'] );
@@ -216 +215 @@
                 $notice = new BP_Messages_Notice($notice_id);
 
-                if ( $bp->action_variables[0] == 'deactivate' ) {
+                if ( 'deactivate' == $bp->action_variables[0] ) {
                         if ( !$notice->deactivate() ) {
                                 bp_core_add_message( __('There was a problem deactivating that notice.', 'buddypress'), 'error' );      
@@ -222 +221 @@
                                 bp_core_add_message( __('Notice deactivated.', 'buddypress') );
                         }
-                } else if ( $bp->action_variables[0] == 'activate' ) {
+                } else if ( 'activate' == $bp->action_variables[0] ) {
                         if ( !$notice->activate() ) {
                                 bp_core_add_message( __('There was a problem activating that notice.', 'buddypress'), 'error' );
@@ -228 +227 @@
                                 bp_core_add_message( __('Notice activated.', 'buddypress') );
                         }
-                } else if ( $bp->action_variables[0] == 'delete' ) {
+                } else if ( 'delete' == $bp->action_variables[0] ) {
                         if ( !$notice->delete() ) {
                                 bp_core_add_message( __('There was a problem deleting that notice.', 'buddypress'), 'buddypress' );
@@ -255 +254 @@
                         <td></td>
                         <td><?php _e( 'A member sends you a new message', 'buddypress' ) ?></td>
-                        <td class="yes"><input type="radio" name="notifications[notification_messages_new_message]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_messages_new_message' ) || get_usermeta( $current_user->id, 'notification_messages_new_message' ) == 'yes' ) { ?>checked="checked" <?php } ?>/></td>
-                        <td class="no"><input type="radio" name="notifications[notification_messages_new_message]" value="no" <?php if ( get_usermeta( $current_user->id, 'notification_messages_new_message' ) == 'no' ) { ?>checked="checked" <?php } ?>/></td>
+                        <td class="yes"><input type="radio" name="notifications[notification_messages_new_message]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_messages_new_message' ) || 'yes' == get_usermeta( $current_user->id, 'notification_messages_new_message' ) ) { ?>checked="checked" <?php } ?>/></td>
+                        <td class="no"><input type="radio" name="notifications[notification_messages_new_message]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_messages_new_message' ) ) { ?>checked="checked" <?php } ?>/></td>
                 </tr>
                 <tr>
                         <td></td>
                         <td><?php _e( 'A new site notice is posted', 'buddypress' ) ?></td>
-                        <td class="yes"><input type="radio" name="notifications[notification_messages_new_notice]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_messages_new_notice' ) || get_usermeta( $current_user->id, 'notification_messages_new_notice' ) == 'yes' ) { ?>checked="checked" <?php } ?>/></td>
-                        <td class="no"><input type="radio" name="notifications[notification_messages_new_notice]" value="no" <?php if ( get_usermeta( $current_user->id, 'notification_messages_new_notice' ) == 'no' ) { ?>checked="checked" <?php } ?>/></td>
+                        <td class="yes"><input type="radio" name="notifications[notification_messages_new_notice]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_messages_new_notice' ) || 'yes' == get_usermeta( $current_user->id, 'notification_messages_new_notice' ) ) { ?>checked="checked" <?php } ?>/></td>
+                        <td class="no"><input type="radio" name="notifications[notification_messages_new_notice]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_messages_new_notice' ) ) { ?>checked="checked" <?php } ?>/></td>
                 </tr>
                 
@@ -365 +364 @@
         global $bp;
         
-        if ( $action == 'new_message') {
+        if ( 'new_message' == $action ) {
                 if ( (int)$total_items > 1 )
                         return apply_filters( 'bp_messages_multiple_new_message_notification', '<a href="' . $bp->loggedin_user->domain . $bp->messages->slug . '/inbox" title="Inbox">' . sprintf( __('You have %d new messages'), (int)$total_items ) . '</a>', $total_items );               
@@ -413 +412 @@
                 
         // If there is only 1 recipient and it is the logged in user.
-        } else if ( count( $recipients ) == 1 && $recipients[0] == $current_user->user_login ) {
+        } else if ( 1 == count( $recipients ) && $recipients[0] == $current_user->user_login ) {
                 bp_core_add_message( __('You must send your message to one or more users not including yourself.', 'buddypress'), 'error' );
                 bp_core_redirect( $bp->loggedin_user->domain . $bp->current_component . '/compose' );   
         
         // If the subject or content boxes are empty.
-        } else if ( $subject == '' || $content == '' ) {
+        } else if ( empty( $subject ) || empty( $content ) ) {
                 if ( !$from_ajax ) {
                         bp_core_add_message( __('Please make sure you fill in all the fields.', 'buddypress'), 'error' );
@@ -515 +514 @@
 
 function messages_send_notice( $subject, $message, $from_template ) {
-        if ( !is_site_admin() || $subject == '' || $message == '' ) {
+        if ( !is_site_admin() || empty( $subject ) || empty( $message ) ) {
                 return false;
         } else {

trunk/bp-messages/bp-messages-classes.php

@@ -62 +62 @@
                                         
                                         foreach ( $this->message_ids as $key => $message_id ) {
-                                                if ( $this->box == 'sentbox' ) {
+                                                if ( 'sentbox' == $this->box ) {
                                                         if ( !messages_is_user_sender( $bp->loggedin_user->id, $message_id ) ) {
                                                                 unset( $this->message_ids[$key] );
@@ -377 +377 @@
                         $sql = $wpdb->prepare( "INSERT INTO {$bp->messages->table_name_threads} ( message_ids, sender_ids, first_post_date, last_post_date, last_message_id, last_sender_id ) VALUES ( %s, %s, FROM_UNIXTIME(%d), FROM_UNIXTIME(%d), %d, %d )", $serialized_message_id, $serialized_sender_id, $this->date_sent, $this->date_sent, $message_id, $this->sender_id ); 
                         
-                        if ( $wpdb->query($sql) === false )
+                        if ( false === $wpdb->query($sql) )
                                 return false;
                         

trunk/bp-messages/bp-messages-notifications.php

@@ -10 +10 @@
 
         for ( $i = 0; $i < count($recipient_ids); $i++ ) {
-                if ( $message->sender_id == $recipient_ids[$i] || get_userdata( $recipient_ids[$i], 'notification-messages-new-message' ) == 'no' ) continue;
+                if ( $message->sender_id == $recipient_ids[$i] || 'no' == get_userdata( $recipient_ids[$i], 'notification-messages-new-message' ) ) continue;
 
                 $ud = get_userdata($recipient_ids[$i]);

trunk/bp-messages/bp-messages-templatetags.php

@@ -22 +22 @@
                 $this->box = $box;
                 
-                if ( $this->box == 'notices' )
+                if ( 'notices' == $this->box )
                         $this->threads = BP_Messages_Notice::get_notices();
                 else
@@ -33 +33 @@
                         $this->thread_count = count($this->threads);
                 
-                        if ( $this->box == 'notices' )
+                        if ( 'notices' == $this->box )
                                 $this->total_thread_count = BP_Messages_Notice::get_total_notice_count();
                         else
@@ -90 +90 @@
                 $thread = $this->next_thread();
 
-                if ( $this->current_thread == 0 ) // loop has just started
+                if ( 0 == $this->current_thread ) // loop has just started
                         do_action('loop_start');
         }
@@ -98 +98 @@
         global $bp, $messages_template;
 
-        if ( $bp->current_action == 'notices' && !is_site_admin() ) {
+        if ( 'notices' == $bp->current_action && !is_site_admin() ) {
                 wp_redirect( $bp->displayed_user->id );
         } else {
-                if ( $bp->current_action == 'inbox' )
+                if ( 'inbox' == $bp->current_action )
                         bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'messages', 'new_message' );
         
@@ -269 +269 @@
         global $messages_template, $bp;
 
-        if ( $messages_template->thread->is_active == "1" ) {
+        if ( 1 == (int)$messages_template->thread->is_active ) {
                 $link = $bp->loggedin_user->domain . $bp->messages->slug . '/notices/deactivate/' . $messages_template->thread->id;
         } else {
@@ -280 +280 @@
         global $messages_template;
         
-        if ( $messages_template->thread->is_active == "1" ) {
+        if ( 1 == (int)$messages_template->thread->is_active  ) {
                 $text = __('Deactivate', 'buddypress');
         } else {

trunk/bp-wire/bp-wire-templatetags.php

@@ -26 +26 @@
                         // Seeing as we're viewing a users wire, lets remove any new wire
                         // post notifications
-                        if ( $bp->current_action == 'all-posts' )
+                        if ( 'all-posts' == $bp->current_action )
                                 bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, 'xprofile', 'new_wire_post' );
                         
@@ -99 +99 @@
                 $this->wire_post = $this->next_wire_post();
 
-                if ( $this->current_wire_post == 0 ) // loop has just started
+                if ( 0 == $this->current_wire_post ) // loop has just started
                         do_action('loop_start');
         }
@@ -262 +262 @@
                 $uri = $bp->current_item;
         
-        if ( $bp->current_component == 'wire' || $bp->current_component == 'profile' ) {
+        if ( $bp->current_component == $bp->wire->slug || $bp->current_component == $bp->profile->slug ) {
                 echo apply_filters( 'bp_wire_get_action', $bp->displayed_user->domain . $bp->wire->slug . '/post/' );
         } else {
@@ -303 +303 @@
                 
         if ( ( $wire_posts_template->wire_post->user_id == $bp->loggedin_user->id ) || $bp->is_item_admin ) {
-                if ( $bp->current_component == 'wire' || $bp->current_component == 'profile' ) {
+                if ( $bp->wire->slug == $bp->current_component || $bp->profile->slug == $bp->current_component ) {
                         echo apply_filters( 'bp_wire_delete_link', '<a href="' . $bp->displayed_user->domain . $bp->wire->slug . '/delete/' . $wire_posts_template->wire_post->id . '">[' . __('Delete', 'buddypress') . ']</a>' );
                 } else {
@@ -319 +319 @@
                 $uri = $bp->current_item;
         
-        if ( $bp->current_component == 'wire' || $bp->current_component == 'profile') {
+        if ( $bp->current_component == $bp->wire->slug || $bp->current_component == $bp->profile->slug ) {
                 echo apply_filters( 'bp_wire_see_all_link', $bp->displayed_user->domain . $bp->wire->slug );
         } else {

trunk/bp-xprofile.php

@@ -56 +56 @@
         
         $sql[] = "CREATE TABLE {$bp->profile->table_name_groups} (
-                          id int(11) unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                          id bigint(20) unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
                           name varchar(150) NOT NULL,
                           description mediumtext NOT NULL,
@@ -64 +64 @@
         
         $sql[] = "CREATE TABLE {$bp->profile->table_name_fields} (
-                          id int(11) unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                          group_id int(11) unsigned NOT NULL,
-                          parent_id int(11) unsigned NOT NULL,
+                          id bigint(20) unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                          group_id bigint(20) unsigned NOT NULL,
+                          parent_id bigint(20) unsigned NOT NULL,
                           type varchar(150) NOT NULL,
                           name varchar(150) NOT NULL,
@@ -72 +72 @@
                           is_required tinyint(1) NOT NULL DEFAULT '0',
                           is_default_option tinyint(1) NOT NULL DEFAULT '0',
-                          field_order int(11) NOT NULL DEFAULT '0',
-                          option_order int(11) NOT NULL DEFAULT '0',
+                          field_order bigint(20) NOT NULL DEFAULT '0',
+                          option_order bigint(20) NOT NULL DEFAULT '0',
                           order_by varchar(15) NOT NULL,
                           is_public int(2) NOT NULL DEFAULT '1',
@@ -85 +85 @@
         
         $sql[] = "CREATE TABLE {$bp->profile->table_name_data} (
-                          id int(11) unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                          field_id int(11) unsigned NOT NULL,
-                          user_id int(11) unsigned NOT NULL,
+                          id bigint(20) unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                          field_id bigint(20) unsigned NOT NULL,
+                          user_id bigint(20) unsigned NOT NULL,
                           value longtext NOT NULL,
                           last_updated datetime NOT NULL,
@@ -118 +118 @@
 
         $sql[] = "CREATE TABLE {$bp->profile->table_name_wire} (
-                           id int(11) NOT NULL AUTO_INCREMENT,
-                           item_id int(11) NOT NULL,
-                           user_id int(11) NOT NULL,
+                           id bigint(20) NOT NULL AUTO_INCREMENT,
+                           item_id bigint(20) NOT NULL,
+                           user_id bigint(20) NOT NULL,
                            content longtext NOT NULL,
                            date_posted datetime NOT NULL,
@@ -187 +187 @@
 
         /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
-        if ( ( $wpdb->get_var("SHOW TABLES LIKE '%{$bp->profile->table_name_groups}%'") == false ) || ( get_site_option('bp-xprofile-db-version') < BP_XPROFILE_DB_VERSION )  )
+        if ( false == ( $wpdb->get_var("SHOW TABLES LIKE '%{$bp->profile->table_name_groups}%'") ) || ( get_site_option('bp-xprofile-db-version') < BP_XPROFILE_DB_VERSION )  )
                 xprofile_install();
         
-        if ( ( function_exists('bp_wire_install') && $wpdb->get_var("SHOW TABLES LIKE '%{$bp->profile->table_name_wire}%'") == false ) || ( get_site_option('bp-xprofile-db-version') < BP_XPROFILE_DB_VERSION )  )
+        if ( ( function_exists('bp_wire_install') && false == $wpdb->get_var( "SHOW TABLES LIKE '%{$bp->profile->table_name_wire}%'" ) ) || ( get_site_option('bp-xprofile-db-version') < BP_XPROFILE_DB_VERSION )  )
                 xprofile_wire_install();
 }
@@ -317 +317 @@
                         <td></td>
                         <td><?php _e( 'A member posts on your wire', 'buddypress' ) ?></td>
-                        <td class="yes"><input type="radio" name="notifications[notification_profile_wire_post]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_profile_wire_post' ) || get_usermeta( $current_user->id, 'notification_profile_wire_post' ) == 'yes' ) { ?>checked="checked" <?php } ?>/></td>
-                        <td class="no"><input type="radio" name="notifications[notification_profile_wire_post]" value="no" <?php if ( get_usermeta( $current_user->id, 'notification_profile_wire_post' ) == 'no' ) { ?>checked="checked" <?php } ?>/></td>
+                        <td class="yes"><input type="radio" name="notifications[notification_profile_wire_post]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_profile_wire_post' ) || 'yes' == get_usermeta( $current_user->id, 'notification_profile_wire_post' ) ) { ?>checked="checked" <?php } ?>/></td>
+                        <td class="no"><input type="radio" name="notifications[notification_profile_wire_post]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_profile_wire_post' ) ) { ?>checked="checked" <?php } ?>/></td>
                 </tr>
                 
@@ -571 +571 @@
         global $bp;
 
-        if ( $action == 'new_wire_post') {
+        if ( 'new_wire_post' == $action ) {
                 if ( (int)$total_items > 1 ) {
                         return apply_filters( 'bp_xprofile_multiple_new_wire_post_notification', '<a href="' . $bp->loggedin_user->domain . $bp->wire->slug . '" title="Wire">' . sprintf( __('You have %d new posts on your wire'), (int)$total_items ) . '</a>', $total_items );              
@@ -632 +632 @@
                                         
                                         // If the user has submitted the form - validate and save the new value for this field
-                                        if ( isset($_GET['mode']) && $_GET['mode'] == 'save' ) {
+                                        if ( isset($_GET['mode']) && 'save' == $_GET['mode'] ) {
                                                 
                                                 // If the current field is a datebox, we need to append '_day' to the end of the field name
                                                 // otherwise the field name will not exist
-                                                $post_field_string = ( $group->fields[$j]->type == 'datebox' ) ? '_day' : null;
+                                                $post_field_string = ( 'datebox' == $group->fields[$j]->type ) ? '_day' : null;
                                                 
                                                 // Explode the posted field IDs into an array so we know which fields have been submitted
@@ -753 +753 @@
                 <?php
                         if ( $message != '' ) {
-                                $type = ( $type == 'error' ) ? 'error' : 'updated';
+                                $type = ( 'error' == $type ) ? 'error' : 'updated';
                 ?>
                         <div id="message" class="<?php echo $type; ?> fade">
@@ -815 +815 @@
                 return false;
         
-        if ( $field_type == "datebox" ) {
+        if ( 'datebox' == $field_type ) {
                 $field_value = bp_format_time( $field_value, true );
         } else {

trunk/bp-xprofile/bp-xprofile-admin.php

@@ -16 +16 @@
         $groups = BP_XProfile_Group::get_all();
 
-        if ( isset($_GET['mode']) && isset($_GET['group_id']) && $_GET['mode'] == "add_field" ) {
+        if ( isset($_GET['mode']) && isset($_GET['group_id']) && 'add_field' == $_GET['mode'] ) {
                 xprofile_admin_manage_field($_GET['group_id']);
-        } else if ( isset($_GET['mode']) && isset($_GET['group_id']) && isset($_GET['field_id']) && $_GET['mode'] == "edit_field" ) {
+        } else if ( isset($_GET['mode']) && isset($_GET['group_id']) && isset($_GET['field_id']) && 'edit_field' == $_GET['mode'] ) {
                 xprofile_admin_manage_field($_GET['group_id'], $_GET['field_id']);
-        } else if ( isset($_GET['mode']) && isset($_GET['field_id']) && $_GET['mode'] == "delete_field" ) {
+        } else if ( isset($_GET['mode']) && isset($_GET['field_id']) && 'delete_field' == $_GET['mode'] ) {
                 xprofile_admin_delete_field($_GET['field_id'], 'field');
-        } else if ( isset($_GET['mode']) && isset($_GET['option_id']) && $_GET['mode'] == "delete_option" ) {
+        } else if ( isset($_GET['mode']) && isset($_GET['option_id']) && 'delete_option' == $_GET['mode'] ) {
                 xprofile_admin_delete_field($_GET['option_id'], 'option');
-        } else if ( isset($_GET['mode']) && $_GET['mode'] == "add_group" ) {
+        } else if ( isset($_GET['mode']) && 'add_group' == $_GET['mode'] ) {
                 xprofile_admin_manage_group();
-        } else if ( isset($_GET['mode']) && isset($_GET['group_id']) && $_GET['mode'] == "delete_group" ) {
+        } else if ( isset($_GET['mode']) && isset($_GET['group_id']) && 'delete_group' == $_GET['mode'] ) {
                 xprofile_admin_delete_group($_GET['group_id']);
-        } else if ( isset($_GET['mode']) && isset($_GET['group_id']) && $_GET['mode'] == "edit_group" ) {
+        } else if ( isset($_GET['mode']) && isset($_GET['group_id']) && 'edit_group' == $_GET['mode'] ) {
                 xprofile_admin_manage_group($_GET['group_id']);
         } else {
@@ -91 +91 @@
                                                   <?php if ( $groups[$i]->fields ) { ?>
                                                 <?php for ( $j = 0; $j < count($groups[$i]->fields); $j++ ) { ?>
-                                                                        <?php if ( $j % 2 == 0 ) { $class = ""; } else { $class = "alternate"; } ?>
+                                                                        <?php if ( 0 == $j % 2 ) { $class = ""; } else { $class = "alternate"; } ?>
                                                             <?php $field = new BP_XProfile_Field($groups[$i]->fields[$j]->id); ?>
                                                             <?php if ( !$field->can_delete ) { $class .= ' core'; } ?>
@@ -244 +244 @@
         global $message, $type;
         
-        if ( $type == 'field' ) {
+        if ( 'field' == $type ) {
                 $type = __('field', 'buddypress');
         } else {

trunk/bp-xprofile/bp-xprofile-classes.php

@@ -52 +52 @@
                 }
                 
-                if ( $wpdb->query($sql) === false )
+                if ( !$wpdb->query($sql) )
                         return false;
                 
@@ -66 +66 @@
                 $sql = $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_groups} WHERE id = %d", $this->id );
 
-                if ( $wpdb->query($sql) === false) {
+                if ( !$wpdb->query($sql) ) {
                         return false;
                 } else {
@@ -85 +85 @@
 
                 // Get field ids for the current group.
-                $sql = $wpdb->prepare("SELECT id, type FROM {$bp->profile->table_name_fields} WHERE group_id = %d AND parent_id = 0 ORDER BY id", $this->id);
-
-                if(!$fields = $wpdb->get_results($sql))                 
-                        return false;
-
+                if ( !$fields = $wpdb->get_results( $wpdb->prepare("SELECT id, type FROM {$bp->profile->table_name_fields} WHERE group_id = %d AND parent_id = 0 ORDER BY id", $this->id ) ) )
+                        return false;
+                
                 return $fields;
         }
@@ -96 +94 @@
                 global $message;
 
-                if ( $this->id == null ) {
+                if ( !$this->id ) {
                         $title = __('Add Group', 'buddypress');
                         $action = "admin.php?page=xprofile_settings&mode=add_group";
@@ -111 +109 @@
                         <?php
                                 if ( $message != '' ) {
-                                        $type = ( $type == 'error' ) ? 'error' : 'updated';
+                                        $type = ( 'error' == $type ) ? 'error' : 'updated';
                         ?>
                                 <div id="message" class="<?php echo $type; ?> fade">
@@ -233 +231 @@
                         return false;
                         
-                $sql = $wpdb->prepare("DELETE FROM {$bp->profile->table_name_fields} WHERE id = %d OR parent_id = %d", $this->id, $this->id );
-
-                if ( $wpdb->query($sql) === false )
+                if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_fields} WHERE id = %d OR parent_id = %d", $this->id, $this->id ) ) )
                         return false;
                 
@@ -252 +248 @@
                         $sql = $wpdb->prepare("INSERT INTO {$bp->profile->table_name_fields} (group_id, parent_id, type, name, description, is_required, is_public, order_by) VALUES (%d, 0, %s, %s, %s, %d, %d, %s)", $this->group_id, $this->type, $this->name, $this->desc, $this->is_required, $this->is_public, $this->order_by);
                 }
-                if ( $wpdb->query($sql) !== false ) {
+                
+                if ( $wpdb->query($sql) ) {
+                        
                         // Only do this if we are editing an existing field
                         if ( $this->id != null ) {
@@ -264 +262 @@
                         // Check to see if this is a field with child options.
                         // We need to add the options to the db, if it is.
-                        if ( $this->type == 'radio' || $this->type == 'selectbox' || $this->type == 'checkbox' || $this->type == 'multiselectbox' ) {
+                        if ( 'radio' == $this->type || 'selectbox' == $this->type || 'checkbox' == $this->type || 'multiselectbox' == $this->type ) {
                                 if ( $this->id ) {
                                         $parent_id = $this->id;
@@ -305 +303 @@
                                         }
                                 } else {
-                                        if ( $this->type == "radio" ) {
+                                        
+                                        if ( 'radio' == $this->type ) {
+                                                
                                                 $options = $_POST['radio_option'];
                                                 $defaults = $_POST['isDefault_radio_option'];
-                                        } else if ( $this->type == "selectbox" ) {
+                                                
+                                        } else if ( 'selectbox' == $this->type ) {
+                                                
                                                 $options = $_POST['selectbox_option'];
                                                 $defaults = $_POST['isDefault_selectbox_option'];
-                                        } else if ( $this->type == "multiselectbox" ) {
+                                                
+                                        } else if ( 'multiselectbox' == $this->type ) {
+                                                
                                                 $options = $_POST['multiselectbox_option'];
                                                 $defaults = $_POST['isDefault_multiselectbox_option'];
-                                        } else if ( $this->type == "checkbox" ) {
+                                                
+                                        } else if ( 'checkbox' == $this->type ) {
+                                                
                                                 $options = $_POST['checkbox_option'];
                                                 $defaults = $_POST['isDefault_checkbox_option'];
+                                                
                                         }
                                         
@@ -332 +339 @@
                                                         }
 
-                                                        if ( $option_value != "" ) { 
+                                                        if ( !empty( $option_valu ) ) { 
+                                                                
                                                                 // don't insert an empty option.
-                                                                $sql = $wpdb->prepare("INSERT INTO {$bp->profile->table_name_fields} (group_id, parent_id, type, name, description, is_required, option_order, is_default_option) VALUES (%d, %d, 'option', %s, '', 0, %d, %d)", $this->group_id, $parent_id, $option_value, $counter, $is_default);
-
-                                                                if ( $wpdb->query($sql) === false ) {
+                                                                if ( !$wpdb->query( $wpdb->prepare("INSERT INTO {$bp->profile->table_name_fields} (group_id, parent_id, type, name, description, is_required, option_order, is_default_option) VALUES (%d, %d, 'option', %s, '', 0, %d, %d)", $this->group_id, $parent_id, $option_value, $counter, $is_default ) ) )
                                                                         return false;
-
-                                                                        // @TODO 
-                                                                        // Need to go back and reverse what has been entered here.
-                                                                }
+                                                                
+                                                                return true;
                                                         }
                                                 
@@ -580 +584 @@
                 global $wpdb, $bp;
                 
-                //This is done here so we don't have problems with sql injection
-                if ( $this->order_by == 'asc' && !$for_editing ) {
+                // This is done here so we don't have problems with sql injection
+                if ( 'asc' == $this->order_by && !$for_editing ) {
                         $sort_sql = 'ORDER BY name ASC';
-                } else if ( $this->order_by == 'desc' && !$for_editing ) {
+                } else if ( 'desc' == $this->order_by && !$for_editing ) {
                         $sort_sql = 'ORDER BY name DESC';
                 } else {
@@ -619 +623 @@
                         $default_name = '';
                         
-                        if ( $type == 'multiselectbox' || $type == 'checkbox' ) {
+                        if ( 'multiselectbox' == $type || 'checkbox' == $type ) {
                                 $default_input = 'checkbox';
                         } else {
@@ -627 +631 @@
                         <div id="<?php echo $type ?>" class="options-box" style="<?php if ( $this->type != $type ) { ?>display: none;<?php } ?> margin-left: 15px;">
                                 <h4><?php _e('Please enter options for this Field:', 'buddypress') ?></h4>
-                                <p>Order By: 
+                                <p><?php _e( 'Order By:', 'buddypress' ) ?>
                                         
                                         <select name="sort_order_<?php echo $type ?>" id="sort_order_<?php echo $type ?>" >
-                                                <option value="default" <?php if ( $this->order_by == 'default' ) {?> selected="selected"<?php } ?> ><?php _e( 'Order Entered', 'buddypress' ) ?></option>
-                                                <option value="asc" <?php if ( $this->order_by == 'asc' ) {?> selected="selected"<?php } ?>><?php _e( 'Name - Ascending', 'buddypress' ) ?></option>
-                                                <option value="desc" <?php if ( $this->order_by == 'desc' ) {?> selected="selected"<?php } ?>><?php _e( 'Name - Descending', 'buddypress' ) ?></option>
+                                                <option value="default" <?php if ( 'default' == $this->order_by ) {?> selected="selected"<?php } ?> ><?php _e( 'Order Entered', 'buddypress' ) ?></option>
+                                                <option value="asc" <?php if ( 'asc' == $this->order_by ) {?> selected="selected"<?php } ?>><?php _e( 'Name - Ascending', 'buddypress' ) ?></option>
+                                                <option value="desc" <?php if ( 'desc' == $this->order_by ) {?> selected="selected"<?php } ?>><?php _e( 'Name - Descending', 'buddypress' ) ?></option>
                                         </select>
         
@@ -642 +646 @@
                                                 $j = $i + 1;
                                                 
-                                                if ( $type == 'multiselectbox' || $type == 'checkbox' )
+                                                if ( 'multiselectbox' == $type || 'checkbox' == $type )
                                                         $default_name = '[' . $j . ']';
                                         ?>
                                                 <p><?php _e('Option', 'buddypress') ?> <?php echo $j ?>: 
                                                    <input type="text" name="<?php echo $type ?>_option[<?php echo $j ?>]" id="<?php echo $type ?>_option<?php echo $j ?>" value="<?php echo $options[$i]->name ?>" />
-                                                   <input type="<?php echo $default_input ?>" name="isDefault_<?php echo $type ?>_option<?php echo $default_name; ?>" <?php if ( $options[$i]->sort_order == 'CHECKED' ) {?> checked="checked"<?php } ?> " /> <?php _e( 'Default Value', 'buddypress' ) ?> 
+                                                   <input type="<?php echo $default_input ?>" name="isDefault_<?php echo $type ?>_option<?php echo $default_name; ?>" <?php if ( 'CHECKED' == $options[$i]->sort_order ) {?> checked="checked"<?php } ?> " /> <?php _e( 'Default Value', 'buddypress' ) ?> 
                                                 <a href="admin.php?page=xprofile_settings&amp;mode=delete_option&amp;option_id=<?php echo $options[$i]->id ?>" class="ajax-option-delete" id="delete-<?php echo $options[$i]->id ?>">[x]</a></p>
                                                 </p>
@@ -655 +659 @@
                                 <?php 
                                 } else { 
-                                        if ( $type == 'multiselectbox' || $type == 'checkbox' )
+                                        if ( 'multiselectbox' == $type || 'checkxbox' == $type )
                                                 $default_name = '[1]';
                                 ?>
@@ -672 +676 @@
                 
         function render_admin_form( $message = '' ) {
-                if ( $this->id == null ) {
+                if ( !$this->id ) {
                         $title = __('Add Field', 'buddypress');
                         $action = "admin.php?page=xprofile_settings&amp;group_id=" . $this->group_id . "&amp;mode=add_field";
@@ -706 +710 @@
                                 </div>
                         
-                                <div id="titlediv">
+                                <div id="titlediv" class="inside">
                                         <h3><label for="description"><?php _e("Field Description", 'buddypress') ?></label></h3>
                                         <div id="titlewrap">
-                                                <textarea name="description" id="description" rows="8" cols="60" style="border: none; width: 99%;"><?php echo $this->desc ?></textarea>
+                                                <textarea name="description" id="description" rows="8" cols="60" style="border: 1px solid #ddd; width: 85%;"><?php echo $this->desc ?></textarea>
                                         </div>
                                 </div>
@@ -910 +914 @@
                 
                 // Validate Form
-                if ( empty( $_POST['title'] ) || empty( $_POST['required'] ) || empty( $_POST['fieldtype'] ) ) {
+                if ( '' == $_POST['title'] || '' == $_POST['required'] || '' == $_POST['fieldtype'] ) {
                         $message = __('Please make sure you fill out all required fields.', 'buddypress');
                         return false;
@@ -1047 +1051 @@
                 global $wpdb, $bp;
                 
-                $sql = $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id = %d", $this->field_id, $this->user_id );
-
-                if ( $wpdb->query($sql) === false )
+                if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_data} WHERE field_id = %d AND user_id = %d", $this->field_id, $this->user_id ) ) )
                         return false;
                 
@@ -1126 +1128 @@
                 global $wpdb, $userdata, $bp;
 
-                $sql = $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_data} WHERE field_id = %d", $field_id );
-
-                if ( $wpdb->query($sql) === false )
+                if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_data} WHERE field_id = %d", $field_id ) ) )
                         return false;
                 

trunk/bp-xprofile/bp-xprofile-filters.php

@@ -20 +20 @@
                 return false;
 
-        if ( $field_type == 'datebox' ) {
+        if ( 'datebox' == $field_type ) {
                 $field_value = bp_format_time( $field_value, true );
         } else {
@@ -31 +31 @@
 
 function xprofile_filter_link_profile_data( $field_value, $field_type, $field_id ) {
-        if ( $field_type == 'datebox' )
+        if ( 'datebox' == $field_type )
                 return $field_value;
         

trunk/bp-xprofile/bp-xprofile-notifications.php

@@ -25 +25 @@
                 bp_core_add_notification( $poster_id, $user_id, 'xprofile', 'new_wire_post' );
 
-                if ( !get_usermeta( $bp->loggedin_user->id, 'notification_profile_wire_post' ) || get_usermeta( $bp->loggedin_user->id, 'notification_profile_wire_post' ) == 'yes' ) {
+                if ( !get_usermeta( $bp->loggedin_user->id, 'notification_profile_wire_post' ) || 'yes' == get_usermeta( $bp->loggedin_user->id, 'notification_profile_wire_post' ) ) {
                         $poster_name = bp_fetch_user_fullname( $poster_id, false );
                         $wire_post = new BP_Wire_Post( $bp->profile->table_name_wire, $wire_post_id, true );

trunk/bp-xprofile/bp-xprofile-signup.php

@@ -112 +112 @@
                         $field = new BP_XProfile_Field($field->id);
                         
-                        if ( $field->type == "datebox" ) {
+                        if ( 'datebox' == $field->type ) {
                                 if ( $_POST['field_' . $field->id . '_day'] != "" && $_POST['field_' . $field->id . '_month'] != "" && $_POST['field_' . $field->id . '_year'] != "") {
                                         $value = strtotime( $_POST['field_' . $field->id . '_day'] . " " . 
@@ -160 +160 @@
         if ( isset($_FILES['file']) ) {
 
-                if ( $_FILES['file']['error'] !== 4 ) {
+                if ( 4 !== $_FILES['file']['error'] ) {
                         if ( !$checked_upload = bp_core_check_avatar_upload($_FILES) ) {
                                 $avatar_error = true;

trunk/bp-xprofile/bp-xprofile-templatetags.php

@@ -68 +68 @@
                 $group = $this->next_group();
 
-                if ( $this->current_group == 0 ) // loop has just started
+                if ( 0 == $this->current_group ) // loop has just started
                         do_action('loop_start');
         }