New extension added, ext-uberwach rewritten (unfinished), some fixes

[mailer.git] / show_bonus.php

diff --git a/show_bonus.php b/show_bonus.php
index 616973e472e963980e22c4b17cb680da29beb87e..cf45a31fe1723037bf90ecb2ee90bebf753778c6 100644 (file)
--- a/show_bonus.php
+++ b/show_bonus.php
@@ -88,7 +88,11 @@ ON
 WHERE
        d.`status`='CONFIRMED' AND d.userid=%s AND b.%s=%s
 LIMIT 1",
-                       array(bigintval(getRequestElement('userid')), $t, bigintval(getRequestElement('d'))), __FILE__, __LINE__);
+                       array(
+                               bigintval(getRequestElement('userid')),
+                               $t,
+                               bigintval(getRequestElement('d'))
+                       ), __FILE__, __LINE__);
 
                // Entry found?
                if (SQL_NUMROWS($result) == 1) {
@@ -101,6 +105,9 @@ LIMIT 1",
                        $content['mailid'] = bigintval(getRequestElement('d'));
                        $content['rows']   = addBonusRanks(bigintval(getRequestElement('d')), $t, bigintval(getRequestElement('userid')));
 
+                       // Get some prepared content
+                       $content = merge_array($content, $GLOBALS['ranking_content']);
+
                        // Load pre-template
                        $content['message'] = loadTemplate('show_bonus_msg', true, $content);
                } else {
@@ -125,9 +132,6 @@ $content['header'] = loadTemplate('show_bonus_header', true);
 // Load show_bonus footer template (for your banners, e.g.?)
 $content['footer'] = loadTemplate('show_bonus_footer', true);
 
-// Total ranks who can win
-$content['total_ranks'] = getConfig('bonus_ranks');
-
 // Load final template
 loadTemplate('show_bonus', false, $content);