X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fuser_functions.php;h=f5103384843691161a1fae922459644670daabbe;hp=d00650cfbd63708fed76562aa83bd76f115d5d99;hb=ee0625c4882bb462985c504abf65a3ef0e7bf1eb;hpb=820a65d753f3103901bec03a93588044670684fa
diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index d00650cfbd..f510338484 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -10,7 +10,12 @@
* -------------------------------------------------------------------- *
* Kurzbeschreibung : Spezielle Funktionen fuer die user-Erweiterung *
* -------------------------------------------------------------------- *
- * *
+ * $Revision:: $ *
+ * $Date:: $ *
+ * $Tag:: 0.2.1-FINAL $ *
+ * $Author:: $ *
+ * Needs to be in all Files and every File needs "svn propset *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2008 by Roland Haeder *
* For more information visit: http://www.mxchange.org *
@@ -38,28 +43,27 @@ 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);
+ $alphabet = array(getMessage('_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",getMessage('_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 / $_CONFIG['user_alpha']) == round($counter / $_CONFIG['user_alpha'])) && ($counter > 0)) {
+ if ((($counter / getConfig('user_alpha')) == round($counter / getConfig('user_alpha'))) && ($counter > 0)) {
$OUT .= " ]
[ ";
} elseif ( $counter != $num ) {
$OUT .= " | ";
@@ -70,7 +74,7 @@ function alpha($sortby, $colspan, $return=false) {
// Load template
$OUT = LOAD_TEMPLATE("admin_list_user_alpha", true);
- if ($return) {
+ if ($return === true) {
// Return generated code
return $OUT;
} else {
@@ -80,39 +84,39 @@ function alpha($sortby, $colspan, $return=false) {
}
// Add links for sorting
-function SortLinks($letter, $sortby, $colspan, $return=false) {
+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;
+ if ($letter == "front") $letter = getMessage('_ALL2');
// Prepare array with all possible sorters
$list = array(
- 'userid' => _UID,
- 'family' => FAMILY_NAME,
- 'email' => ADDY,
- 'REMOTE_ADDR' => REMOTE_IP
+ 'userid' => getMessage('_UID'),
+ 'family' => getMessage('FAMILY_NAME'),
+ 'email' => getMessage('ADDY'),
+ 'REMOTE_ADDR' => getMessage('REMOTE_IP')
);
// Add nickname if extension is installed
if (EXT_IS_ACTIVE("nickname")) {
- $list['nickname'] = NICKNAME;
- }
+ $list['nickname'] = getMessage('NICKNAME');
+ } // END - if
foreach ($list as $sort => $title) {
if ($sortby == $sort) {
- $OUT .= "".$title." | ";
+ $OUT .= "".$title." | ";
} else {
- $OUT .= "".$title." | ";
+ $OUT .= "".$title." | ";
}
} // END - foreach
@@ -120,7 +124,7 @@ function SortLinks($letter, $sortby, $colspan, $return=false) {
// Load template
$OUT = LOAD_TEMPLATE("admin_list_user_sort", true);
- if ($return) {
+ if ($return === true) {
// Return code
return $OUT;
} else {
@@ -130,10 +134,10 @@ function SortLinks($letter, $sortby, $colspan, $return=false) {
}
// Add page navigation
-function ADD_PAGENAV($PAGES, $offset, $show_form, $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 +145,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 .= " | ";
@@ -181,7 +185,7 @@ function ADD_PAGENAV($PAGES, $offset, $show_form, $colspan,$return=false) {
// Load template
$OUT = LOAD_TEMPLATE("admin_list_user_pagenav", true);
- if ($return) {
+ if ($return === true) {
// Return code
return $OUT;
} else {
@@ -193,21 +197,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
-WHERE email='%s'".$locked." LIMIT 1",
- array($email), __FILE__, __LINE__);
+FROM `{!_MYSQL_PREFIX!}_user_data`
+WHERE `email`='%s'".$locked." LIMIT 1",
+ 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,15 +223,13 @@ 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;
// Is the extension version fine?
if (GET_EXT_VERSION("user") >= "0.3.4") {
// Get all user ids
- $totalUsers = GET_TOTAL_DATA("CONFIRMED", "user_data", "userid", "status", true, " AND `rand_confirmed` >= ".$_CONFIG['user_min_confirmed']."");
+ $totalUsers = GET_TOTAL_DATA("CONFIRMED", "user_data", "userid", "status", true, " AND `rand_confirmed` >= ".getConfig('user_min_confirmed')."");
// Do we have at least one?
if ($totalUsers > 0) {
@@ -235,8 +237,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($_CONFIG['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 +246,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
@@ -257,5 +259,210 @@ function SELECT_RANDOM_REFID () {
return $refid;
}
+// Do the user login
+function USER_DO_LOGIN ($uid, $passwd) {
+ // Init variables
+ $dmy = "";
+
+ // Add last_login if available
+ $lastOnline = "";
+ if (GET_EXT_VERSION("sql_patches") >= "0.2.8") {
+ $lastOnline = ", last_login";
+ } // END - if
+
+ // Init array
+ $content = array(
+ 'password' => "",
+ 'userid' => "",
+ 'last_online' => 0,
+ 'last_login' => 0,
+ 'hash' => ""
+ );
+
+ // Check login data
+ 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), __FUNCTION__, __LINE__);
+ } 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, $content['hash']), __FUNCTION__, __LINE__);
+ }
+
+ // Load entry
+ $content = SQL_FETCHARRAY($result);
+ if (!empty($content['userid'])) $uid = bigintval($content['userid']);
+
+ // Is there an entry?
+ if ((SQL_NUMROWS($result) == 1) && ((($probe_nickname) && (!empty($content['userid']))) || ($content['userid'] == $uid))) {
+ // Free result
+ SQL_FREERESULT($result);
+
+ // Check for old MD5 passwords
+ if ((strlen($content['password']) == 32) && (md5($passwd) == $content['password'])) {
+ // Just set the hash to the password from DB... :)
+ $content['hash'] = $content['password'];
+ } else {
+ // Hash password with improved way for comparsion
+ $content['hash'] = generateHash($passwd, substr($content['password'], 0, -40));
+ }
+
+ // Does the password match the hash?
+ if ($content['hash'] == $content['password']) {
+ // New hashed password found so let's generate a new one
+ $content['hash'] = generateHash($passwd);
+
+ // ... and update database
+ // @TODO Make this filter working: $ADDON = runFilterChain('post_login_update', $content);
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET password='%s' WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1",
+ array($content['hash'], $uid), __FUNCTION__, __LINE__);
+
+ // No login bonus by default
+ $GLOBALS['bonus_payed'] = false;
+
+ // Probe for last online timemark
+ $probe = time() - $content['last_online'];
+ if (!empty($content['last_login'])) $probe = time() - $content['last_login'];
+ if ((GET_EXT_VERSION("bonus") >= "0.2.2") && ($probe >= getConfig('login_timeout'))) {
+ // Add login bonus to user's account
+ $add = sprintf(", login_bonus=login_bonus+%s",
+ (float)getConfig('login_bonus')
+ );
+ $GLOBALS['bonus_payed'] = true;
+
+ // Subtract login bonus from userid's account or jackpot
+ if ((GET_EXT_VERSION("bonus") >= "0.3.5") && (getConfig('bonus_mode') != "ADD")) BONUS_POINTS_HANDLER('login_bonus');
+ } // END - if
+
+ // Calculate new hash with the secret key and master salt together
+ $content['hash'] = generatePassString($content['hash']);
+
+ // Update global array
+ // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
+ setUserId($uid);
+
+ // Try to set session data (which shall normally always work!)
+ if ((set_session('userid', $uid )) && (set_session('u_hash', $content['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), __FUNCTION__, __LINE__);
+ if (SQL_AFFECTEDROWS() == 1) {
+ // Procedure to checking for login data
+ if (($GLOBALS['bonus_payed']) && (EXT_IS_ACTIVE("bonus"))) {
+ // Bonus added (just displaying!)
+ $URL = "modules.php?module=chk_login&mode=bonus";
+ } else {
+ // Bonus not added
+ $URL = "modules.php?module=chk_login&mode=login";
+ }
+ } else {
+ // Cannot update counter!
+ $URL = "modules.php?module=index&what=login&login=".getCode('CNTR_FAILED');
+ }
+ } else {
+ // Cookies not setable!
+ $URL = "modules.php?module=index&what=login&login=".getCode('NO_COOKIES');
+ }
+ } 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), __FUNCTION__, __LINE__);
+
+ // Wrong password!
+ $URL = "modules.php?module=index&what=login&login=".getCode('WRONG_PASS');
+ }
+ } elseif ((($probe_nickname) && (!empty($content['userid']))) || ($content['userid'] == $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",
+ array($uid), __FUNCTION__, __LINE__);
+
+ // Entry found?
+ if (SQL_NUMROWS($result) == 1) {
+ // Load status
+ list($status) = SQL_FETCHROW($result);
+
+ // Create an error code from given status
+ $errorCode = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status);
+ } else {
+ // ID not found!
+ $errorCode = getCode('WRONG_ID');
+ }
+
+ // Construct URL
+ $URL = "modules.php?module=index&what=login&login=".$errorCode;
+ } else {
+ // ID not found!
+ $URL = "modules.php?module=index&what=login&login=".getCode('WRONG_ID');
+ }
+
+ // Return URL
+ return $URL;
+}
+
+// Try to send a new password for the given user account
+function USER_DO_NEW_PASSWORD ($email, $uid) {
+ // Compile email when found in address (only secure chars!)
+ if (!empty($email)) $email = str_replace("{DOT}", '.', $email);
+
+ // Init result and error
+ $errorCode = "";
+ $result = false;
+
+ // 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), __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)), __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), __FUNCTION__, __LINE__);
+ } else {
+ // Userid not set!
+ DEBUG_LOG(__FUNCTION__, __LINE__, "Userid is not set! BUG!");
+ $errorCode = getCode('WRONG_ID');
+ }
+
+ // Any entry found?
+ if (SQL_NUMROWS($result) == 1) {
+ // This data is valid, so we create a new pass... :-)
+ list($uid, $status) = SQL_FETCHROW($result);
+
+ 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), __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, getMessage('GUEST_NEW_PASSWORD'), $msg);
+
+ // Output note to user
+ LOAD_TEMPLATE("admin_settings_saved", false, getMessage('GUEST_NEW_PASSWORD_SEND'));
+ } else {
+ // Account is locked or unconfirmed
+ $errorCode = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status);
+
+ // Load URL
+ LOAD_URL("modules.php?module=index&what=login&login=".$errorCode);
+ }
+ } else {
+ // ID or email is wrong
+ LOAD_TEMPLATE("admin_settings_saved", false, "{--GUEST_WRONG_ID_EMAIL--}");
+ }
+
+ // Return the error code
+ return $errorCode;
+}
+
// [EOF]
?>