X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Flibs%2Frallye_functions.php;h=aa4859a4e11e4af579e86f6420a64193dca288e9;hb=d8148e3f1f3a6762b2e786dbe99ada269dcf2ea0;hp=4389864886a7960d21cee430ff6d6e713bb377d1;hpb=5bdeaf8b452206598b6c6cd4f941145b11a0eccc;p=mailer.git
diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 4389864886..aa4859a4e1 100644
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -53,7 +53,7 @@ function RALLYE_AUTOSTART_RALLYES($result)
array(bigintval($id)), __FILE__, __LINE__);
// Do a snapshot off all user refs
- $result_user = SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE status='CONFIRMED' ORDER BY userid", __FILE__, __LINE__);
+ $result_user = SQL_QUERY("SELECT userid FROM `{!_MYSQL_PREFIX!}_user_data` WHERE `status`='CONFIRMED' ORDER BY userid", __FILE__, __LINE__);
// Transfer all neccessary data to the global $DATA array
$DATA['uid_cnt'] = SQL_NUMROWS($result_user);
@@ -65,7 +65,7 @@ function RALLYE_AUTOSTART_RALLYES($result)
if ($min_users == 0) {
// Rallye ends without user limitation
- $DATA['min_users'] = RALLYE_END_NO_USER_LIMITATION;
+ $DATA['min_users'] = getMessage('RALLYE_END_NO_USER_LIMITATION');
} else {
// Rallye ends when X members are totally in your exchange
$DATA['min_users'] = RALLYE_END_USERS_1." ".$min_users." ".RALLYE_END_USERS_2;
@@ -73,7 +73,7 @@ function RALLYE_AUTOSTART_RALLYES($result)
if ($min_prices == 0) {
// Rallye ends without user limitation
- $DATA['min_prices'] = RALLYE_END_NO_PRICE_LIMITATION;
+ $DATA['min_prices'] = getMessage('RALLYE_END_NO_PRICE_LIMITATION');
} else {
// Rallye ends when X members are totally in your exchange
$DATA['min_prices'] = RALLYE_END_PRICES_1." ".$min_prices." ".RALLYE_END_PRICES_2;
@@ -102,7 +102,7 @@ function RALLYE_AUTOSTART_RALLYES($result)
FROM `{!_MYSQL_PREFIX!}_user_points` AS p
LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d
ON p.userid=d.userid
-WHERE d.status='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p.ref_depth=1 AND p.points > 0 AND d.userid=%s",
+WHERE d.`status`='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p.ref_depth=1 AND p.points > 0 AND d.userid=%s",
array(getConfig('ref_payout'), bigintval($uid)), __FILE__, __LINE__);
list($cpoints) = SQL_FETCHROW($result_ref);
SQL_FREERESULT($result_ref);
@@ -213,7 +213,7 @@ WHERE u.rallye_id=%s AND r.counter > 0 ORDER BY u.refs DESC",
$result_ref = SQL_QUERY_ESC("SELECT DISTINCT p.points FROM `{!_MYSQL_PREFIX!}_user_points` AS p
LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d
ON p.userid=d.userid
-WHERE d.userid=%s AND d.status='CONFIRMED' AND p.ref_depth=1 AND d.max_mails > 0 AND d.mails_confirmed >= %s
+WHERE d.userid=%s AND d.`status`='CONFIRMED' AND p.ref_depth=1 AND d.max_mails > 0 AND d.mails_confirmed >= %s
LIMIT 1", array(bigintval($uid), getConfig('ref_payout')), __FILE__, __LINE__);
list($refpoints) = SQL_FETCHROW($result_ref);
SQL_FREERESULT($result_ref);
@@ -371,7 +371,7 @@ function RALLYE_EXPIRE_RALLYES($result)
// active = 0: account is deleted or locked
$result = SQL_QUERY_ESC("SELECT COUNT(userid) AS active
FROM `{!_MYSQL_PREFIX!}_user_data`
-WHERE userid=%s AND status='CONFIRMED'
+WHERE userid=%s AND `status`='CONFIRMED'
LIMIT 1", array(bigintval($uid)), __FILE__, __LINE__);
list($active) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
@@ -474,7 +474,7 @@ function RALLYE_LOAD_USER_DATA($uids_array)
$uid_string = implode(",", $uids_array['uid']);
// Load users
- $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid IN(%s) AND status='CONFIRMED' ORDER BY userid LIMIT %s",
+ $result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid IN(%s) AND `status`='CONFIRMED' ORDER BY userid LIMIT %s",
array($uid_string, count($uids_array)), __FILE__, __LINE__);
$ret = "";
while (list($u, $gender, $surname, $family, $email) = SQL_FETCHROW($result))
@@ -514,10 +514,8 @@ function RALLYE_LOAD_PRICES_ARRAY($rallye)
//
function RALLYE_LOAD_USERS_ARRAY ($rallye) {
- global $_CONFIG;
-
// Fix zero points to 0.00000
- if (getConfig('ref_payout') == "0") $_CONFIG['ref_payout'] = "0.00000";
+ if (getConfig('ref_payout') == "0") setConfigEntry('ref_payout', "0.00000");
// Init multi array
$users = array(
@@ -538,7 +536,7 @@ function RALLYE_LOAD_USERS_ARRAY ($rallye) {
FROM `{!_MYSQL_PREFIX!}_user_points` AS p
LEFT JOIN `{!_MYSQL_PREFIX!}_user_data` AS d
ON p.userid=d.userid
-WHERE d.status='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p.ref_depth=1 AND p.points > 0 AND d.userid=%s",
+WHERE d.`status`='CONFIRMED' AND d.max_mails > 0 AND d.mails_confirmed >= %s AND p.ref_depth=1 AND p.points > 0 AND d.userid=%s",
array(getConfig('ref_payout'), bigintval($uid)), __FILE__, __LINE__);
list($refpoints) = SQL_FETCHROW($result_ref);
SQL_FREERESULT($result_ref);
@@ -595,7 +593,7 @@ function RALLYE_LIST_WINNERS ($rallye, $default=0) {
// Check status
// active = 1: account is still confirmed
// active = 0: account is deleted or locked
- $result_active = SQL_QUERY_ESC("SELECT COUNT(userid) FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND status='CONFIRMED' LIMIT 1",
+ $result_active = SQL_QUERY_ESC("SELECT COUNT(userid) FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s AND `status`='CONFIRMED' LIMIT 1",
array(bigintval($DATA['uid'][$idx])), __FILE__, __LINE__);
list($active) = SQL_FETCHROW($result_active);
SQL_FREERESULT($result_active);
@@ -683,7 +681,7 @@ WHERE end_time <= (UNIX_TIMESTAMP() - %s) AND expired='Y'",
// Add task
SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_task_system` (status, task_type, subject, text, task_created)
-VALUES ('NEW','RALLYE_PURGED','".RALLYE_ADMIN_PURGED.": %s','".RALLYE_ADMIN_PURGED_TEXT."',UNIX_TIMESTAMP())",
+VALUES ('NEW','RALLYE_PURGED','{--RALLYE_ADMIN_PURGED--}: %s','{--RALLYE_ADMIN_PURGED_TEXT--}',UNIX_TIMESTAMP())",
array($title), __FILE__, __LINE__);
}
@@ -695,7 +693,7 @@ function RALLYE_TEMPLATE_SELECTION($name="template", $default="")
{
// Check templates directory
$OUT = ""; $ral = array();
- $BASE = sprintf("%stemplates/%s/html/rallye/", PATH, GET_LANGUAGE());
+ $BASE = sprintf("%stemplates/%s/html/rallye/", constant('PATH'), GET_LANGUAGE());
$dir = opendir($BASE);
while ($read = readdir($dir))
{
@@ -714,23 +712,20 @@ function RALLYE_TEMPLATE_SELECTION($name="template", $default="")
closedir($dir);
// Do we have found templates which we can link with the new rallye?
- if (!empty($ral[0]))
- {
+ if (!empty($ral[0])) {
// Generate selection box for all found templates
+ // @TODO Rewrite this to our API function
$OUT = "\n";
- }
- else
- {
+ } else {
// No rallye templates found
- $OUT = RALLYE_NO_TEMPLATES_FOUND;
+ $OUT = getMessage('RALLYE_NO_TEMPLATES_FOUND');
}
// Return selection
@@ -738,21 +733,19 @@ function RALLYE_TEMPLATE_SELECTION($name="template", $default="")
}
//
function RALLYE_GET_REFCOUNT($uid, $old=0) {
- global $cacheArray;
-
// Check current refs
if (GET_EXT_VERSION("cache") >= "0.1.2") {
// Get refs from cache
$cnt = 0;
- foreach ($cacheArray['refsystem']['userid'] as $id => $u_id) {
+ foreach ($GLOBALS['cache_array']['refsystem']['userid'] as $id => $uid) {
// Do we have a ref for this user?
- //* DEBUG: */ echo "id={$id},u_id={$u_id},uid={$uid},old={$old},level={$cacheArray['refsystem']['level'][$id]}
\n";
- if (($u_id == $uid) && ($cacheArray['refsystem']['level'][$id] == 1)) {
+ //* DEBUG: */ echo "id={$id},uid={$uid},uid={$uid},old={$old},level={$GLOBALS['cache_array']['refsystem']['level'][$id]}
\n";
+ if (($uid == $uid) && ($GLOBALS['cache_array']['refsystem']['level'][$id] == 1)) {
//* DEBUG: */ echo "uid matches!
\n";
- foreach ($cacheArray['ref_depths']['level'] as $level) {
- if (($level == $cacheArray['refsystem']['level'][$id]) && ($level == 1)) {
+ foreach ($GLOBALS['cache_array']['ref_depths']['level'] as $level) {
+ if (($level == $GLOBALS['cache_array']['refsystem']['level'][$id]) && ($level == 1)) {
// Level does exist so abort here
- $cnt = $cacheArray['refsystem']['counter'][$id];
+ $cnt = $GLOBALS['cache_array']['refsystem']['counter'][$id];
//* DEBUG: */ echo "*".$uid."/".$cnt."*
";
break;
} elseif ($level > 1) {
@@ -766,7 +759,7 @@ function RALLYE_GET_REFCOUNT($uid, $old=0) {
}
}
//* DEBUG: */ echo "
"; - //* DEBUG: */ print_r($cacheArray['refsystem']); + //* DEBUG: */ print_r($GLOBALS['cache_array']['refsystem']); //* DEBUG: */ echo ""; //* DEBUG: */ die();