Changeset 9392

Timestamp:

01/21/2015 07:42:11 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Add brackets and whitespace in bp-core-moderation.php, and port recent updates from bbPress.

File:

• trunk/src/bp-core/bp-core-moderation.php (modified) (10 diffs)

trunk/src/bp-core/bp-core-moderation.php

@@ -32 +32 @@
 
     // Option disabled. No flood checks.
-    if ( !$throttle_time = bp_get_option( '_bp_throttle_time' ) )
-        return true;
+    if ( !$throttle_time = bp_get_option( '_bp_throttle_time' ) ) {
+        return true;
+    }
 
     // Bail if no user ID passed
-    if ( empty( $user_id ) )
+    if ( empty( $user_id ) ) {
         return false;
+    }
 
     $last_posted = get_user_meta( $user_id, '_bp_last_posted', true );
-    if ( isset( $last_posted ) && ( time() < ( $last_posted + $throttle_time ) ) && !current_user_can( 'throttle' ) )
+    if ( isset( $last_posted ) && ( time() < ( $last_posted + $throttle_time ) ) && !current_user_can( 'throttle' ) ) {
         return false;
+    }
 
     return true;
@@ -63 +66 @@
 
     // Bail if super admin is author
-    if ( is_super_admin( $user_id ) )
-        return true;
+    if ( is_super_admin( $user_id ) ) {
+        return true;
+    }
 
     // Define local variable(s)
@@ -70 +74 @@
     $match_out = '';
 
-    /** Blacklist *************************************************************/
-
-    // Get the moderation keys
-    $blacklist = trim( get_option( 'moderation_keys' ) );
-
-    // Bail if blacklist is empty
-    if ( empty( $blacklist ) )
-        return true;
-
     /** User Data *************************************************************/
 
-    if ( !empty( $user_id ) ) {
+    if ( ! empty( $user_id ) ) {
 
         // Get author data
@@ -87 +82 @@
 
         // If data exists, map it
-        if ( !empty( $user ) ) {
+        if ( ! empty( $user ) ) {
             $post['author'] = $user->display_name;
             $post['email']  = $user->user_email;
@@ -105 +100 @@
 
     $max_links = get_option( 'comment_max_links' );
-    if ( !empty( $max_links ) ) {
+    if ( ! empty( $max_links ) ) {
 
         // How many links?
@@ -117 +112 @@
             return false;
         }
+    }
+
+    /** Blacklist *************************************************************/
+
+    // Get the moderation keys
+    $blacklist = trim( get_option( 'moderation_keys' ) );
+
+    // Bail if blacklist is empty
+    if ( empty( $blacklist ) ) {
+        return true;
     }
 
@@ -171 +176 @@
 
     // Bail if super admin is author
-    if ( is_super_admin( $user_id ) )
-        return true;
+    if ( is_super_admin( $user_id ) ) {
+        return true;
+    }
 
     // Define local variable
     $post = array();
 
-    /** Blacklist *************************************************************/
-
-    // Get the moderation keys
-    $blacklist = trim( get_option( 'blacklist_keys' ) );
-
-    // Bail if blacklist is empty
-    if ( empty( $blacklist ) )
-        return true;
-
     /** User Data *************************************************************/
 
     // Map current user data
-    if ( !empty( $user_id ) ) {
+    if ( ! empty( $user_id ) ) {
 
         // Get author data
@@ -195 +192 @@
 
         // If data exists, map it
-        if ( !empty( $user ) ) {
+        if ( ! empty( $user ) ) {
             $post['author'] = $user->display_name;
             $post['email']  = $user->user_email;
@@ -210 +207 @@
     $post['content'] = $content;
 
+    /** Blacklist *************************************************************/
+
+    // Get the moderation keys
+    $blacklist = trim( get_option( 'blacklist_keys' ) );
+
+    // Bail if blacklist is empty
+    if ( empty( $blacklist ) ) {
+        return true;
+    }
+
     /** Words *****************************************************************/
 
@@ -267 +274 @@
 
     // Sanity check the user agent
-    if ( !empty( $_SERVER['HTTP_USER_AGENT'] ) )
+    if ( ! empty( $_SERVER['HTTP_USER_AGENT'] ) ) {
         $retval = substr( $_SERVER['HTTP_USER_AGENT'], 0, 254 );
-    else
+    } else {
         $retval = '';
+    }
 
     return apply_filters( 'bp_core_current_user_ua', $retval );