From 2ae1f97af18d4c23b123db2d7ac82997a82fe3f8 Mon Sep 17 00:00:00 2001
From: Skylar Ittner <admin@netsyms.com>
Date: Mon, 17 Dec 2018 19:18:08 -0700
Subject: [PATCH] Improve not expired message, close #19

---
 public/parts/renew.php  | 12 ++++++++----
 public/parts/verify.php |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/public/parts/renew.php b/public/parts/renew.php
index 044f101..cf83a8d 100644
--- a/public/parts/renew.php
+++ b/public/parts/renew.php
@@ -28,6 +28,7 @@ if (empty($IN_SITE)) {
 
                     <?php
                     $msg = "";
+                    $alert = "danger";
                     if (!empty($_GET['msg'])) {
                         switch ($_GET['msg']) {
                             case "sessionexpired":
@@ -40,17 +41,20 @@ if (empty($IN_SITE)) {
                                 $msg = "That email address doesn't look right.  Please try again.";
                                 break;
                             case "tooearly":
-                                if (!empty($_GET['exp']) && is_numeric($_GET['exp'])) {
-                                    $msg = "This membership isn't expiring until " . date("F Y", $_GET['exp'] * 1) . " and cannot be renewed yet.";
+                                $alert = "info";
+                                if (!empty($_GET['exp']) && is_numeric($_GET['exp']) && $_GET['exp'] * 1 > time()) {
+                                    $msg = "<i class=\"fas fa-calendar-check\"></i> This membership isn't expiring until " . date("F j, Y", $_GET['exp'] * 1) . " and cannot be renewed yet.";
                                 } else {
-                                    $msg = "This membership isn't close enough to expiration and cannot be renewed yet.";
+                                    // Somebody is screwing with the URL
+                                    // for some reason
+                                    $msg = "<i class=\"fas fa-calendar-check\"></i> This membership isn't close enough to expiration and cannot be renewed yet.";
                                 }
                                 break;
                         }
                     }
                     if ($msg != "") {
                         ?>
-                        <div class="alert alert-danger">
+                        <div class="alert alert-<?php echo $alert; ?>">
                             <?php echo $msg; ?>
                         </div>
                         <?php
diff --git a/public/parts/verify.php b/public/parts/verify.php
index 8b348da..dc36d52 100644
--- a/public/parts/verify.php
+++ b/public/parts/verify.php
@@ -25,7 +25,7 @@ if (!empty($_POST['email'])) {
     $expires = (new Family())->load($familyid)->getExpires();
     if ($expires > strtotime("+6 months")) {
         header("Location: ./?page=renew&msg=tooearly&exp=$expires");
-        die("This membership isn't expiring until " . date("F Y", $expires) . " and cannot be renewed yet.");
+        die("This membership isn't expiring until " . date("F j, Y", $expires) . " and cannot be renewed yet.");
     }
 
     $code = mt_rand(100000, 999999);