X-Git-Url: http://andersk.mit.edu/gitweb/sql-web.git/blobdiff_plain/5085530310ff52260aa0c23533ee883f1add85cd..79ffa7719bedd98ba94a37c1217dbafe56ea1a72:/login.php
diff --git a/login.php b/login.php
index 18f7531..4858893 100644
--- a/login.php
+++ b/login.php
@@ -1,37 +1,36 @@
exists())) {
- addUser($SSLCred);
- $Login = new Login($SSLUsername);
- }
}
}
-if (empty($err) && isPost()) {
-
+if (isPost() && empty($err)) {
+
if (isSSL()) {
- $Login = new Login($SSLUsername);
- $Login->update($cred['Name'],$cred['Email']);
- sess('Login', $Login);
+ $Login = $LoginSSL;
} else {
$Login = new Login($i_u, $i_p);
- if ($Login->exists() && !$Login->isEnabled()) {
- $err[] = 'Account not active. Did you signup yet?.';
- } elseif (!$Login->exists()) {
- $err[] = 'Nonexistant account or invalid password.';
- } elseif (!$Login->canLogin()) {
- $err[] = 'That account is no longer valid. Please contact the staff.';
- } else {
- sess('Login', $Login);
- }
+ }
+
+ if ($Login->exists() && !$Login->isEnabled()) {
+ $err[] = 'Account not active. Did you signup yet?.';
+ } elseif (!$Login->exists()) {
+ $err[] = 'Nonexistant account or invalid password.';
+ } elseif (!$Login->canLogin()) {
+ $err[] = 'That account is no longer valid. Please contact the staff (sql@mit.edu).';
+ }
+
+ if (empty($err)) {
+ sess('UserId', $Login->getUserId());
+ redirect('main?refresh');
}
}