X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_bonus.php;h=3e3308027ebd003bc1b62607ace2210a9edf408f;hb=8401d620295d27ad2c7804da2a593bba1ac6ff47;hp=1488a2b32905e04cb40c2a0299eab86c87a14ca7;hpb=963e55ca1ea79e255f235e359cde9f7862191dc5;p=mailer.git

diff --git a/inc/modules/admin/what-config_bonus.php b/inc/modules/admin/what-config_bonus.php
index 1488a2b329..3e3308027e 100644
--- a/inc/modules/admin/what-config_bonus.php
+++ b/inc/modules/admin/what-config_bonus.php
@@ -38,22 +38,20 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
-if (isset($_POST['ok']))
-{
+if (isset($_POST['ok'])) {
 	// Replace german decimal commas to computer decimal dots
-	$_POST['login_bonus']         = str_replace(",", ".", $_POST['login_bonus']        );
-	$_POST['turbo_bonus']         = str_replace(",", ".", $_POST['turbo_bonus']        );
-	$_POST['bonus_ref']           = str_replace(",", ".", $_POST['bonus_ref']          );
-	$_POST['bonus_order']         = str_replace(",", ".", $_POST['bonus_order']        );
-	$_POST['bonus_notify_points'] = str_replace(",", ".", $_POST['bonus_notify_points']);
+	$_POST['login_bonus']         = REVERT_COMMA($_POST['login_bonus']        );
+	$_POST['turbo_bonus']         = REVERT_COMMA($_POST['turbo_bonus']        );
+	$_POST['bonus_ref']           = REVERT_COMMA($_POST['bonus_ref']          );
+	$_POST['bonus_order']         = REVERT_COMMA($_POST['bonus_order']        );
+	$_POST['bonus_notify_points'] = REVERT_COMMA($_POST['bonus_notify_points']);
 
 	// Generate string for saving ranks
 	$_POST['turbo_rates'] = ""; $RATES = array();
-	foreach ($_POST['rate'] as $rate)
-	{
-		$rate = trim(str_replace(",", ".", $rate));
+	foreach ($_POST['rate'] as $rate) {
+		$rate = trim(REVERT_COMMA($rate));
 		if (isset($rate)) $RATES[] = $rate;
 	}
 	$_POST['turbo_rates'] = trim(implode(";", $RATES));
@@ -69,11 +67,6 @@ if (isset($_POST['ok']))
 	$_CONFIG['bonus_active']    = $_POST['bonus_active'];
 	$_CONFIG['bonus_en_notify'] = $_POST['bonus_en_notify'];
 	$_CONFIG['bonus_di_notify'] = $_POST['bonus_di_notify'];
-
-	// Include sending out mails
-	if ((($_CONFIG['bonus_active'] == "Y") && ($_CONFIG['bonus_en_notify'] == "Y")) || (($_CONFIG['bonus_active'] == "N") && ($_CONFIG['bonus_di_notify'] == "Y"))) {
-		include(PATH."inc/mails/bonus_mails.php");
-	}
 } else {
 	// Prepare contants for the template
 	define('__LOGIN_VALUE' , TRANSLATE_COMMA($_CONFIG['login_bonus']        , false));
@@ -86,24 +79,32 @@ if (isset($_POST['ok']))
 	define('__TLINES_VALUE', $_CONFIG['bonus_lines']);
 
 	// Transfer options to template __MEMBER_SELECTION
-	ADD_MEMBER_SELECTION_BOX($_CONFIG['bonus_uid'], false, true, true);
+	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));
+	if (empty($_CONFIG['turbo_rates'])) $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);
@@ -116,122 +117,122 @@ if (isset($_POST['ok']))
 	switch ($_CONFIG['bonus_active'])
 	{
 	case 'Y':
-		define('__BONUS_ACTIVE_Y', ' checked');
+		define('__BONUS_ACTIVE_Y', " checked=\"checked\"");
 		define('__BONUS_ACTIVE_N', "");
 		break;
 
 	case 'N':
 		define('__BONUS_ACTIVE_Y', "");
-		define('__BONUS_ACTIVE_N', ' checked');
+		define('__BONUS_ACTIVE_N', " checked=\"checked\"");
 		break;
 	}
 	// Other bonus to de-/activate
 	switch ($_CONFIG['bonus_login_yn'])
 	{
 	case 'Y':
-		define('__BONUS_LOGIN_Y', ' checked');
+		define('__BONUS_LOGIN_Y', " checked=\"checked\"");
 		define('__BONUS_LOGIN_N', "");
 		break;
 
 	case 'N':
 		define('__BONUS_LOGIN_Y', "");
-		define('__BONUS_LOGIN_N', ' checked');
+		define('__BONUS_LOGIN_N', " checked=\"checked\"");
 		break;
 	}
 	switch ($_CONFIG['bonus_stats_yn'])
 	{
 	case 'Y':
-		define('__BONUS_STATS_Y', ' checked');
+		define('__BONUS_STATS_Y', " checked=\"checked\"");
 		define('__BONUS_STATS_N', "");
 		break;
 
 	case 'N':
 		define('__BONUS_STATS_Y', "");
-		define('__BONUS_STATS_N', ' checked');
+		define('__BONUS_STATS_N', " checked=\"checked\"");
 		break;
 	}
 	switch ($_CONFIG['bonus_order_yn'])
 	{
 	case 'Y':
-		define('__BONUS_ORDER_Y', ' checked');
+		define('__BONUS_ORDER_Y', " checked=\"checked\"");
 		define('__BONUS_ORDER_N', "");
 		break;
 
 	case 'N':
 		define('__BONUS_ORDER_Y', "");
-		define('__BONUS_ORDER_N', ' checked');
+		define('__BONUS_ORDER_N', " checked=\"checked\"");
 		break;
 	}
 	switch ($_CONFIG['bonus_ref_yn'])
 	{
 	case 'Y':
-		define('__BONUS_REF_Y', ' checked');
+		define('__BONUS_REF_Y', " checked=\"checked\"");
 		define('__BONUS_REF_N', "");
 		break;
 
 	case 'N':
 		define('__BONUS_REF_Y', "");
-		define('__BONUS_REF_N', ' checked');
+		define('__BONUS_REF_N', " checked=\"checked\"");
 		break;
 	}
 	switch ($_CONFIG['bonus_click_yn'])
 	{
 	case 'Y':
-		define('__BONUS_CLICK_Y', ' checked');
+		define('__BONUS_CLICK_Y', " checked=\"checked\"");
 		define('__BONUS_CLICK_N', "");
 		break;
 
 	case 'N':
 		define('__BONUS_CLICK_Y', "");
-		define('__BONUS_CLICK_N', ' checked');
+		define('__BONUS_CLICK_N', " checked=\"checked\"");
 		break;
 	}
 	switch ($_CONFIG['bonus_en_notify'])
 	{
 	case 'Y':
-		define('__BONUS_EN_NOTIFY_Y', ' checked');
+		define('__BONUS_EN_NOTIFY_Y', " checked=\"checked\"");
 		define('__BONUS_EN_NOTIFY_N', "");
 		break;
 
 	case 'N':
 		define('__BONUS_EN_NOTIFY_Y', "");
-		define('__BONUS_EN_NOTIFY_N', ' checked');
+		define('__BONUS_EN_NOTIFY_N', " checked=\"checked\"");
 		break;
 	}
 	switch ($_CONFIG['bonus_di_notify'])
 	{
 	case 'Y':
-		define('__BONUS_DI_NOTIFY_Y', ' checked');
+		define('__BONUS_DI_NOTIFY_Y', " checked=\"checked\"");
 		define('__BONUS_DI_NOTIFY_N', "");
 		break;
 
 	case 'N':
 		define('__BONUS_DI_NOTIFY_Y', "");
-		define('__BONUS_DI_NOTIFY_N', ' checked');
+		define('__BONUS_DI_NOTIFY_N', " checked=\"checked\"");
 		break;
 	}
 	switch ($_CONFIG['bonus_new_mem_notify'])
 	{
 	case 'Y':
-		define('__BONUS_NEW_MEMBER_NOTIFY_Y', ' checked');
+		define('__BONUS_NEW_MEMBER_NOTIFY_Y', " checked=\"checked\"");
 		define('__BONUS_NEW_MEMBER_NOTIFY_N', "");
 		break;
 
 	case 'N':
 		define('__BONUS_NEW_MEMBER_NOTIFY_Y', "");
-		define('__BONUS_NEW_MEMBER_NOTIFY_N', ' checked');
+		define('__BONUS_NEW_MEMBER_NOTIFY_N', " checked=\"checked\"");
 		break;
 	}
 	switch ($_CONFIG['bonus_include_own'])
 	{
 	case 'Y':
-		define('__BONUS_INCLUDE_OWN_Y', ' checked');
+		define('__BONUS_INCLUDE_OWN_Y', " checked=\"checked\"");
 		define('__BONUS_INCLUDE_OWN_N', "");
 		break;
 
 	case 'N':
 		define('__BONUS_INCLUDE_OWN_Y', "");
-		define('__BONUS_INCLUDE_OWN_N', ' checked');
+		define('__BONUS_INCLUDE_OWN_N', " checked=\"checked\"");
 		break;
 	}