X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fguest%2Fwhat-rallyes.php;h=43afabe64ddebad8cc450c4595834e51f45a3a64;hp=f712818c3363880d52b68b848a69e9e9cd34d431;hb=4f7df133f736da124e6f7bd02008b9093f736451;hpb=f2aeaab0cd313b2eeb151642455ed558f6b186dc diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php index f712818c33..43afabe64d 100644 --- a/inc/modules/guest/what-rallyes.php +++ b/inc/modules/guest/what-rallyes.php @@ -14,12 +14,10 @@ * $Date:: $ * * $Tag:: 0.2.1-FINAL $ * * $Author:: $ * - * Needs to be in all Files and every File needs "svn propset * - * 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 * + * 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 * * it under the terms of the GNU General Public License as published by * @@ -39,14 +37,14 @@ // Some security stuff... if (!defined('__SECURITY')) { - die(); + exit(); } // END - if // Add description as navigation point -addMenuDescription('guest', __FILE__); +addYouAreHereLink('guest', __FILE__); if ((!isExtensionActive('rallye')) && (!isAdmin())) { - loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('rallye')); + displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=rallye%}'); return; } // END - if @@ -54,33 +52,43 @@ if ((!isExtensionActive('rallye')) && (!isAdmin())) { outputHtml('
'); // 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'" . $ADD . " + `d`.`notified`='Y' + " . $ADD . " ORDER BY - d.end_time + `d`.`end_time` ASC LIMIT 1", __FILE__, __LINE__); if (SQL_NUMROWS($result) == 1) { // Found some (normally one... - list($id, $adminId, $login, $title, $descr, $templ, $start, $end, $min_users, $min_prices) = SQL_FETCHROW($result); + $content = SQL_FETCHARRAY($result); - $expired = false; - if ($end < time()) { + $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; - } elseif (time() >= ($end - getConfig('ONE_DAY'))) { + $expired = TRUE; + } elseif (time() >= ($content['end_time'] - getOneDay())) { // Rallye will expire in less one day! $content['extras'] = '{--RALLYE_EXPIRE_ONE_DAY--}'; } else { @@ -88,45 +96,39 @@ if (SQL_NUMROWS($result) == 1) { } // Set admin line (currently set to impressum, later to contact form) - // @TODO Reactivate this: $content['admin'] = '' . $login . ''; - - // Set title - $content['title'] = $title; + // @TODO Reactivate this: $content['admin'] = '' . $content['login'] . ''; // Handle description... - if ((empty($descr)) && (!empty($templ))) { + if ((empty($content['descr'])) && (!empty($content['template']))) { // Use description from template - $content['descr'] = loadTemplate('rallye_' . $templ, true); - } else { - // Use description from database - $content['descr'] = $descr; - } + $content['descr'] = loadTemplate('rallye_' . $content['template'], TRUE); + } // END - if // Set start and end time - $content['start'] = generateDateTime($start, 1); - $content['end'] = generateDateTime($end , 1); + $content['start_time'] = generateDateTime($content['start_time'], 1); + $content['end_time'] = generateDateTime($content['end_time'] , 1); // Determine min_users - $content['min_users'] = determineReferalRallyeMinimumUsers($min_users); + $content['min_users'] = determineReferralRallyeMinimumUsers($content['min_users']); // Determine min prices (now in function) - $content['min_prices'] = determineReferalRallyeMinimumPrices($min_prices); + $content['min_prices'] = determineReferralRallyeMinimumPrices($content['min_prices']); - if ($expired === true) { - $content['prices'] = addReferalRallyeWinners($id); + if ($expired === TRUE) { + $content['prices'] = addReferralRallyeWinners('guest', $content['id']); $content['top_users'] = '
' . $content['extras'] . '
'; $content['can_win_this'] = '{--RALLYE_OUR_WINNERS_ARE--}'; } else { - $content['prices'] = addReferalRallyePrices($id, 'html'); - $content['top_users'] = addReferalRallyeTopUsers($id, getMemberId()); + $content['prices'] = addReferralRallyePrices($content['id'], 'html'); + $content['top_users'] = addReferralRallyeTopUsers('guest', $content['id'], getMemberId()); $content['can_win_this'] = '{--RALLYE_YOU_CAN_WIN--}'; } // And load final template - loadTemplate('guest_rallye_show', false, $content); + loadTemplate('guest_show_rallye', FALSE, $content); } else { // No rallye found so far - loadTemplate('guest_no_rallyes'); + loadTemplate('guest_rallye_404'); } // Close the div tag