Reset rewritten, SQL fixed, zeros are now numeric

[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 62450c81b6b2a728bc45617ef4ca97928feb88fa..ecf3887652dca4f3893b9ecaef704fce1e4468be 100644 (file)
--- a/inc/modules/guest/what-login.php
+++ b/inc/modules/guest/what-login.php
@@ -33,8 +33,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
-{
+if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
@@ -42,7 +41,6 @@ if (ereg(basename(__FILE__), $_SERVER['PHP_SELF']))
 // Add description as navigation point
 ADD_DESCR("guest", basename(__FILE__));
 
-OPEN_TABLE("100%", "guest_content_align", "");
 global $DATA, $FATAL;
 
 // Initialize data
@@ -66,11 +64,11 @@ if ((!empty($GLOBALS['userid'])) && (isSessionVariableSet('u_hash')))
        }
 } elseif (!empty($_POST['new_pass'])) {
        // New password requested
-       $UID = "0";
+       $UID = 0;
        if (!empty($_POST['id'])) $UID = $_POST['id'];
 } else {
        // Not logged in
-       $UID = "0"; $hash = "";
+       $UID = 0; $hash = "";
 }
 
 $URL = ""; $ADD = "";
@@ -78,7 +76,7 @@ $URL = ""; $ADD = "";
 if (empty($_POST['new_pass'])) $_POST['new_pass'] = "";
 if (empty($_GET['login']))     $_GET['login']     = "";
 
-if (IS_LOGGED_IN()) {
+if (IS_MEMBER()) {
        // Login immidiately...
        $URL = URL."/modules.php?module=login";
 } elseif (isset($_POST['ok'])) {
@@ -98,7 +96,7 @@ if (IS_LOGGED_IN()) {
                if (!empty($UID2)) $UID = $UID2;
        } 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",
+               $result = SQL_QUERY_ESC("SELECT userid, password, last_online".$LAST." FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
                 array(bigintval($UID), $hash), __FILE__, __LINE__);
                list($dmy, $password, $online, $login) = SQL_FETCHROW($result);
        }
@@ -122,7 +120,7 @@ if (IS_LOGGED_IN()) {
                                $hash = generateHash($_POST['password']);
 
                                // ... and update database
-                               $result_update = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET password='%s' WHERE userid=%d AND status='CONFIRMED' LIMIT 1",
+                               $result_update = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET password='%s' WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
                                 array($hash, $UID), __FILE__, __LINE__);
 
                                // No login bonus by default
@@ -157,17 +155,17 @@ if (IS_LOGGED_IN()) {
                                               && set_session("lifetime", $l   , $life, COOKIE_PATH));
 
                                        // Update global array
-                                       $GLOBALS['userid'] = $UID;
+                                       $GLOBALS['userid'] = bigintval($UID);
                                } else {
                                        // Check for login data
-                                       $login = IS_LOGGED_IN();
+                                       $login = IS_MEMBER();
                                }
 
                                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",
+                                       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET total_logins=total_logins+1".$ADD." WHERE userid=%s LIMIT 1",
                                         array(bigintval($UID)), __FILE__, __LINE__);
-                                       if (SQL_AFFECTEDROWS($link) == 1) {
+                                       if (SQL_AFFECTEDROWS() == 1) {
                                                // Procedure to checking for login data
                                                if (($BONUS) && (EXT_IS_ACTIVE("bonus"))) {
                                                        // Bonus added (just displaying!)
@@ -194,7 +192,7 @@ if (IS_LOGGED_IN()) {
                }
        } else {
                // Other account status?
-               $result = SQL_QUERY_ESC("SELECT status FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT status FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s LIMIT 1",
                 array(bigintval($UID)), __FILE__, __LINE__);
                if (SQL_NUMROWS($result) == 1)
                {
@@ -231,7 +229,7 @@ if (IS_LOGGED_IN()) {
        if (!empty($_POST['email'])) $_POST['email'] = str_replace("{DOT}", '.', $_POST['email']);
 
        // Set ID number when left empty
-       if (empty($_POST['id'])) $_POST['id'] = "0";
+       if (empty($_POST['id'])) $_POST['id'] = 0;
 
        // Probe userid/nickname
        $probe_nickname = ((EXT_IS_ACTIVE("nickname")) && (("".round($_POST['id'])."") != $_POST['id']));
@@ -244,7 +242,7 @@ if (IS_LOGGED_IN()) {
         else
        {
                // Direct userid entered
-               $result = SQL_QUERY_ESC("SELECT userid, status FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d OR email='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT userid, status FROM "._MYSQL_PREFIX."_user_data WHERE userid=%s OR email='%s' LIMIT 1",
                 array(bigintval($UID), $_POST['email']), __FILE__, __LINE__);
        }
        if (SQL_NUMROWS($result) == 1)
@@ -256,7 +254,7 @@ if (IS_LOGGED_IN()) {
                {
                        // Ooppps, this was missing! ;-) We should update the database...
                        $NEW_PASS = GEN_PASS();
-                       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET password='%s' WHERE userid=%d LIMIT 1",
+                       $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET password='%s' WHERE userid=%s LIMIT 1",
                         array(generateHash($NEW_PASS), bigintval($UID)), __FILE__, __LINE__);
 
                        // Prepare data and message for email
@@ -347,21 +345,17 @@ if (IS_LOGGED_IN()) {
 }
 
 // Was an URL constructed?
-if (!empty($URL))
-{
+if (!empty($URL)) {
        // URL was constructed
        if (!empty($FATAL[0]))
        {
                // Fatal errors!
                require_once(PATH."inc/fatal_errors.php");
-       }
-        else
-       {
+       } else {
                // Load URL
                LOAD_URL($URL);
        }
 }
 
-CLOSE_TABLE();
 //
 ?>