From 398b9853befe5db69371c68f78dcb6e4287c219e Mon Sep 17 00:00:00 2001
From: Luke Tainton <luke@tainton.uk>
Date: Sun, 16 Aug 2020 18:35:18 +0100
Subject: [PATCH 1/2] :sparkles: Move mailing list to Google Groups

---
 app/includes/footer.php | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/app/includes/footer.php b/app/includes/footer.php
index 2a57c20..e7c2297 100644
--- a/app/includes/footer.php
+++ b/app/includes/footer.php
@@ -5,14 +5,32 @@
       if ($_ENV['APP_NAME'] != "FHeD") {echo(", powered by FHeD");};
     ?><br>
     <?php if (is_signed_in()) { ?>
-      <form id="mailer-subscribe" method="post" action="https://mailer.tainton.uk/subscription/form" style="margin-top: -1%;">
-        <div class="form-group">
-          <input hidden type="text" class="form-control" id="name" name="name" value="<?php echo($_SESSION['full_name']); ?>">
-          <input hidden type="text" class="form-control" id="email" name="email" value="<?php echo($_SESSION['email']); ?>">
-          <input hidden type="text" class="form-control" id="bdce4" name="l" value="bdce4805-ff03-41f1-be2c-60b28c444e83">
+      <a data-target="#mailingListModal" data-toggle="modal" href="#mailingListModal">Subscribe</a>
+      <div class="modal fade" id="mailingListModal" tabindex="-1" aria-labelledby="mailingListModalLabel" aria-hidden="true">
+        <div class="modal-dialog">
+          <div class="modal-content">
+            <div class="modal-header">
+              <h5 class="modal-title" id="mailingListModalLabel">FHeD Users mailing list</h5>
+              <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+              </button>
+            </div>
+            <div class="modal-body">
+            <p>
+              The <i>FHeD Users</i> mailing list is aimed at administrators managing an FHeD deployment, allowing you to interact
+              with other FHeD administrators and get help from the developers.
+            </p>
+            <p>
+              <b>You need a Google account to subscribe.</b> Your data will be stored in accordance with Google's <a target="_blank" href="https://policies.google.com/privacy">privacy policy</a>.
+            </p>
+            </div>
+            <div class="modal-footer">
+              <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+              <a href='https://groups.google.com/g/fhed-users' class='btn btn-success'>Subscribe</a>
+            </div>
+          </div>
         </div>
-        <a href="#" onclick="document.getElementById('mailer-subscribe').submit();">Subscribe</a>
-      </form>
+      </div>
     <?php } ?>
   </div>
 </footer>
-- 
2.49.1


From e95941114fca152d96bdf0f5a02c959fa09e34ab Mon Sep 17 00:00:00 2001
From: "restyled-io[bot]" <32688539+restyled-io[bot]@users.noreply.github.com>
Date: Sun, 16 Aug 2020 18:39:49 +0100
Subject: [PATCH 2/2] Restyled by php-cs-fixer (#102)

Co-authored-by: Restyled.io <commits@restyled.io>
---
 app/includes/footer.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/includes/footer.php b/app/includes/footer.php
index e7c2297..6c39b39 100644
--- a/app/includes/footer.php
+++ b/app/includes/footer.php
@@ -1,10 +1,13 @@
 <footer class="footer mt-auto py-3">
   <div class="text-center text-muted">
     <?php
-      echo( $_ENV['APP_NAME'] . " v" . $_ENV['APP_VERSION']);
-      if ($_ENV['APP_NAME'] != "FHeD") {echo(", powered by FHeD");};
+      echo($_ENV['APP_NAME'] . " v" . $_ENV['APP_VERSION']);
+      if ($_ENV['APP_NAME'] != "FHeD") {
+          echo(", powered by FHeD");
+      };
     ?><br>
-    <?php if (is_signed_in()) { ?>
+    <?php if (is_signed_in()) {
+        ?>
       <a data-target="#mailingListModal" data-toggle="modal" href="#mailingListModal">Subscribe</a>
       <div class="modal fade" id="mailingListModal" tabindex="-1" aria-labelledby="mailingListModalLabel" aria-hidden="true">
         <div class="modal-dialog">
@@ -31,7 +34,8 @@
           </div>
         </div>
       </div>
-    <?php } ?>
+    <?php
+    } ?>
   </div>
 </footer>
 <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"></script>
-- 
2.49.1