X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=inc%2Flibs%2Fuser_functions.php;h=5fbf3978286d58cb99f9aa241f8558546a235d61;hb=b8c86fa12322603c24a88ea2b0fd3dbeba612752;hp=76d85f5876d76c3a0f3835fc2a5753f2c4984dd1;hpb=e71e9e1380d65ccd06beef6fbc594bec10371f5f;p=mailer.git
diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 76d85f5876..5fbf397828 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -38,25 +38,24 @@ if (!defined('__SECURITY')) {
}
// Add links for selecting some users
-function alpha($sortby, $colspan, $return=false) {
- global $_CONFIG;
- 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']);
+function alpha ($sortby, $colspan, $return=false) {
+ if (!REQUEST_ISSET_GET(('offset'))) REQUEST_SET_GET('offset', 0);
+ $ADD = "&page=".REQUEST_GET(('page'))."&offset=".REQUEST_GET(('offset'));
+ if (REQUEST_ISSET_GET(('mode'))) $ADD .= "&mode=".REQUEST_GET(('mode'));
/* Creates the list of letters and makes them a link. */
$alphabet = array(_ALL2,"A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z",_OTHERS);
$num = count($alphabet) - 1;
$OUT = "";
while (list($counter, $ltr) = each($alphabet)) {
- if ($_GET['letter'] == $ltr) {
+ if (REQUEST_GET('letter') == $ltr) {
// Current letter is letter from URL
- $OUT .= "".$ltr."";
+ $OUT .= "".$ltr."";
} else {
// Output link to letter
- $OUT .= "".$ltr."";
+ $OUT .= "".$ltr."";
}
if ((($counter / getConfig('user_alpha')) == round($counter / getConfig('user_alpha'))) && ($counter > 0)) {
@@ -82,15 +81,15 @@ function alpha($sortby, $colspan, $return=false) {
// Add links for sorting
function SortLinks($letter, $sortby, $colspan, $return=false) {
$OUT = "";
- if (empty($_GET['offset'])) $_GET['offset'] = 0;
- if (empty($_GET['page'])) $_GET['page'] = 0;
+ if (!REQUEST_ISSET_GET(('offset'))) REQUEST_SET_GET('offset', 0);
+ if (!REQUEST_ISSET_GET(('page'))) REQUEST_SET_GET('page' , 0);
// Add page and offset
- $ADD = "&page=".SQL_ESCAPE($_GET['page'])."&offset=".SQL_ESCAPE($_GET['offset']);
+ $ADD = "&page=".REQUEST_GET(('page'))."&offset=".REQUEST_GET(('offset'));
// Add status or mode
- if (!empty($_GET['status'])) $ADD .= "&mode=".SQL_ESCAPE($_GET['status']);
- elseif (!empty($_GET['mode'])) $ADD .= "&mode=".SQL_ESCAPE($_GET['mode']);
+ if (REQUEST_ISSET_GET(('status'))) $ADD .= "&mode=".REQUEST_GET(('status'));
+ elseif (REQUEST_ISSET_GET(('mode'))) $ADD .= "&mode=".REQUEST_GET(('mode'));
// Makes order by links..
if ($letter == "front") $letter = _ALL2;
@@ -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,37 +140,37 @@ 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 .= "-";
+ if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET(('page'))) && ($page == "1"))) {
+ $OUT .= "-";
} else {
- if (empty($_GET['letter'])) $_GET['letter'] = _ALL2;
- if (empty($_GET['sortby'])) $_GET['sortby'] = "userid";
+ if (!REQUEST_ISSET_GET(('letter'))) REQUEST_SET_GET('letter', getMessage('_ALL2'));
+ if (!REQUEST_ISSET_GET(('sortby'))) REQUEST_SET_GET('sortby', "userid");
// Base link
- $OUT .= "";
+ $OUT .= "&letter=".REQUEST_GET(('letter'))."&sortby=".REQUEST_GET(('sortby'))."&page=".$page."&offset=".$offset."\">";
}
$OUT .= $page;
- if (($page == $_GET['page']) || ((empty($_GET['page'])) && ($page == "1"))) {
- $OUT .= "-";
+ if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET(('page'))) && ($page == "1"))) {
+ $OUT .= "-";
} else {
- $OUT .= "";
+ $OUT .= "";
}
if ($page < $PAGES) $OUT .= " | ";
@@ -193,21 +192,21 @@ 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__);
+ array($email), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Load userid
list($uid) = SQL_FETCHROW($result);
// Rewrite email address to contact link
- $email = URL."/modules.php?module=".$mod."&what=user_contct&u_id=".bigintval($uid);
+ $email = "{!URL!}/modules.php?module=".$mod."&what=user_contct&uid=".bigintval($uid);
} // END - if
// Free memory
@@ -219,8 +218,6 @@ WHERE email='%s'".$locked." LIMIT 1",
// Selects a random user id as the new referal id if they have at least X confirmed mails in this run
function SELECT_RANDOM_REFID () {
- global $_CONFIG;
-
// Default is zero refid
$refid = 0;
@@ -235,8 +232,8 @@ 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",
- array(getConfig('user_min_confirmed'), $randNum), __FILE__, __LINE__);
+ $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), __FUNCTION__, __LINE__);
// Do we have one entry there?
if (SQL_NUMROWS($result) == 1) {
@@ -244,8 +241,8 @@ 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",
- array($refid), __FILE__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `rand_confirmed`=0 WHERE userid=%s LIMIT 1",
+ array($refid), __FUNCTION__, __LINE__);
} // END - if
// Free result
@@ -260,23 +257,23 @@ 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",
- array($uid), __FILE__, __LINE__);
+ $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), __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".$LAST." FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
- array($uid, $hash), __FILE__, __LINE__);
+ $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), __FUNCTION__, __LINE__);
list($uid2, $password, $online, $login) = SQL_FETCHROW($result);
}
@@ -302,8 +299,8 @@ 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",
- array($hash, $uid), __FILE__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET password='%s' WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1",
+ 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));
@@ -336,8 +333,8 @@ 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",
- array($uid), __FILE__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET total_logins=total_logins+1".$ADD." WHERE userid=%s LIMIT 1",
+ array($uid), __FUNCTION__, __LINE__);
if (SQL_AFFECTEDROWS() == 1) {
// Procedure to checking for login data
if (($BONUS) && (EXT_IS_ACTIVE("bonus"))) {
@@ -349,25 +346,25 @@ 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",
- array($uid), __FILE__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET login_failures=login_failures+1,last_failure=NOW() WHERE userid=%s LIMIT 1",
+ array($uid), __FUNCTION__, __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",
- array($uid), __FILE__, __LINE__);
+ // @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), __FUNCTION__, __LINE__);
// Entry found?
if (SQL_NUMROWS($result) == 1) {
@@ -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",
- array($uid, $email), __FILE__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' OR email='%s' LIMIT 1",
+ 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__);
+ $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
+ 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__);
+ $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE email='%s' LIMIT 1",
+ array($email), __FUNCTION__, __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",
- array(generateHash($NEW_PASS), $uid), __FILE__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET password='%s' WHERE userid=%s LIMIT 1",
+ 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);
// ... 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