tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-27 20:06:52 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Code formatting fixes to Email

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73650 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-03-25 21:27:01 +00:00
parent 50ca8ff01a
commit 0085a1ad9d
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
email/Email.php
View File

@ -115,13 +115,13 @@ class Email extends ViewableData {
/** /**
* @param string $bounceHandlerURL * @param string $bounceHandlerURL
*/ */
protected $bounceHandlerURL = null; protected $bounceHandlerURL = null;
/** /**
* @param sring $admin_email_address The default administrator email address. * @param sring $admin_email_address The default administrator email address.
* This will be set in the config on a site-by-site basis * This will be set in the config on a site-by-site basis
*/ */
static $admin_email_address = ''; static $admin_email_address = '';
/** /**
* @param string $send_all_emails_to Email-Address * @param string $send_all_emails_to Email-Address
@ -160,10 +160,11 @@ class Email extends ViewableData {
} }
public function setBounceHandlerURL( $bounceHandlerURL ) { public function setBounceHandlerURL( $bounceHandlerURL ) {
if( $bounceHandlerURL ) if($bounceHandlerURL) {
$this->bounceHandlerURL = $bounceHandlerURL; $this->bounceHandlerURL = $bounceHandlerURL;
else } else {
$this->bounceHandlerURL = $_SERVER['HTTP_HOST'] . Director::baseURL() . 'Email_BounceHandler'; $this->bounceHandlerURL = $_SERVER['HTTP_HOST'] . Director::baseURL() . 'Email_BounceHandler';
}
} }
public function attachFile($filename, $attachedFilename = null, $mimetype = null) { public function attachFile($filename, $attachedFilename = null, $mimetype = null) {
@ -394,18 +395,19 @@ class Email extends ViewableData {
if(self::$send_all_emails_to) { if(self::$send_all_emails_to) {
$subject .= " [addressed to $to"; $subject .= " [addressed to $to";
$to = self::$send_all_emails_to; $to = self::$send_all_emails_to;
if($this->cc) $subject .= ", cc to $this->cc"; if($this->cc) $subject .= ", cc to $this->cc";
if($this->bcc) $subject .= ", bcc to $this->bcc"; if($this->bcc) $subject .= ", bcc to $this->bcc";
$subject .= ']'; $subject .= ']';
} else { } else {
if($this->cc) $headers["Cc"] = $this->cc; if($this->cc) $headers["Cc"] = $this->cc;
if($this->bcc) $headers["Bcc"] = $this->bcc; if($this->bcc) $headers["Bcc"] = $this->bcc;
} }
if(self::$cc_all_emails_to) { if(self::$cc_all_emails_to) {
if(trim($headers['Cc'])) $headers['Cc'] .= ', '; if(trim($headers['Cc'])) $headers['Cc'] .= ', ';
$headers['Cc'] .= self::$cc_all_emails_to; $headers['Cc'] .= self::$cc_all_emails_to;
} }
if(self::$bcc_all_emails_to) { if(self::$bcc_all_emails_to) {
if(trim($headers['Bcc'])) $headers['Bcc'] .= ', '; if(trim($headers['Bcc'])) $headers['Bcc'] .= ', ';
$headers['Bcc'] .= self::$bcc_all_emails_to; $headers['Bcc'] .= self::$bcc_all_emails_to;
@ -431,9 +433,7 @@ class Email extends ViewableData {
$this->parseVariables(); $this->parseVariables();
if( empty( $this->from ) ){ if(empty($this->from)) $this->from = Email::getAdminEmail();
$this->from = Email::getAdminEmail();
}
$this->setBounceHandlerURL( $this->bounceHandlerURL ); $this->setBounceHandlerURL( $this->bounceHandlerURL );
@ -441,9 +441,9 @@ class Email extends ViewableData {
$headers['X-SilverStripeBounceURL'] = $this->bounceHandlerURL; $headers['X-SilverStripeBounceURL'] = $this->bounceHandlerURL;
if( $messageID ) $headers['X-SilverStripeMessageID'] = project() . '.' . $messageID; if($messageID) $headers['X-SilverStripeMessageID'] = project() . '.' . $messageID;
if( project() ) $headers['X-SilverStripeSite'] = project(); if(project()) $headers['X-SilverStripeSite'] = project();
$to = $this->to; $to = $this->to;
$subject = $this->subject; $subject = $this->subject;
@ -490,7 +490,7 @@ class Email extends ViewableData {
* *
* @param string $newEmail * @param string $newEmail
*/ */
public static function setAdminEmail( $newEmail ) { public static function setAdminEmail($newEmail) {
self::$admin_email_address = $newEmail; self::$admin_email_address = $newEmail;
} }
@ -540,7 +540,6 @@ class Email extends ViewableData {
self::$bcc_all_emails_to = $emailAddress; self::$bcc_all_emails_to = $emailAddress;
} }
/** /**
* Checks for RFC822-valid email format. * Checks for RFC822-valid email format.
* *