1.1 --- a/public_html/profiles.php	Wed Mar 16 22:27:44 2011 -0400
     1.2 +++ b/public_html/profiles.php	Wed Feb 01 20:35:07 2012 -0500
     1.3 @@ -138,7 +138,7 @@
     1.4  
     1.5              $sent = COM_mail($to, $subject, $message, $from);
     1.6  
     1.7 -            if ($sent && isset($_POST['cc']) && ($_POST['cc'] == 'on')) {
     1.8 +            if ($sent && $_CONF['mail_cc_enabled'] && isset($_POST['cc']) && ($_POST['cc'] == 'on')) {
     1.9                  $ccmessage = sprintf($LANG08[38], COM_getDisplayName($uid,
    1.10                                              $A['username'], $A['fullname']));
    1.11                  $ccmessage .= "\n------------------------------------------------------------\n\n" . $message;
    1.12 @@ -238,9 +238,13 @@
    1.13              } else {
    1.14                  $mail_template->set_var ('useremail', $_USER['email']);
    1.15              }
    1.16 -            $mail_template->set_var('cc', $cc);
    1.17 -            $mail_template->set_var('lang_cc', $LANG08[36]);
    1.18 -            $mail_template->set_var('lang_cc_description', $LANG08[37]);
    1.19 +            if (!$_CONF['mail_cc_enabled']) {
    1.20 +                $mail_template->set_var('cc_enabled', ' style="display: none"');
    1.21 +            } else {
    1.22 +                $mail_template->set_var('cc', $cc);
    1.23 +                $mail_template->set_var('lang_cc', $LANG08[36]);
    1.24 +                $mail_template->set_var('lang_cc_description', $LANG08[37]);
    1.25 +            }
    1.26              $mail_template->set_var('lang_subject', $LANG08[13]);
    1.27              $mail_template->set_var('subject', $subject);
    1.28              $mail_template->set_var('lang_message', $LANG08[14]);
    1.29 @@ -376,7 +380,7 @@
    1.30  
    1.31      $sent = COM_mail($mailto, $subject, $mailtext, $mailfrom);
    1.32  
    1.33 -    if ($sent && isset($_POST['cc']) && ($_POST['cc'] == 'on')) {
    1.34 +    if ($sent && $_CONF['mail_cc_enabled'] && isset($_POST['cc']) && ($_POST['cc'] == 'on')) {
    1.35          $ccmessage = sprintf($LANG08[38], $to);
    1.36          $ccmessage .= "\n------------------------------------------------------------\n\n" . $mailtext;
    1.37  
    1.38 @@ -469,9 +473,13 @@
    1.39      $mail_template->set_var('toname', $to);
    1.40      $mail_template->set_var('lang_toemailaddress', $LANG08[19]);
    1.41      $mail_template->set_var('toemail', $toemail);
    1.42 -    $mail_template->set_var('cc', $cc);
    1.43 -    $mail_template->set_var('lang_cc', $LANG08[36]);
    1.44 -    $mail_template->set_var('lang_cc_description', $LANG08[37]);
    1.45 +    if (!$_CONF['mail_cc_enabled']) {
    1.46 +        $mail_template->set_var('cc_enabled', ' style="display: none"');
    1.47 +    } else {
    1.48 +        $mail_template->set_var('cc', $cc);
    1.49 +        $mail_template->set_var('lang_cc', $LANG08[36]);
    1.50 +        $mail_template->set_var('lang_cc_description', $LANG08[37]);
    1.51 +    }
    1.52      $mail_template->set_var('lang_shortmessage', $LANG08[27]);
    1.53      $mail_template->set_var('shortmsg', htmlspecialchars($shortmsg));
    1.54      $mail_template->set_var('lang_warning', $LANG08[22]);
    1.55 @@ -524,7 +532,7 @@
    1.56                                      . '/article.php?story=' . $sid));
    1.57          } else {
    1.58              $display .= COM_siteHeader ('menu', $LANG08[17])
    1.59 -                     . mailstoryform ($sid, true)
    1.60 +                     . mailstoryform ($sid, $_CONF['mail_cc_default'])
    1.61                       . COM_siteFooter ();
    1.62          }
    1.63          break;
    1.64 @@ -589,7 +597,7 @@
    1.65                  $subject = htmlspecialchars (trim ($subject), ENT_QUOTES);
    1.66              }
    1.67              $display .= COM_siteHeader ('menu', $LANG04[81])
    1.68 -                     . contactform ($uid, true, $subject)
    1.69 +                     . contactform ($uid, $_CONF['mail_cc_default'], $subject)
    1.70                       . COM_siteFooter ();
    1.71          } else {
    1.72              $display .= COM_refresh ($_CONF['site_url'] . '/index.php');