Fix old student members coming back with the same student id after thier...

Fix old student members coming back with the same student id after thier account has been deleted and they paid via the su

components/susignup.php

@@ -40,19 +40,18 @@ 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 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) {
+        // else if they aren't in the SUCS DB but have a signup slip, take them back to that part of signup
+        } else if ($tmpresult->fields == false && $signuptmpresult->fields["sid"] == $sid && $signuptmpresult->fields["activated"] != NULL) {
             $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 they aren't in the SUCS DB, then bootstrap signup process
         } else if ($tmpresult->fields == false && $signuptmpresult->fields == false) {
             $mode = "form";
             $pass = make_password();