Naming inconsistencies for userid fixed

[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 76834e96be1ab4b7c56d535f692b69ef4d3cca2e..364261fd4f0e53143fe51db8ebfc8d8875a0f6c8 100644 (file)
--- a/inc/modules/member/what-doubler.php
+++ b/inc/modules/member/what-doubler.php
@@ -17,7 +17,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,78 +38,60 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-       require($INC);
-} elseif (!IS_MEMBER()) {
-       LOAD_URL('modules.php?module=index');
-} elseif ((!EXT_IS_ACTIVE('doubler')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, sprintf(getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'doubler'));
-       return;
+       die();
+} elseif (!isMember()) {
+       redirectToIndexMemberOnlyModule();
 }
 
 // Add description as navigation point
-ADD_DESCR('member', __FILE__);
+addMenuDescription('member', __FILE__);
+
+if ((!isExtensionActive('doubler')) && (!isAdmin())) {
+       loadTemplate('admin_settings_saved', false, generateExtensionInactiveNotInstalledMessage('doubler'));
+       return;
+} // END - if
 
 // Percent values etc.
-define('__CHARGE_VALUE', TRANSLATE_COMMA(getConfig('doubler_charge') * 100));
-define('__REF_VALUE'   , TRANSLATE_COMMA(getConfig('doubler_ref') * 100));
-define('__TOTAL_VALUE' , TRANSLATE_COMMA(getConfig('doubler_points')));
-define('__MIN_VALUE'   , TRANSLATE_COMMA(getConfig('doubler_min')));
-define('__MAX_VALUE'   , TRANSLATE_COMMA(getConfig('doubler_max')));
+$content['charge'] = translateComma(getConfig('doubler_charge') * 100);
+$content['ref']    = translateComma(getConfig('doubler_ref') * 100);
+$content['total']  = translateComma(getConfig('doubler_points'));
+$content['min']    = translateComma(getConfig('doubler_min'));
+$content['max']    = translateComma(getConfig('doubler_max'));
 
-// Transfer referal ID
-if (EXT_IS_ACTIVE('nickname')) {
+// Default refid is the userid
+$content['userid'] = getMemberId();
+
+// Transfer referal id
+if (isExtensionActive('nickname')) {
        // Load nickname from DB
-       $nick = NICKNAME_GET_NICK(getUserId());
+       $nick = getNickname(getMemberId());
 
        if (!empty($nick)) {
                // Set nickname
-               define('__USERID', $nick);
-       } else {
-               // Use direct userid
-               define('__USERID', getUserId());
-       }
-} else {
-       // Use direct userid
-       define('__USERID', getUserId());
-}
-
-// Usage counter
-define('__DOUBLER_COUNTER', TRANSLATE_COMMA(getConfig('doubler_counter')));
+               $content['userid'] = $nick;
+       } // END - if
+} // END - if
 
 // Which mail-send-mode did the admin setup?
-switch (getConfig('doubler_send_mode')) {
-case "DIRECT":
-       define('DOUBLER_PAYOUT_TIME', getMessage('DOUBLER_PAYOUT_TIME_DIRECT'));
-       break;
-
-case "RESET":
-       define('DOUBLER_PAYOUT_TIME', getMessage('DOUBLER_PAYOUT_TIME_RESET'));
-       break;
-
-default:
-       define('DOUBLER_PAYOUT_TIME', sprintf(getMessage('DOUBLER_PAYOUT_TIME_UNKNOWN'), getConfig('doubler_send_mode')));
-       DEBUG_LOG(__FILE__, __LINE__, constant('DOUBLER_PAYOUT_TIME'));
-       break;
-}
+$content['payout_time'] = getMessage('DOUBLER_PAYOUT_TIME_' . getConfig('doubler_send_mode'));
 
 // Generate table with already payed out doubles
-define('__DOUBLER_PAYOUT_HISTORY', DOUBLER_GENERATE_TABLE(getUserId(), "Y", "N", "DESC"));
+$content['payout_history'] = generateDoublerTable(getMemberId(), 'Y', 'N', 'DESC');
 
 // Generate table with next-to-run payouts
-define('__DOUBLER_PAYOUT_NEXT', DOUBLER_GENERATE_TABLE(getUserId()));
+$content['next_table'] = generateDoublerTable(getMemberId());
 
 // Generate table with refferal payouts
-define('__DOUBLER_PAYOUT_REF', DOUBLER_GENERATE_TABLE(getUserId(), "N", "Y", "DESC"));
+$content['payout_ref'] = generateDoublerTable(getMemberId(), 'N', 'Y', 'DESC');
 
 // Generate timemark
-define('__TIMEOUT_MARK', CREATE_FANCY_TIME(getConfig('doubler_timeout')));
+$content['timeout_mark'] = createFancyTime(getConfig('doubler_timeout'));
 
 // Points left to double
-define('__LEFT_VALUE', TRANSLATE_COMMA(DOUBLER_GET_TOTAL_POINTS_LEFT()));
+$content['left'] = translateComma(DOUBLER_GET_TOTAL_POINTS_LEFT());
 
 // Load template
-LOAD_TEMPLATE("member_doubler");
+loadTemplate('member_doubler', false, $content);
 
-//
+// [EOF]
 ?>