Updated copyright notice as there are changes in this year

[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 70d0e433a1a3f252ab9143067aea3543cbec1ef1..2821d8c1d67e24a09144cec4db74ff48e7aad718 100644 (file)
--- a/inc/modules/member/what-rallyes.php
+++ b/inc/modules/member/what-rallyes.php
@@ -16,7 +16,7 @@
  * $Author::                                                          $ *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -51,42 +51,42 @@ if ((!isExtensionActive('rallye')) && (!isAdmin())) {
 } // END - if
 
 // Check for possible running rallyes
-$ADD = " AND d.`is_active`='Y'";
+$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`
+       `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
-       `{?_MYSQL_PREFIX?}_rallye_data` AS d
+       `{?_MYSQL_PREFIX?}_rallye_data` AS `d`
 INNER JOIN
-       `{?_MYSQL_PREFIX?}_admins` AS a
+       `{?_MYSQL_PREFIX?}_admins` AS `a`
 ON
-       d.`admin_id`=a.`id`
+       `d`.`admin_id`=`a`.`id`
 WHERE
-       d.`notified`='Y'
+       `d`.`notified`='Y'
        " . $ADD . "
 ORDER BY
-       d.`end_time` ASC
+       `d`.`end_time` ASC
 LIMIT 1", __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result) == 1) {
        // Found some (normally one...
        $content = SQL_FETCHARRAY($result);
 
-       $expired = false;
+       $expired = FALSE;
        if (($content['end_time'] < time()) && (getTotalConfirmedUser() >= $content['min_users']) && (getTotalRallyeWinners($content['id']) >= $content['min_prices'])) {
                // Rallye is expired
                $content['extras'] = '{--RALLYE_HAS_EXPIRED--}';
-               $expired = true;
+               $expired = TRUE;
        } elseif (time() >= ($content['end_time'] - getOneDay())) {
                // Rallye will expire in less one day!
                $content['extras'] = '{--RALLYE_EXPIRE_ONE_DAY--}';
@@ -101,18 +101,14 @@ if (SQL_NUMROWS($result) == 1) {
        // Handle description...
        if ((empty($content['descr'])) && (!empty($content['template']))) {
                // Use description from template
-               $content['descr'] = loadTemplate('rallye_' . $content['template'], true);
+               $content['descr'] = '{%template,LoadTemplate=rallye_' . $content['template'] . '%}';
        } // END - if
 
-       // Determine min_users/prices
-       $content['min_users']  = determineReferralRallyeMinimumUsers($content['min_users']);
-       $content['min_prices'] = determineReferralRallyeMinimumPrices($content['min_prices']);
-
        // Set start and end time
        $content['start_time'] = generateDateTime($content['start_time'], 1);
        $content['end_time']   = generateDateTime($content['end_time']  , 1);
 
-       if ($expired === true) {
+       if ($expired === TRUE) {
                $content['prices']       = addReferralRallyeWinners('member', $content['id']);
                $content['top_users']    = '<div align="center" class="big">' . $content['extras'] . '</div>';
                $content['can_win_this'] = '{--RALLYE_OUR_WINNERS_ARE--}';
@@ -123,7 +119,7 @@ if (SQL_NUMROWS($result) == 1) {
        }
 
        // And load final template
-       loadTemplate('member_show_rallye', false, $content);
+       loadTemplate('member_show_rallye', FALSE, $content);
 } else {
        // No rallye found so far
        loadTemplate('member_rallye_404');