reading and checking for session variables rewritten

[mailer.git] / inc / modules / guest / what-login.php

diff --git a/inc/modules/guest/what-login.php b/inc/modules/guest/what-login.php
index 93fc1bd2cf185c7a94977abc8d3a2c4e84b92b2f..9aea8f972b276cbd4270e926cabd2de5e95b4af9 100644 (file)
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -49,34 +49,26 @@ global $DATA, $FATAL;
 $probe_nickname = false; $UID = false; $hash = "";
 unset($login); unset($online);
 
-if ((!empty($GLOBALS['userid'])) && (!empty($_SESSION['u_hash'])))
+if ((!empty($GLOBALS['userid'])) && (isSessionVariableSet('u_hash')))
 {
        // Already logged in?
        $UID = $GLOBALS['userid'];
-}
- elseif ((!empty($_POST['id'])) && (!empty($_POST['password'])) && (isset($_POST['ok'])))
-{
+} elseif ((!empty($_POST['id'])) && (!empty($_POST['password'])) && (isset($_POST['ok']))) {
        // Set userid and crypt password when login data was submitted
        $probe_nickname = ((EXT_IS_ACTIVE("nickname")) && (("".round($_POST['id'])."") != $_POST['id']));
        if ($probe_nickname)
        {
                // Nickname entered
                $UID = SQL_ESCAPE($_POST['id']);
-       }
-        else
-       {
+       } else {
                // Direct userid entered
                $UID  = bigintval($_POST['id']);
        }
-}
- elseif (!empty($_POST['new_pass']))
-{
+} elseif (!empty($_POST['new_pass'])) {
        // New password requested
        $UID = "0";
        if (!empty($_POST['id'])) $UID = $_POST['id'];
-}
- else
-{
+} else {
        // Not logged in
        $UID = "0"; $hash = "";
 }
@@ -86,59 +78,46 @@ $URL = ""; $ADD = "";
 if (empty($_POST['new_pass'])) $_POST['new_pass'] = "";
 if (empty($_GET['login']))     $_GET['login']     = "";
 
-if (IS_LOGGED_IN())
-{
+if (IS_LOGGED_IN()) {
        // Login immidiately...
        $URL = URL."/modules.php?module=login";
-}
- elseif (isset($_POST['ok']))
-{
+} elseif (isset($_POST['ok'])) {
        // Add last_login if available
        $LAST = "";
-       if (GET_EXT_VERSION("sql_patches") >= "0.2.8")
-       {
+       if (GET_EXT_VERSION("sql_patches") >= "0.2.8") {
                $LAST = ", last_login";
        }
 
        // Check login data
        $password = "";
-       if ($probe_nickname)
-       {
+       if ($probe_nickname) {
                // Nickname entered
                $result = SQL_QUERY_ESC("SELECT userid, password, last_online".$LAST." FROM "._MYSQL_PREFIX."_user_data WHERE nickname='%s' AND status='CONFIRMED' LIMIT 1",
                 array($UID), __FILE__, __LINE__);
                list($UID2, $password, $online, $login) = SQL_FETCHROW($result);
                if (!empty($UID2)) $UID = $UID2;
-       }
-        else
-       {
+       } else {
                // Direct userid entered
                $result = SQL_QUERY_ESC("SELECT userid, password, last_online".$LAST." FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d AND status='CONFIRMED' LIMIT 1",
                 array(bigintval($UID), $hash), __FILE__, __LINE__);
                list($dmy, $password, $online, $login) = SQL_FETCHROW($result);
        }
-       if (SQL_NUMROWS($result) == 1)
-       {
+       if (SQL_NUMROWS($result) == 1) {
                // Valid data found so let's load the last login data
-               if (isset($_POST['ok']))
-               {
+               if (isset($_POST['ok'])) {
                        // By default the hash is empty
                        $hash = "";
 
                        // Check for old MD5 passwords
-                       if ((strlen($password) == 32) && (md5($_POST['password']) == $password))
-                       {
+                       if ((strlen($password) == 32) && (md5($_POST['password']) == $password)) {
                                // Just set the hash to the password from DB... :)
                                $hash = $password;
-                       }
-                        else
-                       {
+                       } else {
                                // Encrypt hash for comparsion
                                $hash = generateHash($_POST['password'], substr($password, 0, -40));
                        }
 
-                       if ($hash == $password)
-                       {
+                       if ($hash == $password) {
                                // New hashed password found so let's generate a new one
                                $hash = generateHash($_POST['password']);
 
@@ -152,8 +131,7 @@ if (IS_LOGGED_IN())
                                // Probe for last online timemark
                                $probe = time() -  $online;
                                if (!empty($login)) $probe = time() - $login;
-                               if ((GET_EXT_VERSION("bonus") >= "0.2.2") && ($probe >= $_CONFIG['login_timeout']))
-                               {
+                               if ((GET_EXT_VERSION("bonus") >= "0.2.2") && ($probe >= $_CONFIG['login_timeout'])) {
                                        // Add login bonus to user's account
                                        $ADD = ", login_bonus=login_bonus+'".$_CONFIG['login_bonus']."'";
                                        $BONUS = true;
@@ -166,8 +144,7 @@ if (IS_LOGGED_IN())
                                // Secure lifetime from input form
                                $l = bigintval($_POST['lifetime']);
                                $life = "-1";
-                               if ($l > 0)
-                               {
+                               if ($l > 0) {
                                        // Calculate lifetime of cookies
                                        $life = time() + $l;
 
@@ -181,60 +158,41 @@ if (IS_LOGGED_IN())
 
                                        // Update global array
                                        $GLOBALS['userid'] = $UID;
-                                       $_SESSION['u_hash'] = $hash;
-                                       $_SESSION['lifetime'] = $l;
-                               }
-                                else
-                               {
+                               } else {
                                        // Check for login data
                                        $login = IS_LOGGED_IN();
                                }
 
-                               if ($login)
-                               {
+                               if ($login) {
                                        // Update database records
                                        $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET total_logins=total_logins+1".$ADD." WHERE userid=%d LIMIT 1",
                                         array(bigintval($UID)), __FILE__, __LINE__);
-                                       if (SQL_AFFECTEDROWS($link) == 1)
-                                       {
+                                       if (SQL_AFFECTEDROWS($link) == 1) {
                                                // Procedure to checking for login data
-                                               if (($BONUS) && (EXT_IS_ACTIVE("bonus")))
-                                               {
+                                               if (($BONUS) && (EXT_IS_ACTIVE("bonus"))) {
                                                        // Bonus added (just displaying!)
                                                        $URL = URL."/modules.php?module=chk_login&mode=bonus";
-                                               }
-                                                else
-                                               {
+                                               } else {
                                                        // Bonus not added
                                                        $URL = URL."/modules.php?module=chk_login&mode=login";
                                                }
-                                       }
-                                        else
-                                       {
+                                       } else {
                                                // Cannot update counter!
                                                $URL = URL."/modules.php?module=".$GLOBALS['module']."&what=login&login=".CODE_CNTR_FAILED;
                                        }
-                               }
-                                else
-                               {
+                               } else {
                                        // Cookies not setable!
                                        $URL = URL."/modules.php?module=".$GLOBALS['module']."&what=login&login=".CODE_NO_COOKIES;
                                }
-                       }
-                        else
-                       {
+                       } else {
                                // Wrong password!
                                $ERROR = CODE_WRONG_PASS;
                        }
-               }
-                else
-               {
+               } else {
                        // Fatal error!
                        $ERROR = CODE_LOGIN_FAILED;
                }
-       }
-        else
-       {
+       } else {
                // Other account status?
                $result = SQL_QUERY_ESC("SELECT status FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1",
                 array(bigintval($UID)), __FILE__, __LINE__);