A lot rewrites from double-quote to single-quote, some fixes for extension handling...

[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 a57b9ea8fa20e322b76cbcb65658127833261ec0..fe209d5cd34229f96592930fc8d938a01c20f23b 100644 (file)
--- a/inc/modules/member/what-doubler.php
+++ b/inc/modules/member/what-doubler.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Allgemeine Informationen zum Verdoppen           *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -37,13 +42,13 @@ if (!defined('__SECURITY')) {
        require($INC);
 } elseif (!IS_MEMBER()) {
        LOAD_URL("modules.php[5~?module=index");
-} elseif ((!EXT_IS_ACTIVE("doubler")) && (!IS_ADMIN())) {
-       ADD_FATAL(EXTENSION_PROBLEM_EXT_INACTIVE, "doubler");
+} elseif ((!EXT_IS_ACTIVE('doubler')) && (!IS_ADMIN())) {
+       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'doubler');
        return;
 }
 
 // Add description as navigation point
-ADD_DESCR("member", __FILE__);
+ADD_DESCR('member', __FILE__);
 
 // Percent values etc.
 define('__CHARGE_VALUE', TRANSLATE_COMMA(getConfig('doubler_charge') * 100));
@@ -53,26 +58,20 @@ define('__MIN_VALUE'   , TRANSLATE_COMMA(getConfig('doubler_min')));
 define('__MAX_VALUE'   , TRANSLATE_COMMA(getConfig('doubler_max')));
 
 // Transfer referal ID
-if (EXT_IS_ACTIVE("nickname"))
-{
+if (EXT_IS_ACTIVE('nickname')) {
        // Load nickname from DB
-       $nick = NICKNAME_GET_NICK($GLOBALS['userid']);
+       $nick = NICKNAME_GET_NICK(getUserId());
 
-       if (!empty($nick))
-       {
+       if (!empty($nick)) {
                // Set nickname
                define('__USERID', $nick);
-       }
-        else
-       {
+       } else {
                // Use direct userid
-               define('__USERID', $GLOBALS['userid']);
+               define('__USERID', getUserId());
        }
-}
- else
-{
+} else {
        // Use direct userid
-       define('__USERID', $GLOBALS['userid']);
+       define('__USERID', getUserId());
 }
 
 // Usage counter
@@ -81,22 +80,27 @@ define('__DOUBLER_COUNTER', TRANSLATE_COMMA(getConfig('doubler_counter')));
 // Which mail-send-mode did the admin setup?
 switch (getConfig('doubler_send_mode')) {
 case "DIRECT":
-       define('DOUBLER_PAYOUT_TIME', DOUBLER_PAYOUT_TIME_DIRECT);
+       define('DOUBLER_PAYOUT_TIME', getMessage('DOUBLER_PAYOUT_TIME_DIRECT'));
        break;
 
 case "RESET":
-       define('DOUBLER_PAYOUT_TIME', DOUBLER_PAYOUT_TIME_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;
 }
 
 // Generate table with already payed out doubles
-define('__DOUBLER_PAYOUT_HISTORY', DOUBLER_GENERATE_TABLE($GLOBALS['userid'], "Y", "N", "DESC"));
+define('__DOUBLER_PAYOUT_HISTORY', DOUBLER_GENERATE_TABLE(getUserId(), "Y", "N", "DESC"));
 
 // Generate table with next-to-run payouts
-define('__DOUBLER_PAYOUT_NEXT', DOUBLER_GENERATE_TABLE($GLOBALS['userid']));
+define('__DOUBLER_PAYOUT_NEXT', DOUBLER_GENERATE_TABLE(getUserId()));
 
 // Generate table with refferal payouts
-define('__DOUBLER_PAYOUT_REF', DOUBLER_GENERATE_TABLE($GLOBALS['userid'], "N", "Y", "DESC"));
+define('__DOUBLER_PAYOUT_REF', DOUBLER_GENERATE_TABLE(getUserId(), "N", "Y", "DESC"));
 
 // Generate timemark
 define('__TIMEOUT_MARK', CREATE_FANCY_TIME(getConfig('doubler_timeout')));