projects / mailer.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
More improved SQL queries
[mailer.git] / inc / libs / user_functions.php
diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index c07333256a7c2e5337da8c4f92a0d62a23a05a0a..03fbfae67bde258e1171b40b07427051ac61ee51 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -54,7 +54,7 @@ function alpha ($sortby, $colspan, $return=false) {
                        $OUT .= "<strong>".$ltr."</strong>";
                } else {
                        // Output link to letter
-                       $OUT .= "<a href=\"".URL."/modules.php?module=admin&amp;what=".$GLOBALS['what'];
+                       $OUT .= "<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$GLOBALS['what'];
                        if (!empty($_GET['mode'])) $OUT .= "&amp;mode=".SQL_ESCAPE($_GET['mode']);
                        $OUT .= "&amp;letter=".$ltr."&amp;sortby=".$sortby.$ADD."\">".$ltr."</a>";
                }
@@ -112,7 +112,7 @@ function SortLinks($letter, $sortby, $colspan, $return=false) {
                if ($sortby == $sort) {
                        $OUT .= "<strong>".$title."</strong>&nbsp;|&nbsp;";
                } else {
-                       $OUT .= "<a href=\"".URL."/modules.php?module=admin&amp;what=list_user&amp;letter=".$letter."&amp;sortby=".$sort.$ADD."\">".$title."</a>&nbsp;|&nbsp;";
+                       $OUT .= "<a href=\"{!URL!}/modules.php?module=admin&amp;what=list_user&amp;letter=".$letter."&amp;sortby=".$sort.$ADD."\">".$title."</a>&nbsp;|&nbsp;";
                }
        } // END - foreach
 
@@ -156,7 +156,7 @@ function ADD_PAGENAV($PAGES, $offset, $show_form, $colspan,$return=false) {
                        if (empty($_GET['sortby'])) $_GET['sortby'] = "userid";
 
                        // Base link
-                       $OUT .= "<a href=\"".URL."/modules.php?module=admin&amp;what=".$GLOBALS['what'];
+                       $OUT .= "<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$GLOBALS['what'];
 
                        // Add status or mode
                        if (!empty($_GET['status'])) $OUT .= "&amp;mode=".SQL_ESCAPE($_GET['status']);
@@ -193,13 +193,13 @@ function ADD_PAGENAV($PAGES, $offset, $show_form, $colspan,$return=false) {
 // Create email link to user's account
 function USER_CREATE_EMAIL_LINK($email, $mod="admin") {
        // Show contact link only if user is confirmed by default
-       $locked = " AND status='CONFIRMED'";
+       $locked = " AND `status`='CONFIRMED'";
 
        // But admins shall always see it
        if (IS_ADMIN()) $locked = "";
 
        $result = SQL_QUERY_ESC("SELECT userid
-FROM "._MYSQL_PREFIX."_user_data
+FROM `{!_MYSQL_PREFIX!}_user_data`
 WHERE email='%s'".$locked." LIMIT 1",
         array($email), __FILE__, __LINE__);
        if (SQL_NUMROWS($result) == 1) {
@@ -207,7 +207,7 @@ WHERE email='%s'".$locked." LIMIT 1",
                list($uid) = SQL_FETCHROW($result);
 
                // Rewrite email address to contact link
-               $email = URL."/modules.php?module=".$mod."&amp;what=user_contct&amp;u_id=".bigintval($uid);
+               $email = "{!URL!}/modules.php?module=".$mod."&amp;what=user_contct&amp;u_id=".bigintval($uid);
        } // END - if
 
        // Free memory
@@ -235,7 +235,7 @@ function SELECT_RANDOM_REFID () {
                        $randNum = mt_rand(0, ($totalUsers - 1));
 
                        // 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",
+                       $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__);
 
                        // Do we have one entry there?
@@ -244,7 +244,7 @@ function SELECT_RANDOM_REFID () {
                                list($refid) = SQL_FETCHROW($result);
 
                                // Reset this user's counter
-                               SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_user_data` SET `rand_confirmed`=0 WHERE userid=%s LIMIT 1",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `rand_confirmed`=0 WHERE userid=%s LIMIT 1",
                                        array($refid), __FILE__, __LINE__);
                        } // END - if
 
@@ -269,13 +269,13 @@ function USER_DO_LOGIN ($uid, $passwd) {
        $password = ""; $uid2 = ""; $dmy = ""; $online = 0; $login = 0;
        if ((EXT_IS_ACTIVE("nickname")) && (NICKNAME_PROBE_ON_USERID($uid))) {
                // 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",
+               $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 = bigintval($uid2);
        } else {
                // Direct userid entered
-               $result = SQL_QUERY_ESC("SELECT userid, password, last_online".$LAST." FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s 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($uid, $hash), __FILE__, __LINE__);
                list($uid2, $password, $online, $login) = SQL_FETCHROW($result);
        }
@@ -302,7 +302,7 @@ function USER_DO_LOGIN ($uid, $passwd) {
                        $hash = generateHash($passwd);
 
                        // ... and update database
-                       SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_user_data` SET password='%s' WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
+                       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
@@ -336,7 +336,7 @@ function USER_DO_LOGIN ($uid, $passwd) {
                        // Try to set session data (which shall normally always work!)
                        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",
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET total_logins=total_logins+1".$ADD." WHERE userid=%s LIMIT 1",
                                        array($uid), __FILE__, __LINE__);
                                if (SQL_AFFECTEDROWS() == 1) {
                                        // Procedure to checking for login data
@@ -357,7 +357,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",
+                       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__);
 
                        // Wrong password!
@@ -366,7 +366,7 @@ function USER_DO_LOGIN ($uid, $passwd) {
        } elseif ((($probe_nickname) && (!empty($uid2))) || ($uid2 == $uid)) {
                // 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",
+               $result = SQL_QUERY_ESC("SELECT status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
                        array($uid), __FILE__, __LINE__);
 
                // Entry found?
@@ -404,15 +404,15 @@ function USER_DO_NEW_PASSWORD ($email, $uid) {
        // Probe userid/nickname
        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",
+               $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__);
        } 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",
+               $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
                        array(bigintval($uid)), __FILE__, __LINE__);
        } elseif (!empty($email)) {
                // Email entered
-               $result = SQL_QUERY_ESC("SELECT userid, status FROM `"._MYSQL_PREFIX."_user_data` WHERE email='%s' LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE email='%s' LIMIT 1",
                        array($email), __FILE__, __LINE__);
        } else {
                // Userid not set!
@@ -428,17 +428,17 @@ function USER_DO_NEW_PASSWORD ($email, $uid) {
                if ($status == "CONFIRMED") {
                        // 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",
+                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET password='%s' WHERE userid=%s LIMIT 1",
                                array(generateHash($NEW_PASS), $uid), __FILE__, __LINE__);
 
                        // Prepare data and message for email
                        $msg = LOAD_EMAIL_TEMPLATE("new-pass", array('new_pass' => $NEW_PASS), $uid);
 
                        // ... and send it away
-                       SEND_EMAIL($uid, GUEST_NEW_PASSWORD, $msg);
+                       SEND_EMAIL($uid, getMessage('GUEST_NEW_PASSWORD'), $msg);
 
                        // Output note to user
-                       LOAD_TEMPLATE("admin_settings_saved", false, GUEST_NEW_PASSWORD_SEND);
+                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('GUEST_NEW_PASSWORD_SEND'));
                } else {
                        // Account is locked or unconfirmed
                        $ERROR = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status);
Mailer-Project repository