New functions introduced, several rewrites:

[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 3daa41edce39aca87faaf670128c0617ac6224b9..e5c70a987fa5759af54f0bb043313e62d4845e02 100644 (file)
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 06/29/2004 *
- * ================                             Last change: 08/22/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 06/29/2004 *
+ * ===================                          Last change: 08/22/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-rallyes.php                                 *
@@ -52,8 +52,9 @@ if ((!isExtensionActive('rallye')) && (!isAdmin())) {
 } // END - if
 
 // Check for possible running rallyes
-$ADMIN = " AND d.is_active='Y'";
-if (isAdmin()) $ADMIN = '';
+$ADD = " AND d.is_active='Y'";
+if (isAdmin()) $ADD = '';
+
 $result = SQL_QUERY("SELECT
        d.id, d.admin_id, a.login, d.title, d.descr, d.template, d.start_time, d.end_time, d.min_users, d.min_prices
 FROM
@@ -63,7 +64,7 @@ INNER JOIN
 ON
        d.admin_id=a.id
 WHERE
-       d.notified='Y'".$ADMIN."
+       d.notified='Y'".$ADD."
 ORDER BY
        d.end_time ASC
 LIMIT 1", __FILE__, __LINE__);
@@ -82,11 +83,11 @@ if (SQL_NUMROWS($result) == 1) {
                $content['extras'] = getMessage('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_REFLINK--}</a>';
        }
 
        // Set admin line (currently set to impressum, later to contact form)
-       // @TODO Reactivate this: $content['admin'] = "<a href=\"{?URL?}/modules.php?module=index&amp;what=impressum&amp;admin=".$content['admin_id']."\">".$content['login']."</a>";
+       // @TODO Reactivate this: $content['admin'] = '<a href="{%url=modules.php?module=index&amp;what=impressum&amp;admin=' . $content['admin_id'] . '%}">' . $content['login'] . '</a>';
 
        // Handle description...
        if ((empty($content['descr'])) && (!empty($content['template']))) {
@@ -99,16 +100,16 @@ if (SQL_NUMROWS($result) == 1) {
        $content['min_prices'] = determineReferalRallyeMinimumPrices($content['min_prices']);
 
        // Set start and end time
-       $content['start'] = generateDateTime($content['start_time'], '1');
-       $content['end']   = generateDateTime($content['end_time']  , '1');
+       $content['start'] = generateDateTime($content['start_time'], 1);
+       $content['end']   = generateDateTime($content['end_time']  , 1);
 
        if ($expired === true) {
                $content['prices']       = addReferalRallyeWinners($content['id']);
-               $content['top_users']    = "<div align=\"center\" class=\"big\">".$content['extras']."</div>";
+               $content['top_users']    = '<div align="center" class="big">' . $content['extras'] . '</div>';
                $content['can_win_this'] = getMessage('RALLYE_OUR_WINNERS_ARE');
        } else {
                $content['prices']       = addReferalRallyePrices($content['id'], 'html');
-               $content['top_users']    = addReferalRallyeTopUsers($content['id'], getUserId());
+               $content['top_users']    = addReferalRallyeTopUsers($content['id'], getMemberId());
                $content['can_win_this'] = getMessage('RALLYE_YOU_CAN_WIN');
        }