X-Git-Url: http://andersk.mit.edu/gitweb/sql-web.git/blobdiff_plain/77bd96856c2fc1ac3730e3c01d875506ce2ba2a5..8ed5cf0132d45b10a72923502677333626a359e5:/global.act.php

diff --git a/global.act.php b/global.act.php
index 467282b..1a9b64d 100644
--- a/global.act.php
+++ b/global.act.php
@@ -3,20 +3,7 @@
 require_once('mitsql.cfg.php');
 require_once('mitsql.lib.php');
 
-if (isset($i_ssl)) {
-	if (isSSL() && $i_ssl==1) redirect(newQS('ssl'));
-	if (!isSSL() && $i_ssl==0) redirect(newQS('ssl'));
-	redirect2(flipSSL());
-}
-if (isset($i_reset)) { session_destroy(); session_start(); redirect(newQS('reset')); }
-
-$msg = $err = array();
-
-## SESSION VARS
-
-$timings = array();
-$UserId = sess('UserId');
-$Login = new Login($UserId);
+$msg = $err = $timings = array();
 
 ## PROCESS CERTIFICATE
 
@@ -25,28 +12,46 @@ $SSLName = '';
 $SSLEmail = '';
 $SSLUsername = '';
 
-if (isSSL() || !isLoggedIn()) {
-	$SSLName = $SSLCred['Name'];
-	$SSLUsername = $SSLCred['Username'];
-	$SSLEmail = $SSLCred['Email'];
+if (isOnline()) {
+	
+## HANDLE SOME GLOBAL ACTIONS
 
-	/*$LoginSSL = sess('LoginSSL');
-	if (!is_a($LoginSSL, 'Login')) { $LoginSSL = new Login($SSLUsername); }*/
-	$LoginSSL = new Login($SSLUsername);
-	$LoginSSL->update($SSLCred['Name'],$SSLCred['Email']);
+	if (isset($i_ssl)) {
+		if (isSSL() && $i_ssl==1) redirect(newQS('ssl'));
+		if (!isSSL() && $i_ssl==0) redirect(newQS('ssl'));
+		redirect2(flipSSL());
+	}
+	if (isset($i_reset)) { session_destroy(); session_start(); redirect(newQS('reset')); }
+
+## SETUP SESSION VARS
+
+	$UserId = sess('UserId');
+	$Login = new Login($UserId);
+
+	if (isSSL() || !isLoggedIn()) {
+		$SSLName = $SSLCred['Name'];
+		$SSLUsername = $SSLCred['Username'];
+		$SSLEmail = $SSLCred['Email'];
+
+		/*$LoginSSL = sess('LoginSSL');
+		if (!is_a($LoginSSL, 'Login')) { $LoginSSL = new Login($SSLUsername); }*/
+		$LoginSSL = new Login($SSLUsername);
+		$LoginSSL->update($SSLCred['Name'],$SSLCred['Email']);
+
+		if (!isLoggedIn() && !$LoginSSL->exists()) {
+			if (!empty($SSLName))
+				addUser($SSLCred);
+			$LoginSSL->refresh();
+		}
+	} else {
+		unset($_SESSION['LoginSSL']);
+	}
 
-	if (!isLoggedIn() && !$LoginSSL->exists()) {
-		if (!empty($SSLName))
-			addUser($SSLCred);
-		$LoginSSL->refresh();
+	if (isPost() || isset($i_refresh)) {
+		checkQuotas($UserId);
+		isset($i_refresh) && redirect('main');
 	}
-} else {
-	unset($_SESSION['LoginSSL']);
-}
-
-if (isPost() || isset($i_refresh)) {
-	checkQuotas($UserId);
-	isset($i_refresh) && redirect('main');
-}
+
+} // isOnline()
 
 ?>