More misc fixes and rewrites (sorry, lame description)

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

diff --git a/inc/modules/guest/what-doubler.php b/inc/modules/guest/what-doubler.php
index 26192e7036ca043063aab2625c0c1a2e35996473..3c08ac964f045f5e8538b27482767f463f6b9788 100644 (file)
--- a/inc/modules/guest/what-doubler.php
+++ b/inc/modules/guest/what-doubler.php
@@ -41,7 +41,7 @@ if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 } elseif ((!EXT_IS_ACTIVE('doubler')) && (!IS_ADMIN())) {
-       addFatalMessage(__FILE__, __LINE__, getMessage('EXTENSION_PROBLEM_EXT_INACTIVE'), 'doubler');
+       addFatalMessage(__FILE__, __LINE__, generateExtensionInactiveNotInstalledMessage('doubler'));
        return;
 }
 
@@ -49,11 +49,11 @@ if (!defined('__SECURITY')) {
 ADD_DESCR('guest', __FILE__);
 
 // 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')));
+define('__CHARGE_VALUE', translateComma(getConfig('doubler_charge') * 100));
+define('__REF_VALUE'   , translateComma(getConfig('doubler_ref') * 100));
+define('__TOTAL_VALUE' , translateComma(getConfig('doubler_points')));
+define('__MIN_VALUE'   , translateComma(getConfig('doubler_min')));
+define('__MAX_VALUE'   , translateComma(getConfig('doubler_max')));
 
 // Transfer referal ID
 define('__REFID', $GLOBALS['refid']);
@@ -62,31 +62,30 @@ define('__REFID', $GLOBALS['refid']);
 define('__DOUBLER_COUNTER', 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);
-       break;
+switch (getConfig('doubler_send_mode')) {
+       case 'DIRECT':
+               define('DOUBLER_PAYOUT_TIME', DOUBLER_PAYOUT_TIME_DIRECT);
+               break;
 
-case "RESET":
-       define('DOUBLER_PAYOUT_TIME', DOUBLER_PAYOUT_TIME_RESET);
-       break;
+       case 'RESET':
+               define('DOUBLER_PAYOUT_TIME', DOUBLER_PAYOUT_TIME_RESET);
+               break;
 }
 
 // Generate table with already payed out doubles
-define('__DOUBLER_PAYOUT_HISTORY', DOUBLER_GENERATE_TABLE("0", "Y", "N", "DESC"));
+define('__DOUBLER_PAYOUT_HISTORY', DOUBLER_GENERATE_TABLE('0', 'Y', 'N', 'DESC'));
 
 // Generate table with next-to-run payouts
 define('__DOUBLER_PAYOUT_NEXT', DOUBLER_GENERATE_TABLE());
 
 // Generate timemark
-define('__TIMEOUT_MARK', CREATE_FANCY_TIME(getConfig('doubler_timeout')));
+define('__TIMEOUT_MARK', createFancyTime(getConfig('doubler_timeout')));
 
 // Points left to double
 define('__LEFT_VALUE', DOUBLER_GET_TOTAL_POINTS_LEFT());
 
 // Load template
-LOAD_TEMPLATE("guest_doubler");
+LOAD_TEMPLATE('guest_doubler');
 
 //
 ?>