X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fuser_functions.php;h=1241a8748bd1f4264365ed40c29be449ec00512d;hb=b4042713447d2eb3777a49f24523511dbba8970f;hp=488e8f6f4f10143a3c88904bf0f365581f068dd8;hpb=6449d733d65425128f9ebc3f9d9c818c6a7e5206;p=mailer.git
diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 488e8f6f4f..1241a8748b 100644
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -17,7 +17,7 @@
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
* Copyright (c) 2009 - 2011 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * 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 *
@@ -44,8 +44,8 @@ if (!defined('__SECURITY')) {
function alpha ($sortby) {
$add = '';
foreach (array('page','offset','mode','status') as $param) {
- if (isGetRequestParameterSet($param)) {
- $add .= '&' . $param . '=' . getRequestParameter($param);
+ if (isGetRequestElementSet($param)) {
+ $add .= '&' . $param . '=' . getRequestElement($param);
} // END - if
} // END - foreach
@@ -54,7 +54,7 @@ function alpha ($sortby) {
$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 {
@@ -84,16 +84,16 @@ function alpha ($sortby) {
// Add links for sorting
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/ mode
foreach (array('mode','status') as $param) {
- if (isGetRequestParameterSet($param)) {
- $add .= '&' . $param . '=' . getRequestParameter($param);
+ if (isGetRequestElementSet($param)) {
+ $add .= '&' . $param . '=' . getRequestElement($param);
} // END - if
} // END - foreach
@@ -142,29 +142,29 @@ function addPageNavigation ($numPages) {
if ($numPages > 1) {
// Create navigation links for every page
for ($page = 1; $page <= $numPages; $page++) {
- if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
+ if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
$OUT .= '-';
} else {
- if (!isGetRequestParameterSet('letter')) setGetRequestParameter('letter', '');
- if (!isGetRequestParameterSet('sortby')) setGetRequestParameter('sortby', 'userid');
+ if (!isGetRequestElementSet('letter')) setGetRequestElement('letter', '');
+ if (!isGetRequestElementSet('sortby')) setGetRequestElement('sortby', 'userid');
// Base link
$OUT .= '';
+ $OUT .= '&letter=' . getRequestElement('letter') . '&sortby=' . getRequestElement('sortby') . '&page=' . $page . '&offset=' . getConfig('user_limit') . '%}">';
}
$OUT .= $page;
- if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
+ if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
$OUT .= '-';
} else {
$OUT .= '';
@@ -192,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);
@@ -217,9 +223,9 @@ 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 = NULL;
@@ -239,7 +245,7 @@ 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);
} // END - if
@@ -328,12 +334,12 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
// Is the timeout reached?
if ($probe >= getConfig('login_timeout')) {
// Add login bonus to user's account
- $add = ', `login_bonus`=`login_bonus`+{?login_bonus?}';
+ $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')) && (getBonusMode() != 'ADD')) {
- handleBonusPoints('login_bonus');
+ handleBonusPoints('login_bonus', $userid);
} // END - if
} // END - if
} // END - if
@@ -462,8 +468,8 @@ function doNewUserPassword ($email, $userid) {
redirectToUrl('modules.php?module=index&what=login&login=' . $errorCode);
}
} else {
- // id or email is wrong
- displayMessage('{--GUEST_WRONG_ID_EMAIL--}');
+ // Id or email is wrong
+ displayMessage('{--GUEST_WRONG_ID_EMAIL--}');
}
// Return the error code
@@ -477,7 +483,7 @@ function getEpocheTimeFromUserStats ($statsType, $statsData, $userid = NULL) {
$data['inserted'] = '0';
// User id set?
- if ((isMemberIdSet()) && ($userid == '0')) {
+ if ((isMemberIdSet()) && (is_null($userid))) {
$userid = getMemberId();
} // END - if
@@ -595,12 +601,12 @@ LIMIT 1",
// And send him right away the confirmation mail
sendEmail($userid, '{--GUEST_THANX_CONFIRM--}', $message);
- // Maybe he got "referaled"?
+ // Maybe he got "referraled"?
if ((isValidUserId($refid)) && ($refid != $userid)) {
- // Select the referal 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())) {
@@ -609,18 +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
- initReferalSystem();
- addPointsThroughReferalSystem('referal_bonus', $refid, getPointsRef(), bigintval($userid));
+ // 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!
@@ -759,17 +765,35 @@ function doTemplateAdminListUserTitle ($template, $clear = false) {
$code = '{--ADMIN_LIST_ALL_ACCOUNTS--}';
// Do we have a 'status' or 'mode' set?
- if (isGetRequestParameterSet('status')) {
+ if (isGetRequestElementSet('status')) {
// Set title according to the 'status'
- $code = sprintf("{--ADMIN_LIST_STATUS_%s_ACCOUNTS--}", strtoupper(getRequestParameter('status')));
- } elseif (isGetRequestParameterSet('mode')) {
+ $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(getRequestParameter('mode')));
+ $code = sprintf("{--ADMIN_LIST_MODE_%s_ACCOUNTS--}", strtoupper(getRequestElement('mode')));
}
// Return the code
return $code;
}
+// Template call-back function for displaying "username"
+function doTemplateDisplayUsername ($template, $clear = false, $userid = NULL) {
+ // Is a userid set?
+ if (!isValidUserId($userid)) {
+ // Please don't call this without a valid userid
+ debug_report_bug(__FUNCTION__, __LINE__, 'template=' . $template . ',clear=' . intval($clear) . ',userid[' . gettype($userid) . ']=' . intval($userid) . ' - Invalid userid provided.');
+ } // END - if
+
+ // Do we have cache?
+ if (!isset($GLOBALS[__FUNCTION__][$userid])) {
+ // Generate code
+ $GLOBALS[__FUNCTION__][$userid] = $userid . ' ({%user,nickname,fixEmptyContentToDashes=' . $userid . '%})';
+ } // END - if
+
+ // Return cache
+ return $GLOBALS[__FUNCTION__][$userid];
+}
+
// [EOF]
?>