X-Git-Url: http://andersk.mit.edu/gitweb/sql-web.git/blobdiff_plain/3ebfe9a36acba9515fadc37791a8931749a5bd51..f9f86182f16e77bb9c4972ecd927c345ae29cb04:/global.act.php

diff --git a/global.act.php b/global.act.php
index 009d529..94e662d 100644
--- a/global.act.php
+++ b/global.act.php
@@ -10,28 +10,13 @@ if (isset($i_ssl)) {
 }
 if (isset($i_reset)) { session_destroy(); session_start(); redirect(newQS('reset')); }
 
-$err = array();
+$msg = $err = array();
 
 ## SESSION VARS
 
 $timings = array();
-$UserId = 0;
-$Username = '';
-$Name = '';
-$Email = '';
-$UL = 0;
-$Login = sess('Login');
-$LoginSSL = sess('LoginSSL');
-
-if (is_a($Login, 'Login')) {
-    $UserId = $Login->getUserId();
-	$Username = $Login->getUsername();
-	$Name = $Login->getName();
-	$Email = $Login->getEmail();
-	$UL = $Login->getUL();
-} else {
-	$Login = new Login('');
-}
+$UserId = sess('UserId');
+$Login = new Login($UserId);
 
 ## PROCESS CERTIFICATE
 
@@ -40,18 +25,27 @@ $SSLName = '';
 $SSLEmail = '';
 $SSLUsername = '';
 
-if (isSSL()) {
+if (isSSL() || !isLoggedIn()) {
 	$SSLName = $SSLCred['Name'];
 	$SSLUsername = $SSLCred['Username'];
 	$SSLEmail = $SSLCred['Email'];
-}
-if (!is_a($LoginSSL, 'Login')) {
+
+	/*$LoginSSL = sess('LoginSSL');
+	if (!is_a($LoginSSL, 'Login')) { $LoginSSL = new Login($SSLUsername); }*/
 	$LoginSSL = new Login($SSLUsername);
-}
-if (!isLoggedIn() && !$LoginSSL->exists()) {
-	if (!empty($SSLName))
-		addUser($SSLCred);
-	$LoginSSL->refresh();
+	$LoginSSL->update($SSLCred['Name'],$SSLCred['Email']);
+
+	if (!isLoggedIn() && !$LoginSSL->exists()) {
+		if (!empty($SSLName))
+			addUser($SSLCred);
+		$LoginSSL->refresh();
+	}
+} else {
+	unset($_SESSION['LoginSSL']);
 }
 
+if (isPost() || isset($i_refresh)) {
+	checkQuotas($UserId);
+	isset($i_refresh) && redirect('main');
+}
 ?>