X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Fsponsor_functions.php;h=3de5472e7e07d6376be033ff00376408a0d100be;hb=e9da1508b2a3ccbf63adc999981674740a47e074;hp=b60e222682f0fbf7eb3c80e2ff23a0aeb0a9e961;hpb=596c8ab32594401ca84abfbfe35513ddfff31bec;p=mailer.git
diff --git a/inc/libs/sponsor_functions.php b/inc/libs/sponsor_functions.php
index b60e222682..3de5472e7e 100644
--- a/inc/libs/sponsor_functions.php
+++ b/inc/libs/sponsor_functions.php
@@ -16,7 +16,7 @@
* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team *
+ * Copyright (c) 2009 - 2015 by Mailer Developer Team *
* For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -72,11 +72,11 @@ function handleSponsorRequest ($postData, $update=false, $messageArray = array()
$SAVE = FALSE;
} else {
// Add a new sponsor or update his data?
- $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE email='%s' LIMIT 1",
+ $result = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE email='%s' LIMIT 1",
array($postData['email']), __FUNCTION__, __LINE__);
// Is a sponsor alread in the db?
- if (SQL_NUMROWS($result) == 1) {
+ if (sqlNumRows($result) == 1) {
// Yes, he is!
if ((getWhat() == 'add_sponsor') || ($update)) {
// Already found
@@ -88,15 +88,15 @@ function handleSponsorRequest ($postData, $update=false, $messageArray = array()
}
// Free memory
- SQL_FREERESULT($result);
+ sqlFreeResult($result);
}
break;
- case 'pass1':
+ case 'password1':
$k = ''; $v = '';
break;
- case 'pass2':
+ case 'password2':
$k = 'password'; $v = md5($v);
break;
@@ -189,7 +189,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray = array()
foreach ($postData as $k => $v) {
// Do not add 'force' !
if ($k != 'force') {
- $OUT .= '';
+ $OUT .= '';
} // END - if
} // END - foreach
@@ -208,7 +208,7 @@ function handleSponsorRequest ($postData, $update=false, $messageArray = array()
if (!empty($sql)) {
// Run SQL command
- $result = SQL_QUERY_ESC($sql, $DATA['values'], __FUNCTION__, __LINE__);
+ $result = sqlQueryEscaped($sql, $DATA['values'], __FUNCTION__, __LINE__);
} // END - if
} else {
// Error detected
@@ -272,7 +272,7 @@ function addSponsorMenu ($current) {
if (isAdmin()) $WHERE = '';
// Load main menu entries
- $result_main = SQL_QUERY("SELECT
+ $result_main = sqlQuery("SELECT
`action` AS `main_action`,
`title` AS `main_title`
FROM
@@ -282,11 +282,11 @@ WHERE
" . $WHERE . "
ORDER BY
`sort` ASC", __FUNCTION__, __LINE__);
- if (!SQL_HASZERONUMS($result_main)) {
+ if (!ifSqlHasZeroNums($result_main)) {
// Load every menu and it's sub menus
- while ($content = SQL_FETCHARRAY($result_main)) {
+ while ($content = sqlFetchArray($result_main)) {
// Load sub menus
- $result_sub = SQL_QUERY_ESC("SELECT
+ $result_sub = sqlQueryEscaped("SELECT
`what` AS `sub_what`,
`title` AS `sub_title`
FROM
@@ -299,10 +299,10 @@ WHERE
ORDER BY
`sort` ASC",
array($content['main_action']), __FUNCTION__, __LINE__);
- if (!SQL_HASZERONUMS($result_sub)) {
+ if (!ifSqlHasZeroNums($result_sub)) {
// Load sub menus
$SUB = '';
- while ($content2 = SQL_FETCHARRAY($result_sub)) {
+ while ($content2 = sqlFetchArray($result_sub)) {
// Check if current selected menu is matching the loaded one
if ($current == $content2['sub_what']) $content2['sub_title'] = '' . $content2['sub_title'] . '';
@@ -321,7 +321,7 @@ ORDER BY
}
// Free memory
- SQL_FREERESULT($result_sub);
+ sqlFreeResult($result_sub);
} // END - while
} else {
// No main menus active
@@ -329,7 +329,7 @@ ORDER BY
}
// Free memory
- SQL_FREERESULT($result_main);
+ sqlFreeResult($result_main);
// Return content
return $OUT;
@@ -341,7 +341,7 @@ function addSponsorContent ($what) {
$GLOBALS['sponsor_output'] = '';
// Generate IFN (Include FileName)
- $INC = sprintf("inc/modules/sponsor/%s.php", $what);
+ $INC = sprintf('inc/modules/sponsor/%s.php', $what);
if (isIncludeReadable($INC)) {
// Every sponsor action will output nothing directly. It will be written into $GLOBALS['sponsor_output']!
loadIncludeOnce($INC);
@@ -362,7 +362,7 @@ function updateSponsorLogin () {
// Is sponsor?
if (isSponsor()) {
// Update last online timestamp
- SQL_QUERY_ESC("UPDATE
+ sqlQueryEscaped("UPDATE
`{?_MYSQL_PREFIX?}_sponsor_data`
SET
`last_online`=NOW()
@@ -376,7 +376,7 @@ LIMIT 1",
), __FUNCTION__, __LINE__);
// This update went fine?
- $login = (!SQL_HASZEROAFFECTED());
+ $login = (!ifSqlHasZeroAffectedRows());
} // END - if
// Return status
@@ -390,17 +390,17 @@ function saveSponsorData ($postData, $content) {
// Unsecure data which we don't want
$UNSAFE = array('password', 'id', 'remote_addr', 'sponsor_created', 'last_online', 'status', 'ref_count',
'points_amount', 'points_used', 'refid', 'hash', 'last_payment', 'last_currency',
- 'pass_old', 'ok', 'pass1', 'pass2');
+ 'pass_old', 'ok', 'password1', 'password2');
// Set default message ("not saved")
$message = '{--SPONSOR_ACCOUNT_DATA_NOT_SAVED--}';
// Check for submitted passwords
- if ((!empty($postData['pass1'])) && (!empty($postData['pass2']))) {
+ if ((!empty($postData['password1'])) && (!empty($postData['password2']))) {
// Are both passwords the same?
- if ($postData['pass1'] == $postData['pass2']) {
- // Okay, then set password and remove pass1 and pass2
- $postData['password'] = md5($postData['pass1']);
+ if ($postData['password1'] == $postData['password2']) {
+ // Okay, then set password and remove password1 and password2
+ $postData['password'] = md5($postData['password1']);
} // END - if
} // END - if
@@ -409,7 +409,7 @@ function saveSponsorData ($postData, $content) {
unset($postData[$remove]);
} // END - foreach
- // This array is for the submitted data which we will use with the SQL_QUERY_ESC() function to
+ // This array is for the submitted data which we will use with the sqlQueryEscaped() function to
// secure the data
$DATA = array();
@@ -419,7 +419,7 @@ function saveSponsorData ($postData, $content) {
// Mmmmm, too less security here???
$sql .= " `" . secureString($key) . "`='%s',";
- // We will secure this later inside the SQL_QUERY_ESC() function
+ // We will secure this later inside the sqlQueryEscaped() function
array_push($DATA, secureString($value));
} // END - foreach
@@ -478,11 +478,11 @@ function saveSponsorData ($postData, $content) {
} // END - switch
// Has an entry updated?
- if (!SQL_HASZEROAFFECTED()) {
+ if (!ifSqlHasZeroAffectedRows()) {
// Template and subject are set?
if (!empty($templ) && !empty($subject)) {
// Run SQL command and check for success
- $result = SQL_QUERY_ESC($sql, $DATA, __FUNCTION__, __LINE__);
+ $result = sqlQueryEscaped($sql, $DATA, __FUNCTION__, __LINE__);
// Add all data to content
$content['new_data'] = $postData;
@@ -535,7 +535,7 @@ function generateSponsorEmailLink ($email, $mod = 'admin') {
// But admins shall always see it
if (isAdmin()) $locked = '';
- $result = SQL_QUERY_ESC("SELECT
+ $result = sqlQueryEscaped("SELECT
`id`
FROM
`{?_MYSQL_PREFIX?}_sponsor_data`
@@ -544,16 +544,16 @@ WHERE
" . $locked . "
LIMIT 1",
array($email), __FUNCTION__, __LINE__);
- if (SQL_NUMROWS($result) == 1) {
+ if (sqlNumRows($result) == 1) {
// Load sponsor_id
- list($sponsor_id) = SQL_FETCHROW($result);
+ list($sponsor_id) = sqlFetchRow($result);
// Rewrite email address to contact link
$email = '{%url=modules.php?module=' . $mod . '&what=sponsor_contct&sponsor_id=' . bigintval($sponsor_id) . '%}';
} // END - if
// Free memory
- SQL_FREERESULT($result);
+ sqlFreeResult($result);
// Return rewritten (?) email address
return $email;
@@ -571,11 +571,11 @@ function doProcessSponsorFormRequest ($messageArray = array()) {
switch ($status) {
case 'added': // Sponsor successfully added with account status = UNCONFIRMED!
// Check for his id number
- $result = SQL_QUERY_ESC("SELECT `id`, `hash` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE '%s' REGEXP `email` LIMIT 1",
+ $result = sqlQueryEscaped("SELECT `id`, `hash` FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE '%s' REGEXP `email` LIMIT 1",
array(postRequestElement('email')), __FUNCTION__, __LINE__);
- if (SQL_NUMROWS($result) == 1) {
+ if (sqlNumRows($result) == 1) {
// id found so let's load it for the confirmation email
- list($id, $hash) = SQL_FETCHROW($result);
+ list($id, $hash) = sqlFetchRow($result);
// Prepare data for the email template
$content['id'] = $id;
@@ -584,7 +584,7 @@ function doProcessSponsorFormRequest ($messageArray = array()) {
$content['surname'] = postRequestElement('surname');
$content['family'] = postRequestElement('family');
$content['timestamp'] = generateDateTime(time(), 0);
- $content['password'] = postRequestElement('pass1');
+ $content['password'] = postRequestElement('password1');
// Generate email and send it to the new sponsor
$message = loadEmailTemplate('sponsor_confirm', $content, $id);
@@ -601,7 +601,7 @@ function doProcessSponsorFormRequest ($messageArray = array()) {
}
// Free memory
- SQL_FREERESULT($result);
+ sqlFreeResult($result);
break;
default:
@@ -635,7 +635,7 @@ function doExpressionSponsor ($data) {
// Sponsor data found
$functionName = "getFetchedSponsorData('id', " . $data['matches'][4][$data['key']] . ", '" . $data['callback'] . "')";
}
- } elseif ((!empty($data['callback'])) && (isSponsorDataValid())) {
+ } elseif ((!empty($data['callback'])) && (isValidSponsorData())) {
// "Call-back" alias column for current logged in sponsor's data
$functionName = "getSponsorData('" . $data['callback'] . "')";
}
@@ -667,14 +667,14 @@ function fetchSponsorData ($sponsor_id, $column = 'id') {
setCurrentSponsorId($sponsor_id);
// Don't look for invalid sponsor_ids...
- if (!isValidUserId($sponsor_id)) {
+ if (!isValidId($sponsor_id)) {
// Invalid, so abort here
reportBug(__FUNCTION__, __LINE__, 'Sponsor id ' . $sponsor_id . ' is invalid.');
- } elseif (isSponsorDataValid()) {
+ } elseif (isValidSponsorData()) {
// Use cache, so it is fine
return TRUE;
}
- } elseif (isSponsorDataValid()) {
+ } elseif (isValidSponsorData()) {
// Use cache, so it is fine
return TRUE;
}
@@ -686,13 +686,13 @@ function fetchSponsorData ($sponsor_id, $column = 'id') {
$ADD = '';
// Query for the sponsor
- $result = SQL_QUERY_ESC("SELECT *".$ADD." FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `%s`='%s' LIMIT 1",
+ $result = sqlQueryEscaped("SELECT *".$ADD." FROM `{?_MYSQL_PREFIX?}_sponsor_data` WHERE `%s`='%s' LIMIT 1",
array($column, $sponsor_id), __FUNCTION__, __LINE__);
// Is there a record?
- if (SQL_NUMROWS($result) == 1) {
+ if (sqlNumRows($result) == 1) {
// Load data from cookies
- $data = SQL_FETCHARRAY($result);
+ $data = sqlFetchArray($result);
// Set the sponsor_id for later use
setCurrentSponsorId($data['id']);
@@ -726,11 +726,11 @@ function fetchSponsorData ($sponsor_id, $column = 'id') {
} // END - if
// Found, but valid?
- $found = isSponsorDataValid();
+ $found = isValidSponsorData();
} // END - if
// Free memory
- SQL_FREERESULT($result);
+ sqlFreeResult($result);
// Return result
return $found;
@@ -739,7 +739,7 @@ function fetchSponsorData ($sponsor_id, $column = 'id') {
// Wrapper for fetchSponsorData() and getSponsorData() calls
function getFetchedSponsorData ($keyColumn, $sponsor_id, $valueColumn) {
// Zero ids are not valid
- if ($sponsor_id == 0) {
+ if (!isValidId($sponsor_id)) {
// Abort here
reportBug(__FUNCTION__, __LINE__, 'Zero sponsor_id provided');
} // END - if
@@ -750,7 +750,7 @@ function getFetchedSponsorData ($keyColumn, $sponsor_id, $valueColumn) {
$data = '';
// Can we fetch the sponsor data?
- if ((isValidSponsorId($sponsor_id)) && (fetchSponsorData($sponsor_id, $keyColumn))) {
+ if ((isValidId($sponsor_id)) && (fetchSponsorData($sponsor_id, $keyColumn))) {
// Now get the data back
$data = getSponsorData($valueColumn);
} // END - if
@@ -766,7 +766,7 @@ function getFetchedSponsorData ($keyColumn, $sponsor_id, $valueColumn) {
// Checks if the sponsor data is valid, this may indicate that the sponsor has logged
// in, but you should use isMember() if you want to find that out.
-function isSponsorDataValid () {
+function isValidSponsorData () {
// Sponsor id should not be zero so abort here
if (!isCurrentSponsorIdSet()) return FALSE;
@@ -803,25 +803,13 @@ function getCurrentSponsorId () {
// Checks if current sponsor_id is set
function isCurrentSponsorIdSet () {
- return ((isset($GLOBALS['current_sponsor_id'])) && (isValidSponsorId($GLOBALS['current_sponsor_id'])));
-}
-
-// Is given sponsor_id valid?
-function isValidSponsorId ($sponsor_id) {
- // Is there cache?
- if (!isset($GLOBALS[__FUNCTION__][$sponsor_id])) {
- // Check it out
- $GLOBALS[__FUNCTION__][$sponsor_id] = ((!is_null($sponsor_id)) && (!empty($sponsor_id)) && ($sponsor_id > 0));
- } // END - if
-
- // Return cache
- return $GLOBALS[__FUNCTION__][$sponsor_id];
+ return ((isset($GLOBALS['current_sponsor_id'])) && (isValidId($GLOBALS['current_sponsor_id'])));
}
// Getter for sponsor data
function getSponsorData ($column) {
// Sponsor id should not be zero
- if (!isValidUserId(getCurrentSponsorId())) {
+ if (!isValidId(getCurrentSponsorId())) {
reportBug(__FUNCTION__, __LINE__, 'Sponsor id is zero.');
} // END - if