[geeklog-cvs] geeklog: Backing out Blaine's BCC changes (for later)

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/5ea3e9d5a82e
changeset: 7129:5ea3e9d5a82e
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat Jun 20 16:06:40 2009 +0200
description:
Backing out Blaine's BCC changes (for later)

diffstat:

 public_html/lib-common.php |  16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diffs (71 lines):

diff -r 45aff005f42c -r 5ea3e9d5a82e public_html/lib-common.php
--- a/public_html/lib-common.php	Thu Jun 18 21:25:41 2009 +0100
+++ b/public_html/lib-common.php	Sat Jun 20 16:06:40 2009 +0200
@@ -1360,7 +1360,7 @@
     } else {
         $displayRightBlocks = false;
     }
-
+    
     if ($displayRightBlocks)
     {
         /* Check if an array has been passed that includes the name of a plugin
@@ -1379,7 +1379,7 @@
         } else {
             $rblocks = COM_showBlocks( 'right', $topic );
         }
-
+        
         if( empty( $rblocks ))
         {
             $footer->set_var( 'geeklog_blocks', '');
@@ -3177,11 +3177,10 @@
 * @param    boolean     $html       (optional) true if to be sent as HTML email
 * @param    int         $priority   (optional) add X-Priority header, if > 0
 * @param    string      $cc         (optional) other recipients (name + email)
-* @param    string      $bcc        (optional) Blind Copy recipients
 * @return   boolean                 true if successful,  otherwise false
 *
 */
-function COM_mail( $to, $subject, $message, $from = '', $html = false, $priority = 0, $cc = '', $bcc = '' )
+function COM_mail( $to, $subject, $message, $from = '', $html = false, $priority = 0, $cc = '' )
 {
     global $_CONF;
 
@@ -3194,7 +3193,6 @@
 
     $to = substr( $to, 0, strcspn( $to, "\r\n" ));
     $cc = substr( $cc, 0, strcspn( $cc, "\r\n" ));
-    $bcc = substr( $bcc, 0, strcspn( $bcc, "\r\n" ));
     $from = substr( $from, 0, strcspn( $from, "\r\n" ));
     $subject = substr( $subject, 0, strcspn( $subject, "\r\n" ));
     $subject = COM_emailEscape( $subject );
@@ -3234,10 +3232,6 @@
     {
         $headers['Cc'] = $cc;
     }
-    if( !empty( $bcc ))
-    {
-        $headers['Bcc'] = $bcc;
-    }
     $headers['Date'] = date( 'r' ); // RFC822 formatted date
     if( $method == 'smtp' )
     {
@@ -3574,7 +3568,7 @@
             $A = DB_fetchArray($result);
         }
     }
-
+    
     if( array_key_exists( 'onleft', $A ) )
     {
         if( $A['onleft'] == 1 )
@@ -4496,7 +4490,7 @@
 *
 * Display one of the predefined messages from the $MESSAGE array. If a plugin
 * name is provided, display that plugin's message instead.
-*
+* 
 * @param    int     $msg        ID of message to show
 * @param    string  $plugin     Optional name of plugin to lookup plugin defined message
 * @return   string              HTML block with message