mailer project continued:

[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 4ecc3cca97e98a874dfa3f44dfa226028c1c034e..70d0e433a1a3f252ab9143067aea3543cbec1ef1 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 - 2011 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -37,7 +37,7 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       die();
+       exit();
 } elseif (!isMember()) {
        redirectToIndexMemberOnlyModule();
 }
@@ -51,21 +51,31 @@ 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
 INNER JOIN
        `{?_MYSQL_PREFIX?}_admins` AS a
 ON
-       d.admin_id=a.id
+       d.`admin_id`=a.`id`
 WHERE
-       d.notified='Y'" . $ADD . "
+       d.`notified`='Y'
+       " . $ADD . "
 ORDER BY
-       d.end_time ASC
+       d.`end_time` ASC
 LIMIT 1", __FILE__, __LINE__);
 
 if (SQL_NUMROWS($result) == 1) {
@@ -73,7 +83,7 @@ if (SQL_NUMROWS($result) == 1) {
        $content = SQL_FETCHARRAY($result);
 
        $expired = false;
-       if ($content['end_time'] < time()) {
+       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;
@@ -99,8 +109,8 @@ if (SQL_NUMROWS($result) == 1) {
        $content['min_prices'] = determineReferralRallyeMinimumPrices($content['min_prices']);
 
        // Set start and end time
-       $content['start'] = generateDateTime($content['start_time'], 1);
-       $content['end']   = generateDateTime($content['end_time']  , 1);
+       $content['start_time'] = generateDateTime($content['start_time'], 1);
+       $content['end_time']   = generateDateTime($content['end_time']  , 1);
 
        if ($expired === true) {
                $content['prices']       = addReferralRallyeWinners('member', $content['id']);