Complete rewrite of and , wrapper functions added, see bug #101

[mailer.git] / inc / libs / rallye_functions.php

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index 3d70abc82496e915b055ada4313b0f78527ecb25..aa4859a4e11e4af579e86f6420a64193dca288e9 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -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;
@@ -681,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__);
        }
 
@@ -737,10 +737,10 @@ function RALLYE_GET_REFCOUNT($uid, $old=0) {
        if (GET_EXT_VERSION("cache") >= "0.1.2") {
                // Get refs from cache
                $cnt = 0;
-               foreach ($GLOBALS['cache_array']['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={$GLOBALS['cache_array']['refsystem']['level'][$id]}<br />\n";
-                       if (($u_id == $uid) && ($GLOBALS['cache_array']['refsystem']['level'][$id] == 1)) {
+                       //* DEBUG: */ echo "id={$id},uid={$uid},uid={$uid},old={$old},level={$GLOBALS['cache_array']['refsystem']['level'][$id]}<br />\n";
+                       if (($uid == $uid) && ($GLOBALS['cache_array']['refsystem']['level'][$id] == 1)) {
                                //* DEBUG: */ echo "uid matches!<br />\n";
                                foreach ($GLOBALS['cache_array']['ref_depths']['level'] as $level) {
                                        if (($level == $GLOBALS['cache_array']['refsystem']['level'][$id]) && ($level == 1)) {