A lot fixes to templates and missing functions added, more rewrites

[mailer.git] / inc / libs / user_functions.php

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index b0de254c1eaad5966615a565f1a67e76daa36ac6..5fbf3978286d58cb99f9aa241f8558546a235d61 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -200,7 +200,7 @@ function USER_CREATE_EMAIL_LINK($email, $mod="admin") {
        $result = SQL_QUERY_ESC("SELECT userid
 FROM `{!_MYSQL_PREFIX!}_user_data`
 WHERE email='%s'".$locked." LIMIT 1",
-        array($email), __FILE__, __LINE__);
+        array($email), __FUNCTION__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
                // Load userid
                list($uid) = SQL_FETCHROW($result);
@@ -233,7 +233,7 @@ function SELECT_RANDOM_REFID () {
 
                        // Look for random user
                        $result = SQL_QUERY_ESC("SELECT `userid` FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' AND `rand_confirmed` >= %s ORDER BY `rand_confirmed` DESC LIMIT %s, 1",
-                               array(getConfig('user_min_confirmed'), $randNum), __FILE__, __LINE__);
+                               array(getConfig('user_min_confirmed'), $randNum), __FUNCTION__, __LINE__);
 
                        // Do we have one entry there?
                        if (SQL_NUMROWS($result) == 1) {
@@ -242,7 +242,7 @@ function SELECT_RANDOM_REFID () {
 
                                // Reset this user's counter
                                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `rand_confirmed`=0 WHERE userid=%s LIMIT 1",
-                                       array($refid), __FILE__, __LINE__);
+                                       array($refid), __FUNCTION__, __LINE__);
                        } // END - if
 
                        // Free result
@@ -267,13 +267,13 @@ function USER_DO_LOGIN ($uid, $passwd) {
        if ((EXT_IS_ACTIVE("nickname")) && (NICKNAME_PROBE_ON_USERID($uid))) {
                // Nickname entered
                $result = SQL_QUERY_ESC("SELECT userid, password, last_online".$lastOnline." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' AND `status`='CONFIRMED' LIMIT 1",
-                       array($uid), __FILE__, __LINE__);
+                       array($uid), __FUNCTION__, __LINE__);
                list($uid2, $password, $online, $login) = SQL_FETCHROW($result);
                if (!empty($uid2)) $uid = bigintval($uid2);
        } else {
                // Direct userid entered
                $result = SQL_QUERY_ESC("SELECT userid, password, last_online".$lastOnline." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1",
-                       array($uid, $hash), __FILE__, __LINE__);
+                       array($uid, $hash), __FUNCTION__, __LINE__);
                list($uid2, $password, $online, $login) = SQL_FETCHROW($result);
        }
 
@@ -300,7 +300,7 @@ function USER_DO_LOGIN ($uid, $passwd) {
 
                        // ... and update database
                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET password='%s' WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1",
-                               array($hash, $uid), __FILE__, __LINE__);
+                               array($hash, $uid), __FUNCTION__, __LINE__);
 
                        // No login bonus by default
                        // @TODO Make this filter working: $ADDON = RUN_FILTER('post_login_update', array('login' => $login, 'online' => $online));
@@ -334,7 +334,7 @@ function USER_DO_LOGIN ($uid, $passwd) {
                        if ((set_session('userid', $uid )) && (set_session('u_hash', $hash))) {
                                // Update database records
                                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET total_logins=total_logins+1".$ADD." WHERE userid=%s LIMIT 1",
-                                       array($uid), __FILE__, __LINE__);
+                                       array($uid), __FUNCTION__, __LINE__);
                                if (SQL_AFFECTEDROWS() == 1) {
                                        // Procedure to checking for login data
                                        if (($BONUS) && (EXT_IS_ACTIVE("bonus"))) {
@@ -355,7 +355,7 @@ function USER_DO_LOGIN ($uid, $passwd) {
                } elseif (GET_EXT_VERSION("sql_patches") >= "0.6.1") {
                        // Update failture counter
                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET login_failures=login_failures+1,last_failure=NOW() WHERE userid=%s LIMIT 1",
-                               array($uid), __FILE__, __LINE__);
+                               array($uid), __FUNCTION__, __LINE__);
 
                        // Wrong password!
                        $URL = "modules.php?module=index&what=login&login=".constant('CODE_WRONG_PASS');
@@ -364,7 +364,7 @@ function USER_DO_LOGIN ($uid, $passwd) {
                // Other account status?
                // @TODO Can this query be merged with above query?
                $result = SQL_QUERY_ESC("SELECT status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-                       array($uid), __FILE__, __LINE__);
+                       array($uid), __FUNCTION__, __LINE__);
 
                // Entry found?
                if (SQL_NUMROWS($result) == 1) {
@@ -402,15 +402,15 @@ function USER_DO_NEW_PASSWORD ($email, $uid) {
        if ((EXT_IS_ACTIVE("nickname")) && (NICKNAME_PROBE_ON_USERID($uid))) {
                // Nickname entered
                $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' OR email='%s' LIMIT 1",
-                       array($uid, $email), __FILE__, __LINE__);
+                       array($uid, $email), __FUNCTION__, __LINE__);
        } elseif (($uid > 0) && (empty($email))) {
                // Direct userid entered
                $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-                       array(bigintval($uid)), __FILE__, __LINE__);
+                       array(bigintval($uid)), __FUNCTION__, __LINE__);
        } elseif (!empty($email)) {
                // Email entered
                $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE email='%s' LIMIT 1",
-                       array($email), __FILE__, __LINE__);
+                       array($email), __FUNCTION__, __LINE__);
        } else {
                // Userid not set!
                DEBUG_LOG(__FUNCTION__, __LINE__, "Userid is not set! BUG!");
@@ -426,7 +426,7 @@ function USER_DO_NEW_PASSWORD ($email, $uid) {
                        // Ooppps, this was missing! ;-) We should update the database...
                        $NEW_PASS = GEN_PASS();
                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET password='%s' WHERE userid=%s LIMIT 1",
-                               array(generateHash($NEW_PASS), $uid), __FILE__, __LINE__);
+                               array(generateHash($NEW_PASS), $uid), __FUNCTION__, __LINE__);
 
                        // Prepare data and message for email
                        $msg = LOAD_EMAIL_TEMPLATE("new-pass", array('new_pass' => $NEW_PASS), $uid);