'what' files should be loaded only once

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

diff --git a/inc/modules/guest/what-rallyes.php b/inc/modules/guest/what-rallyes.php
index c8a79d642081d3219c92eda3421da65cbd5484fc..bbaec5f4718c45857b82c2def5a9382c2786052e 100644 (file)
--- a/inc/modules/guest/what-rallyes.php
+++ b/inc/modules/guest/what-rallyes.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * 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 *
@@ -44,7 +44,7 @@ if (!defined('__SECURITY')) {
 addYouAreHereLink('guest', __FILE__);
 
 if ((!isExtensionActive('rallye')) && (!isAdmin())) {
-       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('rallye'));
+       displayMessage('{%pipe,generateExtensionInactiveNotInstalledMessage=rallye%}');
        return;
 } // END - if
 
@@ -86,7 +86,7 @@ if (SQL_NUMROWS($result) == 1) {
        }
 
        // 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=' . $adminId . '%}">' . $login . '</a>';
+       // @TODO Reactivate this: $content['admin'] = '<a href="{%url=modules.php?module=index&amp;what=impressum&amp;id=' . $adminId . '%}">' . $login . '</a>';
 
        // Set title
        $content['title'] = $title;
@@ -111,20 +111,20 @@ if (SQL_NUMROWS($result) == 1) {
        $content['min_prices'] = determineReferalRallyeMinimumPrices($min_prices);
 
        if ($expired === true) {
-               $content['prices']       = addReferalRallyeWinners($id);
+               $content['prices']       = addReferalRallyeWinners('guest', $id);
                $content['top_users']    = '<div align="center" class="big">' . $content['extras'] . '</div>';
                $content['can_win_this'] = '{--RALLYE_OUR_WINNERS_ARE--}';
        } else {
                $content['prices']       = addReferalRallyePrices($id, 'html');
-               $content['top_users']    = addReferalRallyeTopUsers($id, getMemberId());
+               $content['top_users']    = addReferalRallyeTopUsers('guest', $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