Next wave of lesser getMessage() usage and more EL

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

diff --git a/inc/libs/rallye_functions.php b/inc/libs/rallye_functions.php
index acb09444c5c049133c79d66149084909a22c21c2..e4dff31d0279ebbfdcc2aef7a5053bafa1960232 100644 (file)
--- a/inc/libs/rallye_functions.php
+++ b/inc/libs/rallye_functions.php
@@ -292,7 +292,7 @@ LIMIT 1",
                $userid = '---';
 
                // List only users with at least one ref!
-               //* DEBUG: */ print("*".$cnt.'/'.$content['userid'].'/'.$content['curr_points'].'/'.$refpoints."*<br />");
+               //* DEBUG: */ debugOutput('*'.$cnt.'/'.$content['userid'].'/'.$content['curr_points'].'/'.$refpoints.'*');
                if (($cnt > 0) && ($refpoints > $content['curr_points'])) { $userid = $content['userid']; } else { $cnt = ''; }
 
                // Save values to array
@@ -855,7 +855,7 @@ function addReferalRallyeTemplateSelection ($name = 'template', $default = '') {
                $OUT .= '</select>';
        } else {
                // No rallye templates found
-               $OUT = getMessage('RALLYE_NO_TEMPLATES_FOUND');
+               $OUT = '{--RALLYE_NO_TEMPLATES_FOUND--}';
        }
 
        // Return selection
@@ -870,14 +870,14 @@ function getReferalRallyeRefsCount ($currUserid, $old = '0') {
                $cnt = '0';
                foreach ($GLOBALS['cache_array']['refsystem']['userid'] as $id => $userid) {
                        // Do we have a ref for this user?
-                       //* DEBUG: */ print("id={$id},userid={$userid},userid={$userid},old={$old},level={$GLOBALS['cache_array']['refsystem']['level'][$id]}<br />");
+                       //* DEBUG: */ debugOutput('id='.$id.',userid='.$userid.',userid='.$userid.',old='.$old.',level='.$GLOBALS['cache_array']['refsystem']['level'][$id]);
                        if (($currUserid == $userid) && ($GLOBALS['cache_array']['refsystem']['level'][$id] == 1)) {
-                               //* DEBUG: */ print("userid matches!<br />");
+                               //* DEBUG: */ debugOutput('userid matches!');
                                foreach ($GLOBALS['cache_array']['refdepths']['level'] as $level) {
                                        if (($level == $GLOBALS['cache_array']['refsystem']['level'][$id]) && ($level == 1)) {
                                                // Level does exist so abort here
                                                $cnt = $GLOBALS['cache_array']['refsystem']['counter'][$id];
-                                               //* DEBUG: */ print("*".$userid.'/'.$cnt."*<br />");
+                                               //* DEBUG: */ debugOutput('*'.$userid.'/'.$cnt.'*');
                                                break;
                                        } elseif ($level > 1) {
                                                // Not interesting here...
@@ -890,9 +890,7 @@ function getReferalRallyeRefsCount ($currUserid, $old = '0') {
                        } // END - if
                } // END - foreach
 
-               //* DEBUG: */ print("<pre>");
-               //* DEBUG: */ print(print_r($GLOBALS['cache_array']['refsystem'], true));
-               //* DEBUG: */ print("</pre>");
+               //* DEBUG: */ debugOutput('<pre>'.print_r($GLOBALS['cache_array']['refsystem'], true).'</pre>');
                //* DEBUG: */ shutdown();
 
                if ($cnt > 0) {
@@ -900,7 +898,7 @@ function getReferalRallyeRefsCount ($currUserid, $old = '0') {
                        incrementStatsEntry('cache_hits');
 
                        // Remove old refs
-                       //* DEBUG: */ print('+'.$cnt.'/'.$old."+<br />");
+                       //* DEBUG: */ debugOutput('+'.$cnt.'/'.$old.'+');
                        $cnt -= $old;
                } // END - if
        } else {
@@ -933,14 +931,14 @@ WHERE
        }
 
        // Return count
-       //* DEBUG: */ print("*".$userid.'/'.$old.'/'.$cnt."*<br />");
+       //* DEBUG: */ debugOutput('*'.$userid.'/'.$old.'/'.$cnt.'*');
        return $cnt;
 }
 
 // Determines the right language string for min_users
 function determineReferalRallyeMinimumUsers ($min_users) {
        // Rallye ends without user limitation is the default
-       $return = getMessage('RALLYE_END_NO_USER_LIMITATION');
+       $return = '{--RALLYE_END_NO_USER_LIMITATION--}';
 
        if ($min_users > 0) {
                // Rallye ends when X members are totally in your exchange
@@ -954,7 +952,7 @@ function determineReferalRallyeMinimumUsers ($min_users) {
 // Determines the right language string for min_prices
 function determineReferalRallyeMinimumPrices ($min_prices) {
        // Rallye ends without user limitation is the default
-       $return = getMessage('RALLYE_END_NO_PRICE_LIMITATION');
+       $return = '{--RALLYE_END_NO_PRICE_LIMITATION--}';
 
        if ($min_prices > 0) {
                // Rallye ends when X members are totally in your exchange