Naming convention applied to language strings, new API function added:

[mailer.git] / inc / modules / admin / what-config_doubler.php

diff --git a/inc/modules/admin/what-config_doubler.php b/inc/modules/admin/what-config_doubler.php
index 8f375d51c84a040ea57ad641b579bdcd17a01c10..421752c55d8ed4c969da7d95f8a7eb5c40855a78 100644 (file)
--- a/inc/modules/admin/what-config_doubler.php
+++ b/inc/modules/admin/what-config_doubler.php
@@ -47,8 +47,8 @@ addMenuDescription('admin', __FILE__);
 
 if (isFormSent()) {
        // Replace commata with decimal dot
-       setPostRequestParameter('doubler_charge', (convertCommaToDot(postRequestParameter('doubler_charge')) / 100));
-       setPostRequestParameter('doubler_ref'   , (convertCommaToDot(postRequestParameter('doubler_ref')) / 100));
+       setPostRequestParameter('doubler_charge', convertCommaToDot(postRequestParameter('doubler_charge')));
+       setPostRequestParameter('doubler_ref'   , convertCommaToDot(postRequestParameter('doubler_ref')));
        setPostRequestParameter('doubler_min'   , convertCommaToDot(postRequestParameter('doubler_min')));
        setPostRequestParameter('doubler_max'   , convertCommaToDot(postRequestParameter('doubler_max')));
        setPostRequestParameter('doubler_left'  , convertCommaToDot(postRequestParameter('doubler_left')));
@@ -56,18 +56,6 @@ if (isFormSent()) {
        // Save settings
        adminSaveSettingsFromPostData();
 } else {
-       // Prepare data for the template
-       // - Charge rate
-       $content['charge']  = translateComma((getConfig('doubler_charge') * 100), false);
-       // - Referal rate
-       $content['referal'] = translateComma((getConfig('doubler_ref') * 100), false);
-       // - Minimum points to double
-       $content['minimum'] = translateComma(getConfig('doubler_min'), false);
-       // - Maximum points to double
-       $content['maximum'] = translateComma(getConfig('doubler_max'), false);
-       // - Points left on users account after doubling
-       $content['left']    = translateComma(getConfig('doubler_left'), false);
-
        // Init all Y/N selections
        foreach (array('jackpot','own','sent_all') as $entry) {
                $content[$entry . '_y'] = '';
@@ -86,11 +74,31 @@ if (isFormSent()) {
        } // END - foreach
 
        // Transfer options
-       $content['member_selection'] = addMemberSelectionBox(getConfig('doubler_userid'), false, true, true, 'doubler_userid');
+       $content['form_selection'] = addMemberSelectionBox(getConfig('doubler_userid'), false, true, true, 'doubler_userid');
 
        // Number of rows to display (option lines!!!)
        foreach (array('new','pay','old') as $entry) {
-               $content['display_' . $entry] = generateOptionList('/ARRAY/', array(5,10,20,30,40,50,100), array(5,10,20,30,40,50,100), getConfig('doubler_display_' . $entry));
+               $content['display_' . $entry] = generateOptionList(
+                       '/ARRAY/',
+                       array(
+                               5,
+                               10,
+                               20,
+                               30,
+                               40,
+                               50,
+                               100
+                       ), array(
+                               5,
+                               10,
+                               20,
+                               30,
+                               40,
+                               50,
+                               100
+                       ),
+                       getConfig('doubler_display_' . $entry)
+               );
        } // END - foreach
 
        // Timeout selection box or input box?