From: Roland Häder <roland@mxchange.org>
Date: Tue, 7 Oct 2008 00:42:10 +0000 (+0000)
Subject: Fix for double-included file
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b521e578facc3715e91f1a9ea62b162b7fecba52;p=mailer.git

Fix for double-included file
---

diff --git a/inc/databases.php b/inc/databases.php
index ef7c4bcebc..798fcef80a 100644
--- 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', "473");
+define('CURR_SVN_REVISION', "474");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
diff --git a/inc/modules/admin/what-config_beg.php b/inc/modules/admin/what-config_beg.php
index 5342beb5ad..b9911aab76 100644
--- a/inc/modules/admin/what-config_beg.php
+++ b/inc/modules/admin/what-config_beg.php
@@ -40,8 +40,7 @@ if ((!defined('__SECURITY')) || (!is_admin())) {
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
 
-if (isset($_POST['ok']))
-{
+if (isset($_POST['ok'])) {
 	// Translate german decimal commas to computer decimal dots
 	$_POST['beg_points']       = REVERT_COMMA($_POST['beg_points']      );
 	$_POST['beg_points_max']   = REVERT_COMMA($_POST['beg_points_max']  );
@@ -54,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));
diff --git a/inc/modules/admin/what-config_bonus.php b/inc/modules/admin/what-config_bonus.php
index 21f8293287..53a6e3c884 100644
--- a/inc/modules/admin/what-config_bonus.php
+++ b/inc/modules/admin/what-config_bonus.php
@@ -40,8 +40,7 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 // Add description as navigation point
 ADD_DESCR("admin", basename(__FILE__));
 
-if (isset($_POST['ok']))
-{
+if (isset($_POST['ok'])) {
 	// Replace german decimal commas to computer decimal dots
 	$_POST['login_bonus']         = REVERT_COMMA($_POST['login_bonus']        );
 	$_POST['turbo_bonus']         = REVERT_COMMA($_POST['turbo_bonus']        );
@@ -51,8 +50,7 @@ if (isset($_POST['ok']))
 
 	// Generate string for saving ranks
 	$_POST['turbo_rates'] = ""; $RATES = array();
-	foreach ($_POST['rate'] as $rate)
-	{
+	foreach ($_POST['rate'] as $rate) {
 		$rate = trim(REVERT_COMMA($rate));
 		if (isset($rate)) $RATES[] = $rate;
 	}
@@ -69,12 +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"))) {
-		// Send mails out!
-		include(PATH."inc/mails/bonus_mails.php");
-	}
 } else {
 	// Prepare contants for the template
 	define('__LOGIN_VALUE' , TRANSLATE_COMMA($_CONFIG['login_bonus']        , false));