X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=4b9ee0e0138ad015586eaf8baec4091bb696f930;hp=143048b6de4a766f7c5bb710b7ffc09f0f8f181e;hb=0851db137e420b90617f47b77de2302e770f5f02;hpb=20cff9828debc7f67cda7d4c32a0314aae26b793
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 143048b6de..4b9ee0e013 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -108,8 +108,8 @@ function addYouAreHereLink ($accessLevel, $FQFN, $return = false) {
$dummy = substr($search, 0, -4);
$ADD .= sprintf(" AND `action`='%s'", getActionFromModuleWhat($accessLevel, $dummy));
- } elseif (($accessLevel == 'sponsor') || ($accessLevel == 'engine')) {
- // Sponsor / engine menu
+ } elseif ($accessLevel == 'sponsor') {
+ // Sponsor menu
$type = 'what';
$search = $file;
$modCheck = getModule();
@@ -428,6 +428,12 @@ function isMember () {
// Fetch user data for given user id
function fetchUserData ($value, $column = 'userid') {
+ // Extension ext-user must be there at any case
+ if (!isExtensionActive('user')) {
+ // Absent ext-user is really not good
+ return false;
+ } // END - if
+
// If we should look for userid secure&set it here
if (substr($column, -2, 2) == 'id') {
// Secure userid
@@ -444,8 +450,8 @@ function fetchUserData ($value, $column = 'userid') {
// Use cache, so it is fine
return true;
}
- } elseif (isUserDataValid()) {
- // Use cache, so it is fine
+ } elseif (isUserDataValid()) {
+ // Using cache is fine
return true;
}
@@ -630,18 +636,21 @@ function addMaxReceiveList ($mode, $default = '', $return = false) {
// Checks wether the given email address is used.
function isEmailTaken ($email) {
+ // Replace dot with {DOT}
+ $email = str_replace('.', '{DOT}', $email);
+
// Query the database
- $result = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `email` LIKE '%%%s%%' OR `email` LIKE '%%%s%%' LIMIT 1",
- array($email, str_replace('.', '{DOT}', $email)), __FUNCTION__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT `userid` FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `email` LIKE '%%%s%%' LIMIT 1",
+ array($email), __FUNCTION__, __LINE__);
// Is the email there?
- $ret = (SQL_NUMROWS($result) == 1);
+ $isTaken = (SQL_NUMROWS($result) == 1);
// Free the result
SQL_FREERESULT($result);
// Return result
- return $ret;
+ return $isTaken;
}
// Validate the given menu action
@@ -665,7 +674,7 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry=false) {
//* DEBUG: */ debugOutput(__LINE__ . ':' . $mode . '/' . $action . '/' . $what . '*');
if (($mode != 'admin') && ($updateEntry === true)) {
// Update guest or member menu
- $sql = SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET counter=counter+1 WHERE `action`='%s' AND `what`='%s'".$add." LIMIT 1",
+ $sql = SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `counter`=`counter`+1 WHERE `action`='%s' AND `what`='%s'".$add." LIMIT 1",
array(
$mode,
$action,
@@ -749,7 +758,7 @@ function getActionFromModuleWhat ($module, $what) {
// Get it directly from URL
return getAction();
}
- //* DEBUG: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . '): ret=' . $data['action']);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ' ret=' . $data['action']);
// Does the module have a menu?
if (ifModuleHasMenu($module)) {
@@ -839,7 +848,7 @@ function getPaymentTitlePrice ($pid, $full=false) {
// Get (basicly) the price of given payment id
function getPaymentPoints ($pid, $lookFor = 'price') {
// Default value...
- $data[$lookFor] = '-1';
+ $data[$lookFor] = -1;
// Search for it in database
$result = SQL_QUERY_ESC("SELECT `%s` FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`=%s LIMIT 1",
@@ -996,7 +1005,7 @@ function getReferalLevelPercents ($level) {
/**
*
- * Dynamic referal system, can also send mails!
+ * Dynamic referal and points system, can also send mails!
*
* subject = Subject line, write in lower-case letters and underscore is allowed
* userid = Referal id wich should receive...
@@ -1004,105 +1013,112 @@ function getReferalLevelPercents ($level) {
* sendNotify = shall I send the referal an email or not?
* refid = inc/modules/guest/what-confirm.php need this
* locked = Shall I pay it to normal (false) or locked (true) points ammount?
- * add_mode = Add points only to $userid or also refs? (WARNING! Changing 'ref' to 'direct'
+ * add_mode = Add points only to $userid or also refs? (WARNING! Changing 'REFERAL' to 'DIRECT'
* for default value will cause no referal will get points ever!!!)
*/
-function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify = false, $refid = '0', $add_mode = 'ref') {
+function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify = false, $refid = '0', $addMode = 'REFERAL') {
// By default nothing has been added
$added = false;
//* DEBUG: */ debugOutput('----------------------- ' . __FUNCTION__ . ' - ENTRY ------------------------- ');
- // Convert mode to lower-case
- $add_mode = strtolower($add_mode);
+ // Convert mode to upper-case
+ $addMode = strtoupper($addMode);
// When $userid = '0' add points to jackpot
if (($userid == '0') && (isExtensionActive('jackpot'))) {
// Add points to jackpot
- addPointsToJackpot($points);
- return;
+ return addPointsToJackpot($points);
} // END - if
// Count up referal depth
if (!isset($GLOBALS['ref_level'])) {
// Initialialize referal system
- //* DEBUG: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . '): Referal system initialized!');
- $GLOBALS['ref_level'] = '0';
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ' Referal system initialized!');
+ $GLOBALS['ref_level'] = NULL;
} else {
// Increase referal level
$GLOBALS['ref_level']++;
- //* DEBUG: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . '): Referal level increased. DEPTH='.$GLOBALS['ref_level']);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, ' Referal level increased. DEPTH='.$GLOBALS['ref_level']);
}
// Check user account
- //* DEBUG: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . '):userid='.$userid.',points='.$points);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.$userid.',points='.$points);
if (fetchUserData($userid)) {
// Determine wether the user has some mails to click before he/she gets the points
$locked = ifUserPointsLocked($userid);
- // Default is 'normal' points
- $data = 'points';
-
- // Which points, locked or normal?
- if ($locked === true) {
- $data = 'locked_points';
- } // END - if
+ // Detect database column
+ $pointsColumn = determinePointsColumnFromSubjectLocked($subject, $locked);
// This is the user and his ref
$GLOBALS['cache_array']['add_userid'][getUserData('refid')] = $userid;
// Get percents
$per = getReferalLevelPercents($GLOBALS['ref_level']);
- //* DEBUG: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . '):userid='.$userid.',points='.$points.',depth='.$GLOBALS['ref_level'].',per='.$per.',mode='.$add_mode);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.$userid.',points='.$points.',depth='.$GLOBALS['ref_level'].',per='.$per.',mode='.$addMode);
// Some percents found?
if ($per > 0) {
// Calculate new points
- //* DEBUG: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . '):userid='.$userid.',points='.$points.',per='.$per.',depth='.$GLOBALS['ref_level']);
+ //* DEBUG: */ logDebugMessage(__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: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . '):userid='.$userid.',data='.$GLOBALS['cache_array']['add_userid'][$userid].',ref_points='.$ref_points.',depth='.$GLOBALS['ref_level'].' - BEFORE!');
+ if ((isExtensionActive('refback')) && ($GLOBALS['ref_level'] > 0) && ($per < 100) && ($addMode == 'REFERAL') && (isset($GLOBALS['cache_array']['add_userid'][$userid]))) {
+ //* DEBUG: */ logDebugMessage(__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: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . '):userid='.$userid.',data='.$GLOBALS['cache_array']['add_userid'][$userid].',ref_points='.$ref_points.',depth='.$GLOBALS['ref_level'].' - AFTER!');
+ //* DEBUG: */ logDebugMessage(__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: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . '):data='.$data.',ref_points='.$ref_points.',userid='.$userid.',depth='.$GLOBALS['ref_level'].',mode='.$add_mode.' - UPDATE! ('.SQL_AFFECTEDROWS().')');
+ array(
+ $pointsColumn,
+ $pointsColumn,
+ $ref_points,
+ bigintval($userid),
+ makeZeroToNull($GLOBALS['ref_level'])
+ ), __FUNCTION__, __LINE__);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'pointsColumn='.$pointsColumn.',ref_points='.$ref_points.',userid='.$userid.',depth='.$GLOBALS['ref_level'].',mode='.$addMode.' - UPDATE! ('.SQL_AFFECTEDROWS().')');
// No entry updated?
if (SQL_HASZEROAFFECTED()) {
// 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: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . '):data='.$data.',ref_points='.$ref_points.',userid='.$userid.',depth='.$GLOBALS['ref_level'].',mode='.$add_mode.' - INSERTED! ('.SQL_AFFECTEDROWS().')');
+ SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_points` (`userid`, `ref_depth`, `%s`) VALUES (%s, %s, %s)",
+ array(
+ $pointsColumn,
+ bigintval($userid),
+ makeZeroToNull($GLOBALS['ref_level']),
+ $ref_points
+ ), __FUNCTION__, __LINE__);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'data='.$pointsColumn.',ref_points='.$ref_points.',userid='.$userid.',depth='.$GLOBALS['ref_level'].',mode='.$addMode.' - INSERTED! ('.SQL_AFFECTEDROWS().')');
} // END - if
// Check affected rows
$added = SQL_AFFECTEDROWS();
- //* DEBUG: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . '):added='.intval($added));
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'added='.intval($added));
// Prepare data for the filter
$filterData = array(
- 'subject' => $subject,
- 'userid' => $userid,
- 'points' => $points,
- 'notify' => $sendNotify,
- 'refid' => $refid,
- 'locked' => $locked,
- 'mode' => 'add',
- 'sub_mode' => $add_mode,
- 'added' => $added
+ 'subject' => $subject,
+ 'userid' => $userid,
+ 'points' => $points,
+ 'ref_points' => $ref_points,
+ 'column' => $pointsColumn,
+ 'notify' => $sendNotify,
+ 'refid' => $refid,
+ 'locked' => $locked,
+ 'mode' => 'add',
+ 'add_mode' => $addMode,
+ 'added' => $added
);
// Filter it now
- $filterData = runFilterChain('add_points', $filterData);
+ $filterData = runFilterChain('post_add_points', $filterData);
// Extract $added
$added = $filterData['added'];
- //* DEBUG: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . '):added='.intval($added));
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'added='.intval($added));
// Points updated, maybe I shall send him an email?
if (($sendNotify === true) && (isValidUserId(getUserData('refid'))) && ($locked === false)) {
@@ -1114,11 +1130,11 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
);
// Load email template
- $message = loadEmailTemplate('confirm-referal', $content, bigintval($userid));
+ $message = loadEmailTemplate('guest_user_confirmed_referal', $content, bigintval($userid));
// Send email
sendEmail($userid, '{--THANX_REFERAL_ONE_SUBJECT--}', $message);
- } elseif (($sendNotify === true) && (!isValidUserId(getUserData('refid'))) && ($locked === false) && ($add_mode == 'direct')) {
+ } elseif (($sendNotify === true) && (!isValidUserId(getUserData('refid'))) && ($locked === false) && ($addMode == 'DIRECT')) {
// Prepare content
$content = array(
'reason' => '{--REASON_DIRECT_PAYMENT--}',
@@ -1126,7 +1142,7 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
);
// Load message
- $message = loadEmailTemplate('add-points', $content, $userid);
+ $message = loadEmailTemplate('member_add_points', $content, $userid);
// And sent it away
sendEmail($userid, '{--DIRECT_PAYMENT_SUBJECT--}', $message);
@@ -1137,9 +1153,9 @@ function addPointsThroughReferalSystem ($subject, $userid, $points, $sendNotify
}
// Maybe there's another ref?
- if ((isValidUserId(getUserData('refid'))) && ($points > 0) && (getUserData('refid') != $userid) && ($add_mode == 'ref')) {
+ if ((isValidUserId(getUserData('refid'))) && ($points > 0) && (getUserData('refid') != $userid) && ($addMode == 'REFERAL')) {
// Then let's credit him here...
- //* DEBUG: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . '):userid='.$userid.',ref='.getUserData('refid').',points='.$points.' - ADVANCE!');
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.$userid.',ref='.getUserData('refid').',points='.$points.' - ADVANCE!');
$added = ($added && addPointsThroughReferalSystem(sprintf("%s_ref:%s", $subject, $GLOBALS['ref_level']), getUserData('refid'), $points, $sendNotify, getUserData('refid')));
} // END - if
} // END - if
@@ -1153,14 +1169,14 @@ 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: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . '):userid='.$userid.',level='.$GLOBALS['cache_array']['ref_level'][$userid]);
+ //* DEBUG: */ logDebugMessage(__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: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . '):updated=' . SQL_AFFECTEDROWS());
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'updated=' . SQL_AFFECTEDROWS());
if (SQL_HASZEROAFFECTED()) {
// First count!
SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_refsystem` (`userid`, `level`, `counter`) VALUES (%s,%s,1)",
@@ -1168,7 +1184,7 @@ function updateReferalCounter ($userid) {
bigintval($userid),
$GLOBALS['cache_array']['ref_level'][$userid]
), __FUNCTION__, __LINE__);
- //* DEBUG: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . '):userid='.$userid);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid='.$userid);
} // END - if
// Init referal id
@@ -1180,17 +1196,17 @@ function updateReferalCounter ($userid) {
$ref = getUserData('refid');
} // END - if
- //* DEBUG: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . '):userid='.$userid.',ref='.$ref);
+ //* DEBUG: */ logDebugMessage(__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: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . '):ref='.$ref.' - ADVANCE!');
+ //* DEBUG: */ logDebugMessage(__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: */ debugOutput(__FUNCTION__ . '(' . __LINE__ . '):ref='.$ref.' - CACHE!');
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ref='.$ref.' - CACHE!');
rebuildCache('refsystem', 'refsystem');
}
@@ -1223,7 +1239,7 @@ function sendAdminEmails ($subj, $message) {
// Get id number from administrator's login name
function getAdminId ($adminLogin) {
// By default no admin is found
- $data['id'] = '-1';
+ $data['id'] = -1;
// Check cache
if (isset($GLOBALS['cache_array']['admin']['admin_id'][$adminLogin])) {
@@ -1278,7 +1294,7 @@ function setCurrentAdminId ($currentAdminId) {
// Get password hash from administrator's login name
function getAdminHash ($adminId) {
// By default an invalid hash is returned
- $data['password'] = '-1';
+ $data['password'] = -1;
if (isAdminHashSet($adminId)) {
// Check cache
@@ -1377,7 +1393,7 @@ function getAdminEmail ($adminId) {
// Get default ACL of admin id
function getAdminDefaultAcl ($adminId) {
// By default an invalid ACL value is returned
- $data['default_acl'] = '***';
+ $data['default_acl'] = 'NO-ACL';
// Is sql_patches there and was it found in cache?
if (!isExtensionActive('sql_patches')) {
@@ -1393,6 +1409,8 @@ function getAdminDefaultAcl ($adminId) {
// Load from database
$result_admin_id = SQL_QUERY_ESC("SELECT `default_acl` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
array(bigintval($adminId)), __FUNCTION__, __LINE__);
+
+ // Do we have an entry?
if (SQL_NUMROWS($result_admin_id) == 1) {
// Fetch data
$data = SQL_FETCHARRAY($result_admin_id);
@@ -1442,7 +1460,9 @@ function generateOptionList ($table, $id, $name, $default = '', $special = '', $
} else {
// Data from database
$SPEC = ', `' . $id . '`';
- if (!empty($special)) $SPEC = ', `' . $special . '`';
+ if (!empty($special)) {
+ $SPEC = ', `' . $special . '`';
+ } // END - if
// Query the database
$result = SQL_QUERY_ESC("SELECT `%s`, `%s`".$SPEC." FROM `{?_MYSQL_PREFIX?}_%s` ".$where." ORDER BY `%s` ASC",
@@ -1469,7 +1489,9 @@ function generateOptionList ($table, $id, $name, $default = '', $special = '', $
}
// Add it, if set
- if (!empty($add)) $add = ' ('.$add.')';
+ if (!empty($add)) {
+ $add = ' ('.$add.')';
+ } // END - if
// Is the call-back function set?
if (!empty($callback)) {
@@ -1522,6 +1544,7 @@ function deleteUserAccount ($userid, $reason) {
// Init points
$data['points'] = '0';
+ // Search for the points and user data
$result = SQL_QUERY_ESC("SELECT
(SUM(p.`points`) - d.`used_points`) AS `points`
FROM
@@ -1541,6 +1564,7 @@ LIMIT 1",
$data = SQL_FETCHARRAY($result);
// Delete points entries as well
+ // @TODO Rewrite these lines to a filter
SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_user_points` WHERE `userid`=%s",
array(bigintval($userid)), __FUNCTION__, __LINE__);
@@ -1551,7 +1575,9 @@ LIMIT 1",
} // END - if
// Now, when we have all his points adds them do the jackpot!
- if (isExtensionActive('jackpot')) addPointsToJackpot($data['points']);
+ if (isExtensionActive('jackpot')) {
+ addPointsToJackpot($data['points']);
+ } // END - if
} // END - if
// Free the result
@@ -1572,7 +1598,7 @@ LIMIT 1",
$data['text'] = $reason;
// Now a mail to the user and that's all...
- $message = loadEmailTemplate('del-user', $data, $userid);
+ $message = loadEmailTemplate('member_user_deleted', $data, $userid);
sendEmail($userid, '{--ADMIN_DELETE_ACCOUNT--}', $message);
// Ok, delete the account!
@@ -1712,7 +1738,7 @@ function generateCategoryOptionsList ($mode) {
}
// Add bonus mail to queue
-function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds, $url, $cat, $mode='normal', $receiver=0) {
+function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds, $url, $categoryId, $mode='normal', $receiver=0) {
// Is admin or bonus extension there?
if (!isAdmin()) {
// Abort here
@@ -1733,27 +1759,21 @@ function addBonusMailToQueue ($subject, $text, $receiverList, $points, $seconds,
// HTML extension active?
if (isExtensionActive('html_mail')) {
- // No HTML by default
- $HTML = 'N';
-
- // HTML mode?
- if ($mode == 'html') {
- // Yes, please
- $HTML = 'Y';
- } // END - if
+ // Determine if we have HTML mode active
+ $HTML = convertBooleanToYesNo($mode == 'html');
// Add HTML mail
SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_bonus`
(`subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `mails_sent`, `html_msg`)
-VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s','%s')",
+VALUES ('%s','%s','%s',%s,%s,'NEW', UNIX_TIMESTAMP(),'%s',%s,%s,%s,'%s')",
array(
$subject,
$text,
$receiverList,
$points,
- $seconds,
+ bigintval($seconds),
$url,
- $cat,
+ bigintval($categoryId),
$target,
bigintval($receiver),
$HTML
@@ -1762,15 +1782,15 @@ VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s','%s
// Add regular mail
SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_bonus`
(`subject`, `text`, `receivers`, `points`, `time`, `data_type`, `timestamp`, `url`, `cat_id`, `target_send`, `mails_sent`)
-VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s')",
+VALUES ('%s','%s','%s',%s,%s,'NEW', UNIX_TIMESTAMP(),'%s',%s,%s,%s)",
array(
$subject,
$text,
$receiverList,
$points,
- $seconds,
+ bigintval($seconds),
$url,
- $cat,
+ bigintval($categoryId),
$target,
bigintval($receiver),
), __FUNCTION__, __LINE__);
@@ -1778,7 +1798,7 @@ VALUES ('%s','%s','%s','%s','%s','NEW', UNIX_TIMESTAMP(),'%s','%s','%s','%s')",
}
// Generate a receiver list for given category and maximum receivers
-function generateReceiverList ($cat, $receiver, $mode = '') {
+function generateReceiverList ($categoryId, $receiver, $mode = '') {
// Init variables
$CAT_TABS = '';
$CAT_WHERE = '';
@@ -1786,8 +1806,8 @@ function generateReceiverList ($cat, $receiver, $mode = '') {
$result = false;
// Secure data
- $cat = bigintval($cat);
- $receiver = bigintval($receiver);
+ $categoryId = bigintval($categoryId);
+ $receiver = bigintval($receiver);
// Is the receiver zero and mode set?
if (($receiver == '0') && (!empty($mode))) {
@@ -1796,10 +1816,10 @@ function generateReceiverList ($cat, $receiver, $mode = '') {
} // END - if
// Category given?
- if ($cat > 0) {
+ if ($categoryId > 0) {
// Select category
$CAT_TABS = "LEFT JOIN `{?_MYSQL_PREFIX?}_user_cats` AS c ON d.`userid`=c.`userid`";
- $CAT_WHERE = sprintf(" AND c.`cat_id`=%s", $cat);
+ $CAT_WHERE = sprintf(" AND c.`cat_id`=%s", $categoryId);
} // END - if
// Exclude users in holiday?
@@ -1810,13 +1830,13 @@ function generateReceiverList ($cat, $receiver, $mode = '') {
if ((isExtensionActive('html_mail')) && ($mode == 'html')) {
// Only include HTML receivers
- $result = SQL_QUERY_ESC("SELECT d.userid FROM `{?_MYSQL_PREFIX?}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED' AND d.`html`='Y'".$CAT_WHERE." ORDER BY d.{?order_select?} {?order_mode?} LIMIT %s",
+ $result = SQL_QUERY_ESC("SELECT d.`userid` FROM `{?_MYSQL_PREFIX?}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED' AND d.`html`='Y'".$CAT_WHERE." ORDER BY d.`{?order_select?}` {?order_mode?} LIMIT %s",
array(
$receiver
), __FUNCTION__, __LINE__);
} else {
// Include all
- $result = SQL_QUERY_ESC("SELECT d.userid FROM `{?_MYSQL_PREFIX?}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED'".$CAT_WHERE." ORDER BY d.{?order_select?} {?order_mode?} LIMIT %s",
+ $result = SQL_QUERY_ESC("SELECT d.`userid` FROM `{?_MYSQL_PREFIX?}_user_data` AS d ".$CAT_TABS." WHERE d.`status`='CONFIRMED'".$CAT_WHERE." ORDER BY d.`{?order_select?}` {?order_mode?} LIMIT %s",
array(
$receiver
), __FUNCTION__, __LINE__);
@@ -1991,5 +2011,83 @@ function updateLastActivity($userid) {
), __FUNCTION__, __LINE__);
}
+// Get points data for given extension's name
+function getPointsDataArrayFromExtensionName ($ext_name) {
+ // If we have cache, shortcut it here
+ if (isset($GLOBALS['cache_array']['points_data'][$ext_name])) {
+ // Return it
+ return $GLOBALS['cache_array']['points_data'][$ext_name];
+ } // END - if
+
+ // Now checkout the entry in database table
+ $result = SQL_QUERY_ESC("SELECT `id`, `ext_name`, `column_name`, `locked_mode`, `payment_method` FROM `{?_MYSQL_PREFIX?}_points_data` WHERE `ext_name`='%s' LIMIT 1",
+ array($ext_name), __FUNCTION__, __LINE__);
+
+ // Do we have an entry?
+ if (SQL_NUMROWS($result) == 1) {
+ // Then load it
+ $pointsData = SQL_FETCHARRAY($result);
+
+ // Add all remaining entries
+ foreach ($pointsData as $key=>$value) {
+ $GLOBALS['cache_array']['points_data'][$ext_name][$key] = $value;
+ } // END - foreach
+ } else {
+ /*
+ * Having no entry is not bad but it means that all points will go to
+ * the general account which the user can let payout.
+ */
+ logDebugMessage(__FUNCTION__, __LINE__, 'ext_name=' . $ext_name . ' - No entry found, switching to general points account.');
+ }
+
+ // Free result
+ SQL_FREERESULT($result);
+
+ // Return it
+ return $GLOBALS['cache_array']['points_data'][$ext_name];
+}
+
+// Determines the right points column name for given extension and 'locked'
+function getPointsColumnNameFromExtensionNameLocked ($ext_name, $isLocked) {
+ // Extension sql_patches must be up-to-date
+ if (isExtensionInstalledAndOlder('sql_patches', '0.8.0')) {
+ // Please update ext-sql_patches
+ debug_report_bug(__FUNCTION__, __LINE__, 'sql_patches is out-dated. Please update to at least 0.8.0 to continue. ext_name=' . $ext_name . ',isLocked=' . intval($isLocked));
+ } // END - if
+
+ // Get the points_data entry
+ $pointsData = getPointsDataArrayFromExtensionName($ext_name);
+
+ // Regular points by default
+ $columnName = $pointsData['column_name'];
+
+ // Are the points locked?
+ if (($isLocked === true) && ($pointsData['locked_mode'] == 'LOCKED')) {
+ // Locked points, so prefix it
+ $columnName = 'locked_' . $pointsData['column_name'];
+ } // END - if
+
+ // Return the result
+ return $columnName;
+}
+
+// Determines the payment method for given extension and 'locked'
+function getPaymentMethodFromExtensionName ($ext_name) {
+ // Extension sql_patches must be up-to-date
+ if (isExtensionInstalledAndOlder('sql_patches', '0.8.0')) {
+ // Please update ext-sql_patches
+ debug_report_bug(__FUNCTION__, __LINE__, 'sql_patches is out-dated. Please update to at least 0.8.0 to continue. ext_name=' . $ext_name . ',isLocked=' . intval($isLocked));
+ } // END - if
+
+ // Get the points_data entry
+ $pointsData = getPointsDataArrayFromExtensionName($ext_name);
+
+ // Regular points by default
+ $paymentMethod = $pointsData['payment_method'];
+
+ // Return the result
+ return $paymentMethod;
+}
+
// [EOF]
?>