A lot naming conventions applied, TODOs.txt updated

[mailer.git] / inc / modules / member / what-rallyes.php

diff --git a/inc/modules/member/what-rallyes.php b/inc/modules/member/what-rallyes.php
index e5c70a987fa5759af54f0bb043313e62d4845e02..f246691a83547ed0213c87b292c59340f3b2b9ba 100644 (file)
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -18,6 +18,7 @@
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -64,7 +65,7 @@ INNER JOIN
 ON
        d.admin_id=a.id
 WHERE
-       d.notified='Y'".$ADD."
+       d.notified='Y'" . $ADD . "
 ORDER BY
        d.end_time ASC
 LIMIT 1", __FILE__, __LINE__);
@@ -76,14 +77,14 @@ if (SQL_NUMROWS($result) == 1) {
        $expired = false;
        if ($content['end_time'] < time()) {
                // Rallye is expired
-               $content['extras'] = getMessage('RALLYE_HAS_EXPIRED');
+               $content['extras'] = '{--RALLYE_HAS_EXPIRED--}';
                $expired = true;
        } elseif (time() >= ($content['end_time'] - getConfig('ONE_DAY'))) {
                // Rallye will expire in less one day!
-               $content['extras'] = getMessage('RALLYE_EXPIRE_ONE_DAY');
+               $content['extras'] = '{--RALLYE_EXPIRE_ONE_DAY--}';
        } else {
                // Link to referal links page
-               $content['extras'] = '<a href="{%url=modules.php?module=login&amp;what=reflinks%}">{--RALLYE_GET_REFLINK--}</a>';
+               $content['extras'] = '<a href="{%url=modules.php?module=login&amp;what=reflinks%}">{--RALLYE_GET_REFERAL_LINK--}</a>';
        }
 
        // Set admin line (currently set to impressum, later to contact form)
@@ -106,11 +107,11 @@ if (SQL_NUMROWS($result) == 1) {
        if ($expired === true) {
                $content['prices']       = addReferalRallyeWinners($content['id']);
                $content['top_users']    = '<div align="center" class="big">' . $content['extras'] . '</div>';
-               $content['can_win_this'] = getMessage('RALLYE_OUR_WINNERS_ARE');
+               $content['can_win_this'] = '{--RALLYE_OUR_WINNERS_ARE--}';
        } else {
                $content['prices']       = addReferalRallyePrices($content['id'], 'html');
                $content['top_users']    = addReferalRallyeTopUsers($content['id'], getMemberId());
-               $content['can_win_this'] = getMessage('RALLYE_YOU_CAN_WIN');
+               $content['can_win_this'] = '{--RALLYE_YOU_CAN_WIN--}';
        }
 
        // And load final template