X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=9be835047a6c6122fd088736e3a399a6f5a658c3;hp=283fd4b02dbfea93eb5e6c12d6491b882cdb0d75;hb=330dbb3e2b34450cd1665497506455e195a0a166;hpb=30ae22f62ae87c53a56baf0d134569ba91011111;ds=sidebyside
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 283fd4b02d..9be835047a 100644
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -6,19 +6,17 @@
* -------------------------------------------------------------------- *
* File : mysql-manager.php *
* -------------------------------------------------------------------- *
- * Short description : All MySQL-related functions *
+ * Short description : All database-related functions *
* -------------------------------------------------------------------- *
- * Kurzbeschreibung : Alle MySQL-Relevanten Funktionen *
+ * Kurzbeschreibung : Alle datenbank-relevanten Funktionen *
* -------------------------------------------------------------------- *
* $Revision:: $ *
* $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 *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -47,7 +45,7 @@ if (!defined('__SECURITY')) {
function getTitleFromMenu ($mode, $what, $column = 'what', $ADD='') {
// Fix empty 'what'
if (empty($what)) {
- $what = getConfig('index_home');
+ $what = getIndexHome();
} // END - if
// Default is not found
@@ -74,8 +72,8 @@ function getTitleFromMenu ($mode, $what, $column = 'what', $ADD='') {
return $data['title'];
}
-// Add menu description pending on given file name (without path!)
-function addMenuDescription ($accessLevel, $FQFN, $return = false) {
+// Add link into output stream (or return it) for 'You Are Here' navigation
+function addYouAreHereLink ($accessLevel, $FQFN, $return = false) {
// Use only filename of the FQFN...
$file = basename($FQFN);
@@ -100,18 +98,21 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false) {
// This is a 'what file'!
$type = 'what';
$search = substr($file, 5);
- $ADD = " AND `visible`='Y' AND `locked`='N'";
// Get access level from it
$modCheck = getModuleFromFileName($file, $accessLevel);
// Do we have admin? Then display all
- if (isAdmin()) $ADD = '';
+ $ADD = " AND `visible`='Y' AND `locked`='N'";
+ if (isAdmin()) {
+ // Display all!
+ $ADD = '';
+ } // END - if
$dummy = substr($search, 0, -4);
- $ADD .= " AND `action`='".getActionFromModuleWhat($accessLevel, $dummy)."'";
- } elseif (($accessLevel == 'sponsor') || ($accessLevel == 'engine')) {
- // Sponsor / engine menu
+ $ADD .= sprintf(" AND `action`='%s'", getActionFromModuleWhat($accessLevel, $dummy));
+ } elseif ($accessLevel == 'sponsor') {
+ // Sponsor menu
$type = 'what';
$search = $file;
$modCheck = getModule();
@@ -125,7 +126,7 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false) {
}
// Begin the navigation line
- if ((!isset($GLOBALS['nav_depth'])) && ($return === false)) {
+ if (!isset($GLOBALS['nav_depth'])) {
// Init nav_depth
$GLOBALS['nav_depth'] = '0';
@@ -147,7 +148,7 @@ function addMenuDescription ($accessLevel, $FQFN, $return = false) {
if (substr($search, -4, 4) == '.php') {
// Remove the .php
$search = substr($search, 0, -4);
- } // END - i
+ } // END - if
if (((isExtensionInstalledAndNewer('sql_patches', '0.2.3')) && (getConfig('youre_here') == 'Y')) || ((isAdmin()) && ($modCheck == 'admin'))) {
// Output HTML code
@@ -207,7 +208,7 @@ ORDER BY
`sort` ASC",
array($mode), __FUNCTION__, __LINE__);
- //* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.':'.getWhat().'*');
+ //* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . ':' . getWhat() . '*');
if (!SQL_HASZERONUMS($result_main)) {
// There are menus available, so we simply display them... :)
$GLOBALS['rows'] = '';
@@ -239,7 +240,7 @@ ORDER BY
// Do we have some entries?
if (!SQL_HASZERONUMS($result_sub)) {
// Init counter
- $cnt = '0';
+ $count = '0';
// Load all sub menus
while ($content2 = SQL_FETCHARRAY($result_sub)) {
@@ -261,12 +262,12 @@ ORDER BY
// Navigation link
$OUT .= '';
} else {
- // Not found! - open
- $OUT .= '';
+ // Not found - open
+ $OUT .= '';
}
// Menu title
- $OUT .= getConfig('menu_blur_spacer') . $content['sub_title'];
+ $OUT .= '{?menu_blur_spacer?}' . $content['sub_title'];
if (isIncludeReadable($inc)) {
$OUT .= '';
@@ -276,12 +277,12 @@ ORDER BY
$OUT .= '';
} // END - if
} else {
- // Not found! - close
+ // Not found - close
$OUT .= '';
}
// Cunt it up
- $cnt++;
+ $count++;
// Rewrite array
$content = array(
@@ -292,7 +293,7 @@ ORDER BY
);
// Add regular menu row or bottom row?
- if ($cnt < SQL_NUMROWS($result_sub)) {
+ if ($count < SQL_NUMROWS($result_sub)) {
$GLOBALS['rows'] .= loadTemplate($mode . '_menu_row', true, $content);
} else {
$GLOBALS['rows'] .= loadTemplate($mode . '_menu_bottom', true, $content);
@@ -307,12 +308,12 @@ ORDER BY
if (isFileReadable($INC)) {
// Load include file
if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_begin', true, $mode);
- //* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.getWhat().'*');
+ //* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . '/' . $content['action'] . '/' . getWhat().'*');
loadInclude($INC);
- //* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.getWhat().'*');
+ //* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . '/' . $content['action'] . '/' . getWhat() . '*');
if ((!isExtensionActive($content['action'])) || ($content['action'] == 'online')) $GLOBALS['rows'] .= loadTemplate('menu_what_end', true, $mode);
}
- //* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.getWhat().'*');
+ //* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . '/' . $content['action'] . '/' . $content['sub_what'] . ':' . getWhat() . '*');
}
// Free result
@@ -321,7 +322,7 @@ ORDER BY
// Count one up
$main_cnt++;
- //* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.':'.getWhat().'*');
+ //* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . ':' . getWhat() . '*');
if (SQL_NUMROWS($result_main) > $main_cnt) {
// Add seperator
$GLOBALS['rows'] .= loadTemplate('menu_seperator', true, $mode);
@@ -356,7 +357,7 @@ ORDER BY
);
// Load main template
- //* DEBUG: */ debugOutput(__LINE__.'/'.$main_cnt.'/'.$content['action'].'/'.$content['sub_what'].':'.getWhat().'*');
+ //* DEBUG: */ debugOutput(__LINE__ . '/' . $main_cnt . '/' . $content['action'] . '/' . $content['sub_what'] . ':' . getWhat() . '*');
loadTemplate('menu_table', false, $content);
} // END - if
}
@@ -368,63 +369,60 @@ function isMember () {
// Fix missing 'last_online' array, damn stupid code :(((
// @TODO Try to rewrite this to one or more functions
- if ((!isset($GLOBALS['last_online'])) || (!is_array($GLOBALS['last_online']))) $GLOBALS['last_online'] = array();
+ if ((!isset($GLOBALS['last_online'])) || (!is_array($GLOBALS['last_online']))) {
+ $GLOBALS['last_online'] = array();
+ } // END - if
- // is the cache entry there?
- if (isset($GLOBALS['is_member'])) {
+ // Is the cache entry there?
+ if (isset($GLOBALS[__FUNCTION__])) {
// Then return it
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHED! (' . intval($GLOBALS['is_member']) . ')');
- return $GLOBALS['is_member'];
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'CACHED! (' . intval($GLOBALS[__FUNCTION__]) . ')');
+ return $GLOBALS[__FUNCTION__];
} elseif ((!isSessionVariableSet('userid')) || (!isSessionVariableSet('u_hash'))) {
- // No member
+ // Destroy any existing user session data
+ destroyMemberSession();
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'No member set in cookie/session.');
+
+ // Abort further processing
return false;
- } else {
- // Get it secured from session
- setMemberId(getSession('userid'));
- setCurrentUserId(getMemberId());
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . getSession('userid') . ' used from cookie/session.');
}
+ // Get userid secured from session
+ setMemberId(getSession('userid'));
+
+ // ... and set it as currently handled user id
+ setCurrentUserId(getMemberId());
+
// Init user data array
initUserData();
// Fix "deleted" cookies first
fixDeletedCookies(array('userid', 'u_hash'));
- // Are cookies set?
- if ((isMemberIdSet()) && (isSessionVariableSet('u_hash'))) {
- // 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 = encodeHashForCookie(getUserData('password'));
+ // Are cookies set and can the member data be loaded?
+ if ((isMemberIdSet()) && (isSessionVariableSet('u_hash')) && (fetchUserData(getMemberId()) === true)) {
+ // Validate password by created the difference of it and the secret key
+ $valPass = encodeHashForCookie(getUserData('password'));
+ // So did we now have valid data and an unlocked user?
+ if ((getUserData('status') == 'CONFIRMED') && ($valPass == getSession('u_hash'))) {
// Transfer last module and online time
$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 ((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 {
- // Maybe got locked etc.
- //* DEBUG */ logDebugMessage(__FUNCTION__, __LINE__, 'status=' . getUserData('status') . ',' . $valPass . '(' . strlen($valPass) . ')/' . getSession('u_hash') . '(' . strlen(getSession('u_hash')) . ')/' . getUserData('password') . '(' . strlen(getUserData('password')) . ')');
- destroyMemberSession();
- }
- } else {
- // Cookie data is invalid!
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cookie data invalid or user not found.');
- destroyMemberSession();
- }
- } else {
- // Cookie data is invalid!
- //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Cookie data not complete.');
+ // Account is confirmed and all cookie data is valid so he is definely logged in! :-)
+ $ret = true;
+ } // END - if
+ } // END - if
+
+ // Is $ret still false?
+ if ($ret === false) {
+ // Yes, so destroy the session
destroyMemberSession();
- }
+ } // END - if
// Cache status
- $GLOBALS['is_member'] = $ret;
+ $GLOBALS[__FUNCTION__] = $ret;
// Return status
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ret=' . intval($ret));
@@ -432,39 +430,46 @@ function isMember () {
}
// Fetch user data for given user id
-function fetchUserData ($userid, $column = 'userid') {
+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
- $userid = bigintval($userid);
+ $value = bigintval($value);
// Set it here
- setCurrentUserId($userid);
+ setCurrentUserId($value);
// Don't look for invalid userids...
- if ($userid < 1) {
+ if (!isValidUserId($value)) {
// Invalid, so abort here
- debug_report_bug(__FUNCTION__, __LINE__, 'User id ' . $userid . ' is invalid.');
+ debug_report_bug(__FUNCTION__, __LINE__, 'User id ' . $value . ' is invalid.');
} elseif (isUserDataValid()) {
// Use cache, so it is fine
return true;
}
- } elseif (isUserDataValid()) {
- // Use cache, so it is fine
+ } elseif (isUserDataValid()) {
+ // Using cache is fine
return true;
}
-
// By default none was found
$found = false;
// Extra statements
$ADD = '';
- if (isExtensionInstalledAndNewer('user', '0.3.5')) $ADD = ', UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`';
+ if (isExtensionInstalledAndNewer('user', '0.3.5')) {
+ $ADD = ', UNIX_TIMESTAMP(`lock_timestamp`) AS `lock_timestamp`';
+ } // END - if
// Query for the user
$result = SQL_QUERY_ESC("SELECT *".$ADD." FROM `{?_MYSQL_PREFIX?}_user_data` WHERE `%s`='%s' LIMIT 1",
- array($column, $userid), __FUNCTION__, __LINE__);
+ array($column, $value), __FUNCTION__, __LINE__);
// Do we have a record?
if (SQL_NUMROWS($result) == 1) {
@@ -473,16 +478,18 @@ function fetchUserData ($userid, $column = 'userid') {
// Set the userid for later use
setCurrentUserId($data['userid']);
+
+ // And cache the data for this userid
$GLOBALS['user_data'][getCurrentUserId()] = $data;
- // Rewrite 'last_failure' if found
- if (isset($GLOBALS['user_data'][getCurrentUserId()]['last_failure'])) {
+ // Rewrite 'last_failure' if found and ext-user has version >= 0.3.7
+ if ((isExtensionInstalledAndNewer('user', '0.3.7')) && (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';
+ $GLOBALS['user_data'][getCurrentUserId()]['last_failure'] = null;
// Is it not zero?
- if ($GLOBALS['user_data'][getCurrentUserId()]['last_failure_raw'] != '0000-00-00 00:00:00') {
+ if (!is_null($GLOBALS['user_data'][getCurrentUserId()]['last_failure_raw'])) {
// Seperate data/time
$array = explode(' ', $GLOBALS['user_data'][getCurrentUserId()]['last_failure_raw']);
@@ -530,8 +537,8 @@ function isAdmin () {
// If admin login is not given take current from cookies...
if ((isSessionVariableSet('admin_id')) && (isSessionVariableSet('admin_md5'))) {
// Get admin login and password from session/cookies
- $adminId = getSession('admin_id');
- $passCookie = getSession('admin_md5');
+ $adminId = getCurrentAdminId();
+ $passCookie = getAdminMd5();
} // END - if
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, $adminId.'/'.$passCookie);
@@ -541,9 +548,9 @@ function isAdmin () {
} // END - if
// Do we have cache?
- if (!isset($GLOBALS['is_admin'][$adminId])) {
+ if (!isset($GLOBALS[__FUNCTION__][$adminId])) {
// Init it with failed
- $GLOBALS['is_admin'][$adminId] = false;
+ $GLOBALS[__FUNCTION__][$adminId] = false;
// Search in array for entry
if (isset($GLOBALS['admin_hash'])) {
@@ -569,12 +576,12 @@ function isAdmin () {
if (!empty($valPass)) {
// Check if password is valid
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, '(' . $valPass . '==' . $passCookie . ')='.intval($valPass == $passCookie));
- $GLOBALS['is_admin'][$adminId] = (($GLOBALS['admin_hash'] == $passCookie) || ((strlen($GLOBALS['admin_hash']) == 32) && ($GLOBALS['admin_hash'] == md5($passCookie))) || (($GLOBALS['admin_hash'] == '*FAILED*') && (!isExtensionActive('cache'))));
+ $GLOBALS[__FUNCTION__][$adminId] = (($GLOBALS['admin_hash'] == $passCookie) || ((strlen($GLOBALS['admin_hash']) == 32) && ($GLOBALS['admin_hash'] == md5($passCookie))) || (($GLOBALS['admin_hash'] == '*FAILED*') && (!isExtensionActive('cache'))));
} // END - if
} // END - if
// Return result of comparision
- return $GLOBALS['is_admin'][$adminId];
+ return $GLOBALS[__FUNCTION__][$adminId];
}
// Generates a list of "max receiveable emails per day"
@@ -585,13 +592,13 @@ function addMaxReceiveList ($mode, $default = '', $return = false) {
switch ($mode) {
case 'guest':
// Guests (in the registration form) are not allowed to select 0 mails per day.
- $result = SQL_QUERY("SELECT `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `value` > 0 ORDER BY `value` ASC",
+ $result = SQL_QUERY('SELECT `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` WHERE `value` > 0 ORDER BY `value` ASC',
__FUNCTION__, __LINE__);
break;
case 'member':
// Members are allowed to set to zero mails per day (we will change this soon!)
- $result = SQL_QUERY("SELECT `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` ORDER BY `value` ASC",
+ $result = SQL_QUERY('SELECT `value`, `comment` FROM `{?_MYSQL_PREFIX?}_max_receive` ORDER BY `value` ASC',
__FUNCTION__, __LINE__);
break;
@@ -632,18 +639,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
@@ -664,10 +674,10 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry=false) {
$add = '';
if ((!isAdmin()) && ($mode != 'admin')) $add = " AND `locked`='N'";
- //* DEBUG: */ debugOutput(__LINE__.':'.$mode.'/'.$action.'/'.$what.'*');
+ //* 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,
@@ -696,10 +706,10 @@ function isMenuActionValid ($mode, $action, $what, $updateEntry=false) {
// Should we look for affected rows (only update) or found rows?
if ($updateEntry === true) {
// Check updated/affected rows
- $ret = (SQL_AFFECTEDROWS() == 1);
+ $ret = (!SQL_HASZEROAFFECTED());
} else {
// Check found rows
- $ret = (SQL_NUMROWS($result) == 1);
+ $ret = (!SQL_HASZERONUMS($result));
}
// Free memory
@@ -717,7 +727,7 @@ function getActionFromModuleWhat ($module, $what) {
// Init status
$data['action'] = '';
- //* DEBUG: */ debugOutput(__LINE__.'='.$module.'/'.$what.'/'.getAction().'=');
+ //* DEBUG: */ debugOutput(__LINE__ . '=' . $module . '/'.$what . '/' . getAction() . '=');
if (!isExtensionInstalledAndNewer('sql_patches', '0.0.5')) {
// sql_patches is missing so choose depending on mode
if (isWhatSet()) {
@@ -732,7 +742,7 @@ function getActionFromModuleWhat ($module, $what) {
}
} elseif ((empty($what)) && ($module != 'admin')) {
// Use configured 'home'
- $what = getConfig('index_home');
+ $what = getIndexHome();
} // END - if
if ($module == 'admin') {
@@ -751,7 +761,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)) {
@@ -817,6 +827,8 @@ function getPaymentTitlePrice ($pid, $full=false) {
// Load payment data
$result = SQL_QUERY_ESC("SELECT `mail_title`, `price` FROM `{?_MYSQL_PREFIX?}_payments` WHERE `id`=%s LIMIT 1",
array(bigintval($pid)), __FUNCTION__, __LINE__);
+
+ // Do we have an entry?
if (SQL_NUMROWS($result) == 1) {
// Payment type found... :-)
$data = SQL_FETCHARRAY($result);
@@ -825,9 +837,9 @@ function getPaymentTitlePrice ($pid, $full=false) {
if ($full === false) {
$ret = $data['mail_title'];
} else {
- $ret = $data['mail_title'] . ' / ' . translateComma($data['price']) . ' {?POINTS?}';
+ $ret = $data['mail_title'] . ' / {%pipe,translateComma=' . $data['price'] . '%} {?POINTS?}';
}
- }
+ } // END - if
// Free result
SQL_FREERESULT($result);
@@ -839,7 +851,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",
@@ -859,20 +871,26 @@ function getPaymentPoints ($pid, $lookFor = 'price') {
}
// Remove a receiver's id from $receivers and add a link for him to confirm
-function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = '', $bonus = false) {
+function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = 0, $isBonusMail = false) {
// Default is not removed
$ret = 'failed';
// Is the userid valid?
- if ($userid > 0) {
+ if (isValidUserId($userid)) {
// Remove entry from array
unset($receivers[$key]);
// Is there already a line for this user available?
if ($stats_id > 0) {
+ // Default is 'normal' mail
+ $type = 'NORMAL';
+ $rowName = 'stats_id';
+
// Only when we got a real stats id continue searching for the entry
- $type = 'NORMAL'; $rowName = 'stats_id';
- if ($bonus) { $type = 'BONUS'; $rowName = 'bonus_id'; }
+ if ($isBonusMail === true) {
+ $type = 'BONUS';
+ $rowName = 'bonus_id';
+ } // END - if
// Try to look the entry up
$result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_links` WHERE %s='%s' AND `userid`=%s AND link_type='%s' LIMIT 1",
@@ -883,6 +901,13 @@ function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = '', $
// So we add one!
SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_user_links` (`%s`, `userid`, `link_type`) VALUES ('%s','%s','%s')",
array($rowName, $stats_id, bigintval($userid), $type), __FUNCTION__, __LINE__);
+
+ // Update 'mails_sent' if sql_patches is updated
+ if (isExtensionInstalledAndNewer('sql_patches', '0.7.4')) {
+ // Update the pool
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_pool` SET `mails_sent`=`mails_sent`+1 WHERE `id`=%s LIMIT 1",
+ array(bigintval($pool_id)), __FUNCTION__, __LINE__);
+ } // END - if
$ret = 'done';
} else {
// Already found
@@ -891,8 +916,8 @@ function removeReceiver (&$receivers, $key, $userid, $pool_id, $stats_id = '', $
// Free memory
SQL_FREERESULT($result);
- }
- }
+ } // END - if
+ } // END - if
// Return status for sending routine
return $ret;
@@ -908,22 +933,22 @@ function countSumTotalData ($search, $tableName, $lookFor = 'id', $whereStatemen
// Count or sum whole table?
if ($countRows === true) {
// Count whole table
- $result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS res FROM `{?_MYSQL_PREFIX?}_%s`".$add,
+ $result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`".$add,
array($lookFor, $tableName), __FUNCTION__, __LINE__);
} else {
// Sum whole table
- $result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS res FROM `{?_MYSQL_PREFIX?}_%s`".$add,
+ $result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s`".$add,
array($lookFor, $tableName), __FUNCTION__, __LINE__);
}
} elseif (($countRows === true) || ($lookFor == 'userid')) {
// Count rows
//* DEBUG: */ debugOutput('COUNT!');
- $result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS res FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
+ $result = SQL_QUERY_ESC("SELECT COUNT(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
array($lookFor, $tableName, $whereStatement, $search), __FUNCTION__, __LINE__);
} else {
// Add all rows
//* DEBUG: */ debugOutput('SUM!');
- $result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS res FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
+ $result = SQL_QUERY_ESC("SELECT SUM(`%s`) AS `res` FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`='%s'".$add,
array($lookFor, $tableName, $whereStatement, $search), __FUNCTION__, __LINE__);
}
@@ -956,7 +981,7 @@ function getReferalLevelPercents ($level) {
// First look for level
$key = array_search($level, $GLOBALS['cache_array']['refdepths']['level']);
if ($key !== false) {
- // Entry found!
+ // Entry found
$data['percents'] = $GLOBALS['cache_array']['refdepths']['percents'][$key];
// Count cache hit
@@ -983,97 +1008,121 @@ 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...
+ * userid = Referal id wich should receive...
* points = ... xxx points
* sendNotify = shall I send the referal an email or not?
- * rid = inc/modules/guest/what-confirm.php need this
+ * 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, $rid = '0', $locked = false, $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 ------------------------