X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=d56ddf7cd7d4dab2c0ca44b795f2cf40b43b2d11;hp=30aa831a000bf40ea87d550c7444c0dc160917a1;hb=c3f2beb3f1d47c9593d262d7f5dac47640b4aa52;hpb=8b4478db59f4631cae077d87cc40aa8a56bfba0c
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 30aa831a00..d56ddf7cd7 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -326,7 +326,7 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false) {
if (isAdmin()) $ADD = '';
$dummy = substr($search, 0, -4);
- $ADD .= " AND `action`='".getModeAction($accessLevel, $dummy)."'";
+ $ADD .= " AND `action`='".getActionFromModuleWhat($accessLevel, $dummy)."'";
} elseif (($accessLevel == 'sponsor') || ($accessLevel == 'engine')) {
// Sponsor / engine menu
$type = 'what';
@@ -568,7 +568,7 @@ function isMember () {
setCurrentUserid(getMemberId());
}
- // Init global user data array
+ // Init user data array
initUserData();
// Fix "deleted" cookies first
@@ -579,7 +579,7 @@ function isMember () {
// Cookies are set with values, but are they valid?
if (fetchUserData(getMemberId()) === true) {
// Validate password by created the difference of it and the secret key
- $valPass = generatePassString(getUserData('password'));
+ $valPass = encodeHashForCookie(getUserData('password'));
// Transfer last module and online time
$GLOBALS['last_online']['module'] = getUserData('last_module');
@@ -693,51 +693,56 @@ function fetchUserData ($userid, $column = 'userid') {
}
// This patched function will reduce many SELECT queries for the specified or current admin login
-function isAdmin ($admin = '') {
+function isAdmin ($adminLogin = '') {
// Init variables
- $ret = false; $passCookie = ''; $valPass = '';
- //* DEBUG: */ print(__FUNCTION__.':'.$admin.'
');
+ $ret = false;
+ $passCookie = '';
+ $valPass = '';
+ //* DEBUG: */ print(__FUNCTION__.':'.$adminLogin.'
');
// If admin login is not given take current from cookies...
- if ((empty($admin)) && (isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5'))) {
+ if ((empty($adminLogin)) && (isSessionVariableSet('admin_login')) && (isSessionVariableSet('admin_md5'))) {
// Get admin login and password from session/cookies
- $admin = getSession('admin_login');
+ $adminLogin = getSession('admin_login');
$passCookie = getSession('admin_md5');
} // END - if
- //* DEBUG: */ print(__FUNCTION__.':'.$admin.'/'.$passCookie.'
');
+ //* DEBUG: */ print(__FUNCTION__.':'.$adminLogin.'/'.$passCookie.'
');
// Do we have cache?
- if (!isset($GLOBALS['is_admin'][$admin])) {
+ if (!isset($GLOBALS['is_admin'][$adminLogin])) {
// Init it with failed
- $GLOBALS['is_admin'][$admin] = false;
+ $GLOBALS['is_admin'][$adminLogin] = false;
// Search in array for entry
if (isset($GLOBALS['admin_hash'])) {
// Use cached string
$valPass = $GLOBALS['admin_hash'];
- } elseif ((!empty($passCookie)) && (isAdminHashSet($admin) === true) && (!empty($admin))) {
+ } elseif ((!empty($passCookie)) && (isAdminHashSet($adminLogin) === true) && (!empty($adminLogin))) {
// Login data is valid or not?
- $valPass = generatePassString(getAdminHash($admin));
+ $valPass = encodeHashForCookie(getAdminHash($adminLogin));
// Cache it away
$GLOBALS['admin_hash'] = $valPass;
// Count cache hits
incrementStatsEntry('cache_hits');
- } elseif ((!empty($admin)) && ((!isExtensionActive('cache'))) || (isAdminHashSet($admin) === false)) {
+ } elseif ((!empty($adminLogin)) && ((!isExtensionActive('cache')) || (isAdminHashSet($adminLogin) === false))) {
// Get admin hash and hash it
- $valPass = generatePassString(getAdminHash($admin));
+ $valPass = encodeHashForCookie(getAdminHash($adminLogin));
+
+ // Cache it away
+ $GLOBALS['admin_hash'] = $valPass;
}
if (!empty($valPass)) {
// Check if password is valid
//* DEBUG: */ print(__FUNCTION__ . ':(' . $valPass . '==' . $passCookie . ')='.intval($valPass == $passCookie).'
');
- $GLOBALS['is_admin'][$admin] = (($valPass == $passCookie) || ((strlen($valPass) == 32) && ($valPass == md5($passCookie))) || (($valPass == '*FAILED*') && (!isExtensionActive('cache'))));
+ $GLOBALS['is_admin'][$adminLogin] = (($valPass == $passCookie) || ((strlen($valPass) == 32) && ($valPass == md5($passCookie))) || (($valPass == '*FAILED*') && (!isExtensionActive('cache'))));
} // END - if
} // END - if
// Return result of comparision
- return $GLOBALS['is_admin'][$admin];
+ return $GLOBALS['is_admin'][$adminLogin];
}
// Generates a list of "max receiveable emails per day"
@@ -865,29 +870,29 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry=false) {
}
// Get action value from mode (admin/guest/member) and what-value
-function getModeAction ($mode, $what) {
+function getActionFromModuleWhat ($module, $what) {
// Init status
$data['action'] = '';
- //* DEBUG: */ print(__LINE__.'='.$mode.'/'.$what.'/'.getAction()."=
");
+ //* DEBUG: */ print(__LINE__.'='.$module.'/'.$what.'/'.getAction()."=
");
if (!isExtensionInstalledAndNewer('sql_patches', '0.0.5')) {
// sql_patches is missing so choose depending on mode
if (isWhatSet()) {
// Use setted what
$what = getWhat();
- } elseif ($mode == 'admin') {
+ } elseif ($module == 'admin') {
// Admin area
$what = 'overview';
} else {
// Everywhere else
$what = 'welcome';
}
- } elseif ((empty($what)) && ($mode != 'admin')) {
+ } elseif ((empty($what)) && ($module != 'admin')) {
// Use configured 'home'
$what = getConfig('index_home');
} // END - if
- if ($mode == 'admin') {
+ if ($module == 'admin') {
// Action value for admin area
if (isGetRequestParameterSet('action')) {
// Use from request!
@@ -903,19 +908,19 @@ function getModeAction ($mode, $what) {
// Get it directly from URL
return getAction();
}
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."): ret=".$data['action'].'
');
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__ . '): ret=' . $data['action'] . '
');
// Does the module have a menu?
- if (ifModuleHasMenu($mode)) {
+ if (ifModuleHasMenu($module)) {
// Rewriting modules to menu
- $mode = mapModuleToTable($mode);
+ $module = mapModuleToTable($module);
// Guest and member menu is 'main' as the default
if (empty($data['action'])) $data['action'] = 'main';
// Load from database
$result = SQL_QUERY_ESC("SELECT `action` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `what`='%s' LIMIT 1",
- array($mode, $what), __FUNCTION__, __LINE__);
+ array($module, $what), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Load action value and pray that this one is the right you want... ;-)
$data = SQL_FETCHARRAY($result);
@@ -923,7 +928,7 @@ function getModeAction ($mode, $what) {
// Free memory
SQL_FREERESULT($result);
- } elseif ((!isExtensionInstalled('sql_patches')) && (($mode != 'admin') && ($mode != 'unknown'))) {
+ } elseif ((!isExtensionInstalled('sql_patches')) && ($module != 'admin') && ($module != 'unknown')) {
// No sql_patches installed, but maybe we need to register an admin?
if (isAdminRegistered()) {
// Redirect to admin area
@@ -1176,12 +1181,12 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
// Count up referal depth
if (!isset($GLOBALS['ref_level'])) {
// Initialialize referal system
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."): Referal system initialized!
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."): Referal system initialized!
");
$GLOBALS['ref_level'] = '0';
} else {
// Increase referal level
$GLOBALS['ref_level']++;
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."): Referal level increased. DEPTH={$GLOBALS['ref_level']}
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."): Referal level increased. DEPTH={$GLOBALS['ref_level']}
");
}
// Default is 'normal' points
@@ -1191,39 +1196,39 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
if ($locked === true) $data = 'locked_points';
// Check user account
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):userid={$userid},points={$points}
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):userid={$userid},points={$points}
");
if (fetchUserData($userid)) {
// This is the user and his ref
$GLOBALS['cache_array']['add_userid'][getUserData('refid')] = $userid;
// Get percents
$per = getReferalLevelPercents($GLOBALS['ref_level']);
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):userid={$userid},points={$points},depth={$GLOBALS['ref_level']},per={$per},mode={$add_mode}
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):userid={$userid},points={$points},depth={$GLOBALS['ref_level']},per={$per},mode={$add_mode}
");
// Some percents found?
if ($per > 0) {
// Calculate new points
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):userid={$userid},points={$points},per={$per},depth={$GLOBALS['ref_level']}
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):userid={$userid},points={$points},per={$per},depth={$GLOBALS['ref_level']}
");
$ref_points = $points * $per / 100;
// Pay refback here if level > 0 and in ref-mode
if ((isExtensionActive('refback')) && ($GLOBALS['ref_level'] > 0) && ($per < 100) && ($add_mode == "ref") && (isset($GLOBALS['cache_array']['add_userid'][$userid]))) {
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):userid={$userid},data={$GLOBALS['cache_array']['add_userid'][$userid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - BEFORE!
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):userid={$userid},data={$GLOBALS['cache_array']['add_userid'][$userid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - BEFORE!
");
$ref_points = addRefbackPoints($GLOBALS['cache_array']['add_userid'][$userid], $userid, $points, $ref_points);
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):userid={$userid},data={$GLOBALS['cache_array']['add_userid'][$userid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - AFTER!
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):userid={$userid},data={$GLOBALS['cache_array']['add_userid'][$userid]},ref_points={$ref_points},depth={$GLOBALS['ref_level']} - AFTER!
");
} // END - if
// Update points...
SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_user_points` SET `%s`=`%s`+%s WHERE `userid`=%s AND `ref_depth`='%s' LIMIT 1",
array($data, $data, $ref_points, bigintval($userid), bigintval($GLOBALS['ref_level'])), __FUNCTION__, __LINE__);
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):data={$data},ref_points={$ref_points},userid={$userid},depth={$GLOBALS['ref_level']},mode={$add_mode} - UPDATE! (".SQL_AFFECTEDROWS().")
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):data={$data},ref_points={$ref_points},userid={$userid},depth={$GLOBALS['ref_level']},mode={$add_mode} - UPDATE! (".SQL_AFFECTEDROWS().")
");
// No entry updated?
if (SQL_AFFECTEDROWS() < 1) {
// First ref in this level! :-)
SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_points` (`userid`,`ref_depth`,`%s`) VALUES (%s,'%s',%s)",
array($data, bigintval($userid), bigintval($GLOBALS['ref_level']), $ref_points), __FUNCTION__, __LINE__);
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):data={$data},ref_points={$ref_points},userid={$userid},depth={$GLOBALS['ref_level']},mode={$add_mode} - INSERTED! (".SQL_AFFECTEDROWS().")
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):data={$data},ref_points={$ref_points},userid={$userid},depth={$GLOBALS['ref_level']},mode={$add_mode} - INSERTED! (".SQL_AFFECTEDROWS().")
");
} // END - if
// Points updated, maybe I shall send him an email?
@@ -1241,7 +1246,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
// Send email
sendEmail($userid, getMessage('THANX_REFERAL_ONE_SUBJECT'), $message);
- } elseif (($sendNotify) && (getUserData('refid') == '0') && ($locked === false) && ($add_mode == 'direct')) {
+ } elseif (($sendNotify === true) && (getUserData('refid') == '0') && ($locked === false) && ($add_mode == 'direct')) {
// Prepare content
$content = array(
'text' => getMessage('REASON_DIRECT_PAYMENT'),
@@ -1259,7 +1264,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
// Maybe there's another 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=".getUserData('refid').",points={$points} - ADVANCE!
");
+ //* 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
@@ -1272,19 +1277,19 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
function updateReferalCounter ($userid) {
// Make it sure referal level zero (member him-/herself) is at least selected
if (empty($GLOBALS['cache_array']['ref_level'][$userid])) $GLOBALS['cache_array']['ref_level'][$userid] = 1;
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):userid={$userid},level={$GLOBALS['cache_array']['ref_level'][$userid]}
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):userid={$userid},level={$GLOBALS['cache_array']['ref_level'][$userid]}
");
// Update counter
SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_refsystem` SET `counter`=`counter`+1 WHERE `userid`=%s AND `level`='%s' LIMIT 1",
array(bigintval($userid), $GLOBALS['cache_array']['ref_level'][$userid]), __FUNCTION__, __LINE__);
// When no entry was updated then we have to create it here
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):updated=".SQL_AFFECTEDROWS().'
');
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):updated=".SQL_AFFECTEDROWS().'
');
if (SQL_AFFECTEDROWS() < 1) {
// First count!
SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_refsystem` (`userid`, `level`, `counter`) VALUES (%s,%s,1)",
array(bigintval($userid), $GLOBALS['cache_array']['ref_level'][$userid]), __FUNCTION__, __LINE__);
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):userid={$userid}
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):userid={$userid}
");
} // END - if
// Init referal id
@@ -1296,17 +1301,17 @@ function updateReferalCounter ($userid) {
$ref = getUserData('refid');
} // END - if
- //* DEBUG: */ print(__FUNCTION__."(".__LINE__."):userid={$userid},ref={$ref}
");
+ //* 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!
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):ref={$ref} - ADVANCE!
");
$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!
");
+ //* DEBUG: */ print(__FUNCTION__ . '(' . __LINE__."):ref={$ref} - CACHE!
");
rebuildCacheFile('refsystem', 'refsystem');
}
@@ -1336,21 +1341,21 @@ function sendAdminEmails ($subj, $message) {
}
// Get id number from administrator's login name
-function getAdminId ($login) {
+function getAdminId ($adminLogin) {
// By default no admin is found
$data['id'] = '-1';
// Check cache
- if (isset($GLOBALS['cache_array']['admin']['admin_id'][$login])) {
+ if (isset($GLOBALS['cache_array']['admin']['admin_id'][$adminLogin])) {
// Use it if found to save SQL queries
- $data['id'] = $GLOBALS['cache_array']['admin']['admin_id'][$login];
+ $data['id'] = $GLOBALS['cache_array']['admin']['admin_id'][$adminLogin];
// Update cache hits
incrementStatsEntry('cache_hits');
} elseif (!isExtensionActive('cache')) {
// Load from database
$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
- array($login), __FUNCTION__, __LINE__);
+ array($adminLogin), __FUNCTION__, __LINE__);
// Do we have an entry?
if (SQL_NUMROWS($result) == 1) {
@@ -1377,28 +1382,34 @@ function getCurrentAdminId () {
$adminId = getAdminId($adminLogin);
// Remember in cache securely
- $GLOBALS['current_admin_id'] = bigintval($adminId);
+ setCurrentAdminId(bigintval($adminId));
} // END - if
// Return it
return $GLOBALS['current_admin_id'];
}
+// Setter for current admin id
+function setCurrentAdminId ($currentAdminId) {
+ // Set it secured
+ $GLOBALS['current_admin_id'] = bigintval($currentAdminId);
+}
+
// Get password hash from administrator's login name
-function getAdminHash ($admin) {
+function getAdminHash ($adminLogin) {
// By default an invalid hash is returned
$data['password'] = '-1';
- if (isAdminHashSet($admin)) {
+ if (isAdminHashSet($adminLogin)) {
// Check cache
- $data['password'] = $GLOBALS['cache_array']['admin']['password'][$admin];
+ $data['password'] = $GLOBALS['cache_array']['admin']['password'][$adminLogin];
// Update cache hits
incrementStatsEntry('cache_hits');
} elseif (!isExtensionActive('cache')) {
// Load from database
$result = SQL_QUERY_ESC("SELECT `password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
- array($admin), __FUNCTION__, __LINE__);
+ array($adminLogin), __FUNCTION__, __LINE__);
// Do we have an entry?
if (SQL_NUMROWS($result) == 1) {
@@ -1406,7 +1417,7 @@ function getAdminHash ($admin) {
$data = SQL_FETCHARRAY($result);
// Set cache
- setAdminHash($admin, $data['password']);
+ setAdminHash($adminLogin, $data['password']);
} // END - if
// Free result