Changeset 5025

Timestamp:

08/22/2011 07:41:12 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Clean up sign-up notification functions and remove unused $current_site globals.

File:

• trunk/bp-core/bp-core-filters.php (modified) (3 diffs)

trunk/bp-core/bp-core-filters.php

@@ -48 +48 @@
  *
  * @package BuddyPress Core
- * @global $current_site Object containing current site metadata
  * @return noreply@sitedomain email address
  */
@@ -191 +190 @@
 // Notify user of signup success.
 function bp_core_activation_signup_blog_notification( $domain, $path, $title, $user, $user_email, $key, $meta ) {
-    global $current_site;
 
     // Send email with activation link.
     $activate_url = bp_get_activation_page() ."?key=$key";
-    $activate_url = esc_url($activate_url);
-
-    $admin_email = get_site_option( "admin_email" );
+    $activate_url = esc_url( $activate_url );
+
+    $admin_email = get_site_option( 'admin_email' );
 
     if ( empty( $admin_email ) )
         $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
 
-    $from_name = ( '' == get_site_option( "site_name" ) ) ? 'WordPress' : esc_html( 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( __( "Thanks for registering! To complete the activation of your account and blog, please click the following link:\n\n%1$s\n\n\n\nAfter you activate, you can visit your blog here:\n\n%2$s", 'buddypress' ), $activate_url, esc_url("http://{$domain}{$path}" ) );
-    $subject = '[' . $from_name . '] ' . sprintf(__('Activate %s', 'buddypress' ), esc_url('http://' . $domain . $path));
-
-    /* Send the message */
-    $to = apply_filters( 'bp_core_activation_signup_blog_notification_to', $user_email, $domain, $path, $title, $user, $user_email, $key, $meta );
-    $subject = apply_filters( 'bp_core_activation_signup_blog_notification_subject', $subject, $domain, $path, $title, $user, $user_email, $key, $meta );
-    $message = apply_filters( 'bp_core_activation_signup_blog_notification_message', $message, $domain, $path, $title, $user, $user_email, $key, $meta );
+    $from_name       = ( '' == get_site_option( 'site_name' ) ) ? 'WordPress' : esc_html( 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( __( "Thanks for registering! To complete the activation of your account and blog, please click the following link:\n\n%1$s\n\n\n\nAfter you activate, you can visit your blog here:\n\n%2$s", 'buddypress' ), $activate_url, esc_url( "http://{$domain}{$path}" ) );
+    $subject         = '[' . $from_name . '] ' . sprintf(__('Activate %s', 'buddypress' ), esc_url( 'http://' . $domain . $path ) );
+
+    // Send the message
+    $to              = apply_filters( 'bp_core_activation_signup_blog_notification_to',   $user_email, $domain, $path, $title, $user, $user_email, $key, $meta );
+    $subject         = apply_filters( 'bp_core_activation_signup_blog_notification_subject', $subject, $domain, $path, $title, $user, $user_email, $key, $meta );
+    $message         = apply_filters( 'bp_core_activation_signup_blog_notification_message', $message, $domain, $path, $title, $user, $user_email, $key, $meta );
 
     wp_mail( $to, $subject, $message, $message_headers );
@@ -223 +221 @@
 
 function bp_core_activation_signup_user_notification( $user, $user_email, $key, $meta ) {
-    global $current_site;
-
-    $activate_url = bp_get_activation_page() ."?key=$key";
+
+    $activate_url = bp_get_activation_page() . "?key=$key";
     $activate_url = esc_url($activate_url);
-    $admin_email = get_site_option( "admin_email" );
+    $admin_email  = get_site_option( 'admin_email' );
 
     if ( empty( $admin_email ) )
         $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
 
-    /* If this is an admin generated activation, add a param to email the user login details */
+    // If this is an admin generated activation, add a param to email the
+    // user login details
     $email = is_admin() ? '&e=1' : '';
 
-    $from_name = ( '' == get_site_option( "site_name" ) ) ? 'WordPress' : esc_html( 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( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%s\n\n", 'buddypress' ), $activate_url . $email );
-    $subject = '[' . $from_name . '] ' . __( 'Activate Your Account', 'buddypress' );
-
-    /* Send the message */
-    $to = apply_filters( 'bp_core_activation_signup_user_notification_to', $user_email, $user, $user_email, $key, $meta );
+    $from_name       = ( '' == get_site_option( 'site_name' ) ) ? 'WordPress' : esc_html( 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( __( "Thanks for registering! To complete the activation of your account please click the following link:\n\n%s\n\n", 'buddypress' ), $activate_url . $email );
+    $subject         = '[' . $from_name . '] ' . __( 'Activate Your Account', 'buddypress' );
+
+    // Send the message
+    $to      = apply_filters( 'bp_core_activation_signup_user_notification_to',   $user_email, $user, $user_email, $key, $meta );
     $subject = apply_filters( 'bp_core_activation_signup_user_notification_subject', $subject, $user, $user_email, $key, $meta );
     $message = apply_filters( 'bp_core_activation_signup_user_notification_message', $message, $user, $user_email, $key, $meta );