X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fuser_functions.php;h=05d43f9a84d1d829cf554a258301afbd762e6b9b;hb=d016e24dd4686f613a17733b96bc28fac936a4ac;hp=76d85f5876d76c3a0f3835fc2a5753f2c4984dd1;hpb=e71e9e1380d65ccd06beef6fbc594bec10371f5f;p=mailer.git diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php index 76d85f5876..05d43f9a84 100644 --- a/inc/libs/user_functions.php +++ b/inc/libs/user_functions.php @@ -38,8 +38,7 @@ if (!defined('__SECURITY')) { } // Add links for selecting some users -function alpha($sortby, $colspan, $return=false) { - global $_CONFIG; +function alpha ($sortby, $colspan, $return=false) { if (empty($_GET['offset'])) $_GET['offset'] = 0; $ADD = "&page=".SQL_ESCAPE($_GET['page'])."&offset=".SQL_ESCAPE($_GET['offset']); if (!empty($_GET['mode'])) $ADD .= "&mode=".SQL_ESCAPE($_GET['mode']); @@ -51,12 +50,12 @@ function alpha($sortby, $colspan, $return=false) { while (list($counter, $ltr) = each($alphabet)) { if ($_GET['letter'] == $ltr) { // Current letter is letter from URL - $OUT .= "".$ltr.""; + $OUT .= "".$ltr.""; } else { // Output link to letter - $OUT .= "".$ltr.""; + $OUT .= "&letter=".$ltr."&sortby=".$sortby.$ADD."\">".$ltr.""; } if ((($counter / getConfig('user_alpha')) == round($counter / getConfig('user_alpha'))) && ($counter > 0)) { @@ -110,9 +109,9 @@ function SortLinks($letter, $sortby, $colspan, $return=false) { foreach ($list as $sort => $title) { if ($sortby == $sort) { - $OUT .= "".$title." | "; + $OUT .= "".$title." | "; } else { - $OUT .= "".$title." | "; + $OUT .= "".$title." | "; } } // END - foreach @@ -133,7 +132,7 @@ function SortLinks($letter, $sortby, $colspan, $return=false) { function ADD_PAGENAV($PAGES, $offset, $show_form, $colspan,$return=false) { if (!$show_form) { // Empty row - define('__FORM_HEADER', " "); + define('__FORM_HEADER', " "); } else { // Load form for changing number of lines define('__FORM_HEADER', LOAD_TEMPLATE("admin_list_user_sort_form", true)); @@ -141,22 +140,22 @@ function ADD_PAGENAV($PAGES, $offset, $show_form, $colspan,$return=false) { if (!$show_form) { // Add line with bottom border - define('__FORM_FOOTER', " "); + define('__FORM_FOOTER', " "); } else { // Add line without bottom border - define('__FORM_FOOTER', " "); + define('__FORM_FOOTER', " "); } $OUT = ""; for ($page = 1; $page <= $PAGES; $page++) { if (($page == $_GET['page']) || ((empty($_GET['page'])) && ($page == "1"))) { - $OUT .= "-"; + $OUT .= "-"; } else { if (empty($_GET['letter'])) $_GET['letter'] = _ALL2; if (empty($_GET['sortby'])) $_GET['sortby'] = "userid"; // Base link - $OUT .= "= %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 +241,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 @@ -260,22 +257,22 @@ function SELECT_RANDOM_REFID () { // Do the user login function USER_DO_LOGIN ($uid, $passwd) { // Add last_login if available - $LAST = ""; + $lastOnline = ""; if (GET_EXT_VERSION("sql_patches") >= "0.2.8") { - $LAST = ", last_login"; + $lastOnline = ", last_login"; } // END - if // Check login data $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".$lastOnline." 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".$lastOnline." 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 +299,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 +333,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 @@ -349,24 +346,24 @@ function USER_DO_LOGIN ($uid, $passwd) { } } else { // Cannot update counter! - $URL = "modules.php?module=index&what=login&login=".CODE_CNTR_FAILED; + $URL = "modules.php?module=index&what=login&login=".constant('CODE_CNTR_FAILED'); } } else { // Cookies not setable! - $URL = "modules.php?module=index&what=login&login=".CODE_NO_COOKIES; + $URL = "modules.php?module=index&what=login&login=".constant('CODE_NO_COOKIES'); } - } elseif (GET_EXT_VERSION("sql_patches") >= "0.4.7") { + } elseif (GET_EXT_VERSION("sql_patches") >= "0.6.1") { // Update failture counter - SQL_QUERY_ESC("UPDATE `"._MYSQL_PREFIX."_user_data` SET login_failtures=login_failtures+1,last_failture=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! - $URL = "modules.php?module=index&what=login&login=".CODE_WRONG_PASS; + $URL = "modules.php?module=index&what=login&login=".constant('CODE_WRONG_PASS'); } } elseif ((($probe_nickname) && (!empty($uid2))) || ($uid2 == $uid)) { // Other account status? - // @TODO Can this query be saved??? - $result = SQL_QUERY_ESC("SELECT status FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1", + // @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__); // Entry found? @@ -378,14 +375,14 @@ function USER_DO_LOGIN ($uid, $passwd) { $ERROR = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status); } else { // ID not found! - $ERROR = CODE_WRONG_ID; + $ERROR = constant('CODE_WRONG_ID'); } // Construct URL $URL = "modules.php?module=index&what=login&login=".$ERROR; } else { // ID not found! - $URL = "modules.php?module=index&what=login&login=".CODE_WRONG_ID; + $URL = "modules.php?module=index&what=login&login=".constant('CODE_WRONG_ID'); } // Return URL @@ -404,20 +401,20 @@ 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! DEBUG_LOG(__FUNCTION__, __LINE__, "Userid is not set! BUG!"); - $ERROR = CODE_WRONG_ID; + $ERROR = constant('CODE_WRONG_ID'); } // Any entry found? @@ -428,17 +425,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); @@ -448,7 +445,7 @@ function USER_DO_NEW_PASSWORD ($email, $uid) { } } else { // ID or email is wrong - LOAD_TEMPLATE("admin_settings_saved", false, "".GUEST_WRONG_ID_EMAIL.""); + LOAD_TEMPLATE("admin_settings_saved", false, "{--GUEST_WRONG_ID_EMAIL--}"); } // Return the error code