From 592f6ce002635d3d4a16bc0d9e06eb10eed973ea Mon Sep 17 00:00:00 2001
From: Imran Hussain <imranh@sucs.org>
Date: Thu, 13 Oct 2016 10:36:28 +0100
Subject: [PATCH] Revert "Fix old members returning with the same student id
while still being a student."
This reverts commit f772dc7a1da618a609b3312ce390e7cf11abde8c.
Better fix incoming
---
components/susignup.php | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/components/susignup.php b/components/susignup.php
index 91b5246..4d7d4b8 100755
--- a/components/susignup.php
+++ b/components/susignup.php
@@ -40,13 +40,19 @@ if (!empty($_REQUEST['sid']) && !empty($_REQUEST['transactionID'])) {
if ($tmpresult->fields["sid"] == $sid && $tmpresult->fields["paid"] == paidUntil(time())) {
// let them know they are already signed up and renewed
message_flash("You are a numpty and have already signed up and paid for this year.");
- // else if check to see if they have signedup and paid for the new year but haven't renewed
+ // else if check to see if they have signedup and paid for the new year but haven't renewed
} else if ($tmpresult->fields["sid"] == $sid && $tmpresult->fields["paid"] != paidUntil(time())) {
// renew them!
renew_membership($tmpresult->fields["username"]);
// let them know that their account has been renewed
message_flash("Your SUCS account has been renewed.");
- // else if they aren't in the SUCS DB, then bootstrap signup process
+ // else if they aren't in the SUCS DB but have a signup slip, take them back to that part of signup
+ // I don't know how you would end up in a state like this but the old code dealt with it so I will as well
+ } else if ($tmpresult->fields == false && $signuptmpresult->fields["sid"] == $sid) {
+ $mode = "form";
+ $smarty->assign("id", $signuptmpresult->fields["id"]);
+ $smarty->assign("pass", $signuptmpresult->fields["password"]);
+ // else if they aren't in the SUCS DB, then bootstrap signup process
} else if ($tmpresult->fields == false && $signuptmpresult->fields == false) {
$mode = "form";
$pass = make_password();
--
GitLab