Deprecated variables for templates removed, mor EL-rewrites, getMessage() rewritten:

[mailer.git] / inc / modules / member / what-doubler.php

diff --git a/inc/modules/member/what-doubler.php b/inc/modules/member/what-doubler.php
index ba674f53947d3ec3874bce19183922e45b451bab..520853db579b9ada40b23e056f7a106221ecd21a 100644 (file)
--- a/inc/modules/member/what-doubler.php
+++ b/inc/modules/member/what-doubler.php
@@ -52,23 +52,13 @@ if ((!isExtensionActive('doubler')) && (!isAdmin())) {
        return;
 } // END - if
 
        return;
 } // END - if
 

-// Percent values etc.
-// @TODO The '*100' is in the way to get moved into the template
-$content['charge'] = translateComma(getConfig('doubler_charge') * 100);
-$content['ref']    = translateComma(getConfig('doubler_ref') * 100);
-
-// Default refid is the userid
-$content['userid'] = getMemberId();
+// Init nickname
+$content['nickname'] = '';

 
 // Transfer referal id
 if (isExtensionActive('nickname')) {
        // Load nickname from DB
 
 // Transfer referal id
 if (isExtensionActive('nickname')) {
        // Load nickname from DB

-       $nick = getNickname(getMemberId());
-
-       if (!empty($nick)) {
-               // Set nickname
-               $content['userid'] = $nick;
-       } // END - if
+       $content['nickname'] = getNickname(getMemberId());

 } // END - if
 
 // Which mail-send-mode did the admin setup?
 } // END - if
 
 // Which mail-send-mode did the admin setup?


@@ -77,18 +67,9 @@ $content['payout_time'] = getMessage('DOUBLER_PAYOUT_TIME_' . getConfig('doubler
 // Generate table with already payed out doubles
 $content['payout_history'] = generateDoublerTable(getMemberId(), 'Y', 'N', 'DESC');
 
 // Generate table with already payed out doubles
 $content['payout_history'] = generateDoublerTable(getMemberId(), 'Y', 'N', 'DESC');
 

-// Generate table with next-to-run payouts
-$content['next_table'] = generateDoublerTable(getMemberId());
-

 // Generate table with refferal payouts
 $content['payout_ref'] = generateDoublerTable(getMemberId(), 'N', 'Y', 'DESC');
 
 // Generate table with refferal payouts
 $content['payout_ref'] = generateDoublerTable(getMemberId(), 'N', 'Y', 'DESC');
 

-// Generate timemark
-$content['timeout_mark'] = createFancyTime(getConfig('doubler_timeout'));
-
-// Points left to double
-$content['left'] = translateComma(DOUBLER_GET_TOTAL_POINTS_LEFT());
-

 // Load template
 loadTemplate('member_doubler', false, $content);
 
 // Load template
 loadTemplate('member_doubler', false, $content);