diff --git a/lib/Constants.php b/lib/Constants.php index 9ad6239f..ac3f58a9 100644 --- a/lib/Constants.php +++ b/lib/Constants.php @@ -38,8 +38,9 @@ const CAPTCHA_IMAGE_WIDTH = 230; const NO_REPLY_EMAIL_ADDRESS = 'admin@standardebooks.org'; const ADMIN_EMAIL_ADDRESS = 'admin@standardebooks.org'; const EDITOR_IN_CHIEF_EMAIL_ADDRESS = 'alex@standardebooks.org'; +const EDITOR_IN_CHIEF_NAME = 'Alex Cabal'; define('EMAIL_SMTP_USERNAME', get_cfg_var('se.secrets.postmark.username')); -const EMAIL_SMTP_HOST = 'smtp-broadcasts.postmarkapp.com'; +const EMAIL_SMTP_HOST = 'smtp.postmarkapp.com'; const EMAIL_POSTMARK_STREAM_BROADCAST = 'the-standard-ebooks-newsletter'; const REST = 0; diff --git a/lib/Email.php b/lib/Email.php index 84b41aa8..357e2ede 100644 --- a/lib/Email.php +++ b/lib/Email.php @@ -7,6 +7,7 @@ use function Safe\file_get_contents; class Email{ public $To = ''; + public $ToName = ''; public $From = ''; public $FromName = ''; public $ReplyTo = ''; @@ -43,7 +44,7 @@ class Email{ try{ $phpMailer->SetFrom($this->From, $this->FromName); $phpMailer->AddReplyTo($this->ReplyTo); - $phpMailer->AddAddress($this->To); + $phpMailer->AddAddress($this->To, $this->ToName); $phpMailer->Subject = $this->Subject; $phpMailer->CharSet = 'UTF-8'; if($this->TextBody !== null && $this->TextBody != ''){ diff --git a/lib/Patron.php b/lib/Patron.php index 6cd30bc5..f3f94311 100644 --- a/lib/Patron.php +++ b/lib/Patron.php @@ -33,7 +33,9 @@ class Patron extends PropertiesBase{ if($this->User !== null){ $em = new Email(); $em->To = $this->User->Email; + $em->ToName = $this->User->Name; $em->From = EDITOR_IN_CHIEF_EMAIL_ADDRESS; + $em->FromName = EDITOR_IN_CHIEF_NAME; $em->Subject = 'Thank you for supporting Standard Ebooks!'; $em->Body = Template::EmailPatronsCircleWelcome(['isAnonymous' => $this->IsAnonymous, 'isReturning' => $isReturning]); $em->TextBody = Template::EmailPatronsCircleWelcomeText(['isAnonymous' => $this->IsAnonymous, 'isReturning' => $isReturning]); diff --git a/lib/User.php b/lib/User.php index ff17ed70..b3524953 100644 --- a/lib/User.php +++ b/lib/User.php @@ -4,27 +4,12 @@ use Safe\DateTime; class User extends PropertiesBase{ public $UserId; - public $FirstName; - public $LastName; - protected $Name = null; + public $Name; public $Email; public $Created; public $Uuid; - // ******* - // GETTERS - // ******* - - protected function GetName(): string{ - if($this->Name === null){ - $this->Name = $this->FirstName . ' ' . $this->LastName; - } - - return $this->Name; - } - - // ******* // METHODS // ******* diff --git a/scripts/process-pending-payments b/scripts/process-pending-payments index d453b6cc..377acd4b 100755 --- a/scripts/process-pending-payments +++ b/scripts/process-pending-payments @@ -195,7 +195,9 @@ try{ $log->Write('Sending thank you email to non-patron donor.'); $em = new Email(); $em->To = $payment->User->Email; + $em->ToName = $payment->User->Name; $em->From = EDITOR_IN_CHIEF_EMAIL_ADDRESS; + $em->FromName = EDITOR_IN_CHIEF_NAME; $em->Subject = 'Thank you for supporting Standard Ebooks!'; $em->Body = Template::EmailDonationThankYou(); $em->TextBody = Template::EmailDonationThankYouText(); @@ -214,9 +216,7 @@ catch(Exception $ex){ $exceptionString = vds($ex); $log->Write('Error: Uncaught exception: ' . $exceptionString); - $em = new Email(); - $em->To = ADMIN_EMAIL_ADDRESS; - $em->From = NO_REPLY_EMAIL_ADDRESS; + $em = new Email(true); $em->Subject = 'Donation processing failed'; $em->Body = Template::EmailDonationProcessingFailed(['exception' => preg_replace('/^/m', "\t", $exceptionString)]); $em->TextBody = Template::EmailDonationProcessingFailedText(['exception' => preg_replace('/^/m', "\t", $exceptionString)]); diff --git a/scripts/update-patrons-circle b/scripts/update-patrons-circle index 676750d6..6ccafdd4 100755 --- a/scripts/update-patrons-circle +++ b/scripts/update-patrons-circle @@ -6,19 +6,74 @@ require_once('/standardebooks.org/web/lib/Core.php'); // who aren't in that list. // We give a 15 day grace period to Patrons Circle members because sometimes FA can be delayed in charging. -Db::Query(' - update Patrons - set Ended = utc_timestamp() - where UserId not in +$now = new DateTime(); +$lastYear = new DateTime('-1 year'); + +$expiredPatrons = Db::Query(' + select * from Patrons + where + Ended is null and + UserId not in ( select distinct UserId from Payments where UserId is not null and ( - (IsRecurring = 1 and Amount >= 10 and Created > utc_timestamp() - interval 45 day) + (IsRecurring = 1 and Amount >= 10 and Created > ? - interval 45 day) or - (IsRecurring = 0 and Amount >= 100 and Created > utc_timestamp() - interval 1 year) + (IsRecurring = 0 and Amount >= 100 and Created > ? - interval 1 year) ) ) -'); +', [$now, $now], 'Patron'); + +if(sizeof($expiredPatrons) > 0){ + $ebooksThisYear = 0; + + // We can't use the Library class to get ebooks because this script is typically run via cron or CLI, + // which doesn't have access PHP-FMP's APCu cache. + foreach(explode("\n", trim(shell_exec('find ' . EBOOKS_DIST_PATH . ' -name "content.opf"') ?? '')) as $filename){ + $metadata = file_get_contents($filename); + + // Don't create a new Ebook object because that's very slow. Just do a regex match for speed. + preg_match_all('/(.+?)<\/dc:date>/iu', $metadata, $matches); + + if(sizeof($matches) > 0){ + $created = new DateTime($matches[1][0]); + if($created >= $lastYear){ + $ebooksThisYear++; + } + } + } + + foreach($expiredPatrons as $patron){ + Db::Query('update Patrons set Ended = ? where UserId = ?', [$now, $patron->UserId]); + + // Email the patron to notify them their term has ended + // Is the patron a recurring subscriber? + $lastPayment = Db::Query('select * from Payments where UserId = ? order by Created desc limit 1;', [$patron->UserId], 'Payment'); + + if(sizeof($lastPayment) > 0 && $patron->User->Email !== null){ + $em = new Email(); + $em->From = EDITOR_IN_CHIEF_EMAIL_ADDRESS; + $em->FromName = EDITOR_IN_CHIEF_NAME; + $em->To = $patron->User->Email; + $em->ToName = $patron->Name; + $em->Subject = 'Will you continue supporting beautiful digital literature?'; + + if($lastPayment[0]->IsRecurring){ + // Email recurring donors who have lapsed + $em->Body = Template::EmailPatronsCircleRecurringCompleted(); + $em->TextBody = Template::EmailPatronsCircleRecurringCompletedText(); + } + else{ + // Email one time donors who have expired after one year + $em->Body = Template::EmailPatronsCircleCompleted(['ebooksThisYear' => $ebooksThisYear]); + $em->TextBody = Template::EmailPatronsCircleCompletedText(['ebooksThisYear' => $ebooksThisYear]); + } + + $em->Send(); + } + } +} + ?> diff --git a/templates/EmailFooter.php b/templates/EmailFooter.php index 87790b68..23fc5188 100644 --- a/templates/EmailFooter.php +++ b/templates/EmailFooter.php @@ -1,9 +1,9 @@

- Donate • Get involved • Ebook feeds + Donate • Get involved • Ebook feeds

- + The Standard Ebooks logo.

diff --git a/templates/EmailHeader.php b/templates/EmailHeader.php index d09d2481..0364bafd 100644 --- a/templates/EmailHeader.php +++ b/templates/EmailHeader.php @@ -1,5 +1,6 @@ @@ -22,6 +23,7 @@ $preheader = $preheader ?? null; div.body{ text-align: left; background-color: #E9E7E0; + border: 1px solid #AAA8A3; border-radius: 1em; font-family: "Georgia", serif; font-size: 18px; @@ -29,12 +31,22 @@ $preheader = $preheader ?? null; line-height: 1.4; color: #222222; margin: auto; - max-width: 80ch; + max-width: 60ch; padding: 2em; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; } + + div.body.letterhead{ + background-image: url("https://standardebooks.org/images/logo-email.png"); + background-position: top 2em right 2em; + background-repeat: no-repeat; + background-size: 210px 49px; + padding-top: 5em; + } + + .preheader{ display: none !important; @@ -75,6 +87,7 @@ $preheader = $preheader ?? null; border-bottom: 3px double #222; font-size: 2em; line-height: 1.3; + margin-top: .25em; padding-bottom: .75em; text-transform: uppercase; } @@ -112,14 +125,28 @@ $preheader = $preheader ?? null; .footer{ border-top: 1px solid #ccc; margin-top: 2em; - padding-top: 1em; + padding-top: 2em; text-align: center; text-transform: lowercase; } + .footer p{ + margin: 0; + } + .footer img{ margin-top: 1em; - max-width: 110px; + max-width: 55px; + } + + footer{ + margin-right: 4em; + margin-top: 2em; + text-align: right; + } + + footer p{ + margin: 0; } a.button:link, @@ -155,8 +182,12 @@ $preheader = $preheader ?? null; margin: 2em auto; text-align: center; } + + .letterhead{ + text-align: right; + } -
+

‌ 

diff --git a/templates/EmailPatronsCircleCompleted.php b/templates/EmailPatronsCircleCompleted.php new file mode 100644 index 00000000..28b2db3f --- /dev/null +++ b/templates/EmailPatronsCircleCompleted.php @@ -0,0 +1,16 @@ + true]) ?> +

Hello,

+

Last year, your generous donation to Standard Ebooks made it possible for us to continue producing beautiful ebook editions for free distribution. It also allowed me to add you to our Patrons Circle, a group of donors who are honored on our masthead, and who have a direct voice in the future of our ebook catalog, for one year.

+

Now that a year has passed, will you renew your membership to our Patrons Circle?

+

0){ ?>In the year since you joined our Patrons Circle, our volunteers produced new free ebooks. We need the financial support of literature lovers like you in order to keep up that pace. We need the financial support of literature lovers like you in order to keep producing free ebooks. Your membership in our Patrons Circle is what makes Standard Ebooks possible.

+

We can’t do it without you. Will you join us for another year of beautiful digital literature?

+

+ Renew your Patrons Circle membership +

+

I hope to see you back!

+
+

+

Alex Cabal

+

S.E. Editor-in-Chief

+
+ diff --git a/templates/EmailPatronsCircleCompletedText.php b/templates/EmailPatronsCircleCompletedText.php new file mode 100644 index 00000000..573cff18 --- /dev/null +++ b/templates/EmailPatronsCircleCompletedText.php @@ -0,0 +1,18 @@ +Hello, + +Last year, your generous donation to Standard Ebooks made it possible for us to continue producing beautiful ebook editions for free distribution. It also allowed me to add you to our Patrons Circle, a group of donors who are honored on our masthead, and who have a direct voice in the future of our ebook catalog, for one year. + +Now that a year has passed, will you renew your membership to our Patrons Circle? + + 0){ ?>In the year since you joined our Patrons Circle, our volunteers produced new free ebooks. We need the financial support of literature lovers like you in order to keep up that pace. We need the financial support of literature lovers like you in order to keep producing free ebooks. *Your membership in our Patrons Circle is what makes Standard Ebooks possible.* + +**We can’t do it without you.** Will you join us for another year of beautiful digital literature? + +Renew your Patrons Circle membership here: </donate#patrons-circle> + +I hope to see you back! + + +Alex Cabal + +S.E. Editor-in-Chief diff --git a/templates/EmailPatronsCircleRecurringCompleted.php b/templates/EmailPatronsCircleRecurringCompleted.php new file mode 100644 index 00000000..b8ecda44 --- /dev/null +++ b/templates/EmailPatronsCircleRecurringCompleted.php @@ -0,0 +1,16 @@ + true]) ?> +

Hello,

+

I couldn’t help but notice that your monthly donation to Standard Ebooks has recently ended. Your generous donation allowed me to add you to our Patrons Circle, a group of donors who are honored on our masthead, and who have a direct voice in the future of our ebook catalog.

+

Oftentimes credit cards will expire, or recurring charges will get accidentally canceled for any number of nebulous administrative reasons. If you didn’t mean to cancel your recurring donation—and thus your Patrons Circle membership—now’s a great time to renew it.

+

We need the financial support of literature lovers like you in order to keep producing free ebooks. Your membership in our Patrons Circle is what makes Standard Ebooks possible.

+

We can’t do it without you. Will you rejoin us in our journey of producing free beautiful digital literature?

+

+ Renew your Patrons Circle membership +

+

I hope to see you back!

+
+

+

Alex Cabal

+

S.E. Editor-in-Chief

+
+ diff --git a/templates/EmailPatronsCircleRecurringCompletedText.php b/templates/EmailPatronsCircleRecurringCompletedText.php new file mode 100644 index 00000000..9ac2bae0 --- /dev/null +++ b/templates/EmailPatronsCircleRecurringCompletedText.php @@ -0,0 +1,18 @@ +Hello, + +I couldn’t help but notice that your monthly donation to Standard Ebooks has recently ended. Your generous donation allowed me to add you to our Patrons Circle, a group of donors who are honored on our masthead, and who have a direct voice in the future of our ebook catalog. + +Oftentimes credit cards will expire, or recurring charges will get accidentally canceled for any number of nebulous administrative reasons. If you didn’t mean to cancel your recurring donation—and thus your Patrons Circle membership—now’s a great time to renew it. + +We need the financial support of literature lovers like you in order to keep producing free ebooks. *Your membership in our Patrons Circle is what makes Standard Ebooks possible.* + +**We can’t do it without you.** Will you rejoin us in our journey of producing free beautiful digital literature? + +Renew your Patrons Circle membership here: </donate#patrons-circle> + +I hope to see you back! + + +Alex Cabal + +S.E. Editor-in-Chief diff --git a/templates/EmailPatronsCircleWelcome.php b/templates/EmailPatronsCircleWelcome.php index e159faf3..3dd08789 100644 --- a/templates/EmailPatronsCircleWelcome.php +++ b/templates/EmailPatronsCircleWelcome.php @@ -5,15 +5,15 @@

Hello,

-

I wanted to thank you personally for your recent donation to Standard Ebooks. Your donation will go towards continuing our mission of producing and distributing high-quality ebooks that are free of cost and free of copyright restrictions. Donations like yours help ensure that the world's literature is available in beautiful editions made for the digital age.

+

I wanted to thank you personally for your recent donation to Standard Ebooks. Your donation will go towards continuing our mission of producing and distributing high-quality ebooks that are free of cost and free of copyright restrictions. Donations like yours help ensure that the world’s literature is available in beautiful editions made for the digital age.

-

I'm pleased to be able to welcome you back toinclude you in our Patrons Circle. Since you indicated you want your donation to remain anonymous, I haven't listed your name on our masthead. If you do prefer to have your name listed, just let me know.

+

I’m pleased to be able to welcome you back toinclude you in our Patrons Circle. Since you indicated you want your donation to remain anonymous, I haven’t listed your name on our masthead. If you do prefer to have your name listed, just let me know.

-

I'm pleased to be able to welcome you back toinclude you in our Patrons Circle, with your name listed on our masthead for the duration of your donation. If you'd like to use a different name than the one you entered on our donation form, just let me know.

+

I’m pleased to be able to welcome you back toinclude you in our Patrons Circle, with your name listed on our masthead for the duration of your donation. If you’d like to use a different name than the one you entered on our donation form, just let me know.

As a Patron, once per quarter you may suggest a book for inclusion in our Wanted Ebooks list. Before submitting a suggestion, please review our collections policy; then you can contact me directly at with your selection.

If I may ask, how did you hear about Standard Ebooks? Having an idea of where our readers and supporters find out about us is extremely helpful.

-

As always, pleasePlease don't hesitate to contact me if you have questions or suggestions. Thanks again for your donation, and for supporting the literate arts!

+

As always, pleasePlease don’t hesitate to contact me if you have questions or suggestions. Thanks again for your donation, and for supporting the literate arts!