From f1710738be91d6bc0040e2c2698a23ad5cb058ba Mon Sep 17 00:00:00 2001
From: "Adam T. Carpenter" <atc@53hor.net>
Date: Mon, 30 Oct 2023 14:13:16 -0400
Subject: fix: show email instructions without form submit

---
 tutors/email/index.php | 42 ++++++++++++------------------------------
 1 file changed, 12 insertions(+), 30 deletions(-)

diff --git a/tutors/email/index.php b/tutors/email/index.php
index 1a100b3..08f971c 100644
--- a/tutors/email/index.php
+++ b/tutors/email/index.php
@@ -70,40 +70,21 @@
 
 			// close queue
 			fclose($logins_queue);
+		}
 		?>
 			<h2 id="submit">Configuring your mail client</h2>
-
-			Thank you! Now we're setting up your mailbox. Once it's ready you may begin configuring your mail client based on the method you chose above. If you're unable to complete the below steps due to authentication issues, please wait 24 hours and try again. If you have questions or difficulty, see "Getting help" below.
-
-			<?php
-			if (empty($_POST['forward'])) {
-			?>
-				<h3>Standalone mail</h3>
-
-				<p>
-					Instructions for configuring a mail client vary somewhat based on the application. Regardless of the client you choose, the "Connection details" below will be the same. Save them for future use, or in case your <em>@carpentertutoring.com</em> address isn't ready yet.
-				</p>
-
 				<p>
-				<ul>
-					<li><a href="https://support.apple.com/en-us/HT201320">iOS Mail app</a></li>
-					<li><a href="https://support.microsoft.com/en-us/office/set-up-email-in-the-mail-app-7ff79e8b-439b-4b47-8ff9-3f9a33166c60">Mail app for Windows 10 or Windows 11</a></li>
-					<li><a href="https://support.mozilla.org/en-US/kb/manual-account-configuration">Mozilla Thunderbird</a></li>
-				</ul>
+				You may choose to use a third-party mail app to check your mail, forward your mail to a GMail address, or use another third-party webmail client. Follow the instructions below for the option you chose when you created your password. The connection settings remain the same either way.
 				</p>
 
 				<h3>Connection details</h2>
-					<p>
-						Note that if you already have an email address which we've communicated to you, use that instead of the one provided below as your username.
-					</p>
-
 					<pre>
 SMTP server: mail.53hor.net
 Connection security: STARTTLS
 Authentication method: normal password
 SMTP port: 587
 SMTP password: (use the password you just submitted)
-SMTP username: <?php printf('%s', $email) ?>
+SMTP username: (full carpenter tutoring email address)
 
 
 IMAP server: mail.53hor.net
@@ -111,11 +92,8 @@ Connection security: STARTTLS
 Authentication method: normal password
 IMAP port: 143
 IMAP password: (use the password you just submitted)
-IMAP username: <?php printf('%s', $email) ?>
+IMAP username: (full carpenter tutoring email address)
 </pre>
-				<?php
-			} else {
-				?>
 					<h3>Gmail forwarding</h3>
 
 					<p>
@@ -142,6 +120,14 @@ IMAP username: <?php printf('%s', $email) ?>
 
 					<h3>Other webmail clients</h3>
 
+				<p>
+				<ul>
+					<li><a href="https://support.apple.com/en-us/HT201320">iOS Mail app</a></li>
+					<li><a href="https://support.microsoft.com/en-us/office/set-up-email-in-the-mail-app-7ff79e8b-439b-4b47-8ff9-3f9a33166c60">Mail app for Windows 10 or Windows 11</a></li>
+					<li><a href="https://support.mozilla.org/en-US/kb/manual-account-configuration">Mozilla Thunderbird</a></li>
+				</ul>
+				</p>
+
 					<p>
 						Setup instructions for other popular webmail clients are largely the same. The configuration options for IMAP and SMTP should be identical. Below is a list of setup instructions for common providers.
 					</p>
@@ -152,10 +138,6 @@ IMAP username: <?php printf('%s', $email) ?>
 
 					</ul>
 					</p>
-			<?php
-			}
-		}
-			?>
 			<h2>Getting help</h2>
 			<p>
 				If you encounter difficulty or have questions throughout any part of this process, please reach out to <a href="webmaster@carpentertutoring.com">webmaster@carpentertutoring.com</a> and we'll get in touch to help.
-- 
cgit v1.2.3