X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=343477e89101ab298cd11456a0754c92bd1132ec;hp=0221150793c16c8881fd9d20f3104bd205007b2c;hb=7c15ca79161bf475e958810a5b585bce869a2af9;hpb=d3c4fdd9bfab35389e1a5ff48f3952d527c7b4bb
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 0221150793..343477e891 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -580,10 +580,13 @@ function isMember () {
if (isset($GLOBALS['is_member'])) {
// Then return it
return $GLOBALS['is_member'];
- } // END - if
+ } elseif (getUserId() == 0) {
+ // No member
+ return false;
+ }
- // Init global 'status'
- $GLOBALS['status'] = false;
+ // Init global user data array
+ initUserData();
// Fix "deleted" cookies first
fixDeletedCookies(array('userid', 'u_hash'));
@@ -591,24 +594,16 @@ function isMember () {
// Are cookies set?
if ((isUserIdSet()) && (isSessionVariableSet('u_hash'))) {
// Cookies are set with values, but are they valid?
- $result = SQL_QUERY_ESC("SELECT `password`, `status`, `last_module`, `last_online` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
- array(getUserId()), __FUNCTION__, __LINE__);
- if (SQL_NUMROWS($result) == 1) {
- // Load data from cookies
- list($password, $GLOBALS['status'], $mod, $onl) = SQL_FETCHROW($result);
-
+ if (fetchUserData(getUserId()) === true) {
// Validate password by created the difference of it and the secret key
- $valPass = generatePassString($password);
+ $valPass = generatePassString(getUserData('password'));
// Transfer last module and online time
- if ((!empty($mod)) && (empty($GLOBALS['last_online']['module']))) {
- // @TODO Try to rewrite this to one or more functions
- $GLOBALS['last_online']['module'] = $mod;
- $GLOBALS['last_online']['online'] = $onl;
- } // END - if
+ $GLOBALS['last_online']['module'] = getUserData('last_module');
+ $GLOBALS['last_online']['online'] = getUserData('last_online');
// So did we now have valid data and an unlocked user?
- if (($GLOBALS['status'] == 'CONFIRMED') && ($valPass == getSession('u_hash'))) {
+ if ((getUserData('status') == 'CONFIRMED') && ($valPass == getSession('u_hash'))) {
// Account is confirmed and all cookie data is valid so he is definely logged in! :-)
$ret = true;
} else {
@@ -621,9 +616,6 @@ function isMember () {
//* DEBUG: */ print(__LINE__."***
");
destroyUserSession();
}
-
- // Free memory
- SQL_FREERESULT($result);
} else {
// Cookie data is invalid!
//* DEBUG: */ print(__LINE__."///
");
@@ -637,6 +629,77 @@ function isMember () {
return $ret;
}
+// Fetch user data for given user id
+function fetchUserData ($userid, $column='userid') {
+ // Don't look for invalid userids...
+ if ($userid < 1) {
+ // Invalid, so abort here
+ debug_report_bug('User id ' . $userid . ' is invalid.');
+ } elseif (isset($GLOBALS['user_data'][$userid])) {
+ // Use cache, so it is fine
+ return true;
+ }
+
+ // By default none was found
+ $found = false;
+
+ // Do we have userid/refid?
+ if (($column == 'userid') || ($column == 'refid')) {
+ // Then secure the id
+ $userid = bigintval($userid);
+ } // END - if
+
+ // Query for the user
+ $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `%s`='%s' LIMIT 1",
+ array($column, $userid), __FUNCTION__, __LINE__);
+
+ // Do we have a record?
+ if (SQL_NUMROWS($result) == 1) {
+ // Load data from cookies
+ $data = SQL_FETCHARRAY($result);
+
+ // Set the userid for later use
+ setCurrentUserId($data['userid']);
+ $GLOBALS['user_data'][getCurrentUserId()] = $data;
+
+ // Rewrite 'last_failure' if found
+ if (isset($GLOBALS['user_data'][getCurrentUserId()]['last_failure'])) {
+ // Backup the raw one and zero it
+ $GLOBALS['user_data'][getCurrentUserId()]['last_failure_raw'] = $GLOBALS['user_data'][getCurrentUserId()]['last_failure'];
+ $GLOBALS['user_data'][getCurrentUserId()]['last_failure'] = 0;
+
+ // Is it not zero?
+ if ($GLOBALS['user_data'][getCurrentUserId()]['last_failure_raw'] != '0000-00-00 00:00:00') {
+ // Seperate data/time
+ $array = explode(' ', $GLOBALS['user_data'][getCurrentUserId()]['last_failure']);
+
+ // Seperate data and time again
+ $array['date'] = explode('-', $array[0]);
+ $array['time'] = explode(':', $array[1]);
+
+ // Now pass it to mktime()
+ $GLOBALS['user_data'][getCurrentUserId()]['last_failure'] = mktime(
+ $array['time'][0],
+ $array['time'][1],
+ $array['time'][2],
+ $array['date'][1],
+ $array['date'][2],
+ $array['date'][0]
+ );
+ } // END - if
+ } // END - if
+
+ // Found, but valid?
+ $found = isUserDataValid();
+ } // END - if
+
+ // Free memory
+ SQL_FREERESULT($result);
+
+ // Return result
+ return $found;
+}
+
// This patched function will reduce many SELECT queries for the specified or current admin login
function isAdmin ($admin = '') {
// Init variables
@@ -806,6 +869,8 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry=false) {
// Run SQL command
$result = SQL_QUERY($sql, __FUNCTION__, __LINE__);
+
+ // Should we look for affected rows (only update) or found rows?
if ($updateEntry === true) {
// Check updated/affected rows
$ret = (SQL_AFFECTEDROWS() == 1);
@@ -824,24 +889,22 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry=false) {
return $ret;
}
-//
+// Send out mails depending on the 'mod/modes' combination
+// @TODO Lame description for this function
function sendModeMails ($mod, $modes) {
// Load hash
- $result_main = SQL_QUERY_ESC("SELECT `password` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1",
- array(getUserId()), __FUNCTION__, __LINE__);
- if (SQL_NUMROWS($result_main) == 1) {
- // Load hash from database
- list($hashDB) = SQL_FETCHROW($result_main);
-
+ if (fetchUserData(getUserId())) {
// Extract salt from cookie
$salt = substr(getSession('u_hash'), 0, -40);
// Now let's compare passwords
- $hash = generatePassString($hashDB);
+ $hash = generatePassString(getUserData('password'));
+
+ // Does the hash match or should we change it?
if (($hash == getSession('u_hash')) || (postRequestElement('pass1') == postRequestElement('pass2'))) {
// Load user's data 0 1 2 3 4 5 6 7
$result = SQL_QUERY_ESC("SELECT gender, surname, family, street_nr, country, zip, city, email FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s AND password='%s' LIMIT 1",
- array(getUserId(), $hashDB), __FUNCTION__, __LINE__);
+ array(getUserId(), getUserData('password')), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Load the data
$content = SQL_FETCHARRAY($result, 0, false);
@@ -853,7 +916,7 @@ function sendModeMails ($mod, $modes) {
$content['gender'] = translateGender($content['gender']);
// Clear/init the content variable
- $content['info'] = '';
+ $content['message'] = '';
switch ($mod) {
case 'mydata':
@@ -870,10 +933,10 @@ function sendModeMails ($mod, $modes) {
default:
logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unknown mode %s detected.", $mode));
- $content['message'] = getMessage('MEMBER_UNKNOWN_MODE').": ".$mode."\n\n";
+ $content['message'] = getMessage('MEMBER_UNKNOWN_MODE') . ': ' . $mode . "\n\n";
break;
} // END - switch
- } // END - if
+ } // END - foreach
if (isExtensionActive('country')) {
// Replace code with description
@@ -1161,6 +1224,7 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
}
// Return value
+ //* DEBUG: */ print 'ret='.$ret.'
';
return $ret;
}
// Getter fro ref level percents
@@ -1256,14 +1320,10 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
if ($locked === true) $data = 'locked_points';
// Check user account
- $result_user = SQL_QUERY_ESC("SELECT `refid`, `email` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s AND `status`='CONFIRMED' LIMIT 1",
- array(bigintval($userid)), __FUNCTION__, __LINE__);
-
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):userid={$userid},numRows=".SQL_NUMROWS($result_user).",points={$points}
");
- if (SQL_NUMROWS($result_user) == 1) {
+ //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):userid={$userid},points={$points}
");
+ if (fetchUserData($userid)) {
// This is the user and his ref
- list($ref, $email) = SQL_FETCHROW($result_user);
- $GLOBALS['cache_array']['add_userid'][$ref] = $userid;
+ $GLOBALS['cache_array']['add_userid'][getUserData('refid')] = $userid;
// Get percents
$per = getReferalLevelPercents($GLOBALS['ref_level']);
@@ -1296,20 +1356,20 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
} // END - if
// Points updated, maybe I shall send him an email?
- if (($sendNotify === true) && ($ref > 0) && ($locked === false)) {
+ if (($sendNotify === true) && (getUserData('refid') > 0) && ($locked === false)) {
// Prepare content
$content = array(
'percents' => $per,
'level' => bigintval($GLOBALS['ref_level']),
'points' => $ref_points,
- 'refid' => bigintval($ref)
+ 'refid' => getUserData('refid')
);
// Load email template
$message = loadEmailTemplate('confirm-referal', $content, bigintval($userid));
- sendEmail($email, THANX_REFERRAL_ONE, $message);
- } elseif (($sendNotify) && ($ref == 0) && ($locked === false) && ($add_mode == 'direct')) {
+ sendEmail(getUserData('email'), THANX_REFERAL_ONE, $message);
+ } elseif (($sendNotify) && (getUserData('refid') == 0) && ($locked === false) && ($add_mode == 'direct')) {
// Prepare content
$content = array(
'text' => getMessage('REASON_DIRECT_PAYMENT'),
@@ -1320,21 +1380,19 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
$message = loadEmailTemplate('add-points', $content, $userid);
// And sent it away
- sendEmail($email, getMessage('SUBJECT_DIRECT_PAYMENT'), $message);
+ sendEmail(getUserData('email'), getMessage('SUBJECT_DIRECT_PAYMENT'), $message);
if (!isGetRequestElementSet('mid')) loadTemplate('admin_settings_saved', false, getMessage('ADMIN_POINTS_ADDED'));
}
// Maybe there's another ref?
- if (($ref > 0) && ($points > 0) && ($ref != $userid) && ($add_mode == 'ref')) {
+ if ((getUserData('refid') > 0) && ($points > 0) && (getUserData('refid') != $userid) && ($add_mode == 'ref')) {
// Then let's credit him here...
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):userid={$userid},ref={$ref},points={$points} - ADVANCE!
");
- addPointsThroughReferalSystem(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), $ref, $points, $sendNotify, $ref, $locked);
+ //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):userid={$userid},ref=".getUserData('refid').",points={$points} - ADVANCE!
");
+ addPointsThroughReferalSystem(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), getUserData('refid'), $points, $sendNotify, getUserData('refid'), $locked);
} // END - if
} // END - if
} // END - if
- // Free result
- SQL_FREERESULT($result_user);
//* DEBUG: */ print("----------------------- ".__FUNCTION__." - EXIT ------------------------
");
}
@@ -1357,23 +1415,24 @@ function updateReferalCounter ($userid) {
//* DEBUG: */ print(__FUNCTION__."(".__LINE__."):userid={$userid}
");
} // END - if
- // Check for his referal
- $result = SQL_QUERY_ESC("SELECT `refid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `userid`=%s LIMIT 1",
- array(bigintval($userid)), __FUNCTION__, __LINE__);
+ // Init referal id
+ $ref = 0;
- // Load refid
- list($ref) = SQL_FETCHROW($result);
+ // Check for his referal
+ if (fetchUserData($userid)) {
+ // Get it
+ $ref = getUserData('refid');
+ } // END - if
- // Free memory
- SQL_FREERESULT($result);
//* DEBUG: */ print(__FUNCTION__."(".__LINE__."):userid={$userid},ref={$ref}
");
// When he has a referal...
if (($ref > 0) && ($ref != $userid)) {
// Move to next referal level and count his counter one up!
//* DEBUG: */ print(__FUNCTION__."(".__LINE__."):ref={$ref} - ADVANCE!
");
- $GLOBALS['cache_array']['ref_level'][$userid]++; updateReferalCounter($ref);
- } elseif ((($ref == $userid) || ($ref == 0)) && (getExtensionVersion('cache') >= '0.1.2')) {
+ $GLOBALS['cache_array']['ref_level'][$userid]++;
+ updateReferalCounter($ref);
+ } elseif ((($ref == $userid) || ($ref == 0)) && (isExtensionInstalledAndNewer('cache', '0.1.2'))) {
// Remove cache here
//* DEBUG: */ print(__FUNCTION__."(".__LINE__."):ref={$ref} - CACHE!
");
rebuildCacheFile('refsystem', 'refsystem');