Fixes for ranking prices

diff --git a/inc/databases.php b/inc/databases.php
index 7b58825359cfffc6d412eca06ef16543366ee575..17b8ea880879e9852cb56a1a70f0f9349db496c5 100644 (file)
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -113,7 +113,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level
-define('CURR_SVN_REVISION', "462");
+define('CURR_SVN_REVISION', "463");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);

diff --git a/inc/language/bonus_de.php b/inc/language/bonus_de.php
index 9331f0f70ef3f84b40ca84babd4df4ca07dffbee..d67ce225e0d4a549ee28f0d1fc29b2f237582b06 100644 (file)
--- a/inc/language/bonus_de.php
+++ b/inc/language/bonus_de.php
@@ -45,7 +45,7 @@ define('ADMIN_BONUS_LOGIN_BONUS', "Bonus für Login");
 define('ADMIN_BONUS_TURBO_BONUS', "Rang-Bonus für Erst-Klicker");
 define('ADMIN_BONUS_TURBO_RATES', "Bonus für Klicker 2 bis x");
 define('ADMIN_BONUS_TURBO_RATES_NOTE1', "Hinweise");
-define('ADMIN_BONUS_TURBO_RATES_NOTE2', "Lassen Sie den letzten Eintrag frei, damit kein weiterer Eintrag hingefügt wird.");
+define('ADMIN_BONUS_TURBO_RATES_NOTE2', "Stellen Sie zuerst unter <strong>{--ADMIN_BONUS_TURBO_RANKS--}</strong> die Anzahl der Gewinner ein. Lassen Sie dabei den letzten Platz frei!");
 define('ADMIN_BONUS_TURBO_RATES_NOTE3', "Eintr&auml;ge l&ouml;schen, um Bonus zu entfernen (alle unteren r&uuml;cken beim Speichern nach!)");
 define('ADMIN_BONUS_TURBO_RATES_NOTE4', "Wenn Sie alle Eintr&auml;ge gel&ouml;scht haben, werden Platz 2 und 3 automatisch neu berechnet.");
 define('ADMIN_CONFIG_LOGIN_TIMEOUT', "Zeitspanne zwischen zwei Logins");

diff --git a/inc/modules/admin/what-config_bonus.php b/inc/modules/admin/what-config_bonus.php
index b86ddc5ecc5eda426785e0f79748b73efdbab2d0..9e4641d08ba8d59214ea3212055bd3fc642960e0 100644 (file)
--- a/inc/modules/admin/what-config_bonus.php
+++ b/inc/modules/admin/what-config_bonus.php
@@ -89,21 +89,29 @@ if (isset($_POST['ok']))
        define('__MEMBER_SELECTION', ADD_MEMBER_SELECTION_BOX($_CONFIG['bonus_uid'], false, true, true, "bonus_uid"));
 
        // Initialize array for the points list
-       $RANKS = explode(";", $_CONFIG['bonus_ranks']);
+       //die("*".$_CONFIG['turbo_rates']."*");
+       $RANKS = explode(";", $_CONFIG['turbo_rates']);
 
        // Automatically calculate bonus points for ranks 2 and 3 when not set
        if (empty($_CONFIG['bonus_ranks'])) $RANKS = array(round($_CONFIG['turbo_bonus'] / 2), round($_CONFIG['turbo_bonus'] / 4));
 
        // Generate list
        $OUT = "<OL start=\"2\">\n";
+       $cnt = 0;
        foreach ($RANKS as $k => $rate) {
                if (!empty($rate))      {
                        // Print only when something is in
                        $OUT .= "  <LI><INPUT type=\"text\" name=\"rate[".($k + 2)."]\" class=\"admin_normal\" size=\"4\" maxlength=\"7\" value=\"".$rate."\">&nbsp;<FONT class=\"admin_notes\">(".POINTS.")</FONT?</LI>\n";
                }
+               $cnt++;
        }
-       for ($i = 3; $i < 8; $i++) {
-               $OUT .= "  <LI><INPUT type=\"text\" name=\"rate[".($k + $i)."]\" class=\"admin_normal\" size=\"4\" maxlength=\"7\">&nbsp;<FONT class=\"admin_notes\">(".POINTS.")</FONT?</LI>\n";
+       // Maxmium entries
+       $max = 10;
+       if ($cnt >= 8) $max = $cnt+3;
+
+       // Add more empty fields
+       for ($i = $cnt; $i < $max; $i++) {
+               $OUT .= "  <LI><INPUT type=\"text\" name=\"rate[".($i+2)."]\" class=\"admin_normal\" size=\"4\" maxlength=\"7\">&nbsp;<FONT class=\"admin_notes\">(".POINTS.")</FONT?</LI>\n";
        }
        $OUT .= "</OL>\n";
        define('__TRATES_LIST', $OUT);