old admin stuff deleted

[sql-web.git] / global.act.php

diff --git a/global.act.php b/global.act.php
index a260ad7c415f56ba27dbfeb2ff0f945fdbfdfe5b..8fe4a4c1433cd644c04bbba2a3c6582bfdf86acd 100644 (file)
--- a/global.act.php
+++ b/global.act.php
@@ -10,27 +10,12 @@ 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 = sess('UserId');
-/*$Username = '';
-$Name = '';
-$Email = '';
-$UL = 0;
-$Login = sess('Login');
-
-if (is_a($Login, 'Login')) {
-    $UserId = $Login->getUserId();
-       $Username = $Login->getUsername();
-       $Name = $Login->getName();
-       $Email = $Login->getEmail();
-       $UL = $Login->getUL();
-} else {
-       $Login = new Login('');
-}*/
 $Login = new Login($UserId);
 
 ## PROCESS CERTIFICATE
@@ -40,7 +25,7 @@ $SSLName = '';
 $SSLEmail = '';
 $SSLUsername = '';
 
-if (isSSL()) {
+if (isSSL() || !isLoggedIn()) {
        $SSLName = $SSLCred['Name'];
        $SSLUsername = $SSLCred['Username'];
        $SSLEmail = $SSLCred['Email'];
@@ -59,4 +44,4 @@ if (isSSL()) {
        unset($_SESSION['LoginSSL']);
 }
 
-?>
\ No newline at end of file
+?>