X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_bonus.php;h=8f0a376d8b14a1d1a239b13e519d54883a8d12d5;hb=49248176a5638be80b148ef55d0dc8c334522bf3;hp=c39aac612ab26d497421c79a371aaa8c112aec78;hpb=fb7120ffa230b62b54895bcf95952e1cf30f8594;p=mailer.git

diff --git a/inc/modules/admin/what-config_bonus.php b/inc/modules/admin/what-config_bonus.php
index c39aac612a..8f0a376d8b 100644
--- a/inc/modules/admin/what-config_bonus.php
+++ b/inc/modules/admin/what-config_bonus.php
@@ -38,33 +38,33 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", __FILE__);
+ADD_DESCR('admin', __FILE__);
 
-if (IS_FORM_SENT()) {
+if (isFormSent()) {
 	// Replace german decimal commas to computer decimal dots
-	REQUEST_POST('login_bonus')         = REVERT_COMMA(REQUEST_POST('login_bonus')        );
-	REQUEST_POST('turbo_bonus')         = REVERT_COMMA(REQUEST_POST('turbo_bonus')        );
-	REQUEST_POST('bonus_ref')           = REVERT_COMMA(REQUEST_POST('bonus_ref')          );
-	REQUEST_POST('bonus_order')         = REVERT_COMMA(REQUEST_POST('bonus_order')        );
-	REQUEST_SET_POST('bonus_notify_points', REVERT_COMMA(REQUEST_POST('bonus_notify_points')));
+	REQUEST_SET_POST('login_bonus',         convertCommaToDot(REQUEST_POST('login_bonus')));
+	REQUEST_SET_POST('turbo_bonus',         convertCommaToDot(REQUEST_POST('turbo_bonus')));
+	REQUEST_SET_POST('bonus_ref',           convertCommaToDot(REQUEST_POST('bonus_ref')));
+	REQUEST_SET_POST('bonus_order',         convertCommaToDot(REQUEST_POST('bonus_order')));
+	REQUEST_SET_POST('bonus_notify_points', convertCommaToDot(REQUEST_POST('bonus_notify_points')));
 
 	// Generate string for saving ranks
-	REQUEST_SET_POST('turbo_rates', "");
+	REQUEST_SET_POST('turbo_rates', '');
 	$RATES = array();
 	foreach (REQUEST_POST('rate') as $rate) {
-		$rate = trim(REVERT_COMMA($rate));
+		$rate = trim(convertCommaToDot($rate));
 		if (!empty($rate)) $RATES[] = $rate;
 	}
-	REQUEST_SET_POST('turbo_rates', trim(implode(";", $RATES)));
-	REQUEST_UNSET_POST(('rate'));
+	REQUEST_SET_POST('turbo_rates', trim(implode(';', $RATES)));
+	REQUEST_UNSET_POST('rate');
 
 	// Automatically calculate bonus points for ranks 2 and 3 when not set
-	if (!REQUEST_ISSET_POST(('turbo_rates'))) REQUEST_SET_POST('turbo_rates', "".round(getConfig('turbo_bonus') / 2).";".round(getConfig('turbo_bonus') / 4)."");
+	if (!REQUEST_ISSET_POST(('turbo_rates'))) REQUEST_SET_POST('turbo_rates', ''.round(getConfig('turbo_bonus') / 2).';'.round(getConfig('turbo_bonus') / 4).'');
 
 	// Save data
 	ADMIN_SAVE_SETTINGS_POST();
@@ -75,24 +75,24 @@ if (IS_FORM_SENT()) {
 	setConfigEntry('bonus_di_notify', REQUEST_POST('bonus_di_notify'));
 } else {
 	// Prepare contants for the template
-	define('__LOGIN_VALUE' , TRANSLATE_COMMA(getConfig('login_bonus')        , false));
-	define('__TURBO_VALUE' , TRANSLATE_COMMA(getConfig('turbo_bonus')        , false));
-	define('__ORDER_VALUE' , TRANSLATE_COMMA(getConfig('bonus_order')        , false));
-	define('__REF_VALUE'   , TRANSLATE_COMMA(getConfig('bonus_ref')          , false));
-	define('__STATS_VALUE' , TRANSLATE_COMMA(getConfig('bonus_stats')        , false));
-	define('__NOTIFY_VALUE', TRANSLATE_COMMA(getConfig('bonus_notify_points'), false));
+	define('__LOGIN_VALUE' , translateComma(getConfig('login_bonus')        , false));
+	define('__TURBO_VALUE' , translateComma(getConfig('turbo_bonus')        , false));
+	define('__ORDER_VALUE' , translateComma(getConfig('bonus_order')        , false));
+	define('__REF_VALUE'   , translateComma(getConfig('bonus_ref')          , false));
+	define('__STATS_VALUE' , translateComma(getConfig('bonus_stats')        , false));
+	define('__NOTIFY_VALUE', translateComma(getConfig('bonus_notify_points'), false));
 	define('__TRANKS_VALUE', getConfig('bonus_ranks'));
 	define('__TLINES_VALUE', getConfig('bonus_lines'));
 
 	// Transfer options to template __MEMBER_SELECTION
-	define('__MEMBER_SELECTION', ADD_MEMBER_SELECTION_BOX(getConfig('bonus_uid'), false, true, true, "bonus_uid"));
+	define('__MEMBER_SELECTION', ADD_MEMBER_SELECTION_BOX(getConfig('bonus_uid'), false, true, true, 'bonus_uid'));
 
 	// Initialize array for the points list
 	//die("*".getConfig('turbo_rates')."*");
-	$RANKS = explode(";", getConfig('turbo_rates'));
+	$RANKS = explode(';', getConfig('turbo_rates'));
 
 	// Automatically calculate bonus points for ranks 2 and 3 when not set
-	if (getConfig('turbo_rates') == "") $RANKS = array(round(getConfig('turbo_bonus') / 2), round(getConfig('turbo_bonus') / 4));
+	if (getConfig('turbo_rates') == '') $RANKS = array(round(getConfig('turbo_bonus') / 2), round(getConfig('turbo_bonus') / 4));
 
 	// Generate list
 	$OUT = "<ol start=\"2\">\n";
@@ -115,135 +115,135 @@ if (IS_FORM_SENT()) {
 	$OUT .= "</ol>\n";
 	define('__TRATES_LIST', $OUT);
 
-	define('__LOGIN_TIMEOUT_SELECTION', CREATE_TIME_SELECTIONS(getConfig('login_timeout')    , "login_timeout"    , "WDh"));
-	define('__BONUS_TIMEOUT_SELECTION', CREATE_TIME_SELECTIONS(getConfig('bonus_timeout')    , "bonus_timeout"    , "WDh"));
-	define('__WAIT_SELECTION'         , CREATE_TIME_SELECTIONS(getConfig('bonus_notify_wait'), "bonus_notify_wait", "ms" ));
+	define('__LOGIN_TIMEOUT_SELECTION', createTimeSelections(getConfig('login_timeout')    , 'login_timeout'    , 'WDh'));
+	define('__BONUS_TIMEOUT_SELECTION', createTimeSelections(getConfig('bonus_timeout')    , 'bonus_timeout'    , 'WDh'));
+	$content['wait_selection']        = createTimeSelections(getConfig('bonus_notify_wait'), 'bonus_notify_wait', 'ms' );
 
 	// Activate / Deactivate bonus active rallye (Y/N)
 	switch (getConfig('bonus_active'))
 	{
-	case "Y":
-		define('__BONUS_ACTIVE_Y', " checked=\"checked\"");
-		define('__BONUS_ACTIVE_N', "");
-		break;
-
-	case "N":
-		define('__BONUS_ACTIVE_Y', "");
-		define('__BONUS_ACTIVE_N', " checked=\"checked\"");
-		break;
+		case 'Y':
+			define('__BONUS_ACTIVE_Y', ' checked="checked"');
+			define('__BONUS_ACTIVE_N', '');
+			break;
+
+		case 'N':
+			define('__BONUS_ACTIVE_Y', '');
+			define('__BONUS_ACTIVE_N', ' checked="checked"');
+			break;
 	}
 	// Other bonus to de-/activate
 	switch (getConfig('bonus_login_yn'))
 	{
-	case "Y":
-		define('__BONUS_LOGIN_Y', " checked=\"checked\"");
-		define('__BONUS_LOGIN_N', "");
-		break;
-
-	case "N":
-		define('__BONUS_LOGIN_Y', "");
-		define('__BONUS_LOGIN_N', " checked=\"checked\"");
-		break;
+		case 'Y':
+			define('__BONUS_LOGIN_Y', ' checked="checked"');
+			define('__BONUS_LOGIN_N', '');
+			break;
+
+		case 'N':
+			define('__BONUS_LOGIN_Y', '');
+			define('__BONUS_LOGIN_N', ' checked="checked"');
+			break;
 	}
 	switch (getConfig('bonus_stats_yn'))
 	{
-	case "Y":
-		define('__BONUS_STATS_Y', " checked=\"checked\"");
-		define('__BONUS_STATS_N', "");
-		break;
-
-	case "N":
-		define('__BONUS_STATS_Y', "");
-		define('__BONUS_STATS_N', " checked=\"checked\"");
-		break;
+		case 'Y':
+			define('__BONUS_STATS_Y', ' checked="checked"');
+			define('__BONUS_STATS_N', '');
+			break;
+
+		case 'N':
+			define('__BONUS_STATS_Y', '');
+			define('__BONUS_STATS_N', ' checked="checked"');
+			break;
 	}
 	switch (getConfig('bonus_order_yn'))
 	{
-	case "Y":
-		define('__BONUS_ORDER_Y', " checked=\"checked\"");
-		define('__BONUS_ORDER_N', "");
-		break;
-
-	case "N":
-		define('__BONUS_ORDER_Y', "");
-		define('__BONUS_ORDER_N', " checked=\"checked\"");
-		break;
+		case 'Y':
+			define('__BONUS_ORDER_Y', ' checked="checked"');
+			define('__BONUS_ORDER_N', '');
+			break;
+
+		case 'N':
+			define('__BONUS_ORDER_Y', '');
+			define('__BONUS_ORDER_N', ' checked="checked"');
+			break;
 	}
 	switch (getConfig('bonus_ref_yn'))
 	{
-	case "Y":
-		define('__BONUS_REF_Y', " checked=\"checked\"");
-		define('__BONUS_REF_N', "");
-		break;
-
-	case "N":
-		define('__BONUS_REF_Y', "");
-		define('__BONUS_REF_N', " checked=\"checked\"");
-		break;
+		case 'Y':
+			define('__BONUS_REF_Y', ' checked="checked"');
+			define('__BONUS_REF_N', '');
+			break;
+
+		case 'N':
+			define('__BONUS_REF_Y', '');
+			define('__BONUS_REF_N', ' checked="checked"');
+			break;
 	}
 	switch (getConfig('bonus_click_yn'))
 	{
-	case "Y":
-		define('__BONUS_CLICK_Y', " checked=\"checked\"");
-		define('__BONUS_CLICK_N', "");
-		break;
-
-	case "N":
-		define('__BONUS_CLICK_Y', "");
-		define('__BONUS_CLICK_N', " checked=\"checked\"");
-		break;
+		case 'Y':
+			define('__BONUS_CLICK_Y', ' checked="checked"');
+			define('__BONUS_CLICK_N', '');
+			break;
+
+		case 'N':
+			define('__BONUS_CLICK_Y', '');
+			define('__BONUS_CLICK_N', ' checked="checked"');
+			break;
 	}
 	switch (getConfig('bonus_en_notify'))
 	{
-	case "Y":
-		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=\"checked\"");
-		break;
+		case 'Y':
+			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="checked"');
+			break;
 	}
 	switch (getConfig('bonus_di_notify'))
 	{
-	case "Y":
-		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=\"checked\"");
-		break;
+		case 'Y':
+			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="checked"');
+			break;
 	}
 	switch (getConfig('bonus_new_mem_notify'))
 	{
-	case "Y":
-		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=\"checked\"");
-		break;
+		case 'Y':
+			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="checked"');
+			break;
 	}
 	switch (getConfig('bonus_include_own'))
 	{
-	case "Y":
-		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=\"checked\"");
-		break;
+		case 'Y':
+			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="checked"');
+			break;
 	}
 
 	// Load final template
-	LOAD_TEMPLATE("admin_config_bonus", false);
+	LOAD_TEMPLATE('admin_config_bonus', false, $content);
 }
 //
 ?>