login page links fixed

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

diff --git a/global.act.php b/global.act.php
index 7563b612b68e1d68717d7a10fbff47ad9f828b29..94e662d5af48dad487532fd0b4077d516142332f 100644 (file)
--- 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,17 +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()) {
-       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');
+}
 ?>