tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Formatting (mostly indentation)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73226 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-03-17 09:12:54 +00:00
parent 331ea15e45
commit 67f4e76cee
1 changed files with 222 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
email/Email.php
View File

@ -493,6 +493,9 @@ class Email extends ViewableData {
self::$admin_email_address = $newEmail; self::$admin_email_address = $newEmail;
} }
/**
* @return string
*/
public static function getAdminEmail() { public static function getAdminEmail() {
return self::$admin_email_address; return self::$admin_email_address;
} }
@ -605,8 +608,7 @@ class Email extends ViewableData {
/** /**
* Implements an email template that can be populated. * Implements an email template that can be populated.
* *
* @deprecated - Please use Email instead!. * @deprecated 2.4 Please use Email instead
* @todo Remove this in 2.4
* @package sapphire * @package sapphire
* @subpackage email * @subpackage email
*/ */
@ -689,8 +691,10 @@ class Email_BounceHandler extends Controller {
// Escape just in case // Escape just in case
$SQL_memberID = Convert::raw2sql($member->ID); $SQL_memberID = Convert::raw2sql($member->ID);
$SQL_newsletterID = Convert::raw2sql($newsletter_id_date_parts[0]); $SQL_newsletterID = Convert::raw2sql($newsletter_id_date_parts[0]);
// Log the bounce // Log the bounce
$oldNewsletterSentRecipient = DataObject::get_one("Newsletter_SentRecipient", "\"MemberID\" = '$SQL_memberID' AND \"ParentID\" = '$SQL_newsletterID' AND \"Email\" = '$SQL_email'"); $oldNewsletterSentRecipient = DataObject::get_one("Newsletter_SentRecipient", "\"MemberID\" = '$SQL_memberID' AND \"ParentID\" = '$SQL_newsletterID' AND \"Email\" = '$SQL_email'");
// Update the Newsletter_SentRecipient record if it exists // Update the Newsletter_SentRecipient record if it exists
if($oldNewsletterSentRecipient) { if($oldNewsletterSentRecipient) {
$oldNewsletterSentRecipient->Result = 'Bounced'; $oldNewsletterSentRecipient->Result = 'Bounced';
@ -710,8 +714,6 @@ class Email_BounceHandler extends Controller {
$member->setBlacklistedEmail(TRUE); $member->setBlacklistedEmail(TRUE);
echo '<p><b>Member: '.$member->FirstName.' '.$member->Surname.' <'.$member->Email.'> was added to the Email Blacklist!</b></p>'; echo '<p><b>Member: '.$member->FirstName.' '.$member->Surname.' <'.$member->Email.'> was added to the Email Blacklist!</b></p>';
} }
} }
if( !$date ) if( !$date )
@ -735,7 +737,6 @@ class Email_BounceHandler extends Controller {
} }
} }
} }
/** /**