From 30a3dd053fd160a5b29eda36972a05b6397b94eb Mon Sep 17 00:00:00 2001
From: Alex Cabal <alex@alexcabal.com>
Date: Sun, 19 Jun 2022 09:52:49 -0500
Subject: [PATCH] Add mailing address to email footers

---
 lib/NewsletterSubscriber.php                  |  4 +-
 templates/EmailFooter.php                     |  6 ++
 templates/EmailFooterText.php                 |  5 ++
 templates/EmailHeader.php                     | 78 +++++++++++--------
 templates/EmailNewsletterConfirmation.php     | 11 ++-
 templates/EmailNewsletterConfirmationText.php | 12 ++-
 6 files changed, 77 insertions(+), 39 deletions(-)
 create mode 100644 templates/EmailFooterText.php

diff --git a/lib/NewsletterSubscriber.php b/lib/NewsletterSubscriber.php
index 203a606e..764c11d9 100644
--- a/lib/NewsletterSubscriber.php
+++ b/lib/NewsletterSubscriber.php
@@ -47,8 +47,8 @@ class NewsletterSubscriber extends PropertiesBase{
 		$em->PostmarkStream = EMAIL_POSTMARK_STREAM_BROADCAST;
 		$em->To = $this->Email;
 		$em->Subject = 'Action required: confirm your newsletter subscription';
-		$em->Body = Template::EmailNewsletterConfirmation(['subscriber' => $this]);
-		$em->TextBody = Template::EmailNewsletterConfirmationText(['subscriber' => $this]);
+		$em->Body = Template::EmailNewsletterConfirmation(['subscriber' => $this, 'isSubscribedToSummary' => $this->IsSubscribedToSummary, 'isSubscribedToNewsletter' => $this->IsSubscribedToNewsletter]);
+		$em->TextBody = Template::EmailNewsletterConfirmationText(['subscriber' => $this, 'isSubscribedToSummary' => $this->IsSubscribedToSummary, 'isSubscribedToNewsletter' => $this->IsSubscribedToNewsletter]);
 		$em->Send();
 	}
 
diff --git a/templates/EmailFooter.php b/templates/EmailFooter.php
index dff5bd2b..47076824 100644
--- a/templates/EmailFooter.php
+++ b/templates/EmailFooter.php
@@ -7,6 +7,12 @@
 				<img src="https://standardebooks.org/images/logo-small.png" alt="The Standard Ebooks logo."/>
 			</a>
 		</p>
+		<address>
+			<p>Standard Ebooks L<sup>3</sup>C</p>
+			<p>1658 N. Milwaukee Ave. Unit 204</p>
+			<p>Chicago, IL 60647</p>
+		</address>
 	</div>
+</div>
 </body>
 </html>
diff --git a/templates/EmailFooterText.php b/templates/EmailFooterText.php
new file mode 100644
index 00000000..b6da76e2
--- /dev/null
+++ b/templates/EmailFooterText.php
@@ -0,0 +1,5 @@
+-------------------
+
+Standard Ebooks L3C
+1658 N. Milwaukee Ave. Unit 204
+Chicago, IL 60647
diff --git a/templates/EmailHeader.php b/templates/EmailHeader.php
index 0118bbce..d09d2481 100644
--- a/templates/EmailHeader.php
+++ b/templates/EmailHeader.php
@@ -10,40 +10,45 @@ $preheader = $preheader ?? null;
 	<style type="text/css">
 		@font-face{
 			font-family: "League Spartan";
-			src: url("https://standardebooks.org/fonts/league-spartan-bold.woff2") format("woff2");
-			font-weight: bold;
 			font-style: normal;
+			font-weight: bold;
+			src: url("https://standardebooks.org/fonts/league-spartan-bold.woff2") format("woff2");
 		}
 
 		body{
+			text-align: center;
+		}
+
+		div.body{
+			text-align: left;
+			background-color: #E9E7E0;
 			border-radius: 1em;
 			font-family: "Georgia", serif;
-			hyphens: auto;
 			font-size: 18px;
+			hyphens: auto;
 			line-height: 1.4;
-			-webkit-font-smoothing: antialiased;
-			-webkit-text-size-adjust: none;
 			color: #222222;
 			margin: auto;
-			max-width: 50em;
+			max-width: 80ch;
 			padding: 2em;
-			background-color: #E9E7E0;
+			-webkit-font-smoothing: antialiased;
+			-webkit-text-size-adjust: none;
 		}
 
 		<? if($preheader){ ?>
 		.preheader{
-			display:none !important;
-			visibility: hidden;
-			mso-hide: all;
-			font-size: 1px;
+			display: none !important;
 			color: #ffffff;
-			line-height: 1px;
+			font-size: 1px;
 			height: 0;
-			width: 0;
+			line-height: 1px;
+			mso-hide: all;
 			opacity: 0;
 			overflow: hidden;
 			position: absolute;
 			top: -9999px;
+			visibility: hidden;
+			width: 0;
 		}
 		<? } ?>
 
@@ -69,15 +74,15 @@ $preheader = $preheader ?? null;
 		h1{
 			border-bottom: 3px double #222;
 			font-size: 2em;
-			padding-bottom: 1em;
+			line-height: 1.3;
+			padding-bottom: .75em;
 			text-transform: uppercase;
-			line-height: 1;
 		}
 
 		h2{
 			font-size: 1.5em;
-			text-decoration: underline double;
 			margin-top: 2em;
+			text-decoration: underline double;
 		}
 
 		a,
@@ -91,15 +96,24 @@ $preheader = $preheader ?? null;
 			color: #4f9d85;
 		}
 
+		address{
+			font-size: .75em;
+			text-transform: none;
+		}
+
+		address p{
+			margin: 0;
+		}
+
 		.intro{
 			text-align: center;
 		}
 
 		.footer{
-			text-align: center;
-			border-top: 3px double #222;
-			padding-top: 1em;
+			border-top: 1px solid #ccc;
 			margin-top: 2em;
+			padding-top: 1em;
+			text-align: center;
 			text-transform: lowercase;
 		}
 
@@ -114,25 +128,23 @@ $preheader = $preheader ?? null;
 		}
 
 		a.button{
-			display: inline-block;
-			border: 1px solid rgba(0, 0, 0, .5);
-			font-style: normal;
-			box-sizing: border-box;
 			background-color: #4f9d85;
+			border: 1px solid rgba(0, 0, 0, .5);
 			border-radius: 5px;
-			padding: 1em 2em;
-			color: #fff;
-			text-decoration: none;
-			font-family: "League Spartan", sans-serif;
-			font-weight: bold;
-			text-shadow: 1px 1px 0 rgba(0, 0, 0, .5);
 			box-shadow: 2px 2px 0 rgba(0, 0, 0, .5), 1px 1px 0px rgba(255,255,255, .5) inset;
-			position: relative;
-			text-transform: lowercase;
+			box-sizing: border-box;
+			color: #fff;
 			cursor: pointer;
-			min-height: calc(1.4em + 2em + 2px);
+			display: inline-block;
+			font-family: "League Spartan", sans-serif;
+			font-style: normal;
+			font-weight: bold;
 			hyphens: none;
+			min-height: calc(1.4em + 2em + 2px);
+			padding: 1em 2em;
 			text-decoration: none;
+			text-shadow: 1px 1px 0 rgba(0, 0, 0, .5);
+			text-transform: lowercase;
 		}
 
 		a.button:hover{
@@ -140,9 +152,11 @@ $preheader = $preheader ?? null;
 		}
 
 		.button-row{
+			margin: 2em auto;
 			text-align: center;
 		}
 	</style>
 </head>
 <body>
+	<div class="body">
 	<? if($preheader){ ?><p class="preheader"><?= Formatter::ToPlainText($preheader) ?><? for($i = 0; $i < 150 - strlen($preheader); $i++){ ?>&zwnj;&nbsp;<? } ?></p><? } ?>
diff --git a/templates/EmailNewsletterConfirmation.php b/templates/EmailNewsletterConfirmation.php
index 33309085..d859586c 100644
--- a/templates/EmailNewsletterConfirmation.php
+++ b/templates/EmailNewsletterConfirmation.php
@@ -1,9 +1,14 @@
 <?= Template::EmailHeader() ?>
 <h1>Confirm your newsletter subscription</h1>
 <p>Thank you for subscribing to the Standard Ebooks newsletter!</p>
-<p>Please use the button below to confirm your newsletter subscription. You won’t receive our newsletters until you confirm your subscription.</p>
+<p>You subscribed to:</p>
+<ul>
+	<? if($IsSubscribedToNewsletter){ ?><li><p>The occasional Standard Ebooks newsletter</p></li><? } ?>
+	<? if($isSubscribedToSummary){ ?><li><p>A monthly summary of new ebook releases</p></li><? } ?>
+</ul>
+<p>Please use the button below to confirm your subscription—you won’t receive email from us until you do.</p>
 <p class="button-row">
-	<a href="<?= $subscriber->Url ?>/confirm" class="button">Yes, subscribe me to the newsletter</a>
+	<a href="<?= $subscriber->Url ?>/confirm" class="button">Yes, confirm my subscription</a>
 </p>
-<p>If you didn’t subscribe to our newsletter, or you’re not sure why you received this email, you can safely delete it and you won’t receive any more email from us.</p>
+<p>If you didn’t subscribe, or you’re not sure why you received this email, you can safely delete it and you won’t receive any more email from us.</p>
 <?= Template::EmailFooter() ?>
diff --git a/templates/EmailNewsletterConfirmationText.php b/templates/EmailNewsletterConfirmationText.php
index 1aa4c28c..3fa56a82 100644
--- a/templates/EmailNewsletterConfirmationText.php
+++ b/templates/EmailNewsletterConfirmationText.php
@@ -2,8 +2,16 @@
 
 Thank you for subscribing to the Standard Ebooks newsletter!
 
-Please use the link below to confirm your newsletter subscription. You won’t receive our newsletters until you confirm your subscription.
+You subscribed to:
+
+<? if($IsSubscribedToNewsletter){ ?>- The occasional Standard Ebooks newsletter
+<? } ?>
+<? if($isSubscribedToSummary){ ?>- A monthly summary of new ebook releases
+<? } ?>
+Please use the link below to confirm your subscription—you won’t receive email from us until you do.
 
 <<?= $subscriber->Url ?>/confirm>
 
-If you didn’t subscribe to our newsletter, or you’re not sure why you received this email, you can safely delete it and you won’t receive any more email from us.
+If you didn’t subscribe, or you’re not sure why you received this email, you can safely delete it and you won’t receive any more email from us.
+
+<?= Template::EmailFooterText() ?>