X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-config_beg.php;h=6745c0ce95f943a0137b30b0dfabb528b42fe7f6;hp=76ff3493a05514b2420165f828fed10a24f6684d;hb=357b2ca133fc1f89db74097955c366cb4bee6996;hpb=307a4e11763f0914e73dc756b219356e1c29ab25

diff --git a/inc/modules/admin/what-config_beg.php b/inc/modules/admin/what-config_beg.php
index 76ff3493a0..6745c0ce95 100644
--- a/inc/modules/admin/what-config_beg.php
+++ b/inc/modules/admin/what-config_beg.php
@@ -32,21 +32,19 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!is_admin()))
-{
+if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
 	require($INC);
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+ADD_DESCR("admin", __FILE__);
 
-if (isset($_POST['ok']))
-{
+if (isset($_POST['ok'])) {
 	// Translate german decimal commas to computer decimal dots
-	$_POST['beg_points']       = str_replace(",", ".", $_POST['beg_points']      );
-	$_POST['beg_points_max']   = str_replace(",", ".", $_POST['beg_points_max']  );
-	$_POST['beg_notify_bonus'] = str_replace(",", ".", $_POST['beg_notify_bonus']);
+	$_POST['beg_points']       = REVERT_COMMA($_POST['beg_points']      );
+	$_POST['beg_points_max']   = REVERT_COMMA($_POST['beg_points_max']  );
+	$_POST['beg_notify_bonus'] = REVERT_COMMA($_POST['beg_notify_bonus']);
 
 	// Save settings
 	ADMIN_SAVE_SETTINGS($_POST);
@@ -55,15 +53,7 @@ if (isset($_POST['ok']))
 	$_CONFIG['beg_rallye']        = $_POST['beg_rallye'];
 	$_CONFIG['beg_ral_en_notify'] = $_POST['beg_ral_en_notify'];
 	$_CONFIG['beg_ral_di_notify'] = $_POST['beg_ral_di_notify'];
-
-	// Include sending out mails
-	if ((($_CONFIG['beg_rallye'] == "Y") && ($_CONFIG['beg_ral_en_notify'] == "Y")) || (($_CONFIG['beg_rallye'] == "N") && ($_CONFIG['beg_ral_di_notify'] == "Y")))
-	{
-		include(PATH."inc/mails/beg_mails.php");
-	}
-}
- else
-{
+} else {
 	// Prepare constants for the template
 	define('__BEG_POINTS'           , TRANSLATE_COMMA($_CONFIG['beg_points']      , false));
 	define('__BEG_POINTS_MAX'       , TRANSLATE_COMMA($_CONFIG['beg_points_max']  , false));
@@ -78,90 +68,90 @@ if (isset($_POST['ok']))
 	switch ($_CONFIG['beg_rallye'])
 	{
 	case 'Y':
-		define('__BEG_RALLYE_Y', ' checked');
+		define('__BEG_RALLYE_Y', " checked=\"checked\"");
 		define('__BEG_RALLYE_N', "");
 		break;
 
 	case 'N':
 		define('__BEG_RALLYE_Y', "");
-		define('__BEG_RALLYE_N', ' checked');
+		define('__BEG_RALLYE_N', " checked=\"checked\"");
 		break;
 	}
 	switch ($_CONFIG['beg_active'])
 	{
 	case 'Y':
-		define('__BEG_ACTIVE_Y', ' checked');
+		define('__BEG_ACTIVE_Y', " checked=\"checked\"");
 		define('__BEG_ACTIVE_N', "");
 		break;
 
 	case 'N':
 		define('__BEG_ACTIVE_Y', "");
-		define('__BEG_ACTIVE_N', ' checked');
+		define('__BEG_ACTIVE_N', " checked=\"checked\"");
 		break;
 	}
 	switch ($_CONFIG['beg_mode'])
 	{
 	case "DIRECT":
-		define('__BEG_MODE_DIRECT', ' checked');
+		define('__BEG_MODE_DIRECT', " checked=\"checked\"");
 		define('__BEG_MODE_REF'   , "");
 		break;
 
 	case "REF":
 		define('__BEG_MODE_DIRECT', "");
-		define('__BEG_MODE_REF'   , ' checked');
+		define('__BEG_MODE_REF'   , " checked=\"checked\"");
 		break;
 	}
 	switch ($_CONFIG['beg_ral_en_notify'])
 	{
 	case 'Y':
-		define('__BEG_RAL_EN_NOTIFY_Y', ' checked');
+		define('__BEG_RAL_EN_NOTIFY_Y', " checked=\"checked\"");
 		define('__BEG_RAL_EN_NOTIFY_N', "");
 		break;
 
 	case 'N':
 		define('__BEG_RAL_EN_NOTIFY_Y', "");
-		define('__BEG_RAL_EN_NOTIFY_N', ' checked');
+		define('__BEG_RAL_EN_NOTIFY_N', " checked=\"checked\"");
 		break;
 	}
 	switch ($_CONFIG['beg_ral_di_notify'])
 	{
 	case 'Y':
-		define('__BEG_RAL_DI_NOTIFY_Y', ' checked');
+		define('__BEG_RAL_DI_NOTIFY_Y', " checked=\"checked\"");
 		define('__BEG_RAL_DI_NOTIFY_N', "");
 		break;
 
 	case 'N':
 		define('__BEG_RAL_DI_NOTIFY_Y', "");
-		define('__BEG_RAL_DI_NOTIFY_N', ' checked');
+		define('__BEG_RAL_DI_NOTIFY_N', " checked=\"checked\"");
 		break;
 	}
 	switch ($_CONFIG['beg_new_mem_notify'])
 	{
 	case 'Y':
-		define('__BEG_NEW_MEMBER_NOTIFY_Y', ' checked');
+		define('__BEG_NEW_MEMBER_NOTIFY_Y', " checked=\"checked\"");
 		define('__BEG_NEW_MEMBER_NOTIFY_N', "");
 		break;
 
 	case 'N':
 		define('__BEG_NEW_MEMBER_NOTIFY_Y', "");
-		define('__BEG_NEW_MEMBER_NOTIFY_N', ' checked');
+		define('__BEG_NEW_MEMBER_NOTIFY_N', " checked=\"checked\"");
 		break;
 	}
 	switch ($_CONFIG['beg_include_own'])
 	{
 	case 'Y':
-		define('__BEG_INCLUDE_OWN_Y', ' checked');
+		define('__BEG_INCLUDE_OWN_Y', " checked=\"checked\"");
 		define('__BEG_INCLUDE_OWN_N', "");
 		break;
 
 	case 'N':
 		define('__BEG_INCLUDE_OWN_Y', "");
-		define('__BEG_INCLUDE_OWN_N', ' checked');
+		define('__BEG_INCLUDE_OWN_N', " checked=\"checked\"");
 		break;
 	}
 
 	// Add data to constant __MEMBER_SELECTION
-	ADD_MEMBER_SELECTION_BOX(false, true, true, $_CONFIG['beg_uid']);
+	define('__MEMBER_SELECTION', ADD_MEMBER_SELECTION_BOX($_CONFIG['beg_uid'], false, true, true, "beg_uid"));
 
 	// Load form template
 	LOAD_TEMPLATE("admin_config_beg");