X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fuser_functions.php;h=80fcaf50ea493ff9d55480fc7ef4979fe53ad49f;hp=c3304a72fee35db3c32684f3d7932a8b34cb5dc3;hb=a18efdcd57ba91893f0958a457b5c58639b135c3;hpb=9553dbc9eed40bfa2beffa79813f2d5cd21fa8ac
diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index c3304a72fe..80fcaf50ea 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -14,12 +14,10 @@
* $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 - 2009 by Roland Haeder *
- * Copyright (c) 2009, 2010 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -43,24 +41,25 @@ if (!defined('__SECURITY')) {
} // END - if
// Add links for selecting some users
-function alpha ($sortby, $colspan, $return=false) {
- if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', 0);
- $add = '&page='.getRequestParameter('page').'&offset='.getRequestParameter('offset');
- if (isGetRequestParameterSet('mode')) $add .= '&mode='.getRequestParameter('mode');
+function alpha ($sortby) {
+ $add = '';
+ foreach (array('page','offset','mode','status') as $param) {
+ if (isGetRequestElementSet($param)) {
+ $add .= '&' . $param . '=' . getRequestElement($param);
+ } // END - if
+ } // END - foreach
/* Creates the list of letters and makes them a link. */
$alphabet = explode(',', '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,');
$num = count($alphabet) - 1;
$OUT = '';
while (list($counter, $ltr) = each($alphabet)) {
- if (getRequestParameter('letter') == $ltr) {
+ if (getRequestElement('letter') == $ltr) {
// Current letter is letter from URL
$OUT .= '' . $ltr . '';
} else {
// Output link to letter
- $OUT .= '' . $ltr . '';
+ $OUT .= '' . $ltr . '';
}
if ((($counter / getConfig('user_alpha')) == round($counter / getConfig('user_alpha'))) && ($counter > 0)) {
@@ -72,40 +71,40 @@ function alpha ($sortby, $colspan, $return=false) {
// Prepare content
$content = array (
- 'colspan2' => $colspan,
'alpha_selection' => $OUT
);
// Load template
$OUT = loadTemplate('admin_list_user_alpha', true, $content);
- if ($return === true) {
- // Return generated code
- return $OUT;
- } else {
- // Output generated code
- outputHtml($OUT);
- }
+
+ // Return generated code
+ return $OUT;
}
// Add links for sorting
-function addSortLinks ($letter, $sortby, $colspan, $return=false) {
+function addSortLinks ($letter, $sortby) {
$OUT = '';
- if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', 0);
- if (!isGetRequestParameterSet('page')) setGetRequestParameter('page' , 0);
+ if (!isGetRequestElementSet('offset')) setGetRequestElement('offset', 0);
+ if (!isGetRequestElementSet('page')) setGetRequestElement('page' , 0);
// Add page and offset
- $add = '&page=' . getRequestParameter('page') . '&offset=' . getRequestParameter('offset');
+ $add = '&page=' . getRequestElement('page') . '&offset=' . getRequestElement('offset');
- // Add status or mode
- if (isGetRequestParameterSet('status')) $add .= '&mode=' . getRequestParameter('status');
- elseif (isGetRequestParameterSet('mode')) $add .= '&mode=' . getRequestParameter('mode');
+ // Add status/ mode
+ foreach (array('mode','status') as $param) {
+ if (isGetRequestElementSet($param)) {
+ $add .= '&' . $param . '=' . getRequestElement($param);
+ } // END - if
+ } // END - foreach
// Makes order by links..
- if ($letter == 'front') $letter = '';
+ if ($letter == 'front') {
+ $letter = '';
+ } // END - if
// Prepare array with all possible sorters
$list = array(
- 'userid' => '{--_UID--}',
+ 'userid' => '{--_USERID--}',
'family' => '{--FAMILY--}',
'email' => '{--EMAIL--}',
'REMOTE_ADDR' => '{--REMOTE_IP--}'
@@ -124,79 +123,67 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
}
} // END - foreach
- // Add list and colspan
- $content['list'] = substr($OUT, 0, -13);
- $content['colspan2'] = $colspan;
+ // Add output
+ $content['list'] = substr($OUT, 0, -1);
// Load template
$OUT = loadTemplate('admin_list_user_sort', true, $content);
- // Should we return or output?
- if ($return === true) {
- // Return code
- return $OUT;
- } else {
- // Output code
- outputHtml($OUT);
- }
+ // Return code
+ return $OUT;
}
// Add page navigation
-function addPageNavigation ($numPages, $offset, $showForm, $colspan, $return=false) {
- // @TODO These two constants are no longer used, maybe we reactivate this code?
- //if ($showForm === true) {
- // // Load form for changing number of lines
- // define('__FORM_HEADER', loadTemplate('admin_list_user_sort_form', true));
- // define('__FORM_FOOTER', '| |
');
- //} else {
- // // Empty row
- // define('__FORM_HEADER', '| |
');
- // define('__FORM_FOOTER', '| |
');
- //}
-
+function addPageNavigation ($numPages) {
+ // Start with empty content
$OUT = '';
- for ($page = 1; $page <= $numPages; $page++) {
- if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
- $OUT .= '-';
- } else {
- if (!isGetRequestParameterSet('letter')) setGetRequestParameter('letter', '');
- if (!isGetRequestParameterSet('sortby')) setGetRequestParameter('sortby', 'userid');
- // Base link
- $OUT .= '';
- }
+ // Add status/mode
+ foreach (array('mode','status') as $param) {
+ if (isGetRequestElementSet($param)) {
+ $OUT .= '&' . $param . '=' . getRequestElement($param);
+ } // END - if
+ } // END - foreach
- $OUT .= $page;
+ // Letter and so on
+ $OUT .= '&letter=' . getRequestElement('letter') . '&sortby=' . getRequestElement('sortby') . '&page=' . $page . '&offset=' . getConfig('user_limit') . '%}">';
+ }
- if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
- $OUT .= '-';
- } else {
- $OUT .= '';
- }
+ $OUT .= $page;
+
+ if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
+ $OUT .= '-';
+ } else {
+ $OUT .= '';
+ }
- if ($page < $numPages) $OUT .= '|';
- } // END - for
+ if ($page < $numPages) {
+ $OUT .= '|';
+ } // END - if
+ } // END - for
- // Remember the list and colspan
- $content['list'] = $OUT;
- $content['colspan2'] = $colspan;
+ // Add list output
+ $content['list'] = $OUT;
- // Load template
- $OUT = loadTemplate('admin_list_user_pagenav', true, $content);
- if ($return === true) {
- // Return code
- return $OUT;
- } else {
- // Output code
- outputHtml($OUT);
- }
+ // Load template
+ $OUT = loadTemplate('admin_list_user_pagenav', true, $content);
+ } // END - if
+
+ // Return code
+ return $OUT;
}
// Create email link to user's account
@@ -205,16 +192,22 @@ function generateUserEmailLink ($email, $mod = 'admin') {
$locked = " AND `status`='CONFIRMED'";
// But admins shall always see it
- if (isAdmin()) $locked = '';
+ if (isAdmin()) {
+ $locked = '';
+ } // END - if
+ // Search for the email address
$result = SQL_QUERY_ESC("SELECT
`userid`
FROM
`{?_MYSQL_PREFIX?}_user_data`
WHERE
- `email`='%s'" . $locked."
+ '%s' REGEXP `email`
+ " . $locked . "
LIMIT 1",
array($email), __FUNCTION__, __LINE__);
+
+ // Do we have an entry?
if (SQL_NUMROWS($result) == 1) {
// Load userid
list($userid) = SQL_FETCHROW($result);
@@ -230,11 +223,11 @@ LIMIT 1",
return $email;
}
-// Selects a random user id as the new referal id if they have at least X confirmed mails in this run
+// Selects a random user id as the new referral id if they have at least X confirmed mails in this run
// @TODO Double-check configuration entry here
-function determineRandomReferalId () {
+function determineRandomReferralId () {
// Default is zero refid
- $refid = '0';
+ $refid = NULL;
// Is the extension version fine?
if (isExtensionInstalledAndNewer('user', '0.3.4')) {
@@ -252,12 +245,8 @@ function determineRandomReferalId () {
// Do we have one entry there?
if (SQL_NUMROWS($result) == 1) {
- // Use that userid as new referal id
+ // Use that userid as new referral id
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), __FUNCTION__, __LINE__);
} // END - if
// Free result
@@ -304,11 +293,13 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
if (($errorCode == '0') && ($isFound === true)) {
// Get user data array and set userid (e.g. important if we login with nickname)
$content = getUserDataArray();
- if (!empty($content['userid'])) $userid = bigintval($content['userid']);
+ if (!empty($content['userid'])) {
+ $userid = bigintval($content['userid']);
+ } // END - if
} // END - if
// Is there an entry?
- if ((isUserDataValid()) && (getUserData('status') == 'CONFIRMED') && (!empty($content['userid']))) {
+ if (($errorCode == '0') && (isUserDataValid()) && (getUserData('status') == 'CONFIRMED') && (!empty($content['userid']))) {
// Check for old MD5 passwords
if ((strlen(getUserData('password')) == 32) && (md5($passwd) == getUserData('password'))) {
// Just set the hash to the password from DB... :)
@@ -331,17 +322,26 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
// No login bonus by default
$GLOBALS['bonus_payed'] = false;
- // Probe for last online timemark
- $probe = time() - getUserData('last_online');
- if (getUserData('last_login') > 0) $probe = time() - getUserData('last_login');
+ // Is bonus up-to-date?
+ if (isExtensionInstalledAndNewer('bonus', '0.2.2')) {
+ // Probe for last online timemark
+ $probe = time() - getUserData('last_online');
+ if (getUserData('last_login') > 0) {
+ // Use timestamp from last login
+ $probe = time() - getUserData('last_login');
+ } // END - if
- if ((isExtensionInstalledAndNewer('bonus', '0.2.2')) && ($probe >= getConfig('login_timeout'))) {
- // Add login bonus to user's account
- $add = ', `login_bonus`=`login_bonus`+{?login_bonus?}';
- $GLOBALS['bonus_payed'] = true;
+ // Is the timeout reached?
+ if ($probe >= getConfig('login_timeout')) {
+ // Add login bonus to user's account
+ $add = ',`login_bonus`=`login_bonus`+{?login_bonus?}';
+ $GLOBALS['bonus_payed'] = true;
- // Subtract login bonus from userid's account or jackpot
- if ((isExtensionInstalledAndNewer('bonus', '0.3.5')) && (getConfig('bonus_mode') != 'ADD')) handleBonusPoints('login_bonus');
+ // Subtract login bonus from userid's account or jackpot
+ if ((isExtensionInstalledAndNewer('bonus', '0.3.5')) && (getBonusMode() != 'ADD')) {
+ handleBonusPoints('login_bonus', $userid);
+ } // END - if
+ } // END - if
} // END - if
// @TODO Make this filter working: $url = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
@@ -355,7 +355,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
// Update database records
SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `total_logins`=`total_logins`+1" . $add . " WHERE `userid`=%s LIMIT 1",
array($userid), __FUNCTION__, __LINE__);
- if (SQL_AFFECTEDROWS() == 1) {
+ if (!SQL_HASZEROAFFECTED()) {
// Is a success URL set?
if (empty($successUrl)) {
// Procedure to checking for login data
@@ -379,7 +379,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
$errorCode = getCode('COOKIES_DISABLED');
}
} elseif (isExtensionInstalledAndNewer('sql_patches', '0.6.1')) {
- // Update failture counter
+ // Update failure counter
SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `login_failures`=`login_failures`+1,`last_failure`=NOW() WHERE `userid`=%s LIMIT 1",
array($userid), __FUNCTION__, __LINE__);
@@ -393,7 +393,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
// Set userid in session
setSession('current_userid', getUserData('userid'));
} elseif (!isUserDataValid()) {
- // User id not found!
+ // User id not found
$errorCode = getCode('WRONG_ID');
} else {
// Unknown error
@@ -406,7 +406,9 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
$url = $errorUrl . $errorCode;
// Extension set? Then add it as well.
- if (!empty($ext)) $url .= '&ext=' . $ext;
+ if (!empty($ext)) {
+ $url .= '&ext=' . $ext;
+ } // END - if
} // END - if
// Return URL
@@ -415,77 +417,78 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
// Try to send a new password for the given user account
function doNewUserPassword ($email, $userid) {
- // Init result and error
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'email=' . $email . ',userid=' . $userid . ' - ENTERED!');
+ // Init found-status and error
$errorCode = '';
- $result = false;
+ $accountFound = false;
// Probe userid/nickname
- // @TODO We should try to rewrite this to fetchUserData() somehow
if (!empty($email)) {
// Email entered
- $result = SQL_QUERY_ESC("SELECT `userid`, `status` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `email`='%s' OR `email`='%s' LIMIT 1",
- array($email, str_replace('.', '{DOT}', $email)), __FUNCTION__, __LINE__);
+ $accountFound = fetchUserData($email, 'email');
} elseif ((isExtensionActive('nickname')) && (isNicknameOrUserid($userid))) {
// Nickname entered
- $result = SQL_QUERY_ESC("SELECT `userid`, `status` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `nickname`='%s' OR `userid`='%s' OR `email`='%s' LIMIT 1",
- array($userid, $userid, $email), __FUNCTION__, __LINE__);
+ $accountFound = fetchUserData($userid, 'nickname');
} elseif ((isValidUserId($userid)) && (empty($email))) {
// Direct userid entered
- $result = SQL_QUERY_ESC("SELECT `userid`, `status` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
- array(bigintval($userid)), __FUNCTION__, __LINE__);
+ $accountFound = fetchUserData($userid);
} else {
// Userid not set!
- logDebugMessage(__FUNCTION__, __LINE__, 'Userid is not set! BUG!');
- $errorCode = getCode('WRONG_ID');
+ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',email=' . $email . ': Important variables are empty.');
}
// Any entry found?
- if (SQL_NUMROWS($result) == 1) {
- // This data is valid, so we create a new pass... :-)
- list($userid, $status) = SQL_FETCHROW($result);
-
- if ($status == 'CONFIRMED') {
- // Ooppps, this was missing! ;-) We should update the database...
+ if ($accountFound === true) {
+ // Is the account confirmed
+ if (getUserData('status') == 'CONFIRMED') {
+ // Generate new password
$NEW_PASS = generatePassword();
+
+ // Update database
SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_data` SET `password`='%s' WHERE `userid`=%s LIMIT 1",
- array(generateHash($NEW_PASS), $userid), __FUNCTION__, __LINE__);
+ array(generateHash($NEW_PASS), getUserData('userid')), __FUNCTION__, __LINE__);
// Prepare data and message for email
- $message = loadEmailTemplate('new-pass', array('new_pass' => $NEW_PASS, 'nickname' => $userid), $userid);
+ $message = loadEmailTemplate('guest_new_password',
+ array(
+ 'new_pass' => $NEW_PASS,
+ 'nickname' => $userid
+ ), bigintval(getUserData('userid')));
// ... and send it away
- sendEmail($userid, '{--GUEST_NEW_PASSWORD--}', $message);
+ sendEmail(bigintval(getUserData('userid')), '{--GUEST_NEW_PASSWORD--}', $message);
// Output note to user
- loadTemplate('admin_settings_saved', false, '{--GUEST_NEW_PASSWORD_SEND--}');
+ displayMessage('{--GUEST_NEW_PASSWORD_SEND--}');
} else {
// Account is locked or unconfirmed
- $errorCode = generateErrorCodeFromUserStatus($status);
+ $errorCode = generateErrorCodeFromUserStatus(getUserData('status'));
// Load URL
- redirectToUrl('modules.php?module=index&what=login&login='.$errorCode);
+ redirectToUrl('modules.php?module=index&what=login&login=' . $errorCode);
}
} else {
// id or email is wrong
- loadTemplate('admin_settings_saved', false, '{--GUEST_WRONG_ID_EMAIL--}');
+ displayMessage('{--GUEST_WRONG_ID_EMAIL--}');
}
// Return the error code
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'email=' . $email . ',userid=' . $userid . ',errorCode=' . $errorCode . ' - EXIT!');
return $errorCode;
}
// Get timestamp for given stats type and data
-function getTimestampFromUserStats ($statsType, $statsData, $userid = '0') {
+function getEpocheTimeFromUserStats ($statsType, $statsData, $userid = NULL) {
// Default timestamp is zero
$data['inserted'] = '0';
// User id set?
- if ((isMemberIdSet()) && ($userid == '0')) {
+ if ((isMemberIdSet()) && (is_null($userid))) {
$userid = getMemberId();
} // END - if
// Is the extension installed and updated?
- if ((!isExtensionActive('sql_patches')) || (isExtensionOlder('sql_patches', '0.5.6'))) {
+ if ((!isExtensionActive('sql_patches')) || (isExtensionInstalledAndOlder('sql_patches', '0.5.6'))) {
// Return zero here
return $data['inserted'];
} // END - if
@@ -522,13 +525,16 @@ LIMIT 1",
// Inserts user stats
function insertUserStatsRecord ($userid, $statsType, $statsData) {
// Is the extension installed and updated?
- if ((!isExtensionActive('sql_patches')) || (isExtensionOlder('sql_patches', '0.5.6'))) {
+ if ((!isExtensionActive('sql_patches')) || (isExtensionInstalledAndOlder('sql_patches', '0.5.6'))) {
// Return zero here
return false;
} // END - if
+ // Default is not working
+ $return = false;
+
// Does it exist?
- if ((!getTimestampFromUserStats($statsType, $statsData, $userid)) && (!is_array($statsData))) {
+ if ((!getEpocheTimeFromUserStats($statsType, $statsData, $userid)) && (!is_array($statsData))) {
// Then insert it!
SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_stats_data` (`userid`,`stats_type`,`stats_data`) VALUES (%s,'%s','%s')",
array(
@@ -536,10 +542,16 @@ function insertUserStatsRecord ($userid, $statsType, $statsData) {
$statsType,
$statsData
), __FUNCTION__, __LINE__);
+
+ // Does it have worked?
+ $return = (!SQL_HASZEROAFFECTED());
} elseif (is_array($statsData)) {
// Invalid data!
logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . $userid . ',type=' . $statsType . ',data=' . gettype($statsData) . ': Invalid statistics data type!');
}
+
+ // Return status
+ return $return;
}
// Confirms a user account
@@ -551,14 +563,14 @@ function doConfirmUserAccount ($hash) {
);
// Initialize the user id
- $userid = '0';
+ $userid = NULL;
// Search for an unconfirmed or confirmed account
- $result = SQL_QUERY_ESC("SELECT `userid`, `email`, `refid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `user_hash`='%s' AND (`status`='UNCONFIRMED' OR `status`='CONFIRMED') LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT `userid`,`refid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `user_hash`='%s' AND (`status`='UNCONFIRMED' OR `status`='CONFIRMED') LIMIT 1",
array($hash), __FILE__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Ok, he want's to confirm now so we load some data
- list($userid, $email, $refid) = SQL_FETCHROW($result);
+ list($userid, $refid) = SQL_FETCHROW($result);
// Fetch user data
if (!fetchUserData($userid)) {
@@ -574,7 +586,6 @@ function doConfirmUserAccount ($hash) {
`{?_MYSQL_PREFIX?}_user_data`
SET
`status`='CONFIRMED',
- `ref_payout`={?ref_payout?},
`user_hash`=NULL
WHERE
`user_hash`='%s' AND
@@ -583,19 +594,19 @@ LIMIT 1",
array($hash), __FILE__, __LINE__);
// Was it updated?
- if (SQL_AFFECTEDROWS() == 1) {
+ if (!SQL_HASZEROAFFECTED()) {
// Send email if updated
- $message = loadEmailTemplate('confirm-member', $content, bigintval($userid));
+ $message = loadEmailTemplate('guest_user_confirmed', $content, bigintval($userid));
// And send him right away the confirmation mail
- sendEmail($email, '{--GUEST_THANX_CONFIRM--}', $message);
+ sendEmail($userid, '{--GUEST_THANX_CONFIRM--}', $message);
- // Maybe he got "referaled"?
- if (($refid > 0) && ($refid != $userid)) {
- // Select the referal userid
+ // Maybe he got "referraled"?
+ if ((isValidUserId($refid)) && ($refid != $userid)) {
+ // Select the referral userid
if (fetchUserData($refid)) {
// Update ref counter...
- updateReferalCounter($refid);
+ updateReferralCounter($refid);
// If version matches add ref bonus to refid's account
if ((isExtensionInstalledAndNewer('bonus', '0.4.4')) && (isBonusRallyeActive())) {
@@ -604,19 +615,18 @@ LIMIT 1",
array(bigintval($refid)), __FILE__, __LINE__);
// Subtract points from system
- handleBonusPoints(getConfig('bonus_ref'));
+ handleBonusPoints(getConfig('bonus_ref'), $refid);
} // END - if
- // Add one-time referal bonus over referal system or directly
- // @TODO Try to rewrite the following unset()
- unset($GLOBALS['ref_level']);
- addPointsThroughReferalSystem('referal_bonus', $refid, getPointsRef(), true, bigintval($userid), getConfig('reg_points_mode'));
+ // Add one-time referral bonus over referral system or directly
+ initReferralSystem();
+ addPointsThroughReferralSystem('referral_bonus', $refid, getPointsRef(), bigintval($userid));
} // END - if
} // END - if
if (isExtensionActive('rallye')) {
// Add user to rallye (or not?)
- addUserToReferalRallye(bigintval($userid));
+ addUserToReferralRallye(bigintval($userid));
} // END - if
// Account confirmed!
@@ -646,7 +656,7 @@ LIMIT 1",
}
// Load template
- loadTemplate('admin_settings_saved', false, $content['message']);
+ displayMessage($content['message']);
}
// Does resend the user's confirmation link for given email address
@@ -662,10 +672,10 @@ function doResendUserConfirmationLink ($email) {
// Is the account unconfirmed?
if ($content['status'] == 'UNCONFIRMED') {
// Load email template
- $message = loadEmailTemplate('guest_request_confirm', array('hash' => $content['user_hash']), $content['userid']);
+ $message = loadEmailTemplate('guest_request_confirm', array(), $content['userid']);
// Send email
- sendEmail($email, '{--GUEST_REQUEST_CONFIRM_LINK_SUBJECT--}', $message);
+ sendEmail($content['userid'], '{--GUEST_REQUEST_CONFIRM_LINK_SUBJECT--}', $message);
} // END - if
// Create message based on the status
@@ -673,14 +683,14 @@ function doResendUserConfirmationLink ($email) {
} // END - if
// Output message
- loadTemplate('admin_settings_saved', false, $message);
+ displayMessage($message);
}
// Get a message (somewhat translation) from user status for confirmation link.
// This is different to translateUserStatus() in text messages.
function getConfirmationMessageFromUserStatus ($status) {
// Default is 'UNKNOWN'
- $message = getMaskedMessage('GUEST_LOGIN_ID_UNKNOWN_STATUS', $status);
+ $message = '{%message,GUEST_LOGIN_ID_UNKNOWN_STATUS=' . $status . '%}';
// Which status is it?
switch ($status) {
@@ -714,11 +724,17 @@ function doExpressionUser ($data) {
// User-related data, so is there a userid?
if (!empty($data['matches'][4][$data['key']])) {
// Do we have a userid or $userid?
- if ($data['matches'][4][$data['key']] == '$userid') {
+ if (substr($data['matches'][4][$data['key']], 0, 1) == '$') {
// Use dynamic call
- $functionName = "getFetchedUserData('userid', \$userid, '" . $data['callback'] . "')";
+ $functionName = "getFetchedUserData('userid', " . $data['matches'][4][$data['key']] . ", '" . $data['callback'] . "')";
} elseif (!empty($data['matches'][4][$data['key']])) {
- // User data found
+ // Do we have a number or a dollar sign in front of it?
+ if (preg_replace('/[^0123456789]/', '', $data['matches'][4][$data['key']]) != $data['matches'][4][$data['key']]) {
+ // Possible database column, so get it again
+ $data['matches'][4][$data['key']] = "getFetchedUserData('userid', getMemberId(), '" . $data['matches'][4][$data['key']] . "')";
+ } // END - if
+
+ // Fix all together
$functionName = "getFetchedUserData('userid', " . $data['matches'][4][$data['key']] . ", '" . $data['callback'] . "')";
}
} elseif ((!empty($data['callback'])) && (isUserDataValid())) {
@@ -731,6 +747,7 @@ function doExpressionUser ($data) {
// Surround the original function call with it
$functionName = $data['extra_func'] . '(' . $functionName . ')';
} // END - if
+ //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'functionName=' . $functionName);
// Generate replacer
$replacer = '{DQUOTE} . ' . $functionName . ' . {DQUOTE}';
@@ -742,5 +759,23 @@ function doExpressionUser ($data) {
return $code;
}
+// Template call-back function for list_user admin function
+function doTemplateAdminListUserTitle ($template, $clear = false) {
+ // Init title with "all accounts"
+ $code = '{--ADMIN_LIST_ALL_ACCOUNTS--}';
+
+ // Do we have a 'status' or 'mode' set?
+ if (isGetRequestElementSet('status')) {
+ // Set title according to the 'status'
+ $code = sprintf("{--ADMIN_LIST_STATUS_%s_ACCOUNTS--}", strtoupper(getRequestElement('status')));
+ } elseif (isGetRequestElementSet('mode')) {
+ // Set title according to the "mode"
+ $code = sprintf("{--ADMIN_LIST_MODE_%s_ACCOUNTS--}", strtoupper(getRequestElement('mode')));
+ }
+
+ // Return the code
+ return $code;
+}
+
// [EOF]
?>