new templates

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

diff --git a/global.act.php b/global.act.php
index 009d529c407f0125c508129b1493d67a29c0f909..a260ad7c415f56ba27dbfeb2ff0f945fdbfdfe5b 100644 (file)
--- a/global.act.php
+++ b/global.act.php
@@ -15,13 +15,12 @@ $err = array();
 ## SESSION VARS
 
 $timings = array();
-$UserId = 0;
-$Username = '';
+$UserId = sess('UserId');
+/*$Username = '';
 $Name = '';
 $Email = '';
 $UL = 0;
 $Login = sess('Login');
-$LoginSSL = sess('LoginSSL');
 
 if (is_a($Login, 'Login')) {
     $UserId = $Login->getUserId();
@@ -31,7 +30,8 @@ if (is_a($Login, 'Login')) {
        $UL = $Login->getUL();
 } else {
        $Login = new Login('');
-}
+}*/
+$Login = new Login($UserId);
 
 ## PROCESS CERTIFICATE
 
@@ -44,14 +44,19 @@ if (isSSL()) {
        $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']);
 }
 
-?>
+?>
\ No newline at end of file