Update to phpmailer 5.2.1 effectively fixing a bug where CC would not…

… send when using php mail() method

inc/app/sitellite/boxes/util/contact/index.php

@@ -99,7 +99,7 @@ function onSubmit ($vals) {
 			$this->parameters['email'],
 			'[' . site_domain () . '] ' . intl_get ('Contact Form'),
 			template_simple ('util_contact_email.spt', $vals),
-			'From: ' . $vals['name'] . ' <' . $vals['from'] . '>', //noreply@' . preg_replace ('/^www\./i', '', site_domain ())
+			'From: ' . $vals['from'], //noreply@' . preg_replace ('/^www\./i', '', site_domain ())
             array ("Is_HTML" => true)
 		)) {
 			page_title (intl_get ('An Error Occurred'));

inc/app/sitellite/boxes/util/custom/index.php

@@ -261,17 +261,22 @@ function onSubmit ($vals) {
 		}
 
 		if ($this->parameters['cc'] == 'yes' || $vals['cc'] == 'yes') {
-			$cc = "\r\nCC: " . $vals['email_address'];
+            $cc = $vals['email_address'];
 		} else {
 			$cc = '';
 		}
 
-		if (! @mail (
+        if (! site_mail (
 			$this->parameters['email'],
 			'[' . site_domain () . '] ' . $this->parameters['title'],
 			template_simple ('util_custom_email.spt', $vals),
-			'From: ' . $vals['first_name'] . ' ' . $vals['last_name'] . ' <' . $vals['email_address'] . '>' . $cc
-		)) {
+            null,
+            array (
+                "CC" => $cc,
+                "from_name" => $vals['first_name']. ' ' . $vals['last_name'],
+                "from_email" => $vals['email_address']
+            )
+        )) {
 			page_title (intl_get ('An Error Occurred'));
 			echo '<p>' . intl_get ('Our apologies, your form failed to be submitted.  Please try again later.') . '</p>';
 			return;

inc/app/sitellite/forms/send/index.php

@@ -81,7 +81,7 @@ function onSubmit ($vals) {
 				$email,
 				$vals['subject'],
 				$vals['message'],
-				'From: ' . $vals['from_name'] . ' <' . $vals['from_email'] . ">\r\n",
+				'From: ' . $vals['from_email'],
                 array ("Is_HTML" => true)
 			);
 		}
@@ -91,7 +91,7 @@ function onSubmit ($vals) {
 			$vals['from_email'],
 			$vals['subject'],
 			$vals['message'],
-			'From: ' . $vals['from_name'] . ' <' . $vals['from_email'] . ">\r\n",
+			'From: ' . $vals['from_email'],
             array ("Is_HTML" => true)
 		);
 //END: SEMIAS.

saf/lib/Ext/phpmailer/README

@@ -1,7 +1,130 @@
+/*******************************************************************
+*     http://code.google.com/a/apache-extras.org/p/phpmailer/      *
+********************************************************************/
+
 PHPMailer
 Full Featured Email Transfer Class for PHP
 ==========================================
 
+Version 5.2.1 (January 16, 2012)
+
+Patch release (see changelog.txt).
+
+Version 5.2.0 (July 19, 2011)
+
+With the release of this version, PHPMailer has moved to Apache
+Extras:
+   http://code.google.com/a/apache-extras.org/p/phpmailer/
+
+Version 5.0.0 (April 02, 2009)
+
+With the release of this version, we are initiating a new version numbering
+system to differentiate from the PHP4 version of PHPMailer.
+
+Most notable in this release is fully object oriented code.
+
+We now have available the PHPDocumentor (phpdocs) documentation. This is
+separate from the regular download to keep file sizes down. Please see the
+download area of http://phpmailer.codeworxtech.com.
+
+We also have created a new test script (see /test_script) that you can use
+right out of the box. Copy the /test_script folder directly to your server (in
+the same structure ... with class.phpmailer.php and class.smtp.php in the
+folder above it. Then launch the test script with:
+http://www.yourdomain.com/phpmailer/test_script/index.php
+from this one script, you can test your server settings for mail(), sendmail (or
+qmail), and SMTP. This will email you a sample email (using contents.html for
+the email body) and two attachments. One of the attachments is used as an inline
+image to demonstrate how PHPMailer will automatically detect if attachments are
+the same source as inline graphics and only include one version. Once you click
+the Submit button, the results will be displayed including any SMTP debug
+information and send status. We will also display a version of the script that
+you can cut and paste to include in your projects. Enjoy!
+
+Version 2.3 (November 08, 2008)
+
+We have removed the /phpdoc from the downloads. All documentation is now on
+the http://phpmailer.codeworxtech.com website.
+
+The phpunit.php has been updated to support PHP5.
+
+For all other changes and notes, please see the changelog.
+
+Donations are accepted at PayPal with our id "paypal@worxteam.com".
+
+Version 2.2 (July 15 2008)
+
+- see the changelog.
+
+Version 2.1 (June 04 2008)
+
+With this release, we are announcing that the development of PHPMailer for PHP5
+will be our focus from this date on. We have implemented all the enhancements
+and fixes from the latest release of PHPMailer for PHP4.
+
+Far more important, though, is that this release of PHPMailer (v2.1) is
+fully tested with E_STRICT error checking enabled.
+
+** NOTE: WE HAVE A NEW LANGUAGE VARIABLE FOR DIGITALLY SIGNED S/MIME EMAILS.
+   IF YOU CAN HELP WITH LANGUAGES OTHER THAN ENGLISH AND SPANISH, IT WOULD BE
+   APPRECIATED.
+
+We have now added S/MIME functionality (ability to digitally sign emails).
+BIG THANKS TO "sergiocambra" for posting this patch back in November 2007.
+The "Signed Emails" functionality adds the Sign method to pass the private key
+filename and the password to read it, and then email will be sent with
+content-type multipart/signed and with the digital signature attached.
+
+A quick note on E_STRICT:
+
+- In about half the test environments the development version was subjected
+  to, an error was thrown for the date() functions (used at line 1565 and 1569).
+  This is NOT a PHPMailer error, it is the result of an incorrectly configured
+  PHP5 installation. The fix is to modify your 'php.ini' file and include the
+  date.timezone = America/New York
+  directive, (for your own server timezone)
+- If you do get this error, and are unable to access your php.ini file, there is
+  a workaround. In your PHP script, add
+  date_default_timezone_set('America/Toronto');
+
+  * do NOT try to use
+  $myVar = date_default_timezone_get();
+  as a test, it will throw an error.
+
+We have also included more example files to show the use of "sendmail", "mail()",
+"smtp", and "gmail".
+
+We are also looking for more programmers to join the volunteer development team.
+If you have an interest in this, please let us know.
+
+Enjoy!
+
+
+Version 2.1.0beta1 & beta2
+
+please note, this is BETA software
+** DO NOT USE THIS IN PRODUCTION OR LIVE PROJECTS
+INTENDED STRICTLY FOR TESTING
+
+** NOTE:
+
+As of November 2007, PHPMailer has a new project team headed by industry
+veteran Andy Prevost (codeworxtech). The first release in more than two
+years will focus on fixes, adding ease-of-use enhancements, provide
+basic compatibility with PHP4 and PHP5 using PHP5 backwards compatibility
+features. A new release is planned before year-end 2007 that will provide
+full compatiblity with PHP4 and PHP5, as well as more bug fixes.
+
+We are looking for project developers to assist in restoring PHPMailer to
+its leadership position. Our goals are to simplify use of PHPMailer, provide
+good documentation and examples, and retain backward compatibility to level
+1.7.3 standards.
+
+If you are interested in helping out, visit http://sourceforge.net/projects/phpmailer
+and indicate your interest.
+
+**
+
 http://phpmailer.sourceforge.net/
 
 This software is licenced under the LGPL.  Please read LICENSE for information on the
@@ -28,7 +151,7 @@ easy to use classes: AspEmail(tm) and AspMail.  Both of these
 programs are COM components only available on Windows.  They are also a
 little pricey for smaller projects.
 
-Since I do Linux development I�ve missed these tools for my PHP coding.
+Since I do Linux development I�ve missed these tools for my PHP coding.
 So I built a version myself that implements the same methods (object
 calls) that the Windows-based components do. It is open source and the
 LGPL license allows you to place the class in your proprietary PHP
@@ -39,18 +162,18 @@ Installation:
 
 Copy class.phpmailer.php into your php.ini include_path. If you are
 using the SMTP mailer then place class.smtp.php in your path as well.
-In the language directory you will find several files like 
-phpmailer.lang-en.php.  If you look right before the .php extension 
-that there are two letters.  These represent the language type of the 
-translation file.  For instance "en" is the English file and "br" is 
-the Portuguese file.  Chose the file that best fits with your language 
-and place it in the PHP include path.  If your language is English 
-then you have nothing more to do.  If it is a different language then 
-you must point PHPMailer to the correct translation.  To do this, call 
+In the language directory you will find several files like
+phpmailer.lang-en.php.  If you look right before the .php extension
+that there are two letters.  These represent the language type of the
+translation file.  For instance "en" is the English file and "br" is
+the Portuguese file.  Chose the file that best fits with your language
+and place it in the PHP include path.  If your language is English
+then you have nothing more to do.  If it is a different language then
+you must point PHPMailer to the correct translation.  To do this, call
 the PHPMailer SetLanguage method like so:
 
 // To load the Portuguese version
-$mail->SetLanguage("br", "/optional/path/to/language/directory");
+$mail->SetLanguage("br", "/optional/path/to/language/directory/");
 
 That's it.  You should now be ready to use PHPMailer!
 
@@ -64,9 +187,9 @@ $mail = new PHPMailer();
 
 $mail->IsSMTP();                                      // set mailer to use SMTP
 $mail->Host = "smtp1.example.com;smtp2.example.com";  // specify main and backup server
-$mail->SMTPAuth = true     // turn on SMTP authentication
-$mail->Username = "jswan"  // SMTP username
-$mail->Password = "secret" // SMTP password
+$mail->SMTPAuth = true;     // turn on SMTP authentication
+$mail->Username = "jswan";  // SMTP username
+$mail->Password = "secret"; // SMTP password
 
 $mail->From = "from@example.com";
 $mail->FromName = "Mailer";
@@ -99,4 +222,4 @@ See ChangeLog.txt
 
 Download: http://sourceforge.net/project/showfiles.php?group_id=26031
 
-Brent R. Matzelle
+Andy Prevost